修改禅道1690 1692

src/components/tradeAgency/fee-oceanFreight.vue

@@ -25,7 +25,8 @@
                     @click="allClick('生成应付', 'D')">生成应付</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('D')">
+                <el-button type="primary" size="mini" icon="el-icon-plus" :disabled="disabled" circle
+                    @click="addRow('D')">
                 </el-button>
             </template>
             <template slot="index" slot-scope="{row,index}">
@@ -33,8 +34,8 @@
             </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" :filterable="true" :remote="true"
-                    dataName="cnName" @selectChange="rowDicChange('corpCnName', $event, row)"></dic-select>
+                    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="feeCnNameForm" slot-scope="{ row }">
@@ -50,8 +51,8 @@
                 <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" 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 }">
@@ -97,7 +98,8 @@
                     @click="allClick('撤销账单', 'C')">撤销账单</el-button>
                 <el-button type="primary" plain size="small" :disabled="disabled"
                     @click="allClick('增值税', 'C')">增值税</el-button>
-                <el-button type="danger" plain size="small" :disabled="disabled" @click="allClick('关税', 'C')">关税</el-button>
+                <el-button type="danger" plain size="small" :disabled="disabled"
+                    @click="allClick('关税', 'C')">关税</el-button>
                 <el-button type="primary" plain size="small" @click="$refs.printC.openDialog()">打印账单</el-button>
                 <el-button type="success" plain size="small" :disabled="disabled"
                     @click="allClick('应付模板', 'C')">应付模板</el-button>
@@ -106,9 +108,12 @@
                 <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>
+                <el-button type="info" 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')">
+                <el-button type="primary" size="mini" icon="el-icon-plus" :disabled="disabled" circle
+                    @click="addRow('C')">
                 </el-button>
             </template>
             <template slot="index" slot-scope="{row,index}">
@@ -116,8 +121,8 @@
             </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" :filterable="true" :remote="true"
-                    dataName="cnName" @selectChange="rowDicChange('corpCnName', $event, row)"></dic-select>
+                    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="feeCnNameForm" slot-scope="{ row }">
@@ -133,8 +138,8 @@
                 <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" 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 }">
@@ -160,7 +165,8 @@
             </tempalte>
         </avue-crud>
         <avue-crud id="out-table" class="box-card" :header-cell-class-name="headerClassName" ref="crud"
-        :row-style="{ height: '16px' }" :cell-style="{ padding: '0px' }" :option="sumOption" :data="sumData"></avue-crud>
+            :row-style="{ height: '16px' }" :cell-style="{ padding: '0px' }" :option="sumOption"
+            :data="sumData"></avue-crud>
         <!--有admin 显示，有收和付各一个也显示出来-->
         <div v-if="roleName.indexOf('admin') != -1 || ((roleName.indexOf('应收修改') != -1 || roleName.indexOf('应收查看') != -1) && (roleName.indexOf('应付修改') != -1 || roleName.indexOf('应付查看') != -1))"
             style="display: flex;align-items: center;justify-content: space-around">
@@ -244,7 +250,8 @@
                 </el-row>
             </div>
             <span slot="footer" class="dialog-footer">
-                <el-button size="mini" @click="templateVisible = false; feesselectionList = []; templateRightData = []">取
+                <el-button size="mini"
+                    @click="templateVisible = false; feesselectionList = []; templateRightData = []">取
                     消</el-button>
                 <el-button type="primary" size="mini" @click="templateExport">导 入</el-button>
             </span>
@@ -861,7 +868,7 @@ export default {
             templateRightData: [],
             itemDIds: null,
             itemCIds: null,
-            roleName:null,
+            roleName: null,
         }
     },
     async created() {
@@ -1033,7 +1040,7 @@ export default {
                         businessType: this.form.businessType,
                         billNo: this.form.businessNo,
                         billDate: this.form.businessDate,
-                        days:1,
+                        days: 1,
                     })
                 } else {
                     this.form.feeCenterListD.push({
@@ -1049,7 +1056,7 @@ export default {
                         corpEnName: this.form.feeCenterListD[this.form.feeCenterListD.length - 1].corpEnName,
                         billCorpId: this.form.feeCenterListD[this.form.feeCenterListD.length - 1].billCorpId,
                         billCorpCnName: this.form.feeCenterListD[this.form.feeCenterListD.length - 1].billCorpCnName,
-                        days:1
+                        days: 1
                     })
                 }
             }
@@ -1065,7 +1072,7 @@ export default {
                         businessType: this.form.businessType,
                         billNo: this.form.businessNo,
                         billDate: this.form.businessDate,
-                        days:1,
+                        days: 1,
                     })
                 } else {
                     this.form.feeCenterListC.push({
@@ -1081,15 +1088,15 @@ export default {
                         corpEnName: this.form.feeCenterListC[this.form.feeCenterListC.length - 1].corpEnName,
                         billCorpId: this.form.feeCenterListC[this.form.feeCenterListC.length - 1].billCorpId,
                         billCorpCnName: this.form.feeCenterListC[this.form.feeCenterListC.length - 1].billCorpCnName,
-                        days:1
+                        days: 1
                     })
                 }
             }
         },
         countChange(row) {
-            row.amount =_.round(_.multiply( _.multiply(Number(row.quantity ? row.quantity : 0), Number(row.price ? row.price : 0)), Number(row.days ? row.days : 0)),2)
+            row.amount = _.round(_.multiply(_.multiply(Number(row.quantity ? row.quantity : 0), Number(row.price ? row.price : 0)), Number(row.days ? row.days : 0)), 2)
             if (row.feeCode == 'SFK' || row.feeCode == 'WK') {
-                row.amount = _.round(_.multiply(_.multiply(Number(row.amountLoc ? row.amountLoc : 0), Number(row.exrate ? row.exrate : 0)), Number(row.days ? row.days : 0)),2)
+                row.amount = _.round(_.multiply(_.multiply(Number(row.amountLoc ? row.amountLoc : 0), Number(row.exrate ? row.exrate : 0)), Number(row.days ? row.days : 0)), 2)
             }
         },
         selectionDChange(list) {
@@ -1545,6 +1552,26 @@ export default {
                     this.$emit('getDetails', this.form.id)
                 })
             }
+            if (name == '付费申请') {
+                if (this.selectionCList.length == 0) return this.$message.error("请选择费用");
+                if (this.selectionCList.length != this.selectionCList.filter(e => e.corpCnName == this.selectionCList[0].corpCnName).length) return this.$message.error("请选择相同的往来单位");
+                if (this.$store.getters.payAppStatus) {
+                    this.$alert("付费申请页面已存在,请关闭付费申请再进行操作", "温馨提示", {
+                        confirmButtonText: "确定",
+                        type: 'warning',
+                        callback: action => {
+                        }
+                    });
+                } else {
+                    this.$router.push({
+                        path: `/iosBasicData/PaymentApplication/index`,
+                        query: {
+                            mblno: this.form.mblno,
+                            corpCnName:this.selectionCList[0].corpCnName
+                        }
+                    })
+                }
+            }
         },
         submitValidate() {
             if (this.form.feeCenterListD.length) {
@@ -1672,10 +1699,12 @@ export default {
 .el-table--small th {
     padding: 2px !important;
 }
+
 .bottomFlex {
     display: flex;
     align-items: center;
 }
+
 .weightnum {
     font-size: 15px;
     font-weight: 500;

src/enums/column-name.js

@@ -1868,6 +1868,12 @@ const columnName = [{
   },{
     code: 411,
     name: '贸易代理-决策分析-费用名称统计'
+  },{
+    code: 412,
+    name: '鑫动力-融资管理-预付款管理(L)'
+  },{
+    code: 413,
+    name: '鑫动力-融资管理-预付款管理详情页(L)'
   }
 ]
 export const getColumnName = (key) => {

src/page/index/tags.vue

@@ -404,6 +404,7 @@ export default {
         }
         if (tag.label == "付费申请(F)") {
           this.$store.commit("FFQSF_OUT_DETAIL")
+          this.$store.commit("OUT_PAYAPP_DETAIL")
         }
         if (tag.label == "对账中心(F)") {
           this.$store.commit("DZZXF_OUT_DETAIL")
@@ -456,9 +457,6 @@ export default {
         if (tag.label == "SIAMEND") {
           this.$store.commit("OUT_OFI_DETAIL")
         }
-        if (tag.label == "付费申请(F)") {
-          this.$store.commit("OUT_PAYAPP_DETAIL")
-        }
         if (tag.label == "销项发票(F)") {
           this.$store.commit("OUT_FINOUT_DETAIL")
         }

src/page/index/top/top-notice.vue

@@ -178,6 +178,7 @@ export default {
       });
     },
     afterData(data) {
+      // console.log(data.filter(item => item.isRead != 0))
       if (data.length === 0) return (this.data = []);
       if (this.activeName == "unread") {
         this.unreadData = data.filter(item => item.isRead == 0);

src/store/modules/ifdetail.js

@@ -74,6 +74,14 @@ const ifdetail = {
   },
   actions: {},
   mutations: {
+    //申请付费
+    IN_PAYAPP_DETAIL(state) {
+      state.payAppStatus = true;
+    },
+    //退出申请付费
+    OUT_PAYAPP_DETAIL(state) {
+      state.payAppStatus = false;
+    },
     //轮胎采购
     IN_MYDLT_STATUS(state) {
       state.mydlTStatus = true;
@@ -717,6 +725,7 @@ const ifdetail = {
       }
       if (tag.label == '付费申请(F)') {
         state.paidapplication = true
+        state.payAppStatus = true;
       }
       if (tag.label == '对账中心(F)') {
         state.ReconciliationCenterF = true

src/views/approveDataH/configuration/mainList.json

@@ -88,11 +88,19 @@
       "index": 6
     },
     {
+      "label": "参考号",
+      "prop": "referenceNumber",
+      "search": true,
+      "overHidden": true,
+      "width": 100,
+      "index": 7
+    },
+    {
       "label": "申请人",
       "prop": "sendUserId",
       "overHidden": true,
       "search": true,
-      "index": 7,
+      "index": 8,
       "width": 100,
       "type": "select",
       "props": {
@@ -110,7 +118,7 @@
       "searchRange": true,
       "search": true,
       "overHidden": true,
-      "index": 8,
+      "index": 9,
       "width": 150
     },
     {
@@ -122,7 +130,7 @@
       "unlinkPanels": true,
       "searchRange": true,
       "overHidden": true,
-      "index": 8,
+      "index": 10,
       "width": 150
     },
     {
@@ -136,7 +144,7 @@
       "searchRange": true,
       "search": true,
       "overHidden": true,
-      "index": 8,
+      "index": 11,
       "width": 150
     },
     {
@@ -144,28 +152,28 @@
       "prop": "receivableAmount",
       "overHidden": true,
       "width": 100,
-      "index": 9
+      "index": 12
     },
     {
       "label": "应付金额",
       "prop": "payAmount",
       "overHidden": true,
       "width": 100,
-      "index": 10
+      "index": 13
     },
     {
       "label": "利润",
       "prop": "grossProfit",
       "overHidden": true,
       "width": 100,
-      "index": 11
+      "index": 14
     },
     {
       "label": "订单备注",
       "prop": "orderRemark",
       "overHidden": true,
       "width": 100,
-      "index": 12
+      "index": 15
     }
   ]
 }

src/views/iosBasicData/AirtransportExport/bills/assembly/feecenter.vue

@@ -1363,10 +1363,10 @@ export default {
             let groupCode = ''
             let selectionArr = []
             if (dc == 'D') {
-                groupCode = '应收'
+                groupCode = '应收,应收-账单'
                 selectionArr = this.selectionDList
             } else {
-                groupCode = '应付'
+                groupCode =  '应付,应付-账单'
                 selectionArr = this.selectionCList
             }
             if (selectionArr.length > 0) {

src/views/iosBasicData/AirtransportImport/bills/assembly/feecenter.vue

@@ -1345,10 +1345,10 @@ export default {
             let groupCode = ''
             let selectionArr = []
             if (dc == 'D') {
-                groupCode = '应收'
+                groupCode = '应收,应收-账单'
                 selectionArr = this.selectionDList
             } else {
-                groupCode = '应付'
+                groupCode = '应付,应付-账单'
                 selectionArr = this.selectionCList
             }
             if (selectionArr.length > 0) {

src/views/iosBasicData/AirtransportImport/bills/billsDetails.vue

@@ -342,7 +342,7 @@ export default {
                 feeCenterListD: [], // 收
                 feeCenterListC: [], // 付
                 preContainersList: [], // 箱
-                feeCenterAmendList:[]
+                feeCenterAmendList:[],
             },
             oldForm: {
                 billDate: dateFormat(new Date(), "yyyy-MM-dd") + ' 00:00', // 单据日期 默认 当天

src/views/iosBasicData/ComputationCenter/settlementDetails.vue

@@ -14,9 +14,9 @@
                     :loading="saveLoading" :disabled="!form.id" @click="DesignreportDialog = true">报表设计
                 </el-button>
                 <el-button size="small" type="primary" style="margin-right: 8px" :disabled="!form.id || form.isCleared != 1"
-                    v-if="!form.voucherNo" :loading="saveLoading" @click="generateVoucherfun">生成凭证
+                    v-if="!form.voucherNo&&voucher==1" :loading="saveLoading" @click="generateVoucherfun">生成凭证
                 </el-button>
-                <span v-else style="font-size: 12px;margin-right: 8px;">已生成凭证</span>
+                <span v-if="form.voucherNo&&voucher==1" style="font-size: 12px;margin-right: 8px;">已生成凭证</span>
                 <el-button size="small" type="warning" plain style="margin-right: 8px" :disabled="!form.id || editPower"
                     v-if="form.isCleared == 1" :loading="saveLoading" @click="finstlbillsRevokeSettlementfun">撤销结算
                 </el-button>
@@ -332,6 +332,7 @@ import reportContainer from "@/views/iosBasicData/report-container/report-contai
 import { generateFinStlBills } from "@/api/iosBasicData/fininvoices";
 import { dateFormat} from "@/util/date";
 import dicSelect from "@/components/dicSelect/main";
+import {isProcurement} from "@/api/basicData/configuration";
 export default {
     components: { reportContainer, reportformsList, reports, SearchQuery, expand, finstlbillsitems,dicSelect },
     props: {
@@ -434,12 +435,17 @@ export default {
             roleName: [], // 当前的角色权限
             saberUserInfo: {}, // 当前登录人信息
             editPower: false, // 当前是否可以编辑
+            voucher:0,
         }
     },
     created() {
         this.roleName = localStorage.getItem('roleName').split(',')
         // 获取当前登录人个人信息
         this.saberUserInfo = JSON.parse(localStorage.getItem('saber-userInfo')).content
+        isProcurement({"param":"automatic.generate.voucher"}).then(res=>{
+                    // res.data.data === '1'
+                    this.voucher = res.data.data
+                })
     },
     methods: {
         // 打印

src/views/iosBasicData/OceanFreightImport/bills/assembly/EntrustmentLnformation.vue

@@ -9,21 +9,22 @@
                                 <span style="color: #1e9fff">国外收货地</span>
                             </span>
                             <el-row>
-                                <el-col :span="16">
-                                    <search-query :datalist="placeReceiptData" :selectValue="assemblyForm.placeReceiptName"
-                                        :filterable="true" :clearable="true" :remote="true"
-                                        :disabled="detailData.seeDisabled" :buttonIf="false"
-                                        :forParameter="{ key: 'id', label: 'enName', value: 'enName' }" placeholder="请选择国外收货地"
-                                        @remoteMethod="remoteMethod($event, 'placeReceipt')"
+                                <el-col :span="10">
+                                    <search-query :datalist="placeReceiptData"
+                                        :selectValue="assemblyForm.placeReceiptName" :filterable="true"
+                                        :clearable="true" :remote="true" :disabled="detailData.seeDisabled"
+                                        :buttonIf="false"
+                                        :forParameter="{ key: 'id', label: 'enName', value: 'enName' }"
+                                        placeholder="请选择国外收货地" @remoteMethod="remoteMethod($event, 'placeReceipt')"
                                         @corpChange="corpChange($event, 'placeReceipt')"
                                         @corpFocus="remoteMethod($event, 'placeReceipt')">
                                     </search-query>
                                 </el-col>
-                                <el-col :span="7">
+                                <el-col :span="13">
                                     <span style="padding-left: 20px"></span>
-                                    <el-input type="age" style="width: 100%;" v-model="assemblyForm.placeReceiptNamePrint"
-                                        size="small" autocomplete="off" :disabled="detailData.seeDisabled" clearable
-                                        placeholder="国外收货地"></el-input>
+                                    <el-input type="age" style="width: 100%;"
+                                        v-model="assemblyForm.placeReceiptNamePrint" size="small" autocomplete="off"
+                                        :disabled="detailData.seeDisabled" clearable placeholder="国外收货地"></el-input>
                                 </el-col>
                             </el-row>
                         </el-form-item>
@@ -32,16 +33,17 @@
                                 <span style="color: #1e9fff">装货港</span>
                             </span>
                             <el-row>
-                                <el-col :span="16">
+                                <el-col :span="10">
                                     <search-query :datalist="polData" :selectValue="assemblyForm.polEnName"
                                         :filterable="true" :clearable="true" :remote="true"
                                         :disabled="detailData.seeDisabled || generateBillsfalse" :buttonIf="false"
-                                        :forParameter="{ key: 'id', label: 'enName', value: 'enName' }" placeholder="请选择装货港"
-                                        @remoteMethod="remoteMethod($event, 'pol')" @corpChange="corpChange($event, 'pol')"
+                                        :forParameter="{ key: 'id', label: 'enName', value: 'enName' }"
+                                        placeholder="请选择装货港" @remoteMethod="remoteMethod($event, 'pol')"
+                                        @corpChange="corpChange($event, 'pol')"
                                         @corpFocus="remoteMethod($event, 'pol')">
                                     </search-query>
                                 </el-col>
-                                <el-col :span="7">
+                                <el-col :span="13">
                                     <span style="padding-left: 20px"></span>
                                     <el-input type="age" style="width: 100%;" v-model="assemblyForm.polNamePrint"
                                         size="small" autocomplete="off"
@@ -55,16 +57,17 @@
                                 <span style="color: #1e9fff">卸货港</span>
                             </span>
                             <el-row>
-                                <el-col :span="16">
+                                <el-col :span="10">
                                     <search-query :datalist="podData" :selectValue="assemblyForm.podEnName"
                                         :filterable="true" :clearable="true" :remote="true"
                                         :disabled="detailData.seeDisabled" :buttonIf="false"
-                                        :forParameter="{ key: 'id', label: 'enName', value: 'enName' }" placeholder="请选择卸货港"
-                                        @remoteMethod="remoteMethod($event, 'pod')" @corpChange="corpChange($event, 'pod')"
+                                        :forParameter="{ key: 'id', label: 'enName', value: 'enName' }"
+                                        placeholder="请选择卸货港" @remoteMethod="remoteMethod($event, 'pod')"
+                                        @corpChange="corpChange($event, 'pod')"
                                         @corpFocus="remoteMethod($event, 'pod')">
                                     </search-query>
                                 </el-col>
-                                <el-col :span="7">
+                                <el-col :span="13">
                                     <span style="padding-left: 20px"></span>
                                     <el-input type="age" style="width: 100%;" v-model="assemblyForm.podNamePrint"
                                         size="small" autocomplete="off" :disabled="detailData.seeDisabled" clearable
@@ -77,20 +80,21 @@
                                 <span style="color: #1e9fff">目的地</span>
                             </span>
                             <el-row>
-                                <el-col :span="16">
-                                    <search-query :datalist="destinationData" :selectValue="assemblyForm.destinationName"
-                                        :filterable="true" :clearable="true" :remote="true"
-                                        :disabled="detailData.seeDisabled || generateBillsfalse" :buttonIf="false"
-                                        :forParameter="{ key: 'id', label: 'enName', value: 'enName' }" placeholder="请选择目的地"
-                                        @remoteMethod="remoteMethod($event, 'destination')"
+                                <el-col :span="10">
+                                    <search-query :datalist="destinationData"
+                                        :selectValue="assemblyForm.destinationName" :filterable="true" :clearable="true"
+                                        :remote="true" :disabled="detailData.seeDisabled || generateBillsfalse"
+                                        :buttonIf="false"
+                                        :forParameter="{ key: 'id', label: 'enName', value: 'enName' }"
+                                        placeholder="请选择目的地" @remoteMethod="remoteMethod($event, 'destination')"
                                         @corpChange="corpChange($event, 'destination')"
                                         @corpFocus="remoteMethod($event, 'destination')">
                                     </search-query>
                                 </el-col>
-                                <el-col :span="7">
+                                <el-col :span="13">
                                     <span style="padding-left: 20px"></span>
-                                    <el-input type="age" style="width: 100%;" v-model="assemblyForm.destinationNamePrint"
-                                        size="small" autocomplete="off"
+                                    <el-input type="age" style="width: 100%;"
+                                        v-model="assemblyForm.destinationNamePrint" size="small" autocomplete="off"
                                         :disabled="detailData.seeDisabled || generateBillsfalse" clearable
                                         placeholder="目的地"></el-input>
                                 </el-col>
@@ -116,10 +120,11 @@
                             <div>
                                 <el-col :span="16">
                                     <search-query :datalist="hshipperData" :selectValue="assemblyForm.hshipperCnName"
-                                        :filterable="true" :clearable="true" :remote="true" :addIf="true" :tableIf="false"
-                                        :disabled="detailData.seeDisabled"
-                                        :forParameter="{ key: 'id', label: 'cnName', value: 'cnName' }" placeholder="请选择发货人"
-                                        @addJump="addJump('hshipper')" @remoteMethod="remoteMethod($event, 'hshipper')"
+                                        :filterable="true" :clearable="true" :remote="true" :addIf="true"
+                                        :tableIf="false" :disabled="detailData.seeDisabled"
+                                        :forParameter="{ key: 'id', label: 'cnName', value: 'cnName' }"
+                                        placeholder="请选择发货人" @addJump="addJump('hshipper')"
+                                        @remoteMethod="remoteMethod($event, 'hshipper')"
                                         @corpChange="corpChange($event, 'hshipper')"
                                         @corpFocus="remoteMethod($event, 'hshipper')">
                                     </search-query>
@@ -134,8 +139,9 @@
                         <div style="margin-top: 4px">
                             <el-form-item label="" prop="hshipperDetails">
                                 <el-input type="textarea" style="width: 100%;" v-model="assemblyForm.hshipperDetails"
-                                    size="small" autocomplete="off" :disabled="detailData.seeDisabled" rows="5" clearable
-                                    placeholder="请输入发货人提单描述" @blur="textareaBlur('hshipperDetails')"></el-input>
+                                    size="small" autocomplete="off" :disabled="detailData.seeDisabled" rows="5"
+                                    clearable placeholder="请输入发货人提单描述"
+                                    @blur="textareaBlur('hshipperDetails')"></el-input>
                             </el-form-item>
                         </div>
                         <el-form-item label="收货人" prop="hconsigneeCnName">
@@ -144,11 +150,13 @@
                             </span>
                             <div>
                                 <el-col :span="16">
-                                    <search-query :datalist="hconsigneeData" :selectValue="assemblyForm.hconsigneeCnName"
-                                        :filterable="true" :clearable="true" :remote="true"
-                                        :disabled="detailData.seeDisabled" :addIf="true" :tableIf="false"
-                                        :forParameter="{ key: 'id', label: 'cnName', value: 'cnName' }" placeholder="请选择收货人"
-                                        @addJump="addJump('hconsignee')" @remoteMethod="remoteMethod($event, 'hconsignee')"
+                                    <search-query :datalist="hconsigneeData"
+                                        :selectValue="assemblyForm.hconsigneeCnName" :filterable="true"
+                                        :clearable="true" :remote="true" :disabled="detailData.seeDisabled"
+                                        :addIf="true" :tableIf="false"
+                                        :forParameter="{ key: 'id', label: 'cnName', value: 'cnName' }"
+                                        placeholder="请选择收货人" @addJump="addJump('hconsignee')"
+                                        @remoteMethod="remoteMethod($event, 'hconsignee')"
                                         @corpChange="corpChange($event, 'hconsignee')"
                                         @corpFocus="remoteMethod($event, 'hconsignee')">
                                     </search-query>
@@ -169,8 +177,9 @@
                         <div>
                             <el-form-item label="" prop="hconsigneeDetails">
                                 <el-input type="textarea" style="width: 100%;" v-model="assemblyForm.hconsigneeDetails"
-                                    size="small" autocomplete="off" :disabled="detailData.seeDisabled" rows="5" clearable
-                                    placeholder="请输入收货人提单描述" @blur="textareaBlur('hconsigneeDetails')"></el-input>
+                                    size="small" autocomplete="off" :disabled="detailData.seeDisabled" rows="5"
+                                    clearable placeholder="请输入收货人提单描述"
+                                    @blur="textareaBlur('hconsigneeDetails')"></el-input>
                             </el-form-item>
                         </div>
                         <el-form-item label="通知人" prop="hnotifyCnName">
@@ -182,8 +191,9 @@
                                     <search-query :datalist="hnotifyData" :selectValue="assemblyForm.hnotifyCnName"
                                         :filterable="true" :clearable="true" :remote="true"
                                         :disabled="detailData.seeDisabled" :addIf="true" :tableIf="false"
-                                        :forParameter="{ key: 'id', label: 'cnName', value: 'cnName' }" placeholder="请选择通知人"
-                                        @addJump="addJump('hconsignee')" @remoteMethod="remoteMethod($event, 'hnotify')"
+                                        :forParameter="{ key: 'id', label: 'cnName', value: 'cnName' }"
+                                        placeholder="请选择通知人" @addJump="addJump('hconsignee')"
+                                        @remoteMethod="remoteMethod($event, 'hnotify')"
                                         @corpChange="corpChange($event, 'hnotify')"
                                         @corpFocus="remoteMethod($event, 'hnotify')">
                                     </search-query>
@@ -192,12 +202,14 @@
                                     <div
                                         style="display: flex;align-items: center;justify-content: space-between;padding-left: 10px">
                                         <div style="flex: 4">
-                                            <el-input type="age" style="width: 100%;" v-model="assemblyForm.hnotifyCntyName"
-                                                size="small" autocomplete="off" :disabled="detailData.seeDisabled" clearable
+                                            <el-input type="age" style="width: 100%;"
+                                                v-model="assemblyForm.hnotifyCntyName" size="small" autocomplete="off"
+                                                :disabled="detailData.seeDisabled" clearable
                                                 placeholder="通知人"></el-input>
                                         </div>
                                         <div style="flex: 1;margin-left: 10px">
-                                            <el-button type="primary" icon="el-icon-plus" size="mini" @click="hnotifyClick"></el-button>
+                                            <el-button type="primary" icon="el-icon-plus" size="mini"
+                                                @click="hnotifyClick"></el-button>
                                             <!-- <div class="addbuttonClass" @click="hnotifyClick">+</div> -->
                                         </div>
                                     </div>
@@ -207,8 +219,9 @@
                         <div>
                             <el-form-item label="" prop="hnotifyDetails">
                                 <el-input type="textarea" style="width: 100%;" v-model="assemblyForm.hnotifyDetails"
-                                    size="small" autocomplete="off" :disabled="detailData.seeDisabled" rows="5" clearable
-                                    placeholder="请输入通知人提单描述" @blur="textareaBlur('hnotifyDetails')"></el-input>
+                                    size="small" autocomplete="off" :disabled="detailData.seeDisabled" rows="5"
+                                    clearable placeholder="请输入通知人提单描述"
+                                    @blur="textareaBlur('hnotifyDetails')"></el-input>
                             </el-form-item>
                         </div>
                     </el-row>
@@ -251,13 +264,14 @@
                             </div>
                             <div>
                                 <el-input type="textarea" style="width: 100%;" v-model="assemblyForm.commodityDescr"
-                                    size="small" autocomplete="off" :disabled="detailData.seeDisabled" rows="5" clearable
-                                    placeholder="请输入货物描述" @blur="textareaBlur('commodityDescr')"></el-input>
+                                    size="small" autocomplete="off" :disabled="detailData.seeDisabled" rows="5"
+                                    clearable placeholder="请输入货物描述" @blur="textareaBlur('commodityDescr')"></el-input>
                             </div>
                         </el-row>
                     </el-col>
                     <el-col :span="12">
-                        <el-form-item label="ETA" prop="eta" :rules="[{ required: true, message: '', trigger: 'blur' }]">
+                        <el-form-item label="ETA" prop="eta"
+                            :rules="[{ required: true, message: '', trigger: 'blur' }]">
                             <span slot="label">
                                 <span style="color: #1e9fff">ETA</span>
                             </span>
@@ -285,7 +299,8 @@
                                     :filterable="true" :clearable="true" :remote="true"
                                     :disabled="detailData.seeDisabled || generateBillsfalse" :buttonIf="false"
                                     :forParameter="{ key: 'id', label: 'enName', value: 'enName' }" placeholder="请选择船名"
-                                    @remoteMethod="remoteMethod($event, 'vessel')" @corpChange="corpChange($event, 'vessel')"
+                                    @remoteMethod="remoteMethod($event, 'vessel')"
+                                    @corpChange="corpChange($event, 'vessel')"
                                     @corpFocus="remoteMethod($event, 'vessel')">
                                 </search-query>
                             </el-form-item>
@@ -294,16 +309,16 @@
                                     <span style="color: #1e9fff">航次</span>
                                 </span>
                                 <el-input type="age" style="width: 100%;" v-model="assemblyForm.voyageNo" size="small"
-                                    autocomplete="off" :disabled="detailData.seeDisabled || generateBillsfalse" clearable
-                                    placeholder="请选择航次"></el-input>
+                                    autocomplete="off" :disabled="detailData.seeDisabled || generateBillsfalse"
+                                    clearable placeholder="请选择航次"></el-input>
                             </el-form-item>
                         </div>
                         <el-form-item label="客户约号" prop="corpArgreementNo" label-width="90px">
                             <span slot="label">
                                 <span style="color: #1e9fff">客户约号</span>
                             </span>
-                            <el-input type="age" style="width: 100%;" v-model="assemblyForm.corpArgreementNo" size="small"
-                                autocomplete="off" :disabled="detailData.seeDisabled" clearable
+                            <el-input type="age" style="width: 100%;" v-model="assemblyForm.corpArgreementNo"
+                                size="small" autocomplete="off" :disabled="detailData.seeDisabled" clearable
                                 placeholder="请输入客户约号"></el-input>
                         </el-form-item>
                         <el-form-item label="船公司" prop="carrierCnName">
@@ -315,7 +330,8 @@
                                 :filterable="true" :clearable="true" :remote="true"
                                 :disabled="detailData.seeDisabled || generateBillsfalse" :buttonIf="false"
                                 :forParameter="{ key: 'id', label: 'cnName', value: 'cnName' }" placeholder="请选择船公司"
-                                @remoteMethod="remoteMethod($event, 'carrier')" @corpChange="corpChange($event, 'carrier')"
+                                @remoteMethod="remoteMethod($event, 'carrier')"
+                                @corpChange="corpChange($event, 'carrier')"
                                 @corpFocus="remoteMethod($event, 'carrier')">
                             </search-query>
                         </el-form-item>
@@ -341,7 +357,8 @@
                                     <search-query :datalist="packingUnitData" style="margin-right: -10px;"
                                         :selectValue="assemblyForm.packingUnit" :filterable="true" :clearable="true"
                                         :remote="true" :disabled="detailData.seeDisabled || generateBillsfalse"
-                                        :buttonIf="false" :forParameter="{ key: 'id', label: 'cnName', value: 'cnName' }"
+                                        :buttonIf="false"
+                                        :forParameter="{ key: 'id', label: 'cnName', value: 'cnName' }"
                                         placeholder="请选择包装" @remoteMethod="remoteMethod($event, 'packingUnit')"
                                         @corpChange="corpChange($event, 'packingUnit')"
                                         @corpFocus="remoteMethod($event, 'packingUnit')">
@@ -406,8 +423,8 @@
                                 <span style="color: #1e9fff">备注</span>
                             </span>
                             <el-input type="textarea" style="width: 100%;" v-model="assemblyForm.remarks" size="small"
-                                autocomplete="off" :disabled="detailData.seeDisabled" rows="3" clearable placeholder="请输入备注"
-                                @blur="textareaBlur('remarks')"></el-input>
+                                autocomplete="off" :disabled="detailData.seeDisabled" rows="3" clearable
+                                placeholder="请输入备注" @blur="textareaBlur('remarks')"></el-input>
                         </el-form-item>
                     </el-col>
                 </el-col>
@@ -422,10 +439,11 @@
                                     @click="emailJump('cy')">场站</span>
                             </span>
                             <search-query :datalist="cyData" :selectValue="assemblyForm.cyCnName" :filterable="true"
-                                :clearable="true" :remote="true" :disabled="detailData.seeDisabled || generateBillsfalse"
-                                :buttonIf="false" :forParameter="{ key: 'id', label: 'cnName', value: 'cnName' }"
-                                placeholder="请选择场站" @remoteMethod="remoteMethod($event, 'cy')"
-                                @corpChange="corpChange($event, 'cy')" @corpFocus="remoteMethod($event, 'cy')">
+                                :clearable="true" :remote="true"
+                                :disabled="detailData.seeDisabled || generateBillsfalse" :buttonIf="false"
+                                :forParameter="{ key: 'id', label: 'cnName', value: 'cnName' }" placeholder="请选择场站"
+                                @remoteMethod="remoteMethod($event, 'cy')" @corpChange="corpChange($event, 'cy')"
+                                @corpFocus="remoteMethod($event, 'cy')">
                             </search-query>
                         </el-form-item>
                     </el-col>
@@ -441,8 +459,8 @@
                             <search-query :datalist="cyContactsData" :selectValue="assemblyForm.cyContacts"
                                 :filterable="true" :clearable="true" :allowCreate="true"
                                 :disabled="detailData.seeDisabled || generateBillsfalse || !assemblyForm.cyCnName"
-                                :buttonIf="false" :forParameter="{ key: 'id', label: 'cname', value: 'cname' }" placeholder="联系人"
-                                @corpChange="corpChange($event, 'cyContacts')"
+                                :buttonIf="false" :forParameter="{ key: 'id', label: 'cname', value: 'cname' }"
+                                placeholder="联系人" @corpChange="corpChange($event, 'cyContacts')"
                                 @corpFocus="remoteMethod($event, 'cyContacts')">
                             </search-query>
                         </el-form-item>
@@ -479,9 +497,10 @@
                         <el-col :span="12">
                             <el-form-item label="通知人" prop="hnotify2CnName">
                                 <search-query :datalist="hnotify2Data" :selectValue="assemblyForm.hnotify2CnName"
-                                    :filterable="true" :clearable="true" :remote="true" :disabled="detailData.seeDisabled"
-                                    :buttonIf="false" :forParameter="{ key: 'id', label: 'cnName', value: 'cnName' }"
-                                    placeholder="请选择通知人" @remoteMethod="remoteMethod($event, 'hnotify2')"
+                                    :filterable="true" :clearable="true" :remote="true"
+                                    :disabled="detailData.seeDisabled" :buttonIf="false"
+                                    :forParameter="{ key: 'id', label: 'cnName', value: 'cnName' }" placeholder="请选择通知人"
+                                    @remoteMethod="remoteMethod($event, 'hnotify2')"
                                     @corpChange="corpChange($event, 'hnotify2')"
                                     @corpFocus="remoteMethod($event, 'hnotify2')">
                                 </search-query>
@@ -497,8 +516,9 @@
                         <el-col :span="24">
                             <el-form-item label="提单描述" prop="hnotify2Details">
                                 <el-input type="textarea" style="width: 100%;" v-model="assemblyForm.hnotify2Details"
-                                    size="small" autocomplete="off" :disabled="detailData.seeDisabled" rows="4" clearable
-                                    placeholder="请输入通知人提单描述" @blur="textareaBlur('hnotify2Details')"></el-input>
+                                    size="small" autocomplete="off" :disabled="detailData.seeDisabled" rows="4"
+                                    clearable placeholder="请输入通知人提单描述"
+                                    @blur="textareaBlur('hnotify2Details')"></el-input>
                             </el-form-item>
                         </el-col>
 
@@ -542,9 +562,9 @@
                         </el-col>
                         <el-col :span="12">
                             <el-form-item label="易燃易爆品闪点" prop="dgFlashPoint">
-                                <el-input type="age" style="width: 100%;" v-model="assemblyForm.dgFlashPoint" size="small"
-                                    autocomplete="off" :disabled="detailData.seeDisabled" @input="dgFlashPointInput"
-                                    clearable placeholder="请输入易燃易爆品闪点"></el-input>
+                                <el-input type="age" style="width: 100%;" v-model="assemblyForm.dgFlashPoint"
+                                    size="small" autocomplete="off" :disabled="detailData.seeDisabled"
+                                    @input="dgFlashPointInput" clearable placeholder="请输入易燃易爆品闪点"></el-input>
                             </el-form-item>
                         </el-col>
                         <el-col :span="12">
@@ -570,8 +590,8 @@
                         </el-col>
                         <el-col :span="12">
                             <el-form-item label="危险品净重" prop="dgTel">
-                                <el-input type="age" style="width: 100%;" v-model="assemblyForm.dgNetWeight" size="small"
-                                    autocomplete="off" :disabled="detailData.seeDisabled" clearable
+                                <el-input type="age" style="width: 100%;" v-model="assemblyForm.dgNetWeight"
+                                    size="small" autocomplete="off" :disabled="detailData.seeDisabled" clearable
                                     placeholder="请输入危险品净重"></el-input>
                             </el-form-item>
                         </el-col>
@@ -868,7 +888,7 @@ export default {
                         this.$set(this.assemblyForm, name + 'CnName', item.cnName)
                         this.$set(this.assemblyForm, name + 'EnName', item.enName)
                         this.$set(this.assemblyForm, name + 'Code', item.code)
-                        this.$set(this.assemblyForm, name + 'NamePrint', item.enName)
+                        this.$set(this.assemblyForm, name + 'NamePrint', item.enName.split('-')[1])
                         // 签单地点 默认 装货港
                         if (name == 'pol') {
                             this.$set(this.assemblyForm, 'issueAt', this.assemblyForm.polCnName)
@@ -878,7 +898,7 @@ export default {
                             this.$set(this.assemblyForm, 'destinationId', item.id)
                             this.$set(this.assemblyForm, 'destinationName', item.enName)
                             this.$set(this.assemblyForm, 'destinationCode', item.code)
-                            this.$set(this.assemblyForm, 'destinationNamePrint', item.enName)
+                            this.$set(this.assemblyForm, 'destinationNamePrint', item.enName.split('-')[1])
                         }
                     }
                 }
@@ -896,7 +916,7 @@ export default {
                         this.$set(this.assemblyForm, name + 'Id', item.id)
                         this.$set(this.assemblyForm, name + 'Name', item.enName)
                         this.$set(this.assemblyForm, name + 'Code', item.code)
-                        this.$set(this.assemblyForm, name + 'NamePrint', item.enName)
+                        this.$set(this.assemblyForm, name + 'NamePrint', item.enName.split('-')[1])
                     }
                 }
             }
@@ -1047,7 +1067,7 @@ export default {
         },
         // 通知人
         hnotify2HandleClose(done) {
-  done();
+            done();
         },
         // 危险品弹窗开启
         DangerousGoodsAdd() {
@@ -1224,7 +1244,7 @@ export default {
         placeReceiptBportsListfun(enName) {
             bportsList(1, 10, { enName, status: 0 }).then(res => {
                 this.placeReceiptData = res.data.data.records.map(item => {
-                    item.enName = item.enName + ' - ' + item.code
+                    item.enName = item.code + ' - ' + item.enName
                     return item
                 })
             })
@@ -1233,7 +1253,7 @@ export default {
         polBportsListfun(enName) {
             bportsList(1, 10, { enName, status: 0 }).then(res => {
                 this.polData = res.data.data.records.map(item => {
-                    item.enName = item.enName + ' - ' + item.code
+                    item.enName = item.code + ' - ' + item.enName
                     return item
                 })
             })
@@ -1242,7 +1262,7 @@ export default {
         podBportsListfun(enName) {
             bportsList(1, 10, { enName, status: 0 }).then(res => {
                 this.podData = res.data.data.records.map(item => {
-                    item.enName = item.enName + ' - ' + item.code
+                    item.enName = item.code + ' - ' + item.enName
                     return item
                 })
             })
@@ -1251,7 +1271,7 @@ export default {
         destinationBportsListfun(enName) {
             bportsList(1, 10, { enName, status: 0 }).then(res => {
                 this.destinationData = res.data.data.records.map(item => {
-                    item.enName = item.enName + ' - ' + item.code
+                    item.enName = item.code + ' - ' + item.enName
                     return item
                 })
             })

src/views/iosBasicData/OceanFreightImport/bills/assembly/feecenter.vue

@@ -1389,10 +1389,10 @@ export default {
             let groupCode = ''
             let selectionArr = []
             if (dc == 'D') {
-                groupCode = '应收'
+                groupCode = '应收,应收-账单'
                 selectionArr = this.selectionDList
             } else {
-                groupCode = '应付'
+                groupCode = '应付,应付-账单'
                 selectionArr = this.selectionCList
             }
             if (selectionArr.length > 0) {

src/views/iosBasicData/OceanFreightImport/bills/billsDetails.vue

@@ -372,7 +372,15 @@ export default {
                 feeCenterListD: [], // 收
                 feeCenterListC: [], // 付
                 preContainersList: [], // 箱
-                feeCenterAmendList:[]
+                feeCenterAmendList:[],
+                placeReceiptName:'',
+                placeReceiptNamePrint:'',
+                polEnName:'',
+                polNamePrint:'',
+                podEnName:'',
+                podNamePrint:'',
+                destinationName:'',
+                destinationNamePrint:''
             },
             oldForm: {
                 billDate: dateFormat(new Date(), "yyyy-MM-dd") + ' 00:00', // 单据日期 默认 当天
@@ -396,7 +404,15 @@ export default {
                 feeCenterListD: [], // 收
                 feeCenterListC: [], // 付
                 preContainersList: [], // 箱
-                feeCenterAmendList:[]
+                feeCenterAmendList:[],
+                placeReceiptName:'',
+                placeReceiptNamePrint:'',
+                polEnName:'',
+                polNamePrint:'',
+                podEnName:'',
+                podNamePrint:'',
+                destinationName:'',
+                destinationNamePrint:''
             },
             // 循环的配置
             basicData: {
@@ -1468,7 +1484,7 @@ export default {
             }
             this.form.businessTypeCode = 'HYJK'
             // 把拼接的数据拆开 开始 🐒🐒🐒🐒🐒🐒🐒🐒🐒🐒🐒🐒🐒🐒
-            this.searchSplit()
+            // this.searchSplit()
             // 把拼接的数据拆开 结束 💩💩💩💩💩💩💩💩💩💩💩💩💩💩
             // 费用 收 赋值数据
             this.form.feeCenterListD.map((row, index) => {
@@ -1593,7 +1609,7 @@ export default {
             billsCopyBills({ id }).then(res => {
                 this.form = res.data.data;
                 this.pageLoading = false
-                this.searchMontage() // 下拉 中文名称和编号拼接
+                // this.searchMontage() // 下拉 中文名称和编号拼接
                 // 配箱最上面可以编辑
                 for (let item of this.form.containersList) {
                     item.edit = false
@@ -1685,7 +1701,7 @@ export default {
                 this.pleasereviewType = false
             }
             this.pageLoading = false
-            this.searchMontage() // 下拉 中文名称和编号拼接
+            // this.searchMontage() // 下拉 中文名称和编号拼接
             // 配箱最上面可以编辑
             for (let item of this.form.containersList) {
                 item.edit = false

src/views/iosBasicData/PaymentApplication/finstlbillsDetails.vue

@@ -468,6 +468,11 @@ export default {
         this.roleName = localStorage.getItem('roleName').split(',')
         // 获取当前登录人个人信息
         this.saberUserInfo = JSON.parse(localStorage.getItem('saber-userInfo')).content
+        if(this.$route.query.mblno){
+            // console.log(111111)
+            this.form.mblno=this.$route.query.mblno
+            this.form.corpCnName=this.$route.query.corpCnName
+        }
     },
     methods: {
         // 开户账户跳转维护

src/views/iosBasicData/PaymentApplication/index.vue

@@ -397,6 +397,13 @@ export default {
         }
       }, 200);
     }
+    if (this.$route.query.mblno) {
+      setTimeout(() => {
+        if (!this.$store.getters.payAppStatus) {
+          this.newbillFun()
+        }
+      }, 200);
+    }
   },
   methods: {
     // 展开行

src/views/iosBasicData/SeafreightExportF/bills/assembly/EntrustmentLnformation.vue

@@ -120,7 +120,7 @@
                                 <!-- <span style="color: #1e9fff">收货地</span> -->
                             </span>
                             <el-row>
-                                <el-col :span="16">
+                                <el-col :span="10">
                                     <search-query :datalist="placeReceiptData" :selectValue="assemblyForm.placeReceiptName"
                                         :filterable="true" :clearable="true" :remote="true"
                                         :disabled="detailData.seeDisabled" :buttonIf="false" placeholder="请选择收货地"
@@ -130,7 +130,7 @@
                                         @corpFocus="remoteMethod($event, 'placeReceipt')">
                                     </search-query>
                                 </el-col>
-                                <el-col :span="7">
+                                <el-col :span="13">
                                     <span style="padding-left: 20px"></span>
                                     <el-input type="age" style="width: 100%;" v-model="assemblyForm.placeReceiptNamePrint"
                                         size="small" autocomplete="off" :disabled="detailData.seeDisabled" clearable
@@ -150,7 +150,7 @@
                                 <!-- <span style="color: #1e9fff">装货港</span> -->
                             </span>
                             <el-row>
-                                <el-col :span="16">
+                                <el-col :span="10">
                                     <search-query :datalist="polData" :selectValue="assemblyForm.polEnName"
                                         :filterable="true" :clearable="true" :remote="true"
                                         :disabled="detailData.seeDisabled || generateBillsfalse" :buttonIf="false"
@@ -159,7 +159,7 @@
                                         @corpFocus="remoteMethod($event, 'pol')">
                                     </search-query>
                                 </el-col>
-                                <el-col :span="7">
+                                <el-col :span="13">
                                     <span style="padding-left: 20px"></span>
                                     <el-input type="age" style="width: 100%;" v-model="assemblyForm.polNamePrint"
                                         size="small" autocomplete="off"
@@ -180,7 +180,7 @@
                                 <!-- <span style="color: #1e9fff">卸货港</span> -->
                             </span>
                             <el-row>
-                                <el-col :span="16">
+                                <el-col :span="10">
                                     <search-query :datalist="podData" :selectValue="assemblyForm.podEnName"
                                         :filterable="true" :clearable="true" :remote="true"
                                         :disabled="detailData.seeDisabled" :buttonIf="false" placeholder="请选择卸货港"
@@ -189,7 +189,7 @@
                                         @corpFocus="remoteMethod($event, 'pod')">
                                     </search-query>
                                 </el-col>
-                                <el-col :span="7">
+                                <el-col :span="13">
                                     <span style="padding-left: 20px"></span>
                                     <el-input type="age" style="width: 100%;" v-model="assemblyForm.podNamePrint"
                                         size="small" autocomplete="off" :disabled="detailData.seeDisabled" clearable
@@ -209,7 +209,7 @@
                                 <!-- <span style="color: #1e9fff">目的地</span> -->
                             </span>
                             <el-row>
-                                <el-col :span="16">
+                                <el-col :span="10">
                                     <search-query :datalist="destinationData" :selectValue="assemblyForm.destinationName"
                                         :filterable="true" :clearable="true" :remote="true"
                                         :disabled="detailData.seeDisabled || generateBillsfalse" :buttonIf="false"
@@ -219,7 +219,7 @@
                                         @corpFocus="remoteMethod($event, 'destination')">
                                     </search-query>
                                 </el-col>
-                                <el-col :span="7">
+                                <el-col :span="13">
                                     <span style="padding-left: 20px"></span>
                                     <el-input type="age" style="width: 100%;" v-model="assemblyForm.destinationNamePrint"
                                         size="small" autocomplete="off"
@@ -240,7 +240,7 @@
                                 <!-- <span style="color: #1e9fff">交货地</span> -->
                             </span>
                             <el-row>
-                                <el-col :span="16">
+                                <el-col :span="10">
                                     <search-query :datalist="placeDeliveryData"
                                         :selectValue="assemblyForm.placeDeliveryName" :filterable="true" :clearable="true"
                                         :remote="true" :disabled="detailData.seeDisabled" :buttonIf="false"
@@ -250,7 +250,7 @@
                                         @corpFocus="remoteMethod($event, 'placeDelivery')">
                                     </search-query>
                                 </el-col>
-                                <el-col :span="7">
+                                <el-col :span="13">
                                     <span style="padding-left: 20px"></span>
                                     <el-input type="age" style="width: 100%;" v-model="assemblyForm.placeDeliveryNamePrint"
                                         size="small" autocomplete="off" :disabled="detailData.seeDisabled" clearable
@@ -270,7 +270,7 @@
                                 <!-- <span style="color: #1e9fff">中转港</span> -->
                             </span>
                             <el-row>
-                                <el-col :span="16">
+                                <el-col :span="10">
                                     <search-query :datalist="potData" :selectValue="assemblyForm.potEnName"
                                         :filterable="true" :clearable="true" :remote="true"
                                         :disabled="detailData.seeDisabled" :buttonIf="false" placeholder="请选择中转港"
@@ -279,7 +279,7 @@
                                         @corpFocus="remoteMethod($event, 'pot')">
                                     </search-query>
                                 </el-col>
-                                <el-col :span="7">
+                                <el-col :span="13">
                                     <span style="padding-left: 20px"></span>
                                     <el-input type="age" style="width: 100%;" v-model="assemblyForm.potNamePrint"
                                         size="small" autocomplete="off" :disabled="detailData.seeDisabled" clearable
@@ -1187,7 +1187,7 @@ export default {
                         this.$set(this.assemblyForm, name + 'CnName', item.cnName)
                         this.$set(this.assemblyForm, name + 'EnName', item.enName)
                         this.$set(this.assemblyForm, name + 'Code', item.code)
-                        this.$set(this.assemblyForm, name + 'NamePrint', item.enName)
+                        this.$set(this.assemblyForm, name + 'NamePrint', item.enName.split('-')[1])
                         // 签单地点 默认 装货港
                         if (name == 'pol') {
                             this.$set(this.assemblyForm, 'issueAt', this.assemblyForm.polCnName)
@@ -1204,6 +1204,7 @@ export default {
             }
             // 没有中文名的港口
             else if (portArr.indexOf(name) != -1) {
+                console.log(name)
                 if (!value) {
                     this.$set(this.assemblyForm, name + 'Id', '')
                     this.$set(this.assemblyForm, name + 'Name', '')
@@ -1215,7 +1216,7 @@ export default {
                         this.$set(this.assemblyForm, name + 'Id', item.id)
                         this.$set(this.assemblyForm, name + 'Name', item.enName)
                         this.$set(this.assemblyForm, name + 'Code', item.code)
-                        this.$set(this.assemblyForm, name + 'NamePrint', item.enName)
+                        this.$set(this.assemblyForm, name + 'NamePrint', item.enName.split('-')[1])
                     }
                 }
             }
@@ -1604,7 +1605,7 @@ export default {
         placeReceiptBportsListfun(enName) {
             bportsList(1, 10, { enName, status: 0 }).then(res => {
                 this.placeReceiptData = res.data.data.records.map(item => {
-                    item.enName = item.enName + ' - ' + item.code
+                    item.enName =item.code  + ' - ' + item.enName
                     return item
                 })
             })
@@ -1613,7 +1614,7 @@ export default {
         polBportsListfun(enName) {
             bportsList(1, 10, { enName, status: 0 }).then(res => {
                 this.polData = res.data.data.records.map(item => {
-                    item.enName = item.enName + ' - ' + item.code
+                    item.enName = item.code  + ' - ' + item.enName
                     return item
                 })
             })
@@ -1622,7 +1623,7 @@ export default {
         podBportsListfun(enName) {
             bportsList(1, 10, { enName, status: 0 }).then(res => {
                 this.podData = res.data.data.records.map(item => {
-                    item.enName = item.enName + ' - ' + item.code
+                    item.enName = item.code  + ' - ' + item.enName
                     return item
                 })
             })
@@ -1631,7 +1632,7 @@ export default {
         destinationBportsListfun(enName) {
             bportsList(1, 10, { enName, status: 0 }).then(res => {
                 this.destinationData = res.data.data.records.map(item => {
-                    item.enName = item.enName + ' - ' + item.code
+                    item.enName = item.code  + ' - ' + item.enName
                     return item
                 })
             })
@@ -1640,7 +1641,7 @@ export default {
         placeDeliveryBportsListfun(enName) {
             bportsList(1, 10, { enName, status: 0 }).then(res => {
                 this.placeDeliveryData = res.data.data.records.map(item => {
-                    item.enName = item.enName + ' - ' + item.code
+                    item.enName = item.code  + ' - ' + item.enName
                     return item
                 })
             })
@@ -1649,7 +1650,7 @@ export default {
         potBportsListfun(enName) {
             bportsList(1, 10, { enName, status: 0 }).then(res => {
                 this.potData = res.data.data.records.map(item => {
-                    item.enName = item.enName + ' - ' + item.code
+                    item.enName = item.code  + ' - ' + item.enName
                     return item
                 })
             })

src/views/iosBasicData/SeafreightExportF/bills/assembly/feecenter.vue

@@ -1,7 +1,8 @@
 <template>
     <div>
         <div>
-            <el-form :model="assemblyForm" ref="form" label-width="90px" style="margin-bottom: 4px" class="demo-ruleForm">
+            <el-form :model="assemblyForm" ref="form" label-width="90px" style="margin-bottom: 4px"
+                class="demo-ruleForm">
                 <el-row :gutter="10">
                     <el-col :span="6">
                         <el-form-item label="客户名称" prop="corpCnName">
@@ -26,8 +27,8 @@
                             <span slot="label">
                                 <span style="color: #1e9fff">箱型箱量</span>
                             </span>
-                            <el-input type="age" style="width: 100%;" v-model="assemblyForm.quantityCntrDescr" size="small"
-                                autocomplete="off" disabled clearable placeholder="箱型箱量"></el-input>
+                            <el-input type="age" style="width: 100%;" v-model="assemblyForm.quantityCntrDescr"
+                                size="small" autocomplete="off" disabled clearable placeholder="箱型箱量"></el-input>
                         </el-form-item>
                     </el-col>
                     <el-col :span="6">
@@ -56,30 +57,31 @@
                         <i class="el-icon-coin"></i>
                         <span>应收费用</span>
                     </div>
-                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应收修改') != -1" type="danger" plain
-                        size="small" :disabled="!selectionDList.length || disabled || pleasereviewType"
+                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应收修改') != -1" type="danger"
+                        plain size="small" :disabled="!selectionDList.length || disabled || pleasereviewType"
                         @click="batchDelete('D')">一键删除
                     </el-button>
-                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应收修改') != -1" type="success" plain
-                        size="small" :disabled="!selectionDList.length || disabled || pleasereviewType"
+                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应收修改') != -1" type="success"
+                        plain size="small" :disabled="!selectionDList.length || disabled || pleasereviewType"
                         @click="GenerateBillsfun('D')">生成账单
                     </el-button>
-                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应收修改') != -1" type="danger" plain
-                        size="small" :disabled="!selectionDList.length || disabled || pleasereviewType"
+                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应收修改') != -1" type="danger"
+                        plain size="small" :disabled="!selectionDList.length || disabled || pleasereviewType"
                         @click="RevokingBillsfun('D')">撤销账单
                     </el-button>
                     <el-button type="primary" plain size="small" @click="printingCostsfun('D')">打印账单</el-button>
-                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应收修改') != -1" type="success" plain
-                        size="small" :disabled="!this.assemblyForm.id || disabled || pleasereviewType"
+                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应收修改') != -1" type="success"
+                        plain size="small" :disabled="!this.assemblyForm.id || disabled || pleasereviewType"
                         @click="templateClick('D')">应收模板</el-button>
-                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应收修改') != -1" type="info" plain
-                        size="small" :disabled="disabled || pleasereviewType"
+                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应收修改') != -1" type="info"
+                        plain size="small" :disabled="disabled || pleasereviewType"
                         @click="feecenterSubmitListfun">一键保存</el-button>
-                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应收修改') != -1" type="info" plain
-                        size="small" :disabled="disabled || pleasereviewType" @click="feecenterEditfun('D')">一键编辑
+                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应收修改') != -1" type="info"
+                        plain size="small" :disabled="disabled || pleasereviewType" @click="feecenterEditfun('D')">一键编辑
                     </el-button>
-                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应收修改') != -1" type="primary" plain
-                        size="small" :disabled="disabled || pleasereviewType" @click="copyfun('D')">生成应付</el-button>
+                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应收修改') != -1" type="primary"
+                        plain size="small" :disabled="disabled || pleasereviewType"
+                        @click="copyfun('D')">生成应付</el-button>
                 </template>
                 <template slot="indexHeader" slot-scope="scope">
                     <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应收修改') != -1" type="primary"
@@ -93,8 +95,8 @@
                     <span>{{ row.accStatus ? '是' : '否' }}</span>
                 </template>
                 <template slot="corpCnName" slot-scope="{ row }">
-                    <search-query v-if="row.edit" :datalist="corpCnNameData" :selectValue="row.shortName" :filterable="true"
-                        :clearable="true" :remote="true" :buttonIf="false"
+                    <search-query v-if="row.edit" :datalist="corpCnNameData" :selectValue="row.shortName"
+                        :filterable="true" :clearable="true" :remote="true" :buttonIf="false"
                         :forParameter="{ key: 'id', label: 'shortName', value: 'shortName' }"
                         @remoteMethod="getBcorpsListfun($event, 'shortName')"
                         @corpChange="corpChange($event, 'shortName', row, 'D')"
@@ -103,8 +105,8 @@
                     <span v-else style="color: #1e9fff" @click="corpClick(row)">{{ row.shortName }}</span>
                 </template>
                 <template slot="feeCnName" slot-scope="{ row }">
-                    <search-query v-if="row.edit" :datalist="feeCnNameData" :selectValue="row.feeCnName" :filterable="true"
-                        :clearable="true" :remote="true" :buttonIf="false"
+                    <search-query v-if="row.edit" :datalist="feeCnNameData" :selectValue="row.feeCnName"
+                        :filterable="true" :clearable="true" :remote="true" :buttonIf="false"
                         :forParameter="{ key: 'id', label: 'cnName', value: 'cnName' }"
                         @remoteMethod="bfeesListfun($event, 'feeCnName')"
                         @corpChange="corpChange($event, 'feeCnName', row, 'D')"
@@ -185,36 +187,39 @@
                         <i class="el-icon-coin"></i>
                         <span>应付费用</span>
                     </div>
-                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应付修改') != -1" type="danger" plain
-                        size="small" :disabled="!selectionCList.length || disabled || pleasereviewType"
+                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应付修改') != -1" type="danger"
+                        plain size="small" :disabled="!selectionCList.length || disabled || pleasereviewType"
                         @click="batchDelete('C')">一键删除
                     </el-button>
-                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应付修改') != -1" type="primary" plain
-                        size="small" :disabled="!selectionCList.length || disabled || pleasereviewType"
+                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应付修改') != -1" type="primary"
+                        plain size="small" :disabled="!selectionCList.length || disabled || pleasereviewType"
                         @click="GenerateBillsfun('C')">生成账单
                     </el-button>
-                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应付修改') != -1" type="danger" plain
-                        size="small" :disabled="!selectionCList.length || disabled || pleasereviewType"
+                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应付修改') != -1" type="danger"
+                        plain size="small" :disabled="!selectionCList.length || disabled || pleasereviewType"
                         @click="RevokingBillsfun('C')">撤销账单
                     </el-button>
                     <el-button type="primary" plain size="small" @click="printingCostsfun('C')">打印账单</el-button>
-                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应付修改') != -1" type="success" plain
-                        size="small" :disabled="!this.assemblyForm.id || disabled || pleasereviewType"
+                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应付修改') != -1" type="success"
+                        plain size="small" :disabled="!this.assemblyForm.id || disabled || pleasereviewType"
                         @click="templateClick('C')">应付模板
                     </el-button>
-                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应付修改') != -1" type="info" plain
-                        size="small" :disabled="disabled || pleasereviewType" @click="feecenterSubmitListfun">一键保存
+                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应付修改') != -1" type="info"
+                        plain size="small" :disabled="disabled || pleasereviewType" @click="feecenterSubmitListfun">一键保存
                     </el-button>
-                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应付修改') != -1" type="info" plain
-                        size="small" :disabled="disabled || pleasereviewType" @click="feecenterEditfun('C')">一键编辑
+                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应付修改') != -1" type="info"
+                        plain size="small" :disabled="disabled || pleasereviewType" @click="feecenterEditfun('C')">一键编辑
                     </el-button>
-                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应付修改') != -1" type="primary" plain
-                        size="small" :disabled="disabled || pleasereviewType" @click="copyfun('C')">生成应收
+                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应付修改') != -1" type="primary"
+                        plain size="small" :disabled="disabled || pleasereviewType" @click="copyfun('C')">生成应收
                     </el-button>
+                    <el-button type="info" plain size="small" :disabled="disabled"
+                        @click="allClick('付费申请', 'C')">付费申请</el-button>
                 </template>
                 <template slot="indexHeader" slot-scope="scope">
                     <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应付修改') != -1" type="primary"
-                        size="small" icon="el-icon-plus" circle :disabled="disabled || pleasereviewType" @click="addCfun">
+                        size="small" icon="el-icon-plus" circle :disabled="disabled || pleasereviewType"
+                        @click="addCfun">
                     </el-button>
                 </template>
                 <template slot="index" slot-scope="scope">
@@ -224,8 +229,8 @@
                     <span>{{ row.accStatus ? '是' : '否' }}</span>
                 </template>
                 <template slot="corpCnName" slot-scope="{ row }">
-                    <search-query v-if="row.edit" :datalist="corpCnNameData" :selectValue="row.shortName" :filterable="true"
-                        :clearable="true" :remote="true" :buttonIf="false"
+                    <search-query v-if="row.edit" :datalist="corpCnNameData" :selectValue="row.shortName"
+                        :filterable="true" :clearable="true" :remote="true" :buttonIf="false"
                         :forParameter="{ key: 'id', label: 'shortName', value: 'shortName' }"
                         @remoteMethod="getBcorpsListfun($event, 'shortName')"
                         @corpChange="corpChange($event, 'shortName', row, 'C')"
@@ -234,8 +239,8 @@
                     <span v-else style="color: #1e9fff" @click="corpClick(row)">{{ row.shortName }}</span>
                 </template>
                 <template slot="feeCnName" slot-scope="{ row }">
-                    <search-query v-if="row.edit" :datalist="feeCnNameData" :selectValue="row.feeCnName" :filterable="true"
-                        :clearable="true" :remote="true" :buttonIf="false"
+                    <search-query v-if="row.edit" :datalist="feeCnNameData" :selectValue="row.feeCnName"
+                        :filterable="true" :clearable="true" :remote="true" :buttonIf="false"
                         :forParameter="{ key: 'id', label: 'cnName', value: 'cnName' }"
                         @remoteMethod="bfeesListfun($event, 'feeCnName')"
                         @corpChange="corpChange($event, 'feeCnName', row, 'C')"
@@ -404,7 +409,8 @@
                 </el-row>
             </div>
             <span slot="footer" class="dialog-footer">
-                <el-button @click="templateVisible = false; feesselectionList = []; templateRightData = []">取 消</el-button>
+                <el-button @click="templateVisible = false; feesselectionList = []; templateRightData = []">取
+                    消</el-button>
                 <el-button type="primary" @click="templateExport">导 入</el-button>
             </span>
         </el-dialog>
@@ -447,14 +453,16 @@
             <div>
                 <el-row :gutter="10">
                     <el-col :span="4">
-                        <avue-tree :option="reportOption" :data="reportTypeData" @node-click="reportNodeClick"></avue-tree>
+                        <avue-tree :option="reportOption" :data="reportTypeData"
+                            @node-click="reportNodeClick"></avue-tree>
                     </el-col>
                     <el-col :span="20">
                         <avue-crud :option="optionPrinting" :table-loading="printingLoading" :data="PrintingData"
                             id="out-table" :header-cell-class-name="headerClassName" :row-style="{ height: '20px' }"
                             :cell-style="{ padding: '0px' }">
                             <template slot-scope="scope" slot="menu">
-                                <el-button type="text" size="small" @click="dialogPreviewfun(scope.row)">打印预览</el-button>
+                                <el-button type="text" size="small"
+                                    @click="dialogPreviewfun(scope.row)">打印预览</el-button>
                             </template>
                         </avue-crud>
                     </el-col>
@@ -465,8 +473,8 @@
             </span>
         </el-dialog>
 
-        <el-dialog title="打印" :visible.sync="selectPrintingDialog" append-to-body width="70%" :close-on-click-modal="false"
-            :before-close="handleClose">
+        <el-dialog title="打印" :visible.sync="selectPrintingDialog" append-to-body width="70%"
+            :close-on-click-modal="false" :before-close="handleClose">
             <div>
                 <reportformsList ref="reportformsList" @reportRadio="reportRadio"></reportformsList>
             </div>
@@ -1281,7 +1289,7 @@ export default {
                 },
             ],
             roleName: [], // 当前登录人的角色权限
-            idArr:[],
+            idArr: [],
         }
     },
     async created() {
@@ -1411,13 +1419,13 @@ export default {
             let selectionArr = []
             this.idArr = []
             if (dc == 'D') {
-                groupCode = '应收'
+                groupCode = '应收,应收-账单'
                 selectionArr = this.selectionDList
                 this.idArr = this.selectionDList.map(item => {
                     return item.id
                 })
             } else {
-                groupCode = '应付'
+                groupCode = '应付,应付-账单'
                 selectionArr = this.selectionCList
                 this.idArr = this.selectionCList.map(item => {
                     return item.id
@@ -2559,7 +2567,28 @@ export default {
             })
 
         },
-
+        allClick(name, type) {
+            if (name == '付费申请') {
+                if (this.selectionCList.length == 0) return this.$message.error("请选择费用");
+                if (this.selectionCList.length != this.selectionCList.filter(e => e.corpCnName == this.selectionCList[0].corpCnName).length) return this.$message.error("请选择相同的往来单位");
+                if (this.$store.getters.payAppStatus) {
+                    this.$alert("付费申请页面已存在,请关闭付费申请再进行操作", "温馨提示", {
+                        confirmButtonText: "确定",
+                        type: 'warning',
+                        callback: action => {
+                        }
+                    });
+                } else {
+                    this.$router.push({
+                        path: `/iosBasicData/PaymentApplication/index`,
+                        query: {
+                            mblno: this.assemblyForm.mblno,
+                            corpCnName: this.selectionCList[0].corpCnName
+                        }
+                    })
+                }
+            }
+        },
         // 预览报表
         handleReportPreview(url, data) {
             console.log(url, 1670)
@@ -2928,4 +2957,5 @@ export default {
     overflow: hidden;
     white-space: nowrap;
     text-overflow: ellipsis;
-}</style>
+}
+</style>

src/views/iosBasicData/SeafreightExportF/bills/assembly/formbottom.vue

@@ -216,12 +216,12 @@
                         </search-query>
                     </el-form-item>
                 </el-col>
-            </el-row>
-            <el-row>
                 <el-col :span="6">
-                    <el-button size="small" style="width: 100%;" type="primary" @click="inttraAdd">发送 INTTRA EDI 时 DOOR TO 或
+                    <el-button size="small" style="margin:3px 0 0 10px;" type="primary" @click="inttraAdd">发送 INTTRA EDI 时 DOOR TO 或
                         TO DOOR 联系人信息</el-button>
                 </el-col>
+            </el-row>
+            <el-row>
                 <el-col :span="6">
                     <el-form-item label="签单日期" prop="issueDate">
                         <span slot="label">

src/views/iosBasicData/SeafreightExportF/bills/billsDetails.vue

@@ -23,8 +23,9 @@
                         导入模板<i class="el-icon-arrow-down el-icon--right"></i>
                     </el-button>
                     <el-dropdown-menu slot="dropdown">
-                        <el-dropdown-item v-for="item in imporiData" :key="item.id" @click.native="importData(item.id)">{{
-                            item.name }}
+                        <el-dropdown-item v-for="item in imporiData" :key="item.id"
+                            @click.native="importData(item.id)">{{
+                                item.name }}
                         </el-dropdown-item>
                     </el-dropdown-menu>
                 </el-dropdown>
@@ -89,7 +90,8 @@
                                                                 style="color: #4c9e44;cursor: pointer;text-decoration: underline;"
                                                                 @click="applyforfun(item[0].label)">{{ item[0].label }}
                                                             </span>
-                                                            <span v-else style="color: #1e9fff">{{ item[0].label }}</span>
+                                                            <span v-else style="color: #1e9fff">{{ item[0].label
+                                                                }}</span>
                                                         </span>
                                                         <span v-if="item[0].type == 'button'"></span>
                                                         <!--<el-button v-if="item[0].type == 'button'" :disabled="detailData.seeDisabled || item[0].disabled"-->
@@ -97,9 +99,9 @@
                                                         <!--           @click="applyforfun(item[0].label)" >-->
                                                         <!--</el-button>-->
                                                         <search-query v-else-if="item[0].type == 'select'"
-                                                            :datalist="item[0].dicData" :selectValue="form[item[0].prop]"
-                                                            :filterable="true" :allowCreate="item[0].allowCreate || false"
-                                                            :remote="true"
+                                                            :datalist="item[0].dicData"
+                                                            :selectValue="form[item[0].prop]" :filterable="true"
+                                                            :allowCreate="item[0].allowCreate || false" :remote="true"
                                                             :disabled="detailData.seeDisabled || item[0].disabled"
                                                             :buttonIf="false" :placeholder="`${item[0].text || ''}`"
                                                             :forParameter="item[0].forParameter"
@@ -126,8 +128,9 @@
                                                             value-format="yyyy-MM-dd HH:mm" placeholder="选择日期">
                                                         </el-date-picker>
                                                         <search-query v-else-if="item[1].type == 'select'"
-                                                            :datalist="item[1].dicData" :selectValue="form[item[1].prop]"
-                                                            :filterable="true" :remote="true"
+                                                            :datalist="item[1].dicData"
+                                                            :selectValue="form[item[1].prop]" :filterable="true"
+                                                            :remote="true"
                                                             :disabled="detailData.seeDisabled || item[1].disabled"
                                                             :buttonIf="false" :placeholder="`${item[1].text || ''}`"
                                                             :forParameter="item[1].forParameter"
@@ -158,8 +161,9 @@
                                                             <span style="color: #1e9fff">{{ item[2].label }}</span>
                                                         </span>
                                                         <search-query v-if="item[2].type == 'select'"
-                                                            :datalist="item[2].dicData" :selectValue="form[item[2].prop]"
-                                                            :filterable="true" :clearable="false" :remote="true"
+                                                            :datalist="item[2].dicData"
+                                                            :selectValue="form[item[2].prop]" :filterable="true"
+                                                            :clearable="false" :remote="true"
                                                             :disabled="detailData.seeDisabled || item[2].disabled"
                                                             :buttonIf="false" :forParameter="item[2].forParameter"
                                                             :placeholder="`${item[2].text || ''}`"
@@ -197,8 +201,8 @@
                                                     <bcorpstypedefine v-show="item.slot == 'bcorpstypedefine'">
                                                     </bcorpstypedefine>
                                                 </search-query>
-                                                <el-input v-else type="age" style="width: 100%;" v-model="form[item.prop]"
-                                                    size="small" autocomplete="off"
+                                                <el-input v-else type="age" style="width: 100%;"
+                                                    v-model="form[item.prop]" size="small" autocomplete="off"
                                                     :disabled="detailData.seeDisabled || item.disabled"
                                                     :placeholder="item.text || ''"></el-input>
                                             </el-form-item>
@@ -234,7 +238,8 @@
                                         :disabled="detailData.seeDisabled || showLock" businessValue="HYCK"></reports>
                                 </el-tab-pane>
                                 <el-tab-pane label="EDI CODE" name="sixth">
-                                    <edicode :assemblyForm="form" :detailData="detailData" :disabled="showLock"></edicode>
+                                    <edicode :assemblyForm="form" :detailData="detailData" :disabled="showLock">
+                                    </edicode>
                                 </el-tab-pane>
                                 <el-tab-pane label="文件中心" name="seventh">
                                     <filescenter ref="filescenter" :assemblyForm="form" :pid="form.id"
@@ -243,8 +248,8 @@
                             </el-tabs>
                         </basic-container>
                         <basic-container :showBtn="true" v-if="activeName == 'first' || activeName == 'third'">
-                            <formbottom :assemblyForm="form" :generateBillsfalse="generateBillsfalse" :disabled="showLock"
-                                :detailData="detailData"></formbottom>
+                            <formbottom :assemblyForm="form" :generateBillsfalse="generateBillsfalse"
+                                :disabled="showLock" :detailData="detailData"></formbottom>
                         </basic-container>
                     </div>
                 </el-tab-pane>
@@ -252,8 +257,8 @@
                 <el-tab-pane label="费用信息" name="fy" class="scrollable-container"
                     v-if="roleName.indexOf('admin') != -1 ? true : roleName.indexOf('应收修改') != -1 || roleName.indexOf('应付修改') != -1 || roleName.indexOf('应收查看') != -1 || roleName.indexOf('应付查看') != -1">
                     <feecenter :assemblyForm="form" :copyFormData="copyFormData" :detailData="detailData"
-                        :disabled="detailData.seeDisabled || showLock" :pleasereviewType="pleasereviewType" :pid="form.id"
-                        @billsDetailfun="billsDetailfun(form.id)">
+                        :disabled="detailData.seeDisabled || showLock" :pleasereviewType="pleasereviewType"
+                        :pid="form.id" @billsDetailfun="billsDetailfun(form.id)">
                     </feecenter>
                 </el-tab-pane>
                 <el-tab-pane label="单证中心" name="dz" class="scrollable-container">
@@ -270,8 +275,8 @@
         <!--导入模板-->
         <el-dialog title="导入模板" append-to-body :visible.sync="excelBox" width="555px" :close-on-click-modal="false"
             v-dialog-drag>
-            <avue-form :option="excelOption" v-model="excelForm" :table-loading="excelLoading" :upload-before="uploadBefore"
-                :upload-after="onSuccess">
+            <avue-form :option="excelOption" v-model="excelForm" :table-loading="excelLoading"
+                :upload-before="uploadBefore" :upload-after="onSuccess">
             </avue-form>
         </el-dialog>
         <!--审核弹窗-->
@@ -391,7 +396,19 @@ export default {
                 feeCenterListD: [], // 收
                 feeCenterListC: [], // 付
                 preContainersList: [], // 箱
-                feeCenterAmendList:[]
+                feeCenterAmendList: [],
+                placeReceiptName: '',
+                placeReceiptNamePrint: '',
+                polEnName: '',
+                polNamePrint: '',
+                podEnName: '',
+                podNamePrint: '',
+                destinationName: '',
+                destinationNamePrint: '',
+                placeDeliveryName: '',
+                placeDeliveryNamePrint: '',
+                potEnName: '',
+                potNamePrint: '',
             },
             oldForm: {
                 billDate: dateFormat(new Date(), "yyyy-MM-dd") + ' 00:00', // 单据日期 默认 当天
@@ -416,7 +433,19 @@ export default {
                 feeCenterListD: [], // 收
                 feeCenterListC: [], // 付
                 preContainersList: [], // 箱
-                feeCenterAmendList:[]
+                feeCenterAmendList: [],
+                placeReceiptName: '',
+                placeReceiptNamePrint: '',
+                polEnName: '',
+                polNamePrint: '',
+                podEnName: '',
+                podNamePrint: '',
+                destinationName: '',
+                destinationNamePrint: '',
+                placeDeliveryName: '',
+                placeDeliveryNamePrint: '',
+                potEnName: '',
+                potNamePrint: '',
             },
             // 循环的配置
             basicData: {
@@ -517,27 +546,20 @@ export default {
                     ],
                     [
                         {
-                            label: "HB/L NO",  //弹窗点击确认还是取消申请 调后台接口获取到一个编号
-                            prop: "HB/L NO",
-                            type: 'button',
-                            span: 4,
+                            label: "MB/L NO",
+                            text: "请输入MB/L NO",
+                            prop: "mblno",
+                            span: 18,
                             disabled: false,
+
                         },
                         {
-                            label: "",
-                            text: "请输入HB/L NO",
-                            prop: "hblno",
-                            labelWidth: '6px',
-                            span: 14,
-                            disabled: true,
-                        },
-                        {
-                            label: "", // HB/L 付款方式 PP=预付, CC=到付, FPA, Other', 申请之后默认 PP
+                            label: "",  // MB/L 付款方式 PP=预付, CC=到付, FPA, Other
                             text: "请选择付款方式",
-                            prop: "hpaymode",
+                            prop: "mpaymode",
+                            type: 'select',
                             labelWidth: '30px',
                             disabled: false,
-                            type: 'select',
                             span: 6,
                             dicData: [],
                             forParameter: {
@@ -547,6 +569,7 @@ export default {
                             },
                         },
                     ],
+
                     {
                         label: "booking NO", // 订舱号
                         text: "请输入booking NO",
@@ -555,20 +578,27 @@ export default {
                     },
                     [
                         {
-                            label: "MB/L NO",
-                            text: "请输入MB/L NO",
-                            prop: "mblno",
-                            span: 18,
+                            label: "HB/L NO",  //弹窗点击确认还是取消申请 调后台接口获取到一个编号
+                            prop: "HB/L NO",
+                            type: 'button',
+                            span: 4,
                             disabled: false,
-
                         },
                         {
-                            label: "",  // MB/L 付款方式 PP=预付, CC=到付, FPA, Other
+                            label: "",
+                            text: "请输入HB/L NO",
+                            prop: "hblno",
+                            labelWidth: '6px',
+                            span: 14,
+                            disabled: true,
+                        },
+                        {
+                            label: "", // HB/L 付款方式 PP=预付, CC=到付, FPA, Other', 申请之后默认 PP
                             text: "请选择付款方式",
-                            prop: "mpaymode",
-                            type: 'select',
+                            prop: "hpaymode",
                             labelWidth: '30px',
                             disabled: false,
+                            type: 'select',
                             span: 6,
                             dicData: [],
                             forParameter: {
@@ -979,8 +1009,8 @@ export default {
                         if (item.name == this.form.operatorName) {
                             this.$set(this.form, 'accDeptName', item.deptName)
                             this.$set(this.form, 'accDept', item.deptId)
-                            this.$set(this.form,'operatorDept',item.deptId)
-                            this.$set(this.form,'operatorDeptName',item.deptId)
+                            this.$set(this.form, 'operatorDept', item.deptId)
+                            this.$set(this.form, 'operatorDeptName', item.deptId)
                         }
                     }
                 }
@@ -1058,9 +1088,16 @@ export default {
         },
         // 获取业务来源业务员数据
         salesUserGetListfun(account) {
-            userGetList(1, 10, { account }).then(res => {
-                this.columnforfun('srcCnName').dicData = res.data.data.records
-            })
+            if (this.$store.getters.userInfo.tenant_id === "263057") {
+                userGetList(1, 10, { roleId: '业务员' }).then(res => {
+                    this.columnforfun('srcCnName').dicData = res.data.data.records
+                })
+            }else{
+                userGetList(1, 10, { account }).then(res => {
+                    this.columnforfun('srcCnName').dicData = res.data.data.records
+                }) 
+            }
+
         },
         // 获取公司名称 用户管理左侧
         ownDeptLazyTreefun() {
@@ -1211,8 +1248,8 @@ export default {
                     if (item.name == value) {
                         this.form.operatorName = item.name
                         this.form.operatorId = item.id
-                        this.form.operatorDept=item.deptId
-                        this.form.operatorDeptName=item.deptName
+                        this.form.operatorDept = item.deptId
+                        this.form.operatorDeptName = item.deptName
                     }
                 }
             }
@@ -1265,8 +1302,8 @@ export default {
                         this.$set(this.form, 'srcId', item.srcId)
                         this.$set(this.form, 'srcCnName', item.srcCnName)
                         this.$set(this.form, 'srcEnName', item.srcEnName)
-                        this.$set(this.form,'srcDeptId',item.deptId)
-                        this.$set(this.form,'srcDeptName',item.deptName)
+                        this.$set(this.form, 'srcDeptId', item.deptId)
+                        this.$set(this.form, 'srcDeptName', item.deptName)
                         this.columnforfun('srcType').disabled = false
                         this.columnforfun('srcCnName').disabled = false
                         // 航线带出往来单位的优势航线
@@ -1328,8 +1365,8 @@ export default {
                             this.$set(this.form, 'srcId', item.id)
                             this.$set(this.form, 'srcCnName', item.name)
                             this.$set(this.form, 'srcEnName', item.name)
-                            this.$set(this.form,'srcDeptId',item.deptId)
-                            this.$set(this.form,'srcDeptName',item.deptName)
+                            this.$set(this.form, 'srcDeptId', item.deptId)
+                            this.$set(this.form, 'srcDeptName', item.deptName)
                         } else if (this.form.srcType == 'AGENT') {
                             // 代理
                             this.$set(this.form, 'srcId', item.id)
@@ -1659,7 +1696,7 @@ export default {
             this.form.businessTypeCode = 'HYCK'
             delete this.form.extendedData
             // 把拼接的数据拆开 开始 🐒🐒🐒🐒🐒🐒🐒🐒🐒🐒🐒🐒🐒🐒
-            this.searchSplit()
+            // this.searchSplit()
             // 把拼接的数据拆开 结束 💩💩💩💩💩💩💩💩💩💩💩💩💩💩
             // 费用 收 赋值数据
             this.form.feeCenterListD.map((row, index) => {
@@ -1799,7 +1836,7 @@ export default {
             billsCopyBills({ id }).then(res => {
                 this.form = res.data.data;
                 this.pageLoading = false
-                this.searchMontage() // 下拉 中文名称和编号拼接
+                // this.searchMontage() // 下拉 中文名称和编号拼接
                 // 配箱最上面可以编辑
                 for (let item of this.form.containersList) {
                     item.edit = false
@@ -1900,7 +1937,7 @@ export default {
                 this.pleasereviewType = false
             }
             this.pageLoading = false
-            this.searchMontage() // 下拉 中文名称和编号拼接
+            // this.searchMontage() // 下拉 中文名称和编号拼接
             // 配箱最上面可以编辑
             for (let item of this.form.containersList) {
                 item.edit = false
@@ -2163,12 +2200,12 @@ export default {
 
 </script>
 
-<style scoped  lang="scss">
-
-::v-deep .el-tabs--border-card>.el-tabs__content{
-    padding:4px !important;
+<style scoped lang="scss">
+::v-deep .el-tabs--border-card>.el-tabs__content {
+    padding: 4px !important;
 
 }
+
 .scrollable-container {
     height: 84vh;
     /* 设置容器高度 */
@@ -2196,12 +2233,15 @@ export default {
 ::v-deep.el-form-item {
     margin-bottom: 0;
 }
-::v-deep .basic-container .el-card__body{
+
+::v-deep .basic-container .el-card__body {
     padding: 6px 20px;
 }
-::v-deep .el-tabs__header{
+
+::v-deep .el-tabs__header {
     margin: 0 0 5px;
 }
+
 .isShow {
     display: none;
 }

src/views/tirePartsMall/financingManagement/advanceCharge/detailsPage.vue

@@ -0,0 +1,345 @@
+<template>
+    <div>
+        <div class="customer-head">
+            <div class="customer-back">
+                <el-button type="danger" style="border: none;background: none;color: red" icon="el-icon-arrow-left"
+                    @click="goBack(0)">返回列表
+                </el-button>
+            </div>
+            <div class="add-customer-btn">
+                <el-button class="el-button--small-yh" style="margin-left: 6px;" type="primary" size="small"
+                    @click="submit">保 存
+                </el-button>
+            </div>
+        </div>
+        <div style="margin-top: 50px">
+            <trade-card title="基础信息">
+                <avue-form :option="optionForm" v-model="form" ref="form">
+                    <tempalte slot="corpName" slot-scope="{ row }">
+                        <dic-select v-model="form.corpName" placeholder="客户" key="id" label="cnName" res="records"
+                            url="/blade-los/bcorps/listByType?corpTypeName=客户" :filterable="true" :remote="true"
+                            dataName="cnName" @selectChange="dicChange('corpName', $event)"
+                            :disabled="form.advanceChargeItemList.length>0"></dic-select>
+                    </tempalte>
+                    <tempalte slot="advancePaymentBalance">
+                        <el-input-number v-model="form.advancePaymentBalance"
+                            @change="dicChange('advancePaymentBalance', form)" :controls="false" placeholder="请输入 预付款余额"
+                            size="small" style="width: 100%;" :disabled="form.advanceChargeItemList.length>0"></el-input-number>
+                    </tempalte>
+                    <tempalte slot="inOverpayment">
+                        <el-input-number v-model="form.inOverpayment" @change="dicChange('inOverpayment', form)"
+                            :controls="false" placeholder="请输入 增加金额" size="small" style="width: 100%;" :disabled="form.advanceChargeItemList.length>0"></el-input-number>
+                    </tempalte>
+                    <tempalte slot="outOverpaymen">
+                        <el-input-number v-model="form.outOverpaymen" @change="dicChange('outOverpaymen', form)"
+                            :controls="false" placeholder="请输入 消费金额" size="small" style="width: 100%;" :disabled="form.advanceChargeItemList.length>0"></el-input-number>
+                    </tempalte>
+                </avue-form>
+            </trade-card>
+            <trade-card title="预付款明细">
+                <avue-crud :option="option" :data="form.advanceChargeItemList" id="out-table" ref="crud"
+                    @selection-change="selectionChange" @resetColumn="resetColumn('crud', 'option', 'optionBack', 413)"
+                    @saveColumn="saveColumn('crud', 'option', 'optionBack', 413)">
+                    <template slot="orderNo" slot-scope="{ row }">
+                        <span style="color: #1e9fff" @click="rowEdit(row)">{{ row.orderNo }}</span>
+                    </template>
+                    <template slot="billNo" slot-scope="{ row }">
+                        <span style="color: #1e9fff" @click="rowEdit(row)">{{ row.billNo }}</span>
+                    </template>
+                </avue-crud>
+            </trade-card>
+        </div>
+    </div>
+</template>
+
+<script>
+import { submit, getDetail } from "@/api/iosBasicData/advanceCharge";
+import dicSelect from "@/components/dicSelect/main";
+
+import { bfeesList } from "@/api/iosBasicData/bfees";
+import _ from "lodash";
+export default {
+    name: "detailsPage",
+
+    data() {
+        return {
+            form: {
+                status: '0',
+                advanceChargeItemList: []
+            },
+            optionForm: {
+                menuBtn: false,
+                span: 8,
+                column: [
+                    {
+                        label: '客户',
+                        prop: "corpName",
+                        rules: [{
+                            required: true,
+                            message: " ",
+                            trigger: "blur"
+                        }]
+                    },
+                    {
+                        label: "预付款余额",
+                        prop: "advancePaymentBalance",
+                    },
+                    {
+                        label: "增加金额",
+                        prop: "inOverpayment",
+                    },
+                    {
+                        label: "消费金额",
+                        prop: "outOverpaymen",
+                    },
+                    {
+                        label: '备注',
+                        prop: "remarks",
+                        type: 'textarea',
+                        disabled: false,
+                        span: 24,
+                        minRows: 2,
+                    },
+                ]
+            },
+            option: {},
+            optionBack: {
+                height: 'auto',
+                calcHeight: 30,
+                menuWidth: 140,
+                border: true,
+                index: true,
+                addBtn: false,
+                viewBtn: false,
+                editBtn: false,
+                delBtn: false,
+                menu: false,
+                refreshBtn: false,
+                align: 'center',
+                column: [
+                    {
+                        label: "订单号",
+                        prop: "orderNo",
+                        overHidden: true
+                    },
+                    {
+                        label: "提单号",
+                        prop: "billNo",
+                        overHidden: true
+                    },
+                    {
+                        label: "金额",
+                        prop: "overpayment",
+                        overHidden: true
+                    },
+                    {
+                        label: "收款金额",
+                        prop: "amountD",
+                        overHidden: true
+                    },
+                    {
+                        label: "付款金额",
+                        prop: "amountC",
+                        overHidden: true
+                    },
+                    {
+                        label: "消费类型",
+                        prop: "overpaymentType",
+                        type: 'select',
+                        dicData: [{
+                            label: '增加',
+                            value: 0
+                        }, {
+                            label: '消费',
+                            value: 1
+                        }],
+                        overHidden: true
+                    },
+                    {
+                        label: "来源单号",
+                        prop: "srcOrderNo",
+                        overHidden: true
+                    },
+                    {
+                        label: "生成标识",
+                        prop: "identifier",
+                        type: 'select',
+                        dicData: [{
+                            label: '系统生成',
+                            value: 0
+                        }, {
+                            label: '手动添加',
+                            value: 1
+                        }],
+                        overHidden: true
+                    },
+                    {
+                        label: "生成时间",
+                        prop: "createTime",
+                        overHidden: true
+                    },
+                    {
+                        label: "备注",
+                        prop: "remarks",
+                        overHidden: true
+                    }
+                ]
+            },
+        }
+    },
+    components: {
+        dicSelect,
+    },
+    props: {
+        detailData: Object
+    },
+    async created() {
+        this.option = await this.getColumnData(this.getColumnName(413), this.optionBack);
+        if (this.detailData.id) {
+            this.getDetails(this.detailData.id)
+        }
+    },
+    methods: {
+        dicChange(name, row) {
+            if (name == 'corpName') {
+                if (row) {
+                    this.form.corpId = row.id
+                } else {
+                    this.form.corpId = null
+                }
+            }
+            if (name == 'advancePaymentBalance') {
+                row.inOverpayment = _.add(Number(row.advancePaymentBalance ? row.advancePaymentBalance : 0), Number(row.outOverpaymen ? row.outOverpaymen : 0))
+            }
+            if (name == 'inOverpayment') {
+                row.advancePaymentBalance = _.subtract(Number(row.inOverpayment ? row.inOverpayment : 0), Number(row.outOverpaymen ? row.outOverpaymen : 0))
+            }
+            if (name == 'outOverpaymen') {
+                row.inOverpayment = _.add(Number(row.advancePaymentBalance ? row.advancePaymentBalance : 0), Number(row.outOverpaymen ? row.outOverpaymen : 0))
+            }
+        },
+        rowEdit(row) {
+            if (row.overpaymentType == 1) {
+                if (this.$store.getters.firstSetStatus) {
+                    this.$alert("货款收费(T)页面已存在,请关闭货款收费(T)再进行操作", "温馨提示", {
+                        confirmButtonText: "确定",
+                        type: 'warning',
+                        callback: action => {
+                        }
+                    });
+                } else {
+                    this.$router.push({
+                        path: '/tradeAgency/firstSettlement/index',
+                        query: {
+                            billNo: row.srcPid
+                        },
+                    })
+                }
+
+            }
+            if (row.overpaymentType == 0) {
+                if (this.$store.getters.exchangePurStatus) {
+                    this.$alert("货款付费(T)页面已存在,请关闭货款付费(T)再进行操作", "温馨提示", {
+                        confirmButtonText: "确定",
+                        type: 'warning',
+                        callback: action => {
+                        }
+                    });
+                } else {
+                    this.$router.push({
+                        path: '/tradeAgency/exchangePurchasing/index',
+                        query: {
+                            billNo: row.srcPid
+                        },
+                    })
+                }
+            }
+        },
+        getDetails(id) {
+            const loading = this.$loading({
+                lock: true,
+                text: '加载中',
+                spinner: 'el-icon-loading',
+                background: 'rgba(255,255,255,0.7)'
+            });
+            getDetail({ id: id }).then(res => {
+                this.form = res.data.data
+                this.$refs.crud.dicInit();
+            }).finally(() => {
+                loading.close()
+            })
+        },
+        submit() {
+            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();
+                    })
+
+                } else {
+                    return false;
+                }
+            });
+        },
+        //自定义列保存
+        async saveColumn(ref, option, optionBack, code) {
+            const inSave = await this.saveColumnData(this.getColumnName(code), this[option]);
+            if (inSave) {
+                this.$message.success("保存成功");
+                //关闭窗口
+                this.$refs[ref].$refs.dialogColumn.columnBox = false;
+            }
+        },
+        //自定义列重置
+        async resetColumn(ref, option, optionBack, code) {
+            this[option] = this[optionBack];
+            const inSave = await this.delColumnData(this.getColumnName(code), this[optionBack]);
+            if (inSave) {
+                this.$message.success("重置成功");
+                this.$refs[ref].$refs.dialogColumn.columnBox = false;
+            }
+        },
+        goBack(type) {
+            this.$emit("goBack", type);
+            this.$emit('updateKey')
+        },
+    }
+}
+</script>
+
+<style lang="scss" scoped>
+::v-deep .el-form-item {
+    margin-bottom: 8px !important;
+}
+
+::v-deep .el-table .cell {
+    padding: 0 2px !important;
+
+    .el-form-item {
+        margin-bottom: 0px !important;
+    }
+
+}
+
+::v-deep .avue-crud .el-table .el-form-item__label {
+    left: -1px;
+}
+
+::v-deep#out-table .back-one {
+    background: #ecf5ff !important;
+}
+
+::v-deep#out-table .back-two {
+    background: #ecf5ff !important;
+}
+</style>

src/views/tirePartsMall/financingManagement/advanceCharge/index.vue

@@ -0,0 +1,303 @@
+<template>
+    <div>
+        <basic-container v-if="isShow">
+            <avue-crud :option="option" :table-loading="loading" :data="data" :page.sync="page" :search.sync="query"
+                v-model="form" id="out-table" :header-cell-class-name="headerClassName" ref="crud" @row-del="rowDel"
+                @search-change="searchChange" @search-reset="searchReset" @selection-change="selectionChange"
+                @current-change="currentChange" @size-change="sizeChange" @refresh-change="refreshChange"
+                @resetColumn="resetColumn('crud', 'option', 'optionBack', 412)"
+                @saveColumn="saveColumn('crud', 'option', 'optionBack', 412)" @on-load="onLoad">
+                <template slot="menuLeft">
+                    <el-button type="primary" size="small" icon="el-icon-plus" @click="addButton">新 增
+                    </el-button>
+                </template>
+                <tempalte slot="advancePaymentBalance" slot-scope="{ row }">
+                    <el-input-number v-if="row.$cellEdit" v-model="row.advancePaymentBalance" @change="countChange(row)"
+                        :controls="false" placeholder="请输入 单价" size="small" style="width: 100%;"></el-input-number>
+                    <span v-else>{{ row.advancePaymentBalance }}</span>
+                </tempalte>
+                <template slot="menu" slot-scope="{ row, index }">
+                    <el-button size="small" icon="el-icon-edit" type="text" @click="inEdit(row)">{{ row.$cellEdit ? "保存" :
+                        "编辑" }}</el-button>
+                </template>
+                <template slot="corpName" slot-scope="{ row }">
+                    <span style="color: #1e9fff" @click="rowEdit(row)">{{ row.corpName }}</span>
+                </template>
+            </avue-crud>
+        </basic-container>
+        <detailsPage v-if="!isShow" :detailData="detailData" @goBack="goBack"></detailsPage>
+    </div>
+</template>
+  
+<script>
+import { getList, remove, submit } from "@/api/iosBasicData/advanceCharge";
+import detailsPage from "./detailsPage";
+import _ from "lodash";
+
+export default {
+    data() {
+        return {
+            detailData: {},
+            isShow: true,
+            form: {},
+            query: {},
+            loading: false,
+            page: {
+                pageSize: 10,
+                currentPage: 1,
+                total: 0
+            },
+            selectionList: [],
+            option: {},
+            optionBack: {
+                height: 'auto',
+                calcHeight: 30,
+                menuWidth: 120,
+                searchShow: true,
+                searchMenuSpan: 18,
+                border: true,
+                index: true,
+                addBtn: false,
+                viewBtn: false,
+                editBtn: false,
+                delBtn: false,
+                searchIcon: true,
+                searchIndex: 3,
+                column: [
+                    {
+                        label: "客户名称",
+                        prop: "corpId",
+                        width: "200",
+                        overHidden: true,
+                        search: true,
+                        type: 'select',
+                        filterable: true,
+                        remote: true,
+                        dicUrl: "/api/blade-los/bcorps/listByType?cnName={{key}}",
+                        props: {
+                            label: 'cnName',
+                            value: 'id',
+                            res: 'data.records'
+                        },
+                        hide: true,
+                        showColumn: false,
+                        searchOrder: 1,
+                    },
+                    {
+                        label: "客户名称",
+                        prop: "corpName",
+                        width: "200",
+                        overHidden: true,
+                    },
+                    {
+                        label: "预付款余额",
+                        prop: "advancePaymentBalance",
+                        overHidden: true,
+                    },
+                    {
+                        label: "增加金额",
+                        prop: "inOverpayment",
+                        overHidden: true
+                    },
+                    {
+                        label: "消费金额",
+                        prop: "outOverpaymen",
+                        overHidden: true
+                    },
+                    {
+                        label: "备注",
+                        prop: "remarks",
+                        overHidden: true
+                    }
+                ]
+            },
+            data: [],
+        };
+    },
+    components: {
+        detailsPage,
+    },
+    async created() {
+        this.option = await this.getColumnData(this.getColumnName(412), this.optionBack);
+    },
+    activated() {
+        this.$nextTick(() => {
+            this.$refs.crud.doLayout();
+            this.$refs.crud.dicInit();
+        });
+    },
+    methods: {
+        addButton() {
+            this.isShow = false
+        },
+        rowEdit(row) {
+            this.detailData = {
+                id: row.id
+            };
+            this.isShow = false
+        },
+        rowDel(row) {
+            if (row.status == 1) {
+                this.$confirm("确定将选择数据删除?", {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "warning"
+                })
+                    .then(() => {
+                        return remove({ ids: row.id }).then(() => {
+                            this.onLoad(this.page);
+                            this.$message({
+                                type: "success",
+                                message: "删除成功!"
+                            });
+                        });
+                    })
+
+            } else {
+                this.$message({
+                    message: '非禁用状态无法删除',
+                    type: 'warning'
+                });
+            }
+        },
+        // 编辑
+        inEdit(row) {
+            if (row.$cellEdit == true) {
+                this.loading = true;
+                submit(row).then(res => {
+                    this.$message({
+                        type: "success",
+                        message: "修改成功!"
+                    });
+                    this.onLoad(this.page, this.query);
+                }).finally(() => {
+                    this.loading = false;
+                })
+                this.$set(row, '$cellEdit', false)
+            } else {
+                this.$set(row, '$cellEdit', true)
+            }
+
+        },
+        countChange(row) {
+            row.inOverpayment = _.add(Number(row.advancePaymentBalance ? row.advancePaymentBalance : 0), Number(row.outOverpaymen ? row.outOverpaymen : 0))
+        },
+        searchReset() {
+            this.query = this.$options.data().query;
+            this.onLoad(this.page);
+        },
+        // 搜索按钮点击
+        searchChange(params, done) {
+            this.page.currentPage = 1;
+            this.onLoad(this.page, this.query);
+            done();
+        },
+        selectionChange(list) {
+            this.selectionList = list;
+        },
+        currentChange(currentPage) {
+            this.page.currentPage = currentPage;
+        },
+        sizeChange(pageSize) {
+            this.page.pageSize = pageSize;
+        },
+        refreshChange() {
+            this.onLoad(this.page, this.query);
+        },
+        onLoad(page, params = {}) {
+            let obj = {}
+            obj = {
+                ...Object.assign(params, this.query),
+            }
+            console.log(obj)
+            this.loading = true;
+            getList(page.currentPage, page.pageSize, obj).then(res => {
+                this.data = res.data.data.records;
+                this.page.total = res.data.data.total;
+                this.$nextTick(() => {
+                    this.$refs.crud.doLayout();
+                    this.$refs.crud.dicInit();
+                });
+            }).finally(() => {
+                this.loading = false;
+            })
+
+        },
+        // 详情的返回列表
+        goBack() {
+            // 初始化数据
+            // if (JSON.stringify(this.$route.query) != "{}") {
+            //     this.$router.$avueRouter.closeTag();
+            //     this.$router.push({
+            //         path: "/iosBasicData/accounts/index"
+            //     });
+            // }
+            this.detailData = {}
+            this.isShow = true;
+            this.onLoad(this.page, this.search);
+        },
+        //自定义列保存
+        async saveColumn(ref, option, optionBack, code) {
+            /**
+             * 已定义全局方法，直接使用，saveColumnData保存列数据方法,参数传值(表格名称，当前表格的option数据)
+             * 已定义全局方法，直接使用，getColumnName方法用来获取枚举值，参数根据自己定义的code值获取中文名
+             * 一定要执行异步操作，要等接口成功返回，才能执行下一行代码
+             */
+            const inSave = await this.saveColumnData(this.getColumnName(code), this[option]);
+            if (inSave) {
+                this.$message.success("保存成功");
+                //关闭窗口
+                this.$refs[ref].$refs.dialogColumn.columnBox = false;
+                this.searchReset()
+            }
+        },
+        //自定义列重置
+        async resetColumn(ref, option, optionBack, code) {
+            this[option] = this[optionBack];
+            const inSave = await this.delColumnData(this.getColumnName(code), this[optionBack]);
+            if (inSave) {
+                this.$message.success("重置成功");
+                this.$refs[ref].$refs.dialogColumn.columnBox = false;
+                this.searchReset()
+            }
+        },
+        // 更改表格颜色
+        headerClassName(tab) {
+            //颜色间隔
+            let back = ""
+            if (tab.columnIndex >= 0 && tab.column.level === 1) {
+                if (tab.columnIndex % 2 === 0) {
+                    back = "back-one"
+                } else if (tab.columnIndex % 2 === 1) {
+                    back = "back-two"
+                }
+            }
+            return back;
+        },
+
+    }
+}
+
+</script>
+  
+<style scoped>
+::v-deep#out-table .back-one {
+    background: #ecf5ff !important;
+    text-align: center;
+}
+
+::v-deep#out-table .back-two {
+    background: #ecf5ff !important;
+    text-align: center;
+}
+
+.pointerClick {
+    cursor: pointer;
+    color: #1e9fff;
+}
+
+::v-deep .el-col-md-8 {
+    width: 24.33333%;
+}
+</style>
+  

src/views/tradeAgency/oceanFreightImport/detailsPage.vue

@@ -12,7 +12,7 @@
                 </el-button>
                 <el-button class="el-button--small-yh" style="margin-left: 6px;" type="primary" size="small"
                     v-if="editButton"
-                    :disabled="showLock || !(roleName.indexOf('admin') != -1 || roleName.indexOf('允许修改他人业务') != -1 || saberUserInfo.user_id == form.createUser)"
+                    :disabled="showLock || !(roleName.indexOf('admin') != -1 || roleName.indexOf('允许修改他人业务') != -1 || saberUserInfo.user_id == form.createUser|| saberUserInfo.user_name == form.operatorName)"
                     @click="inEdit">编 辑
                 </el-button>
                 <el-button class="el-button--small-yh" v-else style="margin-left: 6px;" type="primary" size="small"

src/views/tradeAgency/oceanFreightImport/index.vue

@@ -315,7 +315,7 @@ export default {
                     },
                     {
                         label: "品名",
-                        prop: "commodityCnName",
+                        prop: "commodityDescr",
                         width: "120",
                         overHidden: true
                     },

src/views/tradeAgency/tradeAgency/detailsPage.vue

@@ -189,7 +189,8 @@
                         </div>
                     </tempalte>
                     <tempalte slot="remarks">
-                        <el-input type="textarea" :rows="2" placeholder="请输入 备注" v-model="form.remarks" :disabled="editButton">
+                        <el-input type="textarea" :rows="2" placeholder="请输入 备注" v-model="form.remarks"
+                            :disabled="editButton">
                         </el-input>
                     </tempalte>
                 </avue-form>
@@ -405,9 +406,9 @@
             v-dialog-drag>
             <avue-form v-model="hdForm" :option="hdOption">
                 <tempalte slot="operatorName">
-                    <dic-select v-model="hdForm.operatorName" placeholder="操作员" key="id" label="realName"
-                            res="records" url="/blade-user/page" :filterable="true" :remote="true" dataName="realName"
-                            @selectChange="dicChange('operatorName', $event)"></dic-select>
+                    <dic-select v-model="hdForm.operatorName" placeholder="操作员" key="id" label="realName" res="records"
+                        url="/blade-user/page?roleId='操作员'" :filterable="true" :remote="true" dataName="realName"
+                        @selectChange="dicChange('operatorName', $event)"></dic-select>
                 </tempalte>
             </avue-form>
             <span slot="footer" class="dialog-footer">
@@ -415,6 +416,36 @@
                 <el-button size="mini" type="primary" @click="hdSubmit">提 交</el-button>
             </span>
         </el-dialog>
+        <el-dialog append-to-body title="首款账单" class="el-dialogDeep" :visible.sync="skDialog" width="400px" top="30vh"
+            :close-on-click-modal="false" :destroy-on-close="true" :close-on-press-escape="false" @closed="skClosed"
+            v-dialog-drag>
+            <avue-form v-model="skForm" :option="skOption">
+                <tempalte slot="contractDate" slot-scope="{ row }">
+                    <el-date-picker v-model="skForm.contractDate" type="date" placeholder="请选择 合同日期" format="yyyy-MM-dd"
+                        valueFormat="yyyy-MM-dd 00:00:00" @change="skChange()">
+                    </el-date-picker>
+                </tempalte>
+            </avue-form>
+            <span slot="footer" class="dialog-footer">
+                <el-button size="mini" @click="skDialog = false">取 消</el-button>
+                <el-button size="mini" type="primary" @click="skSubmit">提 交</el-button>
+            </span>
+        </el-dialog>
+        <el-dialog append-to-body :title="skType == 1 ? '首款账单' : '生成首款应付'" class="el-dialogDeep"
+            :visible.sync="skDialog" width="400px" top="30vh" :close-on-click-modal="false" :destroy-on-close="true"
+            :close-on-press-escape="false" @closed="skClosed" v-dialog-drag>
+            <avue-form v-model="skForm" :option="skOption">
+                <tempalte slot="contractDate" slot-scope="{ row }">
+                    <el-date-picker v-model="skForm.contractDate" type="date" placeholder="请选择 合同日期" format="yyyy-MM-dd"
+                        valueFormat="yyyy-MM-dd 00:00:00" @change="skChange()">
+                    </el-date-picker>
+                </tempalte>
+            </avue-form>
+            <span slot="footer" class="dialog-footer">
+                <el-button size="mini" @click="skDialog = false">取 消</el-button>
+                <el-button size="mini" type="primary" @click="skSubmit(skType)">提 交</el-button>
+            </span>
+        </el-dialog>
         <dictbiz-dialog ref="dictbiz" :title="dicTitle" :code="dicCode" :parentId="parentId" @closed="getAllWorkDicts">
         </dictbiz-dialog>
     </div>
@@ -439,6 +470,8 @@ export default {
 
     data() {
         return {
+            skType: 1,
+            skDialog: false,
             hdDialog: false,
             hdForm: {},
             dicTitle: null,
@@ -448,6 +481,33 @@ export default {
             wkForm: {
                 agentItemsRList: []
             },
+            skOption: {
+                menuBtn: false,
+                span: 24,
+                disabled: false,
+                column: [
+                    {
+                        label: '币别',
+                        prop: 'currency',
+                        disabled: true,
+                    },
+                    {
+                        label: '账单金额',
+                        prop: 'prepaidAmount',
+                        disabled: true,
+                    },
+                    {
+                        label: '汇率日期',
+                        prop: 'contractDate',
+                        disabled: false,
+                    },
+                    {
+                        label: '汇率',
+                        prop: 'exchangeRate',
+                        disabled: false,
+                    },
+                ]
+            },
             hdOption: {
                 menuBtn: false,
                 span: 24,
@@ -1765,6 +1825,15 @@ export default {
                 this.$message.error("未生成货代");
             }
         },
+        skChange() {
+            bcurrencyGetExrate({ date: this.skForm.contractDate, dc: 'D' }).then(res => {
+                res.data.data.forEach(e => {
+                    if (this.form.currency == e.code) {
+                        this.skForm.exchangeRate = e.exrate
+                    }
+                })
+            })
+        },
         allClick(name) {
             if (name == '一键保存') {
                 for (let row of this.form.agentItemsList) {
@@ -1782,29 +1851,41 @@ export default {
                 }
             }
             if (name == '首款账单') {
+                this.skType = 1
                 // if (!this.form.domesticConsigneeCname) return this.$message.error("请选择国内收货人");
                 bcurrencyGetExrate({ date: this.form.contractDate, dc: 'D' }).then(res => {
                     res.data.data.forEach(e => {
                         if (this.form.currency == e.code) {
-                            this.$prompt('账单金额(' + this.form.currency + ')：' + this.form.prepaidAmount + '<br/>请输入汇率', '首款账单', {
-                                confirmButtonText: '确定',
-                                cancelButtonText: '取消',
-                                inputValue: e.exrate,
-                                dangerouslyUseHTMLString: true,
-                                closeOnClickModal: false,
-                            }).then(({ value }) => {
-                                let obj = {}
-                                obj = {
-                                    ...this.form,
-                                    exchangeRate: value
-                                }
-                                generateDownPaymentBill(obj).then(res => {
-                                    this.$message.success("成功生成首款账单");
-                                    this.getDetails(this.form.id)
-                                })
-                            })
+                            this.skForm = {
+                                contractDate: this.form.contractDate,
+                                currency: this.form.currency,
+                                prepaidAmount: this.form.prepaidAmount,
+                                exchangeRate: e.exrate
+                            }
+                            this.skDialog = true
                         }
                     })
+                    //     res.data.data.forEach(e => {
+                    //         if (this.form.currency == e.code) {
+                    //             this.$prompt('账单金额(' + this.form.currency + ')：' + this.form.prepaidAmount + '<br/>请输入汇率', '首款账单', {
+                    //                 confirmButtonText: '确定',
+                    //                 cancelButtonText: '取消',
+                    //                 inputValue: e.exrate,
+                    //                 dangerouslyUseHTMLString: true,
+                    //                 closeOnClickModal: false,
+                    //             }).then(({ value }) => {
+                    //                 let obj = {}
+                    //                 obj = {
+                    //                     ...this.form,
+                    //                     exchangeRate: value
+                    //                 }
+                    //                 generateDownPaymentBill(obj).then(res => {
+                    //                     this.$message.success("成功生成首款账单");
+                    //                     this.getDetails(this.form.id)
+                    //                 })
+                    //             })
+                    //         }
+                    //     })
                 })
             }
             if (name == '尾款账单') {
@@ -1834,31 +1915,45 @@ export default {
                 this.wkType = name
             }
             if (name == '生成首款应付') {
-                // if (this.form.applyForPayment == 1) return this.$message.error("请勿重复生成");
+                this.skType = 2
                 bcurrencyGetExrate({ date: this.form.contractDate, dc: 'D' }).then(res => {
                     res.data.data.forEach(e => {
                         if (this.form.currency == e.code) {
-                            this.$prompt('账单金额(' + this.form.currency + ')：' + this.form.prepaidAmount + '<br/>请输入汇率', '生成首款应付', {
-                                confirmButtonText: '确定',
-                                cancelButtonText: '取消',
-                                inputValue: e.exrate,
-                                dangerouslyUseHTMLString: true,
-                                closeOnClickModal: false,
-                            }).then(({ value }) => {
-                                let obj = {}
-                                obj = {
-                                    id: this.form.id,
-                                    exchangeRate: value,
-                                    paidApplication: 'FFSQ-SK'
-                                }
-                                generatePayment(obj).then(res => {
-                                    this.$message.success("生成首款应付成功");
-                                    this.getDetails(this.form.id)
-                                })
-                            })
+                            this.skForm = {
+                                contractDate: this.form.contractDate,
+                                currency: this.form.currency,
+                                prepaidAmount: this.form.prepaidAmount,
+                                exchangeRate: e.exrate
+                            }
+                            this.skDialog = true
                         }
                     })
                 })
+                // if (this.form.applyForPayment == 1) return this.$message.error("请勿重复生成");
+                // bcurrencyGetExrate({ date: this.form.contractDate, dc: 'D' }).then(res => {
+                //     res.data.data.forEach(e => {
+                //         if (this.form.currency == e.code) {
+                //             this.$prompt('账单金额(' + this.form.currency + ')：' + this.form.prepaidAmount + '<br/>请输入汇率', '生成首款应付', {
+                //                 confirmButtonText: '确定',
+                //                 cancelButtonText: '取消',
+                //                 inputValue: e.exrate,
+                //                 dangerouslyUseHTMLString: true,
+                //                 closeOnClickModal: false,
+                //             }).then(({ value }) => {
+                //                 let obj = {}
+                //                 obj = {
+                //                     id: this.form.id,
+                //                     exchangeRate: value,
+                //                     paidApplication: 'FFSQ-SK'
+                //                 }
+                //                 generatePayment(obj).then(res => {
+                //                     this.$message.success("生成首款应付成功");
+                //                     this.getDetails(this.form.id)
+                //                 })
+                //             })
+                //         }
+                //     })
+                // })
 
             }
             if (name == '生成尾款应付') {
@@ -2056,6 +2151,49 @@ export default {
                 }
             });
         },
+        skSubmit(type) {
+
+            if (type == 1) {
+                let obj = {}
+                obj = {
+                    ...this.form,
+                    exchangeRate: this.skForm.exchangeRate
+                }
+                const loading = this.$loading({
+                    lock: true,
+                    text: '加载中',
+                    spinner: 'el-icon-loading',
+                    background: 'rgba(255,255,255,0.7)'
+                });
+                generateDownPaymentBill(obj).then(res => {
+                    this.$message.success("成功生成首款账单");
+                    this.skDialog = false
+                    this.getDetails(this.form.id)
+                }).finally(() => {
+                    loading.close();
+                })
+            } else {
+                let obj = {}
+                obj = {
+                    id: this.form.id,
+                    exchangeRate: this.skForm.exchangeRate,
+                    paidApplication: 'FFSQ-SK'
+                }
+                const loading = this.$loading({
+                    lock: true,
+                    text: '加载中',
+                    spinner: 'el-icon-loading',
+                    background: 'rgba(255,255,255,0.7)'
+                });
+                generatePayment(obj).then(res => {
+                    this.$message.success("生成首款应付成功");
+                    this.getDetails(this.form.id)
+                }).finally(() => {
+                    loading.close();
+                })
+            }
+
+        },
         hdSubmit() {
             let obj = {
                 ...this.form,
@@ -2104,6 +2242,10 @@ export default {
         hdClosed() {
             this.hdForm = this.$options.data().hdForm
         },
+        skClosed() {
+            this.skForm = this.$options.data().skForm
+            this.skType = 1
+        },
         application() {
             // if (this.form.downPayment != 1) return this.$message.error("未申请首款账单");
             // if (this.form.balancePayment != 1) return this.$message.error("未申请尾款账单");