新分支

src/xt_pages/management/components/RepairForm.vue

@@ -345,7 +345,7 @@
       ></el-pagination>
     </el-row>
 
-    <!-- 编辑维修记录 -->
+    <-- 编辑维修记录 -->
     <el-dialog
       title="编辑维修记录"
       :visible.sync="dialogVisible"

src/xt_pages/management/components/UserForm.vue

@@ -1557,8 +1557,6 @@ export default {
       });
     },
     EditUser(id, patientid) {
-       console.log("hh2h333232332233232323322323",id)
-       console.log("patient_id2323223323223322332323322323",patientid)
       EditUser(id, patientid).then(response => {
         if (response.data.state === 1) {
           this.dialogVisible = true;
@@ -2509,6 +2507,7 @@ export default {
           }else{
             this.form.bed = ""
             this.bedNumberTwo = []
+            this.getAllSubregion()
 
           }
 

src/xt_pages/management/components/WaterForm.vue

@@ -214,7 +214,7 @@
             </el-col>
             <el-col :span="8">
                 <el-form-item label="时长(h):"  class="st">
-                    <el-input  v-model="form.first_disinfection_time" type="number" style="width:100px" oninput="value=value.replace(/[^\d^\.]/g, '')"></el-input>
+                    <el-input  v-model="form.first_disinfection_time" style="width:100px" oninput="value=value.replace(/[^\d^\.]/g, '')"></el-input>
                 </el-form-item>
             </el-col>
          </el-row>
@@ -237,7 +237,7 @@
             </el-col>
             <el-col :span="8">
                 <el-form-item label="时长(h):"  class="st">
-                    <el-input  v-model="form.last_disinfection_time" type="number" style="width:100px" oninput="value=value.replace(/[^\d^\.]/g, '')"></el-input>
+                    <el-input  v-model="form.last_disinfection_time" style="width:100px" oninput="value=value.replace(/[^\d^\.]/g, '')"></el-input>
                 </el-form-item>
             </el-col>
          </el-row>
@@ -570,7 +570,135 @@ import {getAllDoctorList,saveWaterList} from "@/api/manage";
                 var deviceWater =  response.data.data.deviceWater
                 console.log("保存成功!",deviceWater)
                 this.$message.success("保存成功!")
+                console.log("2333333333333333333333333w",this.form.water_conductivity)
+                if(this.form.water_conductivity == 0){
+                   this.form.water_conductivity = ""
+                }
+                if(this.form.fault_description == 0){
+                   this.form.fault_description = ""
+                }
+                
+                if(this.form.water_conductivity == 0){
+                   this.form.water_conductivity = ""
+                }
 
+                if(this.form.water_pressure == 0){
+                  this.form.water_pressure = ""
+                }
+               
+                if(this.form.temperature == 0){
+                   this.form.temperature = ""
+                }
+
+                if(this.form.first_ro_membrane_water == 0){
+                   this.form.first_ro_membrane_water = ""
+                }
+
+                if(this.form.first_ro_film_thick_water ==0 ){
+                   this.form.first_ro_film_thick_water = ""
+                }
+
+                if(this.form.first_ro_membrane_effluent == 0){
+                   this.form.first_ro_membrane_effluent=""
+                }
+
+                if(this.form.first_production_of_water_conductivity == 0){
+                   this.form.first_production_of_water_conductivity = ""
+                }
+                
+                if(this.form.first_water_yield == 0){
+                   this.form.first_water_yield = ""
+                }
+              
+                if(this.form.last_ro_membrane_water == 0){
+                  this.form.last_ro_membrane_water= ""
+                }
+                
+                if(this.form.last_ro_film_thick_water== 0){
+                   this.form.last_ro_film_thick_water = ""
+                }
+
+                if(this.form.last_ro_membrane_effluent == 0){
+                  this.form.last_ro_membrane_effluent = ""
+                }
+               
+                if(this.form.last_production_of_water_conductivity == 0){
+                  this.form.last_production_of_water_conductivity = ""
+                }
+
+                if(this.form.last_water_yield  == 0){
+                  this.form.last_water_yield = ""
+                }
+              
+                if(this.form.carbon_tank == 0){
+                   this.form.carbon_tank = ""
+                }
+                
+                if(this.form.snd_tank == 0){
+                  this.form.snd_tank = ""
+                }
+             
+                if(this.form.resin_tank == 0){
+                  this.form.resin_tank= ""
+                }
+                
+                if(this.form.ultrafilter == 0){
+                   this.form.ultrafilter= ""
+                }
+                
+                if(this.form.hardness_monitoring  ==0){
+                    this.form.hardness_monitoring = ""
+                }
+                
+                if(this.form.total_chlorine_detection == 0){
+                  this.form.total_chlorine_detection= ""
+                }
+                if(this.form.concentration_of_peroxyacetic_acid == 0){
+                  this.form.concentration_of_peroxyacetic_acid = ""
+                }
+                
+                if(this.form.reverse_osmosis_membrane_disinfection ==0){
+                  this.form.reverse_osmosis_membrane_disinfection = ""
+                } 
+              
+                if(this.form.disinfection_of_water_pipeline == 0){
+                  this.form.disinfection_of_water_pipeline= ""
+                }
+                
+                if(this.form.first_disinfection_method == 0){
+                    this.form.first_disinfection_method = ""
+                }
+                
+                if(this.form.last_disinfection_method  == 0){
+                    this.form.last_disinfection_method = ""
+                }
+
+                if(this.form.first_disinfection_time == 0){
+                  this.form.first_disinfection_time = ""
+                }
+                
+                if(this.form.last_disinfection_time == 0){
+                  this.form.last_disinfection_time = ""
+                }
+              
+                if(this.form.remark == 0){
+                  this.form.remark = ""
+                } 
+                 
+                if(this.form.filter_replacement == 0){
+                    this.form.filter_replacement = ""
+                }
+               
+                if(this.form.admin_user_id == 0){
+                   this.form.admin_user_id = ""
+                }
+               
+              
+               
+               
+                // this.$parent.toParent()
+                
+             }else{
                 this.form.fault_description = ""
                 this.form.water_conductivity = ""
                 this.form.water_pressure = ""
@@ -599,7 +727,7 @@ import {getAllDoctorList,saveWaterList} from "@/api/manage";
                 this.form.first_disinfection_time = ""
                 this.form.last_disinfection_time = ""
                 this.form.remark = ""
-                this.form.filter_replacement = ""
+                this.form.filter_replacement = "" 
              }
            })
 
@@ -612,11 +740,12 @@ import {getAllDoctorList,saveWaterList} from "@/api/manage";
              var doctorList = response.data.data.list
              console.log("dcotorlist",doctorList)
              for(let i=0;i<doctorList.length;i++){
-              if(doctorList[i].user_type == 3){
-                 this.nurseList.push(doctorList[i])
-              }
+            //   if(doctorList[i].user_type == 3){
+            //      this.nurseList.push(doctorList[i])
+            //   }
+               this.nurseList.push(doctorList[i])
              }
-
+             console.log("nurseLisrt===============",this.nurseList)
            }
          })
        },
@@ -642,6 +771,8 @@ import {getAllDoctorList,saveWaterList} from "@/api/manage";
     //     }
     },
     created(){
+       this.form.admin_user_id = this.$store.getters.xt_user.user.id
+    //    this.form.admin_user_id = 829
        this.getAllDoctorList()
     },
     mounted(){

src/xt_pages/management/components/WaterFormList.vue

@@ -5,6 +5,7 @@
           <span class="machineClass">日期查询:</span>
           <el-date-picker
             v-model="form.start_time"
+            @change="changeStartime"
             prefix-icon="none"
             type="date"
             placeholder="请选择"
@@ -14,6 +15,7 @@
           ></el-date-picker
           >-
           <el-date-picker
+           @change="changeEndtime"
             v-model="form.end_time"
             prefix-icon="none"
             type="date"
@@ -879,6 +881,14 @@
         }
       },
       methods:{
+        changeStartime(){
+         this.tableData = []
+         this.getlist()
+        },
+        changeEndtime(){
+         this.tableData = []
+         this.getlist()
+        },
          getlist(){
            var params = {
              start_time:this.form.start_time,
@@ -1328,6 +1338,7 @@
         },
       },
       created(){
+        console.log("list+++++++++++++++++++++++")
         this.getlist()
       }
     }

src/xt_pages/management/home.vue

@@ -1368,8 +1368,8 @@
                           </el-tab-pane>
 
                            <el-tab-pane label="使用登记列表" name="second" >
-                             <user-form ref="userForm" :userdata="userdata" v-if="device_type == 1"></user-form>
-                             <water-form-list ref="waterFormList" v-if="device_type == 2" :equimentid="equimentid"></water-form-list>
+                             <user-form ref="childFive" :userdata="userdata" v-if="device_type == 1"></user-form>
+                             <water-form-list ref="childSix" v-if="device_type == 2" :equimentid="equimentid"></water-form-list>
                            </el-tab-pane>
                        </el-tabs>
                      </div>
@@ -3383,7 +3383,7 @@ export default {
         this.getAllMachine()
       },
       changeDeviceId(val) {
-        console.log("val-------",val)
+       
         if (val === 1) {
           this.zoneDisabled = false
         } else {
@@ -3428,7 +3428,7 @@ export default {
         this.tabIndex = index
       },
       handleCurrentChange(val) {
-      
+        console.log("val3223323223",val)
         // 通过设备型号区分质量控制
         this.device_type = val.device_type
         this.unitType = val.unit_type
@@ -3446,6 +3446,14 @@ export default {
         this.GetUserTotalCount(val.bed_id)
         this.getTimeBeteen(val.id)
         this.getData(val.bed_id)
+        if(val.device_type == 2){
+          this.$refs.childSix.getlist()
+        }
+       
+      },
+      toParent(){
+        console.log("处方23322332")
+        this.$refs.childSix.getlist()
       },
       getAutoData(id) {
         getAutoData(id).then(response => {