Ver código fonte

合并带嘛

csx 2 anos atrás
pai
commit
db954b2d62

+ 3 - 2
src/xt_pages/hospitalStation/components/deskPrescription.vue Ver arquivo

@@ -2989,16 +2989,17 @@ export default {
2989 2989
                 price: temp2[b].price,
2990 2990
                 remark: '',
2991 2991
                 medical_code: temp2[b].medical_code,
2992
-                unit: temp2[b].unit,
2993 2992
                 type: temp2[b].type
2994 2993
               }
2995 2994
 
2996 2995
               if (temp2[b].type == 2) {
2997 2996
                 obj['project'] = temp2[b].project
2997
+                obj['unit'] = temp2[b].project.unit
2998 2998
 
2999 2999
               } else if (temp2[b].type == 3) {
3000
-
3001 3000
                 obj['good_info'] = temp2[b].good_info
3001
+                obj['unit'] = temp2[b].good_info.packing_unit
3002
+
3002 3003
 
3003 3004
               }
3004 3005
               if (temp2[b].team_id == undefined) {

+ 2 - 4
src/xt_pages/outpatientDoctorStation/prescriptionTemplatedetail.vue Ver arquivo

@@ -1548,7 +1548,6 @@
1548 1548
                   price: temp2[b].price,
1549 1549
                   remark: '',
1550 1550
                   medical_code: temp2[b].medical_code,
1551
-                  unit: temp2[b].unit,
1552 1551
                   type: temp2[b].type,
1553 1552
                   frequency_type: 1,
1554 1553
                   day_count: 0,
@@ -1556,11 +1555,10 @@
1556 1555
                 }
1557 1556
                 if (temp2[b].type == 2) {
1558 1557
                   obj['project'] = temp2[b].project
1559
-
1558
+                  obj['unit'] = temp2[b].project.unit
1560 1559
                 } else if (temp2[b].type == 3) {
1561
-
1562 1560
                   obj['good_info'] = temp2[b].good_info
1563
-
1561
+                  obj['unit'] = temp2[b].good_info.packing_unit
1564 1562
                 }
1565 1563
                 if (obj.total == 0 || obj.total == undefined) {
1566 1564
                   obj.total = 1