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

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

                           }}
                         </div>
                       </div>
+
+                      <div class="inline_block" style="flex: 1" v-if="org_id ==0 || org_id ==10440">
+                        衣物重：
+                        <div
+                          class="under_line"
+                          style="width: 70px; text-align: center"
+                        >
+                          {{
+                            record.assessment_before_dislysis &&
+                            record.assessment_before_dislysis.additional_weight
+                              ? record.assessment_before_dislysis.additional_weight
+                              : "/"
+                          }}
+                        </div>
+                      </div>
                       <div
                         class="inline_block"
                         style="flex: 1"
                     </div>
 
                     <div
+                    
                       class="row"
                       style="padding: 2px 0; line-height: 23px; display: flex"
                     >
-                      <div class="inline_block" style="flex: 1">
+                      <div class="inline_block" style="flex: 1"
+                        v-if="org_id!=10440 && org_id !=0">
                         上次透后体重：
                         <div
                           class="under_line"
                           }}
                         </div>
                       </div>
+                    </div>
+                     <div
+                     v-if="org_id ==0 || org_id ==10440"
+                      class="row"
+                      style="padding: 2px 0; line-height: 23px; display: flex"
+                    >
+                      <div
+                        class="inline_block"
+                        style="flex: 1; display: inline-block"
+                      >
+                        衣物重：
+                        <div
+                          class="under_line"
+                          style="
+                            width: 100px;
+                            line-height: 25px;
+                            text-align: left;
+                            margin-left: 2px;
+                            display: inline-block;
+                            white-space: normal;
+                          "
+                        >
+                          {{
+                            record.assessment_after_dislysis && record.assessment_after_dislysis.additional_weight
+                              ? record.assessment_after_dislysis.additional_weight
+                              : "/"
+                          }}
+                        </div>
+                      </div>
                     </div>
                     <div
                       class="row"

src/xt_pages/dialysis/details/dialog/monitor_dialog.vue

                 template_id == 56 ||
                 template_id == 60 ||
                 org_id == 10210 ||
-                org_id == 9555 || org_id == 10387
+                org_id == 9555 
                 || org_id == 10432
                 || org_id == 10445
-                || org_id == 10410)
+                || org_id == 10410) &&
+                org_id!=10387
             "
           >
             <template slot-scope="scope">
             width="110"
             v-if="
               isShow('超滤量') &&
-              template_id != 6 &&
+              (template_id != 6 &&
               template_id != 9 &&
               template_id != 10 &&
               template_id != 11 &&
               template_id != 56 &&
               template_id != 60 &&
               org_id!= 10210 &&
-              org_id != 9555 && org_id!=10387
+              org_id != 9555 
               && org_id!=10432 && org_id!=10445
-              && org_id!=10410
+              && org_id!=10410)
+              || org_id == 10387
             "
           >
             <template slot-scope="scope">
                 org_id == 10432 ||
                 org_id == 10445 ||
                 org_id == 10410)
+                && org_id!=10387
             "
           >
             <template slot-scope="scope">
             width="100"
             v-if="
               isShow('超滤率') &&
-              template_id != 6 &&
+              (template_id != 6 &&
               template_id != 10 &&
               template_id != 11 &&
               template_id != 12 &&
               template_id != 60 &&
               org_id!=10432 &&
               org_id!=10445 &&
-              org_id!=10410
+              org_id!=10410) || 
+              org_id == 10387
             "
           >
             <template slot-scope="scope">
                 template_id == 60 ||
                 org_id== 10432 || 
                 org_id== 10445 ||
-                org_id== 10410)
+                org_id== 10410) &&
+                org_id!=10387
             "
           >
             <el-form-item label="超滤率(ml/h)" :prop="isName('超滤率')"
             :span="8"
             v-if="
               isShow('超滤率') &&
-              template_id != 6 &&
+              (template_id != 6 &&
               template_id != 10 &&
               template_id != 11 &&
               template_id != 12 &&
               template_id != 60 &&
               org_id!=10432 && 
               org_id!=10445 &&
-              org_id!=10410
+              org_id!=10410)
+              || org_id == 10387
             "
           >
             <el-form-item label="超滤率(L/h)" :prop="isName('超滤率')"
                 org_id == 10210 ||
                 org_id == 9555 ||
                 org_id == 10340 ||
-                org_id == 10387 ||
                 org_id == 10432 ||
                 org_id == 10445 ||
-                org_id == 10410)
+                org_id == 10410) 
+                && org_id!=10387
             "
           >
             <el-form-item label="超滤量(ml)：" :prop="isName('超滤量')"
             :span="8"
             v-if="
               isShow('超滤量') &&
-              template_id != 6 &&
+              (template_id != 6 &&
               template_id != 9 &&
               template_id != 10 &&
               template_id != 11 &&
               org_id !=  10210 &&
               org_id !=  10340 &&
               org_id != 9555 &&
-              org_id!=10387&&
               org_id!=10432 && 
               org_id!=10445 && 
-              org_id!=10410
+              org_id!=10410)
+              || org_id == 10387
             "
           >
             <el-form-item label="超滤量(L)：" :prop="isName('超滤量')"

src/xt_pages/dialysis/details/dialysisMonitoring.vue

           <th width="76px">静脉压/动脉压({{monitores[0]&&monitores[0]['venous_pressure_type'] == 2 ? 'kpa' : 'mmHg'}})</th>
           <th v-if="isShow('血流量')" width="92px">血流量(ml/min)</th>
           <th v-if="isShow('跨膜压')" width="76px">跨膜压({{monitores[0]&&monitores[0]['transmembrane_pressure_type'] == 2 ? 'kpa' : 'mmHg'}})</th>
-          <th v-if=" isShow('超滤量') &&(template_id == 6 || template_id == 9 || template_id == 10 || template_id == 11 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 27 || template_id == 28 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 32 || template_id == 34 || template_id == 35 || template_id == 36 || template_id == 38 || template_id == 39 || template_id == 40  || template_id == 41 || template_id == 43 || template_id == 44 || template_id == 46 || template_id == 47 || template_id == 48 || this.$store.getters.xt_user.template_info.org_id == 9555 || template_id == 53 || template_id == 54 || template_id == 56 || template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 10340  || this.$store.getters.xt_user.template_info.org_id == 10387 || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id == 10445 || this.$store.getters.xt_user.template_info.org_id == 10410)" width="76px" > 超滤量(ml)</th>
-          <th v-if=" isShow('超滤量') && template_id != 6 && template_id != 9 && template_id != 10 && template_id != 11 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19 && template_id != 20 && template_id != 21 && template_id != 22 && template_id != 23 && template_id != 24 && template_id != 26 && template_id !=27 && template_id!=28 && template_id!=29 && template_id!=30 && template_id!=31 && template_id!=32 && template_id!=34 && template_id!=35 && template_id!=36 && template_id!=38 && template_id != 39 && template_id != 40  && template_id != 41 && template_id != 43 && template_id != 44 && template_id != 46  && template_id != 47 && template_id != 48 && template_id != 53  && template_id != 54  && template_id != 56  && template_id != 60 && this.$store.getters.xt_user.template_info.org_id != 9555 &&  this.$store.getters.xt_user.template_info.org_id != 10340 && this.$store.getters.xt_user.template_info.org_id!=10387 && this.$store.getters.xt_user.template_info.org_id!=10432  && this.$store.getters.xt_user.template_info.org_id!=10445 && this.$store.getters.xt_user.template_info.org_id!=10410"  width="76px"> 超滤量(L) </th>
-          <th v-if="isShow('超滤率') && (template_id ==6 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 34 || template_id == 35 || template_id == 38 || template_id == 41 || template_id == 43 || template_id == 44 || template_id == 46 || template_id == 47  || template_id == 48  || template_id == 53 || template_id == 54 || template_id == 56  || template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id == 10445 || this.$store.getters.xt_user.template_info.org_id == 10410)" width="50px"> 超滤率 <br />(ml/h) </th>
-          <th v-if="isShow('超滤率') && template_id !=6 && template_id !=10 && template_id !=11 && template_id !=12 && template_id !=13 && template_id !=17 && template_id !=18 && template_id !=19 && template_id !=20 && template_id !=21 && template_id !=22 && template_id !=23 && template_id !=24 && template_id !=26 && template_id !=29 && template_id !=30 && template_id !=31 && template_id !=34 && template_id !=35 && template_id !=38  && template_id !=41 && template_id !=43 && template_id !=44 && template_id !=46 && template_id !=47 &&  template_id !=48 &&  template_id !=53 &&  template_id !=54 &&  template_id !=56 &&  template_id !=60 && this.$store.getters.xt_user.template_info.org_id!=10432  && this.$store.getters.xt_user.template_info.org_id!=10445 && this.$store.getters.xt_user.template_info.org_id!=10410" width="50px"> 超滤率 <br />(L/h) </th>
+          <th v-if=" isShow('超滤量') &&(template_id == 6 || template_id == 9 || template_id == 10 || template_id == 11 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 27 || template_id == 28 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 32 || template_id == 34 || template_id == 35 || template_id == 36 || template_id == 38 || template_id == 39 || template_id == 40  || template_id == 41 || template_id == 43 || template_id == 44 || template_id == 46 || template_id == 47 || template_id == 48 || this.$store.getters.xt_user.template_info.org_id == 9555 || template_id == 53 || template_id == 54 || template_id == 56 || template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 10340  || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id == 10445 || this.$store.getters.xt_user.template_info.org_id == 10410) &&this.$store.getters.xt_user.template_info.org_id!=10387 " width="76px" > 超滤量(ml)</th>
+          <th v-if=" isShow('超滤量') && (template_id != 6 && template_id != 9 && template_id != 10 && template_id != 11 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19 && template_id != 20 && template_id != 21 && template_id != 22 && template_id != 23 && template_id != 24 && template_id != 26 && template_id !=27 && template_id!=28 && template_id!=29 && template_id!=30 && template_id!=31 && template_id!=32 && template_id!=34 && template_id!=35 && template_id!=36 && template_id!=38 && template_id != 39 && template_id != 40  && template_id != 41 && template_id != 43 && template_id != 44 && template_id != 46  && template_id != 47 && template_id != 48 && template_id != 53  && template_id != 54  && template_id != 56  && template_id != 60 && this.$store.getters.xt_user.template_info.org_id != 9555 &&  this.$store.getters.xt_user.template_info.org_id != 10340 && this.$store.getters.xt_user.template_info.org_id!=10432  && this.$store.getters.xt_user.template_info.org_id!=10445 && this.$store.getters.xt_user.template_info.org_id!=10410) || this.$store.getters.xt_user.template_info.org_id == 10387"  width="76px"> 超滤量(L) </th>
+          <th v-if="isShow('超滤率') && (template_id ==6 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 34 || template_id == 35 || template_id == 38 || template_id == 41 || template_id == 43 || template_id == 44 || template_id == 46 || template_id == 47  || template_id == 48  || template_id == 53 || template_id == 54 || template_id == 56  || template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id == 10445 || this.$store.getters.xt_user.template_info.org_id == 10410) && this.$store.getters.xt_user.template_info.org_id!=10387" width="50px"> 超滤率 <br />(ml/h) </th>
+          <th v-if="isShow('超滤率') && (template_id !=6 && template_id !=10 && template_id !=11 && template_id !=12 && template_id !=13 && template_id !=17 && template_id !=18 && template_id !=19 && template_id !=20 && template_id !=21 && template_id !=22 && template_id !=23 && template_id !=24 && template_id !=26 && template_id !=29 && template_id !=30 && template_id !=31 && template_id !=34 && template_id !=35 && template_id !=38  && template_id !=41 && template_id !=43 && template_id !=44 && template_id !=46 && template_id !=47 &&  template_id !=48 &&  template_id !=53 &&  template_id !=54 &&  template_id !=56 &&  template_id !=60 && this.$store.getters.xt_user.template_info.org_id!=10432  && this.$store.getters.xt_user.template_info.org_id!=10445 && this.$store.getters.xt_user.template_info.org_id!=10410) || this.$store.getters.xt_user.template_info.org_id==10387" width="50px"> 超滤率 <br />(L/h) </th>
           <th v-if="isShow('钠浓度')" width="92px">钠浓度(mmol/L)</th>
           <th v-if="isShow('透析液温度')" width="92px">透析液温度(℃)</th>
           <th v-if=" isShow('置换率') && (template_id == 6 || template_id == 10 || template_id == 11 || template_id == 20 || template_id == 26 || template_id == 29 || template_id == 46  || template_id == 48 || template_id == 53  || template_id == 54 || template_id == 56 || org_id == 10432 || org_id == 10445) " width="92px" > 置换率(ml/min) </th>

src/xt_pages/dialysis/template/DialysisPrintOrderFortyThree.vue

                                   : "mmHg"
                               }})
                             </td>
-                            <td width="60">透析液温度(°C)</td>
+                            <td width="60">动脉压</td>
                             <!-- <td width="50">电导度<br />(ms/cm)</td> -->
                             <td width="50">超滤率<br />ml/h</td>
                             <td width="50">超滤量<br />(ml)</td>
                             <!-- 透析液温度 -->
                             <td>
                               {{
-                                monitor.dialysate_temperature
-                                  ? monitor.dialysate_temperature
+                                monitor.arterial_pressure
+                                  ? monitor.arterial_pressure
                                   : ""
                               }}
                             </td>

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

                         }}
                       </div>
                     </div>
+
+                     <div class="inline_block" style="flex: 1" v-if="org_id ==0 || org_id ==10440">
+                      衣物重：
+                      <div
+                        class="under_line"
+                        style="width: 70px; text-align: center"
+                      >
+                        {{
+                          predialysis.additional_weight
+                            ? predialysis.additional_weight
+                            : "/"
+                        }}
+                      </div>
+                    </div>
                     <div class="inline_block" style="flex: 1" v-if="org_id==10290">
                       透析器/灌流器：
                       <div
                     class="row"
                     style="padding: 2px 0; line-height: 23px; display: flex"
                   >
-                    <div class="inline_block" style="flex: 1">
+                    <div class="inline_block" style="flex: 1" v-if="org_id!=0 && org_id!=10440">
                       上次透后体重：
                       <div
                         class="under_line"
                       
 
                         <td>
-                          <span v-if="org_id!=9671 && org_id!=10440 && org_id!=10471"> {{ monitor.ultrafiltration_volume? monitor.ultrafiltration_volume: ""}}</span>
-                          <span v-if="org_id==9671 || org_id==10440 || org_id == 10471"> {{ monitor.ultrafiltration_volume? monitor.ultrafiltration_volume: "0"}}</span>
+                          <span v-if="org_id!=9671 && org_id!=10440"> {{ monitor.ultrafiltration_volume? monitor.ultrafiltration_volume: ""}}</span>
+                          <span v-if="org_id==9671 || org_id==10440"> {{ monitor.ultrafiltration_volume? monitor.ultrafiltration_volume: "0"}}</span>
                         </td>
                         <!-- <td style="width:50px">
                           <span v-if="(prescription.mode_id == 2 || prescription.mode_id == 5 || prescription.mode_id == 12) && ((dialysisOrder && monitor.operate_time <= dialysisOrder.end_time) && (dialysisOrder && monitor.operate_time >= dialysisOrder.start_time))">
                     </div>
                   </div>
 
+
+                   <div
+                    v-if="org_id == 10440 || org_id == 0"
+                    class="row"
+                    style="padding: 2px 0; line-height: 23px; display: flex"
+                  >
+                    <div
+                      class="inline_block"
+                      style="flex: 1; display: inline-block"
+                    >
+                      衣物重：
+                      <div
+                        class="under_line"
+                        style="
+                          width: 100px;
+                          line-height: 25px;
+                          text-align: left;
+                          margin-left: 2px;
+                          display: inline-block;
+                          white-space: normal;
+                        "
+                      >
+                        {{
+                          afterdialysis.additional_weight
+                            ? afterdialysis.additional_weight
+                            : "/"
+                        }}
+                      </div>
+                    </div>
+                  </div>
+
                   <div
                     class="row"
                     style="padding: 2px 0; line-height: 23px; display: flex"
                           }}</span
                         >
                         <img
-                          style="height: 30px"
+                          style="height: 40px"
                           :src="
                             setAdminUserES(
                               dialysisOrder == null
                           }}</span
                         >
                         <img
-                          style="height: 30px"
+                          style="height: 40px"
                           :src="
                             setAdminUserES(
                               dialysisOrder == null
                       >
                     
                         <span
-                          style="height: 30px; display: inline-block"
+                          style="height: 40px; display: inline-block"
                           v-if="
                             setAdminUserES(
                               dialysisOrder == null
                           }}</span
                         >
                         <img
-                          style="height: 30px"
+                          style="height: 40px"
                           :src="
                             setAdminUserES(
                               dialysisOrder == null
                           }}</span
                         >
                         <img
-                          style="height: 30px"
+                          style="height: 40px"
                           :src="
                             setAdminUserES(
                               dialysisOrder == null
                           {{ getAdminUser(check == null ? 0 : check.creater) }}
                         </span>
                         <img
-                          style="height: 30px"
+                          style="height: 40px"
                           :src="
                             setAdminUserES(check == null ? 0 : check.creater)
                           "
                           {{ getAdminUser(check == null ? 0 : check.creater) }}
                         </span>
                         <img
-                          style="height: 30px"
+                          style="height: 40px"
                           :src="
                             setAdminUserES(check == null ? 0 : check.creater)
                           "
                           {{ getAdminUser(check == null ? 0 : check.modifier) }}
                         </span>
                         <img
-                          style="height: 30px"
+                          style="height: 40px"
                           :src="
                             setAdminUserES(check == null ? 0 : check.modifier)
                           "
                           {{ getAdminUser(check == null ? 0 : check.creater) }}
                         </span>
                         <img
-                          style="height: 30px"
+                          style="height: 40px"
                           :src="
                             setAdminUserES(check == null ? 0 : check.creater)
                           "
                           }}
                         </span>
                         <img
-                          style="height: 30px"
+                          style="height: 40px"
                           :src="
                             setAdminUserES(
                               dialysisOrder == null
                           {{ getAdminUser(prescription.creater) }}
                         </span>
                         <img
-                          style="height: 30px"
+                          style="height: 40px"
                           :src="setAdminUserES(prescription.creater)"
                           alt=""
                           srcset=""

src/xt_pages/management/components/RepairForm.vue

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

src/xt_pages/management/components/UserForm.vue

       });
     },
     EditUser(id, patientid) {
-       console.log("hh2h333232332233232323322323",id)
-       console.log("patient_id2323223323223322332323322323",patientid)
       EditUser(id, patientid).then(response => {
         if (response.data.state === 1) {
           this.dialogVisible = true;
           }else{
             this.form.bed = ""
             this.bedNumberTwo = []
+            this.getAllSubregion()
 
           }
 

src/xt_pages/management/components/WaterForm.vue

          <el-row>
             <el-col :span="8">
                 <el-form-item label="原水电导度(μs/cm):" prop="water_conductivity"  class="st" label-width="100px">
-                    <el-input  v-model="form.water_conductivity" style="width:100px" 
+                    <el-input  v-model="form.water_conductivity" style="width:100px"
                         oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3').replace(/^\./g, '')"
                     >
                     </el-input>
             </el-col>
             <el-col :span="8">
                 <el-form-item label="原水压力(Mpa):"  class="st">
-                    <el-input  v-model="form.water_pressure" style="width:100px" 
+                    <el-input  v-model="form.water_pressure" style="width:100px"
                     oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3').replace(/^\./g, '')"
                     >
                     </el-input>
                     <el-input  v-model="form.total_chlorine_detection" style="width:100px"
                     oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3').replace(/^\./g, '')"
                      ></el-input>
-                     
+
                 </el-form-item>
             </el-col>
             <el-col :span="8">
             </el-col>
             <el-col :span="8">
                 <el-form-item label="时长(h):"  class="st">
-                    <el-input  v-model="form.last_disinfection_time"  style="width:100px" oninput="value=value.replace(/[^\d^\.]/g, '')"></el-input>
+                    <el-input  v-model="form.last_disinfection_time" style="width:100px" oninput="value=value.replace(/[^\d^\.]/g, '')"></el-input>
                 </el-form-item>
             </el-col>
          </el-row>
 
          <el-row>
-          
+
             <el-col :span="8">
                 <el-form-item label="过滤器更换(只):"  class="st">
-                    <el-input  v-model="form.filter_replacement" style="width:100px" 
+                    <el-input  v-model="form.filter_replacement" style="width:100px"
                     oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3').replace(/^\./g, '')"
                     ></el-input>
                 </el-form-item>
               </el-form-item>
           </el-col>
 
-        
+
         </el-row>
-       
+
         </el-form>
         <div style="float:right">
             <el-button type="primary" @click="saveWater('form')">保存</el-button>
         </div>
 
-      
+
     </div>
 </template>
 <script>
               last_ro_membrane_effluent:"",
               last_production_of_water_conductivity:"",//产水电导度
               last_water_yield:"",//产水量
-             
+
               carbon_tank:"",//碳罐
               snd_tank:"",//砂罐,
               resin_tank:"",//树脂罐
               remark:"",//备注
               filter_replacement:"",//过滤器更换
               admin_user_id:"",//记录人
-              
+
             },
             machineType:[
-               {id:0,name:"全部"}, 
-               {id:1,name:"正常"}, 
-               {id:2,name:"故障"}, 
+               {id:0,name:"全部"},
+               {id:1,name:"正常"},
+               {id:2,name:"故障"},
             ],
             forcePumpList:[
               {id:0,name:"全部"},
             disinfectionType:[
             { id: 0, name: "请选择" },
             { id: 1, name: "热消毒" },
-            { id: 2, name: "化学消毒" }   
+            { id: 2, name: "化学消毒" }
             ],
             checked:"",
             rules: {
            },
            nurseList:[],
         }
-       
+
     },
     methods:{
         saveWater(formName){
         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
         }
         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{
         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{
         }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!=""){
         }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{
         }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{
         }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{
         }
 
         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
         }
         }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{
         }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
         }
-      
-       
+
+
         console.log("233223232323",this.form)
          this.$refs[formName].validate((valid) => {
           if (valid) {
                 var deviceWater =  response.data.data.deviceWater
                 console.log("保存成功!",deviceWater)
                 this.$message.success("保存成功!")
+                console.log("2333333333333333333333333w",this.form.water_conductivity)
+                if(this.form.water_conductivity == 0){
+                   this.form.water_conductivity = ""
+                }
+                if(this.form.fault_description == 0){
+                   this.form.fault_description = ""
+                }
+
+                if(this.form.water_conductivity == 0){
+                   this.form.water_conductivity = ""
+                }
 
+                if(this.form.water_pressure == 0){
+                  this.form.water_pressure = ""
+                }
+
+                if(this.form.temperature == 0){
+                   this.form.temperature = ""
+                }
+
+                if(this.form.first_ro_membrane_water == 0){
+                   this.form.first_ro_membrane_water = ""
+                }
+
+                if(this.form.first_ro_film_thick_water ==0 ){
+                   this.form.first_ro_film_thick_water = ""
+                }
+
+                if(this.form.first_ro_membrane_effluent == 0){
+                   this.form.first_ro_membrane_effluent=""
+                }
+
+                if(this.form.first_production_of_water_conductivity == 0){
+                   this.form.first_production_of_water_conductivity = ""
+                }
+
+                if(this.form.first_water_yield == 0){
+                   this.form.first_water_yield = ""
+                }
+
+                if(this.form.last_ro_membrane_water == 0){
+                  this.form.last_ro_membrane_water= ""
+                }
+
+                if(this.form.last_ro_film_thick_water== 0){
+                   this.form.last_ro_film_thick_water = ""
+                }
+
+                if(this.form.last_ro_membrane_effluent == 0){
+                  this.form.last_ro_membrane_effluent = ""
+                }
+
+                if(this.form.last_production_of_water_conductivity == 0){
+                  this.form.last_production_of_water_conductivity = ""
+                }
+
+                if(this.form.last_water_yield  == 0){
+                  this.form.last_water_yield = ""
+                }
+
+                if(this.form.carbon_tank == 0){
+                   this.form.carbon_tank = ""
+                }
+
+                if(this.form.snd_tank == 0){
+                  this.form.snd_tank = ""
+                }
+
+                if(this.form.resin_tank == 0){
+                  this.form.resin_tank= ""
+                }
+
+                if(this.form.ultrafilter == 0){
+                   this.form.ultrafilter= ""
+                }
+
+                if(this.form.hardness_monitoring  ==0){
+                    this.form.hardness_monitoring = ""
+                }
+
+                if(this.form.total_chlorine_detection == 0){
+                  this.form.total_chlorine_detection= ""
+                }
+                if(this.form.concentration_of_peroxyacetic_acid == 0){
+                  this.form.concentration_of_peroxyacetic_acid = ""
+                }
+
+                if(this.form.reverse_osmosis_membrane_disinfection ==0){
+                  this.form.reverse_osmosis_membrane_disinfection = ""
+                }
+
+                if(this.form.disinfection_of_water_pipeline == 0){
+                  this.form.disinfection_of_water_pipeline= ""
+                }
+
+                if(this.form.first_disinfection_method == 0){
+                    this.form.first_disinfection_method = ""
+                }
+
+                if(this.form.last_disinfection_method  == 0){
+                    this.form.last_disinfection_method = ""
+                }
+
+                if(this.form.first_disinfection_time == 0){
+                  this.form.first_disinfection_time = ""
+                }
+
+                if(this.form.last_disinfection_time == 0){
+                  this.form.last_disinfection_time = ""
+                }
+
+                if(this.form.remark == 0){
+                  this.form.remark = ""
+                }
+
+                if(this.form.filter_replacement == 0){
+                    this.form.filter_replacement = ""
+                }
+
+                if(this.form.admin_user_id == 0){
+                   this.form.admin_user_id = ""
+                }
+
+
+
+
+                // this.$parent.toParent()
+
+             }else{
                 this.form.fault_description = ""
                 this.form.water_conductivity = ""
                 this.form.water_pressure = ""
              var doctorList = response.data.data.list
              console.log("dcotorlist",doctorList)
              for(let i=0;i<doctorList.length;i++){
-              if(doctorList[i].user_type == 3){
-                 this.nurseList.push(doctorList[i])
-              }
+            //   if(doctorList[i].user_type == 3){
+            //      this.nurseList.push(doctorList[i])
+            //   }
+               this.nurseList.push(doctorList[i])
              }
-
+             console.log("nurseLisrt===============",this.nurseList)
            }
          })
        },
     //     }
     },
     created(){
+       this.form.admin_user_id = this.$store.getters.xt_user.user.id
+    //    this.form.admin_user_id = 829
        this.getAllDoctorList()
     },
     mounted(){
-        
+
     }
  }
- 
+
 </script>
 <style scoped>
 .el-row {
 .newMain .el-form-item__label {
     width: 110px !important;
 }
-</style>
+</style>

src/xt_pages/management/components/WaterFormList.vue

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

src/xt_pages/management/home.vue

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

src/xt_pages/user/firstDiseasePrint.vue

                   {{getDoctor(hosDetail==null?0:(hosDetail.doctor?hosDetail.doctor:hosDetail.doctor))}}
                   </span>
                   <span v-else>
-                    <img style="height:30px;" :src="setAdminUserES(hosDetail==null?0:(hosDetail.doctor?hosDetail.doctor:hosDetail.doctor))" alt="" srcset="">
+                    <img style="height:50px;" :src="setAdminUserES(hosDetail==null?0:(hosDetail.doctor?hosDetail.doctor:hosDetail.doctor))" alt="" srcset="">
                   </span>
               </div>
           </div>

src/xt_pages/user/hospitalSummaryPrint.vue

                   {{getDoctor(hosDetail.doctor)}} 
              </span>
               <span v-else>
-                <img style="height:30px;" :src="setAdminUserES(hosDetail.doctor?hosDetail.doctor:hosDetail.doctor)" alt="" srcset="">
+                <img style="height:50px;" :src="setAdminUserES(hosDetail.doctor?hosDetail.doctor:hosDetail.doctor)" alt="" srcset="">
               </span>
               </span>
             </td>

src/xt_permission.js

 
 router.beforeEach((to, from, next) => {
   // 线上注释
-  if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
-    store.dispatch('VerifyConfigList', []).then(() => {
-      next()
-    })
-  }
-  if (store.getters.permission_routers === undefined) {
-    store.dispatch('xt_GenerateRoutes', []).then(() => {
-      next()
-    })
-  } else {
-    next()
-  }
-  return
+  // if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
+  //   store.dispatch('VerifyConfigList', []).then(() => {
+  //     next()
+  //   })
+  // }
+  // if (store.getters.permission_routers === undefined) {
+  //   store.dispatch('xt_GenerateRoutes', []).then(() => {
+  //     next()
+  //   })
+  // } else {
+  //   next()
+  // }
+  // return
   // 线上注释
   NProgress.start()
   // console.log(store.getters.current_role_urls.indexOf(to.path))