4月26日杨青

src/router/modules/patient.js

@@ -205,7 +205,7 @@ export default {
     }
   },
   {
-    path: '/course/print',
+    path: '/course/print',//coursePrint
     component: () => import('@/xt_pages/user/coursePrint'),
     hidden: true,
     is_menu: false,
@@ -215,6 +215,17 @@ export default {
       noCache: true
     }
   },
+  {
+    path: '/physique/print',//coursePrint
+    component: () => import('@/xt_pages/user/physiqueprinting'),
+    hidden: true,
+    is_menu: false,
+    name: 'physiquePrinting',
+    meta: {
+      title: 'physiquePrinting',
+      noCache: true
+    }
+  },
   {
     path: '/patient/patient/templateSummary/print',
     component: () => import('@/xt_pages/user/templateSummaryPrint'),

src/xt_pages/device/airDisinfectTwo.vue

@@ -44,7 +44,7 @@
                 </el-table-column>
                 <el-table-column prop="fenopda" label="透析室" align="center" min-width="70">
                     <template slot-scope="scope">
-                      {{ getTimeTwo(scope.row.first_start_time)}} - {{ getTimeTwo(scope.row.first_end_time) }}
+                      {{getTimeTwo(scope.row.first_start_time)}} - {{ getTimeTwo(scope.row.first_end_time) }}
                     </template>
                 </el-table-column>
                 <el-table-column prop="dwaiod" label="累计时间" align="center" min-width="50">
@@ -152,7 +152,7 @@
                       <el-input v-model="form.first_disinfection_methods"></el-input>
                   </el-form-item>
                   <el-form-item label="消毒时间(h)" label-width="110px">
-                      <el-input v-model="form.first_disinfection_time " ></el-input>
+                      <el-input v-model="form.first_disinfection_time " :disabled="true"></el-input>
                   </el-form-item>
                   <el-form-item label="开始时间" label-width="110px">
                     <el-date-picker
@@ -161,6 +161,7 @@
                         value-format="yyyy-MM-dd HH:mm"
                         placeholder="选择时间"
                         v-model="form.first_start_time"
+                        @change="firststartime"
                         style="width:100%;"
                     ></el-date-picker>
                   </el-form-item>
@@ -171,6 +172,7 @@
                         value-format="yyyy-MM-dd HH:mm"
                         placeholder="选择时间"
                         v-model="form.first_end_time"
+                        @change="firstendtime"
                         style="width:100%;"
                      ></el-date-picker>
                   </el-form-item>
@@ -204,7 +206,6 @@
                       </el-select>
                   </el-form-item>
 
-
                   <div class="form_title"><span >治疗室</span></div>
                   <el-form-item label="消毒液" label-width="110px">
                       <el-input v-model="form.sencond_disinfection_water"></el-input>
@@ -213,7 +214,7 @@
                       <el-input v-model="form.sencond_disinfection_methods"></el-input>
                   </el-form-item>
                   <el-form-item label="消毒时间(h)" label-width="110px">
-                      <el-input v-model="form.sencond_disinfection_time " ></el-input>
+                      <el-input v-model="form.sencond_disinfection_time " :disabled="true"></el-input>
                   </el-form-item>
                   <el-form-item label="开始时间" label-width="110px">
                     <el-date-picker
@@ -222,6 +223,7 @@
                         value-format="yyyy-MM-dd HH:mm"
                         placeholder="选择时间"
                         v-model="form.sencond_start_time"
+                        @change="sencondstarttime"
                         style="width:100%;"
                     ></el-date-picker>
                   </el-form-item>
@@ -232,6 +234,7 @@
                         value-format="yyyy-MM-dd HH:mm"
                         placeholder="选择时间"
                         v-model="form.sencond_end_time"
+                        @change="sencondendtime"
                         style="width:100%;"
                     ></el-date-picker>
                   </el-form-item>
@@ -274,7 +277,7 @@
                       <el-input v-model="form.third_disinfection_methods"></el-input>
                   </el-form-item>
                   <el-form-item label="消毒时间(h)" label-width="110px">
-                      <el-input v-model="form.third_disinfection_time " ></el-input>
+                      <el-input v-model="form.third_disinfection_time " :disabled="true"></el-input>
                   </el-form-item>
                   <el-form-item label="开始时间"  label-width="110px">
                     <el-date-picker
@@ -283,6 +286,7 @@
                         value-format="yyyy-MM-dd HH:mm"
                         placeholder="选择时间"
                         v-model="form.third_start_time"
+                        @change="thirdstarttime"
                         style="width:100%;"
                     ></el-date-picker>
                   </el-form-item>
@@ -293,6 +297,7 @@
                         value-format="yyyy-MM-dd HH:mm"
                         placeholder="选择时间"
                         v-model="form.third_end_time"
+                        @change="thirdendtime"
                         style="width:100%;"
                     ></el-date-picker>
                   </el-form-item>
@@ -410,7 +415,7 @@
                       <el-input v-model="form.first_disinfection_methods"></el-input>
                   </el-form-item>
                   <el-form-item label="消毒时间(h)" label-width="110px">
-                      <el-input v-model="form.first_disinfection_time " ></el-input>
+                      <el-input v-model="form.first_disinfection_time " :disabled="true"></el-input>
                   </el-form-item>
                   <el-form-item label="开始时间" label-width="110px">
                     <el-date-picker
@@ -419,6 +424,7 @@
                         value-format="yyyy-MM-dd HH:mm"
                         placeholder="选择时间"
                         v-model="form.first_start_time"
+                        @change="firststartime"
                         style="width:100%;"
                     ></el-date-picker>
                   </el-form-item>
@@ -429,6 +435,7 @@
                         value-format="yyyy-MM-dd HH:mm"
                         placeholder="选择时间"
                         v-model="form.first_end_time"
+                        @change="firstendtime"
                         style="width:100%;"
                     ></el-date-picker>
                   </el-form-item>
@@ -461,6 +468,7 @@
                           </el-option>
                       </el-select>
                   </el-form-item>
+
                   <div class="form_title"><span >治疗室</span></div>
                   <el-form-item label="消毒液" label-width="110px">
                       <el-input v-model="form.sencond_disinfection_water"></el-input>
@@ -469,7 +477,7 @@
                       <el-input v-model="form.sencond_disinfection_methods"></el-input>
                   </el-form-item>
                   <el-form-item label="消毒时间(h)" label-width="110px">
-                      <el-input v-model="form.sencond_disinfection_time " ></el-input>
+                      <el-input v-model="form.sencond_disinfection_time " :disabled="true"></el-input>
                   </el-form-item>
                   <el-form-item label="开始时间" required label-width="110px">
                     <el-date-picker
@@ -478,6 +486,7 @@
                         value-format="yyyy-MM-dd HH:mm"
                         placeholder="选择时间"
                         v-model="form.sencond_start_time"
+                        @change="sencondstarttime"
                         style="width:100%;"
                     ></el-date-picker>
                   </el-form-item>
@@ -488,6 +497,7 @@
                         value-format="yyyy-MM-dd HH:mm"
                         placeholder="选择时间"
                         v-model="form.sencond_end_time"
+                        @change="sencondendtime"
                         style="width:100%;"
                     ></el-date-picker>
                   </el-form-item>
@@ -528,7 +538,7 @@
                       <el-input v-model="form.third_disinfection_methods"></el-input>
                   </el-form-item>
                   <el-form-item label="消毒时间(h)" label-width="110px">
-                      <el-input v-model="form.third_disinfection_time " ></el-input>
+                      <el-input v-model="form.third_disinfection_time " :disabled="true"></el-input>
                   </el-form-item>
                   <el-form-item label="开始时间"  label-width="110px">
                     <el-date-picker
@@ -537,6 +547,7 @@
                         value-format="yyyy-MM-dd HH:mm"
                         placeholder="选择时间"
                         v-model="form.third_start_time"
+                        @change="thirdstarttime"
                         style="width:100%;"
                     ></el-date-picker>
                   </el-form-item>
@@ -547,6 +558,7 @@
                         value-format="yyyy-MM-dd HH:mm"
                         placeholder="选择时间"
                         v-model="form.third_end_time"
+                         @change="thirdendtime"
                         style="width:100%;"
                     ></el-date-picker>
                   </el-form-item>
@@ -579,6 +591,7 @@
                           </el-option>
                       </el-select>
                   </el-form-item>
+
                   <div class="form_title"><span >通风</span></div>
                   <el-form-item label="开始时间"  label-width="110px">
                     <el-date-picker
@@ -720,7 +733,7 @@
             record_date:moment(new Date()).add('year',0).format("YYYY-MM-DD"), //创建日期
             first_disinfection_water:"",// 消毒液
             first_disinfection_methods:"",//消毒方式
-            first_disinfection_time:"",//消毒时长
+            first_disinfection_time:'',//消毒时长
             first_start_time:moment(new Date()).format('YYYY-MM-DD HH:mm:ss'),//开始时间
             first_end_time:moment(new Date()).format('YYYY-MM-DD HH:mm:ss'),//结束时间
             first_total_time:"",//累计时间
@@ -740,7 +753,7 @@
 
             third_disinfection_water:"",// 消毒液
             third_disinfection_methods:"",//消毒方式
-            third_disinfection_time:"",//消毒时长
+            third_disinfection_time:'',//消毒时长
             third_start_time:moment(new Date()).format('YYYY-MM-DD HH:mm:ss'),//开始时间
             third_end_time:moment(new Date()).format('YYYY-MM-DD HH:mm:ss'),//结束时间
             third_total_time:"",//累计时间
@@ -770,12 +783,46 @@
          total:0,
          tableData: [],
          hiddenShow:false,
+         firststart:'',
+         firstend:'',
         }
       },
       created(){
         console.log("00000000000000000",this.$store.getters.xt_user.user.id)
         this.getAllDoctorList()
         this.getNewAirDisinfectList()
+        var time=moment(this.form.first_start_time).format("HH:mm"); 
+        console.log('sdfgsdfsdsddf',time,this.form.first_start_time);
+       
+      },
+      computed:{
+        firstdisinfection_time (){
+            let firststart= Date.parse(new Date(this.form.first_start_time))
+            console.log('开始时间',firststart);
+            let firstend= Date.parse(new Date(this.form.first_end_time))
+            console.log('结束时间',firstend);
+            let time_interval = ((firstend - firststart)/(60*60*1000)).toFixed(1)
+            console.log('结束时间',((firstend - firststart)/(60*60*1000)).toFixed(1));
+            return time_interval
+        },
+        senconddisinfection_time (){
+            const sencondstart= Date.parse(new Date(this.form.sencond_start_time))
+            console.log('开始时间',sencondstart);
+            const sencondend= Date.parse(new Date(this.form.sencond_end_time))
+            console.log('结束时间',sencondstart);
+            const time_interval = ((sencondend - sencondstart)/(60*60*1000)).toFixed(1)
+            console.log('结束时间',time_interval);
+            return time_interval
+        },
+        thirddisinfection_time (){
+            const thirdstart= Date.parse(new Date(this.form.third_start_time))
+            console.log('开始时间',thirdstart);
+            const thirdend= Date.parse(new Date(this.form.third_end_time))
+            console.log('结束时间',thirdend);
+            const time_interval = ((thirdend - thirdstart)/(60*60*1000)).toFixed(1)
+            console.log('结束时间',time_interval);
+            return time_interval
+        }
       },
       methods:{
       handleSizeChange(val) {
@@ -787,7 +834,6 @@
         this.getNewAirDisinfectList()
       },
         changeStartime(val){
-          
           this.getNewAirDisinfectList()
         },
         changeEndtime(){
@@ -851,10 +897,6 @@
                 }else{
                     this.form.last_modifications= 0
                 }
-            
-            
-            
-              
               console.log("this232322323",this.form)
               saveNewAirDisinfect(this.form).then(response=>{
                  if(response.data.state == 1 ){
@@ -862,11 +904,13 @@
                    this.$message.success("保存成功！")
                    this.dialogFormVisible = false
                    this.getNewAirDisinfectList()
+                   this.$refs[formName].resetFields();
                  }
               })
             }
+            
           })
-
+         
         },
         getNewAirDisinfectList(){
              var params = {
@@ -1004,11 +1048,13 @@
                   var disinfect =  response.data.data.disinfect
                   this.editDialogFormVisible = false
                   this.getNewAirDisinfectList()
+                  this.$refs[formName].resetFields()
                 }
              })
             }
            
          })
+         
        },
        handleDelete(id){
          deleteNewAirDisInfect(id).then(response=>{
@@ -1036,8 +1082,33 @@
                 scanStyles: false
               });
             }, 1);
-         },
-      }
+        },
+        firststartime(val){
+            this.form.first_start_time = val
+            this.form.first_disinfection_time = this.firstdisinfection_time
+        },
+        firstendtime(val){
+            this.form.first_disinfection_time = this.firstdisinfection_time
+            this.form.first_end_time = val   
+        },
+        sencondstarttime(val){
+            this.form.sencond_start_time = val
+            this.form.sencond_disinfection_time = this.senconddisinfection_time
+        },
+         sencondendtime(val){
+            this.form.sencond_end_time = val
+            this.form.sencond_disinfection_time = this.senconddisinfection_time
+        },
+        thirdstarttime(val){
+            this.form.third_start_time = val
+            this.form.third_disinfection_time = this.thirddisinfection_time
+        },
+        thirdendtime(val){
+            this.form.third_end_time = val
+            this.form.third_disinfection_time = this.thirddisinfection_time
+        },
+      },
+    
     }
   </script>
 

src/xt_pages/device/objectTableDisinfectTwo.vue

@@ -142,7 +142,7 @@
                       <el-input v-model="form.first_disinfection_water"></el-input>
                   </el-form-item>
                   <el-form-item label="消毒时间(h)" label-width="110px">
-                      <el-input v-model="form.first_disinfection_time " ></el-input>
+                      <el-input v-model="form.first_disinfection_time " :disabled="true"></el-input>
                   </el-form-item>
                   <el-form-item label="开始时间" label-width="110px">
                     <el-date-picker
@@ -151,6 +151,7 @@
                         value-format="yyyy-MM-dd HH:mm"
                         placeholder="选择时间"
                         v-model="form.first_start_time"
+                        @change="firststartime"
                         style="width:100%;"
                     ></el-date-picker>
                   </el-form-item>
@@ -161,6 +162,7 @@
                         value-format="yyyy-MM-dd HH:mm"
                         placeholder="选择时间"
                         v-model="form.first_end_time"
+                        @change="firstendtime"
                         style="width:100%;"
                     ></el-date-picker>
                   </el-form-item>
@@ -202,7 +204,7 @@
                       <el-input v-model="form.sencond_disinfection_water"></el-input>
                   </el-form-item>
                   <el-form-item label="消毒时间(h)" label-width="110px">
-                      <el-input v-model="form.sencond_disinfection_time " ></el-input>
+                      <el-input v-model="form.sencond_disinfection_time " :disabled="true"></el-input>
                   </el-form-item>
                   <el-form-item label="开始时间"  label-width="110px">
                     <el-date-picker
@@ -211,6 +213,7 @@
                         value-format="yyyy-MM-dd HH:mm"
                         placeholder="选择时间"
                         v-model="form.sencond_start_time"
+                        @change="sencondstarttime"
                         style="width:100%;"
                     ></el-date-picker>
                   </el-form-item> 
@@ -221,6 +224,7 @@
                         value-format="yyyy-MM-dd HH:mm"
                         placeholder="选择时间"
                         v-model="form.sencond_end_time"
+                        @change="sencondendtime"
                         style="width:100%;"
                     ></el-date-picker>
                   </el-form-item>
@@ -262,7 +266,7 @@
                       <el-input v-model="form.third_disinfection_water"></el-input>
                   </el-form-item>
                   <el-form-item label="消毒时间(h)" label-width="110px">
-                      <el-input v-model="form.third_disinfection_time " ></el-input>
+                      <el-input v-model="form.third_disinfection_time " :disabled="true"></el-input>
                   </el-form-item>
                   <el-form-item label="开始时间"  label-width="110px">
                     <el-date-picker
@@ -271,6 +275,7 @@
                         value-format="yyyy-MM-dd HH:mm"
                         placeholder="选择时间"
                         v-model="form.third_start_time"
+                        @change="thirdstarttime"
                         style="width:100%;"
                     ></el-date-picker>
                   </el-form-item>
@@ -281,6 +286,7 @@
                         value-format="yyyy-MM-dd HH:mm"
                         placeholder="选择时间"
                         v-model="form.third_end_time"
+                        @change="thirdendtime"
                         style="width:100%;"
                     ></el-date-picker>
                   </el-form-item>
@@ -322,7 +328,7 @@
                       <el-input v-model="form.fourth_disinfection_water"></el-input>
                   </el-form-item>
                   <el-form-item label="消毒时间(h)" label-width="110px">
-                      <el-input v-model="form.fourth_disinfection_time " ></el-input>
+                      <el-input v-model="form.fourth_disinfection_time " :disabled="true"></el-input>
                   </el-form-item>
                   <el-form-item label="开始时间"  label-width="110px">
                     <el-date-picker
@@ -331,6 +337,7 @@
                         value-format="yyyy-MM-dd HH:mm"
                         placeholder="选择时间"
                         v-model="form.fourth_start_time"
+                        @change="fourthstarttime"
                         style="width:100%;"
                     ></el-date-picker>
                   </el-form-item>
@@ -341,6 +348,7 @@
                         value-format="yyyy-MM-dd HH:mm"
                         placeholder="选择时间"
                         v-model="form.fourth_end_time"
+                        @change="fourthendtime"
                         style="width:100%;"
                     ></el-date-picker>
                   </el-form-item>
@@ -382,7 +390,7 @@
                       <el-input v-model="form.last_disinfection_water"></el-input>
                   </el-form-item>
                   <el-form-item label="消毒时间(h)" label-width="110px">
-                      <el-input v-model="form.last_disinfection_time " ></el-input>
+                      <el-input v-model="form.last_disinfection_time " :disabled="true"></el-input>
                   </el-form-item>
                   <el-form-item label="开始时间"  label-width="110px">
                     <el-date-picker
@@ -391,6 +399,7 @@
                         value-format="yyyy-MM-dd HH:mm"
                         placeholder="选择时间"
                         v-model="form.last_start_time"
+                        @change="laststarttime"
                         style="width:100%;"
                     ></el-date-picker>
                   </el-form-item>
@@ -401,6 +410,7 @@
                         value-format="yyyy-MM-dd HH:mm"
                         placeholder="选择时间"
                         v-model="form.last_end_time"
+                        @change="lastendtime"
                         style="width:100%;"
                     ></el-date-picker>
                   </el-form-item>
@@ -446,7 +456,7 @@
           width="1000px"
           title="编辑物表消毒表"
           :visible.sync="editDialogFormVisible">
-              <el-form :model="form" ref="form" class="airForm" :rules="airRules">
+          <el-form :model="form" ref="form" class="airForm" :rules="airRules">
                   <div style="width: 100%;">
                     <el-form-item label="创建日期" label-width="110px" required prop="record_date">
                         <el-date-picker
@@ -465,7 +475,7 @@
                       <el-input v-model="form.first_disinfection_water"></el-input>
                   </el-form-item>
                   <el-form-item label="消毒时间(h)" label-width="110px">
-                      <el-input v-model="form.first_disinfection_time " ></el-input>
+                      <el-input v-model="form.first_disinfection_time " :disabled="true"></el-input>
                   </el-form-item>
                   <el-form-item label="开始时间" label-width="110px">
                     <el-date-picker
@@ -474,6 +484,7 @@
                         value-format="yyyy-MM-dd HH:mm"
                         placeholder="选择时间"
                         v-model="form.first_start_time"
+                        @change="firststartime"
                         style="width:100%;"
                     ></el-date-picker>
                   </el-form-item>
@@ -484,6 +495,7 @@
                         value-format="yyyy-MM-dd HH:mm"
                         placeholder="选择时间"
                         v-model="form.first_end_time"
+                        @change="firstendtime"
                         style="width:100%;"
                     ></el-date-picker>
                   </el-form-item>
@@ -525,7 +537,7 @@
                       <el-input v-model="form.sencond_disinfection_water"></el-input>
                   </el-form-item>
                   <el-form-item label="消毒时间(h)" label-width="110px">
-                      <el-input v-model="form.sencond_disinfection_time " ></el-input>
+                      <el-input v-model="form.sencond_disinfection_time " :disabled="true"></el-input>
                   </el-form-item>
                   <el-form-item label="开始时间"  label-width="110px">
                     <el-date-picker
@@ -534,6 +546,7 @@
                         value-format="yyyy-MM-dd HH:mm"
                         placeholder="选择时间"
                         v-model="form.sencond_start_time"
+                        @change="sencondstarttime"
                         style="width:100%;"
                     ></el-date-picker>
                   </el-form-item> 
@@ -544,6 +557,7 @@
                         value-format="yyyy-MM-dd HH:mm"
                         placeholder="选择时间"
                         v-model="form.sencond_end_time"
+                        @change="sencondendtime"
                         style="width:100%;"
                     ></el-date-picker>
                   </el-form-item>
@@ -585,7 +599,7 @@
                       <el-input v-model="form.third_disinfection_water"></el-input>
                   </el-form-item>
                   <el-form-item label="消毒时间(h)" label-width="110px">
-                      <el-input v-model="form.third_disinfection_time " ></el-input>
+                      <el-input v-model="form.third_disinfection_time " :disabled="true"></el-input>
                   </el-form-item>
                   <el-form-item label="开始时间"  label-width="110px">
                     <el-date-picker
@@ -594,6 +608,7 @@
                         value-format="yyyy-MM-dd HH:mm"
                         placeholder="选择时间"
                         v-model="form.third_start_time"
+                        @change="thirdstarttime"
                         style="width:100%;"
                     ></el-date-picker>
                   </el-form-item>
@@ -604,6 +619,7 @@
                         value-format="yyyy-MM-dd HH:mm"
                         placeholder="选择时间"
                         v-model="form.third_end_time"
+                        @change="thirdendtime"
                         style="width:100%;"
                     ></el-date-picker>
                   </el-form-item>
@@ -645,7 +661,7 @@
                       <el-input v-model="form.fourth_disinfection_water"></el-input>
                   </el-form-item>
                   <el-form-item label="消毒时间(h)" label-width="110px">
-                      <el-input v-model="form.fourth_disinfection_time " ></el-input>
+                      <el-input v-model="form.fourth_disinfection_time " :disabled="true"></el-input>
                   </el-form-item>
                   <el-form-item label="开始时间"  label-width="110px">
                     <el-date-picker
@@ -654,6 +670,7 @@
                         value-format="yyyy-MM-dd HH:mm"
                         placeholder="选择时间"
                         v-model="form.fourth_start_time"
+                        @change="fourthstarttime"
                         style="width:100%;"
                     ></el-date-picker>
                   </el-form-item>
@@ -664,6 +681,7 @@
                         value-format="yyyy-MM-dd HH:mm"
                         placeholder="选择时间"
                         v-model="form.fourth_end_time"
+                        @change="fourthendtime"
                         style="width:100%;"
                     ></el-date-picker>
                   </el-form-item>
@@ -705,7 +723,7 @@
                       <el-input v-model="form.last_disinfection_water"></el-input>
                   </el-form-item>
                   <el-form-item label="消毒时间(h)" label-width="110px">
-                      <el-input v-model="form.last_disinfection_time " ></el-input>
+                      <el-input v-model="form.last_disinfection_time " :disabled="true"></el-input>
                   </el-form-item>
                   <el-form-item label="开始时间"  label-width="110px">
                     <el-date-picker
@@ -714,6 +732,7 @@
                         value-format="yyyy-MM-dd HH:mm"
                         placeholder="选择时间"
                         v-model="form.last_start_time"
+                        @change="laststarttime"
                         style="width:100%;"
                     ></el-date-picker>
                   </el-form-item>
@@ -724,6 +743,7 @@
                         value-format="yyyy-MM-dd HH:mm"
                         placeholder="选择时间"
                         v-model="form.last_end_time"
+                        @change="lastendtime"
                         style="width:100%;"
                     ></el-date-picker>
                   </el-form-item>
@@ -927,8 +947,42 @@
         this.getAllDoctorList()
         this.getObjectTableDisInfectList()
       },
+      computed:{
+        firstdisinfection_time (){
+            const firststart= Date.parse(new Date(this.form.first_start_time))
+            console.log('开始时间',firststart);
+            const firstend= Date.parse(new Date(this.form.first_end_time)) 
+            console.log('结束时间',firstend);
+            const time_interval = ((firstend - firststart)/(60*60*1000)).toFixed(1)
+            console.log('结束时间',time_interval,Math.floor((firstend - firststart)/(60*60*1000)).toFixed(1));           
+            return time_interval
+        },
+        senconddisinfection_time (){
+            const sencondstart= Date.parse(new Date(this.form.sencond_start_time))
+            const sencondend= Date.parse(new Date(this.form.sencond_end_time))
+            const time_interval = ((sencondend - sencondstart)/(60*60*1000)).toFixed(1)
+            return time_interval
+        },
+        thirddisinfection_time (){
+            const thirdstart= Date.parse(new Date(this.form.third_start_time))
+            const thirdend= Date.parse(new Date(this.form.third_end_time))
+            const time_interval = ((thirdend - thirdstart)/(60*60*1000)).toFixed(1)
+            return time_interval
+        },
+        fourthdisinfection_time (){
+            const fourthstart= Date.parse(new Date(this.form.fourth_start_time))
+            const fourthend= Date.parse(new Date(this.form.fourth_end_time))
+            const time_interval = ((fourthend - fourthstart)/(60*60*1000)).toFixed(1)
+            return time_interval
+        },
+        lastdisinfection_time (){
+            const laststart= Date.parse(new Date(this.form.last_start_time))
+            const lastend= Date.parse(new Date(this.form.last_end_time))
+            const time_interval = ((lastend - laststart)/(60*60*1000)).toFixed(1)
+            return time_interval
+        },
+      },
       methods:{
-    
       printCard() {
         this.hiddenShow = true;
         var ptime = Math.round(new Date().getTime() / 1000);
@@ -1207,7 +1261,46 @@
             }
           })
         },
-       
+        firststartime(val){
+            this.form.first_start_time = val
+            this.form.first_disinfection_time = this.firstdisinfection_time
+        },
+        firstendtime(val){
+            this.form.first_disinfection_time = this.firstdisinfection_time
+            this.form.first_end_time = val   
+        },
+        sencondstarttime(val){
+            this.form.sencond_start_time = val
+            this.form.sencond_disinfection_time = this.senconddisinfection_time
+        },
+         sencondendtime(val){
+            this.form.sencond_end_time = val
+            this.form.sencond_disinfection_time = this.senconddisinfection_time
+        },
+        thirdstarttime(val){
+            this.form.third_start_time = val
+            this.form.third_disinfection_time = this.thirddisinfection_time
+        },
+        thirdendtime(val){
+            this.form.third_end_time = val
+            this.form.third_disinfection_time = this.thirddisinfection_time
+        },
+        fourthstarttime(val){
+            this.form.fourth_start_time = val
+            this.form.fourth_disinfection_time = this.fourthdisinfection_time
+        },
+        fourthendtime(val){
+            this.form.fourth_end_time = val
+            this.form.fourth_disinfection_time = this.fourthdisinfection_time
+        },
+        laststarttime(val){
+            this.form.last_start_time = val
+            this.form.last_disinfection_time = this.lastdisinfection_time
+        },
+        lastendtime(val){
+            this.form.last_end_time = val
+            this.form.last_disinfection_time = this.lastdisinfection_time
+        }
         
       }
     }

src/xt_pages/dialysis/template/DialysisPrintOrderSixtyfour.vue

@@ -276,8 +276,8 @@
                   </div>
                 </td>
               </tr>
-              <tr>
-                <td colspan="3" style=" text-align: center;">
+              <tr style="border-bottom: none;">
+                <td colspan="3" style=" text-align: center; border-bottom: none;">
                   <span style="font-weight: bold;"
                     >治&nbsp;疗&nbsp;过&nbsp;程&nbsp;记&nbsp;录</span
                   >
@@ -285,34 +285,33 @@
               </tr>
               <tr>
                 <td colspan="3">
-                  <table
-                    style="border-collapse: collapse; width: 100%; text-align: center;"
+                  <table border="1" cellspacing="0" cellpadding="0"
+                    style=" width: 100%; text-align: center; border: none;"
                   >
-                    <!-- <thead> -->
-                      <tr style="border-bottom: 1px solid gray;">
-                        <td rowspan="2" style=" border-right: 1px solid gray;">时间</td>
-                        <td colspan="5" style=" border-right: 1px solid gray;">透析参数</td>
-                        <td colspan="3" style=" border-right: 1px solid gray;">生命体征</td>
-                        <td colspan="3" style=" border-right: 1px solid gray;">治疗中病情变化</td>
+                    <!-- border-bottom: 1px solid gray; border-right: 1px solid gray;-->
+                      <tr style="">
+                        <td rowspan="2" style=" ">时间</td>
+                        <td colspan="5" style=" ">透析参数</td>
+                        <td colspan="3" style=" ">生命体征</td>
+                        <td colspan="3" style=" ">治疗中病情变化</td>
                       </tr>
-                      <tr style="border-bottom: 1px solid gray;">
-                        <td style=" border-right: 1px solid gray;">TMP<br />mmHg</td>
-                        <td style=" border-right: 1px solid gray;">静脉压<br />mmHg</td>
-                        <td style=" border-right: 1px solid gray;">血流量<br />ml/min</td>
-                        <td style=" border-right: 1px solid gray;">脱水量<br />L</td>
-                        <td style=" border-right: 1px solid gray;">T<br />ºC</td>
-                        <td style=" border-right: 1px solid gray;">HR<br />bpm</td>
-                        <td style=" border-right: 1px solid gray;">R<br />bpm</td>
-                        <td style=" border-right: 1px solid gray;">BP<br />mmHg</td>
-                        <td style=" border-right: 1px solid gray;">时间</td>
-                        <td style=" border-right: 1px solid gray;">记录</td>
+                      <tr style="">
+                        <td style=" ">TMP<br />mmHg</td>
+                        <td style=" ">静脉压<br />mmHg</td>
+                        <td style=" ">血流量<br />ml/min</td>
+                        <td style="">脱水量<br />L</td>
+                        <td style=" ">T<br />ºC</td>
+                        <td style=" ">HR<br />bpm</td>
+                        <td style=" ">R<br />bpm</td>
+                        <td style=" ">BP<br />mmHg</td>
+                        <td style=" ">时间</td>
+                        <td style=" ">记录</td>
                         <td >护士签名</td>
                       </tr>
-                    <!-- </thead>
-                    <tbody> -->
-                      <tr style="border-bottom: 1px solid gray;" v-for="(monitor, monindex) in monitors" :key="monindex" >
-                        <td style=" border-right: 1px solid gray;"> {{ getTime(monitor.operate_time, "{h}:{i}") }}</td>
-                        <td style=" border-right: 1px solid gray;">
+                    
+                      <tr style="" v-for="(monitor, monindex) in monitors" :key="monindex" >
+                        <td style=" "> {{ getTime(monitor.operate_time, "{h}:{i}") }}</td>
+                        <td style=" ">
                             <span v-if="getTime(monitor.operate_time) != ''">
                             {{
                                 monitor.transmembrane_pressure
@@ -322,7 +321,7 @@
                             </span>
                         </td >
 
-                        <td style=" border-right: 1px solid gray;">
+                        <td style=" ">
                             <span v-if="getTime(monitor.operate_time) != ''">
                                 &nbsp;{{
                                     monitor.venous_pressure ? monitor.venous_pressure : ""
@@ -330,7 +329,7 @@
                             </span>
                         </td>
 
-                        <td style=" border-right: 1px solid gray;">
+                        <td style=" ">
                             <span v-if="getTime(monitor.operate_time) != ''">
                             {{
                                 monitor.blood_flow_volume
@@ -340,7 +339,7 @@
                             </span>
                         </td>
 
-                        <td style=" border-right: 1px solid gray;">
+                        <td style=" ">
                             <span v-if="getTime(monitor.operate_time) != ''&&monindex == 0 ">
                             {{'/'}}
                             </span>
@@ -350,13 +349,13 @@
                             <span v-else>{{monitor.ultrafiltration_volume? monitor.ultrafiltration_volume: ""}}</span>
                         </td>
 
-                        <td style=" border-right: 1px solid gray;">
+                        <td style=" ">
                             <span v-if="getTime(monitor.operate_time) != ''">
                                 {{ monitor.temperature ? monitor.temperature : "" }}
                             </span>
                         </td>
 
-                        <td style=" border-right: 1px solid gray;">
+                        <td style=" ">
                             <span v-if="getTime(monitor.operate_time) != ''">
                                 {{
                                   monitor.pulse_frequency ? monitor.pulse_frequency : ""
@@ -364,13 +363,13 @@
                             </span>
                         </td>
 
-                        <td style=" border-right: 1px solid gray;">
+                        <td style=" ">
                             <span v-if="getTime(monitor.operate_time) != ''">
                                 {{ monitor.breathing_rate ? monitor.breathing_rate : "" }}
                             </span>
                         </td>
 
-                        <td style=" border-right: 1px solid gray;">
+                        <td style=" ">
                             <span v-if="getTime(monitor.operate_time) != ''">
                                 {{
                                     monitor.systolic_blood_pressure
@@ -385,8 +384,8 @@
                             </span>
                         </td>
 
-                        <td style=" border-right: 1px solid gray;"> {{ getTime(monitor.operate_time, "{h}:{i}") }}</td>
-                        <td style=" border-right: 1px solid gray;">
+                        <td style=" "> {{ getTime(monitor.operate_time, "{h}:{i}") }}</td>
+                        <td style=" ">
                           <span style="word-break: break-all;word-wrap: break-word;">
 
                               {{ monitor.symptom }} &nbsp;{{ monitor.dispose }} &nbsp;{{monitor.result}}
@@ -424,151 +423,33 @@
                           />
                         </td>
                       </tr>
-                    <!-- </tbody> -->
+                    
                   </table>
                 </td>
               </tr>
-              <!-- <tr>
-                <td colspan="3">
-                  <table style="border-collapse: collapse; width: 100%;">
-                    <tr style="border-bottom: 1px solid gray;" v-for="(monitor, monindex) in monitors" :key="monindex" >
-                        <td style=" border-right: 1px solid gray;"> {{ getTime(monitor.operate_time, "{h}:{i}") }}</td>
-                        <td style=" border-right: 1px solid gray;">
-                            <span v-if="getTime(monitor.operate_time) != ''">
-                            {{
-                                monitor.transmembrane_pressure
-                                ? monitor.transmembrane_pressure
-                                : ""
-                            }}
-                            </span>
-                        </td >
-
-                        <td style=" border-right: 1px solid gray;">
-                            <span v-if="getTime(monitor.operate_time) != ''">
-                                &nbsp;{{
-                                    monitor.venous_pressure ? monitor.venous_pressure : ""
-                                }}
-                            </span>
-                        </td>
-
-                        <td style=" border-right: 1px solid gray;">
-                            <span v-if="getTime(monitor.operate_time) != ''">
-                            {{
-                                monitor.blood_flow_volume
-                                ? monitor.blood_flow_volume
-                                : ""
-                            }}
-                            </span>
-                        </td>
-
-                        <td style=" border-right: 1px solid gray;">
-                            <span v-if="getTime(monitor.operate_time) != ''&&monindex == 0 ">
-                            {{'/'}}
-                            </span>
-                            <span v-else-if="getTime(monitor.operate_time) != ''&&monindex == 0 ">
-                            {{monitor.ultrafiltration_volume? monitor.ultrafiltration_volume: ""}}
-                            </span>
-                            <span v-else>{{monitor.ultrafiltration_volume? monitor.ultrafiltration_volume: ""}}</span>
-                        </td>
-
-                        <td style=" border-right: 1px solid gray;">
-                            <span v-if="getTime(monitor.operate_time) != ''">
-                                {{ monitor.temperature ? monitor.temperature : "" }}
-                            </span>
-                        </td>
-
-                        <td style=" border-right: 1px solid gray;">
-                            <span v-if="getTime(monitor.operate_time) != ''">
-                                {{
-                                  monitor.pulse_frequency ? monitor.pulse_frequency : ""
-                                }}
-                            </span>
-                        </td>
-
-                        <td style=" border-right: 1px solid gray;">
-                            <span v-if="getTime(monitor.operate_time) != ''">
-                                {{ monitor.breathing_rate ? monitor.breathing_rate : "" }}
-                            </span>
-                        </td>
-
-                        <td style=" border-right: 1px solid gray;">
-                            <span v-if="getTime(monitor.operate_time) != ''">
-                                {{
-                                    monitor.systolic_blood_pressure
-                                    ? monitor.systolic_blood_pressure
-                                    : ""
-                                }}/{{
-                                    monitor.diastolic_blood_pressure
-                                    ? monitor.diastolic_blood_pressure
-                                    : ""
-                                }}
-
-                            </span>
-                        </td>
-
-                        <td style=" border-right: 1px solid gray;"> {{ getTime(monitor.operate_time, "{h}:{i}") }}</td>
-                        <td style=" border-right: 1px solid gray;">
-                          <span style="word-break: break-all;word-wrap: break-word;">
-
-                              {{ monitor.symptom }} &nbsp;{{ monitor.dispose }} &nbsp;{{monitor.result}}
-                          </span>
-                        </td>
-                        <td>
-                          <span v-if="
-                            setAdminUserES(
-                              dialysisOrder == null
-                                ? 0
-                                : dialysisOrder.start_nurse
-                            ) == ''
-                          "
-                          >{{
-                            getAdminUser(
-                              dialysisOrder == null
-                                ? 0
-                                : dialysisOrder.start_nurse
-                            )
-                          }}</span
-                          >
-                          <img
-                            class="es-img"
-                            style="height: 30px"
-                            :src="
-                              setAdminUserES(
-                                dialysisOrder == null
-                                  ? 0
-                                  : dialysisOrder.start_nurse
-                              )
-                            "
-                            alt=""
-                            srcset=""
-                            v-else
-                          />
-                        </td>
-                      </tr>
-                  </table>
-                </td>
-              </tr> -->
+             
               <tr>
                 <td colspan="3">
-
-                    <table  class="inside_table" style="text-align: center; border-collapse:collapse;">
+                    <table  class="inside_table" border="1" cellspacing="0" cellpadding="0"
+                    style="text-align: center; border-top: none;border-bottom: none;
+                        border-right: none;border-left: none; box-sizing: border-box;">
                       <tr>
-                      <td style="height: 20px;border-right: 1px solid gray;" width="110">
+                      <td style="height: 20px;" width="110">
                           <p style="height: 20px; line-height: 20px" >提交时间</p>
                       </td>
 
-                      <td style="height: 20px; border-right: 1px solid gray;" width="350">
+                      <td style="height: 20px; " width="350">
                           <p style="height: 20px; line-height: 20px">医嘱执行记录</p>
                       </td>
-                      <td style="height: 20px; border-right: 1px solid gray;" width="130">
+                      <td style="height: 20px; " width="130">
                           <p style="height: 20px; line-height: 20px">执行时间</p>
                       </td>
 
-                      <td style="height: 20px; border-right: 1px solid gray;" width="110">
+                      <td style="height: 20px; " width="110">
                           <p style="height: 20px; line-height: 20px">执行</p>
                       </td>
 
-                      <td style="height: 20px; border-right: 1px solid gray;" width="150">
+                      <td style="height: 20px; " width="150">
                           <p style="height: 20px; line-height: 20px">上次透后体重</p>
                       </td>
                       <td style="height: 20px;" width="110">
@@ -579,15 +460,17 @@
                     </table>
                 </td>
               </tr>
-              <tr v-for="(advice, advice_index) in advices" :key="advice_index">
+              <tr v-for="(advice, advice_index) in advices" :key="advice_index" >
                 <td colspan="3">
-                  <table class="inside_table"   cellspacing="0" cellpadding="0" style="text-align: center;">
-                    <tr >
-                      <td width="110" style="border-right: 1px solid gray;">
+                  <table class="inside_table"  border="1" cellspacing="0" cellpadding="0" 
+                        style="text-align: center; border-top: none;border-bottom: none;
+                        border-right: none;border-left: none; box-sizing: border-box;">
+                    <tr style="border-bottom:none;">
+                      <td width="110" style="">
                         {{ getTime(advice.start_time, "{h}:{i}") }}
                       </td>
 
-                      <td style="border-right: 1px solid gray; text-align: left; padding-left: 5px ; word-break: break-all;word-wrap: break-word;" width="350">
+                      <td style=" text-align: left; padding-left: 5px ; word-break: break-all;word-wrap: break-word; box-sizing: border-box;" width="350">
                         <span v-if="advice.parent_id > 0"></span>
                         <span>{{ advice.advice_name }}</span>
                         <span v-if="advice && advice.advice_desc">
@@ -608,10 +491,10 @@
                         <span>{{ advice.remark }}</span>
                       </td>
 
-                      <td width="130" style="border-right: 1px solid gray;">
+                      <td width="130" style="">
                         {{ getTime(advice.execution_time, "{y}-{m}-{d} {h}:{i}") }}
                       </td>
-                      <td width="110" style="border-right: 1px solid gray;">
+                      <td width="110" style="">
                         <span
                           v-if="setAdminUserES(advice.advice_doctor) == ''"
                         >
@@ -624,36 +507,28 @@
                           srcset=""
                         />
                       </td>
-
-                      <td v-if="advice_index === 0" width="150" style="border-right: 1px solid gray;">透前体重</td>
+                      <td v-if="advice_index === 0" width="150" style="">透前体重</td>
                       <td v-if="advice_index === 0" width="110" >
                         {{predialysis.weight_before.toFixed(2) }}kg
                       </td>
-                      <td v-if="advice_index === 1" width="150" style="border-right: 1px solid gray;">体重增加量</td>
+                      <td v-if="advice_index === 1" width="150" style="">体重增加量</td>
                       <td v-if="advice_index === 1" width="110">
                         {{
                           assessmentafter.weight_after == 0 ||
                           predialysis.weight_before == 0
-                            ? 0
+                            ? '0.00'
                             : (
                                 predialysis.weight_before -
                                 assessmentafter.weight_after
                               ).toFixed(2)
                         }}kg
                       </td>
-                      <td v-if="advice_index === 2" width="150" style="border-right: 1px solid gray;">干体重(DW)</td>
+                      <td v-if="advice_index === 2" width="150" style="">干体重(DW)</td>
                       <td v-if="advice_index === 2" width="110">
                         {{ predialysis.dry_weight.toFixed(2) }}kg
                       </td>
-                      <td v-if="advice_index === 3" width="150" style="border-right: 1px solid gray;">较干体重增加量</td>
+                      <td v-if="advice_index === 3" width="150" style="">较干体重增加量</td>
                       <td v-if="advice_index === 3" width="110">
-
-                        <!-- {{
-                          (
-                            afterdialysis.weight_after -
-                            predialysis.dry_weight
-                          ).toFixed(2)
-                        }}kg -->
                           {{
                             patientInfo.total_dialysis +
                             patientInfo.user_sys_before_count >
@@ -661,28 +536,27 @@
                             ? (
                                 afterdialysis.weight_after - predialysis.dry_weight
                               ).toFixed(2)
-                            : 0
+                            : '0.00'
                           }}kg
                       </td>
 
-                      <td v-if="advice_index === 4" width="150" style="border-right: 1px solid gray;">透后体重</td>
+                      <td v-if="advice_index === 4" width="150" style="">透后体重</td>
                       <td v-if="advice_index === 4" width="110">
-
                         {{ afterdialysis.weight_after.toFixed(2) }}kg
                       </td>
-                      <td v-if="advice_index === 5" width="150" style="border-right: 1px solid gray;">
+                      <td v-if="advice_index === 5" width="150" style="">
                         本次透析体重下降量
                       </td>
                       <td v-if="advice_index === 5" width="110">
                         {{
                           afterdialysis.weight_after == 0 || predialysis.weight_before == 0
-                            ? 0
+                            ? '0.00'
                             : (
                                 predialysis.weight_before - afterdialysis.weight_after
                               ).toFixed(2)
                         }}kg
                       </td>
-                      <td v-if="advice_index > 5" width="150" style="border-right: 1px solid gray;"></td>
+                      <td v-if="advice_index > 5" width="150" style=""></td>
                       <td v-if="advice_index > 5" width="110"></td>
                     </tr>
                   </table>

src/xt_pages/management/components/ManageForm.vue

@@ -851,8 +851,10 @@ export default {
     padding: 0;
   }
   .el-form-item__error {
-    margin-left: 60px;
+    //  margin-left: 60px; 
+    margin-left: 200px;
   }
+  
 }
 .el-checkbox {
   color: #606266;
@@ -866,3 +868,16 @@ export default {
   margin-right: 26px;
 }
 </style>
+<!-- <style lang="scss" scoped>
+#manage-form {
+  .el-form-item__label {
+    width: 100px;
+    padding: 0;
+  }
+  .el-form-item__error {
+     /* margin-left: 60px; */
+    margin-left: 200px;
+  }
+}
+  
+</style> -->

src/xt_pages/management/components/WaterFormList.vue

@@ -143,7 +143,7 @@
               </template>
          </el-table-column>
 
-         <el-table-column label="静谧过滤器(MPa)" align="center" min-width="110px">
+         <el-table-column label="精密过滤器(MPa)" align="center" min-width="110px">
               <template slot-scope="scope">
                 {{ scope.row.ultrafilter?scope.row.ultrafilter:"" }}
               </template>
@@ -590,7 +590,7 @@
                  :rowspan="2"
                   style="text-align:center;width:60px;font-size:15px"
                 >
-                  静谧过滤器（MPa）
+                  精密过滤器（MPa）
                 </td>
 
                 <td
@@ -1089,8 +1089,8 @@
         if(this.form.machine_status!=""){
           this.form.machine_status = parseInt(this.form.machine_status)
         }
-      
-       
+
+
         if(this.form.reverse_osmosis_membrane_disinfection == true){
            this.form.reverse_osmosis_membrane_disinfection = 1
         }
@@ -1106,9 +1106,9 @@
         if(this.form.water_conductivity!=""){
           this.form.water_conductivity = parseFloat(this.form.water_conductivity)== NaN ? 0:parseFloat(this.form.water_conductivity)
         }else{
-           this.form.water_conductivity = 0 
+           this.form.water_conductivity = 0
         }
-        
+
         if(this.form.water_pressure!=""){
           this.form.water_pressure = parseFloat(this.form.water_pressure) == NaN ? 0:parseFloat(this.form.water_pressure)
         }else{
@@ -1118,15 +1118,15 @@
         if(this.form.temperature!=""){
           this.form.temperature = parseFloat(this.form.temperature)== NaN ? 0:parseFloat(this.form.temperature)
         }else{
-          this.form.temperature = 0    
+          this.form.temperature = 0
         }
-        
+
         if(this.form.force_pump_status!=""){
           this.form.force_pump_status = parseFloat(this.form.force_pump_status) ==  NaN ? 0: parseFloat(this.form.force_pump_status)
         }else{
             this.form.force_pump_status = 0
         }
-        
+
         if(this.form.first_ro_membrane_water!=""){
           this.form.first_ro_membrane_water = parseFloat(this.form.first_ro_membrane_water) == NaN?0:parseFloat(this.form.first_ro_membrane_water)
         }else{
@@ -1138,11 +1138,11 @@
         }else{
           this.form.first_ro_film_thick_water = 0
         }
-        
+
         if(this.form.first_ro_membrane_effluent!=""){
-          this.form.first_ro_membrane_effluent =parseFloat(this.form.first_ro_membrane_effluent) == NaN?0:parseFloat(this.form.first_ro_membrane_effluent) 
+          this.form.first_ro_membrane_effluent =parseFloat(this.form.first_ro_membrane_effluent) == NaN?0:parseFloat(this.form.first_ro_membrane_effluent)
         }else{
-           this.form.first_ro_membrane_effluent = 0 
+           this.form.first_ro_membrane_effluent = 0
         }
 
         if(this.form.first_production_of_water_conductivity!=""){
@@ -1150,37 +1150,37 @@
         }else{
           this.form.first_production_of_water_conductivity = 0
         }
-        
+
         if(this.form.first_water_yield !=""){
-           this.form.first_water_yield = parseFloat(this.form.first_water_yield) == NaN?0:parseFloat(this.form.first_water_yield)  
+           this.form.first_water_yield = parseFloat(this.form.first_water_yield) == NaN?0:parseFloat(this.form.first_water_yield)
         }else{
             this.form.first_water_yield =0
         }
-       
+
         if(this.form.last_ro_membrane_water!=""){
-          this.form.last_ro_membrane_water = parseFloat(this.form.last_ro_membrane_water) ==NaN?0:parseFloat(this.form.last_ro_membrane_water)  
+          this.form.last_ro_membrane_water = parseFloat(this.form.last_ro_membrane_water) ==NaN?0:parseFloat(this.form.last_ro_membrane_water)
         }else{
           this.form.last_ro_membrane_water = 0
         }
-      
+
         if(this.form.last_ro_membrane_effluent!=""){
           this.form.last_ro_membrane_effluent = parseFloat(this.form.last_ro_membrane_effluent) == NaN?0:parseFloat(this.form.last_ro_membrane_effluent)
         }else{
           this.form.last_ro_membrane_effluent = 0
         }
-      
+
         if(this.form.last_ro_film_thick_water!=""){
             this.form.last_ro_film_thick_water = parseFloat(this.form.last_ro_film_thick_water) == NaN?0:parseFloat(this.form.last_ro_film_thick_water)
         }else{
           this.form.last_ro_film_thick_water = 0
         }
-   
+
         if( this.form.last_production_of_water_conductivity!=""){
             this.form.last_production_of_water_conductivity = parseFloat(this.form.last_production_of_water_conductivity) == NaN?0:parseFloat(this.form.last_production_of_water_conductivity)
         }else{
             this.form.last_production_of_water_conductivity =0
         }
-       
+
         if(this.form.last_water_yield!=""){
             this.form.last_water_yield = parseFloat(this.form.last_water_yield)==NaN?0: parseFloat(this.form.last_water_yield)
         }else{
@@ -1192,25 +1192,25 @@
         }else{
             this.form.carbon_tank = 0
         }
-        
+
         if( this.form.snd_tank!=""){
             this.form.snd_tank = parseFloat(this.form.snd_tank) == NaN?0:parseFloat(this.form.snd_tank)
         }else{
             this.form.snd_tank = 0
         }
-         
+
         if(this.form.resin_tank!=""){
             this.form.resin_tank= parseFloat(this.form.resin_tank) ==NaN?0:parseFloat(this.form.resin_tank)
         }else{
             this.form.resin_tank= 0
         }
-      
+
         if( this.form.ultrafilter!=""){
             this.form.ultrafilter = parseFloat(this.form.ultrafilter)== NaN?0:parseFloat(this.form.ultrafilter)
         }else{
           this.form.ultrafilter = 0
         }
-        
+
         if(this.form.hardness_monitoring !=""){
             this.form.hardness_monitoring = parseFloat(this.form.hardness_monitoring) ==NaN?0: parseFloat(this.form.hardness_monitoring)
         }else{
@@ -1222,7 +1222,7 @@
         }else{
             this.form.total_chlorine_detection = 0
         }
-        
+
         if( this.form.ph_detection!=""){
             this.form.ph_detection = parseFloat(this.form.ph_detection) == NaN?0:parseFloat(this.form.ph_detection)
         }else{
@@ -1230,7 +1230,7 @@
         }
 
         if(this.form.concentration_of_peroxyacetic_acid!="" ){
-            this.form.concentration_of_peroxyacetic_acid = parseFloat(this.form.concentration_of_peroxyacetic_acid) == NaN?0: parseFloat(this.form.concentration_of_peroxyacetic_acid)   
+            this.form.concentration_of_peroxyacetic_acid = parseFloat(this.form.concentration_of_peroxyacetic_acid) == NaN?0: parseFloat(this.form.concentration_of_peroxyacetic_acid)
         }else{
             this.form.concentration_of_peroxyacetic_acid = 0
         }
@@ -1246,26 +1246,26 @@
         }else{
             this.form.first_disinfection_method = 0
         }
-      
-       
+
+
         if(this.form.last_disinfection_method !=""){
            this.form.last_disinfection_method = parseFloat(this.form.last_disinfection_method) == NaN?0:parseFloat(this.form.last_disinfection_method)
         }else{
             this.form.last_disinfection_method = 0
         }
-       
+
         if(this.form.first_disinfection_time !=""){
           this.form.first_disinfection_time = parseFloat(this.form.first_disinfection_time) == NaN?0:parseFloat(this.form.first_disinfection_time)
         }else{
             this.form.first_disinfection_time = 0
         }
-        
+
         if( this.form.last_disinfection_time!=""){
             this.form.last_disinfection_time = parseFloat(this.form.last_disinfection_time) == NaN?0:parseFloat(this.form.last_disinfection_time)
         }else{
-            this.form.last_disinfection_time = 0  
+            this.form.last_disinfection_time = 0
         }
-      
+
         if(this.form.filter_replacement!=""){
             this.form.filter_replacement = parseFloat(this.form.filter_replacement) == NaN?0:parseFloat(this.form.filter_replacement)
         }else{
@@ -1277,13 +1277,13 @@
         }else{
             this.form.admin_user_id =0
         }
-        
+
         if(this.form.disinfection_of_water_pipeline !=""){
             this.form.disinfection_of_water_pipeline = parseFloat(this.form.disinfection_of_water_pipeline) == NaN?0:parseFloat(this.form.disinfection_of_water_pipeline)
         }else{
             this.form.disinfection_of_water_pipeline =0
         }
-      
+
          this.$refs[formName].validate((valid) => {
           if (valid) {
             UpdateDilaysisWater(this.form,this.equimentid).then(response=>{

src/xt_pages/management/home.vue

@@ -941,7 +941,7 @@
                        <div class="userbutton">
                           <el-button type="primary" @click="ToReminders">自动生成使用登记</el-button>
                        </div>
-                     <div v-show="UserShow">
+                     <div v-show="UserShow" class="new-registration">
                         <el-tabs type="border-card" v-model="activeNameThree" @tab-click="handleClick">
                           <el-tab-pane label="新增使用登记" name="first">
 
@@ -1379,7 +1379,7 @@
                    </el-tab-pane>
 
                    <el-tab-pane label="质量控制" name="fourth">
-                      <div v-show="zhiShow">
+                      <div v-show="zhiShow" class="new-registration">
                        <el-tabs type="border-card" v-model="activeNameSix" @tab-click="handleClick">
                          <el-tab-pane label="新增质量控制" name="first">
 
@@ -5410,7 +5410,7 @@ export default {
         // top:4px;
         // z-index: 9;
         margin-bottom: 10px;
-    margin-left: 90%;
+        margin-left: 90%;
       }
     }
     .disinfectOne{
@@ -5456,14 +5456,16 @@ export default {
   }
   .el-form-item__error {
     margin-left: 130px;
-    
   }
 
 </style>
 <style lang="scss">
-    .el-form-item__error {
-      left:103px !important;
+    .new-registration{
+      .el-form-item__error {
+        left:103px ;
+      }
     }
+    
    .a{
      margin-bottom: 10px;
       margin-top: 6px;

src/xt_pages/user/courseOfDisease.vue

@@ -1034,15 +1034,12 @@
         this.table_current_index = row.index
       },
       print(){
-        // if (this.table_current_index == -1) {
-        //   this.$message.error('请选择要打印的病程')
-        //   return
-        // }
         if(this.ids.length == 0){
           this.$message.error('请选择要打印的病程')
           return
         }
         this.$router.push({ path: "/course/print?ids="+this.ids+"&patient_id="+this.patient_id});
+        // this.$router.push({ path: "/physique/print?ids="+this.ids+"&patient_id="+this.patient_id});
       }
     }
   }

src/xt_pages/workforce/components/tableData.vue

@@ -74,7 +74,85 @@
       </div>
     </div>
 
-    <el-dialog :visible.sync="searchTableVisible" width="80%" class="eldialog">
+    <!-- <el-dialog :visible.sync="searchTableVisible" width="80%" class="eldialog">
+      <div style="position: relative;">
+        <el-table
+          :data="schedulePatients"
+          :header-cell-style="{
+            backgroundColor: 'rgb(245, 247, 250)',
+            color: '#606266'
+          }"
+          :row-style="{ color: '#303133' }"
+          style="width: 100%"
+          border
+        >
+          <el-table-column label="姓名" width="120">
+            <template slot-scope="scope">
+              {{ scope.row.patient }}
+            </template>
+          </el-table-column>
+          <el-table-column label="透析日期" width="200">
+            <template slot-scope="scope">
+              {{ getDialysisDate(scope.row) }}
+            </template>
+          </el-table-column>
+          <el-table-column label="分区">
+            <template slot-scope="scope">
+              {{ scope.row.zone.name }}
+            </template>
+          </el-table-column>
+          <el-table-column label="班次" width="80">
+            <template slot-scope="scope">
+              {{ getSchedulesType(scope.row.schedule_type,scope.row) }}
+            </template>
+          </el-table-column>
+          <el-table-column label="机号" width="80">
+            <template slot-scope="scope">
+              {{ scope.row.number.number }}
+            </template>
+          </el-table-column>
+          <el-table-column label="透析模式" width="100">
+            <template slot-scope="scope">
+              {{ scope.row.mode.name }}
+            </template>
+          </el-table-column>
+          <el-table-column label="操作" align="center" width="300">
+            <template slot-scope="scope">
+              <span v-if="now_time <=scope.row.schedule_date">
+                <el-button
+                size="mini"
+                type="primary"
+                @click="CancelSchedule(scope.row.id)"
+              >
+                取消排班
+              </el-button>
+              <el-button
+                size="mini"
+                type="primary"
+                @click="changeMachineNumber(scope.$index, scope.row)"
+              >
+                调整机号
+              </el-button>
+              <el-button
+                size="mini"
+                type="primary"
+                @click="changeMode(scope.$index, scope.row)"
+              >
+                调整模式
+              </el-button>
+              </span>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+    </el-dialog> -->
+
+    <el-dialog
+      title="提示"
+      :visible.sync="searchTableVisible"
+      width="80%"
+      
+      class="eldialog">
       <div style="position: relative;">
         <el-table
           :data="schedulePatients"
@@ -146,7 +224,7 @@
         </el-table>
       </div>
     </el-dialog>
-    
+
     <div class="center-tab">
       <el-table
         :row-style="{ color: '#303133' }"