新分支

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>
@@ -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">
@@ -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>
@@ -2493,7 +2531,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]));
+      },
   },
   created() {
     this.getAllSubregion();

src/xt_pages/management/components/WaterFormList.vue

@@ -1131,30 +1131,37 @@
           }
         })
        },
-        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 filename = '药品进销存查询'
-
-
-                excel.export_json_to_excel({
-                  multiHeader,
-                  header,
-                  merges,
-                  data,
-                  filename
-                })
+            
+              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 = '水处理机使用登记'
+ 
+              console.log("rwwwwwwwwwww",this.tableData)
+              
+              excel.export_json_to_excel({
+                multiHeader,
+                header,
+                merges,
+                data,
+                filename
+              })
             })
         },
         formatJson(filterVal, jsonData) {

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>
@@ -1125,7 +1125,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">
@@ -2381,6 +2381,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="故障发生阶段">
@@ -2405,7 +2431,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"
@@ -2416,7 +2442,7 @@
                                     </el-form-item>
                                 </el-col>
                                  <el-col :span="8">
-                                    <el-form-item label="原因分析:">
+                                    <el-form-item label="维修内容:">
                                         <el-input
                                            type="textarea"
                                            :rows="2"
@@ -2427,7 +2453,7 @@
                                     </el-form-item>
                                 </el-col>
                                  <el-col :span="8">
-                                    <el-form-item label="处理过程:">
+                                    <el-form-item label="维修结果:">
                                         <el-input
                                            type="textarea"
                                            :rows="2"
@@ -2469,7 +2495,7 @@
                              </el-row>
                              <el-row>
                                <el-col :span="20">
-                                 <el-form-item label="原因:">
+                                 <el-form-item label="备注:">
                                       <el-input
                                           type="textarea"
                                           :rows="2"
@@ -2480,6 +2506,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">
@@ -3209,7 +3250,9 @@ export default {
           exclude: '',
           reason: '',
           code_information: '',
-          imageName: ''
+          imageName: '',
+          function_accessories_inspection:"",
+          other_information:'',
         },
 
         filename: '',