test_user 2 years ago
parent
commit
d34a7664d6

+ 2 - 0
src/api/his/his_hospital.js View File

@@ -31,3 +31,5 @@ export function exportData(params) {
31 31
 
32 32
 
33 33
 
34
+
35
+

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

@@ -271,6 +271,7 @@ export function getSolutionSchedule(params) {
271 271
 }
272 272
 
273 273
 
274
+
274 275
 export function CancelScheduleTwo(id) {
275 276
   return request({
276 277
     url: '/api/schedule/delete_two?id=' + id,
@@ -278,3 +279,6 @@ export function CancelScheduleTwo(id) {
278 279
   })
279 280
 }
280 281
 
282
+
283
+
284
+

+ 24 - 24
src/router/modules/dialysis.js View File

@@ -347,30 +347,30 @@ export default {
347 347
         noCache: true
348 348
       }
349 349
     },
350
-    {
351
-      path: '/dialysis/print/batch/fiftyone',
352
-      component: () =>
353
-        import('@/xt_pages/dialysis/batch_print/batch_print_order_fiftyone'),
354
-      hidden: true,
355
-      is_menu: false,
356
-      name: 'dialysis_batch_fiftyone',
357
-      meta: {
358
-        title: '批量打印',
359
-        noCache: true
360
-      }
361
-    },
362
-    {
363
-      path: '/dialysis/print/batch/fiftythree',
364
-      component: () =>
365
-        import('@/xt_pages/dialysis/batch_print/batch_print_order_fiftythree'),
366
-      hidden: true,
367
-      is_menu: false,
368
-      name: 'dialysis_batch_fiftythree',
369
-      meta: {
370
-        title: '批量打印',
371
-        noCache: true
372
-      }
373
-    },
350
+    // {
351
+    //   path: '/dialysis/print/batch/fiftyone',
352
+    //   component: () =>
353
+    //     import('@/xt_pages/dialysis/batch_print/batch_print_order_fiftyone'),
354
+    //   hidden: true,
355
+    //   is_menu: false,
356
+    //   name: 'dialysis_batch_fiftyone',
357
+    //   meta: {
358
+    //     title: '批量打印',
359
+    //     noCache: true
360
+    //   }
361
+    // },
362
+    // {
363
+    //   path: '/dialysis/print/batch/fiftythree',
364
+    //   component: () =>
365
+    //     import('@/xt_pages/dialysis/batch_print/batch_print_order_fiftythree'),
366
+    //   hidden: true,
367
+    //   is_menu: false,
368
+    //   name: 'dialysis_batch_fiftythree',
369
+    //   meta: {
370
+    //     title: '批量打印',
371
+    //     noCache: true
372
+    //   }
373
+    // },
374 374
     {
375 375
       path: '/dialysis/print/batch/fiftynine',
376 376
       component: () =>

+ 2 - 0
src/xt_pages/hospitalStation/invoicePrint.vue View File

@@ -38,6 +38,8 @@
38 38
   </div>
39 39
 </template>
40 40
 
41
+
42
+
41 43
 <script>
42 44
 import printOne from "./invoiceTemplate/printOne";
43 45
 import printTwo from "./invoiceTemplate/printTwo";

+ 2 - 0
src/xt_pages/hospitalStation/outpatientChargesManagement.vue View File

@@ -88,6 +88,8 @@
88 88
 
89 89
       <div class="mainRight">
90 90
 
91
+
92
+
91 93
         <div class="mainCell fixedCell" style="margin-bottom:10px;">
92 94
 
93 95
           <div>

+ 2 - 0
src/xt_pages/outpatientCharges/outpatientChargesManagement.vue View File

@@ -286,6 +286,8 @@
286 286
                     </div>
287 287
                   </div>
288 288
 
289
+
290
+
289 291
                 </div>
290 292
                 <div class="centerRight">
291 293
                   <p class="centerRightTitle" style="padding-top: 10px;">就诊信息</p>

+ 1 - 0
src/xt_pages/outpatientCharges/statementPrint.vue View File

@@ -958,6 +958,7 @@ export default {
958 958
                 }
959 959
 
960 960
               }
961
+
961 962
               console.log(list)
962 963
               let len = list.length / 2
963 964
               let L_list = []

+ 3 - 0
src/xt_pages/outpatientCharges/summary.vue View File

@@ -1781,6 +1781,7 @@ export default {
1781 1781
             var hifmi_pay = 0.0;
1782 1782
             if (order.setl_detail && order.setl_detail.length > 0) {
1783 1783
               var jsonObj = JSON.parse(order.setl_detail);
1784
+
1784 1785
               console.log(jsonObj);
1785 1786
               if (jsonObj != null) {
1786 1787
                 for (let i = 0; i < jsonObj.length; i++) {
@@ -1796,6 +1797,8 @@ export default {
1796 1797
                 }
1797 1798
               }
1798 1799
             }
1800
+
1801
+
1799 1802
             var hifmi_pay = 0.0;
1800 1803
 
1801 1804
             console.log(order.setl_detail);

+ 1 - 0
src/xt_pages/outpatientDoctorStation/checkPrint.vue View File

@@ -16,6 +16,7 @@
16 16
         <printOne v-if="$store.getters.xt_user.org_id != 0 && $store.getters.xt_user.org_id != 10402" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id" :newHisPatient="newHisPatient"></printOne>
17 17
         <check-print-two v-else :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id" :newHisPatient="newHisPatient"></check-print-two>
18 18
       </div>
19
+
19 20
   </div>
20 21
 </template>
21 22
 

+ 1 - 0
src/xt_pages/outpatientDoctorStation/checkTemplate/checkPrintTwo.vue View File

@@ -123,6 +123,7 @@
123 123
 
124 124
   </div>
125 125
 </template>
126
+
126 127
 <script>
127 128
 import { jsGetAge, uParseTime } from "@/utils/tools";
128 129
 import {

+ 1 - 0
src/xt_pages/outpatientDoctorStation/template/printThree.vue View File

@@ -34,6 +34,7 @@
34 34
               style="margin-left: 50px; border: 1px solid #000"
35 35
               >精二</span
36 36
             >
37
+
37 38
           </div>
38 39
           <div style="display: flex;">
39 40
             <div style="width: 33%; display: flex">

+ 2 - 0
src/xt_pages/workforce/components/ScheduleItem.vue View File

@@ -26,6 +26,8 @@ export default {
26 26
           },
27 27
       },
28 28
   },
29
+
30
+
29 31
   methods:{
30 32
         modeColor(name){
31 33
             if(name == 'HD'){

+ 28 - 19
src/xt_pages/workforce/components/editTableData.vue View File

@@ -1542,6 +1542,7 @@
1542 1542
             ref="changeSchedule"
1543 1543
             :rules="changeRules"
1544 1544
             label-width="90px"
1545
+
1545 1546
         >
1546 1547
           <el-form-item label="排班日期: ">
1547 1548
             <el-input v-model="currentData.schedule_date" disabled></el-input>
@@ -2616,23 +2617,28 @@ export default {
2616 2617
           smart_schs: saveOrEditTempData,
2617 2618
           del_schs:delTempData,
2618 2619
         };
2619
-        this.saveloading = true;
2620
-        BatchSmartSch(obj, this.cur_smart_patient_id).then((response) => {
2621
-          if (response.data.state == 1) {
2622
-            this.saveloading = false;
2623
-
2624
-            this.$message.success("保存成功");
2625
-            this.smartVisible = false;
2626
-            this.smart_keyword = "";
2627
-            this.getSchedules();
2628
-          } else {
2629
-            this.saveloading = false;
2630
-            this.smart_keyword = "";
2620
+        if(!this.saveloading){
2621
+          this.saveloading = true;
2622
+          BatchSmartSch(obj, this.cur_smart_patient_id).then((response) => {
2623
+            if (response.data.state == 1) {
2624
+              this.saveloading = false;
2625
+
2626
+              this.$message.success("保存成功");
2627
+              this.smartVisible = false;
2628
+              this.smart_keyword = "";
2629
+              this.getSchedules();
2630
+            } else {
2631
+              this.saveloading = false;
2632
+              this.smart_keyword = "";
2633
+
2634
+              this.$message.error(response.data.msg);
2635
+              return;
2636
+            }
2637
+          });
2638
+
2639
+
2640
+        }
2631 2641
 
2632
-            this.$message.error(response.data.msg);
2633
-            return;
2634
-          }
2635
-        });
2636 2642
       } else {
2637 2643
         this.$message.success("保存成功");
2638 2644
       }
@@ -3268,7 +3274,8 @@ export default {
3268 3274
 
3269 3275
 
3270 3276
 
3271
-    },curInfoDragStart(){
3277
+    },
3278
+    curInfoDragStart(){
3272 3279
       this.cur_drag_obj = 1
3273 3280
       this.cur_drag_info.patient_id = this.cur_info.patient_id
3274 3281
       this.cur_drag_info.patient_name = this.cur_info.patient_name
@@ -3381,7 +3388,8 @@ export default {
3381 3388
     },
3382 3389
     allowDrop(e) {
3383 3390
       e.preventDefault();
3384
-    },coverSch(){
3391
+    },
3392
+    coverSch(){
3385 3393
       let params={
3386 3394
         id_one:this.cur_drag_info.id,
3387 3395
         id_two:this.currentData.id
@@ -3399,7 +3407,8 @@ export default {
3399 3407
           this.getSchedules();
3400 3408
         }
3401 3409
       });
3402
-    },changeSchTwo(){
3410
+    },
3411
+    changeSchTwo(){
3403 3412
         let params={
3404 3413
           id_one:this.cur_drag_info.id,
3405 3414
           id_two:this.currentData.id

+ 1 - 0
src/xt_pages/workforce/template.vue View File

@@ -451,6 +451,7 @@ export default {
451 451
       this.dataloading = false
452 452
     },
453 453
     setTemplate(items){
454
+
454 455
       if(this.template_mode.mode == 1){
455 456
         this.first_template = items[0]
456 457
       }else   if(this.template_mode.mode == 2){