新分支

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){