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

src/lang/zh.js

     outpatientRecord: '住院工作站',
     advancePayment: '预交金',
     labelPrinting: '标签打印',
-    summary: '项目消费明细汇总',
+    summary: '收费列表',
     outpatientPharmacy: '门诊药房',
     pharmacyFormula: '药房配发药',
     prescriptionDrugReturn: '处方退药',

src/xt_pages/outpatientTool/components/detail.vue

             <el-table :data="tableData" border :row-style="{ color: '#303133' }"
                       :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
                       :span-method="merge"
+                      v-loading="detail_loading"
                       highlight-current-row>
 
                 <el-table-column align="center" prop="name" label="患者名字">
     },
     data() {
       return {
+        detail_loading:false,
         tempArr: [],
         sameRowArr: [],
         keywords: '',
 
       },
       getSummaryDetailList() {
+        this.detail_loading = true
         let start_time = this.chargeDate[0]
         let end_time = this.chargeDate[1]
         let params = {
         }
         GetSummaryDetail(params).then(response => {
           if (response.data.state == 0) {
+            this.detail_loading = false
+
             this.$message.error(response.data.msg)
             return false
           } else {
+            this.detail_loading = false
+
             this.tableData = []
             let tempPatients = []
             let tempPatientsTwo = []

src/xt_pages/outpatientTool/components/gather.vue

             </div>
             <el-table :data="tableData" border :row-style="{ color: '#303133' }"
                       :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
+                      v-loading="gather_loading"
                       show-summary
                       max-height="600"
                       :span-method="merge"
     },
     data() {
       return {
+        gather_loading:false,
         crumbs: [],
         tempArr: [],
         sameRowArr: [],
         this.getSummaryDetailList()
       },
       getSummaryDetailList() {
+        this.gather_loading = true
         let start_time = this.chargeDate[0]
         let end_time = this.chargeDate[1]
         let params = {
         }
         GetSummaryDetail(params).then(response => {
           if (response.data.state == 0) {
+            this.gather_loading = false
+
             this.$message.error(response.data.msg)
             return false
           } else {
+            this.gather_loading = false
+
             let tempPatients = []
             let tempPatientsTwo = []
             this.tableData = []

src/xt_pages/outpatientTool/components/settle.vue

             <el-table :data="tableData" border :row-style="{ color: '#303133' }"
                       :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
                       show-summary
+                      v-loading="settle_loading"
                       max-height="600"
                       :span-method="merge"
                       :summary-method="getTotal"
                 </el-table-column>
                 <el-table-column align="center" prop="item_name" label="结算日期">
                     <template slot-scope="scope">
-                        {{scope.row.setl_time?scope.row.setl_time:getTimes(scope.row.settle_accounts_date)}}
+                        {{scope.row.setl_time?scope.row.setl_time.split(" ")[0]:getTimes(scope.row.settle_accounts_date)}}
                     </template>
                 </el-table-column>
 
     },
     data() {
       return {
+        settle_loading:false,
         crumbs: [],
         tempArr: [],
         sameRowArr: [],
           type: this.item_type,
           keyword: this.keywords
         }
+        this.settle_loading = true
         GetSummarySettle(params).then(response => {
           if (response.data.state == 0) {
+            this.settle_loading = false
+
             this.$message.error(response.data.msg)
             return false
           } else {
+            this.settle_loading = false
             this.tableData = []
             let data = response.data.data.patients
 
         let list = []
         for (let i = 0; i < this.tableData.length; i++) {
           let order = this.tableData[i]
-          let name = ''
+          let name = order.other_name
           let time = ''
           let balance_accounts = ""
           let med_type = ""
+          let medfee_sumamt = ""
+          let fund_pay_sumamt = ""
+          let acct_pay = ""
+          let psn_cash_pay = ""
+          let total = ""
+          if(order.setl_time.length == 0){
+
+            time = this.getTimes(order.settle_accounts_date)
+
+          }else {
+
+            time = order.setl_time.split(" ")[0]
+
+          }
 
           if (order.is_medicine_insurance == 0) {
             balance_accounts = '自费'
             med_type = '普通门诊'
           }
 
-          let number = ''
-
-          let department = ''
-          let doctor_name = ''
-          let order_status = ''
-          let charge_name = ''
-          let insutypeName = ''
-
-
-
-
+          medfee_sumamt = order.medfee_sumamt
+          fund_pay_sumamt = order.fund_pay_sumamt
+          acct_pay = order.acct_pay
+          psn_cash_pay = order.psn_cash_pay
+          total = order.total
 
-          if (order.patient != null && order.patient.name.length > 0) {
-            name = order.patient.name
-
-          }
-
-          if (order.p_info != null && order.p_info.department != null && order.p_info.department.name.length > 0) {
-            department = order.p_info.department.name
-
-          }
-
-          if (order.p_info != null && order.p_info.doctor.length > 0) {
-            doctor_name = order.p_info.doctor
-          }
-
-          if (order.creator != null) {
-            charge_name = this.getName(order.creator)
-          }
-          if (order.insutype == '390') {
-
-            insutypeName = '城乡居民基本医疗保险'
-          } else if (order.insutype == '310') {
-            insutypeName = '职工基本医疗保险'
-
-          }
-
-          if (order.order_status == 1) {
-            order_status = '待结算'
-          }
-
-          if (order.order_status == 2) {
-            order_status = '已结算'
-          }
-
-          if (order.order_status == 3) {
-            order_status = '已退费'
-          }
-
-          if (order.settle_type == 2) {
-            time = this.getTimes(order.settle_start_time)
-          } else {
-            time = this.getTimes(order.settle_accounts_date)
-          }
-
-          var hifmi_pay = 0.00
-
-          if (order.setl_detail.length > 0) {
-            var jsonObj = JSON.parse(order.setl_detail)
-            for (let i = 0; i < jsonObj.length; i++) {
-              if (order.insutype == '310') {
-                if (jsonObj[i].fund_pay_type == '310300') {
-                  hifmi_pay = jsonObj[i].fund_payamt
-                }
-
-              } else if (order.insutype == '390') {
-                if (order.fund_pay_type == '390200') {
-                  hifmi_pay = jsonObj[i].fund_payamt
-                }
-              }
-            }
-          }
-          var hifmi_pay = 0.00
-
-          if (order.setl_detail.length > 0) {
-            var jsonObj = JSON.parse(order.setl_detail)
-            for (let i = 0; i < jsonObj.length; i++) {
-              if (order.insutype == '310') {
-                if (jsonObj[i].fund_pay_type == '310300') {
-                  hifmi_pay = jsonObj[i].fund_payamt
-                }
-              }
-              if (order.insutype == '390') {
-                if (jsonObj[i].fund_pay_type == '390200') {
-                  hifmi_pay = jsonObj[i].fund_payamt
-                }
-              }
-            }
-          }
 
           let obj = {
-            '就诊号': order.mdtrt_id,
             '患者姓名': name,
-            '开处时间': time,
-            '险种类型': insutypeName,
-            '应收金额': order.medfee_sumamt,
-            '实收金额': order.medfee_sumamt,
-            '医保统筹金额': order.hifp_pay,
-            '大额基金金额': order.hifob_pay,
-            '大病基金金额': hifmi_pay,
-            '补充保险基金金额': order.hifes_pay,
-            '医疗救助基金金额': order.maf_pay,
-            '公务员基金': order.cvlserv_pay,
-            '个人支付基金': order.psn_cash_pay,
-            '个人账户支付金额': order.acct_pay,
-            '科室': department,
-            '医生姓名': doctor_name,
-            '收费类别': balance_accounts,
-            '收费者姓名': charge_name,
-            '总金额': order.medfee_sumamt,
-            '现金支付': '',
-            '账户支付': '',
-            '支付宝支付': '',
-            '微信支付': '',
-            '其他支付': '',
-            '收费时间': order.setl_time,
-            '收费状态': order_status,
-            '退费日期': ''
+            '结算日期': time,
+            '结算类型': balance_accounts,
+            '处方类型': med_type,
+            '医疗费总额': medfee_sumamt,
+            '基金支付金额': fund_pay_sumamt,
+            '个人账户支付金额': acct_pay,
+            '个人支付基金': psn_cash_pay,
+            '费用总额':total,
           }
-
           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_excel({
             header: tHeader,
             data,
-            filename: '消费明细'
+            filename: '结算明细'
           })
         })