4月12日bug修改

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

@@ -62,6 +62,7 @@
         <el-button size="small" @click="BatchDelete">批量删除</el-button>
       </el-col>
       <el-col :span="6">
+        <el-button type="primary" @click="exportlist">导出</el-button>
         <el-button type="primary" @click="printCard">打印</el-button>
       </el-col>
     </el-row>
@@ -2493,7 +2494,32 @@ export default {
           }
         });
       });
-    }
+    },
+    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

@@ -1134,8 +1134,6 @@
         exportList: function() {
           for(let i=0;i<this.tableList.length;i++){
               this.tableList[i].index = i+1
-             
-
             }
             import('@/vendor/Export2Excel').then(excel => {
               const multiHeader = [['序号', '日期','  药品类型','药品名称','规格&单位','生产产商', '期初结余' , '', '', '本期增加', '', '', '本期减少' , '', '', '期末结余' , '', '']]

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>
@@ -1365,13 +1363,13 @@
                                 </el-row>
                              </el-form>
 
-                            <!-- <water-form ref="waterForm" v-if="device_type == 2" :equimentid="equimentid"></water-form> -->
+                            <water-form ref="waterForm" v-if="device_type == 2" :equimentid="equimentid"></water-form>
 
                           </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> -->
+                             <water-form-list ref="waterFormList" v-if="device_type == 2" :equimentid="equimentid"></water-form-list>
                            </el-tab-pane>
                        </el-tabs>
                      </div>
@@ -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">
@@ -2670,8 +2669,8 @@
   import QualityForm from './components/QualityForm'
   import RepairForm from './components/RepairForm'
   import RemanderForm from './components/RemanderForm'
-  // import WaterForm from './components/WaterForm'
-  // import WaterFormList from './components/WaterFormList.vue'
+  import WaterForm from './components/WaterForm'
+  import WaterFormList from './components/WaterFormList.vue'
   import { parseTime } from '@/utils'
   import { getFileExtension } from '@/utils/tools'
   import { PostSearch } from '@/api/patient'
@@ -2689,8 +2688,8 @@ export default {
       QualityForm,
       RepairForm,
       RemanderForm,
-      // WaterForm,
-      // WaterFormList
+      WaterForm,
+      WaterFormList
     },
     data() {
       return {

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