浏览代码

合并带嘛

csx 2 年前
父节点
当前提交
8ef0b6a279

+ 2 - 2
src/xt_pages/hospitalStation/components/deskPrescription.vue 查看文件

@@ -2657,8 +2657,8 @@ export default {
2657 2657
         }
2658 2658
       }
2659 2659
       for(let i = 0; i < this.prescriptions.length; i++){
2660
-        if (this.prescriptions[i].order_status == 2) {
2661
-          this.$message.error('处方中包含已收费处方,无法新增')
2660
+        if (this.prescriptions[i].order_status == 2 || this.prescriptions[i].order_status == 4) {
2661
+          this.$message.error('处方中包含已收费处方或者包含已上传的处方,无法新增')
2662 2662
           return
2663 2663
         }
2664 2664
       }

+ 12 - 9
src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue 查看文件

@@ -2203,16 +2203,17 @@
2203 2203
       },
2204 2204
       open(index, isLoading) {
2205 2205
 
2206
-        if(this.curStatus == 0){
2207
-          this.prescriptions = []
2208
-        }
2206
+        // if(this.curStatus == 0){
2207
+        //   this.prescriptions = []
2208
+        // }
2209 2209
         if(!isLoading){
2210 2210
           if (this.dayorMonth == 'day') {
2211
-            if (this.prescriptions[0].advices.length == 0 && this.prescriptions[0].project.length == 0) {
2212
-              this.$message.error('请先开处方')
2213
-              return
2211
+            for(let i = 0; i < this.prescriptions.length;i++){
2212
+              if (this.prescriptions[i].advices.length == 0 && this.prescriptions[i].project.length == 0) {
2213
+                this.$message.error('请先开处方')
2214
+                return
2215
+              }
2214 2216
             }
2215
-
2216 2217
           }
2217 2218
 
2218 2219
           if (this.dayorMonth == 'day') {
@@ -2663,13 +2664,15 @@
2663 2664
 
2664 2665
 
2665 2666
         for(let i = 0; i < this.prescriptions.length; i++){
2666
-          if (this.prescriptions[i].order_status == 2) {
2667
-            this.$message.error('处方中包含已收费处方,无法新增')
2667
+          if (this.prescriptions[i].order_status == 2 || this.prescriptions[i].order_status == 4) {
2668
+            this.$message.error('处方中包含已收费处方或者包含已经上传的处方,无法新增')
2668 2669
             return
2669 2670
           }
2670 2671
         }
2671 2672
 
2672 2673
 
2674
+
2675
+
2673 2676
         if (this.curPrescriptions.advices.length == 0 && this.curPrescriptions.project.length == 0) {
2674 2677
           this.$message.error('当前处方无数据,新增数据后才能新增处方')
2675 2678
           return