Merge branch 'yanglilong' of git.ssish.com:sunhailiang/bims into test

src/views/charge-query/detail.vue

@@ -89,6 +89,14 @@
         <a-button class="danger">{{ text | payStyleFilters }}</a-button>
       </template>
     </a-table>
+    <a-row :gutter="30">
+      <a-col :sm="24">
+        <div class="btn-div flex">
+          <a-button type="primary" @click="receiptEvt">
+              <Icon name="ssibaocun" :size="14" />结算</a-button>
+        </div>
+      </a-col>
+    </a-row>
 
     <a-modal title="编辑" :visible="dialogShow" width="700px" :maskClosable="false"
       okText="确定" cancelText="取消"
@@ -208,6 +216,8 @@ export default {
   created() {
     const { receiptNo } = this.$route.query;
     this.receiptNo = receiptNo || "";
+    let chargeQueryDetail = localStorage.getItem('chargeQueryDetail');
+    this.form = chargeQueryDetail? JSON.parse(chargeQueryDetail): {};
 
     this._getChargeListDetail();
     this._getCompanyOptions();//获取保险公司下拉选项
@@ -269,7 +279,26 @@ export default {
         }
       });
     },
-
+    //账单结算
+    receiptEvt(){
+      this.$modal.confirm({
+        title: "结算",
+        content: "确定结算该账单？",
+        okText: "确定",
+        cancelText: "取消",
+        onOk: () => {
+          this.$apis.RECEIPTSETTLEMENT({
+            id: this.form.id
+          }).then((res) => {
+            if (res.returnCode === "0000") {
+              this.$message.success('结算成功');
+            }else{
+              this.$message.error(res.returnMsg);
+            }
+          });
+        },
+      });
+    },
     // 选中就诊时间
     onSelectVisitTime(date, dateString) {
       console.log(date, dateString);
@@ -329,4 +358,8 @@ export default {
     color: #1890ff;
   }
 }
+.btn-div{
+  margin-top: 10px;
+  justify-content: flex-end;
+}
 </style>

src/views/charge-query/index.vue

@@ -77,7 +77,7 @@
         {{ index + 1 }}
       </template>
       <template slot="operation" slot-scope="record">
-        <a-button type="link" @click.stop="receiptEvt(record)">结算</a-button>
+        <!-- <a-button type="link" @click.stop="receiptEvt(record)">结算</a-button> -->
         <a-button type="link" class="success" @click.stop="detailEvt(record)">查看</a-button>
         <!-- <a-popconfirm title="你确定要关闭吗？" ok-text="确定" cancel-text="取消" @confirm="deleteData" >
           <a-button type="link" class="danger">删除</a-button>
@@ -202,6 +202,7 @@ export default {
     },
     //查看 
     detailEvt(record) {
+      localStorage.setItem('chargeQueryDetail', JSON.stringify(record));
       const { receiptNo } = record;
       this.$router.push({
         name: "chargeQueryDetail",

src/views/charge-query/lpjManageDetail.vue

@@ -57,7 +57,12 @@
             <a-input v-model="form.sendEmail" placeholder="请输入寄送邮箱" allow-clear />
           </a-form-model-item>
         </a-col>
-        <a-col :sm="8" class="none-label">
+        <a-col :lg="8" :sm="12">
+          <a-form-model-item label="寄送备注">
+            <a-textarea v-model="form.sendRemark" placeholder="请输入寄送备注" :auto-size="{ minRows: 2, maxRows: 5 }" />
+          </a-form-model-item>
+        </a-col>
+        <a-col :sm="24" class="none-label">
           <div class="btn-div flex">
             <span></span>
             <a-form-model-item label="button">
@@ -177,6 +182,7 @@ export default {
         trackingNo: '',
         sendAddress: '',
         sendEmail: '',
+        sendRemark: ''
       },
       companyOptions: [], //保险公司
       expressList: [], //快递列表

src/views/info/components/companyInfo.vue

 <template>
   <div class="info-div">
+    <Goback title="保险公司详情" />
     <a-form-model ref="form" layout="vertical">
       <a-row :gutter="30">
         <a-col :lg="6" :sm="12">
@@ -148,6 +149,7 @@
 </template>
 
 <script>
+import Goback from "@/components/CUSTOMER/goback";
 export default {
   props: {
     detailObj: {
@@ -160,6 +162,9 @@ export default {
       countyList: [],
     }
   },
+  components: {
+    Goback,
+  },
   created(){
     this.getRefcdByRefgrp();
   },
@@ -251,9 +256,6 @@ export default {
 </script>
 
 <style lang="less" scoped>
-.info-div{
-  margin-top: 16px;
-}
 .title-div {
   line-height: 56px;
   color: #252631;

src/views/verification/index.vue

@@ -13,11 +13,24 @@
           </a-form-model-item>
         </a-col>
         <a-col :lg="6" :sm="12">
-          <a-form-model-item label="账单编号">
-            <a-input v-model="form.receiptNo" placeholder="请输入账单编号" />
+          <a-form-model-item label="EOB状态">
+            <a-select v-model="form.eobSts" placeholder="请选择EOB状态" allowClear>
+              <a-select-option value="1">未回款</a-select-option>
+              <a-select-option value="2">已回款</a-select-option>
+            </a-select>
+          </a-form-model-item>
+        </a-col>
+        <a-col :lg="6" :sm="12">
+          <a-form-model-item label="EOB赔付金额(人民币)">
+            <a-input type="number" v-model.trim="form.eobAmountCny" placeholder="EOB赔付金额(人民币)" />
+          </a-form-model-item>
+        </a-col>
+        <a-col :lg="6" :sm="12">
+          <a-form-model-item label="EOB赔付金额(美元)">
+            <a-input type="number" v-model.trim="form.eobAmountUsd" placeholder="EOB赔付金额(美元)" />
           </a-form-model-item>
         </a-col>
-        <a-col :lg="12" :sm="24" class="none-label">
+        <a-col :sm="24" class="none-label">
           <a-form-model-item label="button">
             <a-button class="mar-left10" type="primary" @click="handlerSearch">
               <Icon name="ssisearch_active" :size="14" />查询
@@ -66,7 +79,9 @@ export default {
       columns,
       form: {
         payorCode: '',
-        receiptNo: '',
+        eobSts: '',
+        eobAmountCny: '',
+        eobAmountUsd: ''
       },
       dataList: [],
       companyOptions: [], //保险公司
@@ -94,7 +109,9 @@ export default {
     handlerReset() {
       this.form = {
         payorCode: '',
-        receiptNo: '',
+        eobSts: '',
+        eobAmountCny: '',
+        eobAmountUsd: ''
       }
     },
     // 获取保险公司下拉选项