Merge remote-tracking branch 'origin/20230223_pc_vue_new_branch' into 20230223_pc_vue_new_branch

src/xt_pages/outpatientDoctorStation/modeTemplateDetail.vue

@@ -1463,6 +1463,7 @@
         //   }
         // }
 
+
         for (let i = 0; i < this.prescriptions.length; i++) {
           if (this.prescriptions[i].name == this.editableTabsValue) {
             var temp = this.deepClone(this.curDrugs)
@@ -1550,7 +1551,6 @@
                   price: temp2[b].price,
                   remark: '',
                   medical_code: temp2[b].medical_code,
-                  unit: temp2[b].unit,
                   type: temp2[b].type,
                   frequency_type: 1,
                   day_count: 0,
@@ -1558,10 +1558,13 @@
                 }
                 if (temp2[b].type == 2) {
                   obj['project'] = temp2[b].project
+                  obj['unit'] = temp2[b].project.unit
 
                 } else if (temp2[b].type == 3) {
 
                   obj['good_info'] = temp2[b].good_info
+                  obj['unit'] = temp2[b].good_info.packing_unit
+
 
                 }
                 if (obj.total == 0 || obj.total == undefined) {
@@ -1570,7 +1573,7 @@
                 if (obj.type == 3) {
                   obj.single_dose = 1
                 }
-
+                console.log(obj)
                 this.prescriptions[i].project.push(obj)
               }
               this.curStatus = 2