Browse Source

11月14日 库存扣减更新

XMLWAN 3 years ago
parent
commit
38f6053edb

+ 8 - 0
src/api/schedule.js View File

@@ -245,3 +245,11 @@ export function getPatientScheduleTemplate(params) {
245 245
     params: params
246 246
   })
247 247
 }
248
+
249
+export function getSolutionSchedule(params) {
250
+  return request({
251
+    url: '/api/schedule/getsolutionschedule',
252
+    method: 'Get',
253
+    params: params
254
+  })
255
+}

+ 55 - 44
src/router/modules/workforce.js View File

@@ -60,49 +60,60 @@ export default {
60 60
       noCache: true
61 61
     }
62 62
   },
63
-    {
64
-      path: '/schedule/remind/print',
65
-      component: () => import('@/xt_pages/workforce/remind_print'),
66
-      name: 'remind_print',
67
-      hidden: true,
68
-      is_menu: false,
69
-      meta: {
70
-        title: 'remind_print',
71
-        noCache: true
72
-      }
73
-    },
74
-    {
75
-      path: '/schedule/remind/print/next',
76
-      component: () => import('@/xt_pages/workforce/next_remind_print'),
77
-      name: 'next_remind_print',
78
-      hidden: true,
79
-      is_menu: false,
80
-      meta: {
81
-        title: 'next_remind_print',
82
-        noCache: true
83
-      }
84
-    },
85
-    {
86
-      path: '/schedule/remind/print/setting',
87
-      component: () => import('@/xt_pages/workforce/remind_print_setting'),
88
-      name: 'remind_print_setting',
89
-      hidden: true,
90
-      is_menu: false,
91
-      meta: {
92
-        title: 'remind_print_setting',
93
-        noCache: true
94
-      }
95
-    },
96
-    {
97
-      path: '/scheduleTablePrint',
98
-      component: () => import('@/xt_pages/workforce/scheduleTablePrint'),
99
-      name: 'scheduleTablePrint',
100
-      hidden: true,
101
-      is_menu: false,
102
-      meta: {
103
-        title: 'scheduleTablePrint',
104
-        noCache: true
105
-      }
106
-    },
63
+  {
64
+    path: '/schedule/remind/print',
65
+    component: () => import('@/xt_pages/workforce/remind_print'),
66
+    name: 'remind_print',
67
+    hidden: true,
68
+    is_menu: false,
69
+    meta: {
70
+      title: 'remind_print',
71
+      noCache: true
72
+    }
73
+  },
74
+  {
75
+    path: '/schedule/remind/print/next',
76
+    component: () => import('@/xt_pages/workforce/next_remind_print'),
77
+    name: 'next_remind_print',
78
+    hidden: true,
79
+    is_menu: false,
80
+    meta: {
81
+      title: 'next_remind_print',
82
+      noCache: true
83
+    }
84
+  },
85
+  {
86
+    path: '/schedule/remind/print/setting',
87
+    component: () => import('@/xt_pages/workforce/remind_print_setting'),
88
+    name: 'remind_print_setting',
89
+    hidden: true,
90
+    is_menu: false,
91
+    meta: {
92
+      title: 'remind_print_setting',
93
+      noCache: true
94
+    }
95
+  },
96
+  {
97
+    path: '/scheduleTablePrint',
98
+    component: () => import('@/xt_pages/workforce/scheduleTablePrint'),
99
+    name: 'scheduleTablePrint',
100
+    hidden: true,
101
+    is_menu: false,
102
+    meta: {
103
+      title: 'scheduleTablePrint',
104
+      noCache: true
105
+    }
106
+  },
107
+  {
108
+    path: '/scheduleTablePrintOne',
109
+    component: () => import('@/xt_pages/workforce/scheduleTablePrintOne'),
110
+    name: 'scheduleTablePrintOne',
111
+    hidden: true,
112
+    is_menu: false,
113
+    meta: {
114
+      title: 'scheduleTablePrintOne',
115
+      noCache: true
116
+    }
117
+  }
107 118
   ]
108 119
 }

+ 66 - 6
src/xt_pages/data/components/consumables.vue View File

@@ -72,6 +72,14 @@
72 72
           size="small"
73 73
         >下载日志
74 74
         </el-button>
75
+        <!-- <el-button
76
+          style="margin-left:10px;"
77
+          @click="exportList()"
78
+          class="filter-item"
79
+          type="primary"
80
+          size="small"
81
+        >点击导出
82
+        </el-button> -->
75 83
       </div>
76 84
 
77 85
     <el-table
@@ -155,7 +163,7 @@
155 163
     <el-pagination
156 164
       @size-change="handleSizeChange"
157 165
       @current-change="handleCurrentChange"
158
-      :page-sizes="[10, 50, 100]"
166
+      :page-sizes="[10, 50, 100,500,1000]"
159 167
       :page-size="10"
160 168
       background
161 169
       align="right"
@@ -325,7 +333,6 @@
325 333
               register_number:"",
326 334
             },
327 335
             isVisibility: false,
328
-
329 336
           }
330 337
         },
331 338
         selectDrug:[],
@@ -351,6 +358,7 @@
351 358
         goodKindList:[],
352 359
         goodTypeList:[{id:0,type_name:"全部"}],
353 360
         is_type:0,
361
+        medicalInsuranceLevelList:[]
354 362
       }
355 363
     },
356 364
     methods: {
@@ -1490,14 +1498,66 @@
1490 1498
        getInitializtion().then(response=>{
1491 1499
          if(response.data.state == 1){
1492 1500
            var goodKindList = response.data.data.goodKindList;
1493
-
1501
+           
1494 1502
            this.goodKindList = goodKindList
1495
-
1496
-
1503
+           var medicalInsuranceLevelList =  response.data.data.medicalInsuranceLevelList
1504
+           console.log("医保等级",medicalInsuranceLevelList)
1505
+           this.medicalInsuranceLevelList = medicalInsuranceLevelList
1497 1506
          }
1498 1507
        })
1499
-      }
1508
+      },
1509
+      exportList(){
1510
+        import('@/vendor/Export2Excel').then(excel => {
1511
+         console.log("this.table",this.goodInfo.goodInfoData)
1512
+         
1513
+         for(let i=0;i<this.goodInfo.goodInfoData.length;i++){
1514
+           for(let j=0;j<this.goodKindList.length;j++){
1515
+              if(this.goodInfo.goodInfoData[i].good_kind == this.goodKindList[j].value){
1516
+                 this.goodInfo.goodInfoData[i].good_kind_name = this.goodKindList[i].name
1517
+              }
1518
+           }
1519
+           for(let z=0;z<this.goodInfo.goodInfoDialog.formValue.goodType;z++){
1520
+              if(this.goodInfo.goodInfoDialog.formValue[z].id == this.goodInfo.goodInfoData[i].good_type_id){
1521
+                 this.goodInfo.goodInfoData[i].good_type_name = this.goodInfo.goodInfoDialog.formValue[z].name
1522
+              }
1523
+           }
1524
+
1525
+           for(let y=0;y<this.medicalInsuranceLevelList.length;y++){
1526
+              if(this.goodInfo.goodInfoData[i].medical_insurance_level == this.medicalInsuranceLevelList[y].value){
1527
+                 this.goodInfo.goodInfoData[i].medical_insurance_level_name = this.medicalInsuranceLevelList[y].name
1528
+              }
1529
+           }
1500 1530
 
1531
+           for(let s=0;s<this.manufacturers.length;s++){
1532
+             if(this.manufacturers[s].id == this.goodInfo.goodInfoData[i].manufacturer){
1533
+                this.goodInfo.goodInfoData[i].manufacturer_name =  this.manufacturers[s].manufacturer_name
1534
+             }
1535
+           }
1536
+          
1537
+          for(let a=0;a<this.dealers.length;a++){
1538
+             if(this.dealers[a].id == this.goodInfo.goodInfoData[i].dealer){
1539
+                 this.goodInfo.goodInfoData[i].dealer_name = this.dealers[a].dealer_name 
1540
+             } 
1541
+          }
1542
+         }
1543
+        
1544
+         const tHeader = ['耗材名称','耗材种类','耗材类型','医保等级','规格型号','生产厂商','单位','零价','库存警戒','经销商','最新进价','医保编码','社保目录编码']
1545
+         const filterVal = ['good_name', 'good_kind_name','good_type_name','medical_insurance_level_name','specification_name','manufacturer_name','packing_unit','packing_price','stock_warn_count','dealer_name','buy_price','medical_insurance_number','social_security_directory_code'] 
1546
+         
1547
+         const data = this.formatJson(filterVal,this.goodInfo.goodInfoData)
1548
+     
1549
+         excel.export_json_to_excel({
1550
+           header: tHeader,
1551
+           data,
1552
+           filename: '耗材信息'
1553
+         })
1554
+          this.downloadLoading = false
1555
+    
1556
+        })
1557
+       },
1558
+       formatJson(filterVal, jsonData) {
1559
+        return jsonData.map(v => filterVal.map(j => v[j]))
1560
+       },
1501 1561
     },
1502 1562
     created() {
1503 1563
       this.getAllGoodType();

+ 70 - 6
src/xt_pages/data/components/drugs.vue View File

@@ -239,7 +239,7 @@
239 239
   import selfPayment from './selfPayment'
240 240
   import maintain from './maintain'
241 241
   import addDrugs from './addDrugs'
242
-  import { GetAllManufacturer,postDrugInformation } from '@/api/stock'
242
+  import { GetAllManufacturer,postDrugInformation,getInitializtion } from '@/api/stock'
243 243
   import { getDataConfig,getDictionaryDataConfig } from "@/utils/data";
244 244
   import { uParseTime } from '@/utils/tools'
245 245
   import {
@@ -410,7 +410,15 @@
410 410
         selectDrug:[],
411 411
         dialogVisible:false,
412 412
         exportLogVisible:false,
413
-        logs:[]
413
+        logs:[],
414
+        drugTypeList:[],
415
+        drugCategoryList:[],
416
+        drugDosageFormList:[],
417
+        medicalInsuranceLevelList:[],
418
+        drugControlList:[],
419
+        drugClassifyList:[],
420
+        statisticsCategoryList:[],
421
+        pharmacologyCategoryList:[],
414 422
       }
415 423
     },
416 424
     methods: {
@@ -1474,12 +1482,38 @@
1474 1482
          
1475 1483
         
1476 1484
          console.log("this.table",this.list)
1477
-         for(let i=0;i<this.list.length;i++){
1478
-            this.list[i].specification_name = this.list[i].dose + this.list[i].dose_unit + this.list[i].min_number + this.list[i].min_unit + "/"+this.list[i].max_unit
1479 1485
 
1486
+         for(let i=0;i<this.list.length;i++){
1487
+          for(let j=0;j<this.drugCategoryList.length;j++){
1488
+              if(this.list[i].drug_category == this.drugCategoryList[j].value){
1489
+                 this.list[i].drug_category_name = this.drugCategoryList[j].name
1490
+              }  
1491
+          }
1492
+           for(let z=0;z<this.drugDosageFormList.length;z++){
1493
+              if(this.list[i].drug_dosage_form == this.drugDosageFormList[z].value){
1494
+                this.list[i].drug_dosage_form_name = this.drugDosageFormList[z].name
1495
+              }
1496
+           }
1497
+           for(let h=0;h<this.drugClassifyList.length;h++){
1498
+              if(this.list[i].drug_classify == this.drugClassifyList[h].value){
1499
+                 this.list[i].drug_classify_name = this.drugClassifyList[h].name
1500
+              }
1501
+           }
1502
+           for(let y=0;y<this.manufacturers.length;y++){
1503
+             if(this.list[i].manufacturer == this.manufacturers[y].id){
1504
+                this.list[i].manufacturer_name = this.manufacturers[y].manufacturer_name
1505
+             }
1506
+           }
1507
+           for(let s=0;s<this.dealer.length;s++){
1508
+             if(this.list[i].dealer == this.dealer[s].id){
1509
+               this.list[i].dealer_name = this.dealer[s].dealer_name
1510
+             }
1511
+           }
1512
+          this.list[i].specification_name = this.list[i].dose + this.list[i].dose_unit + this.list[i].min_number + this.list[i].min_unit + "/"+this.list[i].max_unit
1480 1513
          }
1514
+
1481 1515
          const tHeader = ['药品名称','药品规格','剂量','剂量单位','拆零','拆零单位','包装单位','药品类型','库存警戒','产地','药品剂型','拆零零售价','包装零售价','进货价','药物分类','默认单次用量','默认单次用量单位','生产厂商','经销商','医保编码','社保目录编码']
1482
-         const filterVal = ['drug_name', 'specification_name', 'dose','dose','dose_unit','min_number','min_unit','max_unit','drug_stock_limit','drug_origin_place','drug_dosage_form','min_price','retail_price','last_price','drug_classify','drug_dose','drug_dose_unit','manufacturer','dealer','medical_insurance_number','social_security_directory_code'] 
1516
+         const filterVal = ['drug_name', 'specification_name','dose','dose_unit','min_number','min_unit','max_unit','drug_category_name','drug_stock_limit','drug_origin_place','drug_dosage_form_name','min_price','retail_price','last_price','drug_classify_name','drug_dose','drug_dose_unit','manufacturer_name','dealer_name','medical_insurance_number','social_security_directory_code'] 
1483 1517
          
1484 1518
          const data = this.formatJson(filterVal,this.list)
1485 1519
      
@@ -1495,6 +1529,36 @@
1495 1529
        formatJson(filterVal, jsonData) {
1496 1530
         return jsonData.map(v => filterVal.map(j => v[j]))
1497 1531
        },
1532
+      getInitializtion(){
1533
+        getInitializtion().then(response=>{
1534
+           if(response.data.state ==1){
1535
+             var drugCategoryList =  response.data.data.drugCategoryList
1536
+             console.log("药品类型",drugCategoryList)
1537
+             this.drugCategoryList = drugCategoryList
1538
+             var drugTypeList = response.data.data.drugTypeList
1539
+
1540
+              this.drugTypeList = drugTypeList
1541
+             var drugDosageFormList =  response.data.data.drugDosageFormList
1542
+             console.log("药品剂型",drugDosageFormList)
1543
+             this.drugDosageFormList = drugDosageFormList
1544
+             var medicalInsuranceLevelList =  response.data.data.medicalInsuranceLevelList
1545
+             console.log("医保登记",medicalInsuranceLevelList)
1546
+             this.medicalInsuranceLevelList = medicalInsuranceLevelList
1547
+             var drugControlList = response.data.data.drugControlList
1548
+             console.log("开药控制",drugControlList)
1549
+             this.drugControlList = drugControlList
1550
+             var drugClassifyList = response.data.data.drugClassifyList
1551
+             console.log("药物分类",drugClassifyList)
1552
+             this.drugClassifyList = drugClassifyList
1553
+             var statisticsCategoryList =  response.data.data.statisticsCategoryList
1554
+             console.log("统计分类",statisticsCategoryList)
1555
+             this.statisticsCategoryList = statisticsCategoryList
1556
+             var pharmacologyCategoryList = response.data.data.pharmacologyCategoryList
1557
+             console.log("药理分类",pharmacologyCategoryList)
1558
+             this.pharmacologyCategoryList = pharmacologyCategoryList
1559
+           }
1560
+        })
1561
+      },
1498 1562
 
1499 1563
     },
1500 1564
     created() {
@@ -1502,7 +1566,7 @@
1502 1566
       this.getList();
1503 1567
       this.getAllManufacturer();
1504 1568
       this.GetAllConfig()
1505
-
1569
+      this.getInitializtion()
1506 1570
     }
1507 1571
   }
1508 1572
 </script>

+ 47 - 0
src/xt_pages/data/components/project.vue View File

@@ -61,6 +61,14 @@
61 61
           size="small"
62 62
         >下载日志
63 63
         </el-button>
64
+        <!-- <el-button
65
+          style="margin-left:10px;"
66
+          @click="exportList()"
67
+          class="filter-item"
68
+          type="primary"
69
+          size="small"
70
+        >点击导出
71
+        </el-button> -->
64 72
       </div>
65 73
         <el-table :data="tableData" border style="width: 100%" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)', color: '#606266'}"  @selection-change="handleSelectionChange">
66 74
             <el-table-column
@@ -892,6 +900,45 @@ export default {
892 900
       getDictionaryDataConfig(module, filed_name) {
893 901
           return getDictionaryDataConfig(module, filed_name)
894 902
       },
903
+      exportList(){
904
+        import('@/vendor/Export2Excel').then(excel => {
905
+        
906
+         for(let i=0;i<this.tableData.length;i++){
907
+           for(let j=0;j<this.getDictionaryDataConfig('system','cost_classify').length;j++){
908
+              if(this.tableData[i].cost_classify == this.getDictionaryDataConfig('system','cost_classify')[j].id){
909
+                 this.tableData[i].cost_classify_name = this.getDictionaryDataConfig('system','cost_classify')[j].name 
910
+              }
911
+           }
912
+           for(let y=0;y<this.getDictionaryDataConfig('system','medical_insurance_level').length;y++){
913
+              if(this.tableData[i].medical_coverage == this.getDictionaryDataConfig('system','medical_insurance_level')[y].id){
914
+                 this.tableData[i].medical_coverage_name = this.getDictionaryDataConfig('system','medical_insurance_level')[y].name 
915
+              }
916
+           }
917
+           for(let a=0;a<this.departMentList.length;a++){
918
+             if(this.tableData[i].executive_section == this.departMentList[a].id){
919
+                this.tableData[i].executive_section_name = this.departMentList[a].name
920
+             }
921
+           }
922
+         }
923
+          console.log("this.table",this.tableData)
924
+         const tHeader = ['项目名称','零价','单位','费用类别','执行科室','医保等级','国家编码','社保目录编码']
925
+         const filterVal = ['project_name', 'price','unit','cost_classify_name','executive_section_name','medical_coverage_name','medical_code','social_security_directory_code'] 
926
+         
927
+         const data = this.formatJson(filterVal,this.tableData)
928
+     
929
+         excel.export_json_to_excel({
930
+           header: tHeader,
931
+           data,
932
+           filename: '项目信息'
933
+         })
934
+          this.downloadLoading = false
935
+    
936
+        })
937
+       },
938
+       formatJson(filterVal, jsonData) {
939
+        return jsonData.map(v => filterVal.map(j => v[j]))
940
+       },
941
+     
895 942
     },
896 943
     created(){
897 944
       this.getlist();

+ 24 - 0
src/xt_pages/data/printTemplate/schedulePrint.vue View File

@@ -56,6 +56,30 @@
56 56
         <el-radio v-model="radio" label="2" @change="change">模版二</el-radio
57 57
         >
58 58
         </el-col>
59
+
60
+       <el-col
61
+        :span="6"
62
+        style="margin-left: 100px;margin-right: 100px;text-align: center"
63
+        >
64
+        <div
65
+            @click="imgClick('https://kuyi.shengws.com/tempSchedule2.jpg')"
66
+        >
67
+            <el-tooltip
68
+            class="item"
69
+            effect="dark"
70
+            content="点击查看大图"
71
+            placement="top-start"
72
+            :hide-after="2000"
73
+            >
74
+            <el-image
75
+                style="width: 200px; height: 200px"
76
+                :src="require('@/assets/home/222.jpg')"
77
+            ></el-image>
78
+            </el-tooltip>
79
+        </div>
80
+        <el-radio v-model="radio" label="3" @change="change">模版三</el-radio
81
+        >
82
+        </el-col>
59 83
     </el-row>
60 84
    
61 85
 

+ 1 - 1
src/xt_pages/dialysis/batch_print/batch_print_order_fortyThree.vue View File

@@ -66,7 +66,7 @@
66 66
                     <div class="inline_block" style="margin-left: 10px;">
67 67
                         透析次数:
68 68
                         <div class="under_line" style="width: 80px;text-align: center;">
69
-                            {{ record.patient.total_dialysis + record.patient.user_sys_before_count }}
69
+                            {{ record.Count + record.patient.user_sys_before_count }}
70 70
                         </div>
71 71
                     </div>
72 72
                 </div>

+ 46 - 7
src/xt_pages/dialysis/bloodPresssWatch.vue View File

@@ -353,8 +353,36 @@
353 353
         <el-button type="primary" @click="changeSearchMode">{{
354 354
           search_mode == 1 ? "改为病人查询" : "改为日期查询"
355 355
         }}</el-button>
356
-
357
-        <!-- <el-button type="primary" :disabled="selecting_schs.length == 0" @click="batchPrintAction">打印</el-button> -->
356
+      </div>
357
+      <div class="cell clearfix"  v-show="search_mode == 2">
358
+         <label class="title">
359
+          <span class="name">日期查询</span>:
360
+        </label>
361
+        <el-date-picker
362
+          v-model="listQuery.start_time"
363
+          prefix-icon="el-icon-date"
364
+          @change="changeStartTime"
365
+          style="width: 250px;"
366
+          type="date"
367
+          placeholder="选择日期时间"
368
+          align="right"
369
+          :picker-options="pickerOptions1"
370
+          format="yyyy-MM-dd"
371
+          value-format="timestamp"
372
+        ></el-date-picker>
373
+        -
374
+        <el-date-picker
375
+          v-model="listQuery.end_time"
376
+          prefix-icon="el-icon-date"
377
+          @change="changeEndTime"
378
+          style="width: 250px;"
379
+          type="date"
380
+          placeholder="选择日期时间"
381
+          align="right"
382
+          :picker-options="pickerOptions1"
383
+          format="yyyy-MM-dd"
384
+          value-format="timestamp"
385
+        ></el-date-picker>
358 386
       </div>
359 387
       <div class="cell clearfix">
360 388
         <label class="title"> <span class="name">排班班次</span> : </label>
@@ -480,7 +508,7 @@
480 508
         align="right"
481 509
         @size-change="handleSizeChange"
482 510
         @current-change="handleCurrentChange"
483
-        :page-sizes="[10, 20, 30, 50]"
511
+        :page-sizes="[10, 20, 30, 50,100]"
484 512
         :page-size="10"
485 513
         background
486 514
         style="margin-top:20px;"
@@ -602,10 +630,13 @@ export default {
602 630
         schedul_type: 0,
603 631
         partition_type: 0,
604 632
         schedul_time: "",
605
-        keywords: ""
633
+        keywords: "",
634
+        start_time:"",
635
+        end_time:"",
606 636
       },
607 637
       selecting_schs: [],
608
-      partitionArr: []
638
+      partitionArr: [],
639
+  
609 640
     };
610 641
   },
611 642
   created() {
@@ -696,6 +727,13 @@ export default {
696 727
       this.listQuery.schedul_time = this.time;
697 728
       this.getSchedualPatientList();
698 729
     },
730
+    changeStartTime(){
731
+      this.getSchedualPatientList()
732
+    },
733
+    changeEndTime(){
734
+      
735
+      this.getSchedualPatientList()
736
+    },
699 737
     getAllZone: function() {
700 738
       GetAllZone().then(response => {
701 739
         if (response.data.state == 0) {
@@ -714,9 +752,10 @@ export default {
714 752
       } else {
715 753
         this.listQuery.schedul_time = "";
716 754
       }
755
+      console.log("params332322332323232",this.listQuery)
717 756
       this.SchedualPatientsTableData = [];
718 757
       getSchedualPatient(this.listQuery).then(response => {
719
-        console.log("排班对于23333223323223232",response.data.data.schedule)
758
+      
720 759
         if (response.data.state == 0) {
721 760
           this.loading = false;
722 761
           this.$message.error(response.data.msg);
@@ -773,7 +812,7 @@ export default {
773 812
              
774 813
 
775 814
               this.SchedualPatientsTableData.push(SchedualPatientsTable);
776
-              console.log("中国222222",this.SchedualPatientsTableData)
815
+             
777 816
             }
778 817
           }
779 818
         }

+ 7 - 3
src/xt_pages/dialysis/template/DialysisPrintOrderFortyThree.vue View File

@@ -254,9 +254,13 @@
254 254
                   <div class="inline_block">
255 255
                       置换方式:
256 256
                       <div class="under_line" style="width: 100px;text-align: center;">
257
-                          <span v-if="prescription.displace_liqui_part == ''">/</span>
258
-                          <span v-if="prescription.displace_liqui_part == 1">前置换</span>
259
-                          <span v-if="prescription.displace_liqui_part == 2">后置换</span>
257
+                        <span v-if="prescription.mode_id == 1"></span>
258
+                        <span v-else>
259
+                           <span v-if="prescription.displace_liqui_part == ''">/</span>
260
+                           <span v-if="prescription.displace_liqui_part == 1">前置换</span>
261
+                           <span v-if="prescription.displace_liqui_part == 2">后置换</span>
262
+                        </span>
263
+                         
260 264
                       </div>
261 265
                   </div>
262 266
                   <div class="inline_block">

+ 2 - 2
src/xt_pages/stock/cancelStockOrder.vue View File

@@ -198,11 +198,11 @@
198 198
             </template>
199 199
           </el-table-column>
200 200
 
201
-         <el-table-column label="批次" align="center">
201
+         <!-- <el-table-column label="批次" align="center">
202 202
             <template slot-scope="scope">
203 203
               {{ scope.row.number}}
204 204
             </template>
205
-          </el-table-column>
205
+          </el-table-column> -->
206 206
 
207 207
          <el-table-column label="品名/注册证号(备案凭证号)" align="center">
208 208
             <template slot-scope="scope">

+ 2 - 2
src/xt_pages/stock/drugs/cancelDrugStockOrder.vue View File

@@ -201,11 +201,11 @@
201 201
               </template> 
202 202
             </el-table-column>
203 203
 
204
-            <el-table-column label="批次" align="center">
204
+            <!-- <el-table-column label="批次" align="center">
205 205
               <template slot-scope="scope">
206 206
                 {{ scope.row.batch_number}}
207 207
               </template>
208
-            </el-table-column>
208
+            </el-table-column> -->
209 209
 
210 210
             <el-table-column label="品名/注册证号(备案凭证号)" align="center">
211 211
               <template slot-scope="scope">

+ 2 - 2
src/xt_pages/stock/drugs/drugStockFlow.vue View File

@@ -118,11 +118,11 @@
118 118
             
119 119
            </template>
120 120
         </el-table-column>
121
-        <el-table-column prop="drug_name" label="批号" align="center">
121
+        <!-- <el-table-column prop="drug_name" label="批号" align="center">
122 122
            <template slot-scope="scope">
123 123
              <span>{{scope.row.batch_number}}</span>
124 124
            </template>
125
-        </el-table-column>
125
+        </el-table-column> -->
126 126
         <!-- <el-table-column prop="drug_name" label="生产商" align="center">
127 127
            <template slot-scope="scope">
128 128
              {{getManufacturer(scope.row.manufacturer)}}

+ 2 - 2
src/xt_pages/stock/stockFlow.vue View File

@@ -98,11 +98,11 @@
98 98
          </template>
99 99
        </el-table-column> -->
100 100
 
101
-       <el-table-column label="批次" align="center">
101
+       <!-- <el-table-column label="批次" align="center">
102 102
          <template slot-scope="scope">
103 103
            <span>{{scope.row.number}}</span>
104 104
          </template>
105
-       </el-table-column>
105
+       </el-table-column> -->
106 106
 
107 107
     
108 108
         <el-table-column prop="drug_name" label="单价"  align="center">

+ 3 - 0
src/xt_pages/workforce/appointment.vue View File

@@ -674,6 +674,9 @@
674 674
         if(this.templateObj.template_id == 2){
675 675
           this.$router.push({path: '/scheduleTablePrint?partition_id='+this.partition_id+"&weekTime="+this.activeName})
676 676
         }
677
+        if(this.templateObj.template_id == 3){
678
+          this.$router.push({path: '/scheduleTablePrintOne?partition_id='+this.partition_id+"&weekTime="+this.activeName})
679
+        }
677 680
        
678 681
       }, 
679 682
       isShow() {

+ 6 - 6
src/xt_pages/workforce/scheduleTablePrint.vue View File

@@ -42,13 +42,15 @@
42 42
                 <td style="min-width:50px;">{{ item.cut }}</td>
43 43
                 <td style="min-width:50px;">
44 44
                     <span v-if="item.Mon_M.patient_id">
45
-                        <div>{{ item.Mon_M.patient }}</div>
46
-                        <div v-if="item.Mon_M.mode_name != 'HD'">{{ item.Mon_M.mode_name }}</div>
45
+                        <div>{{ item.Mon_M.patient }} </div>
46
+                        <div v-if="item.Mon_M.mode_name != 'HD'">
47
+                            {{ item.Mon_M.mode_name }}
48
+                     </div>
47 49
                     </span>
48 50
                 </td>
49 51
                 <td style="min-width:50px;">
50 52
                     <span v-if="item.Mon_A.patient_id">
51
-                        <div>{{ item.Mon_A.patient }}</div>
53
+                        <div>{{ item.Mon_A.patient }} </div>
52 54
                         <div v-if="item.Mon_A.mode_name != 'HD'">{{ item.Mon_A.mode_name }}</div>
53 55
                     </span>
54 56
                 </td>
@@ -209,9 +211,7 @@ export default {
209 211
     created(){
210 212
         this.getAllZones()
211 213
         this.modeOptions = this.$store.getters.treatment_mode;
212
-        this.partition_id = this.$route.query.partition_id
213
-       
214
-        
214
+        this.partition_id = this.$route.query.partition_id   
215 215
     },
216 216
     methods:{
217 217
          getAllZones(){

+ 868 - 0
src/xt_pages/workforce/scheduleTablePrintOne.vue View File

@@ -0,0 +1,868 @@
1
+<template>
2
+    <div>
3
+        <el-button type="primary" @click="printAction">打印</el-button>
4
+        <table id="scheduleTable" class="scheduleTable" border="1" cellspacing="0">
5
+            <tr>
6
+                <td rowspan="2">分区</td>
7
+                <td rowspan="2">机号</td>
8
+                <td colspan="3">周一({{ weekTitle[0] }})</td>
9
+                <td colspan="3">周二({{ weekTitle[1] }})</td>
10
+                <td colspan="3">周三({{ weekTitle[2] }})</td>
11
+                <td colspan="3">周四({{ weekTitle[3] }})</td>
12
+                <td colspan="3">周五({{ weekTitle[4] }})</td>
13
+                <td colspan="3">周六({{ weekTitle[5] }})</td>
14
+                <td colspan="3">周日({{ weekTitle[6] }})</td>
15
+                <td>总数</td>
16
+            </tr>
17
+            <tr>
18
+                <td>上午</td>
19
+                <td>下午</td>
20
+                <td>晚上</td>
21
+                <td>上午</td>
22
+                <td>下午</td>
23
+                <td>晚上</td>
24
+                <td>上午</td>
25
+                <td>下午</td>
26
+                <td>晚上</td>
27
+                <td>上午</td>
28
+                <td>下午</td>
29
+                <td>晚上</td>
30
+                <td>上午</td>
31
+                <td>下午</td>
32
+                <td>晚上</td>
33
+                <td>上午</td>
34
+                <td>下午</td>
35
+                <td>晚上</td>
36
+                <td>上午</td>
37
+                <td>下午</td>
38
+                <td>晚上</td>
39
+            </tr>
40
+            <tr v-for="(item,index) in scheduleZone" :key="index">
41
+                <td style="min-width:50px;">{{ item.area }}</td>
42
+                <td style="min-width:50px;">{{ item.cut }}</td>
43
+                <td style="min-width:50px;">
44
+                    <span v-if="item.Mon_M.patient_id">
45
+                        <div>{{ item.Mon_M.patient }} </div>
46
+                        <div v-if="item.Mon_M.mode_name != 'HD'">
47
+                            {{ item.Mon_M.mode_name }}
48
+                     </div>
49
+                    </span>
50
+                </td>
51
+                <td style="min-width:50px;">
52
+                    <span v-if="item.Mon_A.patient_id">
53
+                        <div>{{ item.Mon_A.patient }} </div>
54
+                        <div v-if="item.Mon_A.mode_name != 'HD'">{{ item.Mon_A.mode_name }}</div>
55
+                    </span>
56
+                </td>
57
+                <td style="min-width:50px;">
58
+                    <span v-if="item.Mon_N.patient_id">
59
+                        <div>{{ item.Mon_N.patient }}</div>
60
+                        <div v-if="item.Mon_N.mode_name != 'HD'">{{ item.Mon_N.mode_name }}</div>
61
+                    </span>
62
+                </td>
63
+                <td style="min-width:50px;">
64
+                    <span v-if="item.Tue_M.patient_id">
65
+                        <div>{{ item.Tue_M.patient }}</div>
66
+                        <div v-if="item.Tue_M.mode_name != 'HD'">{{ item.Tue_M.mode_name }}</div>
67
+                    </span>
68
+                </td>
69
+                <td style="min-width:50px;">
70
+                    <span v-if="item.Tue_A.patient_id">
71
+                        <div>{{ item.Tue_A.patient }}</div>
72
+                        <div v-if="item.Tue_A.mode_name != 'HD'">{{ item.Tue_A.mode_name }}</div>
73
+                    </span>
74
+                </td>
75
+                <td style="min-width:50px;">
76
+                    <span v-if="item.Tue_N.patient_id">
77
+                        <div>{{ item.Tue_N.patient }}</div>
78
+                        <div v-if="item.Tue_N.mode_name != 'HD'">{{ item.Tue_N.mode_name }}</div>
79
+                    </span>
80
+                </td>
81
+                <td style="min-width:50px;">
82
+                    <span v-if="item.Wed_M.patient_id">
83
+                        <div>{{ item.Wed_M.patient }}</div>
84
+                        <div v-if="item.Wed_M.mode_name != 'HD'">{{ item.Wed_M.mode_name }}</div>
85
+                    </span>
86
+                </td>
87
+                <td style="min-width:50px;">
88
+                    <span v-if="item.Wed_A.patient_id">
89
+                        <div>{{ item.Wed_A.patient }}</div>
90
+                        <div v-if="item.Wed_A.mode_name != 'HD'">{{ item.Wed_A.mode_name }}</div>
91
+                    </span>
92
+                </td>
93
+                <td style="min-width:50px;"> 
94
+                    <span v-if="item.Wed_N.patient_id">
95
+                        <div>{{ item.Wed_N.patient }}</div>
96
+                        <div v-if="item.Wed_N.mode_name != 'HD'">{{ item.Wed_N.mode_name }}</div>
97
+                    </span>
98
+                </td>
99
+                <td style="min-width:50px;">
100
+                    <span v-if="item.Thurs_M.patient_id">
101
+                        <div>{{ item.Thurs_M.patient }}</div>
102
+                        <div v-if="item.Thurs_M.mode_name != 'HD'">{{ item.Thurs_M.mode_name }}</div>
103
+                    </span>
104
+                </td>
105
+                <td style="min-width:50px;">
106
+                    <span v-if="item.Thurs_A.patient_id">
107
+                        <div>{{ item.Thurs_A.patient }}</div>
108
+                        <div v-if="item.Thurs_A.mode_name != 'HD'">{{ item.Thurs_A.mode_name }}</div>
109
+                    </span>
110
+                </td>
111
+                <td style="min-width:50px;">
112
+                    <span v-if="item.Thurs_N.patient_id">
113
+                        <div>{{ item.Thurs_N.patient }}</div>
114
+                        <div v-if="item.Thurs_N.mode_name != 'HD'">{{ item.Thurs_N.mode_name }}</div>
115
+                    </span>
116
+                </td>
117
+                <td style="min-width:50px;">
118
+                    <span v-if="item.Fri_M.patient_id">
119
+                        <div>{{ item.Fri_M.patient }}</div>
120
+                        <div v-if="item.Fri_M.mode_name != 'HD'">{{ item.Fri_M.mode_name }}</div>
121
+                    </span>
122
+                </td>
123
+                <td style="min-width:50px;">
124
+                    <span v-if="item.Fri_A.patient_id">
125
+                        <div>{{ item.Fri_A.patient }}</div>
126
+                        <div v-if="item.Fri_A.mode_name != 'HD'">{{ item.Fri_A.mode_name }}</div>
127
+                    </span>
128
+                </td>
129
+                <td style="min-width:50px;">
130
+                    <span v-if="item.Fri_N.patient_id">
131
+                        <div>{{ item.Fri_N.patient }}</div>
132
+                        <div v-if="item.Sat_M.mode_name != 'HD'">{{ item.Sat_M.mode_name }}</div>
133
+                    </span>
134
+                </td>
135
+                <td style="min-width:50px;">
136
+                    <span v-if="item.Sat_M.patient_id">
137
+                        <div>{{ item.Sat_M.patient }}</div>
138
+                        <div v-if="item.Sat_M.mode_name != 'HD'">{{ item.Sat_M.mode_name }}</div>
139
+                    </span>
140
+                </td>
141
+                <td style="min-width:50px;">
142
+                    <span v-if="item.Sat_A.patient_id">
143
+                        <div>{{ item.Sat_A.patient }}</div>
144
+                        <div v-if="item.Sat_A.mode_name != 'HD'">{{ item.Sat_A.mode_name }}</div>
145
+                    </span>
146
+                </td>
147
+                <td style="min-width:50px;">
148
+                    <span v-if="item.Sat_N.patient_id">
149
+                        <div>{{ item.Sat_N.patient }}</div>
150
+                        <div v-if="item.Sat_N.mode_name != 'HD'">{{ item.Sat_N.mode_name }}</div>
151
+                    </span>
152
+                </td>
153
+                <td style="min-width:50px;">
154
+                    <span v-if="item.Sun_M.patient_id">
155
+                        <div>{{ item.Sun_M.patient }}</div>
156
+                        <div v-if="item.Sun_M.mode_name != 'HD'">{{ item.Sun_M.mode_name }} FX80</div>
157
+                    </span>
158
+                </td>
159
+                <td style="min-width:50px;">
160
+                    <span v-if="item.Sun_A.patient_id">
161
+                        <div>{{ item.Sun_A.patient }}</div>
162
+                        <div v-if="item.Sun_A.mode_name != 'HD'">{{ item.Sun_A.mode_name }} FX80</div>
163
+                    </span>
164
+                </td>
165
+                <td style="min-width:50px;">
166
+                    <span v-if="item.Sun_N.patient_id">
167
+                        <div>{{ item.Sun_N.patient }}</div>
168
+                        <div v-if="item.Sun_N.mode_name != 'HD'">{{ item.Sun_N.mode_name }} FX80</div>
169
+                    </span>
170
+                </td>
171
+                <td>{{item.total}}</td>
172
+            </tr>
173
+        </table>
174
+    </div>
175
+</template>
176
+
177
+
178
+
179
+<script>
180
+import {getSchedulesOne,getWeekPanelsOne,getPatientSheduleCount,getAllZones,getSolutionSchedule} from "@/api/schedule";
181
+import print from 'print-js'
182
+export default {
183
+    props:{
184
+        scheduleZoneProp: {
185
+            type: Array,
186
+            dafault: []
187
+        },
188
+    },
189
+    data(){
190
+        return{
191
+            schedule_type:'',
192
+            partition_id:'',
193
+            theType:2,
194
+            scheduleZone:[],
195
+            weekTitle:[],
196
+            scheduleZoneRow: [],
197
+            partitions: {},
198
+            theWeek: {
199
+              lastWeek: 0,
200
+              thisWeek: 0,
201
+              nextWeek: 0,
202
+              nextTwoWeek: 0
203
+           },
204
+           scheduleCountList:[],
205
+           total:0,
206
+           zones:[],
207
+           zoneIdList:[],
208
+           strArr:"",
209
+           solutionList:[]
210
+        }
211
+    },
212
+    created(){
213
+        this.getAllZones()
214
+        this.modeOptions = this.$store.getters.treatment_mode;
215
+        this.partition_id = this.$route.query.partition_id   
216
+        this.getSolutionSchedule()
217
+    },
218
+    methods:{
219
+         getAllZones(){
220
+           getAllZones().then(response=>{
221
+             if(response.data.state == 1){
222
+                var zones = response.data.data.zones
223
+               for(let i=0;i<zones.length;i++){
224
+                    this.zoneIdList.push(zones[i].id)
225
+                }
226
+                this.zones.push(...zones)
227
+                var strArr =  this.zoneIdList.join(",")
228
+                
229
+                this.strArr = strArr
230
+                this.getWeekPanels()
231
+                //统计患者排班数量
232
+                this.getPatientSheduleCount()
233
+            }
234
+          })
235
+        },
236
+        getWeekPanels() {
237
+             this.scheduleZone = []
238
+              var partionStr = this.partition_id
239
+              var arr = this.zoneIdList.join(',')
240
+               var str = ""
241
+                if(partionStr == 0){
242
+                    str = arr
243
+                }
244
+                if(partionStr != 0){
245
+                    str = partionStr
246
+                }
247
+            getWeekPanelsOne(1,str).then(response => {
248
+                if (response.data.state == 0) {
249
+                    return false
250
+                }
251
+                var partitions = response.data.data.partitions
252
+                console.log("分区",partitions)
253
+                this.theWeek.thisWeek = response.data.data.theWeek
254
+                this.theWeek.lastWeek = this.theWeek.thisWeek - 1
255
+                this.theWeek.nextWeek = this.theWeek.thisWeek + 1
256
+                this.theWeek.nextTwoWeek = this.theWeek.thisWeek + 2
257
+                var that = this
258
+                if (partitions.length > 0) {
259
+                    partitions.forEach(function(partition) {
260
+                        if (partition.jihaos.length == 0) {
261
+                            return false
262
+                        }
263
+                        that.scheduleZoneRow.push(partition.jihaos.length)
264
+                        that.partitions[partition.id] = partition
265
+                        partition.jihaos.forEach(function(jihao) {
266
+                            var thisPa = {
267
+                            area: partition.name,
268
+                            zone_id: partition.id,
269
+                            zone_type: partition.type,
270
+                            cut: jihao.number,
271
+                            jihao_id: jihao.id,
272
+                            Mon_M: {
273
+                                schedule_id: 0,
274
+                                mode_id: 0,
275
+                                mode_name: '',
276
+                                patient_id: 0,
277
+                                patient: ''
278
+                            },
279
+                            Mon_A: {
280
+                                schedule_id: 0,
281
+                                mode_id: 0,
282
+                                mode_name: '',
283
+                                patient_id: 0,
284
+                                patient: ''
285
+                            },
286
+                            Mon_N: {
287
+                                schedule_id: 0,
288
+                                mode_id: 0,
289
+                                mode_name: '',
290
+                                patient_id: 0,
291
+                                patient: ''
292
+                            },
293
+                            Tue_M: {
294
+                                schedule_id: 0,
295
+                                mode_id: 0,
296
+                                mode_name: '',
297
+                                patient_id: 0,
298
+                                patient: ''
299
+                            },
300
+                            Tue_A: {
301
+                                schedule_id: 0,
302
+                                mode_id: 0,
303
+                                mode_name: '',
304
+                                patient_id: 0,
305
+                                patient: ''
306
+                            },
307
+                            Tue_N: {
308
+                                schedule_id: 0,
309
+                                mode_id: 0,
310
+                                mode_name: '',
311
+                                patient_id: 0,
312
+                                patient: ''
313
+                            },
314
+                            Wed_M: {
315
+                                schedule_id: 0,
316
+                                mode_id: 0,
317
+                                mode_name: '',
318
+                                patient_id: 0,
319
+                                patient: ''
320
+                            },
321
+                            Wed_A: {
322
+                                schedule_id: 0,
323
+                                mode_id: 0,
324
+                                mode_name: '',
325
+                                patient_id: 0,
326
+                                patient: ''
327
+                            },
328
+                            Wed_N: {
329
+                                schedule_id: 0,
330
+                                mode_id: 0,
331
+                                mode_name: '',
332
+                                patient_id: 0,
333
+                                patient: ''
334
+                            },
335
+                            Thurs_M: {
336
+                                schedule_id: 0,
337
+                                mode_id: 0,
338
+                                mode_name: '',
339
+                                patient_id: 0,
340
+                                patient: ''
341
+                            },
342
+                            Thurs_A: {
343
+                                schedule_id: 0,
344
+                                mode_id: 0,
345
+                                mode_name: '',
346
+                                patient_id: 0,
347
+                                patient: ''
348
+                            },
349
+                            Thurs_N: {
350
+                                schedule_id: 0,
351
+                                mode_id: 0,
352
+                                mode_name: '',
353
+                                patient_id: 0,
354
+                                patient: ''
355
+                            },
356
+                            Fri_M: {
357
+                                schedule_id: 0,
358
+                                mode_id: 0,
359
+                                mode_name: '',
360
+                                patient_id: 0,
361
+                                patient: ''
362
+                            },
363
+                            Fri_A: {
364
+                                schedule_id: 0,
365
+                                mode_id: 0,
366
+                                mode_name: '',
367
+                                patient_id: 0,
368
+                                patient: ''
369
+                            },
370
+                            Fri_N: {
371
+                                schedule_id: 0,
372
+                                mode_id: 0,
373
+                                mode_name: '',
374
+                                patient_id: 0,
375
+                                patient: ''
376
+                            },
377
+                            Sat_M: {
378
+                                schedule_id: 0,
379
+                                mode_id: 0,
380
+                                mode_name: '',
381
+                                patient_id: 0,
382
+                                patient: ''
383
+                            },
384
+                            Sat_A: {
385
+                                schedule_id: 0,
386
+                                mode_id: 0,
387
+                                mode_name: '',
388
+                                patient_id: 0,
389
+                                patient: ''
390
+                            },
391
+                            Sat_N: {
392
+                                schedule_id: 0,
393
+                                mode_id: 0,
394
+                                mode_name: '',
395
+                                patient_id: 0,
396
+                                patient: ''
397
+                            },
398
+                            Sun_A: {
399
+                                schedule_id: 0,
400
+                                mode_id: 0,
401
+                                mode_name: '',
402
+                                patient_id: 0,
403
+                                patient: ''
404
+                            },
405
+                            Sun_N: {
406
+                                schedule_id: 0,
407
+                                mode_id: 0,
408
+                                mode_name: '',
409
+                                patient_id: 0,
410
+                                patient: ''
411
+                            },
412
+                            Sun_M: {
413
+                                schedule_id: 0,
414
+                                mode_id: 0,
415
+                                mode_name: '',
416
+                                patient_id: 0,
417
+                                patient: ''
418
+                            },
419
+                            total: 0
420
+                            }
421
+                            that.scheduleZone.push(thisPa)
422
+
423
+                        })
424
+                    })
425
+                }
426
+                this.getSchedules()
427
+            })
428
+        },
429
+        getSchedules() {
430
+            var theType = 2;
431
+            if(this.$route.query.weekTime == "lastWeek"){
432
+               theType = 1
433
+            }
434
+           if(this.$route.query.weekTime == "thisWeek"){
435
+               theType = 2
436
+            }
437
+            if(this.$route.query.weekTime == "nextWeek"){
438
+               theType = 3
439
+            }
440
+           if(this.$route.query.weekTime == "nextTwoWeek"){
441
+               theType = 4
442
+            }
443
+            var partionStr = this.partition_id
444
+            var arr = this.zoneIdList.join(',')
445
+            var str = ""
446
+            if(partionStr == 0){
447
+                str = arr
448
+            }
449
+            if(partionStr != 0){
450
+                str = partionStr
451
+            }
452
+            const params = {
453
+                weekTime:theType,
454
+                patitionid:str,
455
+                schedule_type:this.schedule_type,
456
+            }
457
+            getSchedulesOne(params).then(response => {
458
+                if (response.data.state == 1) {
459
+                    this.weekTitle = response.data.data.weekTitle;
460
+                    this.weekDays = response.data.data.days;
461
+                    this.toDay = response.data.data.today;
462
+                    var theSchedules = response.data.data.schdules;
463
+                    var that = this;
464
+                    that.scheduleZone.forEach(function(zone, index) {
465
+                        
466
+                        that.scheduleZone[index].Mon_M = {
467
+                            mode_id: 0,
468
+                            mode_name: "",
469
+                            patient_id: 0,
470
+                            patient: ""
471
+                        };
472
+                        that.scheduleZone[index].Mon_A = {
473
+                            mode_id: 0,
474
+                            mode_name: "",
475
+                            patient_id: 0,
476
+                            patient: ""
477
+                        };
478
+                        that.scheduleZone[index].Mon_N = {
479
+                            mode_id: 0,
480
+                            mode_name: "",
481
+                            patient_id: 0,
482
+                            patient: ""
483
+                        };
484
+                        that.scheduleZone[index].Tue_M = {
485
+                            mode_id: 0,
486
+                            mode_name: "",
487
+                            patient_id: 0,
488
+                            patient: ""
489
+                        };
490
+                        that.scheduleZone[index].Tue_A = {
491
+                            mode_id: 0,
492
+                            mode_name: "",
493
+                            patient_id: 0,
494
+                            patient: ""
495
+                        };
496
+                        that.scheduleZone[index].Tue_N = {
497
+                            mode_id: 0,
498
+                            mode_name: "",
499
+                            patient_id: 0,
500
+                            patient: ""
501
+                        };
502
+                        that.scheduleZone[index].Wed_M = {
503
+                            mode_id: 0,
504
+                            mode_name: "",
505
+                            patient_id: 0,
506
+                            patient: ""
507
+                        };
508
+                        that.scheduleZone[index].Wed_A = {
509
+                            mode_id: 0,
510
+                            mode_name: "",
511
+                            patient_id: 0,
512
+                            patient: ""
513
+                        };
514
+                        that.scheduleZone[index].Wed_N = {
515
+                            mode_id: 0,
516
+                            mode_name: "",
517
+                            patient_id: 0,
518
+                            patient: ""
519
+                        };
520
+                        that.scheduleZone[index].Thurs_M = {
521
+                            mode_id: 0,
522
+                            mode_name: "",
523
+                            patient_id: 0,
524
+                            patient: ""
525
+                        };
526
+                        that.scheduleZone[index].Thurs_A = {
527
+                            mode_id: 0,
528
+                            mode_name: "",
529
+                            patient_id: 0,
530
+                            patient: ""
531
+                        };
532
+                        that.scheduleZone[index].Thurs_N = {
533
+                            mode_id: 0,
534
+                            mode_name: "",
535
+                            patient_id: 0,
536
+                            patient: ""
537
+                        };
538
+                        that.scheduleZone[index].Fri_M = {
539
+                            mode_id: 0,
540
+                            mode_name: "",
541
+                            patient_id: 0,
542
+                            patient: ""
543
+                        };
544
+                        that.scheduleZone[index].Fri_A = {
545
+                            mode_id: 0,
546
+                            mode_name: "",
547
+                            patient_id: 0,
548
+                            patient: ""
549
+                        };
550
+                        that.scheduleZone[index].Fri_N = {
551
+                            mode_id: 0,
552
+                            mode_name: "",
553
+                            patient_id: 0,
554
+                            patient: ""
555
+                        };
556
+                        that.scheduleZone[index].Sat_M = {
557
+                            mode_id: 0,
558
+                            mode_name: "",
559
+                            patient_id: 0,
560
+                            patient: ""
561
+                        };
562
+                        that.scheduleZone[index].Sat_A = {
563
+                            mode_id: 0,
564
+                            mode_name: "",
565
+                            patient_id: 0,
566
+                            patient: ""
567
+                        };
568
+                        that.scheduleZone[index].Sat_N = {
569
+                            mode_id: 0,
570
+                            mode_name: "",
571
+                            patient_id: 0,
572
+                            patient: ""
573
+                        };
574
+                        that.scheduleZone[index].Sun_A = {
575
+                            mode_id: 0,
576
+                            mode_name: "",
577
+                            patient_id: 0,
578
+                            patient: ""
579
+                        };
580
+                        that.scheduleZone[index].Sun_N = {
581
+                            mode_id: 0,
582
+                            mode_name: "",
583
+                            patient_id: 0,
584
+                            patient: ""
585
+                        };
586
+                        that.scheduleZone[index].Sun_M = {
587
+                            mode_id: 0,
588
+                            mode_name: "",
589
+                            patient_id: 0,
590
+                            patient: ""
591
+                        };
592
+                        that.scheduleZone[index].total = 0;
593
+                        
594
+                        if (response.data.data.schdules.length > 0) {
595
+                            theSchedules.forEach(function(schedule, sindex) {
596
+
597
+                                if (zone.jihao_id == schedule.bed_id) {
598
+                                    // if(zone.zone_id == schedule.partition_id && zone.jihao_id == schedule.bed_id) {
599
+                                    var weekPath = that.weekPath(
600
+                                        schedule.schedule_week,
601
+                                        schedule.schedule_type
602
+                                    );
603
+
604
+                                    if (weekPath.length == 2) {
605
+                                        // console.log(schedule);
606
+
607
+                                        var weekPathKey = weekPath[0] + "_" + weekPath[1];
608
+                                        that.scheduleZone[index][weekPathKey] = {
609
+                                        schedule_id: schedule.id,
610
+                                        mode_id: schedule.mode_id,
611
+                                        patient_id: schedule.patient_id,
612
+                                        patient: schedule.patient,
613
+                                        patient_contagions: schedule.patient_contagions,
614
+                                        mode_name:
615
+                                            typeof that.modeOptions[schedule.mode_id] ===
616
+                                            "undefined"
617
+                                            ? ""
618
+                                            : that.modeOptions[schedule.mode_id].name
619
+                                        };
620
+                                        that.scheduleZone[index].total += 1;
621
+                                        
622
+                                    }
623
+                                    
624
+                                }
625
+                                
626
+                            });
627
+                        }
628
+                       
629
+                    });
630
+                    var newArr= [{"area":"总数","cut":0,"Fri_A":{mode_id:0,mode_name:"",patient:"0",patient_id:"1"},"Fri_M":{mode_id:0,mode_name:"",patient:"0",patient_id:"1"},"Fri_N":{mode_id:0,mode_name:"",patient:"0",patient_id:"1"},"Mon_A":{mode_id:0,mode_name:"",patient:"",patient_id:"1"},"Mon_M":{mode_id:0,mode_name:"",patient:"0",patient_id:"1"},"Mon_N":{mode_id:0,mode_name:"",patient:"0",patient_id:"1"},"Sat_A":{mode_id:0,mode_name:"",patient:"0",patient_id:"1"},"Sat_M":{mode_id:0,mode_name:"",patient:"0",patient_id:"1"},"Sat_N":{mode_id:0,mode_name:"",patient:"0",patient_id:"1"},"Sun_A":{mode_id:0,mode_name:"",patient:"0",patient_id:"1"},"Sun_M":{mode_id:0,mode_name:"",patient:"0",patient_id:"1"},"Sun_N":{mode_id:0,mode_name:"",patient:"0",patient_id:"1"},"Thurs_A":{mode_id:0,mode_name:"",patient:"0",patient_id:"1"},"Thurs_M":{mode_id:0,mode_name:"",patient:"0",patient_id:"1"},"Thurs_N":{mode_id:0,mode_name:"",patient:"0",patient_id:"1"},"Tue_A":{mode_id:0,mode_name:"",patient:"0",patient_id:"1"},"Tue_M":{mode_id:0,mode_name:"",patient:"0",patient_id:"1"},"Tue_N":{mode_id:0,mode_name:"",patient:"0",patient_id:"1"},"Wed_A":{mode_id:0,mode_name:"",patient:"0",patient_id:"1"},"Wed_M":{mode_id:0,mode_name:"",patient:"0",patient_id:"1"},"Wed_N":{mode_id:0,mode_name:"",patient:"0",patient_id:"1"},"jihao_id":"","total":"","zone_id":"","zone_type":""}]
631
+                     
632
+                     
633
+                     for(let i=0;i<newArr.length;i++){
634
+                       for(let j=0;j<this.scheduleCountList.length;j++){
635
+                            newArr[i].cut = this.total
636
+                         //礼拜一上午
637
+                          if(this.scheduleCountList[j].schedule_week == 1 && this.scheduleCountList[j].schedule_type == 1){
638
+                            
639
+                              newArr[i].Mon_M.patient = this.scheduleCountList[j].Count
640
+                          } 
641
+                        //礼拜一下午
642
+                         if(this.scheduleCountList[j].schedule_week == 1 && this.scheduleCountList[j].schedule_type == 2){
643
+                           
644
+                              newArr[i].Mon_A.patient = this.scheduleCountList[j].Count
645
+                          } 
646
+
647
+                         //礼拜一晚上
648
+                         if(this.scheduleCountList[j].schedule_week == 1 && this.scheduleCountList[j].schedule_type == 3){
649
+                            
650
+                              newArr[i].Mon_N.patient = this.scheduleCountList[j].Count
651
+                          } 
652
+                         
653
+                        //礼拜二上午
654
+                         if(this.scheduleCountList[j].schedule_week == 2 && this.scheduleCountList[j].schedule_type == 1){
655
+                            
656
+                              newArr[i].Tue_M.patient = this.scheduleCountList[j].Count
657
+                          } 
658
+                         //礼拜二下午
659
+                         if(this.scheduleCountList[j].schedule_week == 2 && this.scheduleCountList[j].schedule_type == 2){
660
+                            
661
+                              newArr[i].Tue_A.patient = this.scheduleCountList[j].Count
662
+                          } 
663
+                        
664
+                         //礼拜二晚上
665
+                         if(this.scheduleCountList[j].schedule_week == 2 && this.scheduleCountList[j].schedule_type == 3){
666
+                            
667
+                              newArr[i].Tue_N.patient = this.scheduleCountList[j].Count
668
+                          } 
669
+
670
+                         //礼拜三上午
671
+                         if(this.scheduleCountList[j].schedule_week == 3 && this.scheduleCountList[j].schedule_type == 1){
672
+                            
673
+                              newArr[i].Wed_M.patient = this.scheduleCountList[j].Count
674
+                          } 
675
+
676
+                         //礼拜三下午
677
+                         if(this.scheduleCountList[j].schedule_week == 3 && this.scheduleCountList[j].schedule_type == 2){
678
+                            
679
+                              newArr[i].Wed_A.patient = this.scheduleCountList[j].Count
680
+                          }
681
+
682
+                         //礼拜三晚上
683
+                         if(this.scheduleCountList[j].schedule_week == 3 && this.scheduleCountList[j].schedule_type == 3){
684
+                            
685
+                              newArr[i].Wed_N.patient = this.scheduleCountList[j].Count
686
+                          }
687
+
688
+
689
+
690
+                        //礼拜四上午
691
+                         if(this.scheduleCountList[j].schedule_week == 4 && this.scheduleCountList[j].schedule_type == 1){
692
+                            
693
+                              newArr[i].Thurs_M.patient = this.scheduleCountList[j].Count
694
+                          } 
695
+
696
+                         //礼拜四下午
697
+                         if(this.scheduleCountList[j].schedule_week == 4 && this.scheduleCountList[j].schedule_type == 2){
698
+                            
699
+                              newArr[i].Thurs_A.patient = this.scheduleCountList[j].Count
700
+                          }
701
+
702
+                         //礼拜四晚上
703
+                         if(this.scheduleCountList[j].schedule_week == 4 && this.scheduleCountList[j].schedule_type == 3){
704
+                            
705
+                              newArr[i].Thurs_N.patient = this.scheduleCountList[j].Count
706
+                          }
707
+
708
+
709
+                        //礼拜五上午
710
+                         if(this.scheduleCountList[j].schedule_week == 5 && this.scheduleCountList[j].schedule_type == 1){
711
+                            
712
+                              newArr[i].Fri_M.patient = this.scheduleCountList[j].Count
713
+                          } 
714
+
715
+                         //礼拜五下午
716
+                         if(this.scheduleCountList[j].schedule_week == 5 && this.scheduleCountList[j].schedule_type == 2){
717
+                            
718
+                              newArr[i].Fri_A.patient = this.scheduleCountList[j].Count
719
+                          }
720
+
721
+                         //礼拜五晚上
722
+                         if(this.scheduleCountList[j].schedule_week == 5 && this.scheduleCountList[j].schedule_type == 3){
723
+                            
724
+                              newArr[i].Fri_N.patient = this.scheduleCountList[j].Count
725
+                          }
726
+
727
+
728
+                        //礼拜六上午
729
+                         if(this.scheduleCountList[j].schedule_week == 6 && this.scheduleCountList[j].schedule_type == 1){
730
+                            
731
+                              newArr[i].Sat_M.patient = this.scheduleCountList[j].Count
732
+                          } 
733
+
734
+                         //礼拜六下午
735
+                         if(this.scheduleCountList[j].schedule_week == 6 && this.scheduleCountList[j].schedule_type == 2){
736
+                            
737
+                              newArr[i].Sat_A.patient = this.scheduleCountList[j].Count
738
+                          }
739
+
740
+                         //礼拜六晚上
741
+                         if(this.scheduleCountList[j].schedule_week == 6 && this.scheduleCountList[j].schedule_type == 3){
742
+                            
743
+                              newArr[i].Sat_N.patient = this.scheduleCountList[j].Count
744
+                          }
745
+                         
746
+
747
+                          //礼拜日上午
748
+                         if(this.scheduleCountList[j].schedule_week == 7 && this.scheduleCountList[j].schedule_type == 1){
749
+                            
750
+                              newArr[i].Sun_M.patient = this.scheduleCountList[j].Count
751
+                          } 
752
+
753
+                         //礼拜日下午
754
+                         if(this.scheduleCountList[j].schedule_week == 7 && this.scheduleCountList[j].schedule_type == 2){
755
+                            
756
+                              newArr[i].Sun_A.patient = this.scheduleCountList[j].Count
757
+                          }
758
+
759
+                         //礼拜日晚上
760
+                         if(this.scheduleCountList[j].schedule_week == 7 && this.scheduleCountList[j].schedule_type == 3){
761
+                            
762
+                              newArr[i].Sun_N.patient = this.scheduleCountList[j].Count
763
+                          }
764
+
765
+
766
+                       }
767
+                     }
768
+                    console.log("newArr222222222",newArr)
769
+                    that.scheduleZone.push(...newArr)
770
+                    console.log('总数据77777777777',that.scheduleZone)
771
+                    
772
+                } else {
773
+                    this.$message.error("网络错误");
774
+                    return false;
775
+                }
776
+            });
777
+        },
778
+        weekPath(week, schedule_type) {
779
+            var weekArr = {
780
+                1: "Mon",
781
+                2: "Tue",
782
+                3: "Wed",
783
+                4: "Thurs",
784
+                5: "Fri",
785
+                6: "Sat",
786
+                7: "Sun"
787
+            };
788
+            var typeArr = { 1: "M", 2: "A", 3: "N" };
789
+            if (
790
+                typeof weekArr[week] === "undefined" ||
791
+                typeof typeArr[schedule_type] === "undefined"
792
+            ) {
793
+                return [];
794
+            }
795
+            return [weekArr[week], typeArr[schedule_type]];
796
+        },
797
+        printAction: function() {
798
+            const style = '@media print {#scheduleTable{font-size:16px;} .scheduleTable tr td{text-align: center;padding: 5px;}}'
799
+
800
+            printJS({
801
+            printable: 'scheduleTable',
802
+            type: 'html',
803
+            documentTitle: '  ',
804
+            style: style,
805
+            scanStyles: false
806
+            })
807
+        },
808
+        getPatientSheduleCount(){
809
+            var theType = 2;
810
+            if(this.$route.query.weekTime == "lastWeek"){
811
+               theType = 1
812
+            }
813
+           if(this.$route.query.weekTime == "thisWeek"){
814
+               theType = 2
815
+            }
816
+            if(this.$route.query.weekTime == "nextWeek"){
817
+               theType = 3
818
+            }
819
+           if(this.$route.query.weekTime == "nextTwoWeek"){
820
+               theType = 4
821
+            }
822
+           var partionStr = this.partition_id
823
+           console.log("partionStr",partionStr)
824
+            var arr = this.zoneIdList.join(',')
825
+            var str = ""
826
+            if(partionStr == 0){
827
+                str = arr
828
+            }
829
+            if(partionStr != 0){
830
+                str = partionStr
831
+            }
832
+            var params = {
833
+             weekTime:theType,
834
+             partition_id:str,
835
+
836
+            }
837
+           getPatientSheduleCount(params).then(response=>{
838
+               if(response.data.state == 1){
839
+                  var list = response.data.data.list
840
+                  console.log("list22222",list)
841
+                  
842
+                  this.scheduleCountList = list
843
+                  var total = response.data.data.total
844
+                  console.log("totalw222",total)
845
+                  this.total = total
846
+               }
847
+           }) 
848
+        },
849
+        getSolutionSchedule(){
850
+          getSolutionSchedule().then(response=>{
851
+             if(response.data.state ==1){
852
+               var solution = response.data.data.solution
853
+               console.log("solution",solution)
854
+               this.solutionList = solution
855
+             }  
856
+          })  
857
+        }
858
+    }
859
+}
860
+</script>
861
+
862
+
863
+<style lang="scss">
864
+td{
865
+    text-align: center;
866
+    padding: 5px;
867
+}
868
+</style>