XMLWAN 3 年之前
父節點
當前提交
954fb6f9ca

+ 1 - 0
src/api/dialysis.js 查看文件

@@ -157,6 +157,7 @@ export function postPrescription(params) {
157 157
 }
158 158
 
159 159
 export function postSoulution(params) {
160
+  console.log("params",params)
160 161
   return request({
161 162
     url: '/api/dialysis/soulution',
162 163
     method: 'Post',

+ 18 - 0
src/api/schedule.js 查看文件

@@ -220,4 +220,22 @@ export function getPatientSheduleCount(params){
220 220
     method:"get",
221 221
     params:params
222 222
   })
223
+}
224
+
225
+export function postScheduleTemplate(params){
226
+   
227
+  return request({
228
+    url:"/api/schedule/postscheduletemplate",
229
+    method:"get",
230
+    params:params
231
+  })
232
+}
233
+
234
+export function getScheduleTemplate(params){
235
+  
236
+  return request({
237
+    url:"/api/schedule/getscheduletemplate",
238
+    method:"get",
239
+    params:params,
240
+  })
223 241
 }

+ 15 - 0
src/store/modules/globalConfig.js 查看文件

@@ -524,6 +524,21 @@ const global_config = {
524 524
         sodium: 1,
525 525
         calcium: 1,
526 526
         bicarbonate: 1
527
+      },
528
+      22: {
529
+        id: 22,
530
+        name: '血浆胆红素吸附+HDF',
531
+        dialysis_duration: 1,
532
+        replacement_way: 1,
533
+        hemodialysis_machine: 2,
534
+        blood_filter: 1,
535
+        perfusion_apparatus: 2,
536
+        blood_flow_volume: 1,
537
+        dialysate_flow: 1,
538
+        kalium: 1,
539
+        sodium: 1,
540
+        calcium: 1,
541
+        bicarbonate: 1
527 542
       }
528 543
     },
529 544
     anticoagulants_confit: { // 抗凝剂

+ 3 - 3
src/xt_pages/data/prescription.vue 查看文件

@@ -229,7 +229,7 @@
229 229
                     </el-form-item>
230 230
                   </el-col>
231 231
 
232
-                  <el-col :span="8">
232
+                  <el-col :span="8" v-if="this.$store.getters.xt_user.template_info.org_id != 9987 && this.$store.getters.xt_user.template_info.org_id != 3877 && this.$store.getters.xt_user.template_info.org_id != 10090">
233 233
                     <el-form-item label="透析器/灌流器:">
234 234
                       <el-input
235 235
                         v-model="addPlan.dialyzer_perfusion_apparatus" @focus="showInnerDialog('5')"></el-input>
@@ -237,14 +237,14 @@
237 237
                   </el-col>
238 238
 
239 239
 
240
-                  <el-col :span="8" v-if="this.$store.getters.xt_user.template_info.org_id == 9987 || this.$store.getters.xt_user.template_info.org_id == 3877">
240
+                  <el-col :span="8" v-if="this.$store.getters.xt_user.template_info.org_id == 9987 || this.$store.getters.xt_user.template_info.org_id == 3877 || this.$store.getters.xt_user.template_info.org_id == 10090">
241 241
                     <el-form-item label="透析器:">
242 242
                       <el-input
243 243
                         v-model="dialysis_dialyszers" @focus="showInnerDialog('6')"></el-input>
244 244
                     </el-form-item>
245 245
                   </el-col>
246 246
 
247
-                  <el-col :span="8" v-if="this.$store.getters.xt_user.template_info.org_id == 9987 || this.$store.getters.xt_user.template_info.org_id == 3877">
247
+                  <el-col :span="8" v-if="this.$store.getters.xt_user.template_info.org_id == 9987 || this.$store.getters.xt_user.template_info.org_id == 3877 || this.$store.getters.xt_user.template_info.org_id == 10090">
248 248
                     <el-form-item label="灌流器:">
249 249
                       <el-input
250 250
                         v-model="dialysis_irrigation" @focus="showInnerDialog('7')"></el-input>

+ 5 - 3
src/xt_pages/data/printTemplate.vue 查看文件

@@ -20,7 +20,9 @@
20 20
         <el-tab-pane label="透析记录单模板" name="4">
21 21
           <dialysis-print></dialysis-print>
22 22
         </el-tab-pane>
23
-       
23
+        <el-tab-pane label="排班打印模板" name="6">
24
+          <schedule-print></schedule-print>
25
+        </el-tab-pane>
24 26
       </el-tabs>
25 27
     </div>
26 28
   </div>
@@ -33,10 +35,10 @@ import prescriptionPrint from './printTemplate/prescriptionPrint'
33 35
 import treatPrint from './printTemplate/treatPrint'
34 36
 import dialysisPrint from './printTemplate/dialysisPrint'
35 37
 import chargePrint from './printTemplate/chargePrint'
36
-
38
+import schedulePrint from './printTemplate/schedulePrint'
37 39
 export default {
38 40
   name: "printTemplate",
39
-  components: { BreadCrumb,recordPrint,prescriptionPrint,treatPrint,dialysisPrint,chargePrint },
41
+  components: { BreadCrumb,recordPrint,prescriptionPrint,treatPrint,dialysisPrint,chargePrint,schedulePrint },
40 42
   data() {
41 43
     return {
42 44
       showViewer:false,

+ 7 - 0
src/xt_pages/dialysis/batch_print/batch_print_order_six.vue 查看文件

@@ -556,6 +556,13 @@
556 556
                           >
557 557
                             IUF+HD
558 558
                           </div>
559
+                           <div
560
+                            class="under_line"
561
+                            style="width: 100px;text-align: center;font-weight:600;"
562
+                            v-if="record.prescription.mode_id == 22"
563
+                          >
564
+                            血浆胆红素吸附+HDF
565
+                          </div>
559 566
                         </div>
560 567
                       </div>
561 568
 

+ 5 - 0
src/xt_pages/dialysis/details/DialysisPrescription.vue 查看文件

@@ -339,6 +339,11 @@
339 339
           <span class="content">{{this.prescription.replacement_flow}}</span>
340 340
         </li>
341 341
 
342
+        <li v-if="isShow('血浆分离器')">
343
+          <label>血浆分离器: </label>
344
+          <span class="content">{{this.prescription.plasma_separator}}</span>
345
+        </li>
346
+
342 347
       </ul>
343 348
     </div>
344 349
     <div style="color:#34495e;margin: 12px 100px 0 100px;">备注: <span style="color:#409eff;">{{ note }}</span></div>

+ 26 - 4
src/xt_pages/dialysis/details/dialog/dialysisPrescriptionDialog.vue 查看文件

@@ -396,6 +396,12 @@
396 396
              </el-form-item>
397 397
           </el-col>
398 398
 
399
+          <el-col :span="8" v-if="isShows('血浆分离器')">
400
+             <el-form-item label="血浆分离器:">
401
+                  <el-input v-model="dialysisPrescription.plasma_separator" @focus="showInnerDialog('9')"></el-input>
402
+             </el-form-item>
403
+          </el-col>
404
+
399 405
           <el-col :span="8" v-if="isShows('体液过多症状')">
400 406
             <el-form-item label="体液过多症状:">
401 407
               <el-select
@@ -562,15 +568,15 @@
562 568
              </el-form-item>
563 569
           </el-col>
564 570
 
565
-         
566
-
567
-
571
+        
568 572
           <el-col :span="8" v-if="isShows('置换流量')">
569 573
              <el-form-item label="置换流量(L/h):">
570 574
                 <el-input v-model="dialysisPrescription.replacement_flow"></el-input>
571 575
              </el-form-item>
572 576
           </el-col>
577
+         
573 578
 
579
+       
574 580
         </el-row>
575 581
 
576 582
         <el-row :gutter="20">
@@ -1069,6 +1075,7 @@
1069 1075
           single_time:"",
1070 1076
           single_water:"",
1071 1077
           replacement_flow:"",
1078
+          plasma_separator:"",
1072 1079
         },
1073 1080
 
1074 1081
         anticoagulant: {
@@ -1092,7 +1099,8 @@
1092 1099
         bloods:[],
1093 1100
         irrigations:[],
1094 1101
         dialyzers:[],
1095
-        illnessList:[]
1102
+        illnessList:[],
1103
+        plasmaSeparatorList:[],
1096 1104
       }
1097 1105
     },
1098 1106
     methods: {
@@ -1177,6 +1185,15 @@
1177 1185
             this.InnerDialogProps.selected = this.dialysisPrescription.dialysis_irrigation
1178 1186
             this.InnerDialogProps.isShowTextArea = false
1179 1187
             break
1188
+           case '9': // 血浆灌流器
1189
+
1190
+           
1191
+            this.InnerDialogProps.values = this.plasmaSeparatorList
1192
+            this.InnerDialogProps.titles = '血浆灌流器'
1193
+            this.InnerDialogProps.type = 'plasma_separator'
1194
+            this.InnerDialogProps.selected = this.dialysisPrescription.plasma_separator
1195
+            this.InnerDialogProps.isShowTextArea = false
1196
+            break
1180 1197
         }
1181 1198
       },
1182 1199
       innerDialogComfirm: function(val) {
@@ -1194,6 +1211,9 @@
1194 1211
           case 'irrigations':
1195 1212
            this.dialysisPrescription.dialysis_irrigation = val.value.join(',')
1196 1213
           break
1214
+          case 'plasma_separator':
1215
+          this.dialysisPrescription.plasma_separator = val.value.join(',')
1216
+          break
1197 1217
         }
1198 1218
       },
1199 1219
       innerDialogCancle: function() {
@@ -3584,6 +3604,8 @@
3584 3604
     created(){
3585 3605
       this.illnessList = getDataConfig('hemodialysis','illness')
3586 3606
       console.log("列表22222222222",this.illnessList)
3607
+      this.plasmaSeparatorList = getDataConfig('hemodialysis','plasma_separator')
3608
+      console.log("列表333333333",this.plasmaSeparatorList)
3587 3609
     }
3588 3610
   }
3589 3611
 </script>

+ 4 - 1
src/xt_pages/dialysis/details/dialog/doubleCheckDialog.vue 查看文件

@@ -930,9 +930,12 @@
930 930
       isVisibility(val) {
931 931
         
932 932
         if(this.prescription!=null && this.prescription.id!=0){
933
-
933
+          
934 934
           this.diazes = this.diazes + this.prescription.dialyzer_perfusion_apparatus
935
+          this.diazes = this.diazes + this.prescription.dialysis_dialyszers+this.prescription.dialysis_irrigation
935 936
           this.prescription.dialyzer_perfusion_apparatus = ""
937
+          this.prescription.dialysis_dialyszers = ""
938
+          this.prescription.dialysis_irrigation = ""
936 939
           this.dialysate_formulation = this.dialysate_formulation + this.GetDialysateFormulationById(this.prescription.dialysate_formulation)
937 940
           // this.prescription.dialysate_formulation = ""
938 941
           this.kalium = this.kalium + (this.prescription.kalium?this.prescription.kalium:"")

+ 3 - 2
src/xt_pages/dialysis/dialysisDoctorAdvice.vue 查看文件

@@ -2,13 +2,14 @@
2 2
   <div class="main-contain">
3 3
     <div class="position">
4 4
       <bread-crumb :crumbs="crumbs"></bread-crumb>
5
+      <div>
5 6
        <el-button
6 7
           size="small"
7 8
           icon="el-icon-printer"
8 9
           :disabled="selecting_schs.length == 0"
9 10
           @click="signPrintAction"
10 11
           type="primary"
11
-          style="float:right"
12
+          style="margin-right:10"
12 13
         >标签打印
13 14
       </el-button>
14 15
       <el-button
@@ -19,7 +20,7 @@
19 20
           type="primary"
20 21
           >医嘱打印
21 22
       </el-button>
22
-   
23
+    </div>
23 24
     </div>
24 25
     <div class="app-container">
25 26
       <!-- <div class="filter-container">

+ 3 - 0
src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue 查看文件

@@ -300,6 +300,9 @@
300 300
                     <div class="under_line" style="width: 100px;text-align: center;font-weight:600;" v-if="prescription.mode_id == 19">
301 301
                       IUF+HD
302 302
                     </div>
303
+                    <div class="under_line" style="width: 150px;text-align: center;font-weight:600;" v-if="prescription.mode_id == 22">
304
+                      血浆胆红素吸附+HDF
305
+                    </div>
303 306
                   </div>
304 307
 
305 308
                   <div class="inline_block" style="margin-left:10px;flex:1;">

+ 3 - 1
src/xt_pages/stock/detail/print.vue 查看文件

@@ -184,6 +184,7 @@
184 184
       },
185 185
       getDialysisRecord() {
186 186
         this.loading = true
187
+        
187 188
         getPrintStockGood(this.queryParams).then(response => {
188 189
           if (response.data.state == 1) {
189 190
             var stockTotal = response.data.data.stockTotal
@@ -251,7 +252,8 @@
251 252
             return false
252 253
           }
253 254
         })
254
-      }, calCount(stock) {
255
+      }, 
256
+      calCount(stock) {
255 257
       
256 258
         let total = 0
257 259
         var array = []

+ 8 - 5
src/xt_pages/stock/detail/stockOutDetail.vue 查看文件

@@ -164,7 +164,8 @@
164 164
         </el-table-column>
165 165
         <el-table-column label="数量" align="center">
166 166
           <template slot-scope="scope">
167
-            {{ scope.row.count }}
167
+            <span v-if="orgId!=9583">{{ scope.row.count }}</span>
168
+            <span v-if="orgId ==9583">{{getStockCount(scope.row.good_id) }}</span>
168 169
           </template>
169 170
         </el-table-column>
170 171
         <el-table-column label="总价" align="center">
@@ -227,6 +228,9 @@ export default {
227 228
     this.goodUnit = this.$store.getters.good_unit
228 229
     this.getPrintStockGood()
229 230
     this.getList()
231
+    var org_id = this.$store.getters.xt_user.org.id
232
+    this.orgId = org_id
233
+    console.log("机构信息",org_id)
230 234
   },
231 235
   data() {
232 236
     return {
@@ -260,7 +264,8 @@ export default {
260 264
       goodUnit:[],
261 265
       tableList:[],
262 266
       stockTotal:[],
263
-      goodInfoData:[]
267
+      goodInfoData:[],
268
+      orgId:"",
264 269
     };
265 270
   },
266 271
   methods: {
@@ -686,7 +691,6 @@ export default {
686 691
         return Math.floor(amountPrice* 100) / 100
687 692
       },
688 693
       getStockCount(id){
689
-
690 694
         var count = ""
691 695
         for(let i=0;i<this.stockTotal.length;i++){
692 696
             if(id == this.stockTotal[i].good_id){
@@ -758,7 +762,6 @@ export default {
758 762
         this.tableList[i].index = i+1
759 763
         this.tableList[i].min_unit = this.getUnit(this.tableList[i].good_unit)
760 764
         this.tableList[i].count = this.getStockCount(this.tableList[i].id)
761
-        // this.tableList[i].price = this.tableList[i].query_warehouseout_info[0].buy_price
762 765
         this.tableList[i].total = (this.getStockCount(this.tableList[i].id) * this.tableList[i].buy_price).toFixed(2)
763 766
         this.tableList[i].remark = this.tableList[i].query_warehouseout_info[0].remark
764 767
        }
@@ -800,7 +803,7 @@ export default {
800 803
        }
801 804
        return total_price
802 805
      },
803
-
806
+   
804 807
      
805 808
   }
806 809
 };

+ 7 - 10
src/xt_pages/stock/drugs/drugStockInOrder.vue 查看文件

@@ -422,8 +422,7 @@ export default {
422 422
           this.total = response.data.data.total;
423 423
           for (let i = 0; i < response.data.data.list.length; i++) {
424 424
             this.Warehouse.warehouseDate.push(response.data.data.list[i]);
425
-          }
426
-          console.log("列表",this.warehouse.warehouseDate)
425
+          }      
427 426
         }
428 427
       });
429 428
     },
@@ -432,7 +431,7 @@ export default {
432 431
       row.index = rowIndex;
433 432
     },
434 433
     onRowClick(row, event, column) {
435
-      this.WarehouseInfo.warehouseInfoDate = [];
434
+     this.WarehouseInfo.warehouseInfoDate = [];
436 435
       this.Warehouse.tableCurrentIndex = row.index;
437 436
       const params = {
438 437
         id: row.id
@@ -446,9 +445,7 @@ export default {
446 445
         } else {
447 446
           this.WarehouseInfo.loading = false;
448 447
           for (let i = 0; i < response.data.data.info.length; i++) {
449
-            this.WarehouseInfo.warehouseInfoDate.push(
450
-              response.data.data.info[i]
451
-            );
448
+            this.WarehouseInfo.warehouseInfoDate.push(response.data.data.info[i]);
452 449
           }
453 450
         }
454 451
       });
@@ -566,12 +563,12 @@ export default {
566 563
           this.$message.error(response.data.msg);
567 564
           return false;
568 565
         } else {
566
+          //  this.WarehouseInfo.warehouseInfoDate = []
567
+           
569 568
           for (let i = 0; i < response.data.data.info.length; i++) {
570
-            this.WarehouseInfo.warehouseInfoDate = []
571
-            this.WarehouseInfo.warehouseInfoDate.push(
572
-              response.data.data.info[i]
573
-            );
569
+            this.WarehouseInfo.warehouseInfoDate.push(response.data.data.info[i]);
574 570
           }
571
+          console.log("列表222222222", this.WarehouseInfo.warehouseInfoDate)
575 572
           this.WarehouseInfo.warehouse = response.data.data.warehousing;
576 573
         }
577 574
       });

+ 0 - 2
src/xt_pages/stock/drugs/drugStockOutOrderDetailPrint.vue 查看文件

@@ -8,8 +8,6 @@
8 8
     <div class="app-container ">
9 9
       <div id="dialysis-print-box">
10 10
         <div class="dialysis-print-order">
11
-         <div class="order-yy-name" style="font-weight:bold;">{{orgName}}</div>
12
-          <div class="order-title" style="font-weight:normal;">药品出库登记表</div>
13 11
          <div class="order-yy-name" style="font-size:22px;font-weight:bold;letter-spacing:0px;">{{orgName}}</div>
14 12
           <div class="order-title" style="font-weight:500;font-size:18px;">药品出库登记表</div>
15 13
 

+ 32 - 6
src/xt_pages/user/dialysisSolution.vue 查看文件

@@ -512,6 +512,12 @@
512 512
             </el-form-item>
513 513
           </el-col>
514 514
 
515
+         <el-col :span="8" v-if="isShows('血浆分离器')">
516
+             <el-form-item label="血浆分离器:">
517
+               <el-input v-model="addPlan.plasma_separator" @focus="showInnerDialog('8')"></el-input>
518
+             </el-form-item>
519
+         </el-col>
520
+
515 521
           <el-col :span="8" v-if="isShows('目标KT/V')">
516 522
             <el-form-item label="目标KT/V">
517 523
               <el-input v-model="addPlan.target_ktv"></el-input>
@@ -519,6 +525,10 @@
519 525
           </el-col>
520 526
         </el-row>
521 527
 
528
+
529
+    
530
+
531
+
522 532
         <el-row :gutter="24">
523 533
           <el-col :span="24">
524 534
             <el-form-item label="备注: " prop="remark">
@@ -707,6 +717,7 @@ export default {
707 717
         blood_access: '',
708 718
         dialysis_dialyszers:'',
709 719
         dialysis_irrigation:'',
720
+        plasma_separator:"",
710 721
       },
711 722
       childPlan: {
712 723
         mode: '',
@@ -835,6 +846,7 @@ export default {
835 846
      dialyzers:[],
836 847
      dialysis_dialyszers:'',
837 848
      dialysis_irrigation:"",
849
+     plasmaSeparatorList:[]
838 850
     }
839 851
   },
840 852
   watch: {
@@ -913,11 +925,20 @@ export default {
913 925
           this.InnerDialogProps.selected = this.dialysis_irrigation
914 926
           this.InnerDialogProps.isShowTextArea = false
915 927
 
928
+          break
929
+        case '8':
930
+         
931
+          this.InnerDialogProps.values = this.plasmaSeparatorList
932
+          this.InnerDialogProps.titles = '血浆分离器'
933
+          this.InnerDialogProps.type = 'plasma_separator'
934
+          this.InnerDialogProps.selected = this.addPlan.plasma_separator
935
+          this.InnerDialogProps.isShowTextArea = false
936
+
916 937
           break
917 938
       }
918 939
     },
919 940
     innerDialogComfirm: function(val) {
920
-
941
+      console.log("value",val)
921 942
       this.InnerDialogProps.visibility = false
922 943
       switch (val.type) {
923 944
         case 'dialyzer_perfusion_apparatus':
@@ -925,13 +946,14 @@ export default {
925 946
           break
926 947
         case 'dialyzers':
927 948
           this.dialysis_dialyszers = val.value.join(',')
928
-          console.log("3333333",this.addPlan.dialysis_dialyszers)
929
-
930 949
           break
931 950
         case 'irrigations':
932 951
           this.dialysis_irrigation = val.value.join(',')
933 952
           break
934
-
953
+        case 'plasma_separator':
954
+          this.addPlan.plasma_separator = val.value.join(',')
955
+          console.log("333333",this.addPlan.plasma_separator)
956
+          break
935 957
       }
936 958
     },
937 959
     innerDialogCancle: function() {
@@ -1376,6 +1398,7 @@ export default {
1376 1398
       this.addPlan.remark = row.remark
1377 1399
 
1378 1400
       this.addPlan.dialyzer_perfusion_apparatus = row.dialyzer_perfusion_apparatus.toString()
1401
+      this.addPlan.plasma_separator = row.plasma_separator.toString()
1379 1402
       this.addPlan.dialysis_irrigation = row.dialysis_irrigation
1380 1403
       this.addPlan.dialysis_dialyszers = row.dialysis_dialyszers
1381 1404
       this.dialysis_irrigation = row.dialysis_irrigation
@@ -1474,6 +1497,7 @@ export default {
1474 1497
         dialysis_duration_hour: '3',
1475 1498
         dialysis_duration_minute: '30',
1476 1499
         created_time:"",
1500
+        plasma_separator:"",
1477 1501
       }
1478 1502
       this.addPlanTypeChange()
1479 1503
 
@@ -1713,7 +1737,8 @@ export default {
1713 1737
               displace_liqui_part: '',
1714 1738
               displace_liqui_value: '',
1715 1739
               ultrafiltration: '',
1716
-              blood_access: ''
1740
+              blood_access: '',
1741
+              plasma_separator:"",
1717 1742
             }
1718 1743
 
1719 1744
             for (const key in tempAddPlan) {
@@ -1811,7 +1836,8 @@ export default {
1811 1836
       'hemodialysis',
1812 1837
       'dialyzer_perfusion_apparatus'
1813 1838
     )
1814
-
1839
+    this.plasmaSeparatorList = getDataConfig('hemodialysis','plasma_separator')
1840
+    
1815 1841
     this.queryParams.id = this.patientID
1816 1842
     // this.fetchAllDoctorAndNurse();
1817 1843
 

+ 28 - 13
src/xt_pages/workforce/appointment.vue 查看文件

@@ -69,7 +69,7 @@
69 69
       <bread-crumb :crumbs="crumbs"></bread-crumb>
70 70
         <div style="display:flex;align-items:center">
71 71
           <schedule-upload-excel style="margin-right:10px;" :on-success='handleSuccess' ></schedule-upload-excel>
72
-           <el-button @click="printTable" type="primary" size="small">打印排班</el-button>
72
+           <!-- <el-button @click="printTable" type="primary" size="small">打印排班</el-button> -->
73 73
           <el-button v-if="isShow()" type="primary" size="small" @click="export_file()" :loading="downloadLoading">
74 74
             导出模版
75 75
           </el-button>
@@ -85,7 +85,7 @@
85 85
           >下载日志
86 86
           </el-button>
87 87
 
88
-          <el-button type="primary" size="small" icon="el-icon-printer" @click="printScheduleAction">打印</el-button>
88
+          <el-button type="primary" size="small" icon="el-icon-printer" @click="printScheduleAction">打印排班</el-button>
89 89
           <el-button type="primary" size="small" icon="el-icon-setting" @click="setScheduleTemplateAction">排班模板</el-button>
90 90
           <el-button type="primary" size="small" @click="copySchedule">复制排班</el-button>
91 91
         </div>
@@ -157,7 +157,7 @@
157 157
   import moment from 'moment'
158 158
   import { parseTime } from '@/utils'
159 159
   import tableData from './components/tableData'
160
-  import { exportSchedule, getWeekPanels, initDate,getThreeWeekList,copyPatientSchedule } from '@/api/schedule'
160
+  import { exportSchedule, getWeekPanels, initDate,getThreeWeekList,copyPatientSchedule,getScheduleTemplate } from '@/api/schedule'
161 161
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
162 162
   import UploadExcel from '@/xt_pages/components/UploadExcel'
163 163
   import ScheduleUploadExcel from './components/scheduleUploadExcel/index'
@@ -216,8 +216,8 @@
216 216
         clen:7,
217 217
         nowYear: new Date().getFullYear(),
218 218
         schedule_week:0,
219
-        newDay:[]
220
-
219
+        newDay:[],
220
+       templateObj:{}
221 221
       }
222 222
     },
223 223
     components: {
@@ -227,9 +227,9 @@
227 227
       UploadExcel
228 228
     },
229 229
     methods: {
230
-      printTable(){
231
-        this.$router.push({path: '/scheduleTablePrint?partition_id='+this.partition_id+"&weekTime="+this.activeName})
232
-      },
230
+      // printTable(){
231
+      //   this.$router.push({path: '/scheduleTablePrint?partition_id='+this.partition_id+"&weekTime="+this.activeName})
232
+      // },
233 233
       generateTxt: function(log) {
234 234
         var content = ''
235 235
         var errlog = log.err_logs
@@ -638,11 +638,16 @@
638 638
         } else if (this.activeName == 'nextTwoWeek') {
639 639
           date = date + 14 * 24 * 60 * 60 * 1000
640 640
         }
641
-        this.$router.push({
642
-          path: '/workforce/schedule/print',
643
-          query: { date: date }
644
-        })
645
-      }, isShow() {
641
+        
642
+        if(this.templateObj.template_id == 0 || this.templateObj.template_id == 1){
643
+           this.$router.push({path: '/workforce/schedule/print',query: { date: date }})
644
+        }
645
+        if(this.templateObj.template_id == 2){
646
+          this.$router.push({path: '/scheduleTablePrint?partition_id='+this.partition_id+"&weekTime="+this.activeName})
647
+        }
648
+       
649
+      }, 
650
+      isShow() {
646 651
         let isShow = false
647 652
         if (Object.keys(this.partitions).length != 0) {
648 653
           isShow = true
@@ -2811,8 +2816,18 @@
2811 2816
               }
2812 2817
            })
2813 2818
         },
2819
+        getlist(){
2820
+          getScheduleTemplate().then(response=>{
2821
+             if(response.data.state == 1){
2822
+                var template = response.data.data.template
2823
+                console.log("模版",template)
2824
+                this.templateObj = template
2825
+             }
2826
+          })
2827
+        }
2814 2828
     },
2815 2829
     created() {
2830
+     this.getlist()
2816 2831
      var start_time = moment().weekday(1).format('YYYY-MM-DD');
2817 2832
    
2818 2833
      this.start_time = start_time

+ 2 - 1
src/xt_pages/workforce/scheduleTablePrint.vue 查看文件

@@ -818,13 +818,14 @@ export default {
818 818
                theType = 4
819 819
             }
820 820
            var partionStr = this.partition_id
821
+           console.log("partionStr",partionStr)
821 822
             var arr = this.zoneIdList.join(',')
822 823
             var str = ""
823 824
             if(partionStr == 0){
824 825
                 str = arr
825 826
             }
826 827
             if(partionStr != 0){
827
-                str = partionStr.join(',')
828
+                str = partionStr
828 829
             }
829 830
             var params = {
830 831
              weekTime:theType,