Browse Source

合并带嘛

csx 2 years ago
parent
commit
db954b2d62

+ 3 - 2
src/xt_pages/hospitalStation/components/deskPrescription.vue View File

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

+ 2 - 4
src/xt_pages/outpatientDoctorStation/prescriptionTemplatedetail.vue View File

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