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

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

@@ -324,7 +324,7 @@
                 </template>
               </el-autocomplete>
             </el-form-item>
-         
+
           </el-col>
           <el-col :span="8">
             <el-form-item label="传染病:">
@@ -476,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">
@@ -831,6 +831,12 @@
                 <td
                   :rowspan="2"
                   style="text-align:center;min-width:40px;font-size:15px"
+                >
+                  使用次数
+                </td>
+                <td
+                  :rowspan="2"
+                  style="text-align:center;width:60px;font-size:15px"
                 >
                   运行
                 </td>
@@ -861,6 +867,24 @@
                 <td
                   :rowspan="2"
                   style="text-align:center;min-width:40px;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"
                 >
                   签名
                 </td>
@@ -913,6 +937,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>
@@ -943,6 +970,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>
@@ -1185,7 +1222,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++) {
@@ -1268,7 +1305,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";
             }
@@ -1542,7 +1579,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(
@@ -1564,7 +1601,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;
@@ -1580,7 +1617,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;
@@ -1621,7 +1658,7 @@ export default {
           if (device.disinfection === 0) {
             this.userform.disinfection = "";
           }
-          this.userform.user_total = totals.toString() 
+          this.userform.user_total = totals.toString()
         }
       });
     },
@@ -1737,7 +1774,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;
@@ -1862,7 +1899,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";
             }
@@ -1879,8 +1916,8 @@ export default {
               information[index].dialysis_mode = "PE";
             }
 
-           
- 
+
+
             if (information[index].move === 0) {
               information[index].move = "";
             }
@@ -2100,7 +2137,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)
@@ -2203,7 +2240,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";
             }
@@ -2509,6 +2546,43 @@ 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');

src/xt_pages/management/components/WaterFormList.vue

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

src/xt_pages/management/home.vue

@@ -871,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>
@@ -893,7 +893,7 @@
                                         </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>
@@ -1123,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">
@@ -1382,7 +1382,7 @@
                       <div v-show="zhiShow">
                        <el-tabs type="border-card" v-model="activeNameSix" @tab-click="handleClick">
                          <el-tab-pane label="新增质量控制" name="first">
-  
+
                            <span style="margin-bottom: 20px;display: block;">细菌培养</span>
                            <el-form :model="qualityForm" ref="qualityForm" :rules="qualitRules">
                              <el-row>
@@ -1579,7 +1579,7 @@
                                     </el-date-picker>
                                   </el-form-item>
                                 </el-col>
-                               
+
                                 <el-col :span="8">
                                   <el-form-item label="顺序号:" required prop="sort">
                                      <el-input style="width:150px" v-model="qualityFormTwo.sort" ></el-input>
@@ -1632,9 +1632,9 @@
                               </el-row>
                             </el-form>
                             <el-divider></el-divider>
-                           
 
-                          
+
+
                           <div v-if="device_type == 1">
                            <span style="margin-bottom: 20px;display: block;">透析液离子浓度检测</span>
                             <el-form ref="qualityFormThree" :model="qualityFormThree" :rules="ruleThree">
@@ -1689,9 +1689,9 @@
                                         </el-date-picker>
                                     </el-form-item>
                                 </el-col>
-                                
+
                               </el-row>
-                            
+
                               <el-row>
                                 <el-col :span="8">
                                   <!-- <span>Na<sup>+</sup></span> -->
@@ -1791,11 +1791,11 @@
 
 
 
-                           
+
                             <el-divider></el-divider>
-                         </div>     
-                             
-                        
+                         </div>
+
+
                             <span style="margin-bottom: 20px;display: block;">有毒化合物检测</span>
                             <el-form ref="qualityFormFour" :model="qualityFormFour" :rules="diaRules">
                               <el-row>
@@ -1866,7 +1866,7 @@
                                     </el-date-picker>
                                   </el-form-item>
                                 </el-col>
-                               
+
                                 <el-col :span="8">
                                   <el-form-item label="顺序号:" required prop="sort">
                                      <el-input style="width:150px" v-model="qualityFormFour.sort" ></el-input>
@@ -1993,7 +1993,7 @@
                                     </el-date-picker>
                                   </el-form-item>
                                 </el-col>
-                               
+
                                 <el-col :span="8">
                                   <el-form-item label="顺序号:" required prop="sort">
                                      <el-input style="width:150px" v-model="qualityFormFive.sort" ></el-input>
@@ -2046,7 +2046,7 @@
                               </el-row>
                             </el-form>
                             <el-divider></el-divider>
-                            
+
 
 
 
@@ -2120,7 +2120,7 @@
                                       </el-date-picker>
                                     </el-form-item>
                                   </el-col>
-                                
+
                                   <el-col :span="8">
                                     <el-form-item label="顺序号:" required prop="sort">
                                       <el-input style="width:150px" v-model="qualityFormSix.sort" ></el-input>
@@ -2174,8 +2174,8 @@
                               </el-form>
                             <el-divider></el-divider>
 
-                           
-                           
+
+
                             <span style="margin-bottom: 20px;display: block;">PH值检测</span>
                             <el-form ref="qualityFormSeven" :model="qualityFormSeven" :rules="diaRules">
                               <el-row>
@@ -2246,7 +2246,7 @@
                                     </el-date-picker>
                                   </el-form-item>
                                 </el-col>
-                               
+
                                 <el-col :span="8">
                                   <el-form-item label="顺序号:" required prop="sort">
                                      <el-input style="width:150px" v-model="qualityFormSeven.sort" ></el-input>
@@ -2302,7 +2302,7 @@
 
 
 
-                          
+
 
                          </el-tab-pane>
 
@@ -2316,7 +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">
@@ -2351,7 +2351,7 @@
                              <el-row>
                                  <el-col :span="8">
                                   <el-form-item label="到达时间:">
-                                   
+
                                          <el-date-picker
                                           type="datetime"
                                           format="yyyy-MM-dd HH:mm"
@@ -2380,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="故障发生阶段">
@@ -2404,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"
@@ -2415,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"
@@ -2426,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"
@@ -2468,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"
@@ -2479,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">
@@ -2807,7 +2848,7 @@ export default {
           device_name: [{ required: true, message: '请填写序列号' }],
           devicetype: [{ required: true, message: '请填写设备类型' }],
           unit_type: [{ required: true, message: '请填写设备型号' }],
-        
+
         },
         qualitRules: {
           detection_unit: [{ required: true, message: '请填写检测单位' }],
@@ -3208,7 +3249,9 @@ export default {
           exclude: '',
           reason: '',
           code_information: '',
-          imageName: ''
+          imageName: '',
+          function_accessories_inspection:"",
+          other_information:'',
         },
 
         filename: '',
@@ -3372,7 +3415,7 @@ export default {
               }
 
             }
-            
+
           }
         })
       },
@@ -3411,16 +3454,16 @@ export default {
           if (response.data.state === 1) {
             var addmacher = response.data.data.addmacher
             var warning = response.data.data.warning
-          
+
             var time = this.getTimestamp(this.userform.date) - warning.stime
             var germ = response.data.data.germ
-          
+
             var timetwo = this.getTimestamp(this.userform.date) - germ.stime
-           
+
             var clean = response.data.data.clean
             var timethree = this.getTimestamp(this.userform.date) - clean.stime
             var number = response.data.data.number
-          
+
             this.Number = number
             if (addmacher.device_type === 1) {
               this.sShow = false
@@ -3461,7 +3504,7 @@ export default {
             var zone = response.data.data.zone
 
             const arr1 = []
-          
+
             for (let index = 0; index < mode.length; index++) {
               if (mode[index].treate_mode === 1) {
                 mode[index] = 'HD'
@@ -3550,7 +3593,7 @@ export default {
             this.form.machine_status = addmacher.machine_status
             this.form.user_total = addmacher.user_total
             this.form.remarks = addmacher.remarks
-           
+
             if (addmacher.rubbish_date !== 0) {
               this.form.rubbish_date = uParseTime(addmacher.rubbish_date, '{y}-{m}-{d}')
             }
@@ -3657,16 +3700,16 @@ export default {
         var bed_numberss = parseInt(bed_numbers)
         this.form.bed_number = bed_numberss
         this.$refs[formName].validate(valid => {
-          UpdateMachineInfo(this.form).then(response => {         
+          UpdateMachineInfo(this.form).then(response => {
             if (response.data.state === 1) {
-              var addmacher = response.data.data.addmacher         
-              this.$message.success('修改成功')           
+              var addmacher = response.data.data.addmacher
+              this.$message.success('修改成功')
               for (let i = 0; i < this.tableDatatwo.length; i++) {
                 if (this.tableDatatwo[i].id == addmacher.id) {
                   for (let j = 0; j < this.deviceMode.length; j++) {
                     if (this.deviceMode[j].id === parseInt(addmacher.unit_type)) {
                       addmacher.device_mode = this.deviceMode[j].device_mode
-                    
+
                     }
                   }
 
@@ -4327,7 +4370,7 @@ export default {
             }
             this.userform.date = uParseTime(patients.schedule_date, '{y}-{m}-{d}')
             this.userform.patient_name = patients.name
-            this.userform.patient_id = patients.patient_id 
+            this.userform.patient_id = patients.patient_id
             var zone = response.data.data.zone
             this.userform.zone = zone.id
             var number = response.data.data.number
@@ -4472,7 +4515,7 @@ export default {
         this.userform.user_total = parseInt(this.userform.user_total)
 
         console.log("user_form",this.userform)
-      
+
         this.$refs[formName].validate((valid) => {
           if (valid) {
             SaveInformation(this.equimentid, this.userform).then(response => {
@@ -4652,16 +4695,16 @@ export default {
         var samplinglocationa = this.qualityForm.sampling_locationa
         var samplinglocationas = parseInt(samplinglocationa)
         this.qualityForm.sampling_locationa = samplinglocationas
-        
+
         //  if(this.qualityForm.pass_examination!=''){
         //    this.qualityForm.pass_examination = parseInt(this.qualityForm.pass_examination)
         //  }
          if(this.qualityForm.modifications!=''){
            this.qualityForm.modifications = parseInt(this.qualityForm.modifications)
          }
-       
+
         console.log("3333333",this.qualityForm)
-       
+
         this.$refs[formName].validate(response => {
           SaveBacteria(this.equimentid, this.qualityForm).then(response => {
             if (response.data.state === 1) {
@@ -4689,7 +4732,7 @@ export default {
         this.qualityForm.detection_result = ''
       },
       SaveLincomycin(formName) {
-       
+
         this.$refs[formName].validate((valid) => {
           if (this.qualityFormTwo.specimenb === '') {
             this.qualityFormTwo.specimenb = 0
@@ -4705,13 +4748,13 @@ export default {
           var sampling = this.qualityFormTwo.sampling_locationb
           var samplings = parseInt(sampling)
           this.qualityFormTwo.sampling_locationb = samplings
-           
-       
+
+
           if(this.qualityFormTwo.modifications!=''){
             this.qualityFormTwo.modifications = parseInt(this.qualityFormTwo.modifications)
           }
-       
-      
+
+
           if (valid) {
             SaveLincomycin(this.equimentid, this.qualityFormTwo).then(response => {
               if (response.data.state === 1) {
@@ -4723,8 +4766,8 @@ export default {
                 this.qualityFormTwo.concentrateb_nod = ''
                 this.qualityFormTwo.sampling_locationb = ''
                 this.qualityFormTwo.detection_resultb = ''
-               
-              
+
+
                 this.$refs.mychild.getAllQulityInfo()
               }
             })
@@ -4743,11 +4786,11 @@ export default {
       SaveQualityControl(formName) {
         this.$refs[formName].validate((valid) => {
           if (valid) {
-             
+
               if(this.qualityFormThree.modifications!=''){
                 this.qualityFormThree.modifications = parseInt(this.qualityFormThree.modifications)
               }
-            
+
             SaveQualityControl(this.equimentid, this.qualityFormThree).then(response => {
               if (response.data.state === 1) {
                 var ion = response.data.data.ion
@@ -4995,7 +5038,7 @@ export default {
             var deviceInformation = response.data.data.deviceInformation
             var timetwo = this.getTimestamp(this.userform.date) - deviceInformation.stime
             var clean = response.data.data.clean
-          
+
           }
         })
       },
@@ -5098,10 +5141,10 @@ export default {
          GetUserTotalCount(bedid).then(response=>{
             if(response.data.state == 1){
               var count =  response.data.data.count
-              var addmacher = response.data.data.addmacher 
+              var addmacher = response.data.data.addmacher
               if(addmacher.user_total == ''){
                   addmacher.user_total = 0
-              }   
+              }
               // this.userform.user_total = count[0].Total + parseInt(addmacher.user_total)
             }
          })
@@ -5124,12 +5167,12 @@ export default {
           var sampling = this.qualityFormFour.sampling_locationb
           var samplings = parseInt(sampling)
           this.qualityFormFour.sampling_locationb = samplings
-           
-        
+
+
           if(this.qualityFormFour.modifications!=''){
             this.qualityFormFour.modifications = parseInt(this.qualityFormFour.modifications)
           }
-       
+
           if (valid) {
             saveOxygenates(this.equimentid, this.qualityFormFour).then(response => {
               if (response.data.state === 1) {
@@ -5140,10 +5183,10 @@ export default {
                 this.qualityFormFour.concentrate_noc = ''
                 this.qualityFormFour.concentrateb_nod = ''
                 this.qualityFormFour.sampling_locationb = ''
-             
+
                 this.qualityFormFour.detection_resultb = ''
-                
-              
+
+
                 this.$refs.mychild.getAllQulityInfo()
               }
             })
@@ -5168,12 +5211,12 @@ export default {
           var sampling = this.qualityFormFive.sampling_locationb
           var samplings = parseInt(sampling)
           this.qualityFormFive.sampling_locationb = samplings
-           
-        
+
+
           if(this.qualityFormFive.modifications!=''){
             this.qualityFormFive.modifications = parseInt(this.qualityFormFive.modifications)
           }
-       
+
           if (valid) {
             saveHardWater(this.equimentid, this.qualityFormFive).then(response => {
               if (response.data.state === 1) {
@@ -5185,8 +5228,8 @@ export default {
                 this.qualityFormFive.concentrateb_nod = ''
                 this.qualityFormFive.sampling_locationb = ''
                 this.qualityFormFive.detection_resultb = ''
-               
-              
+
+
                 this.$refs.mychild.getAllQulityInfo()
               }
             })
@@ -5211,12 +5254,12 @@ export default {
           var sampling = this.qualityFormSix.sampling_locationb
           var samplings = parseInt(sampling)
           this.qualityFormSix.sampling_locationb = samplings
-           
-       
+
+
           if(this.qualityFormSix.modifications!=''){
             this.qualityFormSix.modifications = parseInt(this.qualityFormSix.modifications)
           }
-       
+
           if (valid) {
             saveWater(this.equimentid, this.qualityFormSix).then(response => {
               if (response.data.state === 1) {
@@ -5228,8 +5271,8 @@ export default {
                 this.qualityFormSix.concentrateb_nod = ''
                 this.qualityFormSix.sampling_locationb = ''
                 this.qualityFormSix.detection_resultb = ''
-             
-              
+
+
                 this.$refs.child.getAllQulityInfo()
               }else{
                 this.qualityFormSix.pass_examination = "1"
@@ -5256,12 +5299,12 @@ export default {
           var sampling = this.qualityFormSeven.sampling_locationb
           var samplings = parseInt(sampling)
           this.qualityFormSeven.sampling_locationb = samplings
-           
-       
+
+
           if(this.qualityFormSeven.modifications!=''){
             this.qualityFormSeven.modifications = parseInt(this.qualityFormSeven.modifications)
           }
-       
+
           if (valid) {
             saveDevicePH(this.equimentid, this.qualityFormSeven).then(response => {
               if (response.data.state === 1) {
@@ -5273,8 +5316,8 @@ export default {
                 this.qualityFormSeven.concentrateb_nod = ''
                 this.qualityFormSeven.sampling_locationb = ''
                 this.qualityFormSeven.detection_resultb = ''
-              
-              
+
+
                 this.$refs.mychild.getAllQulityInfo()
               }
             })
@@ -5296,7 +5339,7 @@ export default {
       this.getAllpatient()
       this.getAllMode()
       this.GetUserTotalCount(bedid)
-      
+
 
   }
   }

src/xt_pages/outpatientCharges/components/chargeDialog.vue

@@ -349,7 +349,7 @@
         //初始化
         this.form.tmp_decimal = 0
         this.tmp_pay = 0
-        this.id = id
+        this.id =id
         this.form.dec_way = false
         this.updateconfig()
         this.form.total = total

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -1265,9 +1265,9 @@ export default {
               } else {
                 that.pwdFormVisible = false
                 if (that.activeName == 'first') {
-                  that.$refs.charge.show(that.getTotalFour(that.other_prescriptions), that.currentOrder)
+                  that.$refs.charge.show(that.getTotalFour(that.other_prescriptions), that.currentOrder,that.patientInfo.id)
                 } else {
-                  that.$refs.charge.show(that.getTotalFour(that.other_prescriptions), that.currentOrder)
+                  that.$refs.charge.show(that.getTotalFour(that.other_prescriptions), that.currentOrder,that.patientInfo.id)
                 }
               }
 

src/xt_pages/outpatientCharges/statementTemplate/batchPrint.vue

@@ -127,7 +127,8 @@
                 <td colspan="7">
                   <div style="display:flex;flez-wrap:wrap;margin-bottom:10px;font-size:16px;">
                     <div style="width:33%;">医疗费总额：{{infos.order.medfee_sumamt?infos.order.medfee_sumamt:""}}元</div>
-                    <div style="width:33%;">基金支付金额：{{infos.order.fund_pay_sumamt?infos.order.fund_pay_sumamt:""}}元</div>
+                    <div style="width:33%;">基金支付金额：{{ (infos.order.hifp_pay + infos.order.maf_pay + infos.order.hifmi_pay).toFixed(2)}}元</div>
+
                     <div style="width:33%;">个人账户支付金额：{{infos.order.acct_pay?infos.order.acct_pay:""}}元</div>
 
                   </div>
@@ -136,9 +137,9 @@
                     <div style="width:33%;">个人支付金额：{{ infos.order.psn_cash_pay}}元</div>
                     <div style="width:33%;">个人账户金额：{{infos.order.balc}}元</div>
                   </div>
-                  <div style="display:flex;flez-wrap:wrap;font-size:16px;margin-top: 10px">
-                    <div style="width:33%;">基金统筹支付金额：{{infos.order.hifp_pay?infos.order.hifp_pay:""}}元</div>
-                  </div>
+<!--                  <div style="display:flex;flez-wrap:wrap;font-size:16px;margin-top: 10px">-->
+<!--&lt;!&ndash;                    <div style="width:33%;">基金统筹支付金额：{{infos.order.hifp_pay?infos.order.hifp_pay:""}}元</div>&ndash;&gt;-->
+<!--                  </div>-->
                 </td>
                 <td style="font-size:16px;">合计：{{infos.order.medfee_sumamt}}元</td>
               </tr>

src/xt_pages/outpatientCharges/statementTemplate/printThree.vue

@@ -123,7 +123,7 @@
                         <td colspan="7">
                             <div style="display:flex;flez-wrap:wrap;margin-bottom:10px;font-size:16px;">
                                 <div style="width:33%;">医疗费总额：{{info.medfee_sumamt?info.medfee_sumamt:info.new_order.medfee_sumamt}}元</div>
-                                <div style="width:33%;">基金支付金额：{{info.fund_pay_sumamt?info.fund_pay_sumamt:info.new_order.fund_pay_sumamt}}元</div>
+                                <div style="width:33%;">基金支付金额：{{ (info.new_order.hifp_pay + info.new_order.maf_pay + info.new_order.hifmi_pay).toFixed(2)}}元</div>
                                 <div style="width:33%;">个人账户支付金额：{{info.acct_pay?info.acct_pay:info.new_order.acct_pay}}元</div>
 
                             </div>
@@ -132,9 +132,9 @@
                                 <div style="width:33%;">个人支付金额：{{ info.new_order.psn_cash_pay}}元</div>
                                 <div style="width:33%;">个人账户金额：{{info.new_order.balc}}元</div>
                             </div>
-                          <div style="display:flex;flez-wrap:wrap;font-size:16px;margin-top: 10px">
-                            <div style="width:33%;">基金统筹支付金额：{{info.hifp_pay?info.hifp_pay:info.new_order.hifp_pay}}元</div>
-                          </div>
+<!--                          <div style="display:flex;flez-wrap:wrap;font-size:16px;margin-top: 10px">-->
+<!--&lt;!&ndash;                            <div style="width:33%;">基金统筹支付金额：{{info.hifp_pay?info.hifp_pay:info.new_order.hifp_pay}}元</div>&ndash;&gt;-->
+<!--                          </div>-->
                         </td>
                         <td style="font-size:16px;">合计：{{info.new_order.medfee_sumamt}}元</td>
                     </tr>