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

src/xt_pages/dialysis/dialysisDoctorAdvice.vue

@@ -542,11 +542,12 @@ export default {
                     projectArr.push(item)
                   }
                 })
-
               })
 
+              console.log(projectArr)
+
               resp.data.hisAdvices.map((item,index) => {
-                if(projectArr[index].project.length > 0){
+                if(projectArr[index].project && projectArr[index].project.length > 0){
                   projectArr[index].project.map(it => {
                     let obj = {
                       advice_doctor: it.doctor,

src/xt_pages/hospitalStation/summary.vue

@@ -74,10 +74,10 @@
                 <!--<template slot-scope="scope"></template>-->
                 <!--</el-table-column>-->
                 <el-table-column align="center" prop="name" label="应收金额">
-                    <template slot-scope="scope">{{scope.row.medfee_sumamt}}</template>
+                    <template slot-scope="scope">{{scope.row.medfee_sumamt.toFixed(4)}}</template>
                 </el-table-column>
                 <el-table-column align="center" prop="name" label="实收金额">
-                    <template slot-scope="scope">{{scope.row.reality_price}}</template>
+                    <template slot-scope="scope">{{scope.row.reality_price.toFixed(4)}}</template>
                 </el-table-column>
                 <el-table-column align="center" prop="name" label="科室">
                     <template slot-scope="scope">{{scope.row.department_name}}</template>

src/xt_pages/hospitalStation/summaryDetail.vue

@@ -56,7 +56,7 @@
                             <el-table-column align="center" prop="name" width="60" label="单价">
                                 <template slot-scope="scope">
                                     <!--<el-input v-model="scope.row.price" placeholder="" readonly></el-input>-->
-                                    {{scope.row.price}}元
+                                    {{scope.row.price.toFixed(4)}}元
 
                                 </template>
                             </el-table-column>
@@ -64,7 +64,7 @@
                             <el-table-column align="center" prop="name" width="60" label="总价">
                                 <template slot-scope="scope">
                                     <!--<el-input v-model="scope.row.price" placeholder="" readonly></el-input>-->
-                                    {{scope.row.price}}元
+                                    {{scope.row.price.toFixed(4)}}元
 
                                 </template>
                             </el-table-column>
@@ -112,12 +112,12 @@
                     </ul>
                     <p class="centerRightTitle" style="margin-top:10px;">收费信息</p>
                     <ul class="basicUl">
-                        <li style="width:50%;">应收金额：{{order.medfee_sumamt }}元</li>
-                        <li style="width:50%;">实收金额：{{order.reality_price}}元</li>
-                        <li style="width:50%;">舍入金额：{{order.medfee_sumamt - order.reality_price}}元</li>
-                        <li style="width:50%;">优惠金额：{{order.preferential_price}}元</li>
+                        <li style="width:50%;">应收金额：{{order.medfee_sumamt.toFixed(4) }}元</li>
+                        <li style="width:50%;">实收金额：{{order.reality_price.toFixed(4)}}元</li>
+                        <li style="width:50%;">舍入金额：{{order.medfee_sumamt.toFixed(4) - order.reality_price.toFixed(4)}}元</li>
+                        <li style="width:50%;">优惠金额：{{order.preferential_price.toFixed(4)}}元</li>
                         <li style="width:50%;">总金额</li>
-                        <li style="width:50%;">{{order.medfee_sumamt}}元</li>
+                        <li style="width:50%;">{{order.medfee_sumamt.toFixed(4)}}元</li>
                     </ul>
                     <!--<p class="centerRightTitle">发票费用</p>-->
                     <!--<ul class="basicUl">-->

src/xt_pages/outpatientCharges/listTemplate/printOne.vue

@@ -28,9 +28,9 @@
                 <td style="width:10%">{{item.med_chrgitm_type}}</td>
                 <td style="width:31%">{{item.name}}</td>
                 <td style="width:14%">{{item.spec}}</td>
-                <td style="width:10%">{{(item.price).toFixed(2)}}</td>
+                <td style="width:10%">{{(item.price).toFixed(4)}}</td>
                 <td style="width:6%">{{item.count}}{{item.unit}}</td>
-                <td style="width:10%">{{(item.price * item.count).toFixed(2)}}</td>
+                <td style="width:10%">{{(item.price * item.count).toFixed(4)}}</td>
             </tr>
         </table>
         <div class="tableBottom">

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -162,15 +162,15 @@
                                                 <span>当前处方总费用：<span style="color:red;">{{items.total}}元</span></span>
 
 
-                                                <span>医疗费总额：<span style="color:red;">{{ items.curPrescriptions.order.medfee_sumamt ?  items.curPrescriptions.order.medfee_sumamt:getTotalFour(items.prescriptions)?getTotalFour(items.prescriptions):'' }}元</span></span>
-                                                <span>基金支付金额：<span style="color:red;">{{ items.curPrescriptions.order.hifp_pay?items.curPrescriptions.order.hifp_pay:''}}元</span></span>
-                                                <span>个人账户支付金额：<span style="color:red;">{{ items.curPrescriptions.order.acct_pay?items.curPrescriptions.order.acct_pay:''}}元</span></span>
+                                                <span>医疗费总额：<span style="color:red;">{{ items.curPrescriptions.order.medfee_sumamt ?  items.curPrescriptions.order.medfee_sumamt.toFixed(4):getTotalFour(items.prescriptions)?getTotalFour(items.prescriptions):'' }}元</span></span>
+                                                <span>基金支付金额：<span style="color:red;">{{ items.curPrescriptions.order.hifp_pay?items.curPrescriptions.order.hifp_pay.toFixed(4):''}}元</span></span>
+                                                <span>个人账户支付金额：<span style="color:red;">{{ items.curPrescriptions.order.acct_pay?items.curPrescriptions.order.acct_pay.toFixed(4):''}}元</span></span>
                                                 <span v-if="hisPatientInfo.balance_accounts_type != 2">个人支付金额：<span
-                                                        style="color:red;">{{ items.curPrescriptions.order.psn_cash_pay?items.curPrescriptions.order.psn_cash_pay:''}}元</span></span>
+                                                        style="color:red;">{{ items.curPrescriptions.order.psn_cash_pay?items.curPrescriptions.order.psn_cash_pay.toFixed(4):''}}元</span></span>
                                                 <span v-if="hisPatientInfo.balance_accounts_type == 2">个人支付金额：<span
-                                                        style="color:red;">{{ items.curPrescriptions.order.medfee_sumamt}}元</span></span>
+                                                        style="color:red;">{{ items.curPrescriptions.order.medfee_sumamt.toFixed(4)}}元</span></span>
 
-                                                <span>个人账户金额：<span style="color:red;">{{ items.curPrescriptions.order.balc?items.curPrescriptions.order.balc:''}}元</span></span>
+                                                <span>个人账户金额：<span style="color:red;">{{ items.curPrescriptions.order.balc?items.curPrescriptions.order.balc.toFixed(4):''}}元</span></span>
 
                                                 <span v-if="items.curPrescriptions.order_status  == 1">待结算</span>
                                                 <span v-if="items.curPrescriptions.order_status  == 2">已结算</span>

src/xt_pages/outpatientCharges/summary.vue

@@ -81,10 +81,10 @@
                 <!--</el-table-column>-->
 
                 <el-table-column align="center" width="90" prop="name" label="应收金额">
-                    <template slot-scope="scope">{{scope.row.medfee_sumamt}}</template>
+                    <template slot-scope="scope">{{scope.row.medfee_sumamt.toFixed(4)}}</template>
                 </el-table-column>
                 <el-table-column align="center" width="90" prop="name" label="实收金额">
-                    <template slot-scope="scope">{{scope.row.reality_price}}</template>
+                    <template slot-scope="scope">{{scope.row.reality_price.toFixed(4)}}</template>
                 </el-table-column>
                 <el-table-column align="center" width="90" prop="name" label="科室">
                     <template slot-scope="scope">{{scope.row.department_name}}</template>

src/xt_pages/outpatientCharges/summaryDetail.vue

@@ -64,7 +64,7 @@
                           <el-table-column align="center" prop="name" width="60" label="总价">
                               <template slot-scope="scope">
                                   <!--<el-input v-model="scope.row.price" placeholder="" readonly></el-input>-->
-                                  {{scope.row.price}}元
+                                  {{scope.row.price.toFixed(4)}}元
 
                               </template>
                           </el-table-column>
@@ -92,7 +92,7 @@
 
                     </div>
                     <div class="costBox">
-                      <span>当前处方总费用：<span style="color:red;">{{ order.medfee_sumamt}}元</span></span>
+                      <span>当前处方总费用：<span style="color:red;">{{ order.medfee_sumamt.toFixed(4)}}元</span></span>
                       <span v-if="order.order_status == 1">待结算</span>
                       <span v-if="order.order_status == 2">已结算</span>
                       <span v-if="order.order_status == 3">已退费</span>
@@ -112,12 +112,12 @@
                     </ul>
                     <p class="centerRightTitle" style="margin-top:10px;">收费信息</p>
                     <ul class="basicUl">
-                        <li style="width:50%;">应收金额：{{order.medfee_sumamt }}元</li>
-                        <li style="width:50%;">实收金额：{{order.reality_price}}元</li>
-                        <li style="width:50%;">舍入金额：{{order.medfee_sumamt - order.reality_price}}元</li>
-                        <li style="width:50%;">优惠金额：{{order.preferential_price}}元</li>
+                        <li style="width:50%;">应收金额：{{order.medfee_sumamt.toFixed(4) }}元</li>
+                        <li style="width:50%;">实收金额：{{order.reality_price.toFixed(4)}}元</li>
+                        <li style="width:50%;">舍入金额：{{order.medfee_sumamt.toFixed(4) - order.reality_price.toFixed(4)}}元</li>
+                        <li style="width:50%;">优惠金额：{{order.preferential_price.toFixed(4)}}元</li>
                         <li style="width:50%;">总金额</li>
-                        <li style="width:50%;">{{order.medfee_sumamt}}元</li>
+                        <li style="width:50%;">{{order.medfee_sumamt.toFixed(4)}}元</li>
                     </ul>
                     <!--<p class="centerRightTitle">发票费用</p>-->
                     <!--<ul class="basicUl">-->

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -1640,7 +1640,7 @@
                 total = total + this.month_prescriptions[i].addition[b].price * this.month_prescriptions[i].addition[b].count
               }
             }
-            total = Math.floor(total * 100) / 100
+            total = total.toFixed(4)
           }
         }
         return total
@@ -1653,12 +1653,12 @@
           for (let a = 0; a < this.curPrescriptions.advices.length; a++) {
             total = total + this.curPrescriptions.advices[a].retail_price * this.curPrescriptions.advices[a].prescribing_number
           }
-          return Math.floor(total * 100) / 100
+          return total.toFixed(4)
         } else {
           for (let a = 0; a < this.curPrescriptions.project.length; a++) {
             total = total + this.curPrescriptions.project[a].price * this.curPrescriptions.project[a].total
           }
-          return Math.floor(total * 100) / 100
+          return total.toFixed(4)
         }
 
       },
@@ -1683,7 +1683,7 @@
           }
         }
 
-        return Math.floor(total * 100) / 100
+        return total.toFixed(4)
       }, getMonthTotal() {
         var total = 0
         for (let i = 0; i < this.month_prescriptions.length; i++) {
@@ -1705,7 +1705,7 @@
           }
         }
 
-        return Math.floor(total * 100) / 100
+        return total.toFixed(4)
       },
       createFilter(queryString) {
         return (restaurant) => {

src/xt_pages/outpatientDoctorStation/template/printFour.vue

@@ -35,7 +35,7 @@
                   <div style="margin-left:100px;"><span>{{it.single_dose}}{{it.single_dose_unit}}&nbsp;×&nbsp; {{it.count}}{{unit}}</span></div>
               </div>
               <div class="drugsBox" v-for="(it,i) in item.additionalcharge" :key="i">
-                <div class="drugsOne">{{it.project_id?it.project_id:""}}:&nbsp;{{it.price}}元/{{it.count}}次</div>
+                <div class="drugsOne">{{it.project_id?it.project_id:""}}:&nbsp;{{it.price.toFixed(4)}}元/{{it.count}}次</div>
                </div>
                <div style="text-align:center;" >(以下空白)</div>
 

src/xt_pages/outpatientDoctorStation/template/printOne.vue

@@ -35,7 +35,7 @@
                   <div style="margin-left:100px;"><span>用法：{{it.single_dose}}{{it.single_dose_unit}}</span>&nbsp;&nbsp;<span>{{it.delivery_way}}</span>&nbsp;&nbsp;<span>{{it.advice_desc}}</span></div>
               </div>
               <div class="drugsBox" v-for="(it,i) in item.additionalcharge" :key="i">
-                <div class="drugsOne">{{it.project_id?it.project_id:""}}:&nbsp;{{it.price}}元/{{it.count}}次</div>
+                <div class="drugsOne">{{it.project_id?it.project_id:""}}:&nbsp;{{it.price.toFixed(4)}}元/{{it.count}}次</div>
                </div>
                <div style="text-align:center;" >(以下空白)</div>
 

src/xt_pages/outpatientDoctorStation/template/printThree.vue

@@ -43,7 +43,7 @@
                   <div style="margin-left:100px;"><span>用法：{{it.single_dose}}{{it.single_dose_unit}}</span>&nbsp;&nbsp;<span>{{it.execution_frequency}}&nbsp;{{it.delivery_way}}&nbsp;</span>&nbsp;&nbsp;<span>{{it.advice_desc}}</span></div>
               </div>
               <div class="drugsBox" v-for="(it,i) in item.additionalcharge" :key="i">
-                <div class="drugsOne">{{it.item_name?it.item_name:""}}:&nbsp;{{it.price}}元/{{it.count}}次</div>
+                <div class="drugsOne">{{it.item_name?it.item_name:""}}:&nbsp;{{it.price.toFixed(4)}}元/{{it.count}}次</div>
               </div>
 
               <!-- <div class="drugsBox" v-for="(it,index) in item.project" :key="index">
@@ -129,7 +129,7 @@ export default {
       //   age++
       // }
       // return age
-      var nowTime = new Date().getTime(); 
+      var nowTime = new Date().getTime();
       //一年毫秒数(365 * 86400000 = 31536000000)
       return Math.ceil((nowTime-(birthday * 1000))/31536000000);
     },

src/xt_pages/outpatientDoctorStation/template/printTwo.vue

@@ -35,7 +35,7 @@
             <p>配对:</p>
             <p>核对：{{getDoctor(advicePrint[0].checker)?getDoctor(advicePrint[0].checker):""}}</p>
             <p>发药：{{getDoctor(advicePrint[0].execution_staff)?getDoctor(advicePrint[0].execution_staff):""}}</p>
-            <p>药费：{{advicePrint[0].price?advicePrint[0].price:""}}</p>
+            <p>药费：{{advicePrint[0].price.toFixed(4)?advicePrint[0].price.toFixed(4):""}}</p>
         </div>
     </div>
 </template>

src/xt_pages/outpatientDoctorStation/treatTemplate/printOne.vue

@@ -54,7 +54,7 @@
                         <td>{{it.type == 2 ? it.project.project_name : it.good_info.good_name}}</td>
                         <td>{{it.count}}</td>
                         <td>{{getUnit(it.unit)}}</td>
-                        <td>{{it.price}}</td>
+                        <td>{{it.price.toFixed(4)}}</td>
                         <td></td>
                         <td>{{it.remark}}</td>
                         <td>{{it.day}}</td>
@@ -66,7 +66,7 @@
                         <td>{{it.advice_name?it.advice_name:''}}</td>
                         <td>{{it.single_dose?it.single_dose:''}}</td>
                         <td>{{it.single_dose_unit?it.single_dose_unit:''}}</td>
-                        <td>{{it.price}}</td>
+                        <td>{{it.price.toFixed(4)}}</td>
                         <td></td>
                         <td>{{it.remark}}</td>
                         <td>{{it.day}}</td>

src/xt_pages/outpatientTool/components/detail.vue

@@ -231,13 +231,16 @@
                   if (orders[b].order_info[c].advice_id == 0 && orders[b].order_info[c].project_id > 0) {
                     newObj['type'] = 2
                     newObj['item_id'] = orders[b].order_info[c].project.project_id
-                    newObj['item_name'] = orders[b].order_info[c].project.project.project_name
 
                     if (orders[b].order_info[c].project.type == 2) {
                       newObj['item_spec'] =""
+                      newObj['item_name'] = orders[b].order_info[c].project.project.project_name
+
 
                     } else if (orders[b].order_info[c].project.type == 3) {
                       newObj['item_spec'] =    orders[b].order_info[c].project.good_info.specification_name
+                      newObj['item_name'] = orders[b].order_info[c].project.good_info.good_name
+
 
                     }
                   }

src/xt_pages/outpatientTool/components/settle.vue

@@ -80,16 +80,16 @@
               </template>
           </el-table-column>
           <el-table-column align="center" prop="item_name" label="医疗费总额">
-              <template slot-scope="scope">{{scope.row.medfee_sumamt}}</template>
+              <template slot-scope="scope">{{scope.row.medfee_sumamt.toFixed(4)}}</template>
           </el-table-column>
           <el-table-column align="center" prop="item_name" label="基金支付金额">
-              <template slot-scope="scope">{{scope.row.fund_pay_sumamt}}</template>
+              <template slot-scope="scope">{{scope.row.fund_pay_sumamt.toFixed(4)}}</template>
           </el-table-column>
           <el-table-column align="center" prop="item_name" label="个人账户支付金额">
-              <template slot-scope="scope">{{scope.row.acct_pay}}</template>
+              <template slot-scope="scope">{{scope.row.acct_pay.toFixed(4)}}</template>
           </el-table-column>
           <el-table-column align="center" prop="item_name" label="个人支付金额">
-              <template slot-scope="scope">{{scope.row.psn_cash_pay}}</template>
+              <template slot-scope="scope">{{scope.row.psn_cash_pay.toFixed(4)}}</template>
           </el-table-column>
           <el-table-column align="center" prop="total" label="费用总额">
               <template slot-scope="scope">