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

src/xt_pages/outpatientCharges/summary.vue

@@ -85,7 +85,9 @@
           <template slot-scope="scope">{{scope.row.department_name}}</template>
         </el-table-column>
         <el-table-column align="center" prop="name" label="收费日期">
-          <template slot-scope="scope"> {{scope.row.setl_time?scope.row.setl_time:getTimes(scope.row.settle_accounts_date)}}</template>
+          <template slot-scope="scope">
+            {{scope.row.setl_time?scope.row.setl_time:getTimes(scope.row.settle_accounts_date)}}
+          </template>
         </el-table-column>
         <el-table-column align="center" prop="name" label="收费员">
           <template slot-scope="scope">{{ getName(scope.row.creator) }}</template>
@@ -104,6 +106,10 @@
                        v-if="(scope.row.order_status == 2 && $store.getters.xt_user.org_id == 9504) || (scope.row.order_status == 2 && $store.getters.xt_user.org_id == 9919) ||  ($store.getters.xt_user.org_id == 10106) ||  (scope.row.order_status == 2 && $store.getters.xt_user.org_id == 4) || (scope.row.order_status == 2 && $store.getters.xt_user.org_id == 9990)">
               结算单
             </el-button>
+            <el-button size="mini" type="primary" @click="uploadInfo(scope.row)"
+                       v-if="scope.row.order_status == 2&& scope.row.result.id == 0">
+              上传结算清单
+            </el-button>
             <el-button size="mini" type="primary"
                        v-if="scope.row.order_status == 2 && $store.getters.xt_user.org_id == 10106"
                        @click="settlementPrint(scope.row)">结算单
@@ -235,6 +241,40 @@
       }
     },
     methods: {
+      uploadInfo(row) {
+        var that = this;
+        axios.get('http://127.0.0.1:9532/api/settlelist/get', {
+          params: {
+            order_id: row.id,
+            admin_user_id: this.$store.getters.xt_user.user.id
+          }
+        }).then(function (response) {
+          if (response.data.state == 0) {
+            that.$message.error(response.data.msg);
+            return false
+          } else {
+
+            if (response.data.data.failed_code == -10) {
+              // that.$message.error(response.data.data.msg)
+              that.$confirm(response.data.data.msg, '医保错误信息', {
+                confirmButtonText: '确 定',
+                type: 'warning'
+              }).then(() => {
+
+              }).catch(() => {
+              })
+
+            } else {
+              that.$message.success("上传成功");
+              row.result.id = response.data.data.result.id
+            }
+
+
+          }
+        }).catch(function (error) {
+        })
+      },
+
       fetchAllAdminUsers() {
         fetchAllAdminUsers().then(response => {
           if (response.data.state == 1) {
@@ -431,6 +471,22 @@
                 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
+                    }
+                }
+              }
 
               let obj = {
                 '就诊号': order.mdtrt_id,
@@ -441,7 +497,7 @@
                 '实收金额': order.medfee_sumamt,
                 '医保统筹金额': order.fund_pay_sumamt,
                 '大额基金金额': order.hifob_pay,
-                '大病基金金额': order.hifmi_pay,
+                '大病基金金额': hifmi_pay,
                 '补充保险基金金额': order.hifes_pay,
                 '医疗救助基金金额': order.maf_pay,
                 '公务员基金': order.cvlserv_pay,
@@ -461,11 +517,12 @@
                 '收费状态': order_status,
                 '退费日期': ''
               };
+
               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,