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

@@ -1705,7 +1705,7 @@
           }
         }
 
-        return total.toFixed(24)
+        return total.toFixed(2)
       },
       createFilter(queryString) {
         return (restaurant) => {

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -461,8 +461,8 @@
             scanStyles: false
           })
         }
-        
-        
+
+
         this.innerVisible = false
         // this.$nextTick(() => {
         //   this.$refs.print.printThisPage()

src/xt_pages/outpatientDoctorStation/prescriptionTemplate.vue

@@ -179,6 +179,7 @@
         this.limit = 10
         this.patient_id = val.id
         this.patient_name = val.name
+
         let params = {
           patient_id: val.id,
           page: this.page,

src/xt_pages/outpatientTool/components/settle.vue

@@ -99,9 +99,6 @@
               <template slot-scope="scope">{{scope.row.hifob_pay.toFixed(2)}}</template>
           </el-table-column>
 
-          <el-table-column align="center" prop="item_name" label="大病基金支付">
-              <template slot-scope="scope">{{scope.row.hifmi_pay.toFixed(2)}}</template>
-          </el-table-column>
 
           <el-table-column align="center" prop="item_name" label="医疗救助基金">
               <template slot-scope="scope">{{scope.row.maf_pay.toFixed(2)}}</template>
@@ -364,6 +361,11 @@
           let psn_cash_pay = ""
           let hifes_pay = ""
           let hifmi_pay = ""
+          let hifp_pay = ""
+          let hifob_pay = ""
+          let maf_pay = ""
+
+
           let total = ""
 
           if(order.setl_time.length == 0){
@@ -394,10 +396,15 @@
 
           medfee_sumamt = order.medfee_sumamt
           fund_pay_sumamt = order.fund_pay_sumamt
+
           acct_pay = order.acct_pay
+
           psn_cash_pay = order.psn_cash_pay
           hifes_pay = order.hifes_pay
           hifmi_pay = order.hifmi_pay
+          hifp_pay = order.hifp_pay
+          hifob_pay = order.hifob_pay
+          maf_pay = order.maf_pay
           total = order.total
 
 
@@ -408,6 +415,9 @@
             '处方类型': med_type,
             '医疗费总额': medfee_sumamt,
             '基金支付金额': fund_pay_sumamt,
+            '基金统筹金额': hifp_pay,
+            '大额基金支付':hifob_pay,
+            '医疗救助基金':maf_pay,
             '个人账户支付金额': acct_pay,
             '个人支付基金': psn_cash_pay,
             '企业补充医疗保险基金支出': hifes_pay,

src/xt_pages/qcd/workAnalysis/nurse.vue

@@ -155,7 +155,7 @@
                 <span v-if="getTotalCount(scope.row.admin_user_id)!=''">({{getTotalCount(scope.row.admin_user_id)}})</span>
               </template>
             </el-table-column>
-            
+
              <el-table-column label="下机" align="center">
               <template slot-scope="scope">
                 {{scope.row.finish_nuser_count?scope.row.finish_nuser_count:''}}
@@ -164,7 +164,7 @@
 
             <el-table-column label="冲管" align="center">
               <template slot-scope="scope">
-                {{scope.row.finish_nuser_count?scope.row.finish_nuser_count:''}}
+                {{scope.row.washpipe_nuser_count?scope.row.washpipe_nuser_count:''}}
               </template>
             </el-table-column>