Merge remote-tracking branch 'origin/20220812' into 20220812

src/xt_pages/hospitalStation/components/deskPrescription.vue

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

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -2202,16 +2202,17 @@
       },
       open(index, isLoading) {
 
-        if(this.curStatus == 0){
-          this.prescriptions = []
-        }
+        // if(this.curStatus == 0){
+        //   this.prescriptions = []
+        // }
         if(!isLoading){
           if (this.dayorMonth == 'day') {
-            if (this.prescriptions[0].advices.length == 0 && this.prescriptions[0].project.length == 0) {
-              this.$message.error('请先开处方')
-              return
+            for(let i = 0; i < this.prescriptions.length;i++){
+              if (this.prescriptions[i].advices.length == 0 && this.prescriptions[i].project.length == 0) {
+                this.$message.error('请先开处方')
+                return
+              }
             }
-
           }
 
           if (this.dayorMonth == 'day') {
@@ -2663,13 +2664,15 @@
 
 
         for(let i = 0; i < this.prescriptions.length; i++){
-          if (this.prescriptions[i].order_status == 2) {
-            this.$message.error('处方中包含已收费处方,无法新增')
+          if (this.prescriptions[i].order_status == 2 || this.prescriptions[i].order_status == 4) {
+            this.$message.error('处方中包含已收费处方或者包含已经上传的处方,无法新增')
             return
           }
         }
 
 
+
+
         if (this.curPrescriptions.advices.length == 0 && this.curPrescriptions.project.length == 0) {
           this.$message.error('当前处方无数据，新增数据后才能新增处方')
           return