新分支

src/xt_pages/management/components/ManageForm.vue

@@ -16,7 +16,7 @@
               ></el-input>
             </el-form-item>
           </el-col>
-
+          
           <el-col :span="8">
             <el-form-item label="设备类型:" required prop="device_type">
               <el-select
@@ -851,7 +851,7 @@ export default {
     padding: 0;
   }
   .el-form-item__error {
-    margin-left: 210px;
+    margin-left: 60px;
   }
 }
 .el-checkbox {

src/xt_pages/management/components/UserForm.vue

@@ -1570,7 +1570,7 @@ export default {
            if(macher.user_total == ''){
              macher.user_total = 0
            }
-          var totals = count[0].Total + parseInt(macher.user_total)
+          // var totals = count[0].Total + parseInt(macher.user_total)
           this.userform.id = device.id;
           this.userform.spling_date = uParseTime(
               device.date,
@@ -1648,7 +1648,7 @@ export default {
           if (device.disinfection === 0) {
             this.userform.disinfection = "";
           }
-          this.userform.user_total = totals.toString()
+          this.userform.user_total = device.user_total.toString()
         }
       });
     },

src/xt_pages/management/home.vue

@@ -2885,10 +2885,10 @@ export default {
           patient_name: [{ required: true, message: '请填写患者', trigger: ['blur', 'change'] }],
           disinfect_type: [{ required: true, message: '请填写消毒方式' }],
           disinfectant_type: [{ required: true, message: '请填写消毒液' }],
-          disinfection: [{ required: true, message: '请填写消毒状态' }],
+          disinfection: [{ required: true, message: '请填写消毒状态', trigger: ['blur','change'] }],
           fluid_path: [{ required: true, message: '请填写消毒方式' }],
           disinfectant: [{ required: true, message: '请填写消毒液' }],
-          disinfection_status: [{ required: true, message: '消毒状态' }],
+          disinfection_status: [{ required: true, message: '请填写消毒状态', trigger: ['blur','change'] }],
           sign_name: [{ required: true, message: '请填写签名', trigger: ['blur','change'] }],
           classtype: [{ required: true, message: '请填写班次', trigger: ['blur','change']  }],
           reporting_date:[{required:true,message:"请填写出报告日期"}]
@@ -3093,7 +3093,7 @@ export default {
           { id:29, name:"PE"},
         ],
         disinfection: [
-          { id: 0, name: '请选择' },
+          // { id: 0, name: '请选择' },
           { id: 1, name: '已消毒' },
           { id: 2, name: '未消毒' },
           { id: 3, name: '消毒未完成' }
@@ -3383,11 +3383,15 @@ export default {
         this.getAllMachine()
       },
       changeDeviceId(val) {
+        console.log("val-------",val)
         if (val === 1) {
           this.zoneDisabled = false
         } else {
           this.zoneDisabled = true
         }
+        if(val == 0){
+          this.zoneDisabled = false
+        }
         this.forms.device_type = val
         this.getAllMachine()
       },
@@ -3424,7 +3428,7 @@ export default {
         this.tabIndex = index
       },
       handleCurrentChange(val) {
-       console.log("val232323232323------",val)
+      
         // 通过设备型号区分质量控制
         this.device_type = val.device_type
         this.unitType = val.unit_type
@@ -4480,22 +4484,22 @@ export default {
         }
 
         // eslint-disable-next-line eqeqeq
-        if (this.userform.start_time == '') {
-          this.userform.start_time = '0'
-        }
-        // eslint-disable-next-line eqeqeq
-        if (this.userform.end_time == '') {
-          this.userform.end_time = '0'
-        }
+        // if (this.userform.start_time == '') {
+        //   this.userform.start_time = '0'
+        // }
+        // // eslint-disable-next-line eqeqeq
+        // if (this.userform.end_time == '') {
+        //   this.userform.end_time = '0'
+        // }
 
-        // eslint-disable-next-line eqeqeq
-        if (this.userform.starttime == '') {
-          this.userform.starttime = '0'
-        }
-        // eslint-disable-next-line eqeqeq
-        if (this.userform.endtime == '') {
-          this.userform.endtime = '0'
-        }
+        // // eslint-disable-next-line eqeqeq
+        // if (this.userform.starttime == '') {
+        //   this.userform.starttime = '0'
+        // }
+        // // eslint-disable-next-line eqeqeq
+        // if (this.userform.endtime == '') {
+        //   this.userform.endtime = '0'
+        // }
 
         if (this.userform.hyperfiltratio === '') {
           this.userform.hyperfiltratio = 0
@@ -4582,8 +4586,18 @@ export default {
             this.userform.patient_id = information.patient_id
             this.userform.contagion = information.contagion
             this.userform.dialysis_mode = information.dialysis_mode
-            this.userform.start_time = this.updateTimes(information.start_time)
-            this.userform.end_time = this.updateTimes(information.end_time)
+            if(information.start_time > 0){
+              this.userform.start_time = this.updateTimes(information.start_time)
+            }else{
+              this.userform.start_time =  ""
+            }
+            if(information.end_time >0){
+              this.userform.end_time = this.updateTimes(information.end_time)
+            }else{
+              this.userform.end_time = ""
+            }
+          
+           
             // this.userform.end_time = uParseTime(information.end_time, '{y}-{m}-{d} {h}:{i}')
             if (information.hyperfiltratio === '') {
               this.userform.hyperfiltratio = dislysis.actual_ultrafiltration
@@ -4612,15 +4626,36 @@ export default {
             this.userform.fault_description = information.fault_description
             this.userform.code_information = information.code_information
             this.userform.disinfect_type = information.disinfect_type
-            this.userform.disinfection = information.disinfection
+            if(information.disinfection == 0){
+              this.userform.disinfection = ""
+            }else{
+              this.userform.disinfection = information.disinfection
+            }
+           
             this.userform.machine_run = information.machine_run
             this.userform.fluid_path = information.fluid_path
             this.userform.disinfectant = information.disinfectant
-            this.userform.disinfection_status = information.disinfection_status
+            if(information.disinfection_status == 0){
+               this.userform.disinfection_status = ""
+            }else{
+              this.userform.disinfection_status = information.disinfection_status
+            }
+           
             this.userform.disinfection_residue = information.disinfection_residue
             this.userform.longtime = information.long_time
-            this.userform.starttime = this.updateTimes(information.disinfec_startime)
-            this.userform.endtime = this.updateTimes(information.disinfec_endtime)
+            if(information.disinfec_startime >0){
+              this.userform.starttime = this.updateTimes(information.disinfec_startime)
+            }else{
+              this.userform.starttime= ""
+            }
+
+            if(information.disinfec_endtime >0){
+              this.userform.endtime = this.updateTimes(information.disinfec_endtime)
+            }else{
+              this.userform.endtime = ""
+            }
+           
+           
 
             if (information.dialysis_checked === 1) {
               this.userform.dialysis_checked = true
@@ -5413,10 +5448,14 @@ export default {
   }
   .el-form-item__error {
     margin-left: 130px;
+    
   }
 
 </style>
 <style lang="scss">
+    .el-form-item__error {
+      left:103px !important;
+    }
    .a{
      margin-bottom: 10px;
       margin-top: 6px;