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

src/vendor/Export2Excel.js

       r: 0
     }
   };
+  console.log('rrrrr',data);
   for (var R = 0; R != data.length; ++R) {
     for (var C = 0; C != data[R].length; ++C) {
       if (range.s.r > R) range.s.r = R;
   filename = filename || 'excel-list'
   data = [...data]
   data.unshift(header);
-
+  console.log('wwwww',data);
   for (let i = multiHeader.length - 1; i > -1; i--) {
     data.unshift(multiHeader[i])
   }
-
+  console.log('qqqqq',data);
   var ws_name = "SheetJS";
   var wb = new Workbook(),
     ws = sheet_from_array_of_arrays(data);
   }
   
 }
+
+export function export_json_to_excel2({
+  multiHeader = [],
+  header,
+  data,
+  filename,
+  merges = [],
+  autoWidth = true,
+  bookType = 'xlsx'
+} = {}) {
+  /* original data */
+  filename = filename || 'excel-list'
+  data = [...data]
+  // data.unshift(header);
+  console.log('wwwww',data);
+  for (let i = multiHeader.length - 1; i > -1; i--) {
+    data.unshift(multiHeader[i])
+  }
+  console.log('qqqqq',data);
+  var ws_name = "SheetJS";
+  var wb = new Workbook(),
+    ws = sheet_from_array_of_arrays(data);
+
+  if (merges.length > 0) {
+    if (!ws['!merges']) ws['!merges'] = [];
+    merges.forEach(item => {
+      console.log(XLSX.utils.decode_range(item))
+      ws['!merges'].push(XLSX.utils.decode_range(item))
+    })
+  }
+
+  if (autoWidth) {
+    /*设置worksheet每列的最大宽度*/
+    const colWidth = data.map(row => row.map(val => {
+      /*先判断是否为null/undefined*/
+      if (val == null) {
+        return {
+          'wch': 10
+        };
+      }
+      /*再判断是否为中文*/
+      else if (val.toString().charCodeAt(0) > 255) {
+        return {
+          'wch': val.toString().length * 2
+        };
+      } else {
+        return {
+          'wch': val.toString().length
+        };
+      }
+    }))
+    /*以第一行为初始值*/
+    let result = colWidth[0];
+    for (let i = 1; i < colWidth.length; i++) {
+      for (let j = 0; j < colWidth[i].length; j++) {
+        if (result[j]['wch'] < colWidth[i][j]['wch']) {
+          result[j]['wch'] = colWidth[i][j]['wch'];
+        }
+      }
+    }
+    ws['!cols'] = result;
+  }
+
+  /* add worksheet to workbook */
+  wb.SheetNames.push(ws_name);
+  wb.Sheets[ws_name] = ws;
+
+  var wbout = XLSX.write(wb, {
+    bookType: bookType,
+    bookSST: false,
+    type: 'binary'
+  });
+  saveAs(new Blob([s2ab(wbout)], {
+    type: "application/octet-stream"
+  }), `${filename}.${bookType}`);
+}

src/xt_pages/Pharmacy/PatientDispensing.vue

         confirmButtonText: "确 定",
         cancelButtonText: "取 消",
         type: "warning",
-      })
-        .then(() => {
+      }).then(() => {
           dispensingmedicine(params).then((res) => {
             if (res.data.state == 1) {
               this.$message.success("操作成功");
               this.tableData = null;
               this.fun4(tmp);
               this.state = 2;
-              // console.log("this.alreadmount_data",this.alreadmount_data)
-              // for (let i = 0;i < this.alreadmount_data.length;i++){
-              //   console.log("tmp = ",tmp)
-              //     if (this.alreadmount_data[i].PatientID == tmp){
-              //       console.log("i = ",i)
-              //       this.$refs.table02.setCurrentRow(this.alreadmount_data[i]);
-              //       this.handleCurrentChange(this.alreadmount_data[i])
-              //     }
-              // }
+           
             } else {
               this.$message.error(res.data.msg);
             }

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

                       <div class="inline_block" style="flex: 1">
                         透前体重：
                         <div
+                          v-if="org_id == 10580"
                           class="under_line"
                           style="width: 70px; text-align: center"
                         >
                               : "/"
                           }}
                         </div>
+                        <div
+                          v-if="org_id == 10580"
+                          class="under_line"
+                          style="width: 70px; text-align: center"
+                        >
+                          {{
+                            record.assessment_before_dislysis &&
+                            record.assessment_before_dislysis.weight_before
+                              ? parseFloat(record.assessment_before_dislysis.weight_before).toFixed(1)
+                              : "/"
+                          }}
+                        </div>
                         kg
                       </div>
                       <div class="inline_block" style="flex: 1" v-if=" org_id!=10469">

src/xt_pages/dialysis/details/DialysisPrescription.vue

         <li v-if=" isShow('总量') && getValueStr('anticoagulant', 'anticoagulant') != 5 " >
           <label>总量: </label>
           <span class="content" v-if="getValueStr('anticoagulant', 'anticoagulant') != 1">{{anticoagulant_zongliang != "0" ? anticoagulant_zongliang : ""}}</span>
-          <span v-if="this.$store.getters.xt_user.template_info.org_id != 10101 && this.$store.getters.xt_user.template_info.template_id !=45">
+          <span v-if="this.$store.getters.xt_user.template_info.org_id != 10101 && this.$store.getters.xt_user.template_info.template_id !=45 && this.$store.getters.xt_user.template_info.org_id != 10600">
             <span class="content" v-if="getValueStr('anticoagulant', 'anticoagulant') == 1" ></span>
-            <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 2 && this.$store.getters.xt_user.template_info.template_id != 13 &&  this.$store.getters.xt_user.template_info.template_id != 23 &&  this.$store.getters.xt_user.template_info.template_id != 40 &&  this.$store.getters.xt_user.template_info.template_id != 38 && this.$store.getters.xt_user.template_info.org_id != 10234 && this.$store.getters.xt_user.template_info.template_id != 65">{{ anticoagulant_zongliang != "0" ? "iu" : "" }}</span>
-            <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 2 && (this.$store.getters.xt_user.template_info.template_id == 13 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 40 || this.$store.getters.xt_user.template_info.template_id == 38 || this.$store.getters.xt_user.template_info.org_id == 10234 ||  this.$store.getters.xt_user.template_info.template_id== 65)">{{ anticoagulant_zongliang != "0" ? "mg" : "" }}</span>
+            <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 2 && this.$store.getters.xt_user.template_info.template_id != 13 &&  this.$store.getters.xt_user.template_info.template_id != 23 &&  this.$store.getters.xt_user.template_info.template_id != 40 &&  this.$store.getters.xt_user.template_info.template_id != 38 && this.$store.getters.xt_user.template_info.org_id != 10234 && this.$store.getters.xt_user.template_info.template_id != 65  && this.$store.getters.xt_user.template_info.org_id != 10600">{{ anticoagulant_zongliang != "0" ? "iu" : "" }}</span>
+            <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 2 && (this.$store.getters.xt_user.template_info.template_id == 13 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 40 || this.$store.getters.xt_user.template_info.template_id == 38 || this.$store.getters.xt_user.template_info.org_id == 10234 ||  this.$store.getters.xt_user.template_info.template_id== 65 || this.$store.getters.xt_user.template_info.org_id == 10600)">{{ anticoagulant_zongliang != "0" ? "mg" : "" }}</span>
             <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 3" >
             
               <span v-if="this.$store.getters.xt_user.template_info.org_id == 9671 || this.$store.getters.xt_user.template_info.org_id == 9675">
           <span class="content" v-if="getValueStr('anticoagulant', 'anticoagulant') != 1">{{ anticoagulant_shouji != "0" ? anticoagulant_shouji : "" }}</span>
           <span v-if="this.$store.getters.xt_user.template_info.org_id != 10101 && this.$store.getters.xt_user.template_info.template_id != 45">
             <span class="content" v-if="getValueStr('anticoagulant', 'anticoagulant') == 1" ></span>
-            <span class="unit"  v-if="getValueStr('anticoagulant', 'anticoagulant') == 2  && this.$store.getters.xt_user.template_info.template_id != 13  && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 40 && this.$store.getters.xt_user.template_info.template_id != 38 && this.$store.getters.xt_user.template_info.template_id != 65 && this.$store.getters.xt_user.template_info.template_id!=0">{{ anticoagulant_shouji != "0" ? "iu" : "" }}</span>
-            <span class="unit"  v-if="getValueStr('anticoagulant', 'anticoagulant') == 2  && (this.$store.getters.xt_user.template_info.template_id == 13 ||  this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 40 || this.$store.getters.xt_user.template_info.template_id == 38  || this.$store.getters.xt_user.template_info.template_id == 65 ||  this.$store.getters.xt_user.template_info.template_id == 0)" >{{ anticoagulant_shouji != "0" ? "mg" : "" }}</span>
+            <span class="unit"  v-if="getValueStr('anticoagulant', 'anticoagulant') == 2  && this.$store.getters.xt_user.template_info.template_id != 13  && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 40 && this.$store.getters.xt_user.template_info.template_id != 38 && this.$store.getters.xt_user.template_info.template_id != 65 && this.$store.getters.xt_user.template_info.template_id!=0 && this.$store.getters.xt_user.template_info.org_id != 10600">{{ anticoagulant_shouji != "0" ? "iu" : "" }}</span>
+            <span class="unit"  v-if="getValueStr('anticoagulant', 'anticoagulant') == 2  && (this.$store.getters.xt_user.template_info.template_id == 13 ||  this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 40 || this.$store.getters.xt_user.template_info.template_id == 38  || this.$store.getters.xt_user.template_info.template_id == 65 ||  this.$store.getters.xt_user.template_info.template_id == 0 || this.$store.getters.xt_user.template_info.org_id == 10600)" >{{ anticoagulant_shouji != "0" ? "mg" : "" }}</span>
             <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 3">
               <span v-if="this.$store.getters.xt_user.template_info.org_id == 9671">
                  {{ anticoagulant_shouji != "0" ? "mg" : "" }}
           <span class="content" v-if="getValueStr('anticoagulant', 'anticoagulant') != 1">{{ anticoagulant_weichi != "0" ? anticoagulant_weichi : "" }}</span>
           <span v-if="this.$store.getters.xt_user.template_info.org_id != 10101 && this.$store.getters.xt_user.template_info.template_id != 45">
             <span class="content" v-if="getValueStr('anticoagulant', 'anticoagulant') == 1"></span>
-            <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 2 && this.$store.getters.xt_user.template_info.template_id != 13 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 40 && this.$store.getters.xt_user.template_info.template_id != 38 && this.$store.getters.xt_user.template_info.template_id != 65 ">{{ anticoagulant_weichi != "0" ? "iu/h" : "" }}</span>
-            <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 2 && (this.$store.getters.xt_user.template_info.template_id == 13 ||  this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 40 || this.$store.getters.xt_user.template_info.template_id == 38 || this.$store.getters.xt_user.template_info.template_id == 65)">{{ anticoagulant_weichi != "0" ? "mg/h" : "" }}</span>
+            <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 2 && this.$store.getters.xt_user.template_info.template_id != 13 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 40 && this.$store.getters.xt_user.template_info.template_id != 38 && this.$store.getters.xt_user.template_info.template_id != 65 && this.$store.getters.xt_user.template_info.org_id!=10600 ">{{ anticoagulant_weichi != "0" ? "iu/h" : "" }}</span>
+            <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 2 && (this.$store.getters.xt_user.template_info.template_id == 13 ||  this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 40 || this.$store.getters.xt_user.template_info.template_id == 38 || this.$store.getters.xt_user.template_info.template_id == 65 || this.$store.getters.xt_user.template_info.org_id == 10600)">{{ anticoagulant_weichi != "0" ? "mg/h" : "" }}</span>
             <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 3">
               <span v-if="this.$store.getters.xt_user.template_info.org_id ==9671">
               {{ anticoagulant_weichi != "0" ? "mg/h" : "" }}

src/xt_pages/dialysis/details/consumable/dialysisGather.vue

     import { uParseTime } from "@/utils/tools";
     import {getRemindPrintList,saveRemindPrint} from '@/api/schedule'
     import { getDataConfig } from '@/utils/data'
+    import print from "print-js";
     const moment = require('moment')
     import store from "@/store";
     export default {
                     if(this.getBloodAccessOption(list[i].dialysis_prescription.blood_access).indexOf("导管")!=-1){
                          total_one ++
                     }
-                    if(this.getBloodAccessOption(list[i].dialysis_prescription.blood_access).indexOf('内瘘')==-1){
+                    if(this.getBloodAccessOption(list[i].dialysis_prescription.blood_access).indexOf('内瘘')!=-1){
                         total_two ++
                     }
                   }

src/xt_pages/dialysis/details/dialog/monitor_dialog.vue

                 org_id!=10551 &&
                 template_id != 43 &&
                 template_id != 47 &&
-                org_id!=10558) ||
+                org_id!=10558 &&
+                org_id!=10517) ||
                 org_id == 9779 ||
                 template_id == 11 ||
                 template_id == 20 ||
             width="100"
             v-if="
               isShow('置换量') &&
-              (template_id != 6 || org_id == 9919 || org_id == 10191 || org_id == 10478 || org_id == 10551 || org_id ==10558) &&
+              (template_id != 6 || org_id == 9919 || org_id == 10191 || org_id == 10478 || org_id == 10551 || org_id ==10558 || org_id ==10517) &&
               template_id != 9779 &&
               template_id != 11 &&
               template_id != 20 &&

src/xt_pages/dialysis/details/dialysisMonitoring.vue

           <th v-if=" isShow('置换率') && (template_id == 6 || template_id == 10 || template_id == 11 || template_id == 20 || template_id == 26 || template_id == 29 || template_id == 46  || template_id == 48 || template_id == 53  || template_id == 54 || template_id == 56 || org_id == 10432 || org_id == 10445 || org_id == 10410) && org_id!=10558" width="92px" > 置换率(ml/min) </th>
           <th v-if=" isShow('置换率') && (template_id != 6 && template_id != 10 && template_id != 11 && template_id != 20 && template_id != 26 && template_id != 29 && template_id != 46 && template_id != 48 && template_id != 53 && template_id != 54 && template_id != 56 && org_id!=10432 && org_id!=10445 && org_id!=10410) || org_id == 10558" width="92px" > 置换率(L/h)  </th>
           <th v-if=" isShow('置换量') && (template_id == 43)" width="92px"> 置换量(ml/h)  </th>
-          <th v-if=" isShow('置换量') && ((template_id == 6 && org_id != 9919 && org_id !=10191 && org_id!=10478 && org_id!=10346) || org_id == 9779 || template_id == 11 || template_id == 20 || template_id == 26 || template_id == 29 || template_id == 46 || template_id == 48 || template_id == 53 || template_id == 54 || template_id == 56 || this.$store.getters.xt_user.template_info.org_id == 10340 || this.$store.getters.xt_user.template_info.org_id == 10432  || this.$store.getters.xt_user.template_info.org_id == 10445 ) && org_id!=10558" width="92px"  > 置换量(ml)  </th>
-          <th v-if=" isShow('置换量') && ((template_id != 6 || org_id == 9919 || org_id == 10191 || org_id == 10478 || org_id ==10346) && org_id != 9779 && template_id != 11 && template_id != 20 && template_id != 26 && template_id != 29 && template_id != 46 && template_id != 48 && template_id != 53 && template_id != 54 && template_id != 56 && this.$store.getters.xt_user.template_info.org_id != 10340 && this.$store.getters.xt_user.template_info.org_id != 10432  && this.$store.getters.xt_user.template_info.org_id != 10445) || org_id == 10558" width="92px" > 置换量(L) </th>
+          <th v-if=" isShow('置换量') && ((template_id == 6 && org_id != 9919 && org_id !=10191 && org_id!=10478 && org_id!=10346 && org_id!=10517) || org_id == 9779 || template_id == 11 || template_id == 20 || template_id == 26 || template_id == 29 || template_id == 46 || template_id == 48 || template_id == 53 || template_id == 54 || template_id == 56 || this.$store.getters.xt_user.template_info.org_id == 10340 || this.$store.getters.xt_user.template_info.org_id == 10432  || this.$store.getters.xt_user.template_info.org_id == 10445 ) && org_id!=10558" width="92px"  > 置换量(ml)  </th>
+          <th v-if=" isShow('置换量') && ((template_id != 6 || org_id == 9919 || org_id == 10191 || org_id == 10478 || org_id ==10346 || org_id ==10517) && org_id != 9779 && template_id != 11 && template_id != 20 && template_id != 26 && template_id != 29 && template_id != 46 && template_id != 48 && template_id != 53 && template_id != 54 && template_id != 56 && this.$store.getters.xt_user.template_info.org_id != 10340 && this.$store.getters.xt_user.template_info.org_id != 10432  && this.$store.getters.xt_user.template_info.org_id != 10445) || org_id == 10558" width="92px" > 置换量(L) </th>
           <th v-if=" isShow('SpO₂') && template_id != 6 && template_id != 10 && template_id != 11  " width="92px" > SpO₂(%) </th>
           <th v-if="isShow('电导度')" width="92px">电导度(mS/m)</th>
           <th v-if="isShow('置换液流量') && template_id != 27 && template_id != 60" width="92px">置换液流量(ml/h)</th>

src/xt_pages/dialysis/newDoctorAdvice.vue

          if(nameOne == '全部'){
           nameOne = ""
         }
-      this.$router.push({ path: "/dialysis/signPrint",query:{time: new Date(this.time).getTime(),delivery_way:name,execution_frequency:nameOne,patient_id:this.patient_id,keyword:this.keyword} });
+      this.$router.push({ path: "/dialysis/signPrint",query:{time: new Date(this.time).getTime(),delivery_way:name,execution_frequency:nameOne,patient_id:this.patient_id,keyword:this.keyword,excution_way:this.excution_way} });
 
     },
     batchPrintActionOne: function() {

src/xt_pages/dialysis/template/DialysisPrintOrderFiftyFour.vue

       return "";
     },
     getAge: function (val) {
-      if (val.birthday != 0) {
-        return jsGetAge(val.birth, "-");
-      } else {
-        return "";
+      // if (val.birthday != 0) {
+      //   return jsGetAge(val.birth, "-");
+      // } else {
+      //   return "";
+      // }
+      if (val.id_card_no) {
+        var thisLen = val.id_card_no.length
+
+        var birth = ''
+        if (thisLen == 15) {
+          birth = '19' + val.id_card_no.substr(6, 6)
+        } else {
+          birth = val.id_card_no.substr(6, 8)
+        }
+        var birthtwo =
+          birth.substr(0, 4) +
+          '-' +
+          birth.substr(4, 2) +
+          '-' +
+          birth.substr(6, 2)
+
+        var age = jsGetAge(birthtwo, '-')
+        return age
       }
     },
     newAdviceGroupObject: function () {

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

                         class="under_line"
                         style="width: 70px; text-align: center"
                       >
-                      <span v-if="org_id !=10447 && org_id != 9675">{{
+                      <span v-if="org_id !=10447 && org_id != 9675 && org_id!=10580">{{
                           predialysis.weight_before
                             ? parseFloat(
                                 predialysis.weight_before -
                             : "未称重"
                         }}
                        </span>
+                       <span v-if="org_id ==10580">
+                        {{
+                          predialysis.weight_before? parseFloat(predialysis.weight_before).toFixed(1): "未称重"
+                        }}
+                       </span>
                       </div>
                       kg
                     </div>

src/xt_pages/qcd/workAnalysis/nurse.vue

             format="yyyy-MM-dd"
             value-format="yyyy-MM-dd"
           ></el-date-picker>
+          <el-button type="primary" @click="export_file()" :loading="downloadLoading">导出</el-button>
         </div>
         <div class="tableTitle">统计图</div>
         <div>
                 start_nurse_count:total_start_nurse, -->
             <el-table-column label="合计" align="center">
               <template slot-scope="scope">
-                {{scope.row.finish_nuser_count + scope.row.washpipe_nuser_count + scope.row.puncture_count + scope.row.cure_count + scope.row.mission_count + scope.row.change_nuser_count+scope.row.difficult_nuser_count+scope.row.new_nuser_count +scope.row.start_nuser_count ?scope.row.puncture_count  + scope.row.cure_count + scope.row.mission_count+scope.row.change_nuser_count+scope.row.difficult_nuser_count+scope.row.new_nuser_count+scope.row.start_nuser_count:''}}
+                {{scope.row.finish_nuser_count + scope.row.washpipe_nuser_count + scope.row.puncture_count + 
+                scope.row.cure_count + scope.row.mission_count + scope.row.change_nuser_count+
+                scope.row.difficult_nuser_count+scope.row.new_nuser_count +scope.row.start_nuser_count ?
+                scope.row.puncture_count  + scope.row.cure_count + scope.row.change_nuser_count+scope.row.difficult_nuser_count+
+                scope.row.difficult_nuser_count+scope.row.finish_nuser_count+scope.row.start_nuser_count +
+                scope.row.washpipe_nuser_count+scope.row.mission_count:''}}
               </template>
             </el-table-column>
           </el-table>
           ]
         },
         modeList:[],
+        downloadLoading: false,
+        list:[]
       };
     },
     methods: {
             var resp = rs.data
             console.log("列表2323323232323233232332323223233223233223",resp)
             if (resp.state == 1) {
-
               let total_cure = 0
               let total_puncture = 0
               let total_mission = 0
               let total_finish_nurse = 0
               let total_washpipe_nurse = 0
               this.loading = false
-
+              var list=[]
               for (let i = 0; i < resp.data.data.length; i++) {
                 total_cure = total_cure + resp.data.data[i].cure_count
                 total_puncture = total_puncture + resp.data.data[i].puncture_count
                 total_diffcult_nurse = total_diffcult_nurse + resp.data.data[i].difficult_nuser_count
                 total_new_fistula_nurse = total_new_fistula_nurse + resp.data.data[i].new_nuser_count
                 total_start_nurse = total_start_nurse + resp.data.data[i].start_nuser_count
-                console.log( resp.data.data[i].start_nuser_count)
+                // console.log( resp.data.data[i].start_nuser_count)
 
-                console.log(total_start_nurse)
+                // console.log(total_start_nurse)
                 total_finish_nurse = total_finish_nurse + resp.data.data[i].finish_nuser_count
                 total_washpipe_nurse = total_washpipe_nurse + resp.data.data[i].washpipe_nuser_count
                 this.tableData.push(resp.data.data[i])
-             }
-              console.log(total_start_nurse)
-
+                
+             }        
+            //  this.list.push(obj)
               this.tableData.push( {
                 user_name:"合计",
                 cure_count:total_cure,
                 finish_nuser_count:total_finish_nurse,
                 washpipe_nuser_count:total_washpipe_nurse,
               })
-              console.log("hhhhhhh23232233223",this.tableData)
+              console.log('33333',this.tableData)
+              
               var dialysisCount = resp.data.dialysisCount
                 console.log("dialysisCount",dialysisCount)
               for(let i=0;i<dialysisCount.length;i++){
+                // for()
+                // var obj={}
                 if(dialysisCount[i].mode_id == 1){
                   dialysisCount[i].mode_id = "HD"
                 }
              })
              console.log("listq23333",list)
              this.modeList.push(...list)
+
+             for(let i=0;i<this.tableData.length;i++){
+              
+                var obj={}
+                  obj['name'] = this.tableData[i].user_name
+                  obj['chuanci'] = this.tableData[i].puncture_count
+                  obj['zhiliao'] = this.tableData[i].cure_count
+                  obj['huanyao'] = this.tableData[i].change_nuser_count
+                  obj['yncc'] = this.tableData[i].difficult_nuser_count
+                  obj['shangji'] = this.tableData[i].start_nuser_count+'('+this.getTotalCount(this.tableData[i].admin_user_id)+')'
+                  obj['xiaji'] = this.tableData[i].finish_nuser_count
+                  obj['chongguan'] = this.tableData[i].washpipe_nuser_count
+                  obj['xuanjiao'] = this.tableData[i].mission_count
+                  obj['heji'] = this.tableData[i].puncture_count*1 +this.tableData[i].cure_count*1 +this.tableData[i].change_nuser_count*1+
+                                this.tableData[i].difficult_nuser_count*1 +this.tableData[i].finish_nuser_count*1+
+                                this.tableData[i].washpipe_nuser_count*1 +this.tableData[i].mission_count*1+
+                                this.tableData[i].start_nuser_count*1
+                  this.list.push(obj)
+              }
+
+              console.log("hhhhhhh23232233223",this.list)
+
             } else {
               this.loading = false
             }
         return y + '-' + m + '-' + d;
       },
       getTotalCount(adminuserid){
-        console.log("adminuserid",adminuserid)
-        console.log("333333",this.modeList)
+        // console.log("adminuserid",adminuserid)
+        // console.log("333333",this.modeList)
         var name = ""
         for(let i=0;i<this.modeList.length;i++){
           for(let j=0;j<this.modeList[i].child.length;j++){
             if(adminuserid == this.modeList[i].child[j].start_nurse){
                name += (this.modeList[i].child[j].mode_id+"-"+this.modeList[i].child[j].Count) + "次"+"、"
+              //  this.list[]
             }
           }
         }
-        console.log("name22222",name)
+        // console.log("name22222",name)
         return name.substr(0,name.length-1)
-      }
+      },
+      export_file:function(){
+        this.export_file_step_two()
+      },
+      export_file_step_two: function(){
+        this.downloadLoading = true
+        import('@/vendor/Export2Excel').then(excel => {
+          // const filterVal = [
+          //   '区号',
+          //   '机号'
+          // ]
+          // if (this.export_type == 0) {
+            const multiHeader = [['姓名', '穿刺', '治疗', '换药', '疑难穿刺', '上机', '下机', '冲管', '宣教小结', '合计']]
+          //  const header=['姓名', '穿刺', '治疗', '换药', '疑难穿刺', '上机', '下机', '冲管', '宣教小结', '合计']
+            // const header = ['', '', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上']
+            const merges = ['A1', 'B1', 'C1', 'D1', 'E1', 'F1', 'G1', 'H1', 'I1', 'J1']
+            // var list = []
+            // let i = 0
+            // var jihaos=[]
+            // for (let key in this.tableData) {
+            //   var tempValue
+            //   if(this.tableData[key].admin_user_id !=''){
+            //     jihaos.push(this.tableData[key].admin_user_id)
+            //     // console.log('2222222',jihaos);
+            //   }
+              
+            //   if (i == 0) {
+            //     let m = 'A2' + ':' + 'A' + (1 + jihaos.length)
+            //     tempValue = (2 + jihaos.length)
+            //     merges.push(m)
+            //   } 
+            //   else {
+            //     let m = 'A' + (tempValue + 1) + ':' + 'A' + ((tempValue + 1) + jihaos.length - 1)
+            //     tempValue = ((tempValue + 1) + jihaos.length - 1)
+            //     merges.push(m)
+            //   }
+            //   // for (let b = 0; b < jihaos.length; b++) {
+            //     let obj = {}
+            //     obj['name'] = this.tableData[key].user_name
+            //     // obj['区号'] = this.partitions[key].name
+            //     // obj['机号'] = jihaos[b].number.toString()
+            //     list.push(obj)
+            //   // }
+            //   // i++
+            // }
+            var data = []
+
+            this.list.map(item => {
+              // console.log('111111',item);
+              data.push(Object.values(item))
+            })
+
+            const filename = '护士工作量'
+            
+            console.log('333333333',data),
+            excel.export_json_to_excel2({
+              
+              multiHeader,
+              // header,
+              merges,
+              data,
+              filename
+            })
+            this.downloadLoading = false
+          // }
+
+        })
+      },
+
     },
     created(){
       var date = new Date()

src/xt_pages/role/admin.vue

           style="float:left"
           @click="toAutoDrug">自动生成</el-button> -->
 
-
+<!-- 
          <el-button
           type="primary"
           size="small"
           icon="el-icon-circle-plus-outline"
           style="float:left"
-          @click="toAutoDiagnose">自动脚本</el-button> 
+          @click="toAutoDiagnose">自动脚本</el-button>  -->
      </div>
 
 

src/xt_pages/stock/drugs/drugStockOutOrder.vue

       getExportOutOrderDrugList(params).then((response) => {
         if (response.data.state == 1) {
           var list = response.data.data.list;
-        
+          if(list!=null){
+            for(let i=0;i<list.length;i++){
+              list[i].count_one =0
+              if(list[i].count_unit == list[i].max_unit && list[i].max_unit!=list[i].min_unit){
+                 list[i].count_one = list[i].count * list[i].min_number
+              }
+              if(list[i].count_unit == list[i].min_unit && list[i].max_unit!=list[i].min_unit){
+                 list[i].count_one = list[i].count 
+              }
+
+              if(list[i].count_unit == list[i].max_unit && list[i].max_unit==list[i].min_unit){
+                 list[i].count_one = list[i].count 
+              }
+            }
+          }
           this.exportList = list;
           this.exportLoding = false
           this.manufacturerList = response.data.data.manufacturerList;
       });
     },
     toExport() {
-
+      
+      console.log("EXPORTLSOT",this.exportList)
       if (this.order_id == "") {
         this.$message.error("请勾选出库单");
         return;
       }
-     
+      
       for (let i = 0; i < this.exportList.length; i++) {
         this.exportList[i].retail_price_one = 0
         if(this.outInfoList.length!=null){
           for(let j=0;j<this.outInfoList.length;j++){
            if(this.exportList[i].warehouse_out_id == this.outInfoList[j].warehouse_out_id && this.exportList[i].drug_id == this.outInfoList[j].drug_id){
-            this.exportList[i].retail_price_one = this.outInfoList[j].price
+             this.exportList[i].retail_price_one = this.outInfoList[j].price
            }
         }
         }
             this.exportList[i].dealer = this.dealerList[z].dealer_name;
           }
         }
+       
+        this.exportList[i].retail_price = (this.exportList[i].count_one * this.exportList[i].min_price).toFixed(2)
+        
         this.exportList[i].ctime = this.getTime(this.exportList[i].ctime)
       }
 
       
 
         const data = this.formatJson(filterVal, this.exportList);
+        console.log("Datewoo2o2o2o",data)
+      
         excel.export_json_to_excel({
           header: tHeader,
           data,

src/xt_pages/stock/drugs/drugStockOutOrderAdd.vue

             </template>
           </el-table-column>
 
+
+          <el-table-column label="使用患者"  width="150" align="center">
+            <template slot-scope="scope">
+               <el-select size="small" v-model="scope.row.patient_id" filterable placeholder="请选择出库对象">
+                <el-option
+                  v-for="(option, index) in patients"
+                  :key="index"
+                  :label="option.name"
+                  :value="option.id">
+                </el-option>
+               </el-select>
+            </template>
+          </el-table-column>
+
           <!-- <el-table-column width="120" align="center">
             <template slot="header" slot-scope="scope">
               <span>进货价</span>
       showCheck:false,
       showReturnCheck:false,
       warehouse_out_id:0,
+      patients:[],
     };
   },
   methods: {
             response.data.data.configlist.drug_storehouse_out;
           this.list = response.data.data.list;
           this.doctorList = response.data.data.doctorList;
-          
+          var obj ={id:0,name:"系统"}
+          this.patients =[]
+          this.patients.push(obj)
+          if(response.data.data.patients!=null){
+            for(let i=0;i<response.data.data.patients.length;i++){
+              this.patients.push(response.data.data.patients[i])
+            }
+          }
           // this.doctorList.push({index:999,user_name:"护士站", admin_user_id:999})
         
         }
       tempObj["max_unit_fisrt"] = 0;
       tempObj["min_unit_fisrt"] = 0;
       tempObj["total_price"] = 0;
+      tempObj["patient_id"] =0
+      tempObj["expiry_date"] = ""
+      tempObj["product_date"] = ""
       this.recordInfo.recordData.push(tempObj);
     },
     handleDelete: function (index, row) {
                 warehousingOutInfo[i].last_price = warehousingOutInfo[i].price
                 warehousingOutInfo[i].max_unit = warehousingOutInfo[i].count_unit
                 warehousingOutInfo[i].count = warehousingOutInfo[i].count.toString()
-
+                warehousingOutInfo[i].patient_id = warehousingOutInfo[i].patient_id
                 for(let z=0;z<drugTypeList.length;z++){
                    if(warehousingOutInfo[i].drug.drug_type == drugTypeList[z].value){
                       warehousingOutInfo[i].drug_type = drugTypeList[z].name
     tempObj["max_unit_fisrt"] = 0;
     tempObj["min_unit_fisrt"] = 0;
     tempObj["total_price"] = 0;
+    tempObj["patient_id"] = 0
+    tempObj["product_date"] = ""
+    tempObj["expiry_date"]=""
     this.recordInfo.recordData.push(tempObj);
     this.GetConfigInfo();
     this.propForm.goodUnit = this.$store.getters.good_unit;

src/xt_pages/stock/drugs/drugStockOutOrderEdit.vue

             </template>
           </el-table-column>
 
+          <el-table-column label="使用患者" width="140" align="center">
+            <template slot-scope="scope">
+              <el-select
+                v-model="scope.row.patient_id"
+                filterable
+                placeholder="请选择使用患者"
+                :disabled="drug_show"
+              >
+                <el-option
+                  v-for="(option, index) in patients"
+                  :key="index"
+                  :label="option.name"
+                  :value="option.id"
+                >
+                </el-option>
+              </el-select>
+            </template>
+          </el-table-column>
+
           <!-- <el-table-column width="120" align="center">
             <template slot="header" slot-scope="scope">
               <span>进货价</span>
       storehouse_id: "",
       is_check:0,
       order_id:0,
+      patients:[]
     };
   },
   methods: {
       tempObj["total_count"] = 0;
       tempObj["max_unit_fisrt"] = 0;
       tempObj["min_unit_fisrt"] = 0;
+      tempObj["patient_id"] =0
       this.recordInfo.recordData.push(tempObj);
     },
     handleDelete: function (index, row) {
               response.data.data.list[i].drug.min_unit +
               "/" +
               response.data.data.list[i].drug.max_unit;
-            // if(response.data.data.list[i].count%response.data.data.list[i].drug.min_number == 0){
-            //    response.data.data.list[i].count = response.data.data.list[i].count/response.data.data.list[i].drug.min_number
-            //    response.data.data.list[i].count_unit = response.data.data.list[i].drug.max_unit
-            // }
+          
             if (
               response.data.data.list[i].number == "0" ||
               response.data.data.list[i].number == 0
               "{y}-{h}-{d}"
             );
 
-            response.data.data.list[i].stock_count =
-              response.data.data.list[i].stock_count;
-            response.data.data.list[i].last_price =
-              response.data.data.list[i].last_price;
+            response.data.data.list[i].stock_count = response.data.data.list[i].stock_count;
+            response.data.data.list[i].last_price = response.data.data.list[i].last_price;
+            response.data.data.list[i].patient_id = response.data.data.list[i].patient_id
             this.recordInfo.recordData.push(response.data.data.list[i]);
           }
 
           );
           this.houstList = response.data.data.houstList;
           this.doctorList = response.data.data.doctorList;
+          var obj ={id:0,name:"系统"}
+          this.patients =[]
+          this.patients.push(obj)
+          if(response.data.data.patients!=null){
+            for(let i=0;i<response.data.data.patients.length;i++){
+              this.patients.push(response.data.data.patients[i])
+            }
+          }
         }
 
         if (this.recordInfo.recordData.length == 0) {

src/xt_pages/stock/stockOutOrderAdd.vue

                </el-select>
             </template>
           </el-table-column>
+
+
+          <el-table-column label="使用患者"  width="150" align="center">
+            <template slot-scope="scope">
+               <el-select size="small" v-model="scope.row.patient_id" filterable placeholder="请选择出库对象">
+                <el-option
+                  v-for="(option, index) in patients"
+                  :key="index"
+                  :label="option.name"
+                  :value="option.id">
+                </el-option>
+               </el-select>
+            </template>
+          </el-table-column>
 <!--
           <el-table-column  width="150" align="center">
             <template slot="header" slot-scope="scope">
       warehouseOut_id:0,
       is_check:0,
       loading:false,
+      patients:[]
     };
   },
   methods: {
           this.list = response.data.data.list
           this.storehouse_id = response.data.data.configlist.storehouse_out_info
           this.doctorList =  response.data.data.doctorList
+          var obj ={id:0,name:"系统"}
+          this.patients =[]
+          this.patients.push(obj)
+          if(response.data.data.patients!=null){
+            for(let i=0;i<response.data.data.patients.length;i++){
+              this.patients.push(response.data.data.patients[i])
+            }
+          }
+          
         }
       });
     },
       tempObj["stock_count"] = ""
       tempObj["id"] = 0
       tempObj['register_number'] = ''
+      tempObj['patient_id'] =0
       this.recordInfo.recordData.push(tempObj);
     },
     handleDelete: function(index, row) {
                     warehouseOutInfoList[i].name =  warehouseOutInfoList[i].GoodInfo.specification_name +"/"+ warehouseOutInfoList[i].GoodInfo.packing_unit
                     warehouseOutInfoList[i].expiry_date = this.getTimeOne(warehouseOutInfoList[i].expiry_date)
                     warehouseOutInfoList[i].product_date = this.getTimeOne(warehouseOutInfoList[i].product_date)
+                    warehouseOutInfoList[i].patient_id = warehouseOutInfoList[i].patient_id
 
                  }
                  this.recordInfo.recordData = warehouseOutInfoList
             this.recordInfo.recordData[i].stock_count = total_count
             this.recordInfo.recordData[i].license_number = val.number
             this.recordInfo.recordData[i].register_number = val.register_number
+            this.recordInfo.recordData[i].patient_id = 0
              
             if( val.first_xt_warehouse_info!=null&&val.first_xt_warehouse_info.expiry_date >0){
               this.recordInfo.recordData[i].expiry_date = this.getTimeOne(val.first_xt_warehouse_info.expiry_date)
     tempObj["stock_count"] = ""
     tempObj["id"] = 0
     tempObj['register_number'] = ''
+    tempObj['patient_id'] = 0
     this.recordInfo.recordData.push(tempObj);
     this.GetConfigInfo();
     this.propForm.goodUnit = this.$store.getters.good_unit;

src/xt_pages/stock/stockOutOrderEdit.vue

             </template>
           </el-table-column>
 
+          
+          <el-table-column label="使用患者"  width="150" align="center">
+            <template slot-scope="scope">
+               <el-select size="small" v-model="scope.row.patient_id" filterable placeholder="请选择使用患者">
+                <el-option
+                  v-for="(option, index) in patients"
+                  :key="index"
+                  :label="option.name"
+                  :value="option.id">
+                </el-option>
+               </el-select>
+            </template>
+          </el-table-column>
+
           <el-table-column label="总价" width="150" align="center">
             <template slot-scope="scope">
               {{calculate(scope.row.price*scope.row.count)}}
         showCheck:false,
         showReturnCheck:false,
         loading:false,
+        patients:[],
       }
     },
     methods: {
         tempObj["buy_price"]= ""
         tempObj["stock_count"] = ""
         tempObj['register_number'] = ''
+        tempObj['patient_id'] =0
         this.recordInfo.recordData.push(tempObj)
       },
       handleDelete: function(index, row) {
             response.data.data.list[i].remark = response.data.data.list[i].remark
             response.data.data.list[i].buy_price = response.data.data.list[i].buy_price.toString()
             response.data.data.list[i].stock_count = response.data.data.list[i].stock_count.toString()
+            response.data.data.list[i].patient_id = response.data.data.list[i].patient_id
             if(response.data.data.list[i].dealer == 0){
                response.data.data.list[i].dealer = ""
             }
             if(response.data.data.list[i].manufacturer ==0 ){
                response.data.data.list[i].manufacturer = ""
             }
+            response.data.data.list[i].patient_id = response.data.data.list[i].patient_id
             this.recordInfo.recordData.push(response.data.data.list[i])
           }
           this.storelist = response.data.data.storelist
           this.warehouse_out_time = this.getTime(response.data.data.out.warehouse_out_time,"{y}-{m}-{d}")
           this.storehouse_id = response.data.data.out.storehouse_id
+          var obj ={id:0,name:"系统"}
+          this.patients =[]
+          this.patients.push(obj)
+          if(response.data.data.patients!=null){
+            for(let i=0;i<response.data.data.patients.length;i++){
+              this.patients.push(response.data.data.patients[i])
+            }
+          }
           loading.close();
         }
       })

src/xt_pages/workforce/appointment.vue

         <table-data ref="tableData"  :week-time="activeName" :partitions-prop="partitions"
                     :schedule-zone-row-prop="scheduleZoneRow"
                     :schedule-zone-prop="scheduleZone" title="" @event1="changePartition"
-                    @event2="changeSchedule"  @event3="changeWeekDay" @event6="changeScheduleType" v-show="showtableOne">
+                    @event2="changeSchedule"  @event3="changeWeekDay" @event6="changeScheduleType" @guanliu_show="guanliu" v-show="showtableOne">
         </table-data>
       </div>
       <!-- 编辑 -->
       schedule_week: 0,
       newDay: [],
       templateObj: {},
-      week_date:""
+      week_date:"",
+      guanliu_show:false,
       
     }
   },
     beforeweekTable
   },
   methods: {
+    // 
+    guanliu(value){
+      this.guanliu_show=value
+      console.log('1111',value);
+      this.getThreeWeekList()
+    },
     handleClick(e,tab){
       if(e.name == 'historyWeek'){
         this.showtable=true
       this.$router.push({path: '/workforce/template'})
     },
     export_file: function () {
+      // this.getThreeWeekList()
+      if(this.$refs.tableData.value1==false){
+        this.guanliu_show=false
+        // this.export_file_step_two()
+      }else{
+        this.guanliu_show=true
+        // this.export_file_step_two()
+      }
       // this.getWeekPanelsTwo()
       this.export_file_step_two()
     },
         partition_id: this.partition_id,
         schedule_type: this.schedule_type
       }
-      console.log("params32323232323223", params)
+      // console.log("params32323232323223", params)
       getThreeWeekList(params).then(response => {
         if (response.data.state == 1) {
           var partitions = response.data.data.partitions
           for (let key in partitions) {
             var tempValue
             var jihaos = partitions[key].jihaos
-
+            
+            jihaos.sort(function(a,b) {
+              return a.sort-b.sort
+            })
+            // console.log('rrrrr',jihaos);
+            // for(let i=0;i<jihaos1.length;i++){
+            //   var jihaos=jihaos1[i].sort
+            // }
+            // for(let i in jihaos1){
+            //   var jihaos=jihaos1[i].sort
+            //    jihaos.sort(function(a,b){
+            //     return a-b
+            //   })
+            //   console.log('wwwww',jihaos);
+            // }
             if (i == 0) {
               let m = 'A3' + ':' + 'A' + (2 + jihaos.length)
               tempValue = (2 + jihaos.length)
           console.log("list")
           console.log(list)
           console.log("week")
-          console.log(week)
+          console.log(lastWeek)
 
           if (week.length > 0) {
             // console.log('qqqqqqqqq',list);
                 if (list[i].机号 == week[j].number && list[i].区号 == week[j].zon_name) {
                   //  周一上午 week[j].number week[j].zon_name
                   if (week[j].schedule_week == 1 && week[j].schedule_type == 1) {
-                    // console.log(week[j].name)
-                    list[i].shangwu = week[j].name+" "+week[j].dialysis_machine_name
-                    console.log('eeeeeee',week[j].mode_id)
+                    if(this.guanliu_show==false){
+                      list[i].shangwu = week[j].name
+                      // console.log('eeeeeee',list[i].shangwu)
+                    }else{
+                      list[i].shangwu = week[j].name+" "+week[j].dialysis_machine_name
+                      // console.log('kkkkkk',list[i].shangwu)
+                    }
                   }
                   // 周一下午
                   if (week[j].schedule_week == 1 && week[j].schedule_type == 2) {
-                    list[i].xiawu = week[j].name+" "+week[j].dialysis_machine_name
+                    if(this.$refs.tableData.value1==false){
+                      list[i].xiawu = week[j].name
+                    }else{
+                      list[i].xiawu = week[j].name+" "+week[j].dialysis_machine_name
+                    }
                   }
                   // 周一晚上
                   if (week[j].schedule_week == 1 && week[j].schedule_type == 3) {
-                    list[i].wanshang = week[j].name+" "+week[j].dialysis_machine_name
+                    if(this.$refs.tableData.value1==false){
+                      list[i].wanshang = week[j].name
+                    }else{
+                      list[i].wanshang = week[j].name+" "+week[j].dialysis_machine_name
+                    }
                   }
 
                   //周二上午
                   if (week[j].schedule_week == 2 && week[j].schedule_type == 1) {
-                    list[i].shangwu1 = week[j].name+" "+week[j].dialysis_machine_name
-                    console.log('eeeeeee',week[j].mode_id)
+                    if(this.$refs.tableData.value1==false){
+                      list[i].shangwu1 = week[j].name
+                    }else{
+                      list[i].shangwu1 = week[j].name+" "+week[j].dialysis_machine_name
+                    }
                   }
                   //周二下午
                   if (week[j].schedule_week == 2 && week[j].schedule_type == 2) {
-                    list[i].xiawu1 = week[j].name+" "+week[j].dialysis_machine_name
+                    if(this.$refs.tableData.value1==false){
+                      list[i].xiawu1 = week[j].name
+                    }else{
+                      list[i].xiawu1 = week[j].name+" "+week[j].dialysis_machine_name
+                    }
                   }
                   //周二晚上
                   if (week[j].schedule_week == 2 && week[j].schedule_type == 3) {
-                    list[i].wanshang1 = week[j].name+" "+week[i].dialysis_machine_name
+                    if(this.$refs.tableData.value1==false){
+                      list[i].wanshang1 = week[j].name
+                    }else{
+                      list[i].wanshang1 = week[j].name+" "+week[j].dialysis_machine_name
+                    }
+                    // list[i].wanshang1 = week[j].name+" "+week[i].dialysis_machine_name
                   }
 
                   //周三上午
                   if (week[j].schedule_week == 3 && week[j].schedule_type == 1) {
-                    list[i].shangwu2 = week[j].name+" "+week[j].dialysis_machine_name
+                    if(this.$refs.tableData.value1==false){
+                      list[i].shangwu2 = week[j].name
+                    }else{
+                      list[i].shangwu2 = week[j].name+" "+week[j].dialysis_machine_name
+                    }
+                    // list[i].shangwu2 = week[j].name+" "+week[j].dialysis_machine_name
                   }
                   //周三下午
                   if (week[j].schedule_week == 3 && week[j].schedule_type == 2) {
-                    list[i].xiawu2 = week[j].name+" "+week[j].dialysis_machine_name
+                    if(this.$refs.tableData.value1==false){
+                      list[i].xiawu2 = week[j].name
+                    }else{
+                      list[i].xiawu2 = week[j].name+" "+week[j].dialysis_machine_name
+                    }
+                    // list[i].xiawu2 = week[j].name+" "+week[j].dialysis_machine_name
                   }
                   //周三晚上
                   if (week[j].schedule_week == 3 && week[j].schedule_type == 3) {
-                    list[i].wanshang2 = week[j].name+" "+week[j].dialysis_machine_name
+                    if(this.$refs.tableData.value1==false){
+                      list[i].wanshang2 = week[j].name
+                    }else{
+                      list[i].wanshang2 = week[j].name+" "+week[j].dialysis_machine_name
+                    }
+                    // list[i].wanshang2 = week[j].name+" "+week[j].dialysis_machine_name
                   }
                   //周四上午
                   if (week[j].schedule_week == 4 && week[j].schedule_type == 1) {
-                    list[i].shangwu3 = week[j].name+" "+week[j].dialysis_machine_name
+                    if(this.$refs.tableData.value1==false){
+                      list[i].shangwu3 = week[j].name
+                    }else{
+                      list[i].shangwu3 = week[j].name+" "+week[j].dialysis_machine_name
+                    }
+                    // list[i].shangwu3 = week[j].name+" "+week[j].dialysis_machine_name
                   }
                   //周四下午
                   if (week[j].schedule_week == 4 && week[j].schedule_type == 2) {
-                    list[i].xiawu3 = week[j].name+" "+week[j].dialysis_machine_name
+                    if(this.$refs.tableData.value1==false){
+                      list[i].xiawu3 = week[j].name
+                    }else{
+                      list[i].xiawu3 = week[j].name+" "+week[j].dialysis_machine_name
+                    }
+                    // list[i].xiawu3 = week[j].name+" "+week[j].dialysis_machine_name
                   }
                   //周四晚上
                   if (week[j].schedule_week == 4 && week[j].schedule_type == 3) {
-                    list[i].wanshang3 = week[j].name+" "+week[j].dialysis_machine_name
+                    if(this.$refs.tableData.value1==false){
+                      list[i].wanshang3 = week[j].name
+                    }else{
+                      list[i].wanshang3 = week[j].name+" "+week[j].dialysis_machine_name
+                    }
+                    // list[i].wanshang3 = week[j].name+" "+week[j].dialysis_machine_name
                   }
                   //周五上午
                   if (week[j].schedule_week == 5 && week[j].schedule_type == 1) {
-                    list[i].shangwu4 = week[j].name+" "+week[j].dialysis_machine_name
+                    if(this.$refs.tableData.value1==false){
+                      list[i].shangwu4 = week[j].name
+                    }else{
+                      list[i].shangwu4 = week[j].name+" "+week[j].dialysis_machine_name
+                    }
+                    // list[i].shangwu4 = week[j].name+" "+week[j].dialysis_machine_name
                   }
                   //周五下午
                   if (week[j].schedule_week == 5 && week[j].schedule_type == 2) {
-                    list[i].xiawu4 = week[j].name+" "+week[j].dialysis_machine_name
+                    if(this.$refs.tableData.value1==false){
+                      list[i].xiawu4 = week[j].name
+                    }else{
+                      list[i].xiawu4 = week[j].name+" "+week[j].dialysis_machine_name
+                    }
+                    // list[i].xiawu4 = week[j].name+" "+week[j].dialysis_machine_name
                   }
                   //周五晚上
                   if (week[j].schedule_week == 5 && week[j].schedule_type == 3) {
-                    list[i].wanshang4 = week[j].name+" "+week[j].dialysis_machine_name
+                    if(this.$refs.tableData.value1==false){
+                      list[i].wanshang4 = week[j].name
+                    }else{
+                      list[i].wanshang4 = week[j].name+" "+week[j].dialysis_machine_name
+                    }
+                    // list[i].wanshang4 = week[j].name+" "+week[j].dialysis_machine_name
                   }
                   //周六上午
                   if (week[j].schedule_week == 6 && week[j].schedule_type == 1) {
-                    list[i].shangwu5 = week[j].name+" "+week[j].dialysis_machine_name
+                    if(this.$refs.tableData.value1==false){
+                      list[i].shangwu5 = week[j].name
+                    }else{
+                      list[i].shangwu5 = week[j].name+" "+week[j].dialysis_machine_name
+                    }
+                    // list[i].shangwu5 = week[j].name+" "+week[j].dialysis_machine_name
                   }
                   //周六下午
                   if (week[j].schedule_week == 6 && week[j].schedule_type == 2) {
-                    list[i].xiawu5 = week[j].name+" "+week[j].dialysis_machine_name
+                    if(this.$refs.tableData.value1==false){
+                      list[i].xiawu5 = week[j].name
+                    }else{
+                      list[i].xiawu5 = week[j].name+" "+week[j].dialysis_machine_name
+                    }
+                    // list[i].xiawu5 = week[j].name+" "+week[j].dialysis_machine_name
                   }
                   //周六晚上
                   if (week[j].schedule_week == 6 && week[j].schedule_type == 3) {
-                    list[i].wanshang5 = week[j].name+" "+week[j].dialysis_machine_name
+                    if(this.$refs.tableData.value1==false){
+                      list[i].wanshang5 = week[j].name
+                    }else{
+                      list[i].wanshang5 = week[j].name+" "+week[j].dialysis_machine_name
+                    }
+                    // list[i].wanshang5 = week[j].name+" "+week[j].dialysis_machine_name
                   }
                   //周日上午
                   if (week[j].schedule_week == 7 && week[j].schedule_type == 1) {
-                    list[i].shangwu6 = week[j].name+" "+week[j].dialysis_machine_name
+                    if(this.$refs.tableData.value1==false){
+                      list[i].shangwu6 = week[j].name
+                    }else{
+                      list[i].shangwu6 = week[j].name+" "+week[j].dialysis_machine_name
+                    }
+                    // list[i].shangwu6 = week[j].name+" "+week[j].dialysis_machine_name
                   }
                   //周日下午
                   if (week[j].schedule_week == 7 && week[j].schedule_type == 2) {
-                    list[i].xiawu6 = week[j].name+" "+week[j].dialysis_machine_name
+                    if(this.$refs.tableData.value1==false){
+                      list[i].xiawu6 = week[j].name
+                    }else{
+                      list[i].xiawu6 = week[j].name+" "+week[j].dialysis_machine_name
+                    }
+                    // list[i].xiawu6 = week[j].name+" "+week[j].dialysis_machine_name
                   }
                   //周日晚上
                   if (week[j].schedule_week == 7 && week[j].schedule_type == 3) {
-                    list[i].wanshang6 = week[j].name+" "+week[j].dialysis_machine_name
+                    if(this.$refs.tableData.value1==false){
+                      list[i].wanshang6 = week[j].name
+                    }else{
+                      list[i].wanshang6 = week[j].name+" "+week[j].dialysis_machine_name
+                    }
+                    // list[i].wanshang6 = week[j].name+" "+week[j].dialysis_machine_name
                   }
                 }
 
                 if (list[i].机号 == nextWeek[j].number && list[i].区号 == nextWeek[j].zon_name) {
                   //周一
                   if (nextWeek[j].schedule_week == 1 && nextWeek[j].schedule_type == 1) {
-                    list[i].shangwu7 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
+                    if(this.$refs.tableData.value1==false){
+                      list[i].shangwu7 = nextWeek[j].name
+                    }else{
+                      list[i].shangwu7 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
+                    }
+                    // list[i].shangwu7 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
                   }
                   //周一下午
                   if (nextWeek[j].schedule_week == 1 && nextWeek[j].schedule_type == 2) {
-                    list[i].xiawu7 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
+                    if(this.$refs.tableData.value1==false){
+                      list[i].xiawu7 = nextWeek[j].name
+                    }else{
+                      list[i].xiawu7 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
+                    }
+                    // list[i].xiawu7 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
                   }
                   //周一晚上
                   if (nextWeek[j].schedule_week == 1 && nextWeek[j].schedule_type == 3) {
-                    list[i].wanshang7 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
+                    if(this.$refs.tableData.value1==false){
+                      list[i].wanshang7 = nextWeek[j].name
+                    }else{
+                      list[i].wanshang7 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
+                    }
+                    // list[i].wanshang7 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
                   }
 
                   //周二上午
                   if (nextWeek[j].schedule_week == 2 && nextWeek[j].schedule_type == 1) {
-                    list[i].shangwu8 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
+                    if(this.$refs.tableData.value1==false){
+                      list[i].shangwu8 = nextWeek[j].name
+                    }else{
+                      list[i].shangwu8 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
+                    }
+                    // list[i].shangwu8 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
                   }
                   //周二下午
                   if (nextWeek[j].schedule_week == 2 && nextWeek[j].schedule_type == 2) {
-                    list[i].xiawu8 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
+                    if(this.$refs.tableData.value1==false){
+                      list[i].xiawu8 = nextWeek[j].name
+                    }else{
+                      list[i].xiawu8 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
+                    }
+                    // list[i].xiawu8 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
                   }
                   //周二晚上
                   if (nextWeek[j].schedule_week == 2 && nextWeek[j].schedule_type == 3) {
-                    list[i].wanshang8 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
+                    if(this.$refs.tableData.value1==false){
+                      list[i].wanshang8 = nextWeek[j].name
+                    }else{
+                      list[i].wanshang8 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
+                    }
+                    // list[i].wanshang8 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
                   }
 
                   //周三上午
                   if (nextWeek[j].schedule_week == 3 && nextWeek[j].schedule_type == 1) {
-                    list[i].shangwu9 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
+                    if(this.$refs.tableData.value1==false){
+                      list[i].shangwu9 = nextWeek[j].name
+                    }else{
+                      list[i].shangwu9 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
+                    }
+                    // list[i].shangwu9 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
                   }
                   //周三下午
                   if (nextWeek[j].schedule_week == 3 && nextWeek[j].schedule_type == 2) {
-                    list[i].xiawu9 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
+                    if(this.$refs.tableData.value1==false){
+                      list[i].xiawu9 = nextWeek[j].name
+                    }else{
+                      list[i].xiawu9 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
+                    }
+                    // 
                   }
                   //周三晚上
                   if (nextWeek[j].schedule_week == 3 && nextWeek[j].schedule_type == 3) {
-                    list[i].wanshang9 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
+                    if(this.$refs.tableData.value1==false){
+                      list[i].wanshang9 = nextWeek[j].name
+                    }else{
+                      list[i].wanshang9 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
+                    }
+                    // list[i].wanshang9 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
                   }
 
                   //周四上午
                   if (nextWeek[j].schedule_week == 4 && nextWeek[j].schedule_type == 1) {
-                    list[i].shangwu10 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
+                    if(this.$refs.tableData.value1==false){
+                      list[i].shangwu10 = nextWeek[j].name
+                    }else{
+                      list[i].shangwu10 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
+                    }
+                    // list[i].shangwu10 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
                   }
                   //周四下午
                   if (nextWeek[j].schedule_week == 4 && nextWeek[j].schedule_type == 2) {
-                    list[i].xiawu10 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
+                    if(this.$refs.tableData.value1==false){
+                      list[i].xiawu10 = nextWeek[j].name
+                    }else{
+                      list[i].xiawu10 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
+                    }
+                    // list[i].xiawu10 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
                   }
                   //周四晚上
                   if (nextWeek[j].schedule_week == 4 && nextWeek[j].schedule_type == 3) {
-                    list[i].wanshang10 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
+                    if(this.$refs.tableData.value1==false){
+                      list[i].wanshang10 = nextWeek[j].name
+                    }else{
+                      list[i].wanshang10 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
+                    }
+                    // list[i].wanshang10 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
                   }
 
                   //周五上午
                   if (nextWeek[j].schedule_week == 5 && nextWeek[j].schedule_type == 1) {
-                    list[i].shangwu11 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
+                    if(this.$refs.tableData.value1==false){
+                      list[i].shangwu11 = nextWeek[j].name
+                    }else{
+                      list[i].shangwu11 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
+                    }
+                    // list[i].shangwu11 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
                   }
                   //周五下午
                   if (nextWeek[j].schedule_week == 5 && nextWeek[j].schedule_type == 2) {
-                    list[i].xiawu11 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
+                    if(this.$refs.tableData.value1==false){
+                      list[i].xiawu11 = nextWeek[j].name
+                    }else{
+                      list[i].xiawu11 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
+                    }
+                    // list[i].xiawu11 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
                   }
                   //周五晚上
                   if (nextWeek[j].schedule_week == 5 && nextWeek[j].schedule_type == 3) {
-                    list[i].wanshang11 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
+                    if(this.$refs.tableData.value1==false){
+                      list[i].wanshang11 = nextWeek[j].name
+                    }else{
+                      list[i].wanshang11 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
+                    }
+                    // list[i].wanshang11 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
                   }
 
                   //周六上午
                   if (nextWeek[j].schedule_week == 6 && nextWeek[j].schedule_type == 1) {
-                    list[i].shangwu12 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
+                    if(this.$refs.tableData.value1==false){
+                      list[i].shangwu12 = nextWeek[j].name
+                    }else{
+                      list[i].shangwu12 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
+                    }
+                    // list[i].shangwu12 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
                   }
                   //周六下午
                   if (nextWeek[j].schedule_week == 6 && nextWeek[j].schedule_type == 2) {
-                    list[i].xiawu12 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
+                    if(this.$refs.tableData.value1==false){
+                      list[i].xiawu12 = nextWeek[j].name
+                    }else{
+                      list[i].xiawu12 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
+                    }
+                    // list[i].xiawu12 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
                   }
                   //周六晚上
                   if (nextWeek[j].schedule_week == 6 && nextWeek[j].schedule_type == 3) {
-                    list[i].wanshang12 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
+                    if(this.$refs.tableData.value1==false){
+                      list[i].wanshang12 = nextWeek[j].name
+                    }else{
+                      list[i].wanshang12 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
+                    }
+                    // list[i].wanshang12 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
                   }
 
                   //周日上午
                   if (nextWeek[j].schedule_week == 7 && nextWeek[j].schedule_type == 1) {
-                    list[i].shangwu13 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
+                    if(this.$refs.tableData.value1==false){
+                      list[i].shangwu13 = nextWeek[j].name
+                    }else{
+                      list[i].shangwu13 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
+                    }
+                    // list[i].shangwu13 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
                   }
                   //周日下午
                   if (nextWeek[j].schedule_week == 7 && nextWeek[j].schedule_type == 2) {
-                    list[i].xiawu13 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
+                    if(this.$refs.tableData.value1==false){
+                      list[i].xiawu13 = nextWeek[j].name
+                    }else{
+                      list[i].xiawu13 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
+                    }
+                    // list[i].xiawu13 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
                   }
                   //周日晚上
                   if (nextWeek[j].schedule_week == 7 && nextWeek[j].schedule_type == 3) {
-                    list[i].wanshang13 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
+                    if(this.$refs.tableData.value1==false){
+                      list[i].wanshang13 = nextWeek[j].name
+                    }else{
+                      list[i].wanshang13 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
+                    }
+                    // list[i].wanshang13 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
                   }
                 }
 
           }
           //
           if (lastWeek.length > 0) {
+            console.log('ttttt',lastWeek);
             for (let i = 0; i < list.length; i++) {
               for (let j = 0; j < lastWeek.length; j++) {
                 if (list[i].机号 == lastWeek[j].number && list[i].区号 == lastWeek[j].zon_name) {
                   //周一
                   if (lastWeek[j].schedule_week == 1 && lastWeek[j].schedule_type == 1) {
-                    list[i].shangwu14 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
+                    if(this.guanliu_show==false){
+                      list[i].shangwu14 = lastWeek[j].name
+                    }else{
+                      list[i].shangwu14 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
+                    }
+                    // list[i].shangwu14 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
                   }
                   //周一下午
                   if (lastWeek[j].schedule_week == 1 && lastWeek[j].schedule_type == 2) {
-                    list[i].xiawu14 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
+                    if(this.guanliu_show==false){
+                      list[i].xiawu14 = lastWeek[j].name
+                    }else{
+                      list[i].xiawu14 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
+                    }
+                    // list[i].xiawu14 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
                   }
                   //周一晚上
                   if (lastWeek[j].schedule_week == 1 && lastWeek[j].schedule_type == 3) {
-                    list[i].wanshang14 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
+                    if(this.guanliu_show==false){
+                      list[i].wanshang14 = lastWeek[j].name
+                    }else{
+                      list[i].wanshang14 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
+                    }
+                    // list[i].wanshang14 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
                   }
 
                   //周二
                   if (lastWeek[j].schedule_week == 2 && lastWeek[j].schedule_type == 1) {
-                    list[i].shangwu15 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
+                    if(this.guanliu_show==false){
+                      list[i].shangwu15 = lastWeek[j].name
+                    }else{
+                      list[i].shangwu15 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
+                    }
+                    // list[i].shangwu15 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
                   }
                   //周二下午
                   if (lastWeek[j].schedule_week == 2 && lastWeek[j].schedule_type == 2) {
-                    list[i].xiawu15 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
+                    if(this.guanliu_show==false){
+                      list[i].xiawu15 = lastWeek[j].name
+                      console.log('22222',list[i].xiawu15);
+                    }else{
+                      list[i].xiawu15 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
+                    }
+                    // list[i].xiawu15 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
                   }
                   //周二晚上
                   if (lastWeek[j].schedule_week == 2 && lastWeek[j].schedule_type == 3) {
-                    list[i].wanshang15 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
+                    if(this.guanliu_show==false){
+                      list[i].wanshang15 = lastWeek[j].name
+                    }else{
+                      list[i].wanshang15 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
+                    }
+                    // list[i].wanshang15 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
                   }
 
                   //周三
                   if (lastWeek[j].schedule_week == 3 && lastWeek[j].schedule_type == 1) {
-                    list[i].shangwu16 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
+                    if(this.guanliu_show==false){
+                      list[i].shangwu16 = lastWeek[j].name
+                    }else{
+                      list[i].shangwu16 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
+                    }
+                    // list[i].shangwu16 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
                   }
                   //周三下午
                   if (lastWeek[j].schedule_week == 3 && lastWeek[j].schedule_type == 2) {
-                    list[i].xiawu16 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
+                    if(this.guanliu_show==false){
+                      list[i].xiawu16 = lastWeek[j].name
+                    }else{
+                      list[i].xiawu16 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
+                    }
+                    // list[i].xiawu16 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
                   }
                   //周三晚上
                   if (lastWeek[j].schedule_week == 3 && lastWeek[j].schedule_type == 3) {
-                    list[i].wanshang16 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
+                    if(this.guanliu_show==false){
+                      list[i].wanshang16 = lastWeek[j].name
+                    }else{
+                      list[i].wanshang16 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
+                    }
+                    // list[i].wanshang16 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
                   }
 
                   //周四
                   if (lastWeek[j].schedule_week == 4 && lastWeek[j].schedule_type == 1) {
-                    list[i].shangwu17 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
+                    if(this.guanliu_show==false){
+                      list[i].shangwu17 = lastWeek[j].name
+                    }else{
+                      list[i].shangwu17 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
+                    }
+                    // list[i].shangwu17 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
                   }
                   //周四下午
                   if (lastWeek[j].schedule_week == 4 && lastWeek[j].schedule_type == 2) {
-                    list[i].xiawu17 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
+                    if(this.guanliu_show==false){
+                      list[i].xiawu17 = lastWeek[j].name
+                    }else{
+                      list[i].xiawu17 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
+                    }
+                    // list[i].xiawu17 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
                   }
                   //周四晚上
                   if (lastWeek[j].schedule_week == 4 && lastWeek[j].schedule_type == 3) {
-                    list[i].wanshang17 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
+                    if(this.guanliu_show==false){
+                      list[i].wanshang17 = lastWeek[j].name
+                    }else{
+                      list[i].wanshang17 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
+                    }
+                    // list[i].wanshang17 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
                   }
 
                   //周五
                   if (lastWeek[j].schedule_week == 5 && lastWeek[j].schedule_type == 1) {
-                    list[i].shangwu18 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
+                    if(this.guanliu_show==false){
+                      list[i].shangwu18 = lastWeek[j].name
+                    }else{
+                      list[i].shangwu18 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
+                    }
+                    // list[i].shangwu18 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
                   }
                   //周五下午
                   if (lastWeek[j].schedule_week == 5 && lastWeek[j].schedule_type == 2) {
-                    list[i].xiawu18 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
+                    if(this.guanliu_show==false){
+                      list[i].xiawu18 = lastWeek[j].name
+                    }else{
+                      list[i].xiawu18 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
+                    }
+                    // list[i].xiawu18 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
                   }
                   //周五晚上
                   if (lastWeek[j].schedule_week == 5 && lastWeek[j].schedule_type == 3) {
-                    list[i].wanshang18 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
+                    if(this.guanliu_show==false){
+                      list[i].wanshang18 = lastWeek[j].name
+                    }else{
+                      list[i].wanshang18 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
+                    }
+                    // list[i].wanshang18 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
                   }
 
                   //周六
                   if (lastWeek[j].schedule_week == 6 && lastWeek[j].schedule_type == 1) {
-                    list[i].shangwu19 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
+                    if(this.guanliu_show==false){
+                      list[i].shangwu19 = lastWeek[j].name
+                    }else{
+                      list[i].shangwu19 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
+                    }
+                    // list[i].shangwu19 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
                   }
                   //周六下午
                   if (lastWeek[j].schedule_week == 6 && lastWeek[j].schedule_type == 2) {
-                    list[i].xiawu19 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
+                    if(this.guanliu_show==false){
+                      list[i].xiawu19 = lastWeek[j].name
+                    }else{
+                      list[i].xiawu19 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
+                    }
+                    // list[i].xiawu19 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
                   }
                   //周六晚上
                   if (lastWeek[j].schedule_week == 6 && lastWeek[j].schedule_type == 3) {
-                    list[i].wanshang19 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
+                    if(this.guanliu_show==false){
+                      list[i].wanshang19 = lastWeek[j].name
+                    }else{
+                      list[i].wanshang19 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
+                    }
+                    // list[i].wanshang19 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
                   }
 
                   //周日
                   if (lastWeek[j].schedule_week == 7 && lastWeek[j].schedule_type == 1) {
-                    list[i].shangwu20 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
+                    if(this.guanliu_show==false){
+                      list[i].shangwu20 = lastWeek[j].name
+                    }else{
+                      list[i].shangwu20 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
+                    }
+                    // list[i].shangwu20 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
                   }
                   //周日下午
                   if (lastWeek[j].schedule_week == 7 && lastWeek[j].schedule_type == 2) {
-                    list[i].xiawu20 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
+                    if(this.guanliu_show==false){
+                      list[i].xiawu20 = lastWeek[j].name
+                    }else{
+                      list[i].xiawu20 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
+                    }
+                    // list[i].xiawu20 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
                   }
                   //周日晚上
                   if (lastWeek[j].schedule_week == 7 && lastWeek[j].schedule_type == 3) {
-                    list[i].wanshang20 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
+                    if(this.guanliu_show==false){
+                      list[i].wanshang20 = lastWeek[j].name
+                    }else{
+                      list[i].wanshang20 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
+                    }
+                    // list[i].wanshang20 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
                   }
                 }
 
 
     }
 
-  }
+  },
+  // updated(){
+  //   this.getThreeWeekList()
+  // }
 }
 </script>
 

src/xt_pages/workforce/components/tableWeeks.vue

           }}</span>
                     <span v-if="scope.row.dialysissolution.anticoagulant == 2">{{
             scope.row.dialysissolution.anticoagulant_zongliang
-              ? scope.row.dialysissolution.anticoagulant_zongliang + 'iu'
+              ? scope.row.dialysissolution.anticoagulant_zongliang + 'mg'
               : ''
           }}</span>
                     <span v-if="scope.row.dialysissolution.anticoagulant == 3">{{

src/xt_pages/workforce/remind_print_setting.vue

                 <div v-if="org_id == 10188 || org_id == 10217 || org_id == 10340 || org_id == 9671 || org_id == 9675">干体重:{{main_collection.assessmentbefor.dry_weight}}</div>
                 <div v-if="org_id == 10188 || org_id == 10217 || org_id == 10340 || org_id == 9671 || org_id == 9675">透前体重:{{main_collection.assessmentbefor.weight_before}}</div>
                 <div v-if="org_id == 10188 || org_id == 10217 || org_id == 10340 || org_id == 9671 || org_id == 9675">体重增加:{{(main_collection.assessmentbefor.weight_before - main_collection.assessmentbefor.dry_weight).toFixed(2)}}</div>
-                <div v-if="org_id!=10278">用法:静脉注射</div>
+                <div v-if="org_id!=10278 && org_id!=10600">用法:静脉注射</div>
                 <!-- 透析器灌流器 -->
                
                  <div>