Browse Source

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

csx 3 years ago
parent
commit
d0994a455a

+ 0 - 9
src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue View File

2655
       comfirm() {
2655
       comfirm() {
2656
 
2656
 
2657
         if (this.curDrugs.length > 0) {
2657
         if (this.curDrugs.length > 0) {
2658
-          if (this.$store.getters.xt_user.org_id == 10138) {
2659
             for (let i = 0; i < this.curDrugs.length; i++) {
2658
             for (let i = 0; i < this.curDrugs.length; i++) {
2660
               if (this.curPrescriptions.med_type == 14 && this.curDrugs[i].is_special_diseases != 1) {
2659
               if (this.curPrescriptions.med_type == 14 && this.curDrugs[i].is_special_diseases != 1) {
2661
                 this.$message.error('该处方属于特病类型处方,开非特病类型的药')
2660
                 this.$message.error('该处方属于特病类型处方,开非特病类型的药')
2663
               }
2662
               }
2664
 
2663
 
2665
             }
2664
             }
2666
-          }
2667
         }
2665
         }
2668
         if (this.teamList.length > 0) {
2666
         if (this.teamList.length > 0) {
2669
-          if (this.$store.getters.xt_user.org_id == 10138) {
2670
             for (let i = 0; i < this.teamList.length; i++) {
2667
             for (let i = 0; i < this.teamList.length; i++) {
2671
               if (this.curPrescriptions.med_type == 14 && this.teamList[i].is_special_diseases != 1) {
2668
               if (this.curPrescriptions.med_type == 14 && this.teamList[i].is_special_diseases != 1) {
2672
                 this.$message.error('该处方属于特病类型处方,请开特病类型的项目')
2669
                 this.$message.error('该处方属于特病类型处方,请开特病类型的项目')
2674
               }
2671
               }
2675
 
2672
 
2676
             }
2673
             }
2677
-          }
2678
 
2674
 
2679
-          if(this.$store.getters.xt_user.org_id == 10138){
2680
             let arr = this.teamList
2675
             let arr = this.teamList
2681
             let newArr = []
2676
             let newArr = []
2682
             arr.map(item => {
2677
             arr.map(item => {
2688
               }
2683
               }
2689
             })
2684
             })
2690
             this.teamList = newArr
2685
             this.teamList = newArr
2691
-          }
2692
         }
2686
         }
2693
 
2687
 
2694
 
2688
 
2695
 
2689
 
2696
         if (this.curDrugs.length == 0) {
2690
         if (this.curDrugs.length == 0) {
2697
-          if (this.$store.getters.xt_user.org_id == 10138) {
2698
             for (let i = 0; i < this.curDrugs.length; i++) {
2691
             for (let i = 0; i < this.curDrugs.length; i++) {
2699
               if (this.curPrescriptions.med_type == 14 && this.curDrugs[i].is_special_diseases != 1) {
2692
               if (this.curPrescriptions.med_type == 14 && this.curDrugs[i].is_special_diseases != 1) {
2700
                 this.$message.error('该处方属于特病类型处方,开非特病类型的药')
2693
                 this.$message.error('该处方属于特病类型处方,开非特病类型的药')
2701
                 return
2694
                 return
2702
               }
2695
               }
2703
-
2704
             }
2696
             }
2705
-          }
2706
         }
2697
         }
2707
 
2698
 
2708
         // if (this.curPrescriptions.order_status == 2) {
2699
         // if (this.curPrescriptions.order_status == 2) {

+ 0 - 4
src/xt_pages/outpatientDoctorStation/prescriptionTemplatedetail.vue View File

1280
         //   return
1280
         //   return
1281
         // }
1281
         // }
1282
        if (this.curPrescriptions.advices.length > 0 && this.curPrescriptions.project.length == 0) {
1282
        if (this.curPrescriptions.advices.length > 0 && this.curPrescriptions.project.length == 0) {
1283
-          if (this.$store.getters.xt_user.org_id == 10138) {
1284
             for (let i = 0; i < this.curDrugs.length; i++) {
1283
             for (let i = 0; i < this.curDrugs.length; i++) {
1285
               if (this.curPrescriptions.med_type == 14 && this.curDrugs[i].is_special_diseases != 1) {
1284
               if (this.curPrescriptions.med_type == 14 && this.curDrugs[i].is_special_diseases != 1) {
1286
                 this.$message.error('该处方属于特病类型处方,开非特病类型的药')
1285
                 this.$message.error('该处方属于特病类型处方,开非特病类型的药')
1288
               }
1287
               }
1289
 
1288
 
1290
             }
1289
             }
1291
-          }
1292
         }
1290
         }
1293
 
1291
 
1294
         if (this.curPrescriptions.advices.length == 0 && this.curPrescriptions.project.length == 0) {
1292
         if (this.curPrescriptions.advices.length == 0 && this.curPrescriptions.project.length == 0) {
1295
-          if (this.$store.getters.xt_user.org_id == 10138) {
1296
             for (let i = 0; i < this.curDrugs.length; i++) {
1293
             for (let i = 0; i < this.curDrugs.length; i++) {
1297
               if (this.curPrescriptions.med_type == 14 && this.curDrugs[i].is_special_diseases != 1) {
1294
               if (this.curPrescriptions.med_type == 14 && this.curDrugs[i].is_special_diseases != 1) {
1298
                 this.$message.error('该处方属于特病类型处方,开非特病类型的药')
1295
                 this.$message.error('该处方属于特病类型处方,开非特病类型的药')
1300
               }
1297
               }
1301
 
1298
 
1302
             }
1299
             }
1303
-          }
1304
         }
1300
         }
1305
         if (this.curStatus == 1 && this.rightTab == 2) {
1301
         if (this.curStatus == 1 && this.rightTab == 2) {
1306
           this.$message.error('改处方是药品,无法添加项目')
1302
           this.$message.error('改处方是药品,无法添加项目')