浏览代码

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

csx 3 年前
父节点
当前提交
8ec720ecfc

+ 5 - 1
src/xt_pages/outpatientDoctorStation/components/callPrescription.vue 查看文件

322
                 total:prescription.project[b].count,
322
                 total:prescription.project[b].count,
323
                 remark:prescription.project[b].remark,
323
                 remark:prescription.project[b].remark,
324
                 unit: prescription.project[b].unit,
324
                 unit: prescription.project[b].unit,
325
-                type: prescription.project[b].type
325
+                type: prescription.project[b].type,
326
                 // medical_code:prescription.project[b].project.medical_code,
326
                 // medical_code:prescription.project[b].project.medical_code,
327
               };
327
               };
328
               if(prescription.project[b].type == 2){
328
               if(prescription.project[b].type == 2){
330
                 obj['medical_code'] =  prescription.project[b].project.medical_code
330
                 obj['medical_code'] =  prescription.project[b].project.medical_code
331
                 obj['project_name'] =  prescription.project[b].project.project_name
331
                 obj['project_name'] =  prescription.project[b].project.project_name
332
                 obj['price'] = prescription.project[b].project.price
332
                 obj['price'] = prescription.project[b].project.price
333
+                obj['project']=prescription.project[b].project
334
+
333
               }else if(prescription.project[b].type == 3){
335
               }else if(prescription.project[b].type == 3){
334
                 obj['statistical_classification'] = ""
336
                 obj['statistical_classification'] = ""
335
                 obj['medical_code'] =  prescription.project[b].good_info.medical_insurance_number
337
                 obj['medical_code'] =  prescription.project[b].good_info.medical_insurance_number
336
                 obj['project_name'] =  prescription.project[b].good_info.good_name
338
                 obj['project_name'] =  prescription.project[b].good_info.good_name
337
                 obj['price'] = prescription.project[b].good_info.packing_price
339
                 obj['price'] = prescription.project[b].good_info.packing_price
340
+                obj['good_info']=prescription.project[b].good_info
341
+
338
               }
342
               }
339
 
343
 
340
               tempProject.push(obj)
344
               tempProject.push(obj)

+ 4 - 1
src/xt_pages/outpatientDoctorStation/components/nextOrLastPrescription.vue 查看文件

376
 
376
 
377
                 // medical_code:prescription.project[b].project.medical_code,
377
                 // medical_code:prescription.project[b].project.medical_code,
378
               };
378
               };
379
-
380
               if(prescription.project[b].type == 2){
379
               if(prescription.project[b].type == 2){
381
                 obj['statistical_classification'] =  prescription.project[b].project.statistical_classification
380
                 obj['statistical_classification'] =  prescription.project[b].project.statistical_classification
382
                 obj['medical_code'] =  prescription.project[b].project.medical_code
381
                 obj['medical_code'] =  prescription.project[b].project.medical_code
383
                 obj['project_name'] =  prescription.project[b].project.project_name
382
                 obj['project_name'] =  prescription.project[b].project.project_name
384
                 obj['price'] = prescription.project[b].project.price
383
                 obj['price'] = prescription.project[b].project.price
384
+                obj['project']=prescription.project[b].project
385
+
385
               }else if(prescription.project[b].type == 3){
386
               }else if(prescription.project[b].type == 3){
386
                 obj['statistical_classification'] = ""
387
                 obj['statistical_classification'] = ""
387
                 obj['medical_code'] =  prescription.project[b].good_info.medical_insurance_number
388
                 obj['medical_code'] =  prescription.project[b].good_info.medical_insurance_number
388
                 obj['project_name'] =  prescription.project[b].good_info.good_name
389
                 obj['project_name'] =  prescription.project[b].good_info.good_name
389
                 obj['price'] = prescription.project[b].good_info.packing_price
390
                 obj['price'] = prescription.project[b].good_info.packing_price
391
+                obj['good_info']=prescription.project[b].good_info
392
+
390
               }
393
               }
391
 
394
 
392
               tempProject.push(obj)
395
               tempProject.push(obj)