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

src/api/apis_moudles/base.js

@@ -7,4 +7,5 @@ export default {
   uploadImg: "/common/upload",
   specialtyList: "/backstage/auth/specialtyList",
   coverageCode: "/backstage/auth/coverageMasterList",
+  getRefcdByRefgrp: "/common/getRefcdByRefgrp", //获取快递列表
 };

src/api/apis_moudles/verification.js

 // 核销管理api
-export default {};
+export default {
+  queryCiReceipSendList: "/backstage/auth/queryEobReceiptList",   //EOB待核销账单查询
+  deleteEobReceiptInfo: "/backstage/auth/deleteEobReceiptInfo",   //删除EOB
+  saveEobReceiptInfo: "/backstage/auth/saveEobReceiptInfo",   //EOB新建
+  queryEobInfoList: "/backstage/auth/queryEobInfoList",   //回款EOB列表查询
+  saveBackMoney: "/backstage/auth/saveBackMoney",   //新建回款
+  deleteBackMoney: "/backstage/auth/deleteBackMoney",   //删除回款
+};

src/api/funcs_modules/base.js

@@ -41,6 +41,11 @@ const GETCOVERAGECODE = (data) => {
   return req.post(apis.coverageCode, data);
 };
 
+// 获取快递列表
+const GETREFCDBYREFGRP = (data) => {
+  return req.post(apis.getRefcdByRefgrp, data);
+};
+
 // 对象数组
 export default {
   GETUSERINFO,
@@ -50,4 +55,5 @@ export default {
   GETSPECIALTYLIST,
   UPLOADIMG,
   GETCOVERAGECODE,
+  GETREFCDBYREFGRP,
 };

src/api/funcs_modules/verification.js

 // 核销管理函数库
-// import apis from "../apis_moudles/index";
-// import req from "../request";
+import apis from "../apis_moudles/verification.js";
+import req from "../request";
+
+//EOB待核销账单查询
+const QUERYCIRECEIPSENDLIST = (data) => {
+  return req.post(apis.queryCiReceipSendList, data);
+};
+
+//EOB新建
+const SAVEEOBRECEIPTINFO = (data) => {
+  return req.post(apis.saveEobReceiptInfo, data);
+};
+
+//删除EOB
+const DELEOBRECEIPTINFO = (data) => {
+  return req.post(apis.deleteEobReceiptInfo, data);
+};
+
+//回款EOB列表查询
+const QUERYEOBRECEIPTINFO = (data) => {
+  return req.post(apis.queryEobInfoList, data);
+};
+
+//新建回款
+const SAVEBACKMONEY = (data) => {
+  return req.post(apis.saveBackMoney, data);
+};
+
+//删除回款
+const DELETEBACKMONEY = (data) => {
+  return req.post(apis.deleteBackMoney, data);
+};
 
 // 对象数组
-export default {};
+export default { 
+  QUERYCIRECEIPSENDLIST,
+  SAVEEOBRECEIPTINFO,
+  DELEOBRECEIPTINFO,
+  QUERYEOBRECEIPTINFO,
+  SAVEBACKMONEY,
+  DELETEBACKMONEY,
+};
\ No newline at end of file

src/views/charge-query/lpjManage.vue

@@ -48,10 +48,8 @@
         </a-col>
         <a-col :lg="4" :sm="12">
           <a-form-model-item label="快递公司">
-            <a-select v-model="form.sendCompany" placeholder="请选择快递公司" allowClear>
-              <a-select-option :value="1">顺丰</a-select-option>
-              <a-select-option :value="2">韵达</a-select-option>
-              <a-select-option :value="3">中通</a-select-option>
+            <a-select v-model="form.sendCompany" placeholder="请选择快递公司" showSearch allowClear>
+              <a-select-option v-for="(item) in expressList" :key="item.id" :value="item.descCh">{{item.descCh}}</a-select-option>
             </a-select>
           </a-form-model-item>
         </a-col>
@@ -90,7 +88,6 @@
               </a-button>
             </a-form-model-item>
           </div>
-          
         </a-col>
       </a-row>
     </a-form-model>
@@ -192,6 +189,7 @@ export default {
         sendRemark: ''
       },
       companyOptions: [], //保险公司
+      expressList: [], //快递列表
       selectedRowKeys: [], // Check here to configure the default column
       dataList: [],
       pagination: {
@@ -218,11 +216,22 @@ export default {
   created() {
     this.getData();
     this._getCompanyOptions();
+    this.getRefcdByRefgrp();
   },
   methods: {
     moment,
     onSelectChange(selectedRowKeys) {
-      this.selectedRowKeys = selectedRowKeys;
+      let arr = [];
+      for(let i=0; i<selectedRowKeys.length; i++){
+        let idx = selectedRowKeys[i];
+        if(this.dataList[idx].sendBatchNo){
+          this.$msg.destroy();
+          this.$message.warning('寄送批号已存在')
+        }else{
+          arr.push(idx);
+        }
+      }
+      this.selectedRowKeys = arr;
     },
     // 获取列表数据
     getData() {
@@ -251,6 +260,15 @@ export default {
         this.companyOptions = res.content || [];
       });
     },
+    // 获取快递列表
+    getRefcdByRefgrp() {
+      this.$apis.GETREFCDBYREFGRP({
+        modid: "CI",
+        refgrp: "SEND_COMPANY"
+      }).then((res) => {
+        this.expressList = res.content || [];
+      });
+    },
     // 重置
     handlerReset() {
       this.form = {
@@ -372,6 +390,7 @@ export default {
         if (res.returnCode == "0000") {
           this.$message.success("新建成功");
           this.handlerReset();
+          this.selectedRowKeys = [];
           this.getData();
         } else {
           this.$message.error(res.returnMsg);