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

src/xt_pages/hospitalStation/components/deskPrescription.vue

@@ -1689,12 +1689,12 @@ export default {
       for (let i = 0; i < this.month_prescriptions.length; i++) {
         if (this.month_prescriptions[i].advices != null) {
           for (let a = 0; a < this.month_prescriptions[i].advices.length; a++) {
-            total = total + (this.month_prescriptions[i].advices[a].retail_price.toFixed(2) * this.month_prescriptions[i].advices[a].prescribing_number)
+            total = total + (this.month_prescriptions[i].advices[a].retail_price* this.month_prescriptions[i].advices[a].prescribing_number)
           }
         }
         if (this.month_prescriptions[i].project != null) {
           for (let b = 0; b < this.month_prescriptions[i].project.length; b++) {
-            total = total+ (this.month_prescriptions[i].project[b].price.toFixed(2) * this.month_prescriptions[i].project[b].total)
+            total = total+ (this.month_prescriptions[i].project[b].price * this.month_prescriptions[i].project[b].total)
           }
         }
 

src/xt_pages/hospitalStation/components/settlePrescriptionTable.vue

@@ -66,7 +66,7 @@
       </el-table-column>
       <el-table-column align="center" prop="name" width="60" label="单价">
         <template slot-scope="scope">
-          <div>{{ scope.row.retail_price }}元</div>
+          <div>{{ scope.row.retail_price}}元</div>
 
           <!--<el-input v-model="scope.row.retail_price" placeholder="" readonly></el-input>-->
         </template>
@@ -75,9 +75,7 @@
         <template slot-scope="scope">
           <div>
             {{
-              (scope.row.prescribing_number * scope.row.retail_price).toFixed(
-                2
-              )
+              (scope.row.prescribing_number * scope.row.retail_price).toFixed(2)
             }}元
           </div>
 
@@ -211,13 +209,13 @@
       <el-table-column align="center" prop="name" width="50" label="单价">
         <template slot-scope="scope">
           <!--<el-input v-model="scope.row.price" placeholder="" readonly></el-input>-->
-          {{ scope.row.price }}元
+          {{ scope.row.price.toFixed(2) }}元
         </template>
       </el-table-column>
 
       <el-table-column align="center" prop="name" width="60" label="总价">
         <template slot-scope="scope">
-          <div>{{ (scope.row.total * scope.row.price).toFixed(2) }}元</div>
+          <div>{{ (scope.row.total * scope.row.price.toFixed(2)) }}元</div>
 
           <!--<el-input v-model="scope.row.retail_price" placeholder="" readonly></el-input>-->
         </template>

src/xt_pages/hospitalStation/invoiceTemplate/printTwo.vue

@@ -6,14 +6,14 @@
         </div>
         <div style="display:flex;justify-content: space-between;">
             <!-- <div>{{ list.department_name }}</div> -->
-            <div  style="position: absolute;top:50px;left:260px">{{ list.his_hospital_record.id_card_no }}</div>
+            <div  style="position: absolute;top:50px;left:260px">{{ list.his_hospital_record.id_card_no?list.order.certno:''}}</div>
             <div></div>
         </div>
         <div style="display:flex;justify-content: space-between;">
             <!-- <div>{{ list.department_name }}</div> -->
             <div  style="position: absolute;top:70px;left:90px">门诊</div>
             <div></div>
-            <div  style="position: absolute;top:70px;left:240px">{{ list.his_hospital_record.number }}</div>
+            <div  style="position: absolute;top:70px;left:240px">{{ list.his_hospital_record.number?list.order.mdtrt_id:''}}</div>
             <div  style="position: absolute;left:470px;top:70px;">
                 <span>{{  paramsObj.setl_time ? paramsObj.setl_time.split(' ')[0].slice(0,4) : getTime(list.date, '{y}-{m}-{d}').slice(0,4) }}</span>
             </div>

src/xt_pages/hospitalStation/outpatientChargesManagement.vue

@@ -1211,14 +1211,14 @@ export default {
       if (this.curSettlePrescriptions.type == 1) {
         if (this.curSettlePrescriptions.advices != null) {
           for (let a = 0; a < this.curSettlePrescriptions.advices.length; a++) {
-            total = parseFloat(total) + parseFloat(this.curSettlePrescriptions.advices[a].retail_price * this.curSettlePrescriptions.advices[a].prescribing_number)
+            total = parseFloat(total) + parseFloat(this.curSettlePrescriptions.advices[a].retail_price.toFixed(2)  * this.curSettlePrescriptions.advices[a].prescribing_number)
 
           }
         }
       } else {
         if (this.curSettlePrescriptions.project != null) {
           for (let b = 0; b < this.curSettlePrescriptions.project.length; b++) {
-            total = parseFloat(total) + parseFloat(this.curSettlePrescriptions.project[b].price  * this.curSettlePrescriptions.project[b].total)
+            total = parseFloat(total) + parseFloat(this.curSettlePrescriptions.project[b].price.toFixed(2)   * this.curSettlePrescriptions.project[b].total)
 
           }
         }
@@ -1249,7 +1249,7 @@ export default {
         }
 
       }
-      return total
+      return total.toFixed(2)
 
     },
     getTotal() {

src/xt_pages/outpatientCharges/invoiceTemplate/printFour.vue

@@ -6,14 +6,14 @@
         </div>
         <div style="display:flex;justify-content: space-between;">
             <!-- <div>{{ list.department_name }}</div> -->
-            <div  style="position: absolute;top:50px;left:260px">{{ list.id_card_no }}</div>
+            <div  style="position: absolute;top:50px;left:260px">{{ list.order.certno }}</div>
             <div></div>
         </div>
         <div style="display:flex;justify-content: space-between;">
             <!-- <div>{{ list.department_name }}</div> -->
             <div  style="position: absolute;top:70px;left:90px">门诊</div>
             <div></div>
-            <div  style="position: absolute;top:70px;left:240px">{{ list.number }}</div>
+            <div  style="position: absolute;top:70px;left:240px">{{ list.order.mdtrt_id }}</div>
             <div  style="position: absolute;left:470px;top:70px;">
                 <span>{{  paramsObj.setl_time ? paramsObj.setl_time.split(' ')[0].slice(0,4) : getTime(list.date, '{y}-{m}-{d}').slice(0,4) }}</span>
             </div>