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

             }
           }
 
-          total = total.toFixed(3)
+          total = total.toFixed(2)
         }
       }
       return total
           }
         }
       }
-      return total.toFixed(3)
+      return total.toFixed(2)
 
     },
     getCurTotal() {
         for (let a = 0; a < this.curPrescriptions.project.length; a++) {
           total = total + this.curPrescriptions.project[a].price * this.curPrescriptions.project[a].total
         }
-        return total.toFixed(3)
+        return total.toFixed(2)
 
       }
     },
         }
       }
 
-      return total.toFixed(3)
+      return total.toFixed(2)
     }, getMonthTotal() {
       var total = 0
       for (let i = 0; i < this.month_prescriptions.length; i++) {
         }
       }
 
-      return total.toFixed(3)
+      return total.toFixed(2)
     },
     createFilter(queryString) {
       return (restaurant) => {
               }
             }
             if (index == 1) {
-              
+
               // for (let i = 0; i < this.prescriptions.length; i++) {
               //   for(let b = 0; b < this.prescriptions[i].advices.length; b++){
               //     if (this.prescriptions[i].med_type == 14 && this.prescriptions[i].advices[b].drug.is_special_diseases != 1) {
                   this.prescriptions[i].addition[b].count = this.prescriptions[i].addition[b].count.toString()
                 }
               }
-            
+
               let data = {
                 'prescriptions': this.prescriptions
               }

src/xt_pages/outpatientTool/components/settle.vue

           <el-table-column align="center" prop="name" label="患者名字">
               <template slot-scope="scope">{{ scope.row.other_name }}</template>
           </el-table-column>
+        <el-table-column align="center" prop="item_name" label="身份证">
+          <template slot-scope="scope">
+            {{scope.row.id_card_no}}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" prop="item_name" label="治疗日期">
+          <template slot-scope="scope">
+            {{getTimes(scope.row.settle_accounts_date)}}
+          </template>
+        </el-table-column>
+
           <el-table-column align="center" prop="item_name" label="结算日期">
               <template slot-scope="scope">
                   {{scope.row.setl_time?scope.row.setl_time.split(" ")[0]:getTimes(scope.row.settle_accounts_date)}}
 
 
 <script>
-  import BreadCrumb from '@/xt_pages/components/bread-crumb'
-  import { GetSummarySettle } from '@/api/his/his'
-  import { uParseTime } from '@/utils/tools'
-  // import NewStatementPrint from './newStatementPrint'
+import BreadCrumb from '@/xt_pages/components/bread-crumb'
+import { GetSummarySettle } from '@/api/his/his'
+import { uParseTime } from '@/utils/tools'
+// import NewStatementPrint from './newStatementPrint'
   const moment = require('moment')
   export default {
     components: {
               for (let b = 0; b < data[i].orders.length; b++) {
                 let order = data[i].orders[b]
                 order['other_name'] = data[i].name
+                order['id_card_no'] = data[i].id_card_no
+
                 total = parseFloat((parseFloat(total.toString()) + parseFloat(data[i].orders[b].medfee_sumamt.toString())).toFixed(2).toString())
               }
 
         })
         this.sameRowArr = sameRowArr
       }, merge({ row, column, rowIndex, columnIndex }) {
-        if (columnIndex === 0 || columnIndex === 8) {
+        if (columnIndex === 0 || columnIndex === 1 || columnIndex === 15) {
           const _row = this.tempArr[rowIndex]
           const _col = _row > 0 ? 1 : 0
           return {
         for (let i = 0; i < this.tableData.length; i++) {
           let order = this.tableData[i]
           let name = order.other_name
+          let id_card_no = order.id_card_no
+
           let time = ''
           let balance_accounts = ""
           let med_type = ""
           let hifp_pay = ""
           let hifob_pay = ""
           let maf_pay = ""
-
+          let time2 = ""
+          time2 = this.getTimes(order.settle_accounts_date)
 
           let total = ""
 
 
           let obj = {
             '患者姓名': name,
+            '身份证': id_card_no,
+            '治疗日期': time2,
             '结算日期': time,
             '结算类型': balance_accounts,
             '处方类型': med_type,
           list.push(obj)
         }
         import('@/vendor/Export2Excel').then(excel => {
-          const tHeader = [ '患者姓名', '结算日期', '结算类型', '处方类型', '医疗费总额', '基金支付金额', '个人账户支付金额', '个人支付基金','企业补充医疗保险基金支出','居民大病保险资金支出', '费用总额']
-          const filterVal = [ '患者姓名', '结算日期', '结算类型', '处方类型', '医疗费总额', '基金支付金额', '个人账户支付金额', '个人支付基金','企业补充医疗保险基金支出','居民大病保险资金支出',  '费用总额']
+          const tHeader = [ '患者姓名','身份证', '治疗日期','结算日期', '结算类型', '处方类型', '医疗费总额', '基金支付金额', '个人账户支付金额', '个人支付基金','企业补充医疗保险基金支出','居民大病保险资金支出', '费用总额']
+          const filterVal = [ '患者姓名','身份证', '治疗日期','结算日期', '结算类型', '处方类型', '医疗费总额', '基金支付金额', '个人账户支付金额', '个人支付基金','企业补充医疗保险基金支出','居民大病保险资金支出',  '费用总额']
           const data = this.formatJson(filterVal, list)
           excel.export_json_to_excel1({
             header: tHeader,