Browse Source

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

XMLWAN 3 years ago
parent
commit
b0eb37f6c8

+ 1 - 1
src/xt_pages/dialysis/template/DialysisPrintOrderSeventeen.vue View File

1465
           this.afterdialysis = afterdialysis
1465
           this.afterdialysis = afterdialysis
1466
           // eslint-disable-next-line no-unused-vars
1466
           // eslint-disable-next-line no-unused-vars
1467
           var doctoradvce = response.data.data.doctorAdvice
1467
           var doctoradvce = response.data.data.doctorAdvice
1468
-          var doctorAdevieInfo = response.data.data.advices
1468
+          var doctorAdevieInfo = JSON.parse(JSON.stringify(response.data.data.advices))
1469
           this.newTableAdvice = response.data.data.doctorAdevieInfo
1469
           this.newTableAdvice = response.data.data.doctorAdevieInfo
1470
           console.log('哈哈哈哈哈哈哈哈哈', this.newTableAdvice)
1470
           console.log('哈哈哈哈哈哈哈哈哈', this.newTableAdvice)
1471
           var tableAdvice = doctorAdevieInfo
1471
           var tableAdvice = doctorAdevieInfo

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

2700
                   delivery_way: temp2[b].delivery_way,
2700
                   delivery_way: temp2[b].delivery_way,
2701
                   execution_frequency: temp2[b].execution_frequency,
2701
                   execution_frequency: temp2[b].execution_frequency,
2702
                   number_days: temp2[b].number_days.toString(),
2702
                   number_days: temp2[b].number_days.toString(),
2703
-                  total: temp2[b].total,
2703
+                  total: 1,
2704
                   price: temp2[b].price,
2704
                   price: temp2[b].price,
2705
                   remark: '',
2705
                   remark: '',
2706
                   medical_code: temp2[b].medical_code,
2706
                   medical_code: temp2[b].medical_code,
2713
                 if (obj.type == 3) {
2713
                 if (obj.type == 3) {
2714
                   obj.single_dose = 1
2714
                   obj.single_dose = 1
2715
                 }
2715
                 }
2716
-
2716
+                console.log('项目obj',temp2)
2717
                 this.prescriptions[i].project.push(obj)
2717
                 this.prescriptions[i].project.push(obj)
2718
               }
2718
               }
2719
               this.curStatus = 2
2719
               this.curStatus = 2