修改bug

src/api/tradeAgency/oceanFreightImport.js

@@ -281,4 +281,33 @@ export const revokeOutbound= (data) => {
         method: 'post',
         data: data
     })
+}
+
+//转押
+export const transferOfPledge= (data) => {
+    return request({
+        url: '/api/blade-los/tradebills/transferOfPledge',
+        method: 'get',
+        params: data
+    })
+}
+//撤销转押
+export const revokeTransferOfPledge= (data) => {
+    return request({
+        url: '/api/blade-los/tradebills/revokeTransferOfPledge',
+        method: 'get',
+        params: data
+    })
+}
+
+export const getListTradeV1= (current, size,data) => {
+    return request({
+        url: '/api/blade-los/tradebills/listTradeV1',
+        method: 'get',
+        params: {
+            ...data,
+            current,
+            size
+        }
+    })
 }

src/components/dicSelect/main.vue

@@ -3,7 +3,7 @@
     <el-select v-model="value" @input="$emit('selectedValue', value)" :placeholder="'请输入 ' + placeholder"
         @change="selectChange" @clear="clear" :clearable="clearable" :multiple="multiple" :filterable="filterable"
         :remote="remote" :remote-method="remoteMethod" :loading="loading" :size="size" :disabled="disabled">
-        <el-option v-for="item in options" :key="item[key]" :label="item[label]" :value="item[label]">
+        <el-option v-for="item in options" :key="item[key]" :label="item[label]" :value="item[keyValue?keyValue:label]">
         </el-option>
     </el-select>
 </template>
@@ -24,13 +24,17 @@ export default {
             default: true
         },
         key: {
-            type: Number,
-            default: 0
+            type: [String, Number],
+            default: null
         },
         label: {
             type: String,
             default: ''
         },
+        keyValue: {
+            type: [String, Number],
+            default: null
+        },
         res: {
             type: String,
             default: ''

src/components/tradeAgency/fee-info.vue

@@ -38,7 +38,8 @@
                 <span v-else>{{ row.corpCnName }}</span>
             </template>
             <template slot="cntrNoForm" slot-scope="{ row }">
-                <el-input v-if="row.$cellEdit&&!row.feeType" v-model="row.cntrNo" placeholder="请输入 箱号" size="small"></el-input>
+                <el-input v-if="row.$cellEdit && !row.feeType" v-model="row.cntrNo" placeholder="请输入 箱号"
+                    size="small"></el-input>
                 <span v-else>{{ row.cntrNo }}</span>
             </template>
             <template slot="feeCnNameForm" slot-scope="{ row }">
@@ -119,7 +120,8 @@
                 <span v-else>{{ row.corpCnName }}</span>
             </template>
             <template slot="cntrNoForm" slot-scope="{ row }">
-                <el-input v-if="row.$cellEdit&&!row.feeType" v-model="row.cntrNo" placeholder="请输入 箱号" size="small"></el-input>
+                <el-input v-if="row.$cellEdit && !row.feeType" v-model="row.cntrNo" placeholder="请输入 箱号"
+                    size="small"></el-input>
                 <span v-else>{{ row.cntrNo }}</span>
             </template>
             <template slot="feeCnNameForm" slot-scope="{ row }">
@@ -862,7 +864,7 @@ export default {
                     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("请完善应收费用信息");
+                            return this.$message.error((!row.corpCnName ? "往来单位，" : '') + (!row.feeCnName ? "费用名称，" : '') + (!row.price ? "单价，" : '') + (!row.quantity ? "数量，" : '') + (!row.curCode ? "币别，" : '') + "不能为空");
                         }
                     }
                     this.form.feeCenterListD.forEach(e => {
@@ -885,7 +887,7 @@ export default {
                     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("请完善应付费用信息");
+                            return this.$message.error((!row.corpCnName ? "往来单位，" : '') + (!row.feeCnName ? "费用名称，" : '') + (!row.price ? "单价，" : '') + (!row.quantity ? "数量，" : '') + (!row.curCode ? "币别，" : '') + "不能为空");
                         }
                     }
                     for (let index in this.form.feeCenterListC) {
@@ -1138,27 +1140,33 @@ 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
+            if (this.form.feeCenterListD.length) {
+                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((!row.corpCnName ? "往来单位，" : '') + (!row.feeCnName ? "费用名称，" : '') + (!row.price ? "单价，" : '') + (!row.quantity ? "数量，" : '') + (!row.curCode ? "币别，" : '') + "不能为空");
+                        // 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 + "费用优惠汇率不能为空");
+
+            if (this.form.feeCenterListC.length) {
+                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((!row.corpCnName ? "往来单位，" : '') + (!row.feeCnName ? "费用名称，" : '') + (!row.price ? "单价，" : '') + (!row.quantity ? "数量，" : '') + (!row.curCode ? "币别，" : '') + "不能为空");
                         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
         },

src/components/tradeAgency/fee-infosimple.vue

@@ -19,8 +19,8 @@
             </template>
             <template slot="corpCnName" 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?corpTypeName=客户" :filterable="true" :remote="true" dataName="cnName"
-                    @selectChange="rowDicChange('corpCnName', $event, row)"></dic-select>
+                    res="records" url="/blade-los/bcorps/listByType?corpTypeName=客户" :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 }">
@@ -90,53 +90,60 @@
                 <span>{{ index + 1 }}</span>
             </template>
             <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?corpTypeName=客户" :filterable="true" :remote="true" dataName="cnName"
-                    @selectChange="rowDicChange('corpCnName', $event, row)"></dic-select>
+                <dic-select v-if="row.$cellEdit && !row.feeType" v-model="row.corpCnName" placeholder="往来单位" key="id"
+                    label="cnName" res="records" url="/blade-los/bcorps/listByType?corpTypeName=客户" :filterable="true"
+                    :remote="true" dataName="cnName" @selectChange="rowDicChange('corpCnName', $event, row)"></dic-select>
                 <span v-else>{{ row.corpCnName }}</span>
             </template>
             <template slot="cntrNoForm" slot-scope="{ row }">
-                <el-input v-if="row.$cellEdit&&!row.feeType" v-model="row.cntrNo" placeholder="请输入 箱号" size="small"></el-input>
+                <el-input v-if="row.$cellEdit && !row.feeType" v-model="row.cntrNo" placeholder="请输入 箱号"
+                    size="small"></el-input>
                 <span v-else>{{ row.cntrNo }}</span>
             </template>
             <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>
+                <dic-select v-if="row.$cellEdit && !row.feeType" 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 }">
-                <dic-select v-if="row.$cellEdit" v-model="row.unitNo" placeholder="收费标准" key="id" label="code"
-                    url="/blade-los/bunits/selectList" :filterable="true"
+                <dic-select v-if="row.$cellEdit && !row.feeType" 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="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>
+                <el-input-number v-if="row.$cellEdit && !row.feeType" 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="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>
+                <el-input-number v-if="row.$cellEdit && !row.feeType" 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="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>
+                <dic-select v-if="row.$cellEdit && !row.feeType" 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>
                 <span v-else>{{ row.curCode }}</span>
             </template>
             <tempalte slot="exrate" slot-scope="{ row }">
-                <el-input-number v-if="row.$cellEdit" v-model="row.exrate" @change="countChange(row)" :controls="false"
-                    placeholder="请输入 汇率" size="small" style="width: 100%;"></el-input-number>
+                <el-input-number v-if="row.$cellEdit && !row.feeType" v-model="row.exrate" @change="countChange(row)"
+                    :controls="false" placeholder="请输入 汇率" size="small" style="width: 100%;"></el-input-number>
                 <span v-else>{{ row.exrate }}</span>
             </tempalte>
             <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>
+                <el-input-number v-if="row.$cellEdit && !row.feeType" 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>
             </tempalte>
+            <tempalte slot="discountExrate" slot-scope="{ row }">
+                <el-input-number v-if="row.$cellEdit" v-model="row.discountExrate" @change="countChange(row, 'C')"
+                    :controls="false" placeholder="请输入 优惠汇率" size="small" style="width: 100%;"></el-input-number>
+                <span v-else>{{ row.discountExrate }}</span>
+            </tempalte>
         </avue-crud>
     </div>
 </template>
@@ -302,7 +309,7 @@ export default {
             },
             optionC: {},
             optionCBack: {
-                maxHeight:400,
+                maxHeight: 400,
                 calcHeight: 30,
                 menuWidth: 140,
                 tip: false,
@@ -485,7 +492,7 @@ export default {
                     },
                     {
                         label: "结算日期",
-                        // prop: "stlDate",
+                        prop: "stlDate",
                         width: "120",
                         cell: true,
                         type: "date",
@@ -496,9 +503,9 @@ export default {
                     {
                         label: "优惠汇率",
                         prop: "discountExrate",
-                        cell: true,
-                        type: 'number',
-                        controls: false,
+                        // cell: true,
+                        // type: 'number',
+                        // controls: false,
                         width: "120",
                         overHidden: true,
                     },
@@ -568,6 +575,11 @@ export default {
                 }
 
             }
+            console.log(row.discountExrate > row.stlExrate,row.discountExrate , row.stlExrate)
+            if (row.discountExrate > row.stlExrate) {
+                row.discountExrate = row.stlExrate
+                return this.$message.error("优惠汇率不能超过结算汇率");
+            }
         },
         selectionDChange(list) {
             this.selectionDList = list
@@ -637,7 +649,7 @@ export default {
                     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("请完善应付费用信息");
+                            return this.$message.error((!row.corpCnName ? "往来单位，" : '') + (!row.feeCnName ? "费用名称，" : '') + (!row.price ? "单价，" : '') + (!row.quantity ? "数量，" : '') + (!row.curCode ? "币别，" : '') + (!row.stlExrate ? "结算汇率，" : '') + "不能为空");
                         }
                     }
                     for (let index in this.form.feeCenterListC) {
@@ -757,7 +769,6 @@ export default {
                     paidApplication: 'WK'
                 }
                 if (type == 'D') {
-
                     this.$confirm("是否确认尾款?", {
                         confirmButtonText: "确定",
                         cancelButtonText: "取消",
@@ -804,15 +815,17 @@ 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
+            if (this.form.feeCenterListC.length) {
+                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((!row.corpCnName ? "往来单位，" : '') + (!row.feeCnName ? "费用名称，" : '') + (!row.price ? "单价，" : '') + (!row.quantity ? "数量，" : '') + (!row.curCode ? "币别，" : '') + (!row.stlExrate ? "结算汇率，" : '') + "不能为空");
+                        return false
+                    }
+                    if (row.feeCnName == '首款' || row.feeCnName == '尾款' || row.feeCnName == '手续费') {
+                        if (Number(row.discountExrate) == 0) {
+                            row.discountExrate = this.form.exchangeRate
+                        }
                     }
                 }
             }
@@ -873,7 +886,9 @@ export default {
     text-align: center;
     padding: 4px 0;
 }
-::v-deep .el-table--small td, .el-table--small th {
+
+::v-deep .el-table--small td,
+.el-table--small th {
     padding: 2px !important;
 }
 </style>

src/components/tradeAgency/fee-oceanFreight.vue

@@ -103,6 +103,9 @@
                     @click="allClick('应付模板', 'C')">应付模板</el-button>
                 <el-button type="primary" plain size="small" :disabled="disabled || selectionCList.length == 0"
                     @click="allClick('生成应收', 'C')">生成应收</el-button>
+                <el-button type="success" plain size="small" :disabled="disabled"
+                    @click="allClick('转押', 'C')">转押</el-button>
+                <el-button plain size="small" :disabled="disabled" @click="allClick('撤销转押', 'C')">撤销转押</el-button>
             </template>
             <template slot="indexHeader" slot-scope="{row,index}">
                 <el-button type="primary" size="mini" icon="el-icon-plus" :disabled="disabled" circle @click="addRow('C')">
@@ -179,6 +182,20 @@
                 <el-button type="primary" size="mini" @click="templateExport">导 入</el-button>
             </span>
         </el-dialog>
+        <el-dialog append-to-body title="转押" class="el-dialogDeep" :visible.sync="subDialog" width="70%"
+            :close-on-click-modal="false" :destroy-on-close="true" :close-on-press-escape="false" @closed="subClosed"
+            v-dialog-drag>
+            <avue-crud ref="subCrud" :table-loading="loading" :data="subData" :option="subOptions" :page.sync="page"
+                :search.sync="query" @search-change="searchChange" @search-reset="searchReset"
+                @selection-change="subselectionChange" @current-change="currentChange" @size-change="sizeChange"
+                @row-click="rowClick" @on-load="onLoad">
+            </avue-crud>
+            <span slot="footer" class="dialog-footer">
+                <el-button size="mini" @click="subDialog = false">取 消</el-button>
+                <el-button size="mini" :disabled="subselectionList.length != 1" type="primary" @click="subSubmit">确
+                    认</el-button>
+            </span>
+        </el-dialog>
         <business-reports :id="form.id" :itemIds="itemIds" ref="printD" businessValue="HYJK" classifyCode="费用"
             groupCode="应收" :selecList="selectionDList"></business-reports>
         <business-reports :id="form.id" :itemIds="itemIds" ref="printC" businessValue="HYJK" classifyCode="费用"
@@ -194,6 +211,7 @@ import { defaultDate } from "@/util/date";
 import { losbfeestemplateDetail } from "@/api/iosBasicData/losbfeestemplate";
 import { losbfeestemplateGetListTemplate } from "@/api/iosBasicData/bills";
 import businessReports from "@/components/tradeAgency/businessReportsJK.vue";
+import { getListTradeV1, transferOfPledge, revokeTransferOfPledge } from "@/api/tradeAgency/oceanFreightImport";
 import _ from "lodash";
 export default {
     components: {
@@ -214,6 +232,72 @@ export default {
     },
     data() {
         return {
+            loading: false,
+            query: {},
+            page: {
+                pageSize: 10,
+                currentPage: 1,
+                total: 0
+            },
+            subData: [],
+            subOptions: {
+                header: false,
+                tip: false,
+                border: true,
+                index: true,
+                menu: false,
+                selection: true,
+                align: 'center',
+                searchMenuSpan: 18,
+                height: '450',
+                column: [
+                    {
+                        label: "客户名称",
+                        prop: "corpCnName",
+                        width: "120",
+                        overHidden: true,
+                    },
+                    {
+                        label: "提单号",
+                        prop: "mblno",
+                        width: "120",
+                        overHidden: true,
+                        search: true,
+                    },
+                    {
+                        label: "预计到港",
+                        prop: "bookingDate",
+                        width: "120",
+                        overHidden: true,
+                        type: "date",
+                        format: "yyyy-MM-dd",
+                        valueFormat: "yyyy-MM-dd HH:mm:ss"
+                    },
+                    {
+                        label: "箱型箱量",
+                        prop: "quantityCntrDescr",
+                        width: "100",
+                        overHidden: true
+                    },
+                    {
+                        label: "船代",
+                        prop: "bookingAgentCnName",
+                        overHidden: true
+                    },
+                    {
+                        label: "船公司",
+                        prop: "carrierCnName",
+                        overHidden: true
+                    },
+                    {
+                        label: "制单人",
+                        prop: "createUserName",
+                        overHidden: true
+                    },
+                ]
+            },
+            subDialog: false,
+            subselectionList: [],
             treeOption: {
                 nodeKey: "id",
                 // lazy: true,
@@ -697,6 +781,54 @@ export default {
             done();
 
         },
+        subSubmit() {
+            let obj = {}
+            obj = {
+                id: this.form.id,
+                billId: this.subselectionList[0].id
+            }
+            transferOfPledge(obj).then(res => {
+                this.$message.success("确认成功");
+                this.$emit('getDetails', this.form.id)
+                this.subDialog = false
+            })
+        },
+        subselectionChange(list) {
+            this.subselectionList = list;
+        },
+        subClosed() {
+            this.subData = []
+            this.subselectionList = []
+        },
+        searchReset() {
+            this.query = this.$options.data().query;
+            this.onLoad(this.page);
+        },
+        onLoad(page, params = {}) {
+            let obj = {}
+            obj = {
+                ...Object.assign(params, this.query),
+                id: this.form.id
+            }
+            console.log(obj)
+            this.loading = true;
+            getListTradeV1(page.currentPage, page.pageSize, obj).then(res => {
+                this.subData = res.data.data.records;
+                this.page.total = res.data.data.total;
+                this.$nextTick(() => {
+                    this.$refs.subCrud.doLayout();
+                });
+            }).finally(() => {
+                this.loading = false;
+            })
+
+        },
+        // 搜索按钮点击
+        searchChange(params, done) {
+            this.page.currentPage = 1;
+            this.onLoad(this.page, this.query);
+            done();
+        },
         feeselectionChange(list) {
             this.feesselectionList = list;
         },
@@ -852,6 +984,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((!row.corpCnName ? "往来单位，" : '') + (!row.feeCnName ? "费用名称，" : '') + (!row.price ? "单价，" : '') + (!row.quantity ? "数量，" : '') + (!row.curCode ? "币别，" : '') + "不能为空");
+                        }
+                    }
                     this.form.feeCenterListD.forEach(e => {
                         this.$set(e, '$cellEdit', false)
                     })
@@ -869,6 +1007,12 @@ 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((!row.corpCnName ? "往来单位，" : '') + (!row.feeCnName ? "费用名称，" : '') + (!row.price ? "单价，" : '') + (!row.quantity ? "数量，" : '') + (!row.curCode ? "币别，" : '') + "不能为空");
+                        }
+                    }
                     this.form.feeCenterListC.forEach(e => {
                         this.$set(e, '$cellEdit', false)
                     })
@@ -1188,29 +1332,46 @@ export default {
                 })
                 this.form.feeCenterListD = this.form.feeCenterListD.concat(arr)
             }
-        },
-        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
+            if (name == '转押') {
+                if (type == 'C') {
+                    this.subDialog = true
+                    this.onLoad(this.page, this.query);
                 }
             }
-            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
+            if (name == '撤销转押') {
+                revokeTransferOfPledge({ id: this.form.id }).then(res => {
+                    this.$message.success("撤销成功");
+                    this.$emit('getDetails', this.form.id)
+                })
+            }
+        },
+        submitValidate() {
+            if (this.form.feeCenterListD.length) {
+                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((!row.corpCnName ? "往来单位，" : '') + (!row.feeCnName ? "费用名称，" : '') + (!row.price ? "单价，" : '') + (!row.quantity ? "数量，" : '') + (!row.curCode ? "币别，" : '') + "不能为空");
+                        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 + "费用优惠汇率不能为空");
+
+            if (this.form.feeCenterListC.length) {
+                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((!row.corpCnName ? "往来单位，" : '') + (!row.feeCnName ? "费用名称，" : '') + (!row.price ? "单价，" : '') + (!row.quantity ? "数量，" : '') + (!row.curCode ? "币别，" : '') + "不能为空");
                         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
         },

src/views/iosBasicData/bcorps/detailsPage.vue

@@ -1434,7 +1434,7 @@ export default {
       },
       // 获取业务来源代理数据
       agentBcorpsListfun(cnName){
-          let corpTypeName = '国内直接客户,国内同行及代理,国外直接客户,国外同行及代理'
+          let corpTypeName = '国内直接客户,国内同行及代理,国外直接客户,国外同行及代理,代理客户'
           getBcorpslistByType(1,10,{cnName,corpTypeName}).then(res=>{
               this.srcData = res.data.data.records
           })

src/views/iosBasicData/storageFee/detailsPage.vue

@@ -55,7 +55,7 @@
 </template>
 
 <script>
-import { submit, getDetail,copyAgent } from "@/api/iosBasicData/storageFee";
+import { submit, getDetail, copyAgent } from "@/api/iosBasicData/storageFee";
 import dicSelect from "@/components/dicSelect/main";
 import { bfeesList } from "@/api/iosBasicData/bfees";
 import _ from "lodash";
@@ -65,7 +65,7 @@ export default {
     data() {
         return {
             form: {
-                status:'0',
+                status: '0',
                 storageFeeItemsList: []
             },
             optionForm: {
@@ -218,6 +218,13 @@ export default {
                     this.form.corpId = null
                 }
             }
+            if (name == 'warehouseName') {
+                if (row) {
+                    this.form.warehouseId = row.id
+                } else {
+                    this.form.warehouseId = null
+                }
+            }
         },
         rowDicChange(name, row, el) {
             if (name == 'feeName') {
@@ -227,13 +234,6 @@ export default {
                     el.feeId = null
                 }
             }
-            if (name == 'warehouseName') {
-                if (row) {
-                    el.warehouseId = row.id
-                } else {
-                    el.warehouseId = null
-                }
-            }
         },
         getDetails(id) {
             const loading = this.$loading({

src/views/tradeAgency/exchangePurchasing/detailsPage.vue

@@ -63,7 +63,7 @@
             <containerTitle title="上传附件"></containerTitle>
             <c-upload :data="form.filesCenterList" :enumerationValue="76"
                 deleteUrl="/blade-purchase-sales/orderfiles/update" display
-                :disabled="editDisabled || form.orderStatus == '已确认'"></c-upload>
+                :disabled="editDisabled|| form.orderStatus == '已确认' || form.orderStatus == '已确认'"></c-upload>
             <!--审核弹窗-->
             <el-dialog append-to-body title="审批进度" class="el-dialogDeep" :visible.sync="checkScheduleDialog" width="40%"
                 :close-on-click-modal="false" :destroy-on-close="true" :close-on-press-escape="false" v-dialog-drag>
@@ -139,7 +139,7 @@ export default {
                     {
                         label: '当天汇率',
                         prop: "exchangeRate",
-                        disabled: true,
+                        disabled:false,
                     },
                     {
                         label: '实付金额',

src/views/tradeAgency/exchangePurchasing/index.vue

@@ -11,7 +11,7 @@
                     <el-button size="small" icon="el-icon-edit" type="text" @click="rowEdit(row)">编辑</el-button>
                 </template>
                 <template slot="businessNo" slot-scope="{ row }">
-                    <span style="color: #1e9fff" @click="rowEdit(row)">{{ row.businessNo }}</span>
+                    <span style="color: #1e9fff;cursor: pointer;" @click="rowEdit(row)">{{ row.businessNo }}</span>
                 </template>
             </avue-crud>
         </basic-container>

src/views/tradeAgency/firstSettlement/index.vue

@@ -11,7 +11,7 @@
                     <el-button size="small" icon="el-icon-edit" type="text" @click="rowEdit(row)">编辑</el-button>
                 </template>
                 <template slot="businessNo" slot-scope="{ row }">
-                    <span style="color: #1e9fff" @click="rowEdit(row)">{{ row.businessNo }}</span>
+                    <span style="color: #1e9fff;cursor: pointer;" @click="rowEdit(row)">{{ row.businessNo }}</span>
                 </template>
             </avue-crud>
         </basic-container>

src/views/tradeAgency/oceanFreightImport/detailsPage.vue

@@ -52,10 +52,31 @@
                             url="/blade-los/bports/list" :filterable="true" :remote="true" dataName="cnName"
                             @selectChange="dicChange('podCnName', $event)" :disabled="editDisabled"></dic-select>
                     </tempalte>
-                    <tempalte slot="srcCnName">
+                    <!-- <tempalte slot="srcCnName">
                         <dic-select v-model="form.srcCnName" placeholder="业务员" key="id" label="realName" res="records"
                             url="/blade-user/page" :filterable="true" :remote="true" dataName="realName"
                             @selectChange="dicChange('srcCnName', $event)" :disabled="editDisabled"></dic-select>
+                    </tempalte> -->
+                    <tempalte slot="srcType" slot-scope="{ row }">
+                        <div style="display: flex;">
+                            <dic-select style="margin-right: 4px;" v-model="form.srcType" placeholder="客户来源" key="dictKey"
+                                keyValue="dictKey" label="dictValue"
+                                url="/blade-system/dict-biz/dictionary?code=source_Type" :filterable="true"
+                                :disabled="editDisabled" @selectChange="dicChange('srcType', $event)"></dic-select>
+                            <el-input v-show="!form.srcType" v-model="form.srcCnName" placeholder="请选择" :disabled="true">
+                            </el-input>
+                            <dic-select v-show="form.srcType == 'OWN'" v-model="form.srcCnName" placeholder="所属公司" key="id"
+                                label="deptName" url="/blade-system/dept/lazy-list?parentId=0" :filterable="true"
+                                @selectChange="dicChange('srcCnName', $event)" :disabled="editDisabled"></dic-select>
+                            <dic-select v-show="form.srcType == 'AGENT'" v-model="form.srcCnName" placeholder="代理" key="id"
+                                label="cnName" res="records" url="/blade-los/bcorps/listByType?corpTypeName=代理客户"
+                                :filterable="true" :remote="true" dataName="cnName"
+                                @selectChange="dicChange('srcCnName', $event)" :disabled="editDisabled"></dic-select>
+                            <dic-select v-show="form.srcType == 'SALES'" v-model="form.srcCnName" placeholder="业务员" key="id"
+                                label="realName" res="records" url="/blade-user/page" :filterable="true" :remote="true"
+                                dataName="realName" @selectChange="dicChange('srcCnName', $event)"
+                                :disabled="editDisabled"></dic-select>
+                        </div>
                     </tempalte>
                     <tempalte slot="hshipperCnName">
                         <dic-select v-model="form.hshipperCnName" placeholder="发货人" key="id" label="cnName" res="records"
@@ -75,6 +96,12 @@
                             dataName="cnName" @selectChange="dicChange('carrierCnName', $event)"
                             :disabled="editDisabled"></dic-select>
                     </tempalte>
+                    <tempalte slot="bookingAgentCnName">
+                        <dic-select v-model="form.bookingAgentCnName" placeholder="船代" key="id" label="cnName" res="records"
+                            url="/blade-los/bcorps/listByType?corpTypeName=客户" :filterable="true" :remote="true"
+                            dataName="cnName" @selectChange="dicChange('bookingAgentCnName', $event)"
+                            :disabled="editDisabled"></dic-select>
+                    </tempalte>
                     <template slot="hscode">
                         <div style="display:flex;">
                             <dic-select v-model="form.hscode" placeholder="品名" key="id" res="records" label="hsCode"
@@ -284,6 +311,7 @@ export default {
                 businessType: 'SI',
                 status: 0,
                 seaType: 'I',
+                mshipperCntyName: '一般贸易',
                 feeCenterListC: [],
                 feeCenterListD: [],
                 filesCenterList: [],
@@ -376,6 +404,15 @@ export default {
                     {
                         label: "船名",
                         prop: "vesselCnName",
+                        type: 'select',
+                        filterable: true,
+                        remote: true,
+                        dicUrl: "/api/blade-los/bvessels/list?cnName={{key}}",
+                        props: {
+                            label: 'cnName',
+                            value: 'cnName',
+                            res: 'data.records'
+                        },
                         disabled: false,
                     },
                     {
@@ -420,6 +457,11 @@ export default {
                         disabled: false,
                     },
                     {
+                        label: "船代",
+                        prop: "bookingAgentCnName",
+                        disabled: false,
+                    },
+                    {
                         label: '装箱方式',
                         prop: "loadType",
                         type: 'select',
@@ -445,6 +487,15 @@ export default {
                     {
                         label: "包装",
                         prop: "packingUnit",
+                        type: 'select',
+                        filterable: true,
+                        remote: true,
+                        dicUrl: "/api/blade-los/bpackages/list?cnName={{key}}",
+                        props: {
+                            label: 'cnName',
+                            value: 'cnName',
+                            res: 'data.records'
+                        },
                         disabled: false,
                     },
                     {
@@ -525,16 +576,47 @@ export default {
                         disabled: false,
                     },
                     {
-                        label: '业务员',
-                        prop: "srcCnName",
+                        label: '客户来源',
+                        prop: "srcType",
+                        disabled: false,
+                        rules: [{
+                            required: true,
+                            message: " ",
+                            trigger: "blur"
+                        }],
+                    },
+                    {
+                        label: '贸易方式',
+                        prop: "mshipperCntyName",
+                        type: "select",
+                        dicUrl: "/api/blade-system/dict-biz/dictionary?code=trade_Mode",
+                        props: {
+                            label: "dictValue",
+                            value: "dictValue"
+                        },
                         disabled: false,
+                        rules: [{
+                            required: true,
+                            message: " ",
+                            trigger: "blur"
+                        }],
                     },
+                    // {
+                    //     label: '业务员',
+                    //     prop: "srcCnName",
+                    //     disabled: false,
+                    //     rules: [{
+                    //         required: true,
+                    //         message: " ",
+                    //         trigger: "blur"
+                    //     }]
+                    // },
                     {
                         label: '备注',
                         prop: "remarks",
                         type: 'textarea',
                         disabled: false,
-                        span: 6,
+                        span: 18,
                         minRows: 2,
                     },
                 ]
@@ -1159,8 +1241,14 @@ export default {
             if (name == 'corpCnName') {
                 if (row) {
                     this.form.corpId = row.id
+                    this.form.srcType = row.sourceType
+                    this.form.srcCnName = row.srcCnName
+                    this.form.srcId = row.srcId
                 } else {
                     this.form.corpId = null
+                    this.form.srcType = null
+                    this.form.srcCnName = null
+                    this.form.srcId = null
                 }
             }
             if (name == 'polCnName') {
@@ -1187,11 +1275,17 @@ export default {
                     this.form.polEnName = null
                 }
             }
+            if (name == 'srcType') {
+                if (!row) {
+                    this.form.srcId = null
+                    this.form.srcCnName = null
+                }
+            }
             if (name == 'srcCnName') {
                 if (row) {
                     this.form.srcId = row.id
                 } else {
-                    this.form.salesmansrcId = null
+                    this.form.srcId = null
                 }
             }
             if (name == 'hshipperCname') {
@@ -1222,6 +1316,13 @@ export default {
                     this.form.commodityCnName = null
                 }
             }
+            if (name == 'bookingAgentCnName') {
+                if (row) {
+                    this.form.bookingAgentId = row.id
+                } else {
+                    this.form.bookingAgentId = null
+                }
+            }
         },
         rowDicChange(name, row, el) {
             if (name == 'goodsName') {

src/views/tradeAgency/oceanFreightImport/index.vue

@@ -28,7 +28,7 @@
                         :disabled="row.status != '0'">删 除</el-button>
                 </template>
                 <template slot="bookingNo" slot-scope="{ row }">
-                    <span style="color: #1e9fff" @click="rowEdit(row)">{{ row.bookingNo }}</span>
+                    <span style="color: #1e9fff;cursor: pointer;" @click="rowEdit(row)">{{ row.bookingNo }}</span>
                 </template>
             </avue-crud>
         </basic-container>
@@ -279,6 +279,30 @@ export default {
                         overHidden: true,
                     },
                     {
+                        label: "箱型箱量",
+                        prop: "quantityCntrDescr",
+                        width: "100",
+                        overHidden: true
+                    },
+                    {
+                        label: "利润",
+                        prop: "amountProfitLoc",
+                        width: "100",
+                        overHidden: true
+                    },
+                    {
+                        label: "应付",
+                        prop: "amountCrLoc",
+                        width: "100",
+                        overHidden: true
+                    },
+                    {
+                        label: "应收",
+                        prop: "amountDrLoc",
+                        width: "100",
+                        overHidden: true
+                    },
+                    {
                         label: "是否退押",
                         prop: "billingStatus",
                         width: "100",
@@ -293,6 +317,12 @@ export default {
                         overHidden: true
                     },
                     {
+                        label: '贸易方式',
+                        prop: "mshipperCntyName",
+                        width: "100",
+                        overHidden: true
+                    },
+                    {
                         label: "备注",
                         prop: "remarks",
                         width: "80",

src/views/tradeAgency/tradeAgency/detailsPage.vue

@@ -123,10 +123,27 @@
                             @selectChange="dicChange('affiliatedCompanyName', $event)"
                             :disabled="editDisabled"></dic-select>
                     </tempalte>
-                    <tempalte slot="srcCnName" slot-scope="{ row }">
-                        <dic-select v-model="form.srcCnName" placeholder="业务员" key="id" label="realName" res="records"
-                            url="/blade-user/page" :filterable="true" :remote="true" dataName="realName"
-                            @selectChange="dicChange('srcCnName', $event)" :disabled="editDisabled"></dic-select>
+                    <tempalte slot="sourceType" slot-scope="{ row }">
+                        <div style="display: flex;">
+                            <dic-select style="margin-right: 4px;" v-model="form.sourceType" placeholder="客户来源"
+                                key="dictKey" keyValue="dictKey" label="dictValue"
+                                url="/blade-system/dict-biz/dictionary?code=source_Type" :filterable="true"
+                                :disabled="editDisabled" @selectChange="dicChange('sourceType', $event)"></dic-select>
+                            <el-input v-show="!form.sourceType" v-model="form.salesmanName" placeholder="请选择"
+                                :disabled="true">
+                            </el-input>
+                            <dic-select v-show="form.sourceType == 'OWN'" v-model="form.salesmanName" placeholder="所属公司"
+                                key="id" label="deptName" url="/blade-system/dept/lazy-list?parentId=0" :filterable="true"
+                                @selectChange="dicChange('salesmanName', $event)" :disabled="editDisabled"></dic-select>
+                            <dic-select v-show="form.sourceType == 'AGENT'" v-model="form.salesmanName" placeholder="代理"
+                                key="id" label="cnName" res="records" url="/blade-los/bcorps/listByType?corpTypeName=代理客户"
+                                :filterable="true" :remote="true" dataName="cnName"
+                                @selectChange="dicChange('salesmanName', $event)" :disabled="editDisabled"></dic-select>
+                            <dic-select v-show="form.sourceType == 'SALES'" v-model="form.salesmanName" placeholder="业务员"
+                                key="id" label="realName" res="records" url="/blade-user/page" :filterable="true"
+                                :remote="true" dataName="realName" @selectChange="dicChange('salesmanName', $event)"
+                                :disabled="editDisabled"></dic-select>
+                        </div>
                     </tempalte>
                 </avue-form>
             </trade-card>
@@ -171,7 +188,7 @@
                                 <el-dropdown-item @click.native="allClick('尾款撤销申请付款')">尾款</el-dropdown-item>
                             </el-dropdown-menu>
                         </el-dropdown> -->
-                        <el-dropdown>
+                        <!-- <el-dropdown>
                             <el-button type="primary" size="small" :disabled="!form.id">
                                 应收待确认通知<i class="el-icon-arrow-down el-icon--right"></i>
                             </el-button>
@@ -179,7 +196,7 @@
                                 <el-dropdown-item @click.native="allClick('首款应收待确认通知')">首款应收待确认通知</el-dropdown-item>
                                 <el-dropdown-item @click.native="allClick('尾款应收待确认通知')">尾款应收待确认通知</el-dropdown-item>
                             </el-dropdown-menu>
-                        </el-dropdown>
+                        </el-dropdown> -->
                     </template>
                     <template slot="indexHeader" slot-scope="{row,index}">
                         <el-button type="primary" size="mini" icon="el-icon-plus" :disabled="editDisabled" circle
@@ -392,11 +409,12 @@ export default {
                 contractDate: dateFormat(new Date(), "yyyy-MM-dd") + " 00:00:00",
                 currency: 'USD',
                 documentType: '普通',
-                advanceRatio: 'T/T 10%',
+                advanceRatio: 'T/T',
                 billNoFormat: 'MYDL',
                 businessTypeCode: 'MYDL',
                 businessType: 'MYDL',
                 businessStatus: '录入',
+                tradeMode: '一般贸易',
                 agentItemsList: [],
                 feeCenterListC: [],
                 feeCenterListD: [],
@@ -568,6 +586,22 @@ export default {
                         disabled: false,
                     },
                     {
+                        label: '贸易方式',
+                        prop: "tradeMode",
+                        type: "select",
+                        dicUrl: "/api/blade-system/dict-biz/dictionary?code=trade_Mode",
+                        props: {
+                            label: "dictValue",
+                            value: "dictValue"
+                        },
+                        disabled: false,
+                        rules: [{
+                            required: true,
+                            message: " ",
+                            trigger: "blur"
+                        }],
+                    },
+                    {
                         label: '所属公司',
                         prop: "affiliatedCompanyName",
                         disabled: false,
@@ -575,13 +609,28 @@ export default {
                             required: true,
                             message: " ",
                             trigger: "blur"
-                        }]
+                        }],
                     },
                     {
-                        label: '业务员',
-                        prop: "srcCnName",
+                        label: '客户来源',
+                        prop: "sourceType",
                         disabled: false,
+                        rules: [{
+                            required: true,
+                            message: " ",
+                            trigger: "blur"
+                        }],
                     },
+                    // {
+                    //     prop: "salesmanName",
+                    //     disabled: false,
+                    //     display:false,
+                    //     rules: [{
+                    //         required: true,
+                    //         message: " ",
+                    //         trigger: "blur"
+                    //     }],
+                    // },
                     {
                         label: "审单状态",
                         prop: "reviewStatus",
@@ -597,7 +646,7 @@ export default {
                         prop: "remarks",
                         type: 'textarea',
                         disabled: false,
-                        span: 6,
+                        span: 18,
                         minRows: 2,
                     },
                 ]
@@ -682,6 +731,13 @@ export default {
                         overHidden: true
                     },
                     {
+                        label: "厂号",
+                        prop: "factoryNumber",
+                        width: "100",
+                        cell: true,
+                        overHidden: true
+                    },
+                    {
                         label: "HSCODE",
                         prop: "hsCode",
                         width: "100",
@@ -698,13 +754,6 @@ export default {
                         ]
                     },
                     {
-                        label: "厂号",
-                        prop: "factoryNumber",
-                        width: "100",
-                        cell: true,
-                        overHidden: true
-                    },
-                    {
                         label: "标签品名",
                         prop: "labelProductName",
                         width: "100",
@@ -759,7 +808,7 @@ export default {
                         ]
                     },
                     {
-                        label: "单价",
+                        label: "单价(USD)",
                         prop: "price",
                         width: "100",
                         cell: true,
@@ -792,7 +841,7 @@ export default {
                     },
                     {
                         label: "金额",
-                        prop: "amount",
+                        prop: "amount(USD)",
                         width: "100",
                         cell: true,
                         slot: true,
@@ -800,6 +849,12 @@ export default {
                         overHidden: true
                     },
                     {
+                        label: "税率",
+                        prop: "taxRate",
+                        width: "80",
+                        overHidden: true
+                    },
+                    {
                         label: "铅封号",
                         prop: "leadSealNo",
                         width: "120",
@@ -834,12 +889,6 @@ export default {
                         overHidden: true
                     },
                     {
-                        label: "税率",
-                        prop: "taxRate",
-                        width: "80",
-                        overHidden: true
-                    },
-                    {
                         label: "报关单号",
                         prop: "customsDeclarationNo",
                         width: "120",
@@ -1058,14 +1107,14 @@ export default {
             if (name == 'corpName') {
                 if (row) {
                     this.form.corpId = row.id
-                    if (row.sourceType == 'SALES') {
-                        this.form.srcCnName = row.srcCnName
-                        this.form.srcId = row.srcId
-                    }
+                    this.form.sourceType = row.sourceType
+                    this.form.salesmanName = row.srcCnName
+                    this.form.salesmanId = row.srcId
                 } else {
                     this.form.corpId = null
-                    this.form.srcCnName = null
-                    this.form.srcId = null
+                    this.form.sourceType = null
+                    this.form.salesmanName = null
+                    this.form.salesmanId = null
                 }
             }
             if (name == 'polCnName') {
@@ -1074,7 +1123,6 @@ export default {
                     this.form.polId = row.id
                     this.form.polCode = row.code
                     this.form.polEnName = row.enName
-
                 } else {
                     this.form.polId = null
                     this.form.polCode = null
@@ -1096,9 +1144,17 @@ export default {
                 if (row) {
                     this.$refs.abankCode.IdGetDicData({ id: row.id })
                     this.form.abroadConsignorId = row.id
-                    this.form.abroadBankMnemonicCode = null
-                    this.form.abroadBank = null
-                    this.form.abroadCurrency = null
+                    getDicinit('get', '/blade-los/bcorps/detail', { id: row.id }).then(res => {
+                        res.data.data.corpsBankList.forEach((e, index) => {
+                            if (index == 0) {
+                                console.log(e)
+                                this.form.abroadBankMnemonicCode = e.mnemonicCode
+                                this.form.abroadBank = e.accountBank
+                                this.form.abroadCurrency = e.curNo
+                            }
+                        })
+                    })
+
                 } else {
                     this.form.abroadConsignorId = null
                     this.form.abroadBankMnemonicCode = null
@@ -1109,10 +1165,18 @@ export default {
             if (name == 'domesticConsigneeCname') {
                 if (row) {
                     this.$refs.dbankCode.IdGetDicData({ id: row.id })
+                    console.log(this.$refs.abankCode.IdGetDicData({ id: row.id }), 222)
                     this.form.domesticConsigneeId = row.id
-                    this.form.domesticBankMnemonicCode = null
-                    this.form.domesticBank = null
-                    this.form.domesticCurrency = null
+                    getDicinit('get', '/blade-los/bcorps/detail', { id: row.id }).then(res => {
+                        res.data.data.corpsBankList.forEach((e, index) => {
+                            if (index == 0) {
+                                console.log(e)
+                                this.form.domesticBankMnemonicCode = e.mnemonicCode
+                                this.form.domesticBank = e.accountBank
+                                this.form.domesticCurrency = e.curNo
+                            }
+                        })
+                    })
                 } else {
                     this.form.domesticConsigneeId = null
                     this.form.domesticBankMnemonicCode = null
@@ -1127,11 +1191,17 @@ export default {
                     this.form.affiliatedCompanyId = null
                 }
             }
-            if (name == 'srcCnName') {
+            if (name == 'sourceType') {
+                if (!row) {
+                    this.form.salesmanId = null
+                    this.form.salesmanName = null
+                }
+            }
+            if (name == 'salesmanName') {
                 if (row) {
-                    this.form.srcId = row.id
+                    this.form.salesmanId = row.id
                 } else {
-                    this.form.srcId = null
+                    this.form.salesmanId = null
                 }
             }
             if (name == 'abroadBankMnemonicCode') {
@@ -1255,6 +1325,7 @@ export default {
                     hsCode: obj.hsCode,
                     factoryNumber: obj.factoryNumber,
                     labelProductName: obj.labelProductName,
+                    taxRate: obj.taxRate,
                     goodsType: obj.goodsType,
                     quantity: obj.quantity,
                     netWeight: obj.netWeight,

src/views/tradeAgency/tradeAgency/index.vue

@@ -33,7 +33,7 @@
                         :disabled="row.orderStatus != '录入'">删 除</el-button>
                 </template>
                 <template slot="contractNo" slot-scope="{ row }">
-                    <span style="color: #1e9fff" @click="rowEdit(row)">{{ row.contractNo }}</span>
+                    <span style="color: #1e9fff;cursor: pointer;" @click="rowEdit(row)">{{ row.contractNo }}</span>
                 </template>
             </avue-crud>
         </basic-container>
@@ -457,19 +457,13 @@ export default {
                         overHidden: true
                     },
                     {
-                        label: "总金额(USD)",
-                        prop: "amount",
-                        width: "100",
-                        overHidden: true
-                    },
-                    {
                         label: "预付比例",
                         prop: "advanceRatio",
                         width: "120",
                         overHidden: true
                     },
                     {
-                        label: "预付金额",
+                        label: "预付金额(USD)",
                         prop: "prepaidAmount",
                         width: "120",
                         overHidden: true
@@ -481,24 +475,36 @@ export default {
                         overHidden: true
                     },
                     {
-                        label: "金额",
-                        prop: "amount",
+                        label: "总金额(USD)",
+                        prop: "goodsValue",
                         width: "100",
                         overHidden: true
                     },
                     {
-                        label: "首付实收",
-                        prop: "downPaymentsNetReceipts",
+                        label: "利润",
+                        prop: "profit",
+                        width: "100",
+                        overHidden: true
+                    },
+                    {
+                        label: "首款实收(USD)",
+                        prop: "firstPaidInPayment",
                         width: "120",
                         overHidden: true
                     },
                     {
-                        label: "尾款实收",
-                        prop: "mblno",
+                        label: "尾款实收(USD)",
+                        prop: "finalPaymentReceived",
                         width: "120",
                         overHidden: true
                     },
                     {
+                        label: '贸易方式',
+                        prop: "tradeMode",
+                        width: "100",
+                        overHidden: true
+                    },
+                    {
                         label: "备注",
                         prop: "remarks",
                         width: "80",