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

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -87,18 +87,18 @@
           <!--&gt;退号-->
           <!--</el-button>-->
 
-          <!--<el-button v-if="$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9919" size="small" @click="open(11)" type="primary"-->
-          <!--&gt;撤销明细-->
-          <!--</el-button>-->
+          <el-button v-if="$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9919" size="small" @click="open(11)" type="primary"
+          >撤销明细
+          </el-button>
 
 
           <!--<el-button v-if="$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9919" size="small" @click="open(12)" type="primary"-->
           <!--&gt;查编码-->
           <!--</el-button>-->
 
-          <!--<el-button v-if="$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9919" size="small" @click="open(13)" type="primary"-->
-          <!--&gt;查待遇-->
-          <!--</el-button>-->
+          <el-button v-if="$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9919" size="small" @click="open(13)" type="primary"
+          >查待遇
+          </el-button>
 
 
         </div>
@@ -526,7 +526,7 @@
                   single_dose: prescription.advices[b].single_dose,
                   delivery_way: prescription.advices[b].delivery_way,
                   execution_frequency: prescription.advices[b].execution_frequency,
-                  retail_price: prescription.advices[b].price.toString(),
+                  retail_price: prescription.advices[b].price,
                   remark: prescription.advices[b].remark,
                   day: prescription.advices[b].day,
                   prescribing_number: prescription.advices[b].prescribing_number.toString(),
@@ -614,14 +614,14 @@
         if (this.curPrescriptions.type == 1) {
           if (this.curPrescriptions.advices != null) {
             for (let a = 0; a < this.curPrescriptions.advices.length; a++) {
-              total = total + Math.floor((this.curPrescriptions.advices[a].retail_price * this.curPrescriptions.advices[a].prescribing_number) * 100) / 100
+              total = total + (this.curPrescriptions.advices[a].retail_price * this.curPrescriptions.advices[a].prescribing_number)
 
             }
           }
         } else {
           if (this.curPrescriptions.project != null) {
             for (let b = 0; b < this.curPrescriptions.project.length; b++) {
-              total = total + Math.floor((this.curPrescriptions.project[b].price * this.curPrescriptions.project[b].total) * 100) / 100
+              total = total + (this.curPrescriptions.project[b].price * this.curPrescriptions.project[b].total)
 
             }
           }
@@ -629,10 +629,10 @@
 
         if (this.curPrescriptions.addition != null) {
           for (let b = 0; b < this.curPrescriptions.addition.length; b++) {
-            total = total + Math.floor((this.curPrescriptions.addition[b].price * this.curPrescriptions.addition[b].count) * 100) / 100
+            total = total + (this.curPrescriptions.addition[b].price * this.curPrescriptions.addition[b].count)
           }
         }
-        return Math.floor(total * 100) / 100
+        return (total * 100) / 100
 
       },
       getTotal() {
@@ -640,22 +640,22 @@
         for (let i = 0; i < this.prescriptions.length; i++) {
           if (this.prescriptions[i].advices != null) {
             for (let a = 0; a < this.prescriptions[i].advices.length; a++) {
-              total = total + Math.floor((this.prescriptions[i].advices[a].retail_price * this.prescriptions[i].advices[a].prescribing_number) * 100) / 100
+              total = total + (this.prescriptions[i].advices[a].retail_price * this.prescriptions[i].advices[a].prescribing_number)
             }
           }
           if (this.prescriptions[i].project != null) {
             for (let b = 0; b < this.prescriptions[i].project.length; b++) {
 
-              total = total + Math.floor((this.prescriptions[i].project[b].price * this.prescriptions[i].project[b].total) * 100) / 100
+              total = total + (this.prescriptions[i].project[b].price * this.prescriptions[i].project[b].total)
             }
           }
           if (this.prescriptions[i].addition != null) {
             for (let b = 0; b < this.prescriptions[i].addition.length; b++) {
-              total = total + Math.floor((this.prescriptions[i].addition[b].price * this.prescriptions[i].addition[b].count) * 100) / 100
+              total = total + (this.prescriptions[i].addition[b].price * this.prescriptions[i].addition[b].count)
             }
           }
         }
-        return Math.floor(total * 100) / 100
+        return (total * 100) / 100
 
       },
       moreState(tab, event) {

src/xt_pages/outpatientDoctorStation/components/callPrescription.vue

@@ -247,7 +247,7 @@
             let tempAddition = []
             for (let b = 0; b < prescription.doctor_advice.length; b++) {
               let obj = {
-                advice_id: prescription.doctor_advice[b].id,
+                advice_id: 0,
                 drug_name: prescription.doctor_advice[b].advice_name,
                 single_dose: prescription.doctor_advice[b].single_dose,
                 delivery_way: prescription.doctor_advice[b].delivery_way,
@@ -268,7 +268,7 @@
 
             for (let b = 0; b < prescription.project.length; b++) {
               let obj = {
-                id: prescription.project[b].id,
+                id: 0,
                 project_id: prescription.project[b].project_id,
                 project_name: prescription.project[b].project.project_name,
                 statistical_classification: prescription.project[b].project.statistical_classification,

src/xt_pages/outpatientDoctorStation/components/nextOrLastPrescription.vue

@@ -302,7 +302,7 @@
             let tempAddition = []
             for (let b = 0; b < prescription.doctor_advice.length; b++) {
               let obj = {
-                advice_id: prescription.doctor_advice[b].id,
+                advice_id: 0,
                 drug_name: prescription.doctor_advice[b].advice_name,
                 single_dose: prescription.doctor_advice[b].single_dose,
                 delivery_way: prescription.doctor_advice[b].delivery_way,
@@ -323,7 +323,7 @@
 
             for (let b = 0; b < prescription.project.length; b++) {
               let obj = {
-                id: prescription.project[b].id,
+                id: 0,
                 project_id: prescription.project[b].project_id,
                 project_name: prescription.project[b].project.project_name,
                 statistical_classification: prescription.project[b].project.statistical_classification,