Merge branch '20230223_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20230223_pc_vue_new_branch

src/xt_pages/device/airDisinfectTwo.vue

@@ -49,7 +49,7 @@
                 </el-table-column>
                 <el-table-column prop="dwaiod" label="累计时间" align="center" min-width="50">
                     <template slot-scope="scope">
-                      {{scope.row.first_total_time }}
+                      {{scope.row.first_total_time?scope.row.first_total_time:"" }}
                     </template>
                 </el-table-column>
                 <el-table-column prop="date" label="责任人" align="center" min-width="50">
@@ -65,7 +65,7 @@
                 </el-table-column>
                 <el-table-column prop="province" label="累计时间" align="center" min-width="50">
                     <template slot-scope="scope">
-                      {{ scope.row.sencond_total_time }}
+                      {{ scope.row.sencond_total_time?scope.row.sencond_total_time:"" }}
                     </template>
                 </el-table-column>
                 <el-table-column prop="city" label="负责人" align="center" min-width="50">
@@ -81,7 +81,7 @@
                 </el-table-column>
                 <el-table-column prop="province" label="累计时间" align="center" min-width="45">
                     <template slot-scope="scope">
-                       {{scope.row.third_total_time }}
+                       {{scope.row.third_total_time?scope.row.third_total_time:"" }}
                     </template>
                 </el-table-column>
                 <el-table-column prop="city" label="负责人" align="center" min-width="50">
@@ -805,16 +805,63 @@
         saveNewAirDisinfect(formName){
           this.$refs[formName].validate((valid)=>{
             if(valid){
+                if(this.form.first_is_check!=""){
+                 this.form.first_is_check = parseInt(this.form.first_is_check)
+                }else{
+                  this.form.first_is_check = 0
+                }
+                
+                if( this.form.sencond_is_check!=""){
+                    this.form.sencond_is_check = parseInt(this.form.sencond_is_check)
+                }else{
+                    this.form.sencond_is_check = ""
+                }
+                
+                if( this.form.third_is_check!=""){
+                   this.form.third_is_check = parseInt(this.form.third_is_check)
+                }else{
+                    this.form.third_is_check = 0
+                }
+                if(this.form.last_is_check!=""){
+                  this.form.last_is_check = parseInt(this.form.last_is_check)
+                }else{
+                  this.form.last_is_check = 0
+                }
+                
+                if(this.form.first_modifications!=""){
+                  this.form.first_modifications = parseInt(this.form.first_modifications)
+                }else{
+                    this.form.first_modifications =0  
+                }
+
+                if(this.form.sencond_modifications!=""){
+                  this.form.sencond_modifications = parseInt(this.form.sencond_modifications)  
+                }else{
+                    this.form.sencond_modifications =0
+                }
                 
-                this.form.first_is_check = parseInt(this.form.first_is_check)
-                this.form.sencond_is_check = parseInt(this.form.sencond_is_check)
-                this.form.third_is_check = parseInt(this.form.third_is_check)
-                this.form.last_is_check = parseInt(this.form.last_is_check)
+                if(this.form.third_modifications!=""){
+                   this.form.third_modifications = parseInt(this.form.third_modifications)
+                }else{
+                    this.form.third_modifications= 0   
+                }
+                
+                if(this.form.last_modifications!=""){
+                    this.form.last_modifications = parseInt(this.form.last_modifications)
+                }else{
+                    this.form.last_modifications= 0
+                }
+            
+            
+            
+              
+              console.log("this232322323",this.form)
               saveNewAirDisinfect(this.form).then(response=>{
                  if(response.data.state == 1 ){
                    var disinfect = response.data.data.disinfect
                    this.$message.success("保存成功！")
                    this.dialogFormVisible = false
+                   this.getNewAirDisinfectList()
                  }
               })
             }
@@ -863,38 +910,38 @@
               console.log("list",list)
               this.form.id = list.id
               this.form.record_date = this.getTimes(list.record_date)
-              this.form.first_disinfection_water = list.first_disinfection_water
-              this.form.first_disinfection_methods = list.first_disinfection_methods
-              this.form.first_disinfection_time = list.first_disinfection_time
+              this.form.first_disinfection_water = list.first_disinfection_water?list.first_disinfection_water:""
+              this.form.first_disinfection_methods = list.first_disinfection_methods?list.first_disinfection_methods:""
+              this.form.first_disinfection_time = list.first_disinfection_time?list.first_disinfection_time:""
               this.form.first_start_time = this.getTimeThree(list.first_start_time)
               this.form.first_end_time = this.getTimeThree(list.first_end_time)
-              this.form.first_total_time = list.first_total_time
+              this.form.first_total_time = list.first_total_time?list.first_total_time:""
               this.form.first_is_check = list.first_is_check.toString()
-              this.form.first_modifications = list.first_modifications
+              this.form.first_modifications = list.first_modifications?list.first_modifications:""
               this.form.first_creator = list.first_creator
-              this.form.sencond_disinfection_water = list.sencond_disinfection_water
-              this.form.sencond_disinfection_methods = list.sencond_disinfection_methods
-              this.form.sencond_disinfection_time = list.sencond_disinfection_time
+              this.form.sencond_disinfection_water = list.sencond_disinfection_water?list.sencond_disinfection_water:""
+              this.form.sencond_disinfection_methods = list.sencond_disinfection_methods? list.sencond_disinfection_methods:""
+              this.form.sencond_disinfection_time = list.sencond_disinfection_time?list.sencond_disinfection_time:""
               this.form.sencond_start_time = this.getTimeThree(list.sencond_start_time)
               this.form.sencond_end_time = this.getTimeThree(list.sencond_end_time)
-              this.form.sencond_total_time = list.sencond_total_time
+              this.form.sencond_total_time = list.sencond_total_time?list.sencond_total_time:""
               this.form.sencond_is_check = list.sencond_is_check.toString()
-              this.form.sencond_modifications = list.sencond_modifications
+              this.form.sencond_modifications = list.sencond_modifications?list.sencond_modifications:""
               this.form.sencond_creator = list.sencond_creator
-              this.form.third_disinfection_water = list.third_disinfection_water
-              this.form.third_disinfection_methods = list.third_disinfection_methods
-              this.form.third_disinfection_time = list.third_disinfection_time
+              this.form.third_disinfection_water = list.third_disinfection_water?list.third_disinfection_water:""
+              this.form.third_disinfection_methods = list.third_disinfection_methods?list.third_disinfection_methods:""
+              this.form.third_disinfection_time = list.third_disinfection_time?list.third_disinfection_time:""
               this.form.third_start_time  =this.getTimeThree(list.third_start_time)
               this.form.third_end_time = this.getTimeThree(list.third_end_time)
-              this.form.third_total_time = list.third_total_time
+              this.form.third_total_time = list.third_total_time?list.third_total_time:""
               this.form.third_is_check = list.third_is_check.toString()
-              this.form.third_modifications = list.third_modifications
+              this.form.third_modifications = list.third_modifications?list.third_modifications:""
               this.form.third_creator = list.third_creator
               this.form.last_start_time = this.getTimeThree(list.last_start_time)
               this.form.last_end_time = this.getTimeThree(list.last_end_time)
-              this.form.last_total_time = list.last_total_time
+              this.form.last_total_time = list.last_total_time?list.last_total_time:""
               this.form.last_is_check = list.last_is_check.toString()
-              this.form.last_modifications = list.last_modifications
+              this.form.last_modifications = list.last_modifications?list.last_modifications:""
               this.form.last_creator = list.last_creator
               this.editDialogFormVisible = true
              
@@ -905,10 +952,53 @@
         
          this.$refs[formName].validate((valid)=>{
             if(valid){
-                this.form.first_is_check = parseInt(this.form.first_is_check)
-                this.form.sencond_is_check = parseInt(this.form.sencond_is_check)
-                this.form.third_is_check = parseInt(this.form.third_is_check)
-                this.form.last_is_check = parseInt(this.form.last_is_check)
+                if(this.form.first_is_check!=""){
+                 this.form.first_is_check = parseInt(this.form.first_is_check)
+                }else{
+                  this.form.first_is_check = 0
+                }
+                
+                if( this.form.sencond_is_check!=""){
+                    this.form.sencond_is_check = parseInt(this.form.sencond_is_check)
+                }else{
+                    this.form.sencond_is_check = ""
+                }
+                
+                if( this.form.third_is_check!=""){
+                   this.form.third_is_check = parseInt(this.form.third_is_check)
+                }else{
+                    this.form.third_is_check = 0
+                }
+                if(this.form.last_is_check!=""){
+                  this.form.last_is_check = parseInt(this.form.last_is_check)
+                }else{
+                  this.form.last_is_check = 0
+                }
+                
+                if(this.form.first_modifications!=""){
+                  this.form.first_modifications = parseInt(this.form.first_modifications)
+                }else{
+                    this.form.first_modifications =0  
+                }
+
+                if(this.form.sencond_modifications!=""){
+                  this.form.sencond_modifications = parseInt(this.form.sencond_modifications)  
+                }else{
+                    this.form.sencond_modifications =0
+                }
+                
+                if(this.form.third_modifications!=""){
+                   this.form.third_modifications = parseInt(this.form.third_modifications)
+                }else{
+                    this.form.third_modifications= 0   
+                }
+                
+                if(this.form.last_modifications!=""){
+                    this.form.last_modifications = parseInt(this.form.last_modifications)
+                }else{
+                    this.form.last_modifications= 0
+                }
+            
               updateAirDisinfect(this.form).then(response=>{
                 if(response.data.state == 1){
                   var disinfect =  response.data.data.disinfect

src/xt_pages/device/objectTableDisinfectTwo.vue

@@ -39,7 +39,7 @@
                 </el-table-column>
                 <el-table-column prop="fenopda" :label="'湿化瓶'+'\n'+'500mg/l含氯制剂'" align="center" min-width="60">
                     <template slot-scope="scope">
-                        {{scope.row.first_total_time}}
+                        {{scope.row.first_total_time?scope.row.first_total_time:""}}
                     </template>
                 </el-table-column>
                 <el-table-column prop="dwaiod" label="责任人" align="center" min-width="60">
@@ -50,7 +50,7 @@
 
                 <el-table-column prop="date" :label="'止血带'+'\n'+'500mg/l含氯制剂'" align="center" min-width="60">
                     <template slot-scope="scope">
-                        {{scope.row.sencond_total_time}}
+                        {{scope.row.sencond_total_time?scope.row.sencond_total_time:""}}
                     </template>
                 </el-table-column>
                 <el-table-column prop="name" label="责任人" align="center" min-width="60">
@@ -61,7 +61,7 @@
 
                 <el-table-column prop="province" :label="'医疗垃圾桶'+'\n'+'1000mg/l含氯制剂'" align="center" min-width="60">
                     <template slot-scope="scope">
-                        {{scope.row.third_total_time}}
+                        {{scope.row.third_total_time?scope.row.third_total_time:""}}
                     </template>
                 </el-table-column>
                 <el-table-column prop="city" label="负责人" align="center" min-width="60">
@@ -72,7 +72,7 @@
 
                 <el-table-column prop="name" :label="'体温计'+'\n'+'75%酒精擦拭'" align="center" min-width="60">
                     <template slot-scope="scope">
-                        {{scope.row.fourth_total_time}}
+                        {{scope.row.fourth_total_time?scope.row.fourth_total_time:""}}
                     </template>
                 </el-table-column>
                 <el-table-column prop="province" label="负责人" align="center" min-width="60">
@@ -83,7 +83,7 @@
 
                 <el-table-column prop="city" :label="'体温枪'+'\n'+'75%酒精擦拭'" align="center" min-width="60">
                     <template slot-scope="scope">
-                        {{scope.row.fourth_total_time}}
+                        {{scope.row.fourth_total_time?scope.row.fourth_total_time:""}}
                     </template>
                 </el-table-column>
                 <el-table-column prop="province" label="负责人" align="center" min-width="60">
@@ -976,16 +976,75 @@
         saveObjectTableDisinfect(formName){
           this.$refs[formName].validate((valid=>{
             if(valid){
-                this.form.first_is_check = parseInt(this.form.first_is_check) 
-                this.form.sencond_is_check = parseInt(this.form.sencond_is_check) 
-                this.form.third_is_check = parseInt(this.form.third_is_check)
-                this.form.fourth_is_check = parseInt(this.form.fourth_is_check)
-                this.form.last_is_check = parseInt(this.form.last_is_check)
+                if(this.form.first_is_check!=""){
+                  this.form.first_is_check = parseInt(this.form.first_is_check) 
+                }else{
+                    this.form.first_is_check=0
+                }
+
+                if(this.form.sencond_is_check!=""){
+                  this.form.sencond_is_check = parseInt(this.form.sencond_is_check) 
+                }else{
+                    this.form.sencond_is_check=0  
+                }
+
+                if(this.form.third_is_check!=""){
+                  this.form.third_is_check = parseInt(this.form.third_is_check)
+                }else{
+                    this.form.third_is_check = 0
+                }
+                
+                if(this.form.fourth_is_check!=""){
+                  this.form.fourth_is_check = parseInt(this.form.fourth_is_check)
+                }else{
+                    this.form.fourth_is_check =0  
+                }
+
+                if(this.form.last_is_check!=""){
+                    this.form.last_is_check = parseInt(this.form.last_is_check)
+                }else{
+                    this.form.last_is_check = 0
+                }
+
+
+                if(this.form.first_modifications!=""){
+                  this.form.first_modifications = parseInt(this.form.first_modifications) 
+                }else{
+                    this.form.first_modifications=0
+                }
+
+                if(this.form.sencond_modifications!=""){
+                  this.form.sencond_modifications = parseInt(this.form.sencond_modifications) 
+                }else{
+                    this.form.sencond_modifications=0  
+                }
+
+                if(this.form.third_modifications!=""){
+                  this.form.third_modifications = parseInt(this.form.third_modifications)
+                }else{
+                    this.form.third_modifications = 0
+                }
+                
+                if(this.form.fourth_modifications!=""){
+                  this.form.fourth_modifications = parseInt(this.form.fourth_modifications)
+                }else{
+                    this.form.fourth_modifications =0  
+                }
+
+                if(this.form.last_modifications!=""){
+                    this.form.last_modifications = parseInt(this.form.last_modifications)
+                }else{
+                    this.form.last_modifications = 0
+                }
+              
+              
+               
               saveObjectTableDisinfect(this.form).then(response=>{
                  if(response.data.state == 1){
                    var objectDisinfect =  response.data.data.objectDisinfect
                    this.$message.success("保存成功!")
                    this.dialogFormVisible = false
+                   this.getObjectTableDisInfectList()
                  }
               })
             }
@@ -1013,53 +1072,53 @@
               console.log("list",list)
               this.form.id = list.id
               this.form.record_date = this.getTimes(list.record_date)
-              this.form.first_disinfection_water = list.first_disinfection_water
-              this.form.first_disinfection_methods = list.first_disinfection_methods
-              this.form.first_disinfection_time = list.first_disinfection_time
+              this.form.first_disinfection_water = list.first_disinfection_water? list.first_disinfection_water:""
+              this.form.first_disinfection_methods = list.first_disinfection_methods? list.first_disinfection_methods:""
+              this.form.first_disinfection_time = list.first_disinfection_time?list.first_disinfection_time:""
               this.form.first_start_time = this.getTimeThree(list.first_start_time)
               this.form.first_end_time = this.getTimeThree(list.first_end_time)
-              this.form.first_total_time = list.first_total_time
+              this.form.first_total_time = list.first_total_time?list.first_total_time:""
               this.form.first_is_check = list.first_is_check.toString()
-              this.form.first_modifications = list.first_modifications
+              this.form.first_modifications = list.first_modifications?list.first_modifications:""
               this.form.first_creator = list.first_creator
-              this.form.sencond_disinfection_water = list.sencond_disinfection_water
-              this.form.sencond_disinfection_methods = list.sencond_disinfection_methods
-              this.form.sencond_disinfection_time = list.sencond_disinfection_time
+              this.form.sencond_disinfection_water = list.sencond_disinfection_water?list.sencond_disinfection_water:""
+              this.form.sencond_disinfection_methods = list.sencond_disinfection_methods?list.sencond_disinfection_methods:""
+              this.form.sencond_disinfection_time = list.sencond_disinfection_time?list.sencond_disinfection_time:""
               this.form.sencond_start_time = this.getTimeThree(list.sencond_start_time)
               this.form.sencond_end_time = this.getTimeThree(list.sencond_end_time)
-              this.form.sencond_total_time = list.sencond_total_time
+              this.form.sencond_total_time = list.sencond_total_time?list.sencond_total_time:""
               this.form.sencond_is_check = list.sencond_is_check.toString()
-              this.form.sencond_modifications = list.sencond_modifications
+              this.form.sencond_modifications = list.sencond_modifications?list.sencond_modifications:""
               this.form.sencond_creator = list.sencond_creator
-              this.form.third_disinfection_water = list.third_disinfection_water
-              this.form.third_disinfection_methods = list.third_disinfection_methods
-              this.form.third_disinfection_time = list.third_disinfection_time
+              this.form.third_disinfection_water = list.third_disinfection_water?list.third_disinfection_water:""
+              this.form.third_disinfection_methods = list.third_disinfection_methods?list.third_disinfection_methods:""
+              this.form.third_disinfection_time = list.third_disinfection_time?list.third_disinfection_time:""
               this.form.third_start_time  =this.getTimeThree(list.third_start_time)
               this.form.third_end_time = this.getTimeThree(list.third_end_time)
-              this.form.third_total_time = list.third_total_time
+              this.form.third_total_time = list.third_total_time?list.third_total_time:""
               this.form.third_is_check = list.third_is_check.toString()
-              this.form.third_modifications = list.third_modifications
+              this.form.third_modifications = list.third_modifications?list.third_modifications:""
               this.form.third_creator = list.third_creator
 
-              this.form.fourth_disinfection_water = list.third_disinfection_water
-              this.form.fourth_disinfection_methods = list.third_disinfection_methods
-              this.form.fourth_disinfection_time = list.third_disinfection_time
+              this.form.fourth_disinfection_water = list.third_disinfection_water?list.third_disinfection_water:""
+              this.form.fourth_disinfection_methods = list.third_disinfection_methods?list.third_disinfection_methods:""
+              this.form.fourth_disinfection_time = list.third_disinfection_time?list.third_disinfection_time:""
               this.form.fourth_start_time  =this.getTimeThree(list.third_start_time)
               this.form.fourth_end_time = this.getTimeThree(list.third_end_time)
-              this.form.fourth_total_time = list.third_total_time
+              this.form.fourth_total_time = list.third_total_time? list.third_total_time:""
               this.form.fourth_is_check = list.third_is_check.toString()
-              this.form.fourth_modifications = list.third_modifications
+              this.form.fourth_modifications = list.third_modifications?list.third_modifications:""
               this.form.fourth_creator = list.third_creator
 
               this.form.last_start_time = this.getTimeThree(list.last_start_time)
               this.form.last_end_time = this.getTimeThree(list.last_end_time)
-              this.form.last_total_time = list.last_total_time
+              this.form.last_total_time = list.last_total_time?list.last_total_time:""
               this.form.last_is_check = list.last_is_check.toString()
-              this.form.last_modifications = list.last_modifications
+              this.form.last_modifications = list.last_modifications?list.last_modifications:""
               this.form.last_creator = list.last_creator
-              this.form.last_disinfection_water = list.last_disinfection_water
-              this.form.last_disinfection_methods = list.last_disinfection_methods
-              this.form.last_disinfection_time = list.last_disinfection_time
+              this.form.last_disinfection_water = list.last_disinfection_water?list.last_disinfection_water:""
+              this.form.last_disinfection_methods = list.last_disinfection_methods?list.last_disinfection_methods:""
+              this.form.last_disinfection_time = list.last_disinfection_time?list.last_disinfection_time:""
               this.editDialogFormVisible = true
             }
           })
@@ -1067,11 +1126,66 @@
         updateObjectTableDisinfect(formName){
           this.$refs[formName].validate((valid=>{
             if(valid){
-                this.form.first_is_check = parseInt(this.form.first_is_check) 
-                this.form.sencond_is_check = parseInt(this.form.sencond_is_check) 
-                this.form.third_is_check = parseInt(this.form.third_is_check)
-                this.form.fourth_is_check = parseInt(this.form.fourth_is_check)
-                this.form.last_is_check = parseInt(this.form.last_is_check)
+                if(this.form.first_is_check!=""){
+                  this.form.first_is_check = parseInt(this.form.first_is_check) 
+                }else{
+                    this.form.first_is_check=0
+                }
+
+                if(this.form.sencond_is_check!=""){
+                  this.form.sencond_is_check = parseInt(this.form.sencond_is_check) 
+                }else{
+                    this.form.sencond_is_check=0  
+                }
+
+                if(this.form.third_is_check!=""){
+                  this.form.third_is_check = parseInt(this.form.third_is_check)
+                }else{
+                    this.form.third_is_check = 0
+                }
+                
+                if(this.form.fourth_is_check!=""){
+                  this.form.fourth_is_check = parseInt(this.form.fourth_is_check)
+                }else{
+                    this.form.fourth_is_check =0  
+                }
+
+                if(this.form.last_is_check!=""){
+                    this.form.last_is_check = parseInt(this.form.last_is_check)
+                }else{
+                    this.form.last_is_check = 0
+                }
+
+
+                if(this.form.first_modifications!=""){
+                  this.form.first_modifications = parseInt(this.form.first_modifications) 
+                }else{
+                    this.form.first_modifications=0
+                }
+
+                if(this.form.sencond_modifications!=""){
+                  this.form.sencond_modifications = parseInt(this.form.sencond_modifications) 
+                }else{
+                    this.form.sencond_modifications=0  
+                }
+
+                if(this.form.third_modifications!=""){
+                  this.form.third_modifications = parseInt(this.form.third_modifications)
+                }else{
+                    this.form.third_modifications = 0
+                }
+                
+                if(this.form.fourth_modifications!=""){
+                  this.form.fourth_modifications = parseInt(this.form.fourth_modifications)
+                }else{
+                    this.form.fourth_modifications =0  
+                }
+
+                if(this.form.last_modifications!=""){
+                    this.form.last_modifications = parseInt(this.form.last_modifications)
+                }else{
+                    this.form.last_modifications = 0
+                }
                 console.log("hhahdhfhahdf",this.form)
                 updateObjectTableDisinfect(this.form).then(response=>{
                  if(response.data.state == 1){

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;