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

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -2185,11 +2185,11 @@
       },
       open(index, isLoading) {
         if (this.dayorMonth == 'day') {
-
           if (this.prescriptions[0].advices.length == 0 && this.prescriptions[0].project.length == 0) {
             this.$message.error('请先开处方')
             return
           }
+
         }
 
         if (this.dayorMonth == 'day') {
@@ -2233,6 +2233,13 @@
               }
           }
           if (index == 1) {
+            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
+              }
+            }
+
             let params = {
               p_type: 2,
               patient_id: this.patientInfo.id,