修改bug

src/components/tradeAgency/fee-info.vue

@@ -174,7 +174,8 @@
                 </el-row>
             </div>
             <span slot="footer" class="dialog-footer">
-                <el-button size="mini" @click="templateVisible = false; feesselectionList = []; templateRightData = []">取 消</el-button>
+                <el-button size="mini" @click="templateVisible = false; feesselectionList = []; templateRightData = []">取
+                    消</el-button>
                 <el-button type="primary" size="mini" @click="templateExport">导 入</el-button>
             </span>
         </el-dialog>
@@ -184,9 +185,9 @@
 <script>
 import dicSelect from "@/components/dicSelect/main";
 import { bcurrencyGetExrate } from "@/api/iosBasicData/rateManagement";
-import { submitListTrade, feeRemove, generateBill, revokeBill,feecenterTemplateImport } from "@/api/tradeAgency/tradeAgency";
+import { submitListTrade, feeRemove, generateBill, revokeBill, feecenterTemplateImport } from "@/api/tradeAgency/tradeAgency";
 import { losbfeestemplateDetail } from "@/api/iosBasicData/losbfeestemplate";
-import {losbfeestemplateGetListTemplate} from "@/api/iosBasicData/bills";
+import { losbfeestemplateGetListTemplate } from "@/api/iosBasicData/bills";
 import _ from "lodash";
 export default {
     components: {
@@ -220,9 +221,9 @@ export default {
                 }
             },
             templateOption: {
-                height:400,
+                height: 400,
                 menu: false,
-                tip:false,
+                tip: false,
                 stripe: true,
                 addBtn: false,
                 editBtn: false,
@@ -230,7 +231,7 @@ export default {
                 viewBtn: false,
                 index: true,
                 selection: true,
-                header:false,
+                header: false,
                 column: [
                     {
                         label: '客户',
@@ -564,7 +565,8 @@ export default {
                     accStatus: 0,
                     businessType: this.form.businessType,
                     billNo: this.form.businessNo,
-                    billDate: this.form.businessDate
+                    billDate: this.form.businessDate,
+                    discountExrate: 0,
                 })
             }
             if (type == 'C') {
@@ -575,7 +577,8 @@ export default {
                     accStatus: 0,
                     businessType: this.form.businessType,
                     billNo: this.form.businessNo,
-                    billDate: this.form.businessDate
+                    billDate: this.form.businessDate,
+                    discountExrate: 0,
                 })
             }
         },

src/components/tradeAgency/fee-infosimple.vue

@@ -219,6 +219,12 @@ export default {
                         overHidden: true,
                     },
                     {
+                        label: '合同号',
+                        prop: "contractNo",
+                        width: '160',
+                        overHidden: true,
+                    },
+                    {
                         label: "费用名称",
                         prop: "feeCnName",
                         width: '120',
@@ -335,6 +341,12 @@ export default {
                         overHidden: true,
                     },
                     {
+                        label: '合同号',
+                        prop: "contractNo",
+                        width: '160',
+                        overHidden: true,
+                    },
+                    {
                         label: "费用名称",
                         prop: "feeCnName",
                         width: '120',
@@ -423,7 +435,8 @@ export default {
                     accStatus: 0,
                     businessType: this.form.businessType,
                     billNo: this.form.businessNo,
-                    billDate: this.form.businessDate
+                    billDate: this.form.businessDate,
+                    discountExrate: 0,
                 })
             }
         },

src/views/tradeAgency/exchangePurchasing/detailsPage.vue

@@ -95,12 +95,17 @@ export default {
                         disabled: true,
                     },
                     {
+                        label: '合同号',
+                        prop: "contractNo",
+                        disabled: true,
+                    },
+                    {
                         label: '业务日期',
                         prop: "businessDate",
                         type: "date",
                         format: "yyyy-MM-dd",
                         valueFormat: "yyyy-MM-dd 00:00:00",
-                        disabled: true,
+                        disabled: false,
                         rules: [{
                             required: true,
                             message: " ",
@@ -146,7 +151,7 @@ export default {
                         label: '备注',
                         prop: "remarks",
                         type: 'textarea',
-                        span: 12,
+                        span: 6,
                         disabled: false,
                         minRows: 2,
                     }

src/views/tradeAgency/exchangePurchasing/index.vue

@@ -46,7 +46,7 @@ export default {
                 calcHeight: 30,
                 menuWidth: 80,
                 searchShow: true,
-                searchMenuSpan: 12,
+                searchMenuSpan: 24,
                 border: true,
                 index: true,
                 addBtn: false,
@@ -58,7 +58,7 @@ export default {
                 column: [
                     {
                         label: "客户名称",
-                        prop: "corpName",
+                        prop: "corpId",
                         overHidden: true,
                         search: true,
                         type: 'select',
@@ -67,12 +67,20 @@ export default {
                         dicUrl: "/api/blade-los/bcorps/listByType?cnName={{key}}",
                         props: {
                             label: 'cnName',
-                            value: 'cnName',
+                            value: 'id',
                             res: 'data.records'
                         },
+                        hide: true,
+                        showColumn: false,
                         searchOrder: 1,
                     },
                     {
+                        label: "客户名称",
+                        prop: "corpName",
+                        width: "120",
+                        overHidden: true,
+                    },
+                    {
                         label: "业务号",
                         prop: "businessNo",
                         overHidden: true,
@@ -83,9 +91,15 @@ export default {
                         label: "业务日期",
                         prop: "businessDate",
                         type: "date",
+                        search: true,
+                        searchOrder: 6,
+                        searchProp: "businessDateList",
+                        unlinkPanels: true,
+                        searchRange: true,
                         format: "yyyy-MM-dd",
-                        valueFormat: "yyyy-MM-dd 00:00:00",
-                        overHidden: true
+                        valueFormat: "yyyy-MM-dd HH:mm:ss",
+                        searchDefaultTime: ["00:00:00", "23:59:59"],
+                        overHidden: true,
                     },
                     {
                         label: "金额",
@@ -93,6 +107,38 @@ export default {
                         overHidden: true,
                     },
                     {
+                        label: '付汇美元金额',
+                        prop: "paymentInUsd",
+                        width:'140',
+                        overHidden: true,
+                    },
+                    {
+                        label: '当天汇率',
+                        prop: "exchangeRate",
+                        overHidden: true,
+                    },
+                    {
+                        label: '实付金额',
+                        prop: "actualAmount",
+                        overHidden: true,
+                    },
+                    {
+                        label: '邮电费',
+                        prop: "postElectricFee",
+                        overHidden: true,
+                    },
+                    {
+                        label: '手续费',
+                        prop: "serviceCharge",
+                        overHidden: true,
+                    },
+                    {
+                        label: '申报单号',
+                        prop: "declarationNumber",
+                        search: true,
+                        overHidden: true,
+                    },
+                    {
                         label: "备注",
                         prop: "remarks",
                         overHidden: true

src/views/tradeAgency/firstSettlement/detailsPage.vue

@@ -69,12 +69,17 @@ export default {
                         disabled: true,
                     },
                     {
+                        label: '合同号',
+                        prop: "contractNo",
+                        disabled: true,
+                    },
+                    {
                         label: '业务日期',
                         prop: "businessDate",
                         type: "date",
                         format: "yyyy-MM-dd",
                         valueFormat: "yyyy-MM-dd 00:00:00",
-                        disabled: true,
+                        disabled: false,
                         rules: [{
                             required: true,
                             message: " ",
@@ -120,7 +125,7 @@ export default {
                         label: '备注',
                         prop: "remarks",
                         type: 'textarea',
-                        span: 12,
+                        span: 6,
                         disabled: false,
                         minRows: 2,
                     }

src/views/tradeAgency/firstSettlement/index.vue

@@ -58,7 +58,7 @@ export default {
                 column: [
                     {
                         label: "客户名称",
-                        prop: "corpName",
+                        prop: "corpId",
                         overHidden: true,
                         search: true,
                         type: 'select',
@@ -67,12 +67,20 @@ export default {
                         dicUrl: "/api/blade-los/bcorps/listByType?cnName={{key}}",
                         props: {
                             label: 'cnName',
-                            value: 'cnName',
+                            value: 'id',
                             res: 'data.records'
                         },
+                        hide: true,
+                        showColumn: false,
                         searchOrder: 1,
                     },
                     {
+                        label: "客户名称",
+                        prop: "corpName",
+                        width: "120",
+                        overHidden: true,
+                    },
+                    {
                         label: "业务号",
                         prop: "businessNo",
                         overHidden: true,
@@ -93,6 +101,36 @@ export default {
                         overHidden: true,
                     },
                     {
+                        label: '付汇美元金额',
+                        prop: "paymentInUsd",
+                        overHidden: true,
+                    },
+                    {
+                        label: '当天汇率',
+                        prop: "exchangeRate",
+                        overHidden: true,
+                    },
+                    {
+                        label: '实付金额',
+                        prop: "actualAmount",
+                        overHidden: true,
+                    },
+                    {
+                        label: '邮电费',
+                        prop: "postElectricFee",
+                        overHidden: true,
+                    },
+                    {
+                        label: '手续费',
+                        prop: "serviceCharge",
+                        overHidden: true,
+                    },
+                    {
+                        label: '申报单号',
+                        prop: "declarationNumber",
+                        overHidden: true,
+                    },
+                    {
                         label: "备注",
                         prop: "remarks",
                         overHidden: true
@@ -181,7 +219,7 @@ export default {
             this.detailData = {}
             this.isShow = true;
             this.onLoad(this.page, this.search);
-          
+
         },
         //自定义列保存
         async saveColumn(ref, option, optionBack, code) {

src/views/tradeAgency/oceanFreightImport/detailsPage.vue

@@ -77,7 +77,7 @@
                             <dic-select v-model="form.hscode" placeholder="品名" key="id" res="records" label="hsCode"
                                 url="/blade-los/bcommodity/list" :filterable="true" :remote="true" dataName="hsCode"
                                 @selectChange="dicChange('hscode', $event)" :disabled="editDisabled"></dic-select>
-                            <el-input style="margin-left: 10px;" v-model="form.goodsName" placeholder="请输入品名"
+                            <el-input style="margin-left: 10px;" v-model="form.commodityCnName" placeholder="请输入品名"
                                 :disabled="editDisabled"></el-input>
                         </div>
                     </template>
@@ -390,7 +390,7 @@ export default {
                     },
                     {
                         label: "包装",
-                        prop: "packing",
+                        prop: "packingUnit",
                         disabled: false,
                     },
                     {
@@ -1125,9 +1125,9 @@ export default {
             }
             if (name == 'hscode') {
                 if (row) {
-                    this.form.goodsName = row.cnName
+                    this.form.commodityCnName = row.cnName
                 } else {
-                    this.form.goodsName = null
+                    this.form.commodityCnName = null
                 }
             }
         },

src/views/tradeAgency/oceanFreightImport/index.vue

@@ -148,14 +148,6 @@ export default {
                         overHidden: true,
                     },
                     {
-                        label: "箱号",
-                        prop: "mnotify2CntyCode",
-                        width: "80",
-                        overHidden: true,
-                        search: true,
-                        searchOrder: 4,
-                    },
-                    {
                         label: "发货人",
                         prop: "hshipperCnName",
                         width: "80",

src/views/tradeAgency/tradeAgency/detailsPage.vue

@@ -133,7 +133,8 @@
                         <el-button type="warning" size="small" :disabled="selectionList.length == 0"
                             @click="allClick('生成货代')">生成货代
                         </el-button>
-                        <el-button size="small" style="margin-right: 8px" :disabled="!form.id" @click="$refs.print.openDialog()">打印账单
+                        <el-button size="small" style="margin-right: 8px" :disabled="!form.id"
+                            @click="$refs.print.openDialog()">打印账单
                         </el-button>
                         <el-dropdown>
                             <el-button type="danger" size="small" :disabled="editDisabled">
@@ -141,7 +142,8 @@
                             </el-button>
                             <el-dropdown-menu slot="dropdown">
                                 <el-dropdown-item @click.native="allClick('生成首款应付')">首款</el-dropdown-item>
-                                <el-dropdown-item @click.native="allClick('生成尾款应付')">尾款</el-dropdown-item>
+                                <el-dropdown-item :disabled="selectionList.length == 0"
+                                    @click.native="allClick('生成尾款应付')">尾款</el-dropdown-item>
                             </el-dropdown-menu>
                         </el-dropdown>
                         <!-- <el-dropdown>
@@ -292,6 +294,7 @@ export default {
 
     data() {
         return {
+            wkType: null,
             wkForm: {
                 agentItemsRList: []
             },
@@ -311,7 +314,7 @@ export default {
                         disabled: true,
                     },
                     {
-                        label: '应收金额',
+                        label:'应收金额',
                         prop: 'amountD',
                         disabled: true,
                     },
@@ -854,7 +857,7 @@ export default {
                     }
                 ]
             },
-            itemIds:null
+            itemIds: null
         }
     },
     components: {
@@ -1084,14 +1087,14 @@ export default {
             });
         },
         selectionChange(list) {
-            let ids=[]
-            list.forEach(e=>{
+            let ids = []
+            list.forEach(e => {
                 ids.push(e.id)
             })
-            if(ids.length){
-                this.itemIds=ids.join(',')
-            }else{
-                this.itemIds=null
+            if (ids.length) {
+                this.itemIds = ids.join(',')
+            } else {
+                this.itemIds = null
             }
             this.selectionList = list;
         },
@@ -1224,20 +1227,6 @@ export default {
                     if (this.selectionList[index].whetherBalancePayment == 1) {
                         return this.$message.error("第" + Number(this.selectionList[index].$index + 1) + "行已生成尾款");
                     }
-                    // if (this.selectionList.filter(row => this.selectionList[index].billNo == row.billNo).length != this.form.agentItemsList.filter(row => this.selectionList[index].billNo == row.billNo).length) {
-                    //     this.$confirm("是否收取所选择相同提单号所有明细尾款?", {
-                    //         confirmButtonText: "确定",
-                    //         cancelButtonText: "取消",
-                    //         type: "warning"
-                    //     }).then(() => {
-                    //         console.log(index)
-                    //         this.form.agentItemsList.forEach(row=>{
-                    //             if(row.billNo==this.selectionList[index].billNo){
-                    //                 this.$refs.crud.toggleRowSelection(row, true);
-                    //             }
-                    //         }) 
-                    //     });
-                    // }
                 }
                 let obj = {}
                 obj = {
@@ -1259,7 +1248,9 @@ export default {
                         })
                     })
                 })
+                this.findObject(this.wkOption.column, "amountD").label ='应收金额';
                 this.wkDialog = true
+                this.wkType = name
             }
             if (name == '生成首款应付') {
                 if (this.form.applyForPayment == 1) return this.$message.error("请勿重复生成");
@@ -1277,19 +1268,47 @@ export default {
                 })
             }
             if (name == '生成尾款应付') {
-                if (this.form.applyForPaymentBalance == 1) return this.$message.error("请勿重复生成");
+                // if (this.form.applyForPaymentBalance == 1) return this.$message.error("请勿重复生成");
+                // let obj = {}
+                // obj = {
+                //     id: this.form.id,
+                //     // url: '/tradeAgency/tradeAgency/index',
+                //     // pageStatus: '',
+                //     // pageLabel: '贸易代理(T)',
+                //     paidApplication: 'FFSQ-WK'
+                // }
+                // generatePayment(obj).then(res => {
+                //     this.$message.success("生成尾款应付成功");
+                //     this.getDetails(this.form.id)
+                // })
+                for (let index in this.selectionList) {
+                    if (this.selectionList[index].applyForPaymentBalance == 1) {
+                        return this.$message.error("第" + Number(this.selectionList[index].$index + 1) + "行已生成尾款");
+                    }
+                }
                 let obj = {}
                 obj = {
-                    id: this.form.id,
-                    // url: '/tradeAgency/tradeAgency/index',
-                    // pageStatus: '',
-                    // pageLabel: '贸易代理(T)',
-                    paidApplication: 'FFSQ-WK'
+                    ...this.form,
+                    agentItemsList: this.selectionList
                 }
-                generatePayment(obj).then(res => {
-                    this.$message.success("生成尾款应付成功");
-                    this.getDetails(this.form.id)
+                balancePayment(obj).then(res => {
+                    this.wkForm = res.data.data
+                    this.wkForm.amountD = _.subtract(res.data.data.goodsValue, res.data.data.prepaidAmount)
+                    res.data.data.agentItemsRList.forEach(e => {
+                        e.$cellEdit = true
+                    })
+                    this.wkForm.agentItemsRList = res.data.data.agentItemsRList
+                    bcurrencyGetExrate({ date: this.form.contractDate, dc: 'C' }).then(res => {
+                        res.data.data.forEach(e => {
+                            if (this.form.currency == e.code) {
+                                this.wkForm.exchangeRate = e.exrate
+                            }
+                        })
+                    })
                 })
+                this.findObject(this.wkOption.column, "amountD").label ='应付金额';
+                this.wkDialog = true
+                this.wkType = name
             }
             if (name == '首款撤销申请付款') {
                 if (this.form.applyForPayment == 0) return this.$message.error("未申请付款");
@@ -1416,14 +1435,24 @@ export default {
             });
         },
         wkSubmit() {
-            generateBalancePaymentBill(this.wkForm).then(res => {
-                this.$message.success("成功生成尾款账单");
-                this.getDetails(this.form.id)
-                this.wkDialog = false
-            })
+            if (this.wkType == '尾款账单') {
+                generateBalancePaymentBill(this.wkForm).then(res => {
+                    this.$message.success("成功生成尾款账单");
+                    this.getDetails(this.form.id)
+                    this.wkDialog = false
+                })
+            }
+            if (this.wkType == '生成尾款应付') {
+                generatePayment(this.wkForm).then(res => {
+                    this.$message.success("生成尾款应付成功");
+                    this.getDetails(this.form.id)
+                    this.wkDialog = false
+                })
+            }
         },
         wkClosed() {
             this.wkForm = this.$options.data().wkForm
+            this.wkType = null
         },
         application() {
             if (this.form.downPayment != 1) return this.$message.error("未申请首款账单");

src/views/tradeAgency/tradeAgency/index.vue

@@ -179,10 +179,9 @@ export default {
                 searchIcon: true,
                 searchIndex: 3,
                 column: [
-                {
+                    {
                         label: "客户名称",
                         prop: "corpId",
-                        width: "120",
                         overHidden: true,
                         search: true,
                         type: 'select',
@@ -203,17 +202,6 @@ export default {
                         prop: "corpName",
                         width: "120",
                         overHidden: true,
-                        // search: true,
-                        // type: 'select',
-                        // filterable: true,
-                        // remote: true,
-                        // dicUrl: "/api/blade-los/bcorps/listByType?cnName={{key}}",
-                        // props: {
-                        //     label: 'cnName',
-                        //     value: 'cnName',
-                        //     res: 'data.records'
-                        // },
-                        // searchOrder: 1,
                     },
                     {
                         label: "合同号",