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

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

@@ -88,9 +88,9 @@ export default {
         pageSize: this.page.pageSize,
       };
       contrastList(data).then((res) => {
-        res.rows.map(e=>{
-          e.srcBillNo=e.fMblno
-        })
+        res.rows.map((e) => {
+          e.srcBillNo = e.fMblno;
+        });
         this.tableData = res.rows;
         this.page.total = res.total;
       });

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

@@ -98,6 +98,13 @@ export const tableOption = [{
   },
   {
     surface: "15",
+    label: "tMblno",
+    name: "提单号",
+    checked: 0,
+    width: 100,
+  },
+  {
+    surface: "16",
     label: "fRemarks",
     name: "备注",
     checked: 0,

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

@@ -30,7 +30,6 @@
         <el-col :span="6">
           <el-form-item
             label="客户名称"
-            :rules="[{ required: true, message: '', trigger: 'blur' }]"
             prop="fCorpid"
           >
             <el-select
@@ -718,17 +717,11 @@ export default {
         fDestportid: this.form.fDestportid,
         fLoadportid: this.form.fLoadportid,
         fStatementNo: this.form.fStatementNo,
+        fMblno:this.form.tMblno,
         fFromDate: this.form.date ? this.form.date[0] : null,
         fToDate: this.form.date ? this.form.date[1] : null,
       };
-      this.$refs["form"].validate((valid) => {
-        if (valid) {
-          this.$refs.addOrUpdate.init(data, this.tableData);
-        } else {
-          this.$message.error("请选择客户名称");
-          return false;
-        }
-      });
+      this.$refs.addOrUpdate.init(data, this.tableData);
     },
     imporData(rows) {
       this.tableData = this.tableData.concat(rows);

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

@@ -88,9 +88,9 @@ export default {
         pageSize: this.page.pageSize,
       };
       contrastList(data).then((res) => {
-            res.rows.map(e=>{
-          e.srcBillNo=e.fMblno
-        })
+        res.rows.map((e) => {
+          e.srcBillNo = e.fMblno;
+        });
         this.tableData = res.rows;
         this.page.total = res.total;
       });

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

@@ -78,6 +78,13 @@ export const tableOption = [
   },
   {
     surface: "13",
+    label: "tMblno",
+    name: "提单号",
+    checked: 0,
+    width: 100,
+  },
+  {
+    surface: "14",
     label: "fRemarks",
     name: "备注",
     checked: 0,
@@ -211,7 +218,7 @@ export const tableOption2 = [{
     width: 100,
   },
   {
-    surface: "19",
+    surface: "20",
     label: "fRemarks",
     name: "备注",
     checked: 0,

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

@@ -30,7 +30,6 @@
         <el-col :span="6">
           <el-form-item
             label="客户名称"
-            :rules="[{ required: true, message: '', trigger: 'blur' }]"
             prop="fCorpid"
           >
             <el-select
@@ -700,17 +699,11 @@ export default {
         fVoyid: this.form.fVoyid,
         fDestportid: this.form.fDestportid,
         fLoadportid: this.form.fLoadportid,
+        fMblno:this.form.tMblno,
         fFromDate: this.form.date ? this.form.date[0] : null,
         fToDate: this.form.date ? this.form.date[1] : null,
       };
-      this.$refs["form"].validate((valid) => {
-        if (valid) {
-          this.$refs.addOrUpdate.init(data, this.tableData);
-        } else {
-          this.$message.error("请选择客户名称");
-          return false;
-        }
-      });
+      this.$refs.addOrUpdate.init(data, this.tableData);
     },
     imporData(rows) {
       this.tableData = this.tableData.concat(rows);

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

@@ -1,108 +1,115 @@
 export const tableOption = [{
-  surface: "1",
-  label: "fBillno",
-  name: "系统编号",
-  checked: 0,
-  width: 150,
-},
-{
-  surface: "2",
-  label: "fCorpidName",
-  name: "客户名称",
-  checked: 0,
-  width: 150,
-},
-{
-  surface: "3",
-  label: "bank",
-  name: "付款银行",
-  checked: 0,
-  width: 150,
-},
-{
-  surface: "4",
-  label: "fBankNumber",
-  name: "付款账号",
-  checked: 0,
-  width: 150,
-},
-{
-  surface: "5",
-  label: "waterBillNo",
-  name: "水单号",
-  checked: 0,
-  width: 150,
-},
-{
-  surface: "6",
-  label: "vessel",
-  name: "船名",
-  checked: 0,
-  width: 150,
-},
-{
-  surface: "7",
-  label: "voyage",
-  name: "航次",
-  checked: 0,
-  width: 150,
-},
-{
-  surface: "8",
-  label: "loadportName",
-  name: "起运港",
-  checked: 0,
-  width: 150,
-},
-{
-  surface: "9",
-  label: "destportName",
-  name: "目的港",
-  checked: 0,
-  width: 150,
-},
-{
-  surface: "10",
-  label: "fAmtdr",
-  name: "应收金额",
-  checked: 0,
-  width: 150,
-},
-{
-  surface: "11",
-  label: "fAmtcr",
-  name: "付费金额",
-  checked: 0,
-  width: 150,
-},
-{
-  surface: "12",
-  label: "fBillstatusName",
-  name: "状态",
-  checked: 0,
-  width: 100,
-},
-{
-  surface: "13",
-  label: "createBy",
-  name: "制单人",
-  checked: 0,
-  width: 100,
-},
-{
-  surface: "14",
-  label: "createTime",
-  name: "制单日期",
-  checked: 0,
-  width: 150,
-},
-{
-  surface: "15",
-  label: "fRemarks",
-  name: "备注",
-  checked: 0,
-  width: 200,
-}
+    surface: "1",
+    label: "fBillno",
+    name: "系统编号",
+    checked: 0,
+    width: 150,
+  },
+  {
+    surface: "2",
+    label: "fCorpidName",
+    name: "客户名称",
+    checked: 0,
+    width: 150,
+  },
+  {
+    surface: "3",
+    label: "bank",
+    name: "付款银行",
+    checked: 0,
+    width: 150,
+  },
+  {
+    surface: "4",
+    label: "fBankNumber",
+    name: "付款账号",
+    checked: 0,
+    width: 150,
+  },
+  {
+    surface: "5",
+    label: "waterBillNo",
+    name: "水单号",
+    checked: 0,
+    width: 150,
+  },
+  {
+    surface: "6",
+    label: "vessel",
+    name: "船名",
+    checked: 0,
+    width: 150,
+  },
+  {
+    surface: "7",
+    label: "voyage",
+    name: "航次",
+    checked: 0,
+    width: 150,
+  },
+  {
+    surface: "8",
+    label: "loadportName",
+    name: "起运港",
+    checked: 0,
+    width: 150,
+  },
+  {
+    surface: "9",
+    label: "destportName",
+    name: "目的港",
+    checked: 0,
+    width: 150,
+  },
+  {
+    surface: "10",
+    label: "fAmtdr",
+    name: "应收金额",
+    checked: 0,
+    width: 150,
+  },
+  {
+    surface: "11",
+    label: "fAmtcr",
+    name: "付费金额",
+    checked: 0,
+    width: 150,
+  },
+  {
+    surface: "12",
+    label: "fBillstatusName",
+    name: "状态",
+    checked: 0,
+    width: 100,
+  },
+  {
+    surface: "13",
+    label: "createBy",
+    name: "制单人",
+    checked: 0,
+    width: 100,
+  },
+  {
+    surface: "14",
+    label: "createTime",
+    name: "制单日期",
+    checked: 0,
+    width: 150,
+  },
+  {
+    surface: "15",
+    label: "tMblno",
+    name: "提单号",
+    checked: 0,
+    width: 100,
+  },
+  {
+    surface: "16",
+    label: "fRemarks",
+    name: "备注",
+    checked: 0,
+    width: 200,
+  }
 ]
 export const tableOption2 = [{
     surface: "1",

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

@@ -30,7 +30,6 @@
         <el-col :span="6">
           <el-form-item
             label="客户名称"
-            :rules="[{ required: true, message: '', trigger: 'blur' }]"
             prop="fCorpid"
           >
             <el-select
@@ -718,17 +717,11 @@ export default {
         fDestportid: this.form.fDestportid,
         fLoadportid: this.form.fLoadportid,
         fStatementNo: this.form.fStatementNo,
+        fMblno:this.form.tMblno,
         fFromDate: this.form.date ? this.form.date[0] : null,
         fToDate: this.form.date ? this.form.date[1] : null,
       };
-      this.$refs["form"].validate((valid) => {
-        if (valid) {
-          this.$refs.addOrUpdate.init(data, this.tableData);
-        } else {
-          this.$message.error("请选择客户名称");
-          return false;
-        }
-      });
+      this.$refs.addOrUpdate.init(data, this.tableData);
     },
     imporData(rows) {
       this.tableData = this.tableData.concat(rows);