修改bug

src/components/tradeAgency/fee-info.vue

@@ -32,35 +32,35 @@
             <template slot="index" slot-scope="{row,index}">
                 <span>{{ index + 1 }}</span>
             </template>
-            <template slot="corpCnName" slot-scope="{ row }">
+            <template slot="corpCnNameForm" slot-scope="{ row }">
                 <dic-select v-if="row.$cellEdit" v-model="row.corpCnName" placeholder="往来单位" key="id" label="cnName"
                     res="records" url="/blade-los/bcorps/listByType" :filterable="true" :remote="true" dataName="cnName"
                     @selectChange="rowDicChange('corpCnName', $event, row)"></dic-select>
                 <span v-else>{{ row.corpCnName }}</span>
             </template>
-            <template slot="feeCnName" slot-scope="{ row }">
+            <template slot="feeCnNameForm" slot-scope="{ row }">
                 <dic-select v-if="row.$cellEdit" v-model="row.feeCnName" placeholder="费用名称" key="id" label="cnName"
                     res="records" url="/blade-los/bfees/list" :filterable="true" :remote="true" dataName="cnName"
                     @selectChange="rowDicChange('feeCnName', $event, row)"></dic-select>
                 <span v-else>{{ row.feeCnName }}</span>
             </template>
-            <template slot="unitNo" slot-scope="{ row }">
+            <template slot="unitNoForm" slot-scope="{ row }">
                 <dic-select v-if="row.$cellEdit" v-model="row.unitNo" placeholder="收费标准" key="id" label="code"
                     url="/blade-los/bunits/selectList" :filterable="true"
                     @selectChange="rowDicChange('unitNo', $event, row)"></dic-select>
                 <span v-else>{{ row.unitNo }}</span>
             </template>
-            <tempalte slot="quantity" slot-scope="{ row }">
+            <tempalte slot="quantityForm" slot-scope="{ row }">
                 <el-input-number v-if="row.$cellEdit" v-model="row.quantity" @change="countChange(row)" :controls="false"
                     placeholder="请输入 数量" size="small" style="width: 100%;"></el-input-number>
                 <span v-else>{{ row.quantity }}</span>
             </tempalte>
-            <tempalte slot="price" slot-scope="{ row }">
+            <tempalte slot="priceForm" slot-scope="{ row }">
                 <el-input-number v-if="row.$cellEdit" v-model="row.price" @change="countChange(row)" :controls="false"
                     placeholder="请输入 单价" size="small" style="width: 100%;"></el-input-number>
                 <span v-else>{{ row.price }}</span>
             </tempalte>
-            <template slot="curCode" slot-scope="{ row }">
+            <template slot="curCodeForm" slot-scope="{ row }">
                 <dic-select v-if="row.$cellEdit" v-model="row.curCode" placeholder="币别" key="id" label="code"
                     :url="'/blade-los/bcurrency/getExrate?date=' + form.contractDate + '&dc=' + row.dc" :filterable="true"
                     @selectChange="rowDicChange('curCode', $event, row)"></dic-select>
@@ -110,35 +110,35 @@
             <template slot="index" slot-scope="{row,index}">
                 <span>{{ index + 1 }}</span>
             </template>
-            <template slot="corpCnName" slot-scope="{ row }">
+            <template slot="corpCnNameForm" slot-scope="{ row }">
                 <dic-select v-if="row.$cellEdit" v-model="row.corpCnName" placeholder="往来单位" key="id" label="cnName"
                     res="records" url="/blade-los/bcorps/listByType" :filterable="true" :remote="true" dataName="cnName"
                     @selectChange="rowDicChange('corpCnName', $event, row)"></dic-select>
                 <span v-else>{{ row.corpCnName }}</span>
             </template>
-            <template slot="feeCnName" slot-scope="{ row }">
+            <template slot="feeCnNameForm" slot-scope="{ row }">
                 <dic-select v-if="row.$cellEdit" v-model="row.feeCnName" placeholder="费用名称" key="id" label="cnName"
                     res="records" url="/blade-los/bfees/list" :filterable="true" :remote="true" dataName="cnName"
                     @selectChange="rowDicChange('feeCnName', $event, row)"></dic-select>
                 <span v-else>{{ row.feeCnName }}</span>
             </template>
-            <template slot="unitNo" slot-scope="{ row }">
+            <template slot="unitNoForm" slot-scope="{ row }">
                 <dic-select v-if="row.$cellEdit" v-model="row.unitNo" placeholder="收费标准" key="id" label="code"
                     url="/blade-los/bunits/selectList" :filterable="true"
                     @selectChange="rowDicChange('unitNo', $event, row)"></dic-select>
                 <span v-else>{{ row.unitNo }}</span>
             </template>
-            <tempalte slot="quantity" slot-scope="{ row }">
+            <tempalte slot="quantityForm" slot-scope="{ row }">
                 <el-input-number v-if="row.$cellEdit" v-model="row.quantity" @change="countChange(row)" :controls="false"
                     placeholder="请输入 数量" size="small" style="width: 100%;"></el-input-number>
                 <span v-else>{{ row.quantity }}</span>
             </tempalte>
-            <tempalte slot="price" slot-scope="{ row }">
+            <tempalte slot="priceForm" slot-scope="{ row }">
                 <el-input-number v-if="row.$cellEdit" v-model="row.price" @change="countChange(row)" :controls="false"
                     placeholder="请输入 单价" size="small" style="width: 100%;"></el-input-number>
                 <span v-else>{{ row.price }}</span>
             </tempalte>
-            <template slot="curCode" slot-scope="{ row }">
+            <template slot="curCodeForm" slot-scope="{ row }">
                 <dic-select v-if="row.$cellEdit" v-model="row.curCode" placeholder="币别" key="id" label="code"
                     :url="'/blade-los/bcurrency/getExrate?date=' + form.contractDate + '&dc=' + row.dc" :filterable="true"
                     @selectChange="rowDicChange('curCode', $event, row)"></dic-select>
@@ -310,7 +310,17 @@ export default {
                         label: "往来单位",
                         prop: "corpCnName",
                         width: '160',
+                        cell: true,
+                        slot: true,
+                        formslot: true,
                         overHidden: true,
+                        rules: [
+                            {
+                                required: true,
+                                message: '请选择往来单位',
+                                trigger: 'blur'
+                            }
+                        ]
                     },
                     {
                         label: "提单号",
@@ -322,7 +332,17 @@ export default {
                         label: "费用名称",
                         prop: "feeCnName",
                         width: '120',
+                        cell: true,
+                        slot: true,
+                        formslot: true,
                         overHidden: true,
+                        rules: [
+                            {
+                                required: true,
+                                message: '请选择费用名称',
+                                trigger: 'blur'
+                            }
+                        ]
                     },
                     {
                         label: "收费标准",
@@ -333,12 +353,32 @@ export default {
                     {
                         label: "单价",
                         prop: "price",
+                        cell: true,
+                        slot: true,
+                        formslot: true,
                         overHidden: true,
+                        rules: [
+                            {
+                                required: true,
+                                message: '请输入单价',
+                                trigger: 'blur'
+                            }
+                        ]
                     },
                     {
                         label: "数量",
                         prop: "quantity",
+                        cell: true,
+                        slot: true,
+                        formslot: true,
                         overHidden: true,
+                        rules: [
+                            {
+                                required: true,
+                                message: '请输入数量',
+                                trigger: 'blur'
+                            }
+                        ]
                     },
                     {
                         label: "金额",
@@ -348,7 +388,17 @@ export default {
                     {
                         label: "币别",
                         prop: "curCode",
+                        cell: true,
+                        slot: true,
+                        formslot: true,
                         overHidden: true,
+                        rules: [
+                            {
+                                required: true,
+                                message: '请选择币别',
+                                trigger: 'blur'
+                            }
+                        ]
                     },
                     {
                         label: "外币金额",
@@ -366,6 +416,16 @@ export default {
                         overHidden: true,
                     },
                     {
+                        label: "结算日期",
+                        prop: "stlDate",
+                        width: "120",
+                        cell: true,
+                        type: "date",
+                        format: "yyyy-MM-dd",
+                        valueFormat: "yyyy-MM-dd 00:00:00",
+                        overHidden: true
+                    },
+                    {
                         label: "备注",
                         prop: "remarks",
                         cell: true,
@@ -413,7 +473,17 @@ export default {
                         label: "往来单位",
                         prop: "corpCnName",
                         width: '160',
+                        cell: true,
+                        slot: true,
+                        formslot: true,
                         overHidden: true,
+                        rules: [
+                            {
+                                required: true,
+                                message: '请选择往来单位',
+                                trigger: 'blur'
+                            }
+                        ]
                     },
                     {
                         label: "提单号",
@@ -425,7 +495,17 @@ export default {
                         label: "费用名称",
                         prop: "feeCnName",
                         width: '120',
+                        cell: true,
+                        slot: true,
+                        formslot: true,
                         overHidden: true,
+                        rules: [
+                            {
+                                required: true,
+                                message: '请选择费用名称',
+                                trigger: 'blur'
+                            }
+                        ]
                     },
                     {
                         label: "收费标准",
@@ -436,12 +516,32 @@ export default {
                     {
                         label: "单价",
                         prop: "price",
+                        cell: true,
+                        slot: true,
+                        formslot: true,
                         overHidden: true,
+                        rules: [
+                            {
+                                required: true,
+                                message: '请输入单价',
+                                trigger: 'blur'
+                            }
+                        ]
                     },
                     {
                         label: "数量",
                         prop: "quantity",
+                        cell: true,
+                        slot: true,
+                        formslot: true,
                         overHidden: true,
+                        rules: [
+                            {
+                                required: true,
+                                message: '请输入数量',
+                                trigger: 'blur'
+                            }
+                        ]
                     },
                     {
                         label: "金额",
@@ -451,7 +551,17 @@ export default {
                     {
                         label: "币别",
                         prop: "curCode",
+                        cell: true,
+                        slot: true,
+                        formslot: true,
                         overHidden: true,
+                        rules: [
+                            {
+                                required: true,
+                                message: '请选择币别',
+                                trigger: 'blur'
+                            }
+                        ]
                     },
                     {
                         label: "外币金额",
@@ -469,13 +579,23 @@ export default {
                         overHidden: true,
                     },
                     {
+                        label: "结算日期",
+                        prop: "stlDate",
+                        width: "120",
+                        cell: true,
+                        type: "date",
+                        format: "yyyy-MM-dd",
+                        valueFormat: "yyyy-MM-dd 00:00:00",
+                        overHidden: true
+                    },
+                    {
                         label: "优惠汇率",
                         prop: "discountExrate",
                         cell: true,
                         type: 'number',
                         controls: false,
                         width: "120",
-                        overHidden: true,
+                        overHidden: true
                     },
                     {
                         label: "利润",
@@ -653,6 +773,12 @@ export default {
         allClick(name, type) {
             if (name == '一键保存') {
                 if (type == 'D') {
+                    for (let row of this.form.feeCenterListD) {
+                        if (!row.corpCnName || !row.feeCnName || !row.price || !row.quantity || !row.curCode) {
+                            this.$refs.crudD.rowCell(row, row.$index)
+                            return this.$message.error("请完善应收费用信息");
+                        }
+                    }
                     this.form.feeCenterListD.forEach(e => {
                         this.$set(e, '$cellEdit', false)
                     })
@@ -670,8 +796,15 @@ export default {
                     })
                 }
                 if (type == 'C') {
+                    for (let row of this.form.feeCenterListC) {
+                        if (!row.corpCnName || !row.feeCnName || !row.price || !row.quantity || !row.curCode) {
+                            this.$refs.crudC.rowCell(row, row.$index)
+                            return this.$message.error("请完善应付费用信息");
+                        }
+                    }
                     for (let index in this.form.feeCenterListC) {
-                        if (this.form.feeCenterListC[index].feeCnName == '首款' || this.form.feeCenterListC[index].feeCnName == '尾款') {
+                        if (this.form.feeCenterListC[index].feeCnName == '首款' || this.form.feeCenterListC[index].feeCnName == '尾款'|| this.form.feeCenterListC[index].feeCnName == '手续费') {
+                            this.$refs.crudC.rowCell(this.form.feeCenterListC[index], index)
                             if (!this.form.feeCenterListC[index].discountExrate) return this.$message.error("第" + (Number(index) + 1) + "行" + this.form.feeCenterListC[index].feeCnName + "费用优惠汇率不能为空");
                         }
                     }
@@ -918,6 +1051,31 @@ export default {
                 })
             }
         },
+        submitValidate() {
+            for (let row of this.form.feeCenterListD) {
+                if (!row.corpCnName || !row.feeCnName || !row.price || !row.quantity || !row.curCode) {
+                    this.$refs.crudD.rowCell(row, row.$index)
+                    this.$message.error("请完善应收费用信息");
+                    return false
+                }
+            }
+            for (let row of this.form.feeCenterListC) {
+                if (!row.corpCnName || !row.feeCnName || !row.price || !row.quantity || !row.curCode) {
+                    this.$refs.crudC.rowCell(row, row.$index)
+                    this.$message.error("请完善应付费用信息");
+                    return false
+                }
+            }
+            for (let index in this.form.feeCenterListC) {
+                if (this.form.feeCenterListC[index].feeCnName == '首款' || this.form.feeCenterListC[index].feeCnName == '尾款'|| this.form.feeCenterListC[index].feeCnName == '手续费') {
+                    if (!this.form.feeCenterListC[index].discountExrate) {
+                        this.$message.error("第" + (Number(index) + 1) + "行" + this.form.feeCenterListC[index].feeCnName + "费用优惠汇率不能为空");
+                        return false
+                    }
+                }
+            }
+            return true
+        },
         //自定义列保存
         async saveColumn(ref, option, optionBack, code) {
             /**

src/components/tradeAgency/fee-infosimple.vue

@@ -89,13 +89,13 @@
             <template slot="index" slot-scope="{row,index}">
                 <span>{{ index + 1 }}</span>
             </template>
-            <template slot="corpCnName" slot-scope="{ row }">
+            <template slot="corpCnNameForm" slot-scope="{ row }">
                 <dic-select v-if="row.$cellEdit" v-model="row.corpCnName" placeholder="往来单位" key="id" label="cnName"
                     res="records" url="/blade-los/bcorps/listByType" :filterable="true" :remote="true" dataName="cnName"
                     @selectChange="rowDicChange('corpCnName', $event, row)"></dic-select>
                 <span v-else>{{ row.corpCnName }}</span>
             </template>
-            <template slot="feeCnName" slot-scope="{ row }">
+            <template slot="feeCnNameForm" slot-scope="{ row }">
                 <dic-select v-if="row.$cellEdit" v-model="row.feeCnName" placeholder="费用名称" key="id" label="cnName"
                     res="records" url="/blade-los/bfees/list" :filterable="true" :remote="true" dataName="cnName"
                     @selectChange="rowDicChange('feeCnName', $event, row)"></dic-select>
@@ -107,17 +107,17 @@
                     @selectChange="rowDicChange('unitNo', $event, row)"></dic-select>
                 <span v-else>{{ row.unitNo }}</span>
             </template>
-            <tempalte slot="quantity" slot-scope="{ row }">
+            <tempalte slot="quantityForm" slot-scope="{ row }">
                 <el-input-number v-if="row.$cellEdit" v-model="row.quantity" @change="countChange(row)" :controls="false"
                     placeholder="请输入 数量" size="small" style="width: 100%;"></el-input-number>
                 <span v-else>{{ row.quantity }}</span>
             </tempalte>
-            <tempalte slot="price" slot-scope="{ row }">
+            <tempalte slot="priceForm" slot-scope="{ row }">
                 <el-input-number v-if="row.$cellEdit" v-model="row.price" @change="countChange(row)" :controls="false"
                     placeholder="请输入 单价" size="small" style="width: 100%;"></el-input-number>
                 <span v-else>{{ row.price }}</span>
             </tempalte>
-            <template slot="curCode" slot-scope="{ row }">
+            <template slot="curCodeForm" slot-scope="{ row }">
                 <dic-select v-if="row.$cellEdit" v-model="row.curCode" placeholder="币别" key="id" label="code"
                     :url="'/blade-los/bcurrency/getExrate?date=' + form.businessDate + '&dc=' + row.dc" :filterable="true"
                     @selectChange="rowDicChange('curCode', $event, row)"></dic-select>
@@ -128,7 +128,7 @@
                     placeholder="请输入 汇率" size="small" style="width: 100%;"></el-input-number>
                 <span v-else>{{ row.exrate }}</span>
             </tempalte>
-            <tempalte slot="stlExrate" slot-scope="{ row }">
+            <tempalte slot="stlExrateForm" slot-scope="{ row }">
                 <el-input-number v-if="row.$cellEdit" v-model="row.stlExrate" @change="countChange(row, 'C')"
                     :controls="false" placeholder="请输入 结算汇率" size="small" style="width: 100%;"></el-input-number>
                 <span v-else>{{ row.stlExrate }}</span>
@@ -272,6 +272,16 @@ export default {
                         overHidden: true,
                     },
                     {
+                        label: "结算日期",
+                        prop: "stlDate",
+                        width: "120",
+                        cell: true,
+                        type: "date",
+                        format: "yyyy-MM-dd",
+                        valueFormat: "yyyy-MM-dd 00:00:00",
+                        overHidden: true
+                    },
+                    {
                         label: "备注",
                         prop: "remarks",
                         cell: true,
@@ -332,7 +342,17 @@ export default {
                         label: "往来单位",
                         prop: "corpCnName",
                         width: '160',
-                        overHidden: true,
+                        cell: true,
+                        slot: true,
+                        formslot: true,
+                        overHidden: true,
+                        rules: [
+                            {
+                                required: true,
+                                message: '请选择往来单位',
+                                trigger: 'blur'
+                            }
+                        ]
                     },
                     {
                         label: "提单号",
@@ -350,7 +370,17 @@ export default {
                         label: "费用名称",
                         prop: "feeCnName",
                         width: '120',
-                        overHidden: true,
+                        cell: true,
+                        slot: true,
+                        formslot: true,
+                        overHidden: true,
+                        rules: [
+                            {
+                                required: true,
+                                message: '请选择费用名称',
+                                trigger: 'blur'
+                            }
+                        ]
                     },
                     {
                         label: "收费标准",
@@ -361,12 +391,33 @@ export default {
                     {
                         label: "单价",
                         prop: "price",
-                        overHidden: true,
+                        cell: true,
+                        slot: true,
+                        formslot: true,
+                        overHidden: true,
+                        rules: [
+                            {
+                                required: true,
+                                message: '请输入单价',
+                                trigger: 'blur'
+                            }
+                        ]
+
                     },
                     {
                         label: "数量",
                         prop: "quantity",
-                        overHidden: true,
+                        cell: true,
+                        slot: true,
+                        formslot: true,
+                        overHidden: true,
+                        rules: [
+                            {
+                                required: true,
+                                message: '请输入数量',
+                                trigger: 'blur'
+                            }
+                        ]
                     },
                     {
                         label: "金额",
@@ -376,7 +427,17 @@ export default {
                     {
                         label: "币别",
                         prop: "curCode",
-                        overHidden: true,
+                        cell: true,
+                        slot: true,
+                        formslot: true,
+                        overHidden: true,
+                        rules: [
+                            {
+                                required: true,
+                                message: '请选择币别',
+                                trigger: 'blur'
+                            }
+                        ]
                     },
                     {
                         label: "外币金额",
@@ -391,7 +452,27 @@ export default {
                     {
                         label: "结算汇率",
                         prop: "stlExrate",
-                        overHidden: true,
+                        cell: true,
+                        slot: true,
+                        formslot: true,
+                        overHidden: true,
+                        rules: [
+                            {
+                                required: true,
+                                message: '请输入结算汇率',
+                                trigger: 'blur'
+                            }
+                        ]
+                    },
+                    {
+                        label: "结算日期",
+                        prop: "stlDate",
+                        width: "120",
+                        cell: true,
+                        type: "date",
+                        format: "yyyy-MM-dd",
+                        valueFormat: "yyyy-MM-dd 00:00:00",
+                        overHidden: true
                     },
                     {
                         label: "优惠汇率",
@@ -516,8 +597,14 @@ export default {
         allClick(name, type) {
             if (name == '一键保存') {
                 if (type == 'C') {
+                    for (let row of this.form.feeCenterListC) {
+                        if (!row.corpCnName || !row.feeCnName || !row.price || !row.quantity || !row.curCode || !Number(row.stlExrate)) {
+                            this.$refs.crudC.rowCell(row, row.$index)
+                            return this.$message.error("请完善应付费用信息");
+                        }
+                    }
                     for (let index in this.form.feeCenterListC) {
-                        if (this.form.feeCenterListC[index].feeCnName == '首款' || this.form.feeCenterListC[index].feeCnName == '尾款') {
+                        if (this.form.feeCenterListC[index].feeCnName == '首款' || this.form.feeCenterListC[index].feeCnName == '尾款' || this.form.feeCenterListC[index].feeCnName == '手续费') {
                             if (!this.form.feeCenterListC[index].discountExrate) return this.$message.error("第" + (Number(index) + 1) + "行" + this.form.feeCenterListC[index].feeCnName + "费用优惠汇率不能为空");
                         }
                     }
@@ -679,6 +766,21 @@ export default {
                 }
             }
         },
+        submitValidate() {
+            for (let row of this.form.feeCenterListC) {
+                if (!row.corpCnName || !row.feeCnName || !row.price || !row.quantity || !row.curCode || !Number(row.stlExrate)) {
+                    this.$refs.crudC.rowCell(row, row.$index)
+                    this.$message.error("请完善应付费用信息");
+                    return false
+                }
+                if (row.feeCnName == '首款' || row.feeCnName == '尾款' || row.feeCnName == '手续费') {
+                    if (Number(row.discountExrate) == 0) {
+                        row.discountExrate = this.form.exchangeRate
+                    }
+                }
+            }
+            return true
+        },
         //自定义列保存
         async saveColumn(ref, option, optionBack, code) {
             /**

src/components/tradeAgency/fee-oceanFreight.vue

@@ -32,13 +32,13 @@
             <template slot="index" slot-scope="{row,index}">
                 <span>{{ index + 1 }}</span>
             </template>
-            <template slot="corpCnName" slot-scope="{ row }">
+            <template slot="corpCnNameForm" slot-scope="{ row }">
                 <dic-select v-if="row.$cellEdit" v-model="row.corpCnName" placeholder="往来单位" key="id" label="cnName"
                     res="records" url="/blade-los/bcorps/listByType" :filterable="true" :remote="true" dataName="cnName"
                     @selectChange="rowDicChange('corpCnName', $event, row)"></dic-select>
                 <span v-else>{{ row.corpCnName }}</span>
             </template>
-            <template slot="feeCnName" slot-scope="{ row }">
+            <template slot="feeCnNameForm" slot-scope="{ row }">
                 <dic-select v-if="row.$cellEdit" v-model="row.feeCnName" placeholder="费用名称" key="id" label="cnName"
                     res="records" url="/blade-los/bfees/list" :filterable="true" :remote="true" dataName="cnName"
                     @selectChange="rowDicChange('feeCnName', $event, row)"></dic-select>
@@ -50,17 +50,17 @@
                     @selectChange="rowDicChange('unitNo', $event, row)"></dic-select>
                 <span v-else>{{ row.unitNo }}</span>
             </template>
-            <tempalte slot="quantity" slot-scope="{ row }">
+            <tempalte slot="quantityForm" slot-scope="{ row }">
                 <el-input-number v-if="row.$cellEdit" v-model="row.quantity" @change="countChange(row)" :controls="false"
                     placeholder="请输入 数量" size="small" style="width: 100%;"></el-input-number>
                 <span v-else>{{ row.quantity }}</span>
             </tempalte>
-            <tempalte slot="price" slot-scope="{ row }">
+            <tempalte slot="priceForm" slot-scope="{ row }">
                 <el-input-number v-if="row.$cellEdit" v-model="row.price" @change="countChange(row)" :controls="false"
                     placeholder="请输入 单价" size="small" style="width: 100%;"></el-input-number>
                 <span v-else>{{ row.price }}</span>
             </tempalte>
-            <template slot="curCode" slot-scope="{ row }">
+            <template slot="curCodeForm" slot-scope="{ row }">
                 <dic-select v-if="row.$cellEdit" v-model="row.curCode" placeholder="币别" key="id" label="code"
                     :url="'/blade-los/bcurrency/getExrate?date=' + defaultDate + '&dc=' + row.dc" :filterable="true"
                     @selectChange="rowDicChange('curCode', $event, row)"></dic-select>
@@ -113,13 +113,13 @@
             <template slot="index" slot-scope="{row,index}">
                 <span>{{ index + 1 }}</span>
             </template>
-            <template slot="corpCnName" slot-scope="{ row }">
+            <template slot="corpCnNameForm" slot-scope="{ row }">
                 <dic-select v-if="row.$cellEdit" v-model="row.corpCnName" placeholder="往来单位" key="id" label="cnName"
                     res="records" url="/blade-los/bcorps/listByType" :filterable="true" :remote="true" dataName="cnName"
                     @selectChange="rowDicChange('corpCnName', $event, row)"></dic-select>
                 <span v-else>{{ row.corpCnName }}</span>
             </template>
-            <template slot="feeCnName" slot-scope="{ row }">
+            <template slot="feeCnNameForm" slot-scope="{ row }">
                 <dic-select v-if="row.$cellEdit" v-model="row.feeCnName" placeholder="费用名称" key="id" label="cnName"
                     res="records" url="/blade-los/bfees/list" :filterable="true" :remote="true" dataName="cnName"
                     @selectChange="rowDicChange('feeCnName', $event, row)"></dic-select>
@@ -131,17 +131,17 @@
                     @selectChange="rowDicChange('unitNo', $event, row)"></dic-select>
                 <span v-else>{{ row.unitNo }}</span>
             </template>
-            <tempalte slot="quantity" slot-scope="{ row }">
+            <tempalte slot="quantityForm" slot-scope="{ row }">
                 <el-input-number v-if="row.$cellEdit" v-model="row.quantity" @change="countChange(row)" :controls="false"
                     placeholder="请输入 数量" size="small" style="width: 100%;"></el-input-number>
                 <span v-else>{{ row.quantity }}</span>
             </tempalte>
-            <tempalte slot="price" slot-scope="{ row }">
+            <tempalte slot="priceForm" slot-scope="{ row }">
                 <el-input-number v-if="row.$cellEdit" v-model="row.price" @change="countChange(row)" :controls="false"
                     placeholder="请输入 单价" size="small" style="width: 100%;"></el-input-number>
                 <span v-else>{{ row.price }}</span>
             </tempalte>
-            <template slot="curCode" slot-scope="{ row }">
+            <template slot="curCodeForm" slot-scope="{ row }">
                 <dic-select v-if="row.$cellEdit" v-model="row.curCode" placeholder="币别" key="id" label="code"
                     :url="'/blade-los/bcurrency/getExrate?date=' + defaultDate + '&dc=' + row.dc" :filterable="true"
                     @selectChange="rowDicChange('curCode', $event, row)"></dic-select>
@@ -314,7 +314,17 @@ export default {
                         label: "往来单位",
                         prop: "corpCnName",
                         width: '160',
+                        cell: true,
+                        slot: true,
+                        formslot: true,
                         overHidden: true,
+                        rules: [
+                            {
+                                required: true,
+                                message: '请选择往来单位',
+                                trigger: 'blur'
+                            }
+                        ]
                     },
                     {
                         label: "提单号",
@@ -326,7 +336,17 @@ export default {
                         label: "费用名称",
                         prop: "feeCnName",
                         width: '120',
+                        cell: true,
+                        slot: true,
+                        formslot: true,
                         overHidden: true,
+                        rules: [
+                            {
+                                required: true,
+                                message: '请选择费用名称',
+                                trigger: 'blur'
+                            }
+                        ]
                     },
                     {
                         label: "收费标准",
@@ -337,12 +357,32 @@ export default {
                     {
                         label: "单价",
                         prop: "price",
+                        cell: true,
+                        slot: true,
+                        formslot: true,
                         overHidden: true,
+                        rules: [
+                            {
+                                required: true,
+                                message: '请输入单价',
+                                trigger: 'blur'
+                            }
+                        ]
                     },
                     {
                         label: "数量",
                         prop: "quantity",
+                        cell: true,
+                        slot: true,
+                        formslot: true,
                         overHidden: true,
+                        rules: [
+                            {
+                                required: true,
+                                message: '请输入数量',
+                                trigger: 'blur'
+                            }
+                        ]
                     },
                     {
                         label: "金额",
@@ -352,7 +392,17 @@ export default {
                     {
                         label: "币别",
                         prop: "curCode",
+                        cell: true,
+                        slot: true,
+                        formslot: true,
                         overHidden: true,
+                        rules: [
+                            {
+                                required: true,
+                                message: '请选择币别',
+                                trigger: 'blur'
+                            }
+                        ]
                     },
                     {
                         label: "外币金额",
@@ -370,6 +420,16 @@ export default {
                         overHidden: true,
                     },
                     {
+                        label: "结算日期",
+                        prop: "stlDate",
+                        width: "120",
+                        cell: true,
+                        type: "date",
+                        format: "yyyy-MM-dd",
+                        valueFormat: "yyyy-MM-dd 00:00:00",
+                        overHidden: true
+                    },
+                    {
                         label: "天数",
                         prop: "days",
                         overHidden: true,
@@ -432,7 +492,17 @@ export default {
                         label: "往来单位",
                         prop: "corpCnName",
                         width: '160',
+                        cell: true,
+                        slot: true,
+                        formslot: true,
                         overHidden: true,
+                        rules: [
+                            {
+                                required: true,
+                                message: '请选择往来单位',
+                                trigger: 'blur'
+                            }
+                        ]
                     },
                     {
                         label: "提单号",
@@ -444,7 +514,17 @@ export default {
                         label: "费用名称",
                         prop: "feeCnName",
                         width: '120',
+                        cell: true,
+                        slot: true,
+                        formslot: true,
                         overHidden: true,
+                        rules: [
+                            {
+                                required: true,
+                                message: '请选择费用名称',
+                                trigger: 'blur'
+                            }
+                        ]
                     },
                     {
                         label: "收费标准",
@@ -455,12 +535,32 @@ export default {
                     {
                         label: "单价",
                         prop: "price",
+                        cell: true,
+                        slot: true,
+                        formslot: true,
                         overHidden: true,
+                        rules: [
+                            {
+                                required: true,
+                                message: '请输入单价',
+                                trigger: 'blur'
+                            }
+                        ]
                     },
                     {
                         label: "数量",
                         prop: "quantity",
+                        cell: true,
+                        slot: true,
+                        formslot: true,
                         overHidden: true,
+                        rules: [
+                            {
+                                required: true,
+                                message: '请输入数量',
+                                trigger: 'blur'
+                            }
+                        ]
                     },
                     {
                         label: "金额",
@@ -470,7 +570,17 @@ export default {
                     {
                         label: "币别",
                         prop: "curCode",
+                        cell: true,
+                        slot: true,
+                        formslot: true,
                         overHidden: true,
+                        rules: [
+                            {
+                                required: true,
+                                message: '请选择币别',
+                                trigger: 'blur'
+                            }
+                        ]
                     },
                     {
                         label: "外币金额",
@@ -488,6 +598,16 @@ export default {
                         overHidden: true,
                     },
                     {
+                        label: "结算日期",
+                        prop: "stlDate",
+                        width: "120",
+                        cell: true,
+                        type: "date",
+                        format: "yyyy-MM-dd",
+                        valueFormat: "yyyy-MM-dd 00:00:00",
+                        overHidden: true
+                    },
+                    {
                         label: "天数",
                         prop: "days",
                         overHidden: true,
@@ -978,6 +1098,31 @@ export default {
                 })
             }
         },
+        submitValidate() {
+            for (let row of this.form.feeCenterListD) {
+                if (!row.corpCnName || !row.feeCnName || !row.price || !row.quantity || !row.curCode) {
+                    this.$refs.crudD.rowCell(row, row.$index)
+                    this.$message.error("请完善应收费用信息");
+                    return false
+                }
+            }
+            for (let row of this.form.feeCenterListC) {
+                if (!row.corpCnName || !row.feeCnName || !row.price || !row.quantity || !row.curCode) {
+                    this.$refs.crudC.rowCell(row, row.$index)
+                    this.$message.error("请完善应付费用信息");
+                    return false
+                }
+            }
+            for (let index in this.form.feeCenterListC) {
+                if (this.form.feeCenterListC[index].feeCnName == '首款' || this.form.feeCenterListC[index].feeCnName == '尾款'|| this.form.feeCenterListC[index].feeCnName == '手续费') {
+                    if (!this.form.feeCenterListC[index].discountExrate) {
+                        this.$message.error("第" + (Number(index) + 1) + "行" + this.form.feeCenterListC[index].feeCnName + "费用优惠汇率不能为空");
+                        return false
+                    }
+                }
+            }
+            return true
+        },
         //自定义列保存
         async saveColumn(ref, option, optionBack, code) {
             /**

src/views/tradeAgency/exchangePurchasing/detailsPage.vue

@@ -48,7 +48,7 @@
                 </avue-crud>
             </trade-card> -->
             <trade-card title="费用明细">
-                <fee-infosimple feeType="C" :form="form" :disabled="editDisabled || form.firstStatus == '审核通过'"
+                <fee-infosimple ref="feeInfo" feeType="C" :form="form" :disabled="editDisabled || form.firstStatus == '审核通过'"
                     @getDetails="getDetails"></fee-infosimple>
             </trade-card>
             <!-- <containerTitle title="上传附件"></containerTitle>
@@ -295,23 +295,20 @@ export default {
             this.$refs["form"].validate((valid, done) => {
                 done();
                 if (valid) {
-                    for (let index in this.form.feeCenterListC) {
-                        if (this.form.feeCenterListC[index].feeCnName == '首款' || this.form.feeCenterListC[index].feeCnName == '尾款') {
-                            if (!this.form.feeCenterListC[index].discountExrate) return this.$message.error("第" + (Number(index) + 1) + "行" + this.form.feeCenterListC[index].feeCnName + "费用优惠汇率不能为空");
-                        }
+                    if (this.$refs.feeInfo.submitValidate()) {
+                        const loading = this.$loading({
+                            lock: true,
+                            text: '加载中',
+                            spinner: 'el-icon-loading',
+                            background: 'rgba(255,255,255,0.7)'
+                        });
+                        submit(this.form).then(res => {
+                            this.$message.success("保存成功");
+                            this.getDetails(res.data.data.id)
+                        }).finally(() => {
+                            loading.close();
+                        })
                     }
-                    const loading = this.$loading({
-                        lock: true,
-                        text: '加载中',
-                        spinner: 'el-icon-loading',
-                        background: 'rgba(255,255,255,0.7)'
-                    });
-                    submit(this.form).then(res => {
-                        this.$message.success("保存成功");
-                        this.getDetails(res.data.data.id)
-                    }).finally(() => {
-                        loading.close();
-                    })
                 } else {
                     return false;
                 }

src/views/tradeAgency/oceanFreightImport/detailsPage.vue

@@ -119,7 +119,7 @@
                         <span v-else>{{ row.pickupAddressName }}</span>
                     </tempalte>
                     <tempalte slot="deliveryAddressName" slot-scope="{ row, index }">
-                        <dic-select v-if="row.$cellEdit" v-model="row.deliveryAddressName" placeholder="提箱地点" key="id"
+                        <dic-select v-if="row.$cellEdit" v-model="row.deliveryAddressName" placeholder="送货地点" key="id"
                             label="cnName" res="records" url="/blade-los/blocations/list" :filterable="true" :remote="true"
                             dataName="cnName" @selectChange="rowDicChange('deliveryAddressName', $event, row)"
                             :disabled="editDisabled"></dic-select>
@@ -193,7 +193,7 @@
                 </avue-crud>
             </trade-card>
             <trade-card title="费用明细">
-                <fee-info :form="form" :disabled="editDisabled" @getDetails="getDetails"></fee-info>
+                <fee-info ref="feeInfo" :form="form" :disabled="editDisabled" @getDetails="getDetails"></fee-info>
             </trade-card>
             <containerTitle title="上传附件"></containerTitle>
             <c-upload :data="form.filesCenterList" :enumerationValue="76"
@@ -1432,18 +1432,20 @@ export default {
             this.$refs["form"].validate((valid, done) => {
                 done();
                 if (valid) {
-                    const loading = this.$loading({
-                        lock: true,
-                        text: '加载中',
-                        spinner: 'el-icon-loading',
-                        background: 'rgba(255,255,255,0.7)'
-                    });
-                    submit(this.form).then(res => {
-                        this.$message.success("保存成功");
-                        this.getDetails(res.data.data.id)
-                    }).finally(() => {
-                        loading.close();
-                    })
+                    if (this.$refs.feeInfo.submitValidate()) {
+                        const loading = this.$loading({
+                            lock: true,
+                            text: '加载中',
+                            spinner: 'el-icon-loading',
+                            background: 'rgba(255,255,255,0.7)'
+                        });
+                        submit(this.form).then(res => {
+                            this.$message.success("保存成功");
+                            this.getDetails(res.data.data.id)
+                        }).finally(() => {
+                            loading.close();
+                        })
+                    }
                 } else {
                     return false;
                 }

src/views/tradeAgency/tradeAgency/detailsPage.vue

@@ -118,7 +118,7 @@
             </trade-card>
             <trade-card title="货物明细">
                 <avue-crud :option="option" :data="form.agentItemsList" id="out-table" ref="crud"
-                    @selection-change="selectionChange" @select="selectHandle"
+                    @selection-change="selectionChange" @select="selectHandle" @row-update="rowUpdate"
                     @resetColumn="resetColumn('crud', 'option', 'optionBack', 376)"
                     @saveColumn="saveColumn('crud', 'option', 'optionBack', 376)">
                     <template slot="menuLeft">
@@ -169,50 +169,51 @@
                         <!-- <el-input v-if="row.$cellEdit" v-model="row.billNo" placeholder="请输入 提单号"></el-input> -->
                         <span v-if="!row.$cellEdit" style="color: #1e9fff" @click="rowJump(row)">{{ row.billNo }}</span>
                     </template>
-                    <template slot="boxType" slot-scope="{ row }">
+                    <template slot="boxTypeForm" slot-scope="{ row }">
                         <dic-select v-if="row.$cellEdit" v-model="row.boxType" placeholder="箱型" key="id" res="records"
                             label="cnName" url="/blade-los/bcntrtypes/list" :filterable="true" :remote="true"
                             dataName="cnName"></dic-select>
                         <span v-else>{{ row.boxType }}</span>
                     </template>
-                    <tempalte slot="orderReleaseMethod" slot-scope="{ row }">
+                    <tempalte slot="orderReleaseMethodForm" slot-scope="{ row }">
                         <dic-select v-if="row.$cellEdit" v-model="row.orderReleaseMethod" placeholder="放单方式" key="dictKey"
                             label="dictValue" url="/blade-system/dict-biz/dictionary?code=release_method"
                             :filterable="true"></dic-select>
                         <span v-else>{{ row.orderReleaseMethod }}</span>
                     </tempalte>
-                    <template slot="hsCode" slot-scope="{ row }">
+                    <template slot="hsCodeForm" slot-scope="{ row }">
                         <dic-select v-if="row.$cellEdit" v-model="row.hsCode" placeholder="HSCODE" key="id" res="records"
                             label="hsCode" url="/blade-los/bcommodity/list" :filterable="true" :remote="true"
                             dataName="hsCode" @selectChange="rowDicChange('hsCode', $event, row)"></dic-select>
                         <span v-else>{{ row.hsCode }}</span>
                     </template>
-                    <tempalte slot="goodsType" slot-scope="{ row }">
+                    <tempalte slot="goodsTypeForm" slot-scope="{ row }">
                         <dic-select v-if="row.$cellEdit" v-model="row.goodsType" placeholder="商品类型" key="dictKey"
                             label="dictValue" url="/blade-system/dict-biz/dictionary?code=goods-type"
                             :filterable="true"></dic-select>
                         <span v-else>{{ row.goodsType }}</span>
                     </tempalte>
-                    <tempalte slot="quantity" slot-scope="{ row }">
+                    <tempalte slot="quantityForm" slot-scope="{ row }">
                         <el-input-number v-if="row.$cellEdit" v-model="row.quantity" @change="countChange(row)"
                             :controls="false" placeholder="请输入 数量" size="small" style="width: 100%;"></el-input-number>
                         <span v-else>{{ row.quantity }}</span>
                     </tempalte>
-                    <tempalte slot="price" slot-scope="{ row }">
+                    <tempalte slot="priceForm" slot-scope="{ row }">
                         <el-input-number v-if="row.$cellEdit" v-model="row.price" @change="countChange(row)"
                             :controls="false" placeholder="请输入 单价" size="small" style="width: 100%;"></el-input-number>
                         <span v-else>{{ row.price }}</span>
                     </tempalte>
                     <template slot="menu" slot-scope="{ row, index }">
-                        <el-button size="small" icon="el-icon-edit" type="text" :disabled="editDisabled"
-                            @click="rowCell(row, index)">编 辑</el-button>
+                        <el-button size="small" :icon="row.$cellEdit ? 'el-icon-plus' : 'el-icon-edit'" type="text"
+                            :disabled="editDisabled" @click="rowCell(row, index)">{{ row.$cellEdit ? '保 存' : '编 辑'
+                            }}</el-button>
                         <el-button size="small" icon="el-icon-delete" type="text" :disabled="editDisabled"
                             @click="rowDel(row, index)">删 除</el-button>
                     </template>
                 </avue-crud>
             </trade-card>
             <trade-card title="费用明细">
-                <fee-info :form="form" :disabled="editDisabled" @getDetails="getDetails"></fee-info>
+                <fee-info ref="feeInfo" :form="form" :disabled="editDisabled" @getDetails="getDetails"></fee-info>
             </trade-card>
             <trade-card title="记录信息">
                 <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
@@ -452,6 +453,11 @@ export default {
                         label: '外国发货人',
                         prop: "abroadConsignorCname",
                         disabled: false,
+                        rules: [{
+                            required: true,
+                            message: " ",
+                            trigger: "blur"
+                        }]
                     },
                     {
                         label: '银行助记码',
@@ -472,6 +478,11 @@ export default {
                         label: '国内收货人',
                         prop: "domesticConsigneeCname",
                         disabled: false,
+                        rules: [{
+                            required: true,
+                            message: " ",
+                            trigger: "blur"
+                        }]
                     },
                     {
                         label: '银行助记码',
@@ -569,20 +580,44 @@ export default {
                         prop: "billNo",
                         width: "120",
                         cell: true,
-                        overHidden: true
+                        overHidden: true,
+                        rules: [
+                            {
+                                required: true,
+                                message: '请输入提单号',
+                                trigger: 'blur'
+                            }
+                        ]
                     },
                     {
                         label: "箱型",
                         prop: "boxType",
                         width: "120",
+                        cell: true,
+                        slot: true,
+                        formslot: true,
                         overHidden: true,
+                        rules: [
+                            {
+                                required: true,
+                                message: '请选择箱型',
+                                trigger: 'blur'
+                            }
+                        ]
                     },
                     {
                         label: "箱号",
                         prop: "boxNo",
                         width: "120",
                         cell: true,
-                        overHidden: true
+                        overHidden: true,
+                        rules: [
+                            {
+                                required: true,
+                                message: '请输入箱号',
+                                trigger: 'blur'
+                            }
+                        ]
                     },
                     {
                         label: "铅封号",
@@ -595,6 +630,9 @@ export default {
                         label: "放单方式",
                         prop: "orderReleaseMethod",
                         width: "160",
+                        cell: true,
+                        slot: true,
+                        formslot: true,
                         overHidden: true
                     },
                     {
@@ -633,7 +671,17 @@ export default {
                         label: "HSCODE",
                         prop: "hsCode",
                         width: "120",
-                        overHidden: true
+                        overHidden: true,
+                        cell: true,
+                        slot: true,
+                        formslot: true,
+                        rules: [
+                            {
+                                required: true,
+                                message: '请输入HSCODE',
+                                trigger: 'blur'
+                            }
+                        ]
                     },
                     {
                         label: "厂号",
@@ -652,13 +700,33 @@ export default {
                         label: "商品类别",
                         prop: "goodsType",
                         width: "120",
-                        overHidden: true
+                        cell: true,
+                        slot: true,
+                        formslot: true,
+                        overHidden: true,
+                        rules: [
+                            {
+                                required: true,
+                                message: '请选择商品类别',
+                                trigger: 'blur'
+                            }
+                        ]
                     },
                     {
                         label: "件数",
                         prop: "quantity",
                         width: "120",
-                        overHidden: true
+                        cell: true,
+                        slot: true,
+                        formslot: true,
+                        overHidden: true,
+                        rules: [
+                            {
+                                required: true,
+                                message: '请输入件数',
+                                trigger: 'blur'
+                            }
+                        ]
                     },
                     {
                         label: "净重(kg)",
@@ -667,13 +735,30 @@ export default {
                         cell: true,
                         type: 'number',
                         controls: false,
-                        overHidden: true
+                        overHidden: true,
+                        rules: [
+                            {
+                                required: true,
+                                message: '请输入净重',
+                                trigger: 'blur'
+                            }
+                        ]
                     },
                     {
                         label: "单价",
                         prop: "price",
                         width: "120",
-                        overHidden: true
+                        cell: true,
+                        slot: true,
+                        formslot: true,
+                        overHidden: true,
+                        rules: [
+                            {
+                                required: true,
+                                message: '请输入单价',
+                                trigger: 'blur'
+                            }
+                        ]
                     },
                     {
                         label: "毛重(kg)",
@@ -682,7 +767,14 @@ export default {
                         cell: true,
                         type: 'number',
                         controls: false,
-                        overHidden: true
+                        overHidden: true,
+                        rules: [
+                            {
+                                required: true,
+                                message: '请输入毛重',
+                                trigger: 'blur'
+                            }
+                        ]
                     },
                     {
                         label: "金额",
@@ -1057,12 +1149,14 @@ export default {
 
         },
         addRow() {
-            if (!this.form.corpId) {
-                return this.$message.error("请选择客户名称");
-            }
+            if (!this.form.corpId) return this.$message.error("请选择客户名称");
             this.form.agentItemsList.push({ $cellEdit: true })
         },
         rowCell(row, index) {
+            if (!row.billNo || !row.boxType || !row.boxNo || !row.hsCode || !row.goodsType || !row.quantity || !row.netWeight || !row.price || !row.grossWeight) {
+                this.$refs.crud.rowCell(row, index)
+                return this.$message.error("请完善明细信息");
+            }
             if (row.$cellEdit == true) {
                 this.$set(row, "$cellEdit", false);
             } else {
@@ -1222,12 +1316,6 @@ export default {
             if (name == '尾款账单') {
 
                 if (!this.form.domesticConsigneeCname) return this.$message.error("请选择国内收货人");
-
-                // for (let index in this.selectionList) {
-                //     if (this.selectionList[index].whetherBalancePayment == 1) {
-                //         return this.$message.error("第" + Number(this.selectionList[index].$index + 1) + "行已生成尾款");
-                //     }
-                // }
                 let obj = {}
                 obj = {
                     ...this.form,
@@ -1411,24 +1499,28 @@ export default {
             this.$refs["form"].validate((valid, done) => {
                 done();
                 if (valid) {
-                    for (let index in this.form.feeCenterListC) {
-                        if (this.form.feeCenterListC[index].feeCnName == '首款' || this.form.feeCenterListC[index].feeCnName == '尾款') {
-                            if (!this.form.feeCenterListC[index].discountExrate) return this.$message.error("第" + (Number(index) + 1) + "行" + this.form.feeCenterListC[index].feeCnName + "费用优惠汇率不能为空");
+                    for (let row of this.form.agentItemsList) {
+                        if (!row.billNo || !row.boxType || !row.boxNo || !row.hsCode || !row.goodsType || !row.quantity || !row.netWeight || !row.price || !row.grossWeight) {
+                            this.$refs.crud.rowCell(row, row.$index)
+                            return this.$message.error("请完善明细信息");
                         }
                     }
-                    const loading = this.$loading({
-                        lock: true,
-                        text: '加载中',
-                        spinner: 'el-icon-loading',
-                        background: 'rgba(255,255,255,0.7)'
-                    });
-                    this.form.businessDate = this.form.contractDate
-                    submit(this.form).then(res => {
-                        this.$message.success("保存成功");
-                        this.getDetails(res.data.data.id)
-                    }).finally(() => {
-                        loading.close();
-                    })
+                    if (this.$refs.feeInfo.submitValidate()) {
+                        const loading = this.$loading({
+                            lock: true,
+                            text: '加载中',
+                            spinner: 'el-icon-loading',
+                            background: 'rgba(255,255,255,0.7)'
+                        });
+                        this.form.businessDate = this.form.contractDate
+                        submit(this.form).then(res => {
+                            this.$message.success("保存成功");
+                            this.getDetails(res.data.data.id)
+                        }).finally(() => {
+                            loading.close();
+                        })
+                    }
+
                 } else {
                     return false;
                 }

src/views/tradeAgency/tradeAgency/index.vue

@@ -293,12 +293,60 @@ export default {
                         searchOrder: 11,
                     },
                     {
+                        label: '外国发货人',
+                        prop: "abroadConsignorId",
+                        width: "120",
+                        search: true,
+                        type: 'select',
+                        filterable: true,
+                        remote: true,
+                        searchOrder: 12,
+                        dicUrl: "/api/blade-los/bcorps/listByType?cnName={{key}}",
+                        props: {
+                            label: 'cnName',
+                            value: 'id',
+                            res: 'data.records'
+                        },
+                        hide: true,
+                        showColumn: false,
+                    },
+                    {
+                        label: "外国发货人",
+                        prop: "abroadConsignorCname",
+                        width: "120",
+                        overHidden: true,
+                    },
+                    {
+                        label: '国内收货人',
+                        prop: "domesticConsigneeId",
+                        width: "120",
+                        search: true,
+                        type: 'select',
+                        filterable: true,
+                        remote: true,
+                        searchOrder: 13,
+                        dicUrl: "/api/blade-los/bcorps/listByType?cnName={{key}}",
+                        props: {
+                            label: 'cnName',
+                            value: 'id',
+                            res: 'data.records'
+                        },
+                        hide: true,
+                        showColumn: false,
+                    },
+                    {
+                        label: "国内收货人",
+                        prop: "domesticConsigneeCname",
+                        width: "120",
+                        overHidden: true,
+                    },
+                    {
                         label: "收货款",
                         prop: "whetherReceivedDownPayments",
                         width: "120",
                         overHidden: true,
                         search: true,
-                        searchOrder: 12,
+                        searchOrder: 15,
                         type: "select",
                         dicUrl: "/api/blade-system/dict-biz/dictionary?code=received_down",
                         props: {
@@ -314,7 +362,7 @@ export default {
                         width: "120",
                         overHidden: true,
                         search: true,
-                        searchOrder: 13,
+                        searchOrder: 14,
                         type: "select",
                         dicUrl: "/api/blade-system/dict-biz/dictionary?code=received_balance",
                         props: {
@@ -462,8 +510,8 @@ export default {
                         prop: "checkbox",
                         overHidden: true,
                         search: true,
-                        searchSpan: 12,
-                        searchOrder: 14,
+                        searchSpan: 18,
+                        searchOrder: 16,
                         hide: true,
                         showColumn: false,
                     }