Sfoglia il codice sorgente

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

陈少旭 1 anno fa
parent
commit
2e63ca7c2e

+ 79 - 2
src/vendor/Export2Excel.js Vedi File

@@ -70,6 +70,7 @@ function sheet_from_array_of_arrays(data, opts) {
70 70
       r: 0
71 71
     }
72 72
   };
73
+  console.log('rrrrr',data);
73 74
   for (var R = 0; R != data.length; ++R) {
74 75
     for (var C = 0; C != data[R].length; ++C) {
75 76
       if (range.s.r > R) range.s.r = R;
@@ -157,11 +158,11 @@ export function export_json_to_excel({
157 158
   filename = filename || 'excel-list'
158 159
   data = [...data]
159 160
   data.unshift(header);
160
-
161
+  console.log('wwwww',data);
161 162
   for (let i = multiHeader.length - 1; i > -1; i--) {
162 163
     data.unshift(multiHeader[i])
163 164
   }
164
-
165
+  console.log('qqqqq',data);
165 166
   var ws_name = "SheetJS";
166 167
   var wb = new Workbook(),
167 168
     ws = sheet_from_array_of_arrays(data);
@@ -310,3 +311,79 @@ export function export_json_to_excel1({
310 311
   }
311 312
   
312 313
 }
314
+
315
+export function export_json_to_excel2({
316
+  multiHeader = [],
317
+  header,
318
+  data,
319
+  filename,
320
+  merges = [],
321
+  autoWidth = true,
322
+  bookType = 'xlsx'
323
+} = {}) {
324
+  /* original data */
325
+  filename = filename || 'excel-list'
326
+  data = [...data]
327
+  // data.unshift(header);
328
+  console.log('wwwww',data);
329
+  for (let i = multiHeader.length - 1; i > -1; i--) {
330
+    data.unshift(multiHeader[i])
331
+  }
332
+  console.log('qqqqq',data);
333
+  var ws_name = "SheetJS";
334
+  var wb = new Workbook(),
335
+    ws = sheet_from_array_of_arrays(data);
336
+
337
+  if (merges.length > 0) {
338
+    if (!ws['!merges']) ws['!merges'] = [];
339
+    merges.forEach(item => {
340
+      console.log(XLSX.utils.decode_range(item))
341
+      ws['!merges'].push(XLSX.utils.decode_range(item))
342
+    })
343
+  }
344
+
345
+  if (autoWidth) {
346
+    /*设置worksheet每列的最大宽度*/
347
+    const colWidth = data.map(row => row.map(val => {
348
+      /*先判断是否为null/undefined*/
349
+      if (val == null) {
350
+        return {
351
+          'wch': 10
352
+        };
353
+      }
354
+      /*再判断是否为中文*/
355
+      else if (val.toString().charCodeAt(0) > 255) {
356
+        return {
357
+          'wch': val.toString().length * 2
358
+        };
359
+      } else {
360
+        return {
361
+          'wch': val.toString().length
362
+        };
363
+      }
364
+    }))
365
+    /*以第一行为初始值*/
366
+    let result = colWidth[0];
367
+    for (let i = 1; i < colWidth.length; i++) {
368
+      for (let j = 0; j < colWidth[i].length; j++) {
369
+        if (result[j]['wch'] < colWidth[i][j]['wch']) {
370
+          result[j]['wch'] = colWidth[i][j]['wch'];
371
+        }
372
+      }
373
+    }
374
+    ws['!cols'] = result;
375
+  }
376
+
377
+  /* add worksheet to workbook */
378
+  wb.SheetNames.push(ws_name);
379
+  wb.Sheets[ws_name] = ws;
380
+
381
+  var wbout = XLSX.write(wb, {
382
+    bookType: bookType,
383
+    bookSST: false,
384
+    type: 'binary'
385
+  });
386
+  saveAs(new Blob([s2ab(wbout)], {
387
+    type: "application/octet-stream"
388
+  }), `${filename}.${bookType}`);
389
+}

+ 2 - 11
src/xt_pages/Pharmacy/PatientDispensing.vue Vedi File

@@ -648,8 +648,7 @@ export default {
648 648
         confirmButtonText: "确 定",
649 649
         cancelButtonText: "取 消",
650 650
         type: "warning",
651
-      })
652
-        .then(() => {
651
+      }).then(() => {
653 652
           dispensingmedicine(params).then((res) => {
654 653
             if (res.data.state == 1) {
655 654
               this.$message.success("操作成功");
@@ -658,15 +657,7 @@ export default {
658 657
               this.tableData = null;
659 658
               this.fun4(tmp);
660 659
               this.state = 2;
661
-              // console.log("this.alreadmount_data",this.alreadmount_data)
662
-              // for (let i = 0;i < this.alreadmount_data.length;i++){
663
-              //   console.log("tmp = ",tmp)
664
-              //     if (this.alreadmount_data[i].PatientID == tmp){
665
-              //       console.log("i = ",i)
666
-              //       this.$refs.table02.setCurrentRow(this.alreadmount_data[i]);
667
-              //       this.handleCurrentChange(this.alreadmount_data[i])
668
-              //     }
669
-              // }
660
+           
670 661
             } else {
671 662
               this.$message.error(res.data.msg);
672 663
             }

+ 13 - 0
src/xt_pages/dialysis/batch_print/batch_print_order_six.vue Vedi File

@@ -970,6 +970,7 @@
970 970
                       <div class="inline_block" style="flex: 1">
971 971
                         透前体重:
972 972
                         <div
973
+                          v-if="org_id == 10580"
973 974
                           class="under_line"
974 975
                           style="width: 70px; text-align: center"
975 976
                         >
@@ -985,6 +986,18 @@
985 986
                               : "/"
986 987
                           }}
987 988
                         </div>
989
+                        <div
990
+                          v-if="org_id == 10580"
991
+                          class="under_line"
992
+                          style="width: 70px; text-align: center"
993
+                        >
994
+                          {{
995
+                            record.assessment_before_dislysis &&
996
+                            record.assessment_before_dislysis.weight_before
997
+                              ? parseFloat(record.assessment_before_dislysis.weight_before).toFixed(1)
998
+                              : "/"
999
+                          }}
1000
+                        </div>
988 1001
                         kg
989 1002
                       </div>
990 1003
                       <div class="inline_block" style="flex: 1" v-if=" org_id!=10469">

+ 7 - 7
src/xt_pages/dialysis/details/DialysisPrescription.vue Vedi File

@@ -62,10 +62,10 @@
62 62
         <li v-if=" isShow('总量') && getValueStr('anticoagulant', 'anticoagulant') != 5 " >
63 63
           <label>总量: </label>
64 64
           <span class="content" v-if="getValueStr('anticoagulant', 'anticoagulant') != 1">{{anticoagulant_zongliang != "0" ? anticoagulant_zongliang : ""}}</span>
65
-          <span v-if="this.$store.getters.xt_user.template_info.org_id != 10101 && this.$store.getters.xt_user.template_info.template_id !=45">
65
+          <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">
66 66
             <span class="content" v-if="getValueStr('anticoagulant', 'anticoagulant') == 1" ></span>
67
-            <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>
68
-            <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>
67
+            <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>
68
+            <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>
69 69
             <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 3" >
70 70
             
71 71
               <span v-if="this.$store.getters.xt_user.template_info.org_id == 9671 || this.$store.getters.xt_user.template_info.org_id == 9675">
@@ -204,8 +204,8 @@
204 204
           <span class="content" v-if="getValueStr('anticoagulant', 'anticoagulant') != 1">{{ anticoagulant_shouji != "0" ? anticoagulant_shouji : "" }}</span>
205 205
           <span v-if="this.$store.getters.xt_user.template_info.org_id != 10101 && this.$store.getters.xt_user.template_info.template_id != 45">
206 206
             <span class="content" v-if="getValueStr('anticoagulant', 'anticoagulant') == 1" ></span>
207
-            <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>
208
-            <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>
207
+            <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>
208
+            <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>
209 209
             <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 3">
210 210
               <span v-if="this.$store.getters.xt_user.template_info.org_id == 9671">
211 211
                  {{ anticoagulant_shouji != "0" ? "mg" : "" }}
@@ -315,8 +315,8 @@
315 315
           <span class="content" v-if="getValueStr('anticoagulant', 'anticoagulant') != 1">{{ anticoagulant_weichi != "0" ? anticoagulant_weichi : "" }}</span>
316 316
           <span v-if="this.$store.getters.xt_user.template_info.org_id != 10101 && this.$store.getters.xt_user.template_info.template_id != 45">
317 317
             <span class="content" v-if="getValueStr('anticoagulant', 'anticoagulant') == 1"></span>
318
-            <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>
319
-            <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>
318
+            <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>
319
+            <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>
320 320
             <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 3">
321 321
               <span v-if="this.$store.getters.xt_user.template_info.org_id ==9671">
322 322
               {{ anticoagulant_weichi != "0" ? "mg/h" : "" }}

+ 2 - 1
src/xt_pages/dialysis/details/consumable/dialysisGather.vue Vedi File

@@ -441,6 +441,7 @@
441 441
     import { uParseTime } from "@/utils/tools";
442 442
     import {getRemindPrintList,saveRemindPrint} from '@/api/schedule'
443 443
     import { getDataConfig } from '@/utils/data'
444
+    import print from "print-js";
444 445
     const moment = require('moment')
445 446
     import store from "@/store";
446 447
     export default {
@@ -659,7 +660,7 @@
659 660
                     if(this.getBloodAccessOption(list[i].dialysis_prescription.blood_access).indexOf("导管")!=-1){
660 661
                          total_one ++
661 662
                     }
662
-                    if(this.getBloodAccessOption(list[i].dialysis_prescription.blood_access).indexOf('内瘘')==-1){
663
+                    if(this.getBloodAccessOption(list[i].dialysis_prescription.blood_access).indexOf('内瘘')!=-1){
663 664
                         total_two ++
664 665
                     }
665 666
                   }

+ 3 - 2
src/xt_pages/dialysis/details/dialog/monitor_dialog.vue Vedi File

@@ -573,7 +573,8 @@
573 573
                 org_id!=10551 &&
574 574
                 template_id != 43 &&
575 575
                 template_id != 47 &&
576
-                org_id!=10558) ||
576
+                org_id!=10558 &&
577
+                org_id!=10517) ||
577 578
                 org_id == 9779 ||
578 579
                 template_id == 11 ||
579 580
                 template_id == 20 ||
@@ -605,7 +606,7 @@
605 606
             width="100"
606 607
             v-if="
607 608
               isShow('置换量') &&
608
-              (template_id != 6 || org_id == 9919 || org_id == 10191 || org_id == 10478 || org_id == 10551 || org_id ==10558) &&
609
+              (template_id != 6 || org_id == 9919 || org_id == 10191 || org_id == 10478 || org_id == 10551 || org_id ==10558 || org_id ==10517) &&
609 610
               template_id != 9779 &&
610 611
               template_id != 11 &&
611 612
               template_id != 20 &&

+ 2 - 2
src/xt_pages/dialysis/details/dialysisMonitoring.vue Vedi File

@@ -24,8 +24,8 @@
24 24
           <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>
25 25
           <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>
26 26
           <th v-if=" isShow('置换量') && (template_id == 43)" width="92px"> 置换量(ml/h)  </th>
27
-          <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>
28
-          <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>
27
+          <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>
28
+          <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>
29 29
           <th v-if=" isShow('SpO₂') && template_id != 6 && template_id != 10 && template_id != 11  " width="92px" > SpO₂(%) </th>
30 30
           <th v-if="isShow('电导度')" width="92px">电导度(mS/m)</th>
31 31
           <th v-if="isShow('置换液流量') && template_id != 27 && template_id != 60" width="92px">置换液流量(ml/h)</th>

+ 1 - 1
src/xt_pages/dialysis/newDoctorAdvice.vue Vedi File

@@ -1332,7 +1332,7 @@ export default {
1332 1332
          if(nameOne == '全部'){
1333 1333
           nameOne = ""
1334 1334
         }
1335
-      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} });
1335
+      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} });
1336 1336
 
1337 1337
     },
1338 1338
     batchPrintActionOne: function() {

+ 23 - 4
src/xt_pages/dialysis/template/DialysisPrintOrderFiftyFour.vue Vedi File

@@ -1545,10 +1545,29 @@ export default {
1545 1545
       return "";
1546 1546
     },
1547 1547
     getAge: function (val) {
1548
-      if (val.birthday != 0) {
1549
-        return jsGetAge(val.birth, "-");
1550
-      } else {
1551
-        return "";
1548
+      // if (val.birthday != 0) {
1549
+      //   return jsGetAge(val.birth, "-");
1550
+      // } else {
1551
+      //   return "";
1552
+      // }
1553
+      if (val.id_card_no) {
1554
+        var thisLen = val.id_card_no.length
1555
+
1556
+        var birth = ''
1557
+        if (thisLen == 15) {
1558
+          birth = '19' + val.id_card_no.substr(6, 6)
1559
+        } else {
1560
+          birth = val.id_card_no.substr(6, 8)
1561
+        }
1562
+        var birthtwo =
1563
+          birth.substr(0, 4) +
1564
+          '-' +
1565
+          birth.substr(4, 2) +
1566
+          '-' +
1567
+          birth.substr(6, 2)
1568
+
1569
+        var age = jsGetAge(birthtwo, '-')
1570
+        return age
1552 1571
       }
1553 1572
     },
1554 1573
     newAdviceGroupObject: function () {

+ 6 - 1
src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue Vedi File

@@ -986,7 +986,7 @@
986 986
                         class="under_line"
987 987
                         style="width: 70px; text-align: center"
988 988
                       >
989
-                      <span v-if="org_id !=10447 && org_id != 9675">{{
989
+                      <span v-if="org_id !=10447 && org_id != 9675 && org_id!=10580">{{
990 990
                           predialysis.weight_before
991 991
                             ? parseFloat(
992 992
                                 predialysis.weight_before -
@@ -1005,6 +1005,11 @@
1005 1005
                             : "未称重"
1006 1006
                         }}
1007 1007
                        </span>
1008
+                       <span v-if="org_id ==10580">
1009
+                        {{
1010
+                          predialysis.weight_before? parseFloat(predialysis.weight_before).toFixed(1): "未称重"
1011
+                        }}
1012
+                       </span>
1008 1013
                       </div>
1009 1014
                       kg
1010 1015
                     </div>

+ 114 - 13
src/xt_pages/qcd/workAnalysis/nurse.vue Vedi File

@@ -60,6 +60,7 @@
60 60
             format="yyyy-MM-dd"
61 61
             value-format="yyyy-MM-dd"
62 62
           ></el-date-picker>
63
+          <el-button type="primary" @click="export_file()" :loading="downloadLoading">导出</el-button>
63 64
         </div>
64 65
         <div class="tableTitle">统计图</div>
65 66
         <div>
@@ -178,7 +179,12 @@
178 179
                 start_nurse_count:total_start_nurse, -->
179 180
             <el-table-column label="合计" align="center">
180 181
               <template slot-scope="scope">
181
-                {{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:''}}
182
+                {{scope.row.finish_nuser_count + scope.row.washpipe_nuser_count + scope.row.puncture_count + 
183
+                scope.row.cure_count + scope.row.mission_count + scope.row.change_nuser_count+
184
+                scope.row.difficult_nuser_count+scope.row.new_nuser_count +scope.row.start_nuser_count ?
185
+                scope.row.puncture_count  + scope.row.cure_count + scope.row.change_nuser_count+scope.row.difficult_nuser_count+
186
+                scope.row.difficult_nuser_count+scope.row.finish_nuser_count+scope.row.start_nuser_count +
187
+                scope.row.washpipe_nuser_count+scope.row.mission_count:''}}
182 188
               </template>
183 189
             </el-table-column>
184 190
           </el-table>
@@ -348,6 +354,8 @@
348 354
           ]
349 355
         },
350 356
         modeList:[],
357
+        downloadLoading: false,
358
+        list:[]
351 359
       };
352 360
     },
353 361
     methods: {
@@ -400,7 +408,6 @@
400 408
             var resp = rs.data
401 409
             console.log("列表2323323232323233232332323223233223233223",resp)
402 410
             if (resp.state == 1) {
403
-
404 411
               let total_cure = 0
405 412
               let total_puncture = 0
406 413
               let total_mission = 0
@@ -411,7 +418,7 @@
411 418
               let total_finish_nurse = 0
412 419
               let total_washpipe_nurse = 0
413 420
               this.loading = false
414
-
421
+              var list=[]
415 422
               for (let i = 0; i < resp.data.data.length; i++) {
416 423
                 total_cure = total_cure + resp.data.data[i].cure_count
417 424
                 total_puncture = total_puncture + resp.data.data[i].puncture_count
@@ -421,15 +428,15 @@
421 428
                 total_diffcult_nurse = total_diffcult_nurse + resp.data.data[i].difficult_nuser_count
422 429
                 total_new_fistula_nurse = total_new_fistula_nurse + resp.data.data[i].new_nuser_count
423 430
                 total_start_nurse = total_start_nurse + resp.data.data[i].start_nuser_count
424
-                console.log( resp.data.data[i].start_nuser_count)
431
+                // console.log( resp.data.data[i].start_nuser_count)
425 432
 
426
-                console.log(total_start_nurse)
433
+                // console.log(total_start_nurse)
427 434
                 total_finish_nurse = total_finish_nurse + resp.data.data[i].finish_nuser_count
428 435
                 total_washpipe_nurse = total_washpipe_nurse + resp.data.data[i].washpipe_nuser_count
429 436
                 this.tableData.push(resp.data.data[i])
430
-             }
431
-              console.log(total_start_nurse)
432
-
437
+                
438
+             }        
439
+            //  this.list.push(obj)
433 440
               this.tableData.push( {
434 441
                 user_name:"合计",
435 442
                 cure_count:total_cure,
@@ -442,10 +449,13 @@
442 449
                 finish_nuser_count:total_finish_nurse,
443 450
                 washpipe_nuser_count:total_washpipe_nurse,
444 451
               })
445
-              console.log("hhhhhhh23232233223",this.tableData)
452
+              console.log('33333',this.tableData)
453
+              
446 454
               var dialysisCount = resp.data.dialysisCount
447 455
                 console.log("dialysisCount",dialysisCount)
448 456
               for(let i=0;i<dialysisCount.length;i++){
457
+                // for()
458
+                // var obj={}
449 459
                 if(dialysisCount[i].mode_id == 1){
450 460
                   dialysisCount[i].mode_id = "HD"
451 461
                 }
@@ -510,6 +520,28 @@
510 520
              })
511 521
              console.log("listq23333",list)
512 522
              this.modeList.push(...list)
523
+
524
+             for(let i=0;i<this.tableData.length;i++){
525
+              
526
+                var obj={}
527
+                  obj['name'] = this.tableData[i].user_name
528
+                  obj['chuanci'] = this.tableData[i].puncture_count
529
+                  obj['zhiliao'] = this.tableData[i].cure_count
530
+                  obj['huanyao'] = this.tableData[i].change_nuser_count
531
+                  obj['yncc'] = this.tableData[i].difficult_nuser_count
532
+                  obj['shangji'] = this.tableData[i].start_nuser_count+'('+this.getTotalCount(this.tableData[i].admin_user_id)+')'
533
+                  obj['xiaji'] = this.tableData[i].finish_nuser_count
534
+                  obj['chongguan'] = this.tableData[i].washpipe_nuser_count
535
+                  obj['xuanjiao'] = this.tableData[i].mission_count
536
+                  obj['heji'] = this.tableData[i].puncture_count*1 +this.tableData[i].cure_count*1 +this.tableData[i].change_nuser_count*1+
537
+                                this.tableData[i].difficult_nuser_count*1 +this.tableData[i].finish_nuser_count*1+
538
+                                this.tableData[i].washpipe_nuser_count*1 +this.tableData[i].mission_count*1+
539
+                                this.tableData[i].start_nuser_count*1
540
+                  this.list.push(obj)
541
+              }
542
+
543
+              console.log("hhhhhhh23232233223",this.list)
544
+
513 545
             } else {
514 546
               this.loading = false
515 547
             }
@@ -663,19 +695,88 @@
663 695
         return y + '-' + m + '-' + d;
664 696
       },
665 697
       getTotalCount(adminuserid){
666
-        console.log("adminuserid",adminuserid)
667
-        console.log("333333",this.modeList)
698
+        // console.log("adminuserid",adminuserid)
699
+        // console.log("333333",this.modeList)
668 700
         var name = ""
669 701
         for(let i=0;i<this.modeList.length;i++){
670 702
           for(let j=0;j<this.modeList[i].child.length;j++){
671 703
             if(adminuserid == this.modeList[i].child[j].start_nurse){
672 704
                name += (this.modeList[i].child[j].mode_id+"-"+this.modeList[i].child[j].Count) + "次"+"、"
705
+              //  this.list[]
673 706
             }
674 707
           }
675 708
         }
676
-        console.log("name22222",name)
709
+        // console.log("name22222",name)
677 710
         return name.substr(0,name.length-1)
678
-      }
711
+      },
712
+      export_file:function(){
713
+        this.export_file_step_two()
714
+      },
715
+      export_file_step_two: function(){
716
+        this.downloadLoading = true
717
+        import('@/vendor/Export2Excel').then(excel => {
718
+          // const filterVal = [
719
+          //   '区号',
720
+          //   '机号'
721
+          // ]
722
+          // if (this.export_type == 0) {
723
+            const multiHeader = [['姓名', '穿刺', '治疗', '换药', '疑难穿刺', '上机', '下机', '冲管', '宣教小结', '合计']]
724
+          //  const header=['姓名', '穿刺', '治疗', '换药', '疑难穿刺', '上机', '下机', '冲管', '宣教小结', '合计']
725
+            // const header = ['', '', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上']
726
+            const merges = ['A1', 'B1', 'C1', 'D1', 'E1', 'F1', 'G1', 'H1', 'I1', 'J1']
727
+            // var list = []
728
+            // let i = 0
729
+            // var jihaos=[]
730
+            // for (let key in this.tableData) {
731
+            //   var tempValue
732
+            //   if(this.tableData[key].admin_user_id !=''){
733
+            //     jihaos.push(this.tableData[key].admin_user_id)
734
+            //     // console.log('2222222',jihaos);
735
+            //   }
736
+              
737
+            //   if (i == 0) {
738
+            //     let m = 'A2' + ':' + 'A' + (1 + jihaos.length)
739
+            //     tempValue = (2 + jihaos.length)
740
+            //     merges.push(m)
741
+            //   } 
742
+            //   else {
743
+            //     let m = 'A' + (tempValue + 1) + ':' + 'A' + ((tempValue + 1) + jihaos.length - 1)
744
+            //     tempValue = ((tempValue + 1) + jihaos.length - 1)
745
+            //     merges.push(m)
746
+            //   }
747
+            //   // for (let b = 0; b < jihaos.length; b++) {
748
+            //     let obj = {}
749
+            //     obj['name'] = this.tableData[key].user_name
750
+            //     // obj['区号'] = this.partitions[key].name
751
+            //     // obj['机号'] = jihaos[b].number.toString()
752
+            //     list.push(obj)
753
+            //   // }
754
+            //   // i++
755
+            // }
756
+            var data = []
757
+
758
+            this.list.map(item => {
759
+              // console.log('111111',item);
760
+              data.push(Object.values(item))
761
+            })
762
+
763
+            const filename = '护士工作量'
764
+            
765
+            console.log('333333333',data),
766
+            excel.export_json_to_excel2({
767
+              
768
+              multiHeader,
769
+              // header,
770
+              merges,
771
+              data,
772
+              filename
773
+            })
774
+            this.downloadLoading = false
775
+          // }
776
+
777
+        })
778
+      },
779
+
679 780
     },
680 781
     created(){
681 782
       var date = new Date()

+ 2 - 2
src/xt_pages/role/admin.vue Vedi File

@@ -224,13 +224,13 @@
224 224
           style="float:left"
225 225
           @click="toAutoDrug">自动生成</el-button> -->
226 226
 
227
-
227
+<!-- 
228 228
          <el-button
229 229
           type="primary"
230 230
           size="small"
231 231
           icon="el-icon-circle-plus-outline"
232 232
           style="float:left"
233
-          @click="toAutoDiagnose">自动脚本</el-button> 
233
+          @click="toAutoDiagnose">自动脚本</el-button>  -->
234 234
      </div>
235 235
 
236 236
 

+ 24 - 4
src/xt_pages/stock/drugs/drugStockOutOrder.vue Vedi File

@@ -1570,7 +1570,21 @@ export default {
1570 1570
       getExportOutOrderDrugList(params).then((response) => {
1571 1571
         if (response.data.state == 1) {
1572 1572
           var list = response.data.data.list;
1573
-        
1573
+          if(list!=null){
1574
+            for(let i=0;i<list.length;i++){
1575
+              list[i].count_one =0
1576
+              if(list[i].count_unit == list[i].max_unit && list[i].max_unit!=list[i].min_unit){
1577
+                 list[i].count_one = list[i].count * list[i].min_number
1578
+              }
1579
+              if(list[i].count_unit == list[i].min_unit && list[i].max_unit!=list[i].min_unit){
1580
+                 list[i].count_one = list[i].count 
1581
+              }
1582
+
1583
+              if(list[i].count_unit == list[i].max_unit && list[i].max_unit==list[i].min_unit){
1584
+                 list[i].count_one = list[i].count 
1585
+              }
1586
+            }
1587
+          }
1574 1588
           this.exportList = list;
1575 1589
           this.exportLoding = false
1576 1590
           this.manufacturerList = response.data.data.manufacturerList;
@@ -1580,18 +1594,19 @@ export default {
1580 1594
       });
1581 1595
     },
1582 1596
     toExport() {
1583
-
1597
+      
1598
+      console.log("EXPORTLSOT",this.exportList)
1584 1599
       if (this.order_id == "") {
1585 1600
         this.$message.error("请勾选出库单");
1586 1601
         return;
1587 1602
       }
1588
-     
1603
+      
1589 1604
       for (let i = 0; i < this.exportList.length; i++) {
1590 1605
         this.exportList[i].retail_price_one = 0
1591 1606
         if(this.outInfoList.length!=null){
1592 1607
           for(let j=0;j<this.outInfoList.length;j++){
1593 1608
            if(this.exportList[i].warehouse_out_id == this.outInfoList[j].warehouse_out_id && this.exportList[i].drug_id == this.outInfoList[j].drug_id){
1594
-            this.exportList[i].retail_price_one = this.outInfoList[j].price
1609
+             this.exportList[i].retail_price_one = this.outInfoList[j].price
1595 1610
            }
1596 1611
         }
1597 1612
         }
@@ -1630,6 +1645,9 @@ export default {
1630 1645
             this.exportList[i].dealer = this.dealerList[z].dealer_name;
1631 1646
           }
1632 1647
         }
1648
+       
1649
+        this.exportList[i].retail_price = (this.exportList[i].count_one * this.exportList[i].min_price).toFixed(2)
1650
+        
1633 1651
         this.exportList[i].ctime = this.getTime(this.exportList[i].ctime)
1634 1652
       }
1635 1653
 
@@ -1682,6 +1700,8 @@ export default {
1682 1700
       
1683 1701
 
1684 1702
         const data = this.formatJson(filterVal, this.exportList);
1703
+        console.log("Datewoo2o2o2o",data)
1704
+      
1685 1705
         excel.export_json_to_excel({
1686 1706
           header: tHeader,
1687 1707
           data,

+ 30 - 2
src/xt_pages/stock/drugs/drugStockOutOrderAdd.vue Vedi File

@@ -249,6 +249,20 @@
249 249
             </template>
250 250
           </el-table-column>
251 251
 
252
+
253
+          <el-table-column label="使用患者"  width="150" align="center">
254
+            <template slot-scope="scope">
255
+               <el-select size="small" v-model="scope.row.patient_id" filterable placeholder="请选择出库对象">
256
+                <el-option
257
+                  v-for="(option, index) in patients"
258
+                  :key="index"
259
+                  :label="option.name"
260
+                  :value="option.id">
261
+                </el-option>
262
+               </el-select>
263
+            </template>
264
+          </el-table-column>
265
+
252 266
           <!-- <el-table-column width="120" align="center">
253 267
             <template slot="header" slot-scope="scope">
254 268
               <span>进货价</span>
@@ -502,6 +516,7 @@ export default {
502 516
       showCheck:false,
503 517
       showReturnCheck:false,
504 518
       warehouse_out_id:0,
519
+      patients:[],
505 520
     };
506 521
   },
507 522
   methods: {
@@ -544,7 +559,14 @@ export default {
544 559
             response.data.data.configlist.drug_storehouse_out;
545 560
           this.list = response.data.data.list;
546 561
           this.doctorList = response.data.data.doctorList;
547
-          
562
+          var obj ={id:0,name:"系统"}
563
+          this.patients =[]
564
+          this.patients.push(obj)
565
+          if(response.data.data.patients!=null){
566
+            for(let i=0;i<response.data.data.patients.length;i++){
567
+              this.patients.push(response.data.data.patients[i])
568
+            }
569
+          }
548 570
           // this.doctorList.push({index:999,user_name:"护士站", admin_user_id:999})
549 571
         
550 572
         }
@@ -594,6 +616,9 @@ export default {
594 616
       tempObj["max_unit_fisrt"] = 0;
595 617
       tempObj["min_unit_fisrt"] = 0;
596 618
       tempObj["total_price"] = 0;
619
+      tempObj["patient_id"] =0
620
+      tempObj["expiry_date"] = ""
621
+      tempObj["product_date"] = ""
597 622
       this.recordInfo.recordData.push(tempObj);
598 623
     },
599 624
     handleDelete: function (index, row) {
@@ -779,7 +804,7 @@ export default {
779 804
                 warehousingOutInfo[i].last_price = warehousingOutInfo[i].price
780 805
                 warehousingOutInfo[i].max_unit = warehousingOutInfo[i].count_unit
781 806
                 warehousingOutInfo[i].count = warehousingOutInfo[i].count.toString()
782
-
807
+                warehousingOutInfo[i].patient_id = warehousingOutInfo[i].patient_id
783 808
                 for(let z=0;z<drugTypeList.length;z++){
784 809
                    if(warehousingOutInfo[i].drug.drug_type == drugTypeList[z].value){
785 810
                       warehousingOutInfo[i].drug_type = drugTypeList[z].name
@@ -1208,6 +1233,9 @@ export default {
1208 1233
     tempObj["max_unit_fisrt"] = 0;
1209 1234
     tempObj["min_unit_fisrt"] = 0;
1210 1235
     tempObj["total_price"] = 0;
1236
+    tempObj["patient_id"] = 0
1237
+    tempObj["product_date"] = ""
1238
+    tempObj["expiry_date"]=""
1211 1239
     this.recordInfo.recordData.push(tempObj);
1212 1240
     this.GetConfigInfo();
1213 1241
     this.propForm.goodUnit = this.$store.getters.good_unit;

+ 33 - 8
src/xt_pages/stock/drugs/drugStockOutOrderEdit.vue Vedi File

@@ -276,6 +276,25 @@
276 276
             </template>
277 277
           </el-table-column>
278 278
 
279
+          <el-table-column label="使用患者" width="140" align="center">
280
+            <template slot-scope="scope">
281
+              <el-select
282
+                v-model="scope.row.patient_id"
283
+                filterable
284
+                placeholder="请选择使用患者"
285
+                :disabled="drug_show"
286
+              >
287
+                <el-option
288
+                  v-for="(option, index) in patients"
289
+                  :key="index"
290
+                  :label="option.name"
291
+                  :value="option.id"
292
+                >
293
+                </el-option>
294
+              </el-select>
295
+            </template>
296
+          </el-table-column>
297
+
279 298
           <!-- <el-table-column width="120" align="center">
280 299
             <template slot="header" slot-scope="scope">
281 300
               <span>进货价</span>
@@ -530,6 +549,7 @@ export default {
530 549
       storehouse_id: "",
531 550
       is_check:0,
532 551
       order_id:0,
552
+      patients:[]
533 553
     };
534 554
   },
535 555
   methods: {
@@ -664,6 +684,7 @@ export default {
664 684
       tempObj["total_count"] = 0;
665 685
       tempObj["max_unit_fisrt"] = 0;
666 686
       tempObj["min_unit_fisrt"] = 0;
687
+      tempObj["patient_id"] =0
667 688
       this.recordInfo.recordData.push(tempObj);
668 689
     },
669 690
     handleDelete: function (index, row) {
@@ -933,10 +954,7 @@ export default {
933 954
               response.data.data.list[i].drug.min_unit +
934 955
               "/" +
935 956
               response.data.data.list[i].drug.max_unit;
936
-            // if(response.data.data.list[i].count%response.data.data.list[i].drug.min_number == 0){
937
-            //    response.data.data.list[i].count = response.data.data.list[i].count/response.data.data.list[i].drug.min_number
938
-            //    response.data.data.list[i].count_unit = response.data.data.list[i].drug.max_unit
939
-            // }
957
+          
940 958
             if (
941 959
               response.data.data.list[i].number == "0" ||
942 960
               response.data.data.list[i].number == 0
@@ -983,10 +1001,9 @@ export default {
983 1001
               "{y}-{h}-{d}"
984 1002
             );
985 1003
 
986
-            response.data.data.list[i].stock_count =
987
-              response.data.data.list[i].stock_count;
988
-            response.data.data.list[i].last_price =
989
-              response.data.data.list[i].last_price;
1004
+            response.data.data.list[i].stock_count = response.data.data.list[i].stock_count;
1005
+            response.data.data.list[i].last_price = response.data.data.list[i].last_price;
1006
+            response.data.data.list[i].patient_id = response.data.data.list[i].patient_id
990 1007
             this.recordInfo.recordData.push(response.data.data.list[i]);
991 1008
           }
992 1009
 
@@ -1017,6 +1034,14 @@ export default {
1017 1034
           );
1018 1035
           this.houstList = response.data.data.houstList;
1019 1036
           this.doctorList = response.data.data.doctorList;
1037
+          var obj ={id:0,name:"系统"}
1038
+          this.patients =[]
1039
+          this.patients.push(obj)
1040
+          if(response.data.data.patients!=null){
1041
+            for(let i=0;i<response.data.data.patients.length;i++){
1042
+              this.patients.push(response.data.data.patients[i])
1043
+            }
1044
+          }
1020 1045
         }
1021 1046
 
1022 1047
         if (this.recordInfo.recordData.length == 0) {

+ 28 - 0
src/xt_pages/stock/stockOutOrderAdd.vue Vedi File

@@ -201,6 +201,20 @@
201 201
                </el-select>
202 202
             </template>
203 203
           </el-table-column>
204
+
205
+
206
+          <el-table-column label="使用患者"  width="150" align="center">
207
+            <template slot-scope="scope">
208
+               <el-select size="small" v-model="scope.row.patient_id" filterable placeholder="请选择出库对象">
209
+                <el-option
210
+                  v-for="(option, index) in patients"
211
+                  :key="index"
212
+                  :label="option.name"
213
+                  :value="option.id">
214
+                </el-option>
215
+               </el-select>
216
+            </template>
217
+          </el-table-column>
204 218
 <!--
205 219
           <el-table-column  width="150" align="center">
206 220
             <template slot="header" slot-scope="scope">
@@ -435,6 +449,7 @@ export default {
435 449
       warehouseOut_id:0,
436 450
       is_check:0,
437 451
       loading:false,
452
+      patients:[]
438 453
     };
439 454
   },
440 455
   methods: {
@@ -500,6 +515,15 @@ export default {
500 515
           this.list = response.data.data.list
501 516
           this.storehouse_id = response.data.data.configlist.storehouse_out_info
502 517
           this.doctorList =  response.data.data.doctorList
518
+          var obj ={id:0,name:"系统"}
519
+          this.patients =[]
520
+          this.patients.push(obj)
521
+          if(response.data.data.patients!=null){
522
+            for(let i=0;i<response.data.data.patients.length;i++){
523
+              this.patients.push(response.data.data.patients[i])
524
+            }
525
+          }
526
+          
503 527
         }
504 528
       });
505 529
     },
@@ -549,6 +573,7 @@ export default {
549 573
       tempObj["stock_count"] = ""
550 574
       tempObj["id"] = 0
551 575
       tempObj['register_number'] = ''
576
+      tempObj['patient_id'] =0
552 577
       this.recordInfo.recordData.push(tempObj);
553 578
     },
554 579
     handleDelete: function(index, row) {
@@ -800,6 +825,7 @@ export default {
800 825
                     warehouseOutInfoList[i].name =  warehouseOutInfoList[i].GoodInfo.specification_name +"/"+ warehouseOutInfoList[i].GoodInfo.packing_unit
801 826
                     warehouseOutInfoList[i].expiry_date = this.getTimeOne(warehouseOutInfoList[i].expiry_date)
802 827
                     warehouseOutInfoList[i].product_date = this.getTimeOne(warehouseOutInfoList[i].product_date)
828
+                    warehouseOutInfoList[i].patient_id = warehouseOutInfoList[i].patient_id
803 829
 
804 830
                  }
805 831
                  this.recordInfo.recordData = warehouseOutInfoList
@@ -890,6 +916,7 @@ export default {
890 916
             this.recordInfo.recordData[i].stock_count = total_count
891 917
             this.recordInfo.recordData[i].license_number = val.number
892 918
             this.recordInfo.recordData[i].register_number = val.register_number
919
+            this.recordInfo.recordData[i].patient_id = 0
893 920
              
894 921
             if( val.first_xt_warehouse_info!=null&&val.first_xt_warehouse_info.expiry_date >0){
895 922
               this.recordInfo.recordData[i].expiry_date = this.getTimeOne(val.first_xt_warehouse_info.expiry_date)
@@ -1057,6 +1084,7 @@ export default {
1057 1084
     tempObj["stock_count"] = ""
1058 1085
     tempObj["id"] = 0
1059 1086
     tempObj['register_number'] = ''
1087
+    tempObj['patient_id'] = 0
1060 1088
     this.recordInfo.recordData.push(tempObj);
1061 1089
     this.GetConfigInfo();
1062 1090
     this.propForm.goodUnit = this.$store.getters.good_unit;

+ 26 - 0
src/xt_pages/stock/stockOutOrderEdit.vue Vedi File

@@ -207,6 +207,20 @@
207 207
             </template>
208 208
           </el-table-column>
209 209
 
210
+          
211
+          <el-table-column label="使用患者"  width="150" align="center">
212
+            <template slot-scope="scope">
213
+               <el-select size="small" v-model="scope.row.patient_id" filterable placeholder="请选择使用患者">
214
+                <el-option
215
+                  v-for="(option, index) in patients"
216
+                  :key="index"
217
+                  :label="option.name"
218
+                  :value="option.id">
219
+                </el-option>
220
+               </el-select>
221
+            </template>
222
+          </el-table-column>
223
+
210 224
           <el-table-column label="总价" width="150" align="center">
211 225
             <template slot-scope="scope">
212 226
               {{calculate(scope.row.price*scope.row.count)}}
@@ -402,6 +416,7 @@
402 416
         showCheck:false,
403 417
         showReturnCheck:false,
404 418
         loading:false,
419
+        patients:[],
405 420
       }
406 421
     },
407 422
     methods: {
@@ -517,6 +532,7 @@
517 532
         tempObj["buy_price"]= ""
518 533
         tempObj["stock_count"] = ""
519 534
         tempObj['register_number'] = ''
535
+        tempObj['patient_id'] =0
520 536
         this.recordInfo.recordData.push(tempObj)
521 537
       },
522 538
       handleDelete: function(index, row) {
@@ -897,17 +913,27 @@
897 913
             response.data.data.list[i].remark = response.data.data.list[i].remark
898 914
             response.data.data.list[i].buy_price = response.data.data.list[i].buy_price.toString()
899 915
             response.data.data.list[i].stock_count = response.data.data.list[i].stock_count.toString()
916
+            response.data.data.list[i].patient_id = response.data.data.list[i].patient_id
900 917
             if(response.data.data.list[i].dealer == 0){
901 918
                response.data.data.list[i].dealer = ""
902 919
             }
903 920
             if(response.data.data.list[i].manufacturer ==0 ){
904 921
                response.data.data.list[i].manufacturer = ""
905 922
             }
923
+            response.data.data.list[i].patient_id = response.data.data.list[i].patient_id
906 924
             this.recordInfo.recordData.push(response.data.data.list[i])
907 925
           }
908 926
           this.storelist = response.data.data.storelist
909 927
           this.warehouse_out_time = this.getTime(response.data.data.out.warehouse_out_time,"{y}-{m}-{d}")
910 928
           this.storehouse_id = response.data.data.out.storehouse_id
929
+          var obj ={id:0,name:"系统"}
930
+          this.patients =[]
931
+          this.patients.push(obj)
932
+          if(response.data.data.patients!=null){
933
+            for(let i=0;i<response.data.data.patients.length;i++){
934
+              this.patients.push(response.data.data.patients[i])
935
+            }
936
+          }
911 937
           loading.close();
912 938
         }
913 939
       })

+ 415 - 72
src/xt_pages/workforce/appointment.vue Vedi File

@@ -124,7 +124,7 @@
124 124
         <table-data ref="tableData"  :week-time="activeName" :partitions-prop="partitions"
125 125
                     :schedule-zone-row-prop="scheduleZoneRow"
126 126
                     :schedule-zone-prop="scheduleZone" title="" @event1="changePartition"
127
-                    @event2="changeSchedule"  @event3="changeWeekDay" @event6="changeScheduleType" v-show="showtableOne">
127
+                    @event2="changeSchedule"  @event3="changeWeekDay" @event6="changeScheduleType" @guanliu_show="guanliu" v-show="showtableOne">
128 128
         </table-data>
129 129
       </div>
130 130
       <!-- 编辑 -->
@@ -369,7 +369,8 @@ export default {
369 369
       schedule_week: 0,
370 370
       newDay: [],
371 371
       templateObj: {},
372
-      week_date:""
372
+      week_date:"",
373
+      guanliu_show:false,
373 374
       
374 375
     }
375 376
   },
@@ -383,6 +384,12 @@ export default {
383 384
     beforeweekTable
384 385
   },
385 386
   methods: {
387
+    // 
388
+    guanliu(value){
389
+      this.guanliu_show=value
390
+      console.log('1111',value);
391
+      this.getThreeWeekList()
392
+    },
386 393
     handleClick(e,tab){
387 394
       if(e.name == 'historyWeek'){
388 395
         this.showtable=true
@@ -794,6 +801,14 @@ export default {
794 801
       this.$router.push({path: '/workforce/template'})
795 802
     },
796 803
     export_file: function () {
804
+      // this.getThreeWeekList()
805
+      if(this.$refs.tableData.value1==false){
806
+        this.guanliu_show=false
807
+        // this.export_file_step_two()
808
+      }else{
809
+        this.guanliu_show=true
810
+        // this.export_file_step_two()
811
+      }
797 812
       // this.getWeekPanelsTwo()
798 813
       this.export_file_step_two()
799 814
     },
@@ -2478,7 +2493,7 @@ export default {
2478 2493
         partition_id: this.partition_id,
2479 2494
         schedule_type: this.schedule_type
2480 2495
       }
2481
-      console.log("params32323232323223", params)
2496
+      // console.log("params32323232323223", params)
2482 2497
       getThreeWeekList(params).then(response => {
2483 2498
         if (response.data.state == 1) {
2484 2499
           var partitions = response.data.data.partitions
@@ -2490,7 +2505,21 @@ export default {
2490 2505
           for (let key in partitions) {
2491 2506
             var tempValue
2492 2507
             var jihaos = partitions[key].jihaos
2493
-
2508
+            
2509
+            jihaos.sort(function(a,b) {
2510
+              return a.sort-b.sort
2511
+            })
2512
+            // console.log('rrrrr',jihaos);
2513
+            // for(let i=0;i<jihaos1.length;i++){
2514
+            //   var jihaos=jihaos1[i].sort
2515
+            // }
2516
+            // for(let i in jihaos1){
2517
+            //   var jihaos=jihaos1[i].sort
2518
+            //    jihaos.sort(function(a,b){
2519
+            //     return a-b
2520
+            //   })
2521
+            //   console.log('wwwww',jihaos);
2522
+            // }
2494 2523
             if (i == 0) {
2495 2524
               let m = 'A3' + ':' + 'A' + (2 + jihaos.length)
2496 2525
               tempValue = (2 + jihaos.length)
@@ -2672,7 +2701,7 @@ export default {
2672 2701
           console.log("list")
2673 2702
           console.log(list)
2674 2703
           console.log("week")
2675
-          console.log(week)
2704
+          console.log(lastWeek)
2676 2705
 
2677 2706
           if (week.length > 0) {
2678 2707
             // console.log('qqqqqqqqq',list);
@@ -2682,92 +2711,191 @@ export default {
2682 2711
                 if (list[i].机号 == week[j].number && list[i].区号 == week[j].zon_name) {
2683 2712
                   //  周一上午 week[j].number week[j].zon_name
2684 2713
                   if (week[j].schedule_week == 1 && week[j].schedule_type == 1) {
2685
-                    // console.log(week[j].name)
2686
-                    list[i].shangwu = week[j].name+" "+week[j].dialysis_machine_name
2687
-                    console.log('eeeeeee',week[j].mode_id)
2714
+                    if(this.guanliu_show==false){
2715
+                      list[i].shangwu = week[j].name
2716
+                      // console.log('eeeeeee',list[i].shangwu)
2717
+                    }else{
2718
+                      list[i].shangwu = week[j].name+" "+week[j].dialysis_machine_name
2719
+                      // console.log('kkkkkk',list[i].shangwu)
2720
+                    }
2688 2721
                   }
2689 2722
                   // 周一下午
2690 2723
                   if (week[j].schedule_week == 1 && week[j].schedule_type == 2) {
2691
-                    list[i].xiawu = week[j].name+" "+week[j].dialysis_machine_name
2724
+                    if(this.$refs.tableData.value1==false){
2725
+                      list[i].xiawu = week[j].name
2726
+                    }else{
2727
+                      list[i].xiawu = week[j].name+" "+week[j].dialysis_machine_name
2728
+                    }
2692 2729
                   }
2693 2730
                   // 周一晚上
2694 2731
                   if (week[j].schedule_week == 1 && week[j].schedule_type == 3) {
2695
-                    list[i].wanshang = week[j].name+" "+week[j].dialysis_machine_name
2732
+                    if(this.$refs.tableData.value1==false){
2733
+                      list[i].wanshang = week[j].name
2734
+                    }else{
2735
+                      list[i].wanshang = week[j].name+" "+week[j].dialysis_machine_name
2736
+                    }
2696 2737
                   }
2697 2738
 
2698 2739
                   //周二上午
2699 2740
                   if (week[j].schedule_week == 2 && week[j].schedule_type == 1) {
2700
-                    list[i].shangwu1 = week[j].name+" "+week[j].dialysis_machine_name
2701
-                    console.log('eeeeeee',week[j].mode_id)
2741
+                    if(this.$refs.tableData.value1==false){
2742
+                      list[i].shangwu1 = week[j].name
2743
+                    }else{
2744
+                      list[i].shangwu1 = week[j].name+" "+week[j].dialysis_machine_name
2745
+                    }
2702 2746
                   }
2703 2747
                   //周二下午
2704 2748
                   if (week[j].schedule_week == 2 && week[j].schedule_type == 2) {
2705
-                    list[i].xiawu1 = week[j].name+" "+week[j].dialysis_machine_name
2749
+                    if(this.$refs.tableData.value1==false){
2750
+                      list[i].xiawu1 = week[j].name
2751
+                    }else{
2752
+                      list[i].xiawu1 = week[j].name+" "+week[j].dialysis_machine_name
2753
+                    }
2706 2754
                   }
2707 2755
                   //周二晚上
2708 2756
                   if (week[j].schedule_week == 2 && week[j].schedule_type == 3) {
2709
-                    list[i].wanshang1 = week[j].name+" "+week[i].dialysis_machine_name
2757
+                    if(this.$refs.tableData.value1==false){
2758
+                      list[i].wanshang1 = week[j].name
2759
+                    }else{
2760
+                      list[i].wanshang1 = week[j].name+" "+week[j].dialysis_machine_name
2761
+                    }
2762
+                    // list[i].wanshang1 = week[j].name+" "+week[i].dialysis_machine_name
2710 2763
                   }
2711 2764
 
2712 2765
                   //周三上午
2713 2766
                   if (week[j].schedule_week == 3 && week[j].schedule_type == 1) {
2714
-                    list[i].shangwu2 = week[j].name+" "+week[j].dialysis_machine_name
2767
+                    if(this.$refs.tableData.value1==false){
2768
+                      list[i].shangwu2 = week[j].name
2769
+                    }else{
2770
+                      list[i].shangwu2 = week[j].name+" "+week[j].dialysis_machine_name
2771
+                    }
2772
+                    // list[i].shangwu2 = week[j].name+" "+week[j].dialysis_machine_name
2715 2773
                   }
2716 2774
                   //周三下午
2717 2775
                   if (week[j].schedule_week == 3 && week[j].schedule_type == 2) {
2718
-                    list[i].xiawu2 = week[j].name+" "+week[j].dialysis_machine_name
2776
+                    if(this.$refs.tableData.value1==false){
2777
+                      list[i].xiawu2 = week[j].name
2778
+                    }else{
2779
+                      list[i].xiawu2 = week[j].name+" "+week[j].dialysis_machine_name
2780
+                    }
2781
+                    // list[i].xiawu2 = week[j].name+" "+week[j].dialysis_machine_name
2719 2782
                   }
2720 2783
                   //周三晚上
2721 2784
                   if (week[j].schedule_week == 3 && week[j].schedule_type == 3) {
2722
-                    list[i].wanshang2 = week[j].name+" "+week[j].dialysis_machine_name
2785
+                    if(this.$refs.tableData.value1==false){
2786
+                      list[i].wanshang2 = week[j].name
2787
+                    }else{
2788
+                      list[i].wanshang2 = week[j].name+" "+week[j].dialysis_machine_name
2789
+                    }
2790
+                    // list[i].wanshang2 = week[j].name+" "+week[j].dialysis_machine_name
2723 2791
                   }
2724 2792
                   //周四上午
2725 2793
                   if (week[j].schedule_week == 4 && week[j].schedule_type == 1) {
2726
-                    list[i].shangwu3 = week[j].name+" "+week[j].dialysis_machine_name
2794
+                    if(this.$refs.tableData.value1==false){
2795
+                      list[i].shangwu3 = week[j].name
2796
+                    }else{
2797
+                      list[i].shangwu3 = week[j].name+" "+week[j].dialysis_machine_name
2798
+                    }
2799
+                    // list[i].shangwu3 = week[j].name+" "+week[j].dialysis_machine_name
2727 2800
                   }
2728 2801
                   //周四下午
2729 2802
                   if (week[j].schedule_week == 4 && week[j].schedule_type == 2) {
2730
-                    list[i].xiawu3 = week[j].name+" "+week[j].dialysis_machine_name
2803
+                    if(this.$refs.tableData.value1==false){
2804
+                      list[i].xiawu3 = week[j].name
2805
+                    }else{
2806
+                      list[i].xiawu3 = week[j].name+" "+week[j].dialysis_machine_name
2807
+                    }
2808
+                    // list[i].xiawu3 = week[j].name+" "+week[j].dialysis_machine_name
2731 2809
                   }
2732 2810
                   //周四晚上
2733 2811
                   if (week[j].schedule_week == 4 && week[j].schedule_type == 3) {
2734
-                    list[i].wanshang3 = week[j].name+" "+week[j].dialysis_machine_name
2812
+                    if(this.$refs.tableData.value1==false){
2813
+                      list[i].wanshang3 = week[j].name
2814
+                    }else{
2815
+                      list[i].wanshang3 = week[j].name+" "+week[j].dialysis_machine_name
2816
+                    }
2817
+                    // list[i].wanshang3 = week[j].name+" "+week[j].dialysis_machine_name
2735 2818
                   }
2736 2819
                   //周五上午
2737 2820
                   if (week[j].schedule_week == 5 && week[j].schedule_type == 1) {
2738
-                    list[i].shangwu4 = week[j].name+" "+week[j].dialysis_machine_name
2821
+                    if(this.$refs.tableData.value1==false){
2822
+                      list[i].shangwu4 = week[j].name
2823
+                    }else{
2824
+                      list[i].shangwu4 = week[j].name+" "+week[j].dialysis_machine_name
2825
+                    }
2826
+                    // list[i].shangwu4 = week[j].name+" "+week[j].dialysis_machine_name
2739 2827
                   }
2740 2828
                   //周五下午
2741 2829
                   if (week[j].schedule_week == 5 && week[j].schedule_type == 2) {
2742
-                    list[i].xiawu4 = week[j].name+" "+week[j].dialysis_machine_name
2830
+                    if(this.$refs.tableData.value1==false){
2831
+                      list[i].xiawu4 = week[j].name
2832
+                    }else{
2833
+                      list[i].xiawu4 = week[j].name+" "+week[j].dialysis_machine_name
2834
+                    }
2835
+                    // list[i].xiawu4 = week[j].name+" "+week[j].dialysis_machine_name
2743 2836
                   }
2744 2837
                   //周五晚上
2745 2838
                   if (week[j].schedule_week == 5 && week[j].schedule_type == 3) {
2746
-                    list[i].wanshang4 = week[j].name+" "+week[j].dialysis_machine_name
2839
+                    if(this.$refs.tableData.value1==false){
2840
+                      list[i].wanshang4 = week[j].name
2841
+                    }else{
2842
+                      list[i].wanshang4 = week[j].name+" "+week[j].dialysis_machine_name
2843
+                    }
2844
+                    // list[i].wanshang4 = week[j].name+" "+week[j].dialysis_machine_name
2747 2845
                   }
2748 2846
                   //周六上午
2749 2847
                   if (week[j].schedule_week == 6 && week[j].schedule_type == 1) {
2750
-                    list[i].shangwu5 = week[j].name+" "+week[j].dialysis_machine_name
2848
+                    if(this.$refs.tableData.value1==false){
2849
+                      list[i].shangwu5 = week[j].name
2850
+                    }else{
2851
+                      list[i].shangwu5 = week[j].name+" "+week[j].dialysis_machine_name
2852
+                    }
2853
+                    // list[i].shangwu5 = week[j].name+" "+week[j].dialysis_machine_name
2751 2854
                   }
2752 2855
                   //周六下午
2753 2856
                   if (week[j].schedule_week == 6 && week[j].schedule_type == 2) {
2754
-                    list[i].xiawu5 = week[j].name+" "+week[j].dialysis_machine_name
2857
+                    if(this.$refs.tableData.value1==false){
2858
+                      list[i].xiawu5 = week[j].name
2859
+                    }else{
2860
+                      list[i].xiawu5 = week[j].name+" "+week[j].dialysis_machine_name
2861
+                    }
2862
+                    // list[i].xiawu5 = week[j].name+" "+week[j].dialysis_machine_name
2755 2863
                   }
2756 2864
                   //周六晚上
2757 2865
                   if (week[j].schedule_week == 6 && week[j].schedule_type == 3) {
2758
-                    list[i].wanshang5 = week[j].name+" "+week[j].dialysis_machine_name
2866
+                    if(this.$refs.tableData.value1==false){
2867
+                      list[i].wanshang5 = week[j].name
2868
+                    }else{
2869
+                      list[i].wanshang5 = week[j].name+" "+week[j].dialysis_machine_name
2870
+                    }
2871
+                    // list[i].wanshang5 = week[j].name+" "+week[j].dialysis_machine_name
2759 2872
                   }
2760 2873
                   //周日上午
2761 2874
                   if (week[j].schedule_week == 7 && week[j].schedule_type == 1) {
2762
-                    list[i].shangwu6 = week[j].name+" "+week[j].dialysis_machine_name
2875
+                    if(this.$refs.tableData.value1==false){
2876
+                      list[i].shangwu6 = week[j].name
2877
+                    }else{
2878
+                      list[i].shangwu6 = week[j].name+" "+week[j].dialysis_machine_name
2879
+                    }
2880
+                    // list[i].shangwu6 = week[j].name+" "+week[j].dialysis_machine_name
2763 2881
                   }
2764 2882
                   //周日下午
2765 2883
                   if (week[j].schedule_week == 7 && week[j].schedule_type == 2) {
2766
-                    list[i].xiawu6 = week[j].name+" "+week[j].dialysis_machine_name
2884
+                    if(this.$refs.tableData.value1==false){
2885
+                      list[i].xiawu6 = week[j].name
2886
+                    }else{
2887
+                      list[i].xiawu6 = week[j].name+" "+week[j].dialysis_machine_name
2888
+                    }
2889
+                    // list[i].xiawu6 = week[j].name+" "+week[j].dialysis_machine_name
2767 2890
                   }
2768 2891
                   //周日晚上
2769 2892
                   if (week[j].schedule_week == 7 && week[j].schedule_type == 3) {
2770
-                    list[i].wanshang6 = week[j].name+" "+week[j].dialysis_machine_name
2893
+                    if(this.$refs.tableData.value1==false){
2894
+                      list[i].wanshang6 = week[j].name
2895
+                    }else{
2896
+                      list[i].wanshang6 = week[j].name+" "+week[j].dialysis_machine_name
2897
+                    }
2898
+                    // list[i].wanshang6 = week[j].name+" "+week[j].dialysis_machine_name
2771 2899
                   }
2772 2900
                 }
2773 2901
 
@@ -2781,93 +2909,198 @@ export default {
2781 2909
                 if (list[i].机号 == nextWeek[j].number && list[i].区号 == nextWeek[j].zon_name) {
2782 2910
                   //周一
2783 2911
                   if (nextWeek[j].schedule_week == 1 && nextWeek[j].schedule_type == 1) {
2784
-                    list[i].shangwu7 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
2912
+                    if(this.$refs.tableData.value1==false){
2913
+                      list[i].shangwu7 = nextWeek[j].name
2914
+                    }else{
2915
+                      list[i].shangwu7 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
2916
+                    }
2917
+                    // list[i].shangwu7 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
2785 2918
                   }
2786 2919
                   //周一下午
2787 2920
                   if (nextWeek[j].schedule_week == 1 && nextWeek[j].schedule_type == 2) {
2788
-                    list[i].xiawu7 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
2921
+                    if(this.$refs.tableData.value1==false){
2922
+                      list[i].xiawu7 = nextWeek[j].name
2923
+                    }else{
2924
+                      list[i].xiawu7 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
2925
+                    }
2926
+                    // list[i].xiawu7 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
2789 2927
                   }
2790 2928
                   //周一晚上
2791 2929
                   if (nextWeek[j].schedule_week == 1 && nextWeek[j].schedule_type == 3) {
2792
-                    list[i].wanshang7 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
2930
+                    if(this.$refs.tableData.value1==false){
2931
+                      list[i].wanshang7 = nextWeek[j].name
2932
+                    }else{
2933
+                      list[i].wanshang7 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
2934
+                    }
2935
+                    // list[i].wanshang7 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
2793 2936
                   }
2794 2937
 
2795 2938
                   //周二上午
2796 2939
                   if (nextWeek[j].schedule_week == 2 && nextWeek[j].schedule_type == 1) {
2797
-                    list[i].shangwu8 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
2940
+                    if(this.$refs.tableData.value1==false){
2941
+                      list[i].shangwu8 = nextWeek[j].name
2942
+                    }else{
2943
+                      list[i].shangwu8 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
2944
+                    }
2945
+                    // list[i].shangwu8 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
2798 2946
                   }
2799 2947
                   //周二下午
2800 2948
                   if (nextWeek[j].schedule_week == 2 && nextWeek[j].schedule_type == 2) {
2801
-                    list[i].xiawu8 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
2949
+                    if(this.$refs.tableData.value1==false){
2950
+                      list[i].xiawu8 = nextWeek[j].name
2951
+                    }else{
2952
+                      list[i].xiawu8 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
2953
+                    }
2954
+                    // list[i].xiawu8 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
2802 2955
                   }
2803 2956
                   //周二晚上
2804 2957
                   if (nextWeek[j].schedule_week == 2 && nextWeek[j].schedule_type == 3) {
2805
-                    list[i].wanshang8 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
2958
+                    if(this.$refs.tableData.value1==false){
2959
+                      list[i].wanshang8 = nextWeek[j].name
2960
+                    }else{
2961
+                      list[i].wanshang8 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
2962
+                    }
2963
+                    // list[i].wanshang8 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
2806 2964
                   }
2807 2965
 
2808 2966
                   //周三上午
2809 2967
                   if (nextWeek[j].schedule_week == 3 && nextWeek[j].schedule_type == 1) {
2810
-                    list[i].shangwu9 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
2968
+                    if(this.$refs.tableData.value1==false){
2969
+                      list[i].shangwu9 = nextWeek[j].name
2970
+                    }else{
2971
+                      list[i].shangwu9 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
2972
+                    }
2973
+                    // list[i].shangwu9 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
2811 2974
                   }
2812 2975
                   //周三下午
2813 2976
                   if (nextWeek[j].schedule_week == 3 && nextWeek[j].schedule_type == 2) {
2814
-                    list[i].xiawu9 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
2977
+                    if(this.$refs.tableData.value1==false){
2978
+                      list[i].xiawu9 = nextWeek[j].name
2979
+                    }else{
2980
+                      list[i].xiawu9 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
2981
+                    }
2982
+                    // 
2815 2983
                   }
2816 2984
                   //周三晚上
2817 2985
                   if (nextWeek[j].schedule_week == 3 && nextWeek[j].schedule_type == 3) {
2818
-                    list[i].wanshang9 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
2986
+                    if(this.$refs.tableData.value1==false){
2987
+                      list[i].wanshang9 = nextWeek[j].name
2988
+                    }else{
2989
+                      list[i].wanshang9 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
2990
+                    }
2991
+                    // list[i].wanshang9 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
2819 2992
                   }
2820 2993
 
2821 2994
                   //周四上午
2822 2995
                   if (nextWeek[j].schedule_week == 4 && nextWeek[j].schedule_type == 1) {
2823
-                    list[i].shangwu10 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
2996
+                    if(this.$refs.tableData.value1==false){
2997
+                      list[i].shangwu10 = nextWeek[j].name
2998
+                    }else{
2999
+                      list[i].shangwu10 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
3000
+                    }
3001
+                    // list[i].shangwu10 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
2824 3002
                   }
2825 3003
                   //周四下午
2826 3004
                   if (nextWeek[j].schedule_week == 4 && nextWeek[j].schedule_type == 2) {
2827
-                    list[i].xiawu10 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
3005
+                    if(this.$refs.tableData.value1==false){
3006
+                      list[i].xiawu10 = nextWeek[j].name
3007
+                    }else{
3008
+                      list[i].xiawu10 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
3009
+                    }
3010
+                    // list[i].xiawu10 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
2828 3011
                   }
2829 3012
                   //周四晚上
2830 3013
                   if (nextWeek[j].schedule_week == 4 && nextWeek[j].schedule_type == 3) {
2831
-                    list[i].wanshang10 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
3014
+                    if(this.$refs.tableData.value1==false){
3015
+                      list[i].wanshang10 = nextWeek[j].name
3016
+                    }else{
3017
+                      list[i].wanshang10 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
3018
+                    }
3019
+                    // list[i].wanshang10 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
2832 3020
                   }
2833 3021
 
2834 3022
                   //周五上午
2835 3023
                   if (nextWeek[j].schedule_week == 5 && nextWeek[j].schedule_type == 1) {
2836
-                    list[i].shangwu11 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
3024
+                    if(this.$refs.tableData.value1==false){
3025
+                      list[i].shangwu11 = nextWeek[j].name
3026
+                    }else{
3027
+                      list[i].shangwu11 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
3028
+                    }
3029
+                    // list[i].shangwu11 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
2837 3030
                   }
2838 3031
                   //周五下午
2839 3032
                   if (nextWeek[j].schedule_week == 5 && nextWeek[j].schedule_type == 2) {
2840
-                    list[i].xiawu11 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
3033
+                    if(this.$refs.tableData.value1==false){
3034
+                      list[i].xiawu11 = nextWeek[j].name
3035
+                    }else{
3036
+                      list[i].xiawu11 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
3037
+                    }
3038
+                    // list[i].xiawu11 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
2841 3039
                   }
2842 3040
                   //周五晚上
2843 3041
                   if (nextWeek[j].schedule_week == 5 && nextWeek[j].schedule_type == 3) {
2844
-                    list[i].wanshang11 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
3042
+                    if(this.$refs.tableData.value1==false){
3043
+                      list[i].wanshang11 = nextWeek[j].name
3044
+                    }else{
3045
+                      list[i].wanshang11 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
3046
+                    }
3047
+                    // list[i].wanshang11 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
2845 3048
                   }
2846 3049
 
2847 3050
                   //周六上午
2848 3051
                   if (nextWeek[j].schedule_week == 6 && nextWeek[j].schedule_type == 1) {
2849
-                    list[i].shangwu12 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
3052
+                    if(this.$refs.tableData.value1==false){
3053
+                      list[i].shangwu12 = nextWeek[j].name
3054
+                    }else{
3055
+                      list[i].shangwu12 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
3056
+                    }
3057
+                    // list[i].shangwu12 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
2850 3058
                   }
2851 3059
                   //周六下午
2852 3060
                   if (nextWeek[j].schedule_week == 6 && nextWeek[j].schedule_type == 2) {
2853
-                    list[i].xiawu12 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
3061
+                    if(this.$refs.tableData.value1==false){
3062
+                      list[i].xiawu12 = nextWeek[j].name
3063
+                    }else{
3064
+                      list[i].xiawu12 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
3065
+                    }
3066
+                    // list[i].xiawu12 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
2854 3067
                   }
2855 3068
                   //周六晚上
2856 3069
                   if (nextWeek[j].schedule_week == 6 && nextWeek[j].schedule_type == 3) {
2857
-                    list[i].wanshang12 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
3070
+                    if(this.$refs.tableData.value1==false){
3071
+                      list[i].wanshang12 = nextWeek[j].name
3072
+                    }else{
3073
+                      list[i].wanshang12 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
3074
+                    }
3075
+                    // list[i].wanshang12 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
2858 3076
                   }
2859 3077
 
2860 3078
                   //周日上午
2861 3079
                   if (nextWeek[j].schedule_week == 7 && nextWeek[j].schedule_type == 1) {
2862
-                    list[i].shangwu13 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
3080
+                    if(this.$refs.tableData.value1==false){
3081
+                      list[i].shangwu13 = nextWeek[j].name
3082
+                    }else{
3083
+                      list[i].shangwu13 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
3084
+                    }
3085
+                    // list[i].shangwu13 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
2863 3086
                   }
2864 3087
                   //周日下午
2865 3088
                   if (nextWeek[j].schedule_week == 7 && nextWeek[j].schedule_type == 2) {
2866
-                    list[i].xiawu13 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
3089
+                    if(this.$refs.tableData.value1==false){
3090
+                      list[i].xiawu13 = nextWeek[j].name
3091
+                    }else{
3092
+                      list[i].xiawu13 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
3093
+                    }
3094
+                    // list[i].xiawu13 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
2867 3095
                   }
2868 3096
                   //周日晚上
2869 3097
                   if (nextWeek[j].schedule_week == 7 && nextWeek[j].schedule_type == 3) {
2870
-                    list[i].wanshang13 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
3098
+                    if(this.$refs.tableData.value1==false){
3099
+                      list[i].wanshang13 = nextWeek[j].name
3100
+                    }else{
3101
+                      list[i].wanshang13 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
3102
+                    }
3103
+                    // list[i].wanshang13 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
2871 3104
                   }
2872 3105
                 }
2873 3106
 
@@ -2876,98 +3109,205 @@ export default {
2876 3109
           }
2877 3110
           //
2878 3111
           if (lastWeek.length > 0) {
3112
+            console.log('ttttt',lastWeek);
2879 3113
             for (let i = 0; i < list.length; i++) {
2880 3114
               for (let j = 0; j < lastWeek.length; j++) {
2881 3115
                 if (list[i].机号 == lastWeek[j].number && list[i].区号 == lastWeek[j].zon_name) {
2882 3116
                   //周一
2883 3117
                   if (lastWeek[j].schedule_week == 1 && lastWeek[j].schedule_type == 1) {
2884
-                    list[i].shangwu14 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
3118
+                    if(this.guanliu_show==false){
3119
+                      list[i].shangwu14 = lastWeek[j].name
3120
+                    }else{
3121
+                      list[i].shangwu14 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
3122
+                    }
3123
+                    // list[i].shangwu14 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
2885 3124
                   }
2886 3125
                   //周一下午
2887 3126
                   if (lastWeek[j].schedule_week == 1 && lastWeek[j].schedule_type == 2) {
2888
-                    list[i].xiawu14 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
3127
+                    if(this.guanliu_show==false){
3128
+                      list[i].xiawu14 = lastWeek[j].name
3129
+                    }else{
3130
+                      list[i].xiawu14 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
3131
+                    }
3132
+                    // list[i].xiawu14 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
2889 3133
                   }
2890 3134
                   //周一晚上
2891 3135
                   if (lastWeek[j].schedule_week == 1 && lastWeek[j].schedule_type == 3) {
2892
-                    list[i].wanshang14 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
3136
+                    if(this.guanliu_show==false){
3137
+                      list[i].wanshang14 = lastWeek[j].name
3138
+                    }else{
3139
+                      list[i].wanshang14 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
3140
+                    }
3141
+                    // list[i].wanshang14 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
2893 3142
                   }
2894 3143
 
2895 3144
                   //周二
2896 3145
                   if (lastWeek[j].schedule_week == 2 && lastWeek[j].schedule_type == 1) {
2897
-                    list[i].shangwu15 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
3146
+                    if(this.guanliu_show==false){
3147
+                      list[i].shangwu15 = lastWeek[j].name
3148
+                    }else{
3149
+                      list[i].shangwu15 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
3150
+                    }
3151
+                    // list[i].shangwu15 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
2898 3152
                   }
2899 3153
                   //周二下午
2900 3154
                   if (lastWeek[j].schedule_week == 2 && lastWeek[j].schedule_type == 2) {
2901
-                    list[i].xiawu15 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
3155
+                    if(this.guanliu_show==false){
3156
+                      list[i].xiawu15 = lastWeek[j].name
3157
+                      console.log('22222',list[i].xiawu15);
3158
+                    }else{
3159
+                      list[i].xiawu15 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
3160
+                    }
3161
+                    // list[i].xiawu15 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
2902 3162
                   }
2903 3163
                   //周二晚上
2904 3164
                   if (lastWeek[j].schedule_week == 2 && lastWeek[j].schedule_type == 3) {
2905
-                    list[i].wanshang15 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
3165
+                    if(this.guanliu_show==false){
3166
+                      list[i].wanshang15 = lastWeek[j].name
3167
+                    }else{
3168
+                      list[i].wanshang15 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
3169
+                    }
3170
+                    // list[i].wanshang15 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
2906 3171
                   }
2907 3172
 
2908 3173
                   //周三
2909 3174
                   if (lastWeek[j].schedule_week == 3 && lastWeek[j].schedule_type == 1) {
2910
-                    list[i].shangwu16 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
3175
+                    if(this.guanliu_show==false){
3176
+                      list[i].shangwu16 = lastWeek[j].name
3177
+                    }else{
3178
+                      list[i].shangwu16 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
3179
+                    }
3180
+                    // list[i].shangwu16 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
2911 3181
                   }
2912 3182
                   //周三下午
2913 3183
                   if (lastWeek[j].schedule_week == 3 && lastWeek[j].schedule_type == 2) {
2914
-                    list[i].xiawu16 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
3184
+                    if(this.guanliu_show==false){
3185
+                      list[i].xiawu16 = lastWeek[j].name
3186
+                    }else{
3187
+                      list[i].xiawu16 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
3188
+                    }
3189
+                    // list[i].xiawu16 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
2915 3190
                   }
2916 3191
                   //周三晚上
2917 3192
                   if (lastWeek[j].schedule_week == 3 && lastWeek[j].schedule_type == 3) {
2918
-                    list[i].wanshang16 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
3193
+                    if(this.guanliu_show==false){
3194
+                      list[i].wanshang16 = lastWeek[j].name
3195
+                    }else{
3196
+                      list[i].wanshang16 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
3197
+                    }
3198
+                    // list[i].wanshang16 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
2919 3199
                   }
2920 3200
 
2921 3201
                   //周四
2922 3202
                   if (lastWeek[j].schedule_week == 4 && lastWeek[j].schedule_type == 1) {
2923
-                    list[i].shangwu17 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
3203
+                    if(this.guanliu_show==false){
3204
+                      list[i].shangwu17 = lastWeek[j].name
3205
+                    }else{
3206
+                      list[i].shangwu17 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
3207
+                    }
3208
+                    // list[i].shangwu17 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
2924 3209
                   }
2925 3210
                   //周四下午
2926 3211
                   if (lastWeek[j].schedule_week == 4 && lastWeek[j].schedule_type == 2) {
2927
-                    list[i].xiawu17 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
3212
+                    if(this.guanliu_show==false){
3213
+                      list[i].xiawu17 = lastWeek[j].name
3214
+                    }else{
3215
+                      list[i].xiawu17 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
3216
+                    }
3217
+                    // list[i].xiawu17 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
2928 3218
                   }
2929 3219
                   //周四晚上
2930 3220
                   if (lastWeek[j].schedule_week == 4 && lastWeek[j].schedule_type == 3) {
2931
-                    list[i].wanshang17 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
3221
+                    if(this.guanliu_show==false){
3222
+                      list[i].wanshang17 = lastWeek[j].name
3223
+                    }else{
3224
+                      list[i].wanshang17 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
3225
+                    }
3226
+                    // list[i].wanshang17 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
2932 3227
                   }
2933 3228
 
2934 3229
                   //周五
2935 3230
                   if (lastWeek[j].schedule_week == 5 && lastWeek[j].schedule_type == 1) {
2936
-                    list[i].shangwu18 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
3231
+                    if(this.guanliu_show==false){
3232
+                      list[i].shangwu18 = lastWeek[j].name
3233
+                    }else{
3234
+                      list[i].shangwu18 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
3235
+                    }
3236
+                    // list[i].shangwu18 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
2937 3237
                   }
2938 3238
                   //周五下午
2939 3239
                   if (lastWeek[j].schedule_week == 5 && lastWeek[j].schedule_type == 2) {
2940
-                    list[i].xiawu18 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
3240
+                    if(this.guanliu_show==false){
3241
+                      list[i].xiawu18 = lastWeek[j].name
3242
+                    }else{
3243
+                      list[i].xiawu18 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
3244
+                    }
3245
+                    // list[i].xiawu18 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
2941 3246
                   }
2942 3247
                   //周五晚上
2943 3248
                   if (lastWeek[j].schedule_week == 5 && lastWeek[j].schedule_type == 3) {
2944
-                    list[i].wanshang18 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
3249
+                    if(this.guanliu_show==false){
3250
+                      list[i].wanshang18 = lastWeek[j].name
3251
+                    }else{
3252
+                      list[i].wanshang18 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
3253
+                    }
3254
+                    // list[i].wanshang18 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
2945 3255
                   }
2946 3256
 
2947 3257
                   //周六
2948 3258
                   if (lastWeek[j].schedule_week == 6 && lastWeek[j].schedule_type == 1) {
2949
-                    list[i].shangwu19 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
3259
+                    if(this.guanliu_show==false){
3260
+                      list[i].shangwu19 = lastWeek[j].name
3261
+                    }else{
3262
+                      list[i].shangwu19 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
3263
+                    }
3264
+                    // list[i].shangwu19 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
2950 3265
                   }
2951 3266
                   //周六下午
2952 3267
                   if (lastWeek[j].schedule_week == 6 && lastWeek[j].schedule_type == 2) {
2953
-                    list[i].xiawu19 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
3268
+                    if(this.guanliu_show==false){
3269
+                      list[i].xiawu19 = lastWeek[j].name
3270
+                    }else{
3271
+                      list[i].xiawu19 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
3272
+                    }
3273
+                    // list[i].xiawu19 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
2954 3274
                   }
2955 3275
                   //周六晚上
2956 3276
                   if (lastWeek[j].schedule_week == 6 && lastWeek[j].schedule_type == 3) {
2957
-                    list[i].wanshang19 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
3277
+                    if(this.guanliu_show==false){
3278
+                      list[i].wanshang19 = lastWeek[j].name
3279
+                    }else{
3280
+                      list[i].wanshang19 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
3281
+                    }
3282
+                    // list[i].wanshang19 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
2958 3283
                   }
2959 3284
 
2960 3285
                   //周日
2961 3286
                   if (lastWeek[j].schedule_week == 7 && lastWeek[j].schedule_type == 1) {
2962
-                    list[i].shangwu20 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
3287
+                    if(this.guanliu_show==false){
3288
+                      list[i].shangwu20 = lastWeek[j].name
3289
+                    }else{
3290
+                      list[i].shangwu20 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
3291
+                    }
3292
+                    // list[i].shangwu20 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
2963 3293
                   }
2964 3294
                   //周日下午
2965 3295
                   if (lastWeek[j].schedule_week == 7 && lastWeek[j].schedule_type == 2) {
2966
-                    list[i].xiawu20 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
3296
+                    if(this.guanliu_show==false){
3297
+                      list[i].xiawu20 = lastWeek[j].name
3298
+                    }else{
3299
+                      list[i].xiawu20 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
3300
+                    }
3301
+                    // list[i].xiawu20 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
2967 3302
                   }
2968 3303
                   //周日晚上
2969 3304
                   if (lastWeek[j].schedule_week == 7 && lastWeek[j].schedule_type == 3) {
2970
-                    list[i].wanshang20 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
3305
+                    if(this.guanliu_show==false){
3306
+                      list[i].wanshang20 = lastWeek[j].name
3307
+                    }else{
3308
+                      list[i].wanshang20 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
3309
+                    }
3310
+                    // list[i].wanshang20 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
2971 3311
                   }
2972 3312
                 }
2973 3313
 
@@ -3250,7 +3590,10 @@ export default {
3250 3590
 
3251 3591
     }
3252 3592
 
3253
-  }
3593
+  },
3594
+  // updated(){
3595
+  //   this.getThreeWeekList()
3596
+  // }
3254 3597
 }
3255 3598
 </script>
3256 3599
 

+ 1 - 1
src/xt_pages/workforce/components/tableWeeks.vue Vedi File

@@ -274,7 +274,7 @@
274 274
           }}</span>
275 275
                     <span v-if="scope.row.dialysissolution.anticoagulant == 2">{{
276 276
             scope.row.dialysissolution.anticoagulant_zongliang
277
-              ? scope.row.dialysissolution.anticoagulant_zongliang + 'iu'
277
+              ? scope.row.dialysissolution.anticoagulant_zongliang + 'mg'
278 278
               : ''
279 279
           }}</span>
280 280
                     <span v-if="scope.row.dialysissolution.anticoagulant == 3">{{

+ 1 - 1
src/xt_pages/workforce/remind_print_setting.vue Vedi File

@@ -128,7 +128,7 @@
128 128
                 <div v-if="org_id == 10188 || org_id == 10217 || org_id == 10340 || org_id == 9671 || org_id == 9675">干体重:{{main_collection.assessmentbefor.dry_weight}}</div>
129 129
                 <div v-if="org_id == 10188 || org_id == 10217 || org_id == 10340 || org_id == 9671 || org_id == 9675">透前体重:{{main_collection.assessmentbefor.weight_before}}</div>
130 130
                 <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>
131
-                <div v-if="org_id!=10278">用法:静脉注射</div>
131
+                <div v-if="org_id!=10278 && org_id!=10600">用法:静脉注射</div>
132 132
                 <!-- 透析器灌流器 -->
133 133
                
134 134
                  <div>