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

src/api/device.js

@@ -231,4 +231,95 @@ export function DeleteDevicePh(id,params){
     method:"Get",
     params:params
   })
+}
+
+
+export function saveNewAirDisinfect(data){
+  
+  return request({
+    url:"/api/manage/savenewairdisinfect",
+    method:"post",
+    data:data,
+  })
+}
+
+export function getNewAirDisinfectList(params){
+
+  return request({
+    url:"/api/manage/getnewairdisinfectlist",
+    method:"get",
+    params:params
+  })
+}
+
+export function getNewAirDisinfectByIdList(id,params){
+  
+  return request({
+    url:"/api/manage/getnewairdisinfectbyidlist?id="+id,
+    method:"Get",
+    params:params
+  })
+}
+
+export function updateNewAirDisinfect(data){
+  
+  return request({
+    url:"/api/manage/updatenewairdisinfect",
+    method:post,
+    data:data,
+  })
+}
+
+export function deleteNewAirDisInfect(id,params){
+  
+  return request({
+    url:"/api/manage/deletenewairdisinfect?id="+id,
+    method:"get",
+    params:params
+  })
+}
+
+export function saveObjectTableDisinfect(data){
+  
+  return request({
+    url:"/api/manage/saveobjtabledisinfect",
+    method:"post",
+    data:data,
+  })
+}
+
+export function getObjectTableDisInfectList(params){
+
+  return request({
+    url:"/api/manage/getobjcttabledisinfectlist",
+    method:"Get",
+    params:params,
+  })
+}
+
+export function getObjectTableDisInfectByIdList(id,params){
+  
+  return request({
+    url:"/api/manage/getobjecttabledisinfectbyidlist?id="+id,
+    method:"Get",
+    params:params,
+  })
+}
+
+export function updateObjectTableDisinfect(data){
+
+  return request({
+    url:"/api/manage/updateobjecttabledisinfect",
+    method:"post",
+    data:data,
+  })
+}
+
+export function deleteObjectTableDisinfect(id,params){
+
+  return request({
+    url:"/api/manage/deleteobjecttabledisinfect?id="+id,
+    method:"get",
+    params:params
+  })
 }

src/api/manage.js

@@ -737,3 +737,64 @@ export function deleteManageMent(id) {
   })
 }
 
+
+export function getAllDoctorList(params){
+  return request({
+    url:"/api/manage/getalldoctorlist",
+    method:"Get",
+    params:params
+  })
+}
+
+export function saveWaterList(equitmentid,data){
+  
+  return request({
+    url:"/api/manage/savewaterlist?equitment_id="+equitmentid,
+    method:"post",
+    data:data,
+  })
+}
+
+export function getWaterFormList(params){
+  return request({
+    url:"/api/manage/getwaterformlist",
+    method:"get",
+    params:params,
+  })
+}
+
+export function DeleteWater(id,params){
+  
+  return request({
+    url:"/api/manage/dialysisdeletewater?id="+id,
+    method:"Get",
+    params:params
+  })
+}
+
+export function getDialysisWaterDetail(id,params){
+  
+  return request({
+    url:"/api/manage/getdialysiswaterdetail?id="+id,
+    method:"Get",
+    params:params
+  })
+}
+
+export function UpdateDilaysisWater(data,equimentid){
+  
+  return request({
+    url:"/api/manage/updatedialysiswater?equitment_id="+equimentid,
+    method:"post",
+    data:data,
+  })
+}
+
+export function DeleteBatchDialyisWater(data){
+  console.log("data",data)
+  return request({
+    url:"/api/manage/deletebatchdialysiswater",
+    method:"Delete",
+    data:data,
+  })
+}

src/lang/zh.js

@@ -272,8 +272,9 @@ export default {
     histemplate: '处方模版',
     outpatientSickRecord: '人员定点病种备案',
     airDisinfect: '空气消毒',
+    airDisinfectTwo:"空气消毒",
     objectTableDisinfect: '物表消毒',
-
+    objectTableDisinfectTwo:"物表消毒",
     hospitalStation: '住院工作站',
     pastInquiries: '既往查询',
 

src/router/modules/device.js

@@ -48,26 +48,56 @@ export default {
 
       }
     },
+    // {
+    //   path: '/device/airDisinfect',
+    //   component: () => import('@/xt_pages/device/airDisinfect'),
+    //   name: 'airDisinfect',
+    //   meta: {
+    //     title: 'airDisinfect',
+    //     noCache: true,
+
+    //   }
+    // },
     {
-      path: '/device/airDisinfect',
-      component: () => import('@/xt_pages/device/airDisinfect'),
-      name: 'airDisinfect',
+      path: '/device/airDisinfectTwo',
+      component: () => import('@/xt_pages/device/airDisinfectTwo'),
+      name: 'airDisinfectTwo',
       meta: {
-        title: 'airDisinfect',
+        title: 'airDisinfectTwo',
         noCache: true,
 
       }
     },
+    // {
+    //   path: '/device/objectTableDisinfect',
+    //   component: () => import('@/xt_pages/device/objectTableDisinfect'),
+    //   name: 'objectTableDisinfect',
+    //   meta: {
+    //     title: 'objectTableDisinfect',
+    //     noCache: true,
+
+    //   }
+    // },
     {
-      path: '/device/objectTableDisinfect',
-      component: () => import('@/xt_pages/device/objectTableDisinfect'),
-      name: 'objectTableDisinfect',
+      path: '/device/objectNewTableDisinfect',
+      component: () => import('@/xt_pages/device/objectTableDisinfectTwo'),
+      name: 'objectTableDisinfectTwo',
       meta: {
-        title: 'objectTableDisinfect',
+        title: 'objectTableDisinfectTwo',
         noCache: true,
 
       }
-    }
+    },
+    // {
+    //   path: '/device/waterformprint',
+    //   component: () => import('@/xt_pages/management/components/waterFormPrint'),
+    //   name: 'waterFormPrint',
+    //   meta: {
+    //     title: 'waterFormPrint',
+    //     noCache: true,
+
+    //   }
+    // }
 
   ]
 }

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="机表消毒方式:">
+          <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="机表消毒液:">
+          <!-- <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"
@@ -127,6 +145,21 @@
             </el-form-item>
           </el-col>
         </el-row>
+
+        <el-row>
+          <el-col :span="10">
+            <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"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
       <span slot="footer" class="dialog-footer">
         <el-button @click="dialogVisible = false">取 消</el-button>
@@ -154,7 +187,8 @@ export default {
         way: 0,
         machine_disinfectant: 0,
         disinfectant_way: 0,
-        disinfectant: 0
+        disinfectant: 0,
+        bed_way:0,
       },
       value: [],
       timeType: [
@@ -211,6 +245,14 @@ export default {
         { id: 9, name: "5%次氯酸钠" },
         { id: 10,name:"25%的柠檬酸+5%次氯酸钠"},
       ],
+      // 床单位更换
+       bedType: [
+        { id: 0, name: "/" },
+        { id: 1, name: "床单" },
+        { id: 2, name: "被套" },
+        { id: 3, name: "枕套" },
+      
+      ],
       DeviceType: [],
       planid: 0,
       plandata: 0
@@ -230,6 +272,7 @@ export default {
       });
     },
     savePlan(formName) {
+      
       var equimentid = this.equimentid;
       // console.log('equimentid', equimentid);
       var devicetype = this.form.device_type;
@@ -251,21 +294,26 @@ export default {
       var disinfectants = this.form.disinfectant;
       var disinfectant = parseInt(disinfectants);
       this.form.disinfectant = disinfectant;
+      this.form.bed_way = parseInt(this.form.bed_way)
       savePlan(this.form, this.equimentid).then(response => {
         if (response.data.state === 1) {
           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 => {
@@ -286,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/RepairForm.vue

@@ -1,7 +1,8 @@
 <template>
   <div>
+    <div>
     <el-row class="row">
-      <el-col :span="5">
+      <!-- <el-col :span="5">
         <span class="machineClass">机号:</span>
         <el-select style="width:100px" v-model="forms.bed">
           <el-option
@@ -11,7 +12,7 @@
             :value="item.id"
           ></el-option>
         </el-select>
-      </el-col>
+      </el-col> -->
       <el-col :span="11">
         <span class="machineClass">日期查询:</span>
         <el-date-picker
@@ -47,8 +48,13 @@
       <el-col :span="2">
         <el-button size="small" @click="BatchDelete">批量删除</el-button>
       </el-col>
+      <span>&nbsp;&nbsp;</span>
+      <el-col :span="6">
+          <el-button type="primary" size="small" @click="printCard">打印</el-button>
+      </el-col>
     </el-row>
     <el-row>
+
       <el-table
         ref="multipleTable"
         @selection-change="handleSelectionChange"
@@ -62,6 +68,125 @@
         fit
         highlight-current-row
         style="width: 100%;margin-top: 10px;"
+      >
+        <el-table-column
+          align="center"
+          type="selection"
+          width="55"
+        ></el-table-column>
+        <el-table-column prop="date" label="设备名称" width="100" align="center">
+           <template slot-scope="scope">
+              {{ getDeviceName(scope.row.equitment_id) }}
+           </template>
+        </el-table-column>
+
+        <el-table-column prop="date" label= "型号" width="80" align="center">
+          <template slot-scope="scope">
+            <span v-if="getRepairName(scope.row.equitment_id) == 1">透析机</span> 
+            <span v-if="getRepairName(scope.row.equitment_id) == 2">水处理机</span> 
+            <span v-if="getRepairName(scope.row.equitment_id) == 3">其他</span> 
+          </template>
+        </el-table-column>
+
+         <el-table-column label="保养维护内容" align="center" min-width="110px">
+            <el-table-column label="功能及附件检查" align="center" min-width="110px">
+              <template slot-scope="scope">
+                 {{scope.row.function_accessories_inspection }}
+              </template>
+            </el-table-column>
+            <el-table-column label="其他" align="center" min-width="110px">
+              <template slot-scope="scope">
+                 {{ scope.row.other_information }}
+              </template>
+            </el-table-column>
+          </el-table-column>
+
+          <el-table-column label="维修记录" align="center" min-width="110px">
+            <el-table-column label="故障现象" align="center" min-width="110px">
+              <template slot-scope="scope">
+                 {{ scope.row.fault_description }}
+              </template>
+            </el-table-column>
+            <el-table-column label="维修内容" align="center" min-width="110px">
+              <template slot-scope="scope">
+                 {{ scope.row.cause_analysis }}
+              </template>
+            </el-table-column>
+
+            <el-table-column label="维修结果" align="center" min-width="110px">
+              <template slot-scope="scope">
+                {{ scope.row.treatment_process }}
+              </template>
+            </el-table-column>
+          </el-table-column>
+
+          <el-table-column prop="date" label= "维修者" width="80" align="center">
+            <template slot-scope="scope">
+                {{ getName(scope.row.admin_user_id) }}
+              </template>
+           </el-table-column>
+
+           <el-table-column prop="date" label= "日期" width="80" align="center">
+            <template slot-scope="scope">
+              {{ getTime(scope.row.guarantee_date) }}
+              </template>
+           </el-table-column>
+
+           <el-table-column prop="date" label= "备注" width="80" align="center">
+            <template slot-scope="scope">
+              {{ scope.row.reason }}
+              </template>
+           </el-table-column>
+ 
+      
+        
+        <el-table-column label="操作" align="center" min-width="150px">
+          <template slot-scope="scope">
+            <el-tooltip
+              class="item"
+              effect="dark"
+              content="编辑"
+              placement="top"
+            >
+              <el-button
+                size="mini"
+                type="primary"
+                icon="el-icon-edit-outline"
+                @click="
+                  EditRepair(scope.row.id, scope.row.sampler, scope.$index)
+                "
+              ></el-button>
+            </el-tooltip>
+
+            <el-tooltip
+              class="item"
+              effect="dark"
+              content="删除"
+              placement="top"
+            >
+              <el-button
+                size="mini"
+                type="danger"
+                icon="el-icon-delete"
+                @click="DeleteRepairs(scope.row.id, scope.$index)"
+              ></el-button>
+            </el-tooltip>
+          </template>
+        </el-table-column>
+      </el-table>
+      <!-- <el-table
+        ref="multipleTable"
+        @selection-change="handleSelectionChange"
+        :row-style="{ color: '#303133' }"
+        :header-cell-style="{
+          backgroundColor: 'rgb(245, 247, 250)',
+          color: '#606266'
+        }"
+        :data="tableData"
+        border
+        fit
+        highlight-current-row
+        style="width: 100%;margin-top: 10px;"
       >
         <el-table-column
           align="center"
@@ -209,7 +334,7 @@
             </el-tooltip>
           </template>
         </el-table-column>
-      </el-table>
+      </el-table> -->
       <el-pagination
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
@@ -291,6 +416,32 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row>
+          <el-col :span="24">
+              <el-form-item class="formItem" label="功能及附件检查:">
+                  <el-input
+                    type="textarea"
+                    :rows="2"
+                      placeholder="请输入内容"
+                      v-model="guaForm.function_accessories_inspection"
+                    style="width:85%">
+                  </el-input>
+              </el-form-item>
+            </el-col>
+        </el-row>
+        <el-row>
+        <el-col :span="24">
+            <el-form-item class="formItem" label="其他:">
+                <el-input
+                  type="textarea"
+                  :rows="2"
+                    placeholder="请输入内容"
+                    v-model="guaForm.other_information"
+                  style="width:85%">
+                </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
         <el-row>
           <el-col :span="24">
             <el-form-item label="故障发生阶段">
@@ -321,7 +472,7 @@
         </el-row>
         <el-row>
           <el-col :span="8">
-            <el-form-item label="故障描述:" required prop="fault_description">
+            <el-form-item label="故障现象:" required prop="fault_description">
               <el-input
                 type="textarea"
                 :rows="2"
@@ -332,7 +483,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="原因分析:">
+            <el-form-item label="维修内容:">
               <el-input
                 type="textarea"
                 :rows="2"
@@ -343,7 +494,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="处理过程:">
+            <el-form-item label="维修结果:">
               <el-input
                 type="textarea"
                 :rows="2"
@@ -393,7 +544,7 @@
         </el-row>
         <el-row>
           <el-col :span="20">
-            <el-form-item label="原因:">
+            <el-form-item label="备注:">
               <el-input
                 type="textarea"
                 :rows="2"
@@ -404,6 +555,21 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row>
+          <el-col :span="20">
+            <el-form-item label="维修者:">
+              <el-select v-model="guaForm.admin_user_id" placeholder="请选择" >
+                      <el-option
+                      v-for="item in docList"
+                      :key="item.admin_user_id"
+                      :label="item.user_name"
+                      :value="item.admin_user_id"
+                      style="width:185px">
+                      </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
       <span slot="footer" class="dialog-footer">
 <!--        <button @click="lili">调试</button>-->
@@ -413,6 +579,272 @@
         >
       </span>
     </el-dialog>
+
+    <div hidden="hidden">
+      <div id="print-card-info" v-show="hiddenShow">
+        <div>
+          <div class="print_main_content">
+            <div class="order_title">水机使用记录清单</div>
+          </div>
+          <div>
+            <div class="printClass">打印日期:{{ nowTime }}</div>
+            <table
+              border="1"
+              style="width:100%"
+              cellspacing="0"
+              cellpadding="0"
+              class="tableClass"
+            >
+              <tr>
+                <td
+                  :rowspan="2"
+                  style="text-align:center;width:60px;font-size:15px;"
+                >
+                  日期
+                </td>
+              
+               
+                <td
+                  :colspan="4"
+                  style="text-align:center;width:60px;font-size:15px"
+                >
+                  原水参数
+                </td>
+
+                <td
+                  :colspan="2"
+                  style="text-align:center;width:60px;font-size:15px"
+                >
+                  一级反渗
+                </td>
+
+                <td
+                  :colspan="2"
+                  style="text-align:center;width:60px;font-size:15px"
+                >
+                  二级反渗
+                </td>
+
+                <td
+                  :rowspan="2"
+                  style="text-align:center;width:60px;font-size:15px"
+                >
+                 碳罐
+                </td>
+                <td
+                 :rowspan="2"
+                  style="text-align:center;width:60px;font-size:15px"
+                >
+                 砂罐
+                </td>
+
+                <td
+                 :rowspan="2"
+                  style="text-align:center;width:60px;font-size:15px"
+                >
+                 树脂罐
+                </td>
+
+                <td
+                 :rowspan="2"
+                  style="text-align:center;width:60px;font-size:15px"
+                >
+                  静谧过滤器（MPa）
+                </td>
+              
+                <td
+                 :colspan="4"
+                  style="text-align:center;width:60px;font-size:15px"
+                >
+                 水质监测
+                </td>
+
+                <td
+                 :colspan="2"
+                  style="text-align:center;width:60px;font-size:15px"
+                >
+                 消毒
+                </td>
+
+                <td
+                 :rowspan="2"
+                  style="text-align:center;width:60px;font-size:15px"
+                >
+                过滤器更换
+                </td>
+
+                <td
+                 :rowspan="2"
+                  style="text-align:center;width:60px;font-size:15px"
+                >
+                记录人
+                </td>
+               
+              </tr>
+              <tr>
+                <td style="text-align:center;width:70px;font-size:15px">
+                  原水电导度
+                </td>
+                <td style="text-align:center;width:50px;font-size:15px">
+                  原水压力
+                </td>
+                <td style="text-align:center;width:70px;font-size:15px">
+                  温度
+                </td>
+                <td style="text-align:center;width:95px;font-size:15px">
+                  加压泵
+                </td>
+
+                <td style="text-align:center;width:70px;font-size:15px">
+                  产水电导度
+                </td>
+                <td style="text-align:center;width:95px;font-size:15px">
+                  产水量
+                </td>
+
+                <td style="text-align:center;width:70px;font-size:15px">
+                  产水电导度
+                </td>
+                <td style="text-align:center;width:95px;font-size:15px">
+                  产水量
+                </td>
+
+             
+
+                <td style="text-align:center;width:70px;font-size:15px">
+                   硬度(mg/l）
+                </td>
+                <td style="text-align:center;width:95px;font-size:15px">
+                  总氯（mg/l）
+                </td>
+
+                <td style="text-align:center;width:70px;font-size:15px">
+                  PH值
+                </td>
+                <td style="text-align:center;width:95px;font-size:15px">
+                  过氧乙酸(mg/l）
+                </td>
+
+                <td style="text-align:center;width:70px;font-size:15px">
+                  反渗膜消毒
+                </td>
+                <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">
+                 
+                </td>
+               
+                <td style="text-align:center;font-size:15px;height:30px">
+                  
+                </td>
+                <td style="text-align:center;font-size:15px;height:30px">
+                 
+                </td>
+                <td style="text-align:center;font-size:15px;height:30px">
+                 
+                </td>
+                <td style="text-align:center;font-size:15px;height:30px">
+                  
+                </td>
+
+                <td style="text-align:center;font-size:15px;height:30px">
+                
+                </td>
+                <td style="text-align:center;font-size:15px;height:30px">
+                 
+                </td>
+
+                <td style="text-align:center;font-size:15px;height:30px">
+                 
+                </td>
+                <td style="text-align:center;font-size:15px;height:30px">
+                 
+                </td>
+
+                <td
+                  style="text-align:center;width:60px;font-size:15px"
+                >
+                
+                </td>
+                <td
+                  style="text-align:center;width:60px;font-size:15px"
+                >
+                
+                </td>
+
+                <td
+                  style="text-align:center;width:60px;font-size:15px"
+                >
+                 
+                </td>
+
+                <td
+                  style="text-align:center;width:60px;font-size:15px"
+                >
+              
+                </td>
+
+                <td
+                  style="text-align:center;width:60px;font-size:15px"
+                >
+               
+                </td>
+                <td
+                  style="text-align:center;width:60px;font-size:15px"
+                >
+               
+                </td>
+
+                <td
+                  style="text-align:center;width:60px;font-size:15px"
+                >
+                 
+                </td>
+
+                <td
+                  style="text-align:center;width:60px;font-size:15px"
+                >
+                
+                </td>
+
+                <td
+                  style="text-align:center;width:60px;font-size:15px"
+                >
+               
+                </td>
+
+                <td
+                  style="text-align:center;width:60px;font-size:15px"
+                >
+              
+                </td>
+
+                <td
+                  style="text-align:center;width:60px;font-size:15px"
+                >
+                
+                </td>
+                
+                <td style="text-align:center;width:70px;font-size:15px">
+                
+                </td>
+             
+               
+               
+             
+              </tr>
+            </table>
+          </div>
+        </div>
+      </div>
+    </div>
+   </div>
   </div>
 </template>
 
@@ -428,10 +860,13 @@ import {
 } from "@/api/manage";
 import { uParseTime } from "@/utils/tools";
 import { getFileExtension } from "@/utils/tools";
+import print from "print-js";
+const moment = require("moment");
 export default {
   name: "RepairForm",
   data() {
     return {
+      nowTime: moment(new Date()).format("YYYY-MM-DD HH:MM:SS"),
       dialogVisible: false,
       selectCulture: [],
       forms: {
@@ -455,7 +890,10 @@ export default {
         exclude: "",
         reason: "",
         code_information: "",
-        image_name: ""
+        image_name: "",
+        admin_user_id:this.$store.getters.xt_user.user.id,
+        function_accessories_inspection:"",
+        other_information:"",
       },
       isIndeterminate: false,
       checkAllStatus: false,
@@ -483,6 +921,9 @@ export default {
       limit: 10,
       page: 1,
       total: 0,
+      macherList:[],
+      docList:[],
+      hiddenShow:false,
     };
   },
   methods: {
@@ -515,6 +956,10 @@ export default {
         if (response.data.state === 1) {
           var repair = response.data.data.repair;
           console.log("repair是", repair);
+          var macherList = response.data.data.macherList
+         
+          this.macherList = macherList
+          this.docList = response.data.data.docList
           // eslint-disable-next-line no-unused-vars
           var total = response.data.data.total;
           this.total = total;
@@ -553,6 +998,7 @@ export default {
               repair[index].exclude = "未解决";
             }
           }
+          console.log("repair------",repair)
           this.tableData = repair;
         }
       });
@@ -575,6 +1021,7 @@ export default {
         if (response.data.state === 1) {
           var repair = response.data.data.repair;
           console.log("repair", repair);
+          this.docList = response.data.data.docList
           this.guaForm.guarantee_date = uParseTime(
             repair.guarantee_date,
             "{y}-{m}-{d}"
@@ -602,6 +1049,9 @@ export default {
           this.guaForm.code_information = repair.code_information;
           this.guaForm.id = repair.id;
           this.filename = repair.image_name;
+          this.guaForm.admin_user_id = repair.admin_user_id
+          this.guaForm.function_accessories_inspection = repair.function_accessories_inspection
+          this.guaForm.other_information= repair.other_information
         }
       });
     },
@@ -807,7 +1257,51 @@ export default {
           }
         });
       });
-    }
+    },
+    getDeviceName(id){
+      var device_name= ""
+      for(let i=0;i<this.macherList.length;i++){
+        if(id == this.macherList[i].id){
+           device_name = this.macherList[i].device_name
+        }
+      }
+      return device_name
+    },
+    getRepairName(id){
+      var device_type= ""
+      for(let i=0;i<this.macherList.length;i++){
+        if(id == this.macherList[i].id){
+          device_type = this.macherList[i].device_type
+        }
+      }
+      return device_type
+    },
+    getName(admin_user_id){
+      var user_name = ""
+      for(let i=0;i<this.docList.length;i++){
+        if(admin_user_id == this.docList[i].admin_user_id){
+           user_name = this.docList[i].user_name
+        }
+      }
+      return user_name
+    },
+    printCard() {
+        this.hiddenShow = true;
+        var ptime = Math.round(new Date().getTime() / 1000);
+        this.print_time = uParseTime(ptime, "{y}年{m}月{d}日");
+
+        const style =
+          "@media print {.print_main_content { background-color: white; width:960px; margin:0 auto; padding: 0 0 20px 0;font-size:15px } .print_main_content .order_title { text-align: center; font-size: 15px; line-height: 50px;} .print_main_content table { width: 100%; border: 1px solid; border-collapse: collapse; padding: 2px;font-size:15px } .print_main_content table tbody tr td { border: 1px solid; text-align: center; padding: 10px 8px;font-size:15px } .td_proj_title { font-size: 15px; line-height: 25px;} .td_proj_content { font-size: 15px; line-height: 25px; } .td_align_left { text-align: left; } .print_footnote_panel { font-size: 15px; line-height: 40px; } .print_footnote_panel .proj { display: inline-block; width: 49%; } .print_footnote_panel .proj}";
+
+        setTimeout(() => {
+          printJS({
+            printable: "print-card-info",
+            type: "html",
+            style: style,
+            scanStyles: false
+          });
+        }, 1);
+      },
   },
   created() {
     this.getAllSubregion();
@@ -816,8 +1310,30 @@ export default {
 };
 </script>
 
+
 <style scoped>
+
 .row {
   margin-bottom: 10px;
 }
+.a {
+  /* .el-col-2 {
+    width: 8.33333%;
+    margin-bottom: 20px;
+  } */
+}
+.print_main_content {
+  background-color: white;
+  width: 960px;
+  margin: 0 auto;
+  padding: 0 0 20px 0;
+}
+.tableClass {
+  font-size: 10px;
+  font-weight: none;
+}
+.printClass {
+  width: 100%;
+  text-align: right;
+}
 </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>
@@ -100,13 +101,13 @@
         <el-table-column label="透析方式" align="center" min-width="90px">
           <template slot-scope="scope">{{ scope.row.dialysis_mode }}</template>
         </el-table-column>
-        <!-- <el-table-column label="使用次数" align="center" min-width="110px">
+        <el-table-column label="使用次数" align="center" min-width="110px">
           <template slot-scope="scope">{{ scope.row.user_total }}</template>
-        </el-table-column>-->
+        </el-table-column>
         <el-table-column label="运行" align="center" min-width="110px">
           <template slot-scope="scope">{{ scope.row.move }}</template>
         </el-table-column>
-        <el-table-column label="机表（床单元、床旁桌）消毒" align="center" min-width="110px">
+        <el-table-column label="机表(床单元、床旁桌)消毒" align="center" min-width="110px">
           <el-table-column label="消毒方式" align="center" min-width="110px">
             <template slot-scope="scope">{{
               scope.row.disinfect_type
@@ -323,7 +324,7 @@
                 </template>
               </el-autocomplete>
             </el-form-item>
-         
+
           </el-col>
           <el-col :span="8">
             <el-form-item label="传染病:">
@@ -475,7 +476,7 @@
         </el-row>
         <el-row>
           <el-col :span="2">
-            <el-form-item label="①机表"></el-form-item>
+            <el-form-item label="①机表(床单元、床旁桌)"></el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="消毒方式:" style="width:200px">
@@ -684,7 +685,7 @@
               >桶
             </el-form-item>
             <span style="color:red" v-show="showone"
-              >您已三个月未更换,请注意检测</span
+              >您已一个月未更换,请注意检测</span
             >
           </el-col>
         </el-row>
@@ -711,7 +712,7 @@
             >
               <el-checkbox v-model="userform.germ_checked">更换</el-checkbox>
               <span style="color:red" v-show="showone"
-                >您已三个月未更换,请注意检测</span
+                >您已一个月未更换,请注意检测</span
               >
             </el-form-item>
           </el-col>
@@ -750,7 +751,7 @@
             >
               <el-checkbox v-model="userform.clean">清洁:</el-checkbox>
               <span style="color:red" v-show="showone"
-                >您已三个月未清洁,请检查</span
+                >您已一个月未清洁,请检查</span
               >
             </el-form-item>
           </el-col>
@@ -827,6 +828,12 @@
                 >
                   透析方式
                 </td>
+                <td
+                  :rowspan="2"
+                  style="text-align:center;width:60px;font-size:15px"
+                >
+                  使用次数
+                </td>
                 <td
                   :rowspan="2"
                   style="text-align:center;width:60px;font-size:15px"
@@ -837,7 +844,7 @@
                   :colspan="4"
                   style="text-align:center;width:60px;font-size:15px"
                 >
-                  机表消毒
+                  机表(床单元、床旁桌)消毒
                 </td>
                 <td
                   :colspan="5"
@@ -845,6 +852,24 @@
                 >
                   液路消毒
                 </td>
+                <td
+                  :rowspan="2"
+                  style="text-align:center;width:80px;font-size:15px"
+                >
+                 透析机消毒液(更换)
+                </td>
+                <td
+                  :rowspan="2"
+                  style="text-align:center;width:80px;font-size:15px"
+                >
+                 细菌过滤器(更换)
+                </td>
+                <td
+                  :rowspan="2"
+                  style="text-align:center;width:80px;font-size:15px"
+                >
+                 空气滤网
+                </td>
                 <td
                   :rowspan="2"
                   style="text-align:center;width:80px;font-size:15px"
@@ -897,6 +922,9 @@
                 <td style="text-align:center;font-size:15px;height:30px">
                   {{ item.dialysis_mode }}
                 </td>
+                <td style="text-align:center;font-size:15px;height:30px">
+                  {{ item.user_total }}
+                </td>
                 <td style="text-align:center;font-size:15px;height:30px">
                   {{ item.move }}
                 </td>
@@ -927,6 +955,16 @@
                 <td style="text-align:center;font-size:15px;height:30px">
                   {{ item.disinfection_residue }}
                 </td>
+                <td style="text-align:center;font-size:15px;height:30px">
+                   {{item.dialysis_checked }}
+                </td>
+                <td style="text-align:center;font-size:15px;height:30px">
+                  {{item.germ_checked }}
+                </td>
+                <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>
@@ -1169,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++) {
@@ -1252,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";
             }
@@ -1526,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(
@@ -1548,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;
@@ -1564,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;
@@ -1605,7 +1643,7 @@ export default {
           if (device.disinfection === 0) {
             this.userform.disinfection = "";
           }
-          this.userform.user_total = totals.toString() 
+          this.userform.user_total = totals.toString()
         }
       });
     },
@@ -1721,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;
@@ -1846,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";
             }
@@ -1863,8 +1901,8 @@ export default {
               information[index].dialysis_mode = "PE";
             }
 
-           
- 
+
+
             if (information[index].move === 0) {
               information[index].move = "";
             }
@@ -2084,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)
@@ -2187,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";
             }
@@ -2493,7 +2531,69 @@ 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_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']
+            const filterVal = ['index','bed','record_date_str','class','name','dialysis_mode','user_total','move','disinfect_type','disinfectant_type','disinfection','dialysis_concentration','fluid_path','disinfectant','disinfec_startime_str','disinfec_endtime_str','long_time','disinfection_status','disinfection_residue','dialysis_checked','germ_checked','clean','user_name']
+            const data = this.formatJson(filterVal, this.tableData)
+
+            const filename = '透析机使用登记'
+
+            console.log("rwwwwwwwwwww",this.tableData)
+
+            excel.export_json_to_excel({
+              multiHeader,
+              header,
+              merges,
+              data,
+              filename
+            })
+          })
+      },
+      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

@@ -0,0 +1,465 @@
+<template>
+    <div id="water-form">
+        <el-form ref="form" :rules="rules" :model="form">
+         <el-row>
+            <el-col>
+                <el-form-item label="日期:" required prop="record_date" class="st">
+                    <el-date-picker
+                    v-model="form.record_date"
+                    prefix-icon="none"
+                    type="date"
+                    placeholder="请选择"
+                    format="yyyy-MM-dd"
+                    value-format="yyyy-MM-dd"
+                    style="width:150px">
+                    </el-date-picker>
+                </el-form-item>
+            </el-col>
+         </el-row>
+         <el-row>
+            <el-col>
+                <el-form-item label="设备运行状态:"  class="st">
+                    <el-radio v-model="form.machine_status" label="1">正常</el-radio>
+                    <el-radio v-model="form.machine_status" label="2">故障</el-radio>
+                </el-form-item>
+            </el-col>
+         </el-row>
+         <el-row>
+            <el-col>
+                <el-form-item label="故障描述:"  class="st">
+                    <el-input type="textarea" v-model="form.fault_description" style="width:600px"></el-input>
+                </el-form-item>
+            </el-col>
+         </el-row>
+         <el-row>
+            <span>原水参数</span>
+         </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" 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" 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" oninput="value=value.replace(/[^\d^\.]/g,'')" maxlength='4'></el-input>
+                </el-form-item>
+            </el-col>
+         </el-row>
+         <el-row>
+            <el-col :span="24">
+                <el-form-item label="加压泵:"  class="st">
+                    <el-radio v-model="form.force_pump_status" label="1">正常</el-radio>
+                    <el-radio v-model="form.force_pump_status" label="2">故障</el-radio>
+                </el-form-item>
+            </el-col>
+         </el-row>
+         <el-row>
+            <span>反渗一级</span>
+         </el-row>
+         <el-row>
+            <el-col :span="8">
+                <el-form-item label="RO膜进水:"  class="st">
+                    <el-input  v-model="form.first_ro_membrane_water" type="number" style="width:100px"></el-input>
+                </el-form-item>
+            </el-col>
+            <el-col :span="8">
+                <el-form-item label="RO膜浓水:"  class="st">
+                    <el-input  v-model="form.first_ro_film_thick_water" type="number" style="width:100px"></el-input>
+                </el-form-item>
+            </el-col>
+            <el-col :span="8">
+                <el-form-item label="RO膜出水:"  class="st">
+                    <el-input  v-model="form.first_ro_membrane_effluent" type="number" style="width:100px"></el-input>
+                </el-form-item>
+            </el-col>
+         </el-row>
+         <el-row>
+            <el-col :span="8">
+                <el-form-item label="产水电导度(μs/cm):"  class="st">
+                    <el-input  v-model="form.first_production_of_water_conductivity" type="number" style="width:100px"></el-input>
+                </el-form-item>
+            </el-col>
+            <el-col :span="8">
+                <el-form-item label="产水量(L/h):"  class="st">
+                    <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>
+         </el-row>
+         <el-row>
+            <el-col :span="8">
+                <el-form-item label="RO膜进水:"  class="st">
+                    <el-input  v-model="form.last_ro_membrane_water" type="number" style="width:100px"></el-input>
+                </el-form-item>
+            </el-col>
+            <el-col :span="8">
+                <el-form-item label="RO膜浓水:"  class="st">
+                    <el-input  v-model="form.last_ro_film_thick_water" type="number" style="width:100px"></el-input>
+                </el-form-item>
+            </el-col>
+            <el-col :span="8">
+                <el-form-item label="RO膜出水:"  class="st">
+                    <el-input  v-model="form.last_ro_membrane_effluent" type="number" style="width:100px"></el-input>
+                </el-form-item>
+            </el-col>
+         </el-row>
+         <el-row>
+            <el-col :span="8">
+                <el-form-item label="产水电导度(μs/cm):"  class="st">
+                    <el-input  v-model="form.last_production_of_water_conductivity" type="number" style="width:100px"></el-input>
+                </el-form-item>
+            </el-col>
+            <el-col :span="8">
+                <el-form-item label="产水量(L/h):"  class="st">
+                    <el-input  v-model="form.last_water_yield" type="number" style="width:100px"></el-input>
+                </el-form-item>
+            </el-col>
+         </el-row>
+
+         <el-row>
+            <el-col :span="8">
+                <el-form-item label="碳罐(MPa):"  class="st">
+                    <el-input  v-model="form.carbon_tank" type="number" style="width:100px"></el-input>
+                </el-form-item>
+            </el-col>
+            <el-col :span="8">
+                <el-form-item label="砂罐(MPa):"  class="st">
+                    <el-input  v-model="form.snd_tank" type="number" style="width:100px"></el-input>
+                </el-form-item>
+            </el-col>
+            <el-col :span="8">
+                <el-form-item label="树脂罐(MPa):"  class="st">
+                    <el-input  v-model="form.resin_tank" type="number" style="width:100px"></el-input>
+                </el-form-item>
+            </el-col>
+         </el-row>
+         <el-row>
+            <el-col :span="8">
+                <el-form-item label="精密过滤器（MPa):"  class="st">
+                    <el-input  v-model="form.ultrafilter" type="number" style="width:100px"></el-input>
+                </el-form-item>
+            </el-col>
+         </el-row>
+
+         <el-row>
+            <span>水质监测</span>
+         </el-row>
+
+         <el-row>
+            <el-col :span="8">
+                <el-form-item label="硬度监测(mg/l):"  class="st">
+                    <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" 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" style="width:100px"
+                     oninput="value=value.replace(/[^\d^\.]/g,'')" maxlength='4'></el-input>
+                </el-form-item>
+            </el-col>
+         </el-row>
+
+         <el-row>
+            <el-col :span="8">
+                <el-form-item label="过氧乙酸浓度(mg/l):"  class="st">
+                    <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>
+
+         <el-row>
+            <el-col :span="8">
+                <el-checkbox v-model="form.reverse_osmosis_membrane_disinfection">反渗膜消毒</el-checkbox>
+            </el-col>
+            <el-col :span="8">
+                <el-form-item label="消毒方式:"  class="st">
+                    <el-select style="width:135px" v-model="form.first_disinfection_method">
+                        <el-option
+                        v-for="item in this.disinfectionType"
+                        :key="item.id"
+                        :label="item.name"
+                        :value="item.id"
+                        ></el-option>
+                     </el-select>
+                </el-form-item>
+            </el-col>
+            <el-col :span="8">
+                <el-form-item label="时长(h):"  class="st">
+                    <el-input  v-model="form.first_disinfection_time" type="number" style="width:100px"></el-input>
+                </el-form-item>
+            </el-col>
+         </el-row>
+
+         <el-row>
+            <el-col :span="8">
+                <el-checkbox v-model="form.disinfection_of_water_pipeline">输水管道消毒</el-checkbox>
+            </el-col>
+            <el-col :span="8">
+                <el-form-item label="消毒方式:"  class="st">
+                    <el-select style="width:135px" v-model="form.last_disinfection_method">
+                        <el-option
+                        v-for="item in this.disinfectionType"
+                        :key="item.id"
+                        :label="item.name"
+                        :value="item.id"
+                        ></el-option>
+                     </el-select>
+                </el-form-item>
+            </el-col>
+            <el-col :span="8">
+                <el-form-item label="时长(h):"  class="st">
+                    <el-input  v-model="form.last_disinfection_time" type="number" style="width:100px"></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" 
+                    oninput="value=value.replace(/[^\d^\.]/g,'')" maxlength='4'></el-input>
+                </el-form-item>
+            </el-col>
+
+            <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="记录人:" 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"
+                    :key="item.admin_user_id"
+                    :label="item.user_name"
+                    :value="item.admin_user_id"
+                    ></el-option>
+                 </el-select>
+              </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>
+const moment = require('moment')
+import {getAllDoctorList,saveWaterList} from "@/api/manage";
+ export default {
+    name: "WaterForm",
+    props: {
+    equimentid: Number
+  },
+    data(){
+        return{
+            form:{
+              record_date: moment(new Date()).format('YYYY-MM-DD'), // 日期
+              machine_status:"1",//设备运行状态
+              fault_description:"",//故障描述
+              water_conductivity:"",//原水电导度
+              water_pressure:"",//原水压力
+              temperature:"",//温度
+              force_pump_status:"1",//加压泵
+
+              first_ro_membrane_water:"",//ro膜进水
+              first_ro_film_thick_water:"",//RO膜浓水
+              first_ro_membrane_effluent:"",//RO膜出水
+              first_production_of_water_conductivity:"",//产水电导度
+              first_water_yield:"",//产水量
+
+              last_ro_membrane_water:"",//ro膜进水
+              last_ro_film_thick_water:"",//ro膜进水
+              last_ro_membrane_effluent:"",
+              last_production_of_water_conductivity:"",//产水电导度
+              last_water_yield:"",//产水量
+             
+              carbon_tank:"",//碳罐
+              snd_tank:"",//砂罐,
+              resin_tank:"",//树脂罐
+              ultrafilter:"",//精密过滤器
+              hardness_monitoring:"",//硬度监测
+              total_chlorine_detection:"",//总录检测,
+              ph_detection:"",//PH值检测,
+              concentration_of_peroxyacetic_acid:"",//过氧乙酸浓度,
+              reverse_osmosis_membrane_disinfection:"",//反渗膜消毒
+              disinfection_of_water_pipeline:"",//输水管道消毒
+              first_disinfection_method:"",//消毒方式
+              last_disinfection_method:"",//消毒方式
+              first_disinfection_time:"",//消毒时长
+              last_disinfection_time:"",//消毒时长
+              remark:"",//备注
+              filter_replacement:"",//过滤器更换
+              admin_user_id:"",//记录人
+              
+            },
+            machineType:[
+               {id:0,name:"全部"}, 
+               {id:1,name:"正常"}, 
+               {id:2,name:"故障"}, 
+            ],
+            forcePumpList:[
+              {id:0,name:"全部"},
+              {id:1,name:"正常"},
+              {id:2,name:"故障"},
+            ],
+            disinfectionType:[
+            { id: 0, name: "请选择" },
+            { id: 1, name: "热消毒" },
+            { id: 2, name: "化学消毒" }   
+            ],
+            checked:"",
+            rules: {
+             admin_user_id: [{ required: true, message: '请选择记录人' }],
+           },
+           nurseList:[],
+        }
+
+    },
+    methods:{
+        saveWater(formName){
+        // console.log("form",this.form,this.equimentid)
+        this.form.force_pump_status = parseInt(this.form.force_pump_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.reverse_osmosis_membrane_disinfection == false){
+           this.form.reverse_osmosis_membrane_disinfection = 2
+        }
+        if(this.form.disinfection_of_water_pipeline == true){
+          this.form.disinfection_of_water_pipeline = 1
+        }
+        if(this.form.disinfection_of_water_pipeline == false){
+          this.form.disinfection_of_water_pipeline = 2
+        }
+
+        this.form.water_conductivity = parseFloat(this.form.water_conductivity)
+        this.form.water_pressure = parseFloat(this.form.water_pressure)
+        this.form.temperature = parseFloat(this.form.temperature)
+        this.form.force_pump_status = parseFloat(this.form.force_pump_status)
+        this.form.first_ro_membrane_water = parseFloat(this.form.first_ro_membrane_water)
+        this.form.first_ro_film_thick_water = parseFloat(this.form.first_ro_film_thick_water)
+        this.form.first_ro_membrane_effluent =parseFloat(this.form.first_ro_membrane_effluent)
+        this.form.first_production_of_water_conductivity = parseFloat(this.form.first_production_of_water_conductivity)
+        this.form.first_water_yield = parseFloat(this.form.first_water_yield)
+        this.form.last_ro_membrane_water = parseFloat(this.form.last_ro_membrane_water)
+        this.form.last_ro_membrane_effluent = parseFloat(this.form.last_ro_membrane_effluent)
+        this.form.last_ro_film_thick_water = parseFloat(this.form.last_ro_film_thick_water)
+        this.form.last_production_of_water_conductivity = parseFloat(this.form.last_production_of_water_conductivity)
+        this.form.last_water_yield = parseFloat(this.form.last_water_yield)
+        this.form.carbon_tank = parseFloat(this.form.carbon_tank)
+        this.form.snd_tank = parseFloat(this.form.snd_tank)
+        this.form.resin_tank= parseFloat(this.form.resin_tank)
+        this.form.ultrafilter = parseFloat(this.form.ultrafilter)
+        this.form.hardness_monitoring = parseFloat(this.form.hardness_monitoring)
+        this.form.total_chlorine_detection = parseFloat(this.form.total_chlorine_detection)
+        this.form.ph_detection = parseFloat(this.form.ph_detection)
+        this.form.concentration_of_peroxyacetic_acid = parseFloat(this.form.concentration_of_peroxyacetic_acid)
+        this.form.reverse_osmosis_membrane_disinfection= parseFloat(this.form.reverse_osmosis_membrane_disinfection)
+        this.form.first_disinfection_method = parseFloat(this.form.first_disinfection_method)
+        this.form.last_disinfection_method = parseFloat(this.form.last_disinfection_method)
+        this.form.first_disinfection_time = parseFloat(this.form.first_disinfection_time)
+        this.form.last_disinfection_time = parseFloat(this.form.last_disinfection_time)
+        this.form.filter_replacement = parseFloat(this.form.filter_replacement)
+        this.form.admin_user_id = parseFloat(this.form.admin_user_id)
+        this.form.disinfection_of_water_pipeline = parseFloat(this.form.disinfection_of_water_pipeline)
+        console.log("fomr=================",this.form)
+         this.$refs[formName].validate((valid) => {
+          if (valid) {
+            saveWaterList(this.equimentid,this.form).then(response=>{
+             if(response.data.state == 1){
+                var deviceWater =  response.data.data.deviceWater
+                console.log("保存成功!",deviceWater)
+                this.$message.success("保存成功!")
+
+                this.form.fault_description = ""
+                this.form.water_conductivity = ""
+                this.form.water_pressure = ""
+                this.form.temperature = ""
+                this.form.first_ro_membrane_water = ""
+                this.form.first_ro_film_thick_water = ""
+                this.form.first_ro_membrane_effluent=""
+                this.form.first_production_of_water_conductivity = ""
+                this.form.first_water_yield = ""
+                this.form.last_ro_membrane_water= ""
+                this.form.last_ro_film_thick_water= ""
+                this.form.last_ro_membrane_effluent = ""
+                this.form.last_production_of_water_conductivity = ""
+                this.form.last_water_yield = ""
+                this.form.carbon_tank = ""
+                this.form.snd_tank = ""
+                this.form.resin_tank= ""
+                this.form.ultrafilter= ""
+                this.form.hardness_monitoring = ""
+                this.form.total_chlorine_detection= ""
+                this.form.concentration_of_peroxyacetic_acid = ""
+                this.form.reverse_osmosis_membrane_disinfection = ""
+                this.form.disinfection_of_water_pipeline= ""
+                this.form.first_disinfection_method = ""
+                this.form.last_disinfection_method = ""
+                this.form.first_disinfection_time = ""
+                this.form.last_disinfection_time = ""
+                this.form.remark = ""
+                this.form.filter_replacement = ""
+             }
+           })
+
+          }
+        })
+       },
+       getAllDoctorList(){
+         getAllDoctorList().then(response=>{
+           if(response.data.state == 1){
+             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])
+              }
+             }
+
+           }
+         })
+       }
+    },
+    created(){
+      
+       this.getAllDoctorList()
+    }
+ }
+</script>
+<style >
+.newMain .el-form-item__label {
+    width: 110px !important;
+}
+</style>

src/xt_pages/management/components/waterFormPrint.vue

@@ -0,0 +1,157 @@
+<template>
+    <div hidden="hidden">
+      <div id="print-card-info" v-show="hiddenShow">
+        <div>
+          <div class="print_main_content">
+            <div class="order_title">设备使用记录清单</div>
+          </div>
+          <div>
+            <div class="printClass">打印日期:{{ nowTime }}</div>
+            <table
+              border="1"
+              style="width:100%"
+              cellspacing="0"
+              cellpadding="0"
+              class="tableClass"
+            >
+              <tr>
+                <td
+                  :rowspan="2"
+                  style="text-align:center;width:60px;font-size:15px;"
+                >
+                  机号
+                </td>
+                <td
+                  :rowspan="2"
+                  style="text-align:center;width:100px;font-size:15px"
+                >
+                  日期
+                </td>
+                <td
+                  :rowspan="2"
+                  style="text-align:center;width:50px;font-size:15px"
+                >
+                  班次
+                </td>
+                <td
+                  :rowspan="2"
+                  style="text-align:center;width:70px;font-size:15px"
+                >
+                  患者
+                </td>
+                <td
+                  :rowspan="2"
+                  style="text-align:center;width:60px;font-size:15px"
+                >
+                  透析方式
+                </td>
+                <td
+                  :rowspan="2"
+                  style="text-align:center;width:60px;font-size:15px"
+                >
+                  运行
+                </td>
+                <td
+                  :colspan="4"
+                  style="text-align:center;width:60px;font-size:15px"
+                >
+                  机表消毒
+                </td>
+                <td
+                  :colspan="5"
+                  style="text-align:center;width:80px;font-size:15px"
+                >
+                  液路消毒
+                </td>
+                <td
+                  :rowspan="2"
+                  style="text-align:center;width:80px;font-size:15px"
+                >
+                  签名
+                </td>
+              </tr>
+              <tr>
+                <td style="text-align:center;width:70px;font-size:15px">
+                  消毒方式
+                </td>
+                <td style="text-align:center;width:50px;font-size:15px">
+                  消毒液
+                </td>
+                <td style="text-align:center;width:70px;font-size:15px">
+                  消毒状态
+                </td>
+                <td style="text-align:center;width:95px;font-size:15px">
+                  消毒液浓度
+                </td>
+                <td style="text-align:center;width:70px;font-size:15px">
+                  消毒方式
+                </td>
+                <td style="text-align:center;width:50px;font-size:15px">
+                  消毒液
+                </td>
+                <td style="text-align:center;width:70px;font-size:15px">
+                  消毒时长/min
+                </td>
+                <td style="text-align:center;width:70px;font-size:15px">
+                  消毒状态
+                </td>
+                <td style="text-align:center;width:70px;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">
+                 
+                </td>
+                <td style="text-align:center;font-size:15px;height:30px">
+                 
+                </td>
+                <td style="text-align:center;font-size:15px;height:30px">
+                 
+                </td>
+                <td style="text-align:center;font-size:15px;height:30px">
+                 
+                </td>
+                <td style="text-align:center;font-size:15px;height:30px">
+                 
+                </td>
+                <td style="text-align:center;font-size:15px;height:30px">
+                
+                </td>
+                <td style="text-align:center;font-size:15px;height:30px">
+                 
+                </td>
+                <td style="text-align:center;font-size:15px;height:30px">
+                  
+                </td>
+                <td style="text-align:center;font-size:15px;height:30px">
+                
+                </td>
+                <td style="text-align:center;font-size:15px;height:30px">
+                 
+                </td>
+                <td style="text-align:center;font-size:15px;height:30px">
+                 
+                </td>
+                <td style="text-align:center;font-size:15px;height:30px">
+                
+                </td>
+                <td style="text-align:center;font-size:15px;height:30px">
+                  
+                </td>
+                <td style="text-align:center;font-size:15px;height:30px">
+                 
+                </td>
+                <td style="text-align:center;font-size:15px;height:30px">
+                  
+                </td>
+                <td style="text-align:center;font-size:15px;height:30px">
+                 
+                </td>
+              </tr>
+            </table>
+          </div>
+        </div>
+      </div>
+    </div>
+</template>

src/xt_pages/management/home.vue

@@ -773,12 +773,12 @@
                                                     {{scope.row.classtime}}
                                                  </template>
                                         </el-table-column>
-                                         <el-table-column label="机表消毒方式" align="center" min-width="110px" >
+                                         <el-table-column label="机表(床单元、床旁桌)消毒方式" align="center" min-width="110px" >
                                                 <template slot-scope="scope">
                                                     {{scope.row.way}}
                                                  </template>
                                         </el-table-column>
-                                         <el-table-column label="机表消毒液" align="center" min-width="100px"  >
+                                         <el-table-column label="机表(床单元、床旁桌)消毒液" align="center" min-width="100px"  >
                                                 <template slot-scope="scope">
                                                      {{scope.row.machine_disinfectant}}
                                                  </template>
@@ -792,6 +792,14 @@
                                                 <template slot-scope="scope">
                                                     {{scope.row.disinfectant}}
                                                  </template>
+                                        </el-table-column>
+                                        <el-table-column label="床单位更换" align="center" min-width="100px" >
+                                                <template slot-scope="scope">
+                                                   <span v-if="scope.row.bed_way ==0">/</span>
+                                                   <span v-if="scope.row.bed_way ==1">床单</span>
+                                                   <span v-if="scope.row.bed_way ==2">被套</span>
+                                                   <span v-if="scope.row.bed_way ==3">枕套</span>
+                                                 </template>
                                         </el-table-column>
                                          <el-table-column label="消毒时长/min" align="center" min-width="60px" >
                                                 <template slot-scope="scope">
@@ -863,12 +871,12 @@
                                                     {{scope.row.classtime}}
                                                  </template>
                                         </el-table-column>
-                                         <el-table-column label="基表消毒方式" align="center" min-width="110px"  >
+                                         <el-table-column label="机表(床单元、床旁桌)消毒方式" align="center" min-width="110px"  >
                                                 <template slot-scope="scope">
                                                     {{scope.row.way}}
                                                  </template>
                                         </el-table-column>
-                                         <el-table-column label="基表消毒液" align="center" min-width="100px"  >
+                                         <el-table-column label="机表(床单元、床旁桌)消毒液" align="center" min-width="100px"  >
                                                 <template slot-scope="scope">
                                                    {{scope.row.machine_disinfectant}}
                                                  </template>
@@ -882,6 +890,15 @@
                                                 <template slot-scope="scope">
                                                    {{scope.row.disinfectan_way}}
                                                  </template>
+                                        </el-table-column>
+                                        <el-table-column label="床单位更换" align="center" min-width="100px" >
+                                                <template slot-scope="scope">
+                                                  
+                                                   <span v-if="scope.row.bed_way ==0">/</span>
+                                                   <span v-if="scope.row.bed_way ==1">床单</span>
+                                                   <span v-if="scope.row.bed_way ==2">被套</span>
+                                                   <span v-if="scope.row.bed_way ==3">枕套</span>
+                                                 </template>
                                         </el-table-column>
                                          <el-table-column label="消毒时长/min" align="center" min-width="60px" >
                                                 <template slot-scope="scope">
@@ -920,8 +937,6 @@
                        </div>
                    </el-tab-pane>
 
-
-
                    <el-tab-pane label="使用登记" name="third">
                        <div class="userbutton">
                           <el-button type="primary" @click="ToReminders">自动生成使用登记</el-button>
@@ -930,7 +945,7 @@
                         <el-tabs type="border-card" v-model="activeNameThree" @tab-click="handleClick">
                           <el-tab-pane label="新增使用登记" name="first">
 
-                             <el-form :model="userform" ref="userform" :rules="userRules">
+                             <el-form :model="userform" ref="userform" :rules="userRules" v-if="device_type == 1">
                                 <el-row>
                                   <el-col :span="8">
                                      <el-form-item label="日期:" required prop="date" class="st">
@@ -1108,7 +1123,7 @@
                                 </el-row>
                                 <el-row>
                                   <el-col :span="3">
-                                      <el-form-item label="①机表(床单位、床旁桌)"></el-form-item>
+                                      <el-form-item label="①机表(床单元,床旁桌)"></el-form-item>
                                   </el-col>
                                   <el-col :span="10">
                                      <el-form-item label="消毒方式:" required prop="disinfect_type">
@@ -1275,7 +1290,7 @@
                                       <el-form-item label="规格:">
                                           <el-input style="width:100px" v-model="userform.norms"></el-input><span style="color:#606266;">桶</span>
                                       </el-form-item>
-                                       <span class="warn" v-show="warnShow">您已三个月未更换,请注意检测</span>
+                                       <span class="warn" v-show="warnShow">您已一个月未更换,请注意检测</span>
                                    </el-col>
                                 </el-row>
                                 <el-row>
@@ -1292,7 +1307,7 @@
                                    <el-col :span="8">
                                      <el-form-item label="细菌过滤器:">
                                        <el-checkbox v-model="userform.germ_checked">更换</el-checkbox>
-                                       <span class="warn" v-show="warnShowTwo">您已三个月未更换,请注意检测</span>
+                                       <span class="warn" v-show="warnShowTwo">您已一个月未更换,请注意检测</span>
                                      </el-form-item>
 
                                      </el-col>
@@ -1319,7 +1334,7 @@
                                    <el-col :span="8">
                                       <el-form-item label="空气滤网清洁:">
                                         <el-checkbox v-model="userform.clean">清洁</el-checkbox>
-                                      <span class="warn" v-show="warnShowThree">您已三个月未清洁,请检查</span>
+                                      <span class="warn" v-show="warnShowThree">您已一个月未清洁,请检查</span>
                                       </el-form-item>
                                      </el-col>
                                    <el-col :span="8">
@@ -1347,10 +1362,14 @@
                                   </div>
                                 </el-row>
                              </el-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"></user-form>
+
+                           <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>
                            </el-tab-pane>
                        </el-tabs>
                      </div>
@@ -2297,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">
@@ -2360,6 +2380,32 @@
                                   </el-form-item>
                                </el-col>
                              </el-row>
+                             <el-row>
+                              <el-col :span="24">
+                                  <el-form-item class="formItem" label="功能及附件检查:">
+                                     <el-input
+                                        type="textarea"
+                                        :rows="2"
+                                         placeholder="请输入内容"
+                                         v-model="guaForm.function_accessories_inspection"
+                                        style="width:85%">
+                                     </el-input>
+                                  </el-form-item>
+                                </el-col>
+                             </el-row>
+                             <el-row>
+                              <el-col :span="24">
+                                  <el-form-item class="formItem" label="其他:">
+                                     <el-input
+                                        type="textarea"
+                                        :rows="2"
+                                         placeholder="请输入内容"
+                                         v-model="guaForm.other_information"
+                                        style="width:85%">
+                                     </el-input>
+                                  </el-form-item>
+                                </el-col>
+                             </el-row>
                              <el-row>
                                <el-col :span="24">
                                   <el-form-item label="故障发生阶段">
@@ -2384,7 +2430,7 @@
                              </el-row>
                              <el-row>
                                 <el-col :span="8">
-                                    <el-form-item label="故障描述:" required prop="fault_description">
+                                    <el-form-item label="故障现象:" required prop="fault_description">
                                         <el-input
                                            type="textarea"
                                            :rows="2"
@@ -2395,7 +2441,7 @@
                                     </el-form-item>
                                 </el-col>
                                  <el-col :span="8">
-                                    <el-form-item label="原因分析:">
+                                    <el-form-item label="维修内容:">
                                         <el-input
                                            type="textarea"
                                            :rows="2"
@@ -2406,7 +2452,7 @@
                                     </el-form-item>
                                 </el-col>
                                  <el-col :span="8">
-                                    <el-form-item label="处理过程:">
+                                    <el-form-item label="维修结果:">
                                         <el-input
                                            type="textarea"
                                            :rows="2"
@@ -2448,7 +2494,7 @@
                              </el-row>
                              <el-row>
                                <el-col :span="20">
-                                 <el-form-item label="原因:">
+                                 <el-form-item label="备注:">
                                       <el-input
                                           type="textarea"
                                           :rows="2"
@@ -2459,6 +2505,21 @@
                                  </el-form-item>
                                </el-col>
                              </el-row>
+                             <el-row>
+                               <el-col :span="20">
+                                 <el-form-item label="维修者:">
+                                   <el-select v-model="guaForm.admin_user_id" placeholder="请选择" >
+                                           <el-option
+                                            v-for="item in autograph"
+                                           :key="item.admin_user_id"
+                                           :label="item.user_name"
+                                           :value="item.admin_user_id"
+                                            style="width:185px">
+                                           </el-option>
+                                    </el-select>
+                                 </el-form-item>
+                               </el-col>
+                             </el-row>
                              <el-row>
                                 <div class="clearn">
                                   <el-col :span="4">
@@ -2649,13 +2710,14 @@
   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 { parseTime } from '@/utils'
   import { getFileExtension } from '@/utils/tools'
   import { PostSearch } from '@/api/patient'
   import {saveOxygenates,saveHardWater,saveWater,saveDevicePH} from '@/api/device'
 const cityOptions = ['HD', 'HDF', 'HD+HP', 'HP', 'HF', 'SCUF', 'IUF', 'HFHD', 'HFHD+HP', 'PHF', 'HFR', 'HDF+HP', 'CRRT', '腹水回输']
 const moment = require('moment')
-
 export default {
     name: 'home',
     components: {
@@ -2667,6 +2729,8 @@ export default {
       QualityForm,
       RepairForm,
       RemanderForm,
+      WaterForm,
+      WaterFormList
     },
     data() {
       return {
@@ -3185,7 +3249,9 @@ export default {
           exclude: '',
           reason: '',
           code_information: '',
-          imageName: ''
+          imageName: '',
+          function_accessories_inspection:"",
+          other_information:'',
         },
 
         filename: '',
@@ -3357,7 +3423,7 @@ export default {
         this.tabIndex = index
       },
       handleCurrentChange(val) {
-        console.log("val-------------------------",val)
+       console.log("val232323232323------",val)
         // 通过设备型号区分质量控制
         this.device_type = val.device_type
         this.unitType = val.unit_type
@@ -4949,7 +5015,7 @@ export default {
             if (total === '') {
               this.userform.user_total = ''
             }
-            this.userform.user_total = total
+            // this.userform.user_total = total
           } else {
             this.$message.error('数据返回失败')
           }
@@ -4981,8 +5047,9 @@ export default {
         getTimeBeteen(id, todayTime).then(response => {
           if (response.data.state === 1) {
             var timedata = response.data.data.timeData
+            // console.log("timedata----------------------",timedata)
             if (timedata.length === 0) {
-              this.warnShow = true
+              this.warnShow = false
             }
             if (timedata.length !== 0) {
               this.warnShow = false
@@ -5078,7 +5145,7 @@ export default {
               if(addmacher.user_total == ''){
                   addmacher.user_total = 0
               }   
-              this.userform.user_total = count[0].Total + parseInt(addmacher.user_total)
+              // this.userform.user_total = count[0].Total + parseInt(addmacher.user_total)
             }
          })
        },

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