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

src/xt_pages/device/objectTableDisinfectTwo.vue

@@ -785,11 +785,11 @@
                                     transform-origin: top left;"></span>
                                     <span style="position: absolute; left: 6px; bottom: 6px;font-size: 12px;">日期</span>
                                 </td>
-                                <td>湿化瓶<br/>500mg/l含氯<br/>制剂</td>
+                                <td>湿化瓶<br/>500mg/l含氯制剂</td>
                                 <td>负责人</td>
-                                <td>止血带<br/>500mg/l含氯<br/>制剂</td>
+                                <td>止血带<br/>500mg/l含氯制剂</td>
                                 <td>负责人</td>
-                                <td>医疗垃圾桶<br/>1000mg/l含氯<br/>制剂</td>
+                                <td>医疗垃圾桶<br/>1000mg/l含氯制剂</td>
                                 <td>负责人</td>
                                 <td>体温计<br/>75%酒精<br/>擦拭</td>
                                 <td>负责人</td>

src/xt_pages/management/components/ManageForm.vue

@@ -311,7 +311,7 @@
         </el-row>
       </el-form>
       <span slot="footer" class="dialog-footer">
-        <el-button @click="dialogVisible = false">取 消</el-button>
+        <el-button @click="delManageInfo() ">取 消</el-button>
         <el-button
           type="primary"
           @click="SaveManageInfo('form')"
@@ -754,8 +754,10 @@ export default {
               this.getAllSubregion();
               this.$emit("getAllMachineInfo");
               this.$forceUpdate();
+              this.$refs['form'].resetFields()
             } else {
               this.$message.error("该机位号已绑定设备,添加失败");
+              this.$refs['form'].resetFields()
             }
           });
         }
@@ -818,6 +820,10 @@ export default {
         this.deviceMode = mode;
         console.log("mode", mode);
       });
+    },
+    delManageInfo(){
+      this.dialogVisible = false
+      this.$refs['form'].resetFields()
     }
   },
   created() {
@@ -827,16 +833,14 @@ export default {
 };
 </script>
 
-<style lang="scss">
+<style lang="scss" >
 .el-form-item__label {
   font-size: 14px;
 }
 // .el-form-item {
 //     margin-bottom: 10px;
 // }
-.el-form-item__error {
-  margin-left: 110px;
-}
+
 .el-checkbox {
   line-height: 26px;
   height: 26px;
@@ -846,6 +850,9 @@ export default {
     width: 100px;
     padding: 0;
   }
+  .el-form-item__error {
+    margin-left: 210px;
+  }
 }
 .el-checkbox {
   color: #606266;

src/xt_pages/management/components/PlanForm.vue

@@ -9,7 +9,7 @@
       <el-form ref="form" :model="form">
         <el-row>
           <el-col :span="10">
-            <el-form-item label="设备型号:">
+            <el-form-item label="设备型号:" prop="device_type">
               <el-select style="width:135px" v-model="form.device_type">
                 <el-option
                   v-for="item in this.DeviceType"
@@ -21,7 +21,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="10">
-            <el-form-item label="消毒时长:">
+            <el-form-item label="消毒时长:" prop="disinfec_time">
               <el-input
                 style="width:135px"
                 v-model="form.disinfec_time"
@@ -32,7 +32,7 @@
         </el-row>
         <el-row>
           <el-col :span="10">
-            <el-form-item label="时间:">
+            <el-form-item label="时间:" prop="time">
               <el-select
                 v-model="form.time"
                 multiple
@@ -41,6 +41,7 @@
                 default-first-option
                 placeholder="请选择时间"
                 style="width: 135px;"
+               
               >
                 <el-option
                   v-for="item in this.timeType"
@@ -52,7 +53,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="10">
-            <el-form-item label="班次:">
+            <el-form-item label="班次:" prop="class_time">
               <el-select
                 v-model="form.class_time"
                 multiple
@@ -73,8 +74,8 @@
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="10">
-            <el-form-item label="机表(床单元、床旁桌)消毒方式:" label-width="200">
+          <el-col :span="20">
+            <el-form-item label="机表(床单元、床旁桌)消毒方式:" prop="way" >
               <el-select style="width:135px" v-model="form.way">
                 <el-option
                   v-for="item in this.disinfectType"
@@ -85,8 +86,25 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="10">
-            <el-form-item label="机表(床单元、床旁桌)消毒液:" label-width="200">
+          <!-- <el-col :span="10">
+            <el-form-item label="机表(床单元、床旁桌)消毒液:" label-width="200" prop="machine_disinfectant">
+              <el-select
+                style="width:135px"
+                v-model="form.machine_disinfectant"
+              >
+                <el-option
+                  v-for="item in this.disinfectantType"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col> -->
+        </el-row>
+        <el-row>
+          <el-col :span="20">
+            <el-form-item label="机表(床单元、床旁桌)消毒液:" label-width="200" prop="machine_disinfectant">
               <el-select
                 style="width:135px"
                 v-model="form.machine_disinfectant"
@@ -103,7 +121,7 @@
         </el-row>
         <el-row>
           <el-col :span="10">
-            <el-form-item label="液路消毒方式:">
+            <el-form-item label="液路消毒方式:" prop="disinfectant_way">
               <el-select style="width:135px" v-model="form.disinfectant_way">
                 <el-option
                   v-for="item in this.sterilizeType"
@@ -115,7 +133,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="10">
-            <el-form-item label="液路消毒液:">
+            <el-form-item label="液路消毒液:" prop="disinfectant">
               <el-select style="width:135px" v-model="form.disinfectant">
                 <el-option
                   v-for="item in this.fluidPathType"
@@ -130,7 +148,7 @@
 
         <el-row>
           <el-col :span="10">
-            <el-form-item label="床单位更换:">
+            <el-form-item label="床单位更换:" prop="bed_way">
               <el-select style="width:135px" v-model="form.bed_way">
                 <el-option
                   v-for="item in this.bedType"
@@ -254,6 +272,7 @@ export default {
       });
     },
     savePlan(formName) {
+      
       var equimentid = this.equimentid;
       // console.log('equimentid', equimentid);
       var devicetype = this.form.device_type;
@@ -281,16 +300,20 @@ export default {
           var msg = response.data.data.msg;
           // console.log('msg', msg);
           this.$message.success("保存成功");
+          
           this.dialogVisible = false;
+          this.$refs['form'].resetFields()
           this.$emit("getAllPlan");
           this.$emit("getAllPlanDetail");
           // 如果保存成功通过状态值改变父组键表格的值
           this.plandata = 1;
           this.$emit("func", this.plandata);
+          
         } else {
           this.$message.error("该消毒计划已存在");
         }
       });
+      
     },
     getAllEquitType() {
       getAllEquitType().then(response => {
@@ -311,10 +334,12 @@ export default {
 <style lang="scss">
 #plan-form {
   .el-form-item__label {
-    width: 100px;
+    text-align: left;
+    // width: 100px;
   }
   .el-dialog__footer {
     text-align: right;
   }
+  // .el-form-item__label
 }
 </style>

src/xt_pages/management/components/UserForm.vue

@@ -324,7 +324,7 @@
                 </template>
               </el-autocomplete>
             </el-form-item>
-         
+
           </el-col>
           <el-col :span="8">
             <el-form-item label="传染病:">
@@ -964,7 +964,7 @@
                 <td style="text-align:center;font-size:15px;height:30px">
                   {{item.clean}}
                 </td>
-              
+
                 <td style="text-align:center;font-size:15px;height:30px">
                   {{ item.user_name }}
                 </td>
@@ -1207,7 +1207,7 @@ export default {
             zone.push({ id: item.id, name: item.name });
           }
           this.zones = zone;
-       
+
           var numbers = response.data.data.numbers;
           var number = [{ id: 0, number: "全部" }];
           for (let index = 0; index < numbers.length; index++) {
@@ -1290,7 +1290,7 @@ export default {
             if (information[index].dialysis_mode === 19) {
               information[index].dialysis_mode = "IUF+HD";
             }
-            
+
             if (information[index].dialysis_mode === 20) {
               information[index].dialysis_mode = "UF";
             }
@@ -1564,7 +1564,7 @@ export default {
           var macher =  response.data.data.macher
            if(macher.user_total == ''){
              macher.user_total = 0
-           }   
+           }
           var totals = count[0].Total + parseInt(macher.user_total)
           this.userform.id = device.id;
           this.userform.spling_date = uParseTime(
@@ -1586,7 +1586,7 @@ export default {
           this.userform.hyperfiltratio = device.hyperfiltratio;
           this.userform.weight_loss = device.weight_loss;
           this.userform.warning_value = device.warning_value;
-       
+
           this.userform.run = device.move;
 
           this.userform.failure_stage = device.failure_stage;
@@ -1602,7 +1602,7 @@ export default {
           this.userform.disinfection_residue = device.disinfection_residue;
           this.userform.longtime = device.long_time;
           this.userform.dialysis_time = device.dialysis_hour;
-        
+
           this.userform.starttime = this.updateTimes(device.disinfec_startime);
           this.userform.endtime = this.updateTimes(device.disinfec_endtime);
           this.userform.equiment_id = device.equiment_id;
@@ -1643,7 +1643,7 @@ export default {
           if (device.disinfection === 0) {
             this.userform.disinfection = "";
           }
-          this.userform.user_total = totals.toString() 
+          this.userform.user_total = totals.toString()
         }
       });
     },
@@ -1759,7 +1759,7 @@ export default {
       this.$refs[formName].validate(valid => {
         if (valid) {
           console.log("hhhh23233323",this.userform)
-       
+
           UpdateForm(this.userform).then(response => {
             if (response.data.state === 1) {
               var information = response.data.data.information;
@@ -1884,7 +1884,7 @@ export default {
             if (information[index].dialysis_mode === 25) {
               information[index].dialysis_mode = "HD高通";
             }
-            
+
             if (information[index].dialysis_mode === 26) {
               information[index].dialysis_mode = "CVVH";
             }
@@ -1901,8 +1901,8 @@ export default {
               information[index].dialysis_mode = "PE";
             }
 
-           
- 
+
+
             if (information[index].move === 0) {
               information[index].move = "";
             }
@@ -2122,7 +2122,7 @@ export default {
     getUserForm(id) {
       getUserForm(id, this.limit, this.page).then(response => {
         if (response.data.state === 1) {
-          var information = response.data.data.information; 
+          var information = response.data.data.information;
           console.log("information",information)
           var addmacher = response.data.data.addmacher;
           console.log("addmacher",addmacher)
@@ -2225,7 +2225,7 @@ export default {
             if (information[index].dialysis_mode === 25) {
               information[index].dialysis_mode = "HD高通";
             }
-            
+
            if (information[index].dialysis_mode === 26) {
               information[index].dialysis_mode = "CVVH";
             }
@@ -2532,20 +2532,20 @@ export default {
         });
       });
 
-      
+
     },
-   
+
     exportlist: function() {
         for(let i=0;i<this.tableData.length;i++){
             this.tableData[i].index = i+1
 
-           
+
             this.tableData[i].record_date_str =  this.getTime(this.tableData[i].date)
-           this.tableData[i].disinfec_startime_str = this.getTimesTwo(this.tableData[i].disinfec_startime) 
+           this.tableData[i].disinfec_startime_str = this.getTimesTwo(this.tableData[i].disinfec_startime)
            this.tableData[i].disinfec_endtime_str = this.getTimesTwo(this.tableData[i].disinfec_endtime)
           }
           import('@/vendor/Export2Excel').then(excel => {
-          
+
             const multiHeader = [['序号', '机号','日期','班次','患者','透析方式','使用次数','运行','机表(床单元、床旁桌）消毒)','','','','液路消毒','','','','','','','透析机消毒液(更换)','细菌过滤器(更换)','空气滤网','签名' ]]
             const header = ['', '','','','','','','','消毒方式','消毒液','消毒状态','消毒液浓度','消毒方式','消毒液','开始消毒时间','结束消毒时间','消毒时长/min','消毒状态','消毒液残留','','','','']
             const merges = ['A1:A2', 'B1:B2','C1:C2','D1:D2','E1:E2','G1:G2','H1:H2','I1:L1','M1:S1','T1:T2','U1:U2','V1:V2','W1:W2']
@@ -2555,7 +2555,7 @@ export default {
             const filename = '透析机使用登记'
 
             console.log("rwwwwwwwwwww",this.tableData)
-            
+
             excel.export_json_to_excel({
               multiHeader,
               header,
@@ -2568,6 +2568,32 @@ export default {
       formatJson(filterVal, jsonData) {
         return jsonData.map(v => filterVal.map(j => v[j]));
       },
+    },
+    exportList: function() {
+      console.log('123245354');
+      // for(let i=0;i<this.tableList.length;i++){
+      //     this.tableList[i].index = i+1
+      //   }
+      //   import('@/vendor/Export2Excel').then(excel => {
+      //     const multiHeader = [['序号', '日期','  药品类型','药品名称','规格&单位','生产产商', '期初结余' , '', '', '本期增加', '', '', '本期减少' , '', '', '期末结余' , '', '']]
+      //     const header = ['', '','','','','', '数量', '进货金额', '销售金额', '数量', '进货金额', '销售金额', '数量', '进货金额', '销售金额', '数量', '进货金额', '销售金额']
+      //     const merges = ['A1:A2', 'B1:B2','C1:C2','D1:D2','E1:E2','F1:F2','G1:I1', 'J1:L1', 'M1:O1', 'P1:R1']
+      //     const filterVal = ['index', 'query_date', 'good_type','drug_name','specification_name','manufacturer_name','drugIn','drugInMoney','drugSaleMoney','drugAdd','drugAddPrice','drugAddSalePrice','drugOut','drugOutPrice','drugOutSalePrice','overDrug','overDrugPrice','oveDrugSaleMoney']
+
+      //     const data = this.formatJson(filterVal, this.tableList)
+
+      //     const filename = '药品进销存查询'
+
+
+      //       excel.export_json_to_excel({
+      //         multiHeader,
+      //         header,
+      //         merges,
+      //         data,
+      //         filename
+      //       })
+      //   })
+    },
   },
   created() {
     this.getAllSubregion();

src/xt_pages/management/components/WaterForm.vue

@@ -36,18 +36,19 @@
          </el-row>
          <el-row>
             <el-col :span="8">
-                <el-form-item label="原水电导度(μs/cm):"  class="st" label-width="100px">
-                    <el-input  v-model="form.water_conductivity" style="width:100px" type="number"></el-input>
+                <el-form-item label="原水电导度(μs/cm):"   class="st" label-width="100px">
+                    <el-input  v-model="form.water_conductivity" style="width:100px" oninput="value=value.replace(/[^\d^\.]/g,'')" maxlength='4'></el-input>
+                    <!-- <el-input-number v-model="form.water_conductivity" :controls="false" :precision="2" ></el-input-number> -->
                 </el-form-item>
             </el-col>
             <el-col :span="8">
                 <el-form-item label="原水压力(Mpa):"  class="st">
-                    <el-input  v-model="form.water_pressure" style="width:100px" type="number"></el-input>
+                    <el-input  v-model="form.water_pressure" style="width:100px" oninput="value=value.replace(/[^\d^\.]/g,'')" maxlength='4'></el-input>
                 </el-form-item>
             </el-col>
             <el-col :span="8">
                 <el-form-item label="温度:"  class="st">
-                    <el-input  v-model="form.temperature" style="width:100px" type="number"></el-input>
+                    <el-input  v-model="form.temperature" style="width:100px" oninput="value=value.replace(/[^\d^\.]/g,'')" maxlength='4'></el-input>
                 </el-form-item>
             </el-col>
          </el-row>
@@ -157,17 +158,20 @@
          <el-row>
             <el-col :span="8">
                 <el-form-item label="硬度监测(mg/l):"  class="st">
-                    <el-input  v-model="form.hardness_monitoring" type="number" style="width:100px"></el-input>
+                    <el-input  v-model="form.hardness_monitoring" style="width:100px"
+                     oninput="value=value.replace(/[^\d^\.]/g,'')" maxlength='4'></el-input>
                 </el-form-item>
             </el-col>
             <el-col :span="8">
                 <el-form-item label="总氯检测(mg/l):"  class="st">
-                    <el-input  v-model="form.total_chlorine_detection" type="number" style="width:100px"></el-input>
+                    <el-input  v-model="form.total_chlorine_detection" style="width:100px"
+                     oninput="value=value.replace(/[^\d^\.]/g,'')" maxlength='4'></el-input>
                 </el-form-item>
             </el-col>
             <el-col :span="8">
                 <el-form-item label="PH值检测:"  class="st">
-                    <el-input  v-model="form.ph_detection" type="number" style="width:100px"></el-input>
+                    <el-input  v-model="form.ph_detection" style="width:100px"
+                     oninput="value=value.replace(/[^\d^\.]/g,'')" maxlength='4'></el-input>
                 </el-form-item>
             </el-col>
          </el-row>
@@ -175,7 +179,8 @@
          <el-row>
             <el-col :span="8">
                 <el-form-item label="过氧乙酸浓度(mg/l):"  class="st">
-                    <el-input  v-model="form.concentration_of_peroxyacetic_acid" type="number" style="width:100px"></el-input>
+                    <el-input  v-model="form.concentration_of_peroxyacetic_acid" style="width:100px"
+                     oninput="value=value.replace(/[^\d^\.]/g,'')" maxlength='4'></el-input>
                 </el-form-item>
             </el-col>
          </el-row>
@@ -230,21 +235,21 @@
           
             <el-col :span="8">
                 <el-form-item label="过滤器更换(只):"  class="st">
-                    <el-input  v-model="form.filter_replacement" type="number" style="width:100px"></el-input>
+                    <el-input  v-model="form.filter_replacement" style="width:100px" 
+                    oninput="value=value.replace(/[^\d^\.]/g,'')" maxlength='4'></el-input>
                 </el-form-item>
             </el-col>
 
-            <el-col :span="8">
-                <el-form-item label="备注:"  class="st">
-                    <el-input  v-model="form.remark" style="width:100px"></el-input>
+            <el-col :span="12">
+                <el-form-item label="备注:"  class="st" >
+                    <el-input type="textarea"  v-model="form.remark" autosize style="width:200px"></el-input>
                 </el-form-item>
             </el-col>
          </el-row>
 
          <el-row>
-          
           <el-col :span="8">
-              <el-form-item label="记录人:"  class="st">
+              <el-form-item label="记录人:" prop="admin_user_id"  class="st">
                 <el-select style="width:135px" v-model="form.admin_user_id">
                     <el-option
                     v-for="item in this.nurseList"
@@ -452,4 +457,9 @@ import {getAllDoctorList,saveWaterList} from "@/api/manage";
        this.getAllDoctorList()
     }
  }
-</script>
+</script>
+<style >
+.newMain .el-form-item__label {
+    width: 110px !important;
+}
+</style>

src/xt_pages/management/components/WaterFormList.vue

@@ -23,7 +23,7 @@
             style="width:130px"
           ></el-date-picker>
         </el-col>
-   
+
       </el-row>
       <el-row :span="24" style="display: flex;align-items: center;">
         <el-col :span="2">
@@ -43,7 +43,7 @@
         </el-col>
       </el-row>
       <el-row>
-     
+
         <el-table
           ref="multipleTable"
           @selection-change="handleSelectionChange"
@@ -185,7 +185,7 @@
             </el-table-column>
           </el-table-column>
 
-        
+
             <el-table-column label="过滤器更换" align="center" min-width="110px">
               <template slot-scope="scope">
                  {{scope.row.filter_replacement}}
@@ -196,7 +196,7 @@
                  {{ getDocName(scope.row.admin_user_id) }}
               </template>
             </el-table-column>
-   
+
           <el-table-column label="操作" align="center" fixed="right" min-width="150px">
             <template slot-scope="scope">
               <el-tooltip
@@ -214,7 +214,7 @@
                   "
                 ></el-button>
               </el-tooltip>
-  
+
               <el-tooltip
                 class="item"
                 effect="dark"
@@ -340,7 +340,7 @@
                     <el-input  v-model="form.first_water_yield" style="width:100px" type="number"></el-input>
                 </el-form-item>
             </el-col>
-         
+
          </el-row>
          <el-row>
             <span>反渗二级</span>
@@ -477,7 +477,7 @@
          </el-row>
 
          <el-row>
-          
+
             <el-col :span="8">
                 <el-form-item label="过滤器更换(只):"  class="st">
                     <el-input  v-model="form.filter_replacement" style="width:100px" type="number"></el-input>
@@ -492,7 +492,7 @@
          </el-row>
 
          <el-row>
-          
+
           <el-col :span="8">
               <el-form-item label="记录人:"  class="st">
                 <el-select style="width:135px" v-model="form.admin_user_id">
@@ -506,9 +506,9 @@
               </el-form-item>
           </el-col>
 
-        
+
         </el-row>
-       
+
         </el-form>
 
           </span>
@@ -517,7 +517,7 @@
             <el-button type="primary" @click="UpdateDilaysisWater('form')">确 定</el-button>
           </span>
         </el-dialog>
-        
+
 
       <div hidden="hidden">
       <div id="print-card-info" v-show="hiddenShow">
@@ -541,8 +541,8 @@
                 >
                   日期
                 </td>
-              
-               
+
+
                 <td
                   :colspan="4"
                   style="text-align:center;width:60px;font-size:15px"
@@ -590,7 +590,7 @@
                 >
                   静谧过滤器（MPa）
                 </td>
-              
+
                 <td
                  :colspan="4"
                   style="text-align:center;width:60px;font-size:15px"
@@ -618,7 +618,7 @@
                 >
                 记录人
                 </td>
-               
+
               </tr>
               <tr>
                 <td style="text-align:center;width:70px;font-size:15px">
@@ -648,7 +648,7 @@
                   产水量
                 </td>
 
-             
+
 
                 <td style="text-align:center;width:70px;font-size:15px">
                    硬度(mg/l）
@@ -670,15 +670,15 @@
                 <td style="text-align:center;width:95px;font-size:15px">
                   输水管道消毒
                 </td>
-                
-               
-              
+
+
+
               </tr>
               <tr v-for="item in this.tableData" :key="item.id">
                 <td style="text-align:center;font-size:15px;height:30px">
                   {{getTime(item.record_date) }}
                 </td>
-               
+
                 <td style="text-align:center;font-size:15px;height:30px">
                   {{ item.water_conductivity }}
                 </td>
@@ -772,14 +772,14 @@
                 >
                 {{item.filter_replacement}}
                 </td>
-                
+
                 <td style="text-align:center;width:70px;font-size:15px">
                   {{ getDocName(item.admin_user_id) }}
                 </td>
-             
-               
-               
-             
+
+
+
+
               </tr>
             </table>
           </div>
@@ -790,7 +790,7 @@
       </div>
     </div>
 
-   
+
   </template>
   <script>
   import { uParseTime } from "@/utils/tools";
@@ -831,7 +831,7 @@
               last_ro_membrane_effluent:"",
               last_production_of_water_conductivity:"",//产水电导度
               last_water_yield:"",//产水量
-             
+
               carbon_tank:"",//碳罐
               snd_tank:"",//砂罐,
               resin_tank:"",//树脂罐
@@ -849,12 +849,12 @@
               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:"全部"},
@@ -864,7 +864,7 @@
             disinfectionType:[
             { id: 0, name: "请选择" },
             { id: 1, name: "热消毒" },
-            { id: 2, name: "化学消毒" }   
+            { id: 2, name: "化学消毒" }
             ],
             checked:"",
             rules: {
@@ -893,7 +893,7 @@
                this.total = total
                this.adminRole = response.data.data.adminRole
 
-               
+
              }
           })
          },
@@ -994,7 +994,7 @@
         ).then(() => {
           DeleteWater(id,index).then(response => {
               if (response.data.state == 1) {
-               
+
                 this.$message.success('删除成功')
                 this.tableData.splice(index,1)
               } else {
@@ -1011,7 +1011,7 @@
         getDialysisWaterDetail(id).then(response=>{
           if(response.data.state == 1){
             var detail =  response.data.data.detail
-            
+
             this.form.id = detail.id
             this.form.record_date = this.getTime(detail.record_date)
             this.form.machine_status = detail.machine_status.toString()
@@ -1043,7 +1043,7 @@
             }else{
               this.form.reverse_osmosis_membrane_disinfection  =false
             }
-              
+
             if(detail.disinfection_of_water_pipeline == 1){
                 this.form.disinfection_of_water_pipeline = true
             }else{
@@ -1122,9 +1122,9 @@
                 var deviceWater =  response.data.data.deviceWater
                 console.log("保存成功!",deviceWater)
                 this.$message.success("保存成功!")
-                this.dialogVisible = false 
+                this.dialogVisible = false
                 this.getlist()
-            
+
              }
            })
 
@@ -1144,7 +1144,7 @@
               this.tableData[i].user_name = this.getDocName(this.tableData[i].admin_user_id)
             }
             import('@/vendor/Export2Excel').then(excel => {
-            
+
               const multiHeader = [['序号', '日期', '原水参数' , '', '','', '一级反渗', '', '二级反渗' , '', '碳罐(MPa)','砂罐(MPa)', '树脂罐(MPa)','静谧过滤器(MPa)','水质监测','','','','消毒','','过滤器更换','记录人' ]]
               const header = ['', '', '原水电导度', '原水压力', '温度','加压泵', '产水电导度', '产水量', '产水电导度', '产水量', '','','','','硬度(mg/l)','总氯(mg/l)','PH值','过氧乙酸(mg/l)','反渗膜消毒','输水管道消毒','','',]
               const merges = ['A1:A2', 'B1:B2', 'C1:F1','G1:H1','I1:J1','K1:K2','L1:L2','M1:M2','N1:N2','O1:R1','S1:T1','U1:U2','V1:V2']
@@ -1152,9 +1152,9 @@
               const data = this.formatJson(filterVal, this.tableData)
 
               const filename = '水处理机使用登记'
- 
+
               console.log("rwwwwwwwwwww",this.tableData)
-              
+
               excel.export_json_to_excel({
                 multiHeader,
                 header,
@@ -1219,6 +1219,5 @@
     }
   }
   </style>
-  
 
-  
+

src/xt_pages/management/home.vue

@@ -937,8 +937,6 @@
                        </div>
                    </el-tab-pane>
 
-
-
                    <el-tab-pane label="使用登记" name="third">
                        <div class="userbutton">
                           <el-button type="primary" @click="ToReminders">自动生成使用登记</el-button>
@@ -2318,6 +2316,7 @@
                           暂无数据
                         </div>
                    </el-tab-pane>
+                   
                     <el-tab-pane label="维修维护" name="five">
                        <el-tabs type="border-card" v-model="activeNameFive" @tab-click="handleClick">
                          <el-tab-pane label="新增维修维护" name="first">

src/xt_pages/outpatientCharges/components/registerDialog.vue

@@ -77,38 +77,6 @@
         <el-input v-model="form.id_card"></el-input>
       </el-form-item>
 
-      <!--<el-form-item label="处方类型：" prop="p_type" :validate-event="is_Name">-->
-      <!--<el-select style="margin-right:5px;width:100px;" v-model="form.p_type" placeholder=""-->
-      <!--&gt;-->
-      <!--<el-option-->
-      <!--v-for="(item,index) in registers"-->
-      <!--:key="index"-->
-      <!--:label="item.label"-->
-      <!--:value="item.value">-->
-      <!--</el-option>-->
-      <!--</el-select>-->
-      <!--</el-form-item>-->
-      <!--<el-form-item label="大病类别：" prop="sick_type" :validate-event="is_Name">-->
-      <!--<el-select style="margin-right:5px;width:100px;" v-model="form.sick_type" placeholder="">-->
-      <!--<el-option-->
-      <!--v-for="(item,index) in sick"-->
-      <!--:key="index"-->
-      <!--:label="item.class_name"-->
-      <!--:value="item.id">-->
-      <!--</el-option>-->
-      <!--</el-select>-->
-      <!--</el-form-item>-->
-
-      <!--<el-form-item label="诊断：" prop="diagnosis" :validate-event="is_Name">-->
-      <!--<el-select style="margin-right:5px;width:100px;" v-model="form.diagnosis" placeholder="">-->
-      <!--<el-option-->
-      <!--v-for="(item,index) in diagnoses"-->
-      <!--:key="index"-->
-      <!--:label="item.class_name"-->
-      <!--:value="item.id">-->
-      <!--</el-option>-->
-      <!--</el-select>-->
-      <!--</el-form-item>-->
 
       <el-form-item label="参保地：">
         <el-select v-model="form.insuplc_admdvs" placeholder="请选择" style="width:100%;">
@@ -167,7 +135,7 @@
         </div>
       </el-form-item>
 
-      <el-form-item label="挂号类型：" :validate-event="is_Name">
+      <el-form-item label="挂号类型：" :validate-event="is_Name" >
         <el-select v-model="form.register" placeholder="请选择" style="width:100%;">
           <el-option
             v-for="item in register"
@@ -294,7 +262,8 @@
           cost: '',
           phone: '',
           social_type: ''
-        }, IDCardTypes: [{
+        }, 
+        IDCardTypes: [{
           value: 1,
           label: '社保卡'
         }, {
@@ -317,7 +286,8 @@
           { value: 7, label: '合同' },
           {value: 8, label: '医保自费'},
 
-        ],InsuplcAdmdvs:[
+        ],
+        InsuplcAdmdvs:[
         ],
         sex: [{
           value: 1,
@@ -383,7 +353,7 @@
         }],
         rules: {
           name: [{ required: true, message: '患者姓名不能为空', trigger: 'blur' }],
-          gender: [{ required: true, message: '患者性别不能为空', trigger: 'blur' }],
+          gender: [{ required: true, message: '患者性别不能为空', trigger: 'change' }],
           id_card: [{ required: true, message: '证件号码不能为空', trigger: 'blur' }],
           doctor: [{ required: true, message: '请选择医生', trigger: 'blur' }],
           department: [{ required: true, message: '请填写科室', trigger: 'blur' }],
@@ -451,8 +421,6 @@
     methods: {
       check11(){
 
-
-
         if(this.form.social_type == 0 || this.form.social_type == ''){
           this.$message.error("社保类型不能为空")
           return
@@ -771,8 +739,10 @@
       hide: function () {
         this.visibility = false
         this.$refs['formValue'].resetFields()
-      }, cancel: function(formName) {
+      },
+       cancel: function(formName) {
         this.$emit('cancel', this.getValue())
+        this.visibility=false
         this.$refs['formValue'].resetFields()
       },
       confirm: function(formName) {
@@ -781,6 +751,9 @@
             let value = {}
             value = this.getValue()
             this.$emit('confirm', value)
+            this.visibility=false
+            this.$refs['formValue'].resetFields()
+            this.$parent.loadingone=false
           }
         })
       },

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -3206,9 +3206,6 @@ export default {
     },
     open(index, med_type, order, prescriptions) {
 
-
-
-
       this.other_prescriptions = prescriptions
 
       if (index == 1) {
@@ -3651,7 +3648,8 @@ export default {
             .catch(function(error) {
             })
       }
-    }, getName(admin_user_id) {
+    },
+     getName(admin_user_id) {
       for (let i = 0; i < this.adminUserOptions.length; i++) {
         if (this.adminUserOptions[i].id == admin_user_id) {
           return this.adminUserOptions[i].name