Merge branch 'func_eccs_1942' into test

src/views/verification/collectionDetail.vue

@@ -64,7 +64,7 @@
       </a-row>
     </a-form-model>
     <!-- table -->
-    <a-table :columns="columns" :data-source="dataList" :scroll="{ x: true }" :pagination="false" :rowKey="'id'"
+    <a-table :columns="columns" :data-source="dataList" :scroll="{ x: true }" :pagination="false"
       :row-selection="isEditNewEOB? { selectedRowKeys: selectedRowKeys, onChange: onSelectChange }: null">
       <template slot="eobNo" slot-scope="text,record">
         <a @click="toEOBDetail(record)">{{text}}</a>
@@ -136,6 +136,7 @@ export default {
       },
       fileList: [], // 上传文件列表
       dataList: [],
+      backEobList: [], // eob回款列表
       isEditNewEOB: false, //是否在新建回款
       companyOptions: [], //保险公司
       pagination: {
@@ -196,11 +197,24 @@ export default {
       this.form = backMoneyDataDetail
       this.form.backDate = this.form.backDate ? moment(this.form.backDate).format('YYYY-MM-DD 00:00:00') : null
       
+      // 如果有上传附件则显示列表
+      if(backMoneyDataDetail.fileList) {
+        this.fileList = backMoneyDataDetail.fileList.map(d => {
+          const file = {
+            uid: Math.random()*10000,
+            name: d.fileName,
+            status: 'done',
+            url: d.fileUrl,
+          }
+          return file
+        })
+      }
+      
       this.getData();
     }
   },
   methods: {
-    // moment,
+    moment,
     // 查看的超链点击时链接已经生成好了，所以要点击的时候才set值才是对应的，不然存的都是最后一条数据
     setData(record){
       localStorage.setItem('EobDataDetail', JSON.stringify(record));
@@ -261,6 +275,7 @@ export default {
           let content = res.content || {};
           this.pagination.total = content.total || 0;
           this.dataList = content.list || [];
+          this.backEobList = this.dataList.map(d => d)
         } else {
           this.$message.error(res.returnMsg);
         }
@@ -305,6 +320,9 @@ export default {
         }
 
         let backMoneyEobList = [];
+        if(!this.isEditNewEOB) {
+          backMoneyEobList = this.backEobList
+        } else {
           this.dataList.forEach((item,index)=>{
             if(this.selectedRowKeys.indexOf(index)!=-1){
                 backMoneyEobList.push({
@@ -317,7 +335,7 @@ export default {
                 })
             }
           })
-
+        }   
         
         const formData = {
             ...this.form,
@@ -326,6 +344,7 @@ export default {
             backMoneyNo: this.backMoneyNo, //回款编号
         }
 
+        // 上传附件格式转换
         formData.fileList = this.fileList.map(d => {
           const file = {
             fileName: d.name,
@@ -341,6 +360,8 @@ export default {
             this.$message.success("成功");
             this.selectedRowKeys = [];
             this.getData();
+  
+            // this.$router.go(-1);
             resolve();
           } else {
             this.$message.error(res.returnMsg);