Merge remote-tracking branch 'origin/dev' into dev

src/views/finance/charge/add-or-update.vue

@@ -88,6 +88,9 @@ export default {
         pageSize: this.page.pageSize,
       };
       contrastList(data).then((res) => {
+        res.rows.map(e=>{
+          e.srcBillNo=e.fMblno
+        })
         this.tableData = res.rows;
         this.page.total = res.total;
       });
@@ -99,7 +102,8 @@ export default {
       if (this.selectionList.length == 0) {
         return this.$message.error("请选择数据");
       }
-      (this.dialogVisible = false), this.$emit("imporData", this.selectionList);
+      this.dialogVisible = false;
+      this.$emit("imporData", this.selectionList);
     },
     close() {
       this.form = this.$options.data().form;

src/views/finance/charge/js/index.js

@@ -107,7 +107,7 @@ export const tableOption = [{
 export const tableOption2 = [{
     surface: "1",
     label: "srcBillNo",
-    name: "系统编号",
+    name: "提单号",
     checked: 0,
     width: 100,
   },

src/views/finance/contrast/add-or-update.vue

@@ -88,6 +88,9 @@ export default {
         pageSize: this.page.pageSize,
       };
       contrastList(data).then((res) => {
+            res.rows.map(e=>{
+          e.srcBillNo=e.fMblno
+        })
         this.tableData = res.rows;
         this.page.total = res.total;
       });
@@ -99,7 +102,8 @@ export default {
       if (this.selectionList.length == 0) {
         return this.$message.error("请选择数据");
       }
-      (this.dialogVisible = false), this.$emit("imporData", this.selectionList);
+      this.dialogVisible = false;
+      this.$emit("imporData", this.selectionList);
     },
     close() {
       this.form = this.$options.data().form;

src/views/finance/contrast/js/index.js

@@ -87,7 +87,7 @@ export const tableOption = [
 export const tableOption2 = [{
     surface: "1",
     label: "srcBillNo",
-    name: "系统编号",
+    name: "提单号",
     checked: 0,
     width: 100,
   },

src/views/finance/contrast/kaihe-detail.vue

@@ -191,7 +191,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="6">
-          <el-form-item label="系统编号">
+          <el-form-item label="提单号">
             <el-input
               v-model="form.srcBillNo"
               size="small"

src/views/finance/payment/add-or-update.vue

@@ -88,6 +88,9 @@ export default {
         pageSize: this.page.pageSize,
       };
       contrastList(data).then((res) => {
+        res.rows.map((e) => {
+          e.srcBillNo = e.fMblno;
+        });
         this.tableData = res.rows;
         this.page.total = res.total;
       });
@@ -99,7 +102,8 @@ export default {
       if (this.selectionList.length == 0) {
         return this.$message.error("请选择数据");
       }
-      (this.dialogVisible = false), this.$emit("imporData", this.selectionList);
+      this.dialogVisible = false;
+      this.$emit("imporData", this.selectionList);
     },
     close() {
       this.form = this.$options.data().form;

src/views/finance/payment/js/index.js

@@ -107,7 +107,7 @@ export const tableOption = [{
 export const tableOption2 = [{
     surface: "1",
     label: "srcBillNo",
-    name: "系统编号",
+    name: "提单号",
     checked: 0,
     width: 100,
   },