Pārlūkot izejas kodu

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

csx 3 gadus atpakaļ
vecāks
revīzija
50e56e9158

+ 8 - 10
src/api/his/his.js Parādīt failu

@@ -41,7 +41,7 @@ export function getDoctors() {
41 41
 }
42 42
 
43 43
 export function createHisPrescription(data, params) {
44
-  console.log('param2323232323233223233223332322323', params)
44
+  console.log('param2323232323233223233223332322323', data, params)
45 45
   return request({
46 46
     url: '/api/hisprescription/create',
47 47
     method: 'post',
@@ -533,10 +533,6 @@ export function GetLabelInfo(params) {
533 533
   })
534 534
 }
535 535
 
536
-
537
-
538
-
539
-
540 536
 export function createFaPiao(params) {
541 537
   return request({
542 538
     url: '/api/fapiao/create',
@@ -577,7 +573,6 @@ export function GetFaPiao(params) {
577 573
   })
578 574
 }
579 575
 
580
-
581 576
 export function postFaPiaoIsUse(params) {
582 577
   return request({
583 578
     url: '/api/fapiao/is_use',
@@ -586,8 +581,6 @@ export function postFaPiaoIsUse(params) {
586 581
   })
587 582
 }
588 583
 
589
-
590
-
591 584
 export function deleteNCDSRecord(params) {
592 585
   return request({
593 586
     url: '/api/psn/ncds/delete',
@@ -596,7 +589,6 @@ export function deleteNCDSRecord(params) {
596 589
   })
597 590
 }
598 591
 
599
-
600 592
 export function getBaiLinRecord(params) {
601 593
   return request({
602 594
     url: '/api/bailin/export',
@@ -605,5 +597,11 @@ export function getBaiLinRecord(params) {
605 597
   })
606 598
 }
607 599
 
608
-
600
+export function getHisDoctorAdviceInfo(id, params) {
601
+  return request({
602
+    url: '/api/his/gethistdoctoradviceinfo?id=' + id,
603
+    method: 'get',
604
+    params: params
605
+  })
606
+}
609 607
 

+ 18 - 0
src/xt_pages/dialysis/batch_print/batch_print_order_fortyOne.vue Parādīt failu

@@ -424,6 +424,24 @@
424 424
                                 <div class="under_line" style="width: 150px;text-align: center;font-weight:600;" v-if="record.prescription.mode_id == 23">
425 425
                                 血浆胆红素吸附
426 426
                                 </div>
427
+                                <div class="under_line" style="width: 70px;text-align: center;font-weight:600;" v-if="record.prescription.mode_id == 24">
428
+                                  I-HDF
429
+                                </div>
430
+                                <div class="under_line" style="width: 70px;text-align: center;font-weight:600;" v-if="record.prescription.mode_id == 25">
431
+                                  HD高通
432
+                                </div>
433
+                                <div class="under_line" style="width: 70px;text-align: center;font-weight:600;" v-if="record.prescription.mode_id == 26">
434
+                                  CVVH
435
+                                </div>
436
+                                <div class="under_line" style="width: 70px;text-align: center;font-weight:600;" v-if="record.prescription.mode_id == 27">
437
+                                  CVVHD
438
+                                </div>
439
+                                <div class="under_line" style="width: 70px;text-align: center;font-weight:600;" v-if="record.prescription.mode_id == 28">
440
+                                  CVVHDF
441
+                                </div>
442
+                                <div class="under_line" style="width: 70px;text-align: center;font-weight:600;" v-if="record.prescription.mode_id == 29">
443
+                                  PE
444
+                                </div>
427 445
                             </div>
428 446
                             <div class="inline_block" style="flex:1;">
429 447
                                 置换方式:

+ 19 - 4
src/xt_pages/dialysis/details/dialog/monitor_dialog.vue Parādīt failu

@@ -303,12 +303,22 @@
303 303
               {{ scope.row.replacement_rate ? scope.row.replacement_rate : "" }}
304 304
             </template>
305 305
           </el-table-column>
306
+          <el-table-column
307
+            prop="displacement_quantity"
308
+            align="center"
309
+            label="置换量(ml/h)"
310
+            width="100"
311
+            v-if=" isShow('置换量') && (template_id == 43)" >
312
+            <template slot-scope="scope">
313
+              {{ scope.row.displacement_quantity ? scope.row.displacement_quantity : "" }}
314
+            </template>
315
+          </el-table-column>
306 316
           <el-table-column
307 317
             prop="displacement_quantity"
308 318
             align="center"
309 319
             label="置换量(ml)"
310 320
             width="100"
311
-            v-if=" isShow('置换量') && ((template_id == 6 && org_id != 9919 && org_id!=10191) || org_id == 9779 || template_id == 11 || template_id == 20 || template_id == 26 || template_id == 29)" >
321
+            v-if=" isShow('置换量') && ((template_id == 6 && org_id != 9919 && org_id!=10191 && template_id!=43) || org_id == 9779 || template_id == 11 || template_id == 20 || template_id == 26 || template_id == 29)" >
312 322
             <template slot-scope="scope">
313 323
               {{ scope.row.displacement_quantity ? scope.row.displacement_quantity : "" }}
314 324
             </template>
@@ -319,7 +329,7 @@
319 329
             align="center"
320 330
             label="置换量(L)"
321 331
             width="100"
322
-            v-if=" isShow('置换量') &&  ((template_id != 6 || org_id == 9919 || org_id == 10191) && template_id != 9779 && template_id != 11 && template_id != 20 && template_id != 26 && template_id != 29)" >
332
+            v-if=" isShow('置换量') &&  ((template_id != 6 || org_id == 9919 || org_id == 10191) && template_id != 9779 && template_id != 11 && template_id != 20 && template_id != 26 && template_id != 29&& template_id != 43)" >
323 333
             <template slot-scope="scope">
324 334
               {{ scope.row.displacement_quantity ? scope.row.displacement_quantity : "" }}
325 335
             </template>
@@ -696,12 +706,17 @@
696 706
               <el-input v-model="form.replacement_rate"></el-input>
697 707
             </el-form-item>
698 708
           </el-col>
699
-          <el-col :span="8" v-if=" isShow('置换量') &&  ((template_id != 6 || org_id == 9919 || org_id == 10191) && org_id != 9779 && template_id != 11 && template_id != 20 && template_id != 26 && template_id != 29)">
709
+           <el-col :span="8" v-if=" isShow('置换量') &&  (template_id == 43)">
710
+            <el-form-item label="置换量(ml/h):">
711
+              <el-input v-model="form.displacement_quantity"></el-input>
712
+            </el-form-item>
713
+          </el-col>
714
+          <el-col :span="8" v-if=" isShow('置换量') &&  ((template_id != 6 || org_id == 9919 || org_id == 10191) && org_id != 9779 && template_id != 11 && template_id != 20 && template_id != 26 && template_id != 29 && template_id!=43)">
700 715
             <el-form-item label="置换量(L):">
701 716
               <el-input v-model="form.displacement_quantity"></el-input>
702 717
             </el-form-item>
703 718
           </el-col>
704
-          <el-col :span="8" v-if=" isShow('置换量') && ((template_id == 6 && org_id != 9919 && org_id!=10191) || org_id == 9779 || template_id == 11 || template_id == 20 || template_id == 26 || template_id == 29)">
719
+          <el-col :span="8" v-if=" isShow('置换量') && ((template_id == 6 && org_id != 9919 && org_id!=10191 && template_id!=43) || org_id == 9779 || template_id == 11 || template_id == 20 || template_id == 26 || template_id == 29)">
705 720
             <el-form-item label="置换量(ml):">
706 721
               <el-input v-model="form.displacement_quantity"></el-input>
707 722
             </el-form-item>

+ 1 - 0
src/xt_pages/dialysis/details/dialysisMonitoring.vue Parādīt failu

@@ -22,6 +22,7 @@
22 22
           <th v-if="isShow('透析液温度')" width="92px">透析液温度(℃)</th>
23 23
           <th v-if=" isShow('置换率') && (template_id == 6 || template_id == 10 || template_id == 11 || template_id == 20 || template_id == 26 || template_id == 29) " width="92px" > 置换率(ml/min) </th>
24 24
           <th v-if=" isShow('置换率') && template_id != 6 && template_id != 10 && template_id != 11 && template_id != 20 && template_id != 26 && template_id != 29" width="92px" > 置换率(L/h)  </th>
25
+          <th v-if=" isShow('置换量') && (template_id == 43)" width="92px"> 置换量(ml/h)  </th>
25 26
           <th v-if=" isShow('置换量') && ((template_id == 6 && org_id != 9919 && org_id !=10191) || org_id == 9779 || template_id == 11 || template_id == 20 || template_id == 26 || template_id == 29)" width="92px"  > 置换量(ml)  </th>
26 27
           <th v-if=" isShow('置换量') && ((template_id != 6 || org_id == 9919 || org_id == 10191) && org_id != 9779 && template_id != 11 && template_id != 20 && template_id != 26 && template_id != 29)" width="92px" > 置换量(L) </th>
27 28
           <th v-if=" isShow('SpO₂') && template_id != 6 && template_id != 10 && template_id != 11  " width="92px" > SpO₂(%) </th>

+ 19 - 1
src/xt_pages/dialysis/template/DialysisPrintOrderFortyOne.vue Parādīt failu

@@ -403,6 +403,24 @@
403 403
                       <div class="under_line" style="width: 150px;text-align: center;font-weight:600;" v-if="prescription.mode_id == 23">
404 404
                         血浆胆红素吸附
405 405
                       </div>
406
+                      <div class="under_line" style="width: 70px;text-align: center;font-weight:600;" v-if="prescription.mode_id == 24">
407
+                        I-HDF
408
+                      </div>
409
+                      <div class="under_line" style="width: 70px;text-align: center;font-weight:600;" v-if="prescription.mode_id == 25">
410
+                        HD高通
411
+                      </div>
412
+                      <div class="under_line" style="width: 70px;text-align: center;font-weight:600;" v-if="prescription.mode_id == 26">
413
+                        CVVH
414
+                      </div>
415
+                      <div class="under_line" style="width: 70px;text-align: center;font-weight:600;" v-if="prescription.mode_id == 27">
416
+                        CVVHD
417
+                      </div>
418
+                      <div class="under_line" style="width: 70px;text-align: center;font-weight:600;" v-if="prescription.mode_id == 28">
419
+                        CVVHDF
420
+                      </div>
421
+                      <div class="under_line" style="width: 70px;text-align: center;font-weight:600;" v-if="prescription.mode_id == 29">
422
+                        PE
423
+                      </div>
406 424
                     </div>
407 425
                     <div class="inline_block" style="flex:1;">
408 426
                       置换方式:
@@ -445,7 +463,7 @@
445 463
                         {{ predialysis.machine_type ? predialysis.machine_type : '' }}
446 464
                       </div>
447 465
                     </div>
448
-                    <div class="inline_block">
466
+                    <div class="inline_block" style="flex:1">
449 467
                       机号:
450 468
                       <div class="under_line" style="width: 60px;text-align: center;">
451 469
                         {{ dialysisOrder && dialysisOrder.DeviceNumber && dialysisOrder.DeviceNumber.number.length > 0 ? dialysisOrder.DeviceNumber.number : patientInfo.DialysisSchedule.device_number.number }}

+ 1 - 1
src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue Parādīt failu

@@ -315,7 +315,7 @@
315 315
                       <div class="under_line" style="width: 150px;text-align: center;font-weight:600;" v-if="prescription.mode_id == 22">
316 316
                         血浆胆红素吸附+HDF
317 317
                       </div>
318
-                      <div class="under_line" style="width: 150px;text-align: center;font-weight:600;" v-if="prescription.mode_id == 23">
318
+                      <div class="under_line" style="bwidth: 150px;text-align: center;font-weight:600;" v-if="prescription.mode_id == 23">
319 319
                         血浆胆红素吸附
320 320
                       </div>
321 321
                       <div class="under_line" style="width:100px;text-align: center;font-weight:600;" v-if="prescription.mode_id == 29">

+ 4 - 4
src/xt_pages/hospitalStation/components/deskPrescription.vue Parādīt failu

@@ -288,7 +288,7 @@
288 288
                     <el-table-column label="库存" width="60">
289 289
                       <template slot-scope="scope">
290 290
                                           <span
291
-                                              v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 10138 || org_id == 3877 || org_id == 10028 || org_id == 10243 || org_id == 10088 || org_id == 10188 || org_id == 10245 || org_id == 9919 || org_id ==10106 || org_id == 9504 || org_id ==10215 || org_id == 10188 || org_id == 10265 || org_id == 10164 || org_id == 9956 || org_id == 10191 ">
291
+                                              v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 10138 || org_id == 3877 || org_id == 10028 || org_id == 10243 || org_id == 10088 || org_id == 10188 || org_id == 10245 || org_id == 9919 || org_id ==10106 || org_id == 9504 || org_id ==10215 || org_id == 10188 || org_id == 10265 || org_id == 10164 || org_id == 9956 || org_id == 10191 || org_id == 10278">
292 292
                                               <span
293 293
                                                   v-if="scope.row.count/scope.row.min_number>0">{{ Math.floor(scope.row.count / scope.row.min_number) }}{{ scope.row.max_unit }}</span>
294 294
                                               <span
@@ -387,7 +387,7 @@
387 387
                     <el-table-column label="库存" width="40">
388 388
                       <template slot-scope="scope">
389 389
                                                 <span
390
-                                                    v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 10138 || org_id == 3877 || org_id == 10028 || org_id == 10243 || org_id == 10088 || org_id == 10245 || org_id == 9919 || org_id ==10106 || org_id == 9504 || org_id ==10215 || org_id == 10188 || org_id == 10265 || org_id == 10164 || org_id == 9956 || org_id == 10191">
390
+                                                    v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 10138 || org_id == 3877 || org_id == 10028 || org_id == 10243 || org_id == 10088 || org_id == 10245 || org_id == 9919 || org_id ==10106 || org_id == 9504 || org_id ==10215 || org_id == 10188 || org_id == 10265 || org_id == 10164 || org_id == 9956 || org_id == 10191 || org_id == 10278">
391 391
                                                     {{ scope.row.stock_count }}
392 392
                                                 </span>
393 393
                         <span v-else> {{ scope.row.total }}</span>
@@ -2666,7 +2666,7 @@ export default {
2666 2666
       this.$refs.additionalCharges.show()
2667 2667
     },
2668 2668
     selectDrugs(selection, row) {
2669
-      if (this.org_id == 10138 || this.org_id == 9671 || this.org_id == 9675 || this.org_id == 4 || this.org_id == 3877 || this.org_id == 10028 || this.org_id == 10243 || this.org_id == 10088 || this.org_id == 10245 || this.org_id == 9919 || this.org_id == 10106 || this.org_id == 9504 || this.org_id == 10215 || this.org_id == 10088 || this.org_id == 10188 || this.org_id == 10265 || this.org_id == 10164 || this.org_id == 9956 || this.org_id == 10191) {
2669
+      if (this.org_id == 10138 || this.org_id == 9671 || this.org_id == 9675 || this.org_id == 4 || this.org_id == 3877 || this.org_id == 10028 || this.org_id == 10243 || this.org_id == 10088 || this.org_id == 10245 || this.org_id == 9919 || this.org_id == 10106 || this.org_id == 9504 || this.org_id == 10215 || this.org_id == 10088 || this.org_id == 10188 || this.org_id == 10265 || this.org_id == 10164 || this.org_id == 9956 || this.org_id == 10191 || this.org_id == 10278) {
2670 2670
         if (row.count <= 0) {
2671 2671
           if (selection) {
2672 2672
             selection.forEach(row => {
@@ -2940,7 +2940,7 @@ export default {
2940 2940
     },
2941 2941
     selectChange(selection, row) {
2942 2942
       console.log('row', row)
2943
-      if (this.org_id == 10138 || this.org_id == 9671 || this.org_id == 9675 || this.org_id == 4 || this.org_id == 3877 || this.org_id == 10028 || this.org_id == 10243 || this.org_id == 10088 || this.org_id == 10245 || this.org_id == 9919 || this.org_id == 10106 || this.org_id == 9504 || this.org_id == 10215 || this.org_id == 10088 || this.org_id == 10265 || this.org_id == 10164 || this.org_id == 10188  || this.org_id == 9956 || this.org_id == 10191) {
2943
+      if (this.org_id == 10138 || this.org_id == 9671 || this.org_id == 9675 || this.org_id == 4 || this.org_id == 3877 || this.org_id == 10028 || this.org_id == 10243 || this.org_id == 10088 || this.org_id == 10245 || this.org_id == 9919 || this.org_id == 10106 || this.org_id == 9504 || this.org_id == 10215 || this.org_id == 10088 || this.org_id == 10265 || this.org_id == 10164 || this.org_id == 10188  || this.org_id == 9956 || this.org_id == 10191 || this.org_id == 10278) {
2944 2944
         if (row.stock_count <= 0) {
2945 2945
           if (row.type == 3) {
2946 2946
             if (selection) {

+ 4 - 6
src/xt_pages/hospitalStation/components/prescriptionTable.vue Parādīt failu

@@ -125,7 +125,9 @@
125 125
     <el-table v-if="activeType == 2" :data="prescription.project" border style="width: 99%;"
126 126
               :row-style="{ color: '#303133' }"
127 127
               :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
128
-      <el-table-column align="center" type="index" width="40" label="序号"></el-table-column>
128
+      <el-table-column align="center" type="index" width="40" label="序号">
129
+        <template slot-scope="scope">{{scope.$index+1}}</template>
130
+      </el-table-column>
129 131
       <el-table-column align="center" prop="project_name" label="名称">
130 132
         <template slot-scope="scope"><span :title="scope.row.project_name">{{ scope.row.project_name }}</span>
131 133
         </template>
@@ -442,18 +444,14 @@
442 444
       getAllChange(scope) {
443 445
         if (scope.row.drug.min_unit == scope.row.single_dose_unit) {
444 446
           if (scope.row.prescribing_number_unit == scope.row.drug.min_unit) {
445
-            console.log(1)
446 447
             scope.row.prescribing_number = scope.row.single_dose * (scope.row.execution_frequency ? this.getNum(scope.row.execution_frequency) : 1) * (scope.row.day ? scope.row.day : 1)
447 448
           } else {
448
-            console.log(12)
449 449
             scope.row.prescribing_number = Math.ceil((scope.row.single_dose * (scope.row.execution_frequency ? this.getNum(scope.row.execution_frequency) : 1)) * (scope.row.day ? scope.row.day : 1) / scope.row.drug.min_number)
450 450
           }
451 451
         } else {
452 452
           if (scope.row.prescribing_number_unit == scope.row.drug.min_unit) {
453
-            console.log(123)
454 453
             scope.row.prescribing_number = Math.ceil((scope.row.single_dose * (scope.row.execution_frequency ? this.getNum(scope.row.execution_frequency) : 1) * (scope.row.day ? scope.row.day : 1)) / scope.row.drug.dose)
455 454
           } else {
456
-            console.log(1234)
457 455
             scope.row.prescribing_number = Math.ceil((scope.row.single_dose * (scope.row.execution_frequency ? this.getNum(scope.row.execution_frequency) : 1) * (scope.row.day ? scope.row.day : 1)) / scope.row.drug.dose / scope.row.drug.min_number)
458 456
           }
459 457
         }
@@ -574,7 +572,7 @@
574 572
 
575 573
         },
576 574
         deep: true
577
-      }
575
+      },
578 576
       // "prescription.project":{
579 577
       //   handler(newVal,oldVal){
580 578
       //     newVal.map((item,index) => {

+ 2 - 2
src/xt_pages/outpatientCharges/newStatementPrintTwo.vue Parādīt failu

@@ -15,7 +15,7 @@
15 15
         <div class='dialysisPage' style="padding-top:40px;">
16 16
             <!--<printOne :info="info"></printOne>-->
17 17
 
18
-            <print-one v-if="org_id != 10138" :info="info"></print-one>
18
+            <print-one v-if="org_id != 10138 && org_id != 10278" :info="info"></print-one>
19 19
             <print-two v-else :info="info" :paramsObj="paramsObj" :balanceAccounts="balanceAccounts"></print-two>
20 20
         </div>
21 21
     </div>
@@ -82,7 +82,7 @@
82 82
         //   scanStyles: false
83 83
         // });
84 84
 
85
-        if(this.$store.getters.xt_user.org_id == 10138){
85
+        if(this.$store.getters.xt_user.org_id == 10138 || this.$store.getters.xt_user.org_id == 10278){
86 86
           setTimeout(() => {
87 87
             const style =
88 88
             '@media print {#prescription-print{font-size:14px;border:1px solid white}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}table td {padding: 10px 5px;font-size:16px;}@media print {html {zoom: 47%;}}}';

+ 2 - 2
src/xt_pages/outpatientCharges/statementPrint.vue Parādīt failu

@@ -13,9 +13,9 @@
13 13
       </template>
14 14
 
15 15
       <div class='dialysisPage' style="padding-top:40px;">
16
-        <div v-if="org_id == 9990 || org_id == 10138 || org_id == 9504 || org_id == 10028 || org_id == 0 || org_id == 4">
16
+        <div v-if="org_id == 9990 || org_id == 10138 || org_id == 9504 || org_id == 10028 || org_id == 0 || org_id == 4 || org_id == 10278">
17 17
           <printTwo :info="info" v-if="org_id == 9990"></printTwo>
18
-          <printThree :info="info" :paramsObj="paramsObj" :balanceAccounts="balanceAccounts" v-if="org_id == 10138 || org_id == 0 || org_id == 4"></printThree>
18
+          <printThree :info="info" :paramsObj="paramsObj" :balanceAccounts="balanceAccounts" v-if="org_id == 10138 || org_id == 0 || org_id == 4 || org_id == 10278"></printThree>
19 19
           <printFour v-if="org_id == 9504 || org_id == 10028" :info="info" :paramsObj="paramsObj" :balanceAccounts="balanceAccounts"></printFour>
20 20
         </div>
21 21
         <printOne :info="info" v-else></printOne>

+ 1 - 1
src/xt_pages/outpatientCharges/treatTemplate/printOne.vue Parādīt failu

@@ -1,7 +1,7 @@
1 1
 <template>
2 2
     <div>
3 3
         <div id='prescription-print' class="prescription-print">
4
-            <div v-if=" this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10028 || this.$store.getters.xt_user.org_id == 10138">
4
+            <div v-if=" this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10028 || this.$store.getters.xt_user.org_id == 10138 || this.$store.getters.xt_user.org_id == 10278">
5 5
                 <div class="printTitle">{{orgname}}&nbsp;&nbsp;医药费收据及收费项目清单</div>
6 6
                 <div class="infoMain">
7 7
                     <div class="infoP">医院(药店)编号:{{org_code}}</div>

+ 2 - 2
src/xt_pages/outpatientDoctorStation/checkTemplate/printOne.vue Parādīt failu

@@ -1,7 +1,7 @@
1 1
 <template>
2 2
     <div>
3 3
         <div id='prescription-print3' class="prescription-print">
4
-            <img style="width:100%;height:80px" v-if="org_id == 10138" src="https://kuyi.shengws.com/bailin/bltotle.jpg" alt="">
4
+            <img style="width:100%;height:80px" v-if="org_id == 10138 || org_id == 10278" src="https://kuyi.shengws.com/bailin/bltotle.jpg" alt="">
5 5
             <div class="printTitle">检验申请单</div>
6 6
 
7 7
             <div style="border:1px solid #000;">
@@ -41,7 +41,7 @@
41 41
                     <div>医生签字:{{ doctor ? doctor : '' }}</div>
42 42
                 </div>
43 43
             </div>   
44
-            <img style="width:100%;" v-if="org_id == 10138" src="https://kuyi.shengws.com/bailin/blend.jpg" alt="">
44
+            <img style="width:100%;" v-if="org_id == 10138 || org_id == 10278" src="https://kuyi.shengws.com/bailin/blend.jpg" alt="">
45 45
         </div>
46 46
     </div>
47 47
 

+ 4 - 4
src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue Parādīt failu

@@ -286,7 +286,7 @@
286 286
                                         </el-table-column>
287 287
                                         <el-table-column label="库存" width="60">
288 288
                                             <template slot-scope="scope">
289
-                                              <span v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 10138 || org_id == 3877 || org_id == 10028 || org_id == 10243 || org_id == 10088 || org_id == 10245 || org_id == 9919 || org_id == 10106 || org_id == 9504 || org_id ==10215 || org_id == 10188 || org_id == 10265 || org_id == 10164 || org_id ==9956 || org_id == 10188 || org_id == 10191 ">
289
+                                              <span v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 10138 || org_id == 3877 || org_id == 10028 || org_id == 10243 || org_id == 10088 || org_id == 10245 || org_id == 9919 || org_id == 10106 || org_id == 9504 || org_id ==10215 || org_id == 10188 || org_id == 10265 || org_id == 10164 || org_id ==9956 || org_id == 10188 || org_id == 10191 || org_id == 10278">
290 290
                                                <span v-if="scope.row.count/scope.row.min_number>0">{{Math.floor(scope.row.count/scope.row.min_number)}}{{scope.row.max_unit}}</span>
291 291
                                                <span v-if="scope.row.count%scope.row.min_number>0"> {{scope.row.count%scope.row.min_number}}{{scope.row.min_unit}}</span>
292 292
                                               </span>
@@ -383,7 +383,7 @@
383 383
                                         </el-table-column>
384 384
                                         <el-table-column label="库存" width="40">
385 385
                                             <template slot-scope="scope">
386
-                                              <span v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 10138 || org_id == 3877 || org_id == 10028 || org_id == 10243 || org_id == 10088 || org_id == 10245 || org_id == 9919 || org_id == 10106 || org_id == 9504 || org_id ==10215 || org_id == 10188 || org_id == 10265 || org_id == 10164 || org_id == 9956 || org_id == 10188 || org_id == 10191">
386
+                                              <span v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 10138 || org_id == 3877 || org_id == 10028 || org_id == 10243 || org_id == 10088 || org_id == 10245 || org_id == 9919 || org_id == 10106 || org_id == 9504 || org_id ==10215 || org_id == 10188 || org_id == 10265 || org_id == 10164 || org_id == 9956 || org_id == 10188 || org_id == 10191 || org_id == 10278">
387 387
                                                    {{scope.row.stock_count}}
388 388
                                               </span>
389 389
                                               <span v-else> {{ scope.row.total }}</span>
@@ -2661,7 +2661,7 @@
2661 2661
       selectDrugs(selection, row) {
2662 2662
         console.log('selection', selection)
2663 2663
         console.log('row', row)
2664
-        if(this.org_id == 10138 || this.org_id == 9671 || this.org_id == 9675 || this.org_id == 4 || this.org_id == 3877 || this.org_id == 10028 || this.org_id == 10243 || this.org_id == 10188 || this.org_id == 10245 || this.org_id == 9919 || this.org_id == 10106 || this.org_id == 9504 || this.org_id ==10215 || this.org_id == 10188 || this.org_id == 10265 || this.org_id == 10164 || this.org_id == 9956 || this.org_id == 10188 || this.org_id == 10191){
2664
+        if(this.org_id == 10138 || this.org_id == 9671 || this.org_id == 9675 || this.org_id == 4 || this.org_id == 3877 || this.org_id == 10028 || this.org_id == 10243 || this.org_id == 10188 || this.org_id == 10245 || this.org_id == 9919 || this.org_id == 10106 || this.org_id == 9504 || this.org_id ==10215 || this.org_id == 10188 || this.org_id == 10265 || this.org_id == 10164 || this.org_id == 9956 || this.org_id == 10188 || this.org_id == 10191 || this.org_id == 10278){
2665 2665
             if (row.count <= 0) {
2666 2666
               if (selection) {
2667 2667
                 selection.forEach(row => {
@@ -2936,7 +2936,7 @@
2936 2936
       },
2937 2937
       selectChange(selection, row) {
2938 2938
         console.log('row', row)
2939
-        if(this.org_id == 10138 || this.org_id == 9671 || this.org_id == 9675 || this.org_id == 4 || this.org_id ==3877 || this.org_id == 10028 || this.org_id == 10243 || this.org_id == 10188 || this.org_id ==10245 || this.org_id == 9919  || this.org_id == 10106 || this.org_id == 9504 || this.org_id ==10215 ||  this.org_id == 10188 || this.org_id == 10265 || this.org_id == 10164 || this.org_id == 9956 || this.org_id == 10188 || this.org_id == 10191){
2939
+        if(this.org_id == 10138 || this.org_id == 9671 || this.org_id == 9675 || this.org_id == 4 || this.org_id ==3877 || this.org_id == 10028 || this.org_id == 10243 || this.org_id == 10188 || this.org_id ==10245 || this.org_id == 9919  || this.org_id == 10106 || this.org_id == 9504 || this.org_id ==10215 ||  this.org_id == 10188 || this.org_id == 10265 || this.org_id == 10164 || this.org_id == 9956 || this.org_id == 10188 || this.org_id == 10191 || this.org_id == 10278){
2940 2940
            if (row.stock_count <= 0) {
2941 2941
             if (row.type == 3) {
2942 2942
               if (selection) {

+ 59 - 5
src/xt_pages/outpatientDoctorStation/components/prescriptionTable.vue Parādīt failu

@@ -210,7 +210,7 @@
210 210
 
211 211
 <script>
212 212
   import { getDictionaryDataConfig } from '@/utils/data'
213
-  import { delHisAddition, delHisAdvice, delHisProject, getInitData } from '@/api/his/his'
213
+  import { delHisAddition, delHisAdvice, delHisProject, getInitData,getHisDoctorAdviceInfo } from '@/api/his/his'
214 214
 
215 215
   export default {
216 216
     props: {
@@ -225,7 +225,9 @@
225 225
             advices: [],
226 226
             project: [],
227 227
             drugways: [],
228
-            efs: []
228
+            efs: [],
229
+            drugList:[],
230
+            adviceList:{}
229 231
           }
230 232
         }
231 233
       }
@@ -316,6 +318,7 @@
316 318
           } else {
317 319
             this.drugways = response.data.data.drugways
318 320
             this.efs = response.data.data.efs
321
+            this.drugList = response.data.data.drugs
319 322
           }
320 323
         })
321 324
 
@@ -382,7 +385,7 @@
382 385
       getGroup(id) {
383 386
         var name = ''
384 387
         var statistics_category = getDictionaryDataConfig('system', 'statistics_category')
385
-        console.log('2235', statistics_category)
388
+        // console.log('2235', statistics_category)
386 389
         for (let i = 0; i < statistics_category.length; i++) {
387 390
           if (id == statistics_category[i].id) {
388 391
             name = statistics_category[i].name
@@ -429,7 +432,7 @@
429 432
       getAllChange(scope) {
430 433
         if (scope.row.drug.min_unit == scope.row.single_dose_unit) {
431 434
           if (scope.row.prescribing_number_unit == scope.row.drug.min_unit) {
432
-            console.log(1)
435
+            // console.log(1)
433 436
             scope.row.prescribing_number = scope.row.single_dose * (scope.row.execution_frequency ? this.getNum(scope.row.execution_frequency) : 1) * (scope.row.day ? scope.row.day : 1)
434 437
           } else {
435 438
             console.log(12)
@@ -492,6 +495,56 @@
492 495
         }
493 496
       },
494 497
       changePrescribingNumber(scope) {
498
+        //  var max_number = 0 
499
+        //  if(scope.row.prescribing_number_unit == scope.row.drug.max_unit){
500
+        //     max_number = parseInt(scope.row.prescribing_number) * scope.row.drug.min_number 
501
+        //  }
502
+        //  if(scope.row.prescribing_number_unit == scope.row.drug.min_unit){
503
+        //    max_number = parseInt(scope.row.prescribing_number)
504
+        //  }
505
+        //  console.log("修改的数量",max_number)
506
+        //  //查询该药品库存
507
+        //  if(this.drugList.length > 0){
508
+        //     var stock_number = 0
509
+        //     for(let i=0;i<this.drugList.length;i++){
510
+        //       if(scope.row.id == this.drugList[i].id){
511
+        //          for(let j=0;j<this.drugList[i].stock_in.length;j++){
512
+        //             stock_number += this.drugList[i].stock_in[j].stock_max_number * this.drugList[i].min_number + this.drugList[i].stock_in[j].stock_min_number
513
+        //          }
514
+        //       }
515
+        //     }
516
+        //     console.log("库存数量",stock_number)
517
+        //  }
518
+        // if(scope.row.advice_id > 0){
519
+        //   //获取该药品上一次出库的的数量
520
+        //   getHisDoctorAdviceInfo(scope.row.advice_id).then(response=>{
521
+        //     if(response.data.state == 1){
522
+        //        var out_count  = 0
523
+        //        var adviceList = response.data.data.advice
524
+        //        if(adviceList.prescribing_number_unit == adviceList.drug.max_number){
525
+        //            out_count = adviceList.prescribing_number * adviceList.drug.min_number
526
+        //        }
527
+        //        if(adviceList.prescribing_number_unit == adviceList.drug.min_unit){
528
+        //           out_count = adviceList.prescribing_number
529
+        //        }
530
+               
531
+        //        //如果更改的数量大于修改之前的数量
532
+        //        if(max_number > out_count){
533
+        //          if((max_number - out_count)>stock_number){
534
+        //            this.$message.error(scope.row.drug_name + '库存不足')
535
+        //          }
536
+        //        }
537
+        //     }
538
+        //   })
539
+        // }
540
+
541
+        // if(scope.row.advice_id == 0){
542
+        //    if(max_number > stock_number){
543
+        //     this.$message.error(scope.row.drug_name + '库存不足')
544
+        //    }
545
+        // }
546
+        
547
+
495 548
         if (scope.row.prescribing_number_unit == scope.row.drug.min_unit) {
496 549
           if (parseInt(scope.row.prescribing_number) > scope.row.drug.total) {
497 550
             this.$message.error(scope.row.drug_name + '库存不足')
@@ -550,7 +603,8 @@
550 603
           num = 1
551 604
         }
552 605
         return num
553
-      }
606
+      },
607
+     
554 608
     }, mounted() {
555 609
       this.getInitData()
556 610
 

+ 1 - 1
src/xt_pages/outpatientDoctorStation/doctorDesk.vue Parādīt failu

@@ -445,7 +445,7 @@
445 445
         this.$refs.multipleTable3.toggleAllSelection()
446 446
       },
447 447
       printThisPage() {
448
-        if(this.org_id == 10138){
448
+        if(this.org_id == 10138 || this.org_id == 10278){
449 449
           const style =
450 450
           '@media print {#prescription-print{font-size:14px;border:1px solid white}.prescription-print:last-child {page-break-after: auto;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;margin-bottom: 10px;}.infoTitle{display: flex;margin-top:10px;}.infoTitle div{width: 200px;}.infoMain{display: flex;flex-wrap: wrap;margin-top:10px;}.infoMain div{width: 50%;line-height: 24px;}.prescriptionBox{min-height:350px;}.Rp{font-size: 18px;font-weight: bold;}.drugsBox{padding-left: 40px;margin-bottom: 10px;}.drugsBox div{line-height: 20px;}.drugsOne{line-height: 24px;}.drugsOne span{margin-right: 20px;}.doctorBox{display: flex;justify-content: space-between;padding:0 10px;line-height: 24px;border-bottom: 2px solid #000;}.actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;}.actionBar p{width:150px;}.under_line{display: inline-block;border-bottom: 1px solid #000;flex: 1;}@media print {html {zoom: 88%;}}#prescription-print{font-size:14px;border:1px solid white}.prescription-print:last-child {page-break-after: auto;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;margin-bottom: 10px;}.infoTitle{display: flex;margin-top:10px;}.infoTitle div{width: 200px;}.infoMain{display: flex;flex-wrap: wrap;margin-top:10px;}.infoMain div{width: 50%;line-height: 24px;}.prescriptionBox{min-height:350px;}.Rp{font-size: 18px;font-weight: bold;}.drugsBox{padding-left: 40px;margin-bottom: 10px;}.drugsBox div{line-height: 20px;}.drugsOne{line-height: 24px;}.drugsOne span{margin-right: 20px;}.doctorBox{display: flex;justify-content: space-between;padding:0 10px;line-height: 24px;border-bottom: 2px solid #000;}.actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;}.actionBar p{width:150px;}.under_line{display: inline-block;border-bottom: 1px solid #000;flex: 1;}@media print {html {zoom: 87%;}}}'
451 451
           printJS({

+ 2 - 2
src/xt_pages/outpatientDoctorStation/print.vue Parādīt failu

@@ -13,7 +13,7 @@
13 13
       </template> -->
14 14
 
15 15
     <div class='dialysisPage' style="padding-top:40px;">
16
-      <div v-if="org_id != 10138">
16
+      <div v-if="org_id != 10138 && org_id != 10278">
17 17
         <printOne v-if="org_id != 10088 && org_id != 10215" v-bind:childResponse="childResponse" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :doctorPorject="doctorPorject" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printOne>
18 18
         <printFour v-if="org_id == 10088" v-bind:childResponse="childResponse" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :doctorPorject="doctorPorject" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printFour>
19 19
         <printFive v-if="org_id == 10215" v-bind:childResponse="childResponse" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :doctorPorject="doctorPorject" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printFive>
@@ -78,7 +78,7 @@ export default {
78 78
       var ptime = Math.round(new Date().getTime() / 1000);
79 79
       this.print_time = uParseTime(ptime, "{y}-{m}-{d} {h}:{i}");
80 80
 
81
-      if(this.org_id == 10138){
81
+      if(this.org_id == 10138 || this.org_id == 10278){
82 82
         setTimeout(() => {
83 83
           const style =
84 84
           '@media print {#prescription-print{font-size:14px;border:1px solid white}.prescription-print:last-child {page-break-after: auto;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;margin-bottom: 10px;}.infoTitle{display: flex;margin-top:10px;}.infoTitle div{width: 200px;}.infoMain{display: flex;flex-wrap: wrap;margin-top:10px;}.infoMain div{width: 50%;line-height: 24px;}.prescriptionBox{min-height:350px;}.Rp{font-size: 18px;font-weight: bold;}.drugsBox{padding-left: 40px;margin-bottom: 10px;}.drugsBox div{line-height: 20px;}.drugsOne{line-height: 24px;}.drugsOne span{margin-right: 20px;}.doctorBox{display: flex;justify-content: space-between;padding:0 10px;line-height: 24px;border-bottom: 2px solid #000;}.actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;}.actionBar p{width:150px;}.under_line{display: inline-block;border-bottom: 1px solid #000;flex: 1;}@media print {html {zoom: 90%;}}}';

+ 2 - 2
src/xt_pages/outpatientDoctorStation/treatPrint.vue Parādīt failu

@@ -13,7 +13,7 @@
13 13
       </template> -->
14 14
             
15 15
       <div class='dialysisPage' style="padding-top:40px;">
16
-        <printOne v-if="org_id != 10138" v-bind:childResponse="childResponse" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printOne>
16
+        <printOne v-if="org_id != 10138 && org_id != 10278" v-bind:childResponse="childResponse" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printOne>
17 17
         <printTwo v-else v-bind:childResponse="childResponse" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printTwo>
18 18
       </div>
19 19
   </div>
@@ -65,7 +65,7 @@ export default {
65 65
       var ptime = Math.round(new Date().getTime() / 1000);
66 66
       this.print_time = uParseTime(ptime, "{y}-{m}-{d} {h}:{i}");
67 67
 
68
-      if(this.org_id == 10138){
68
+      if(this.org_id == 10138 || this.org_id == 10278){
69 69
         setTimeout(() => {
70 70
           const style =
71 71
           '@media print {#prescription-print{font-size:14px;border:1px solid white}.prescription-print:last-child {page-break-after: auto;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;margin-bottom: 10px;}.infoTitle{display: flex;margin-top:10px;}.infoTitle div{width: 200px;}.infoMain{display: flex;flex-wrap: wrap;margin-top:10px;}.infoMain div{width: 50%;line-height: 24px;}.prescriptionBox{min-height:350px;}.Rp{font-size: 18px;font-weight: bold;}.drugsBox{padding-left: 40px;margin-bottom: 10px;}.drugsBox div{line-height: 20px;}.drugsOne{line-height: 24px;}.drugsOne span{margin-right: 20px;}.doctorBox{display: flex;justify-content: space-between;padding:0 10px;line-height: 24px;border-bottom: 2px solid #000;}.actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;}.actionBar p{width:150px;}.under_line{display: inline-block;border-bottom: 1px solid #000;flex: 1;}@media print {html {zoom: 90%;}}}';

+ 5 - 0
src/xt_pages/qcd/basicInformationAnalysis.vue Parādīt failu

@@ -249,6 +249,11 @@
249 249
                       <el-progress :percentage="(item.count/total*100).toFixed(2)"></el-progress>
250 250
                   </span>
251 251
 
252
+                 <span v-if="item.mode_id == 'CRRT'">
253
+                      <p>CRRT:{{item.count}}次({{(item.count/total*100).toFixed(2)}}%)</p>
254
+                      <el-progress :percentage="(item.count/total*100).toFixed(2)"></el-progress>
255
+                  </span>
256
+
252 257
                  <span v-if="item.mode_id == '未知'">
253 258
                       <p>未知:{{item.count}}次({{(item.count/total*100).toFixed(2)}}%)</p>
254 259
                       <el-progress :percentage="(item.count/total*100).toFixed(2)"></el-progress>

+ 7 - 2
src/xt_pages/stock/detail/stockOutDetail.vue Parādīt failu

@@ -309,6 +309,7 @@ export default {
309 309
         keywords: this.searchKey
310 310
       };
311 311
       this.cancelStockDate = [];
312
+      this.tableData = []
312 313
       getStockDetail(Params).then(response => {
313 314
         if (response.data.state == 0) {
314 315
 
@@ -317,21 +318,25 @@ export default {
317 318
         } else {
318 319
 
319 320
           this.total = response.data.data.total;
321
+          var total = 0
320 322
           for (let i = 0; i < response.data.data.list.length; i++) {
321 323
             this.tableData.push(response.data.data.list[i])
324
+            
322 325
             var obj = response.data.data.list[i];
326
+            total += response.data.data.list[i].price * response.data.data.list[i].count
323 327
             obj["is_total"] = 0;
324 328
             this.cancelStockDate.push(obj);
325
-
329
+       
326 330
           }
327 331
           this.cancelStockDate.push({
328 332
             warehouse_out_order_number: "合计",
329 333
             is_total: 1,
330
-            total: response.data.data.total_price,
334
+            total:total.toFixed(2),
331 335
             WarehouseOut: {
332 336
               warehouse_out_time: 0
333 337
             }
334 338
           });
339
+          console.log("cancelstockdate2332323322332332",this.cancelStockDate)
335 340
         }
336 341
       });
337 342
     },

+ 13 - 13
src/xt_pages/user/hospitalSummaryPrint.vue Parādīt failu

@@ -167,7 +167,7 @@
167 167
               </span>
168 168
             </td>   
169 169
             <td style="text-align:center;" colspan="11">
170
-              <span style="display:inline-block;margin-left:10px;">
170
+              <span style="display:block;margin-left:10px;text-align:left;">
171 171
                 <span v-html="hosDetail.admitting_diagnosis"></span>
172 172
               </span>
173 173
             </td>   
@@ -176,9 +176,9 @@
176 176
             <td style="text-align:center;width:300px" colspan="1">
177 177
               出院诊断:
178 178
             </td>
179
-             <td style="text-align:center;width:170px" colspan="11">
179
+             <td style="text-align:center;" colspan="11">
180 180
              
181
-              <span style="display:inline-block;margin-left:10px;">
181
+              <span style="display:block;margin-left:10px;text-align:left;">
182 182
                <span v-html="hosDetail.discharge_diagnosis"></span>  
183 183
               </span>
184 184
             </td>
@@ -188,9 +188,9 @@
188 188
             <td style="text-align:center;width:300px" colspan="1">
189 189
               入院时病情:
190 190
             </td>
191
-           <td style="text-align:center;width:170px" colspan="11">
191
+           <td colspan="11">
192 192
             
193
-              <span style="display:inline-block;margin-left:10px;">
193
+              <span style="display:block;margin-left:10px;text-align:left;">
194 194
                  <span v-html="hosDetail.diagnosis_admission"></span>
195 195
               </span>
196 196
             </td>
@@ -202,8 +202,8 @@
202 202
               诊断经过:
203 203
            
204 204
             </td>
205
-            <td style="text-align:center;width:170px" colspan="11">
206
-              <span style="display:inline-block;margin-left:10px;">
205
+            <td colspan="11">
206
+              <span style="display:block;margin-left:10px;text-align:left;">
207 207
                <span v-html="hosDetail.treatment"></span> 
208 208
               </span>
209 209
             </td>
@@ -213,9 +213,9 @@
213 213
             <td style="text-align:center;width:170px" colspan="1">
214 214
               出院时病情:
215 215
             </td>
216
-            <td style="text-align:center;width:170px" colspan="11">
216
+            <td colspan="11">
217 217
             
218
-              <span style="display:inline-block;margin-left:10px;">
218
+              <span style="display:block;margin-left:10px;text-align:left;">
219 219
                <span v-html="hosDetail.illness_discharge"></span> 
220 220
               </span>
221 221
             </td>
@@ -226,20 +226,20 @@
226 226
             <td style="text-align:center;width:300px" colspan="1">
227 227
               出院医嘱:
228 228
             </td>
229
-            <td style="text-align:center;width:170px" colspan="11">
230
-              <span style="display:inline-block;margin-left:10px;">
229
+            <td colspan="11">
230
+              <span style="display:block;margin-left:10px;text-align:left;">
231 231
                 <span v-html="hosDetail.discharge_advice"></span> 
232 232
               </span>
233 233
             </td>
234 234
             
235 235
           </tr>
236 236
           <tr>
237
-            <td style="text-align:center;width:170px" colspan="4">
237
+            <td style="text-align:center;width:170px" colspan="3">
238 238
               <span style="display:inline-block;margin-left:10px;">
239 239
                
240 240
               </span>
241 241
             </td>
242
-            <td style="text-align:center;width:170px" colspan="2">
242
+            <td style="text-align:center;width:170px" colspan="3">
243 243
               上级医师签名:
244 244
             </td>
245 245
             <td style="text-align:center;width:170px" colspan="2">

+ 43 - 25
src/xt_pages/workforce/appointment.vue Parādīt failu

@@ -546,7 +546,7 @@
546 546
           }
547 547
           
548 548
           if(this.export_type == 1){
549
-            console.log("进来了吗22323323223",this.tableList,this.newDay[0])
549
+      
550 550
             
551 551
             //  const multiHeader = [['区号', '机号', '周一'+"("+this.newDay[0]+")" , '', '', '周二'+"("+this.newDay[1]+")", '', '', '周三'+"("+this.newDay[2]+")" , '', '', '周四'+"("+this.newDay[3]+")" , '', '', '周五'+"("+this.newDay[4]+")" , '', '', '周六'+"("+this.newDay[5]+")" , '', '', '周日'+"("+this.newDay[6]+")" , '', '', '周一'+"("+this.days[7]+")" , '', '', '周二'+"("+this.days[8]+")" , '', '', '周三'+"("+this.days[9]+")" , '', '', '周四'+"("+this.days[10]+")" , '', '', '周五'+"("+this.days[11]+")" , '', '', '周六'+"("+this.days[12]+")" , '', '', '周日'+"("+this.days[13]+")", '', '', '周一'+"("+this.days[14]+")", '', '', '周二'+"("+this.days[15]+")", '', '', '周三'+"("+this.days[16]+")", '', '', '周四'+"("+this.days[17]+")", '', '', '周五'+"("+this.days[18]+")", '', '', '周六'+"("+this.days[19]+")", '', '', '周日'+"("+this.days[20]+")", '', '']]
552 552
             //  const header = ['', '', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上']
@@ -586,7 +586,7 @@
586 586
            
587 587
             
588 588
             const filename = '排班模版'
589
-            console.log("multiHeaders", this.$store.getters.xt_user.org.id,)
589
+     
590 590
 
591 591
             if(this.$store.getters.xt_user.org.id == 10234){
592 592
               excel.export_json_to_excel1({
@@ -702,33 +702,32 @@
702 702
         if (header.length == 65) {
703 703
          
704 704
           var isHas_1 = headers.includes('区号')
705
-          console.log("1"+isHas_1)
705
+ 
706 706
           var isHas_2 = headers.includes('机号')
707
-          console.log("2"+isHas_2)
708
-
707
+      
709 708
 
710 709
           var isHas_3 = headers.includes('周一'+"("+this.days[0]+")")
711
-          console.log("3"+isHas_3)
710
+      
712 711
 
713 712
 
714 713
           var isHas_4 = headers.includes('')
715
-          console.log("4"+isHas_4)
714
+       
716 715
 
717 716
 
718 717
           var isHas_5 = headers.includes('_1')
719
-          console.log("5"+isHas_5)
718
+        
720 719
 
721 720
           var isHas_6 = headers.includes('周二'+"("+this.days[1]+")")
722
-          console.log("6"+isHas_6)
721
+   
723 722
 
724 723
           var isHas_7 = headers.includes('_2')
725
-          console.log("7"+isHas_7)
724
+
726 725
 
727 726
           var isHas_8 = headers.includes('_3')
728
-          console.log("8"+isHas_8)
727
+
729 728
 
730 729
           var isHas_9 = headers.includes('周三'+"("+this.days[2]+")")
731
-          console.log("9"+isHas_9)
730
+
732 731
 
733 732
           var isHas_10 = headers.includes('_4')
734 733
           console.log("10"+isHas_10)
@@ -1246,14 +1245,34 @@
1246 1245
 
1247 1246
               }
1248 1247
             });
1248
+            console.log("data232332233223",datas)
1249
+            console.log("failed_datas33332332",failed_datas)
1250
+            var newSchedule = datas.sort((a,b)=>{ return a.schedule_date-b.schedule_date})
1251
+            var start_time = ""
1252
+            var type = 0
1253
+            if(failed_datas.length> 0){
1254
+              var oldSchedule = failed_datas.sort((a,b)=>{ return a.schedule_date-b.schedule_date})
1255
+              start_time = oldSchedule[0].schedule_date
1256
+              type = 0 
1257
+            }
1249 1258
 
1250
-
1259
+            if(failed_datas.length== 0){
1260
+              start_time = newSchedule[0].schedule_date   
1261
+              type = 1
1262
+            }
1263
+           
1264
+            console.log("newSchedule2323223",newSchedule)
1265
+            console.log("oldSchedule344433434",oldSchedule)
1266
+          
1267
+            var length = newSchedule.length - 1
1251 1268
             let params = {
1252 1269
               schedule: datas,
1253
-              failed_schedule: failed_datas
1254
-
1270
+              failed_schedule: failed_datas,
1271
+              start_time:start_time,
1272
+              end_time:newSchedule[length].schedule_date,
1273
+              delete_type:type,
1255 1274
             }
1256
-
1275
+            console.log("param2323233223",params)
1257 1276
             //今天的时间
1258 1277
             var day2 = new Date()
1259 1278
             day2.setTime(day2.getTime())
@@ -1261,8 +1280,6 @@
1261 1280
             var day = day2.getDate() < 10 ? '0' + (day2.getDate()).toString() : (day2.getMonth() + 1).toString()
1262 1281
             var date = day2.getFullYear() + '-' + month + '-' + day
1263 1282
 
1264
-            console.log("params",params)
1265
-            console.log("datae",date)
1266 1283
             exportSchedule(params, date).then(response => {
1267 1284
               if (response.data.state == 0) {
1268 1285
                 return false
@@ -1275,6 +1292,9 @@
1275 1292
         }
1276 1293
 
1277 1294
       },
1295
+      sortData(a, b) {
1296
+        return a.schedule_date - b.schedule_date
1297
+      },
1278 1298
       getInitDate() {
1279 1299
         initDate().then(response => {
1280 1300
           if (response.data.state == 0) {
@@ -2685,7 +2705,7 @@
2685 2705
        changeWeek(val){
2686 2706
        
2687 2707
          var start = this.getTimestamp(val) - 57600
2688
-         console.log("val23232332323232",start)
2708
+        
2689 2709
          this.start_time = this.getTime(start)
2690 2710
          
2691 2711
          this.newDay.push(this.start_time)  
@@ -2794,16 +2814,14 @@
2794 2814
                 let weekOfday = parseInt(moment().format('d')) 
2795 2815
                 start_time =  this.getTimestamp(moment().subtract(weekOfday + 6, 'days').format('YYYY-MM-DD')) -28800
2796 2816
                 end_time =  this.getTimestamp(moment().subtract(weekOfday, 'days').format('YYYY-MM-DD')) -28800
2797
-                console.log("start",start_time)
2798
-                console.log("end",end_time)
2817
+            
2799 2818
              }
2800 2819
             
2801 2820
             //本周
2802 2821
              if(this.form.lastweek == "2"){
2803 2822
                 start_time = this.getTimestamp(this.weekDayArr[0])
2804 2823
                 end_time = this.getTimestamp(this.weekDayArr[6])
2805
-                console.log("start",start_time)
2806
-                console.log("end",end_time)
2824
+              
2807 2825
              }
2808 2826
 
2809 2827
             var label = ""
@@ -2823,7 +2841,7 @@
2823 2841
               copy_endtime:copy_endtime,
2824 2842
             }
2825 2843
          
2826
-           console.log("param22222",params)
2844
+   
2827 2845
            
2828 2846
            this.$refs[formName].validate(valid=>{
2829 2847
               if(valid){
@@ -2843,7 +2861,7 @@
2843 2861
           getScheduleTemplate().then(response=>{
2844 2862
              if(response.data.state == 1){
2845 2863
                 var template = response.data.data.template
2846
-                console.log("模版",template)
2864
+                
2847 2865
                 this.templateObj = template
2848 2866
              }
2849 2867
           })