Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/lang/en.js

src/lang/en.js

@@ -132,7 +132,6 @@ export default {
         businessSource:'businessSource',
         businessName:'businessName',
         scndesc:'scndesc',
-        auditStatus:'auditStatus',
         feeStatus:'feeStatus',
         sourceBillNo:'sourceBillNo',
         debitStatus:'debitStatus',

src/lang/zh.js

@@ -172,6 +172,7 @@ export default {
     billStatus:'业务状态',
     bookStatus:'订舱状态',
     financeStatus:'财务状态',
+    auditStatus:'审核状态',
     remarks:'备注',
     orderInfo:'委托信息',
     info:'信息',

src/util/exchangeRate.js

@@ -65,7 +65,7 @@ export async function checkRate(curCode, date, dc, type, deptId) {
 export function getExchangeRate(curCode, dc, type) {
     for (let item of this.getCheckRate()) {
         if (item.code == curCode) {
-            console.log(item.code , curCode)
+            console.log(item.code , curCode,item.exrateReceipts)
             if (type == 1 && dc == 'D') return item.exrateReceivable
             if (type == 1 && dc == 'C') return item.exratePayable
             if (type == 2 && dc == 'D') return item.exrateReceipts

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

@@ -1585,6 +1585,7 @@ export default {
             idArr: [],
             updateSearchKey: new Date().getTime(),
             dc: null,
+            expenseApplication: 0,
         }
     },
     async created() {
@@ -1602,8 +1603,8 @@ export default {
         this.roleName = localStorage.getItem('roleName').split(',') // 获取角色数据
         console.log("roleName", this.roleName)
         this.isAdmin = this.roleName.indexOf('admin') >= 0;
-        this.isFeeViewD = this.isAdmin || this.roleName.indexOf('应收查看') >= 0;
-        this.isFeeViewC = this.isAdmin || this.roleName.indexOf('应付查看') >= 0;
+        this.isFeeViewD = this.isAdmin || this.roleName.indexOf('应收查看') >= 0|| this.roleName.indexOf('国外费用') >= 0;
+        this.isFeeViewC = this.isAdmin || this.roleName.indexOf('应付查看') >= 0|| this.roleName.indexOf('国外费用') >= 0;
         this.isFeeView = this.isAdmin || this.isFeeViewD || this.isFeeViewC;
         this.isFeeEditD = this.isAdmin || this.isFeeViewD && this.roleName.indexOf('应收修改') >= 0;
         this.isFeeEditC = this.isAdmin || this.isFeeViewC && this.roleName.indexOf('应付修改') >= 0;
@@ -1616,6 +1617,11 @@ export default {
         this.templateOption = await this.getColumnData(this.getColumnName(309.5), this.templateOptionBack);
         this.getBcorpsListfun() // 获取客户数据
         this.paymodeWorkDictsfun() // 获取预付/到付数据
+        isProcurement({ "param": "expense.application" }).then(res => {
+            if (res.data.data) {
+                this.expenseApplication = res.data.data
+            }
+        })
     },
     methods: {
         updateDetail() {
@@ -2100,6 +2106,9 @@ export default {
                     obj.shortName = this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length -
                         1]
                         .shortName
+                    obj.generationCorpId = this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length - 1].bookingAgentId
+                    obj.generationCorpEnName = this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length - 1].bookingAgentEnName
+                    obj.generationCorpCnName = this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length - 1].bookingAgentCnName
                     // // 费用简称
                     // obj.feeId = this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length - 1].feeId
                     // obj.feeCnName = this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length - 1].feeCnName
@@ -2142,6 +2151,9 @@ export default {
                     obj.paymode = this.assemblyForm.mpaymode
                     getBcorpsDetail(this.assemblyForm.corpId).then(res => {
                         obj.shortName = res.data.data.shortName
+                        obj.generationCorpId = res.data.data.bookingAgentId
+                        obj.generationCorpEnName = res.data.data.bookingAgentEnName
+                        obj.generationCorpCnName = res.data.data.bookingAgentCnName
                         this.assemblyForm.feeCenterListD.push(obj)
                     })
                 }
@@ -3365,7 +3377,7 @@ export default {
                     if (row.auditStatus == 0) {
                         return this.$message.error("未申请费用，不允许撤销");
                     }
-                    if (row.auditStatus > 2) {
+                    if (row.auditStatus > 2 && this.expenseApplication == 1) {
                         return this.$message.error("费用已经审核通过,请使用申请修改和删除功能!");
                     }
                 }
@@ -3464,7 +3476,7 @@ export default {
                     if (row.auditStatus == 0) {
                         return this.$message.error("未申请费用，不允许撤销");
                     }
-                    if (row.auditStatus > 2) {
+                    if (row.auditStatus > 2 && this.expenseApplication == 1) {
                         return this.$message.error("费用已经审核通过,请使用申请修改和删除功能!");
                     }
                 }

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

@@ -451,7 +451,7 @@
                 </el-tab-pane>
 
                 <el-tab-pane label="费用信息" name="fy" class="scrollable-container"
-                    v-if="(roleName.includes('admin') || roleName.includes('secondaryAdmin') || roleName.includes('应收修改') || roleName.includes('应付修改') || roleName.includes('应收查看') || roleName.includes('应付查看'))">
+                    v-if="(roleName.includes('admin') || roleName.includes('secondaryAdmin') || roleName.includes('应收修改') || roleName.includes('应付修改') || roleName.includes('应收查看') || roleName.includes('应付查看'))||roleName.includes('国外费用')">
                     <feecenter :assemblyForm="form" :copyFormData="copyFormData" :detailData="detailData"
                         :disabled="detailData.seeDisabled || showLock" :showLock="showLock"
                         :pleasereviewType="pleasereviewType" :pid="form.id" @billsDetailfun="billsDetailfun(form.id)">

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

@@ -7,7 +7,7 @@
                     <el-col :span="6">
                         <el-form-item label="客户名称" prop="corpCnName">
                             <span slot="label">
-                                <span style="color: #1e9fff">{{$t("sea118n.corpName")}}</span>
+                                <span style="color: #1e9fff">{{ $t("sea118n.corpName") }}</span>
                             </span>
                             <el-input type="age" style="width: 100%;" v-model="assemblyForm.corpCnName" size="small"
                                 autocomplete="off" disabled clearable placeholder="客户名称"></el-input>
@@ -16,7 +16,7 @@
                     <el-col :span="6">
                         <el-form-item label="提单号" prop="mblno">
                             <span slot="label">
-                                <span style="color: #1e9fff">{{$t("sea118n.mblno")}}</span>
+                                <span style="color: #1e9fff">{{ $t("sea118n.mblno") }}</span>
                             </span>
                             <el-input type="age" style="width: 100%;" v-model="assemblyForm.mblno" size="small"
                                 autocomplete="off" disabled clearable placeholder="提单号"></el-input>
@@ -25,7 +25,7 @@
                     <el-col :span="6">
                         <el-form-item label="箱型箱量" prop="containers">
                             <span slot="label">
-                                <span style="color: #1e9fff">{{$t("sea118n.ctnrTypeQty")}}</span>
+                                <span style="color: #1e9fff">{{ $t("sea118n.ctnrTypeQty") }}</span>
                             </span>
                             <el-input type="age" style="width: 100%;" v-model="assemblyForm.quantityCntrDescr"
                                 size="small" autocomplete="off" disabled clearable placeholder="箱型箱量"></el-input>
@@ -34,7 +34,7 @@
                     <el-col :span="6">
                         <el-form-item label="HB/L NO" prop="hblno">
                             <span slot="label">
-                                <span style="color: #1e9fff">{{$t("sea118n.hblno")}}</span>
+                                <span style="color: #1e9fff">{{ $t("sea118n.hblno") }}</span>
                             </span>
                             <el-input type="age" style="width: 100%;" v-model="assemblyForm.hblno" size="small"
                                 autocomplete="off" disabled clearable placeholder="HB/L NO"></el-input>
@@ -53,11 +53,11 @@
                 <template slot="menuLeft">
                     <div style="display: inline-block;margin-right: 20px" class="disabledBox fontSize">
                         <i class="el-icon-coin"></i>
-                        <span>{{$t("sea118n.debit")}}</span>
+                        <span>{{ $t("sea118n.debit") }}</span>
                     </div>
                     <el-button v-if="isFeeEditD" type="danger" plain size="small"
-                        :disabled="!selectionDList.length || disabled"
-                        @click="batchDelete('D')">{{$t("btn118n.deleted")}}
+                        :disabled="!selectionDList.length || disabled" @click="batchDelete('D')">{{
+                            $t("btn118n.deleted") }}
                     </el-button>
                     <!-- <el-button v-if="isFeeEditD" type="success" plain size="small"
                         :disabled="!selectionDList.length || disabled || pleasereviewType"
@@ -67,29 +67,31 @@
                         :disabled="!selectionDList.length || disabled || pleasereviewType"
                         @click="RevokingBillsfun('D')">撤销账单
                     </el-button> -->
-                    <el-button type="primary" plain size="small" @click="printingCostsfun('D')">{{$t("btn118n.printBill")}}</el-button>
+                    <el-button type="primary" plain size="small" @click="printingCostsfun('D')">{{
+                        $t("btn118n.printBill") }}</el-button>
                     <el-button v-if="isFeeEditD" type="success" plain size="small"
-                        :disabled="!this.assemblyForm.id || disabled || pleasereviewType"
-                        @click="templateClick('D')">{{$t("btn118n.debitTemplate")}}</el-button>
+                        :disabled="!this.assemblyForm.id || disabled || pleasereviewType" @click="templateClick('D')">{{
+                            $t("btn118n.debitTemplate") }}</el-button>
                     <el-button v-if="isFeeEditD" type="info" plain size="small" :disabled="disabled"
-                        @click="feecenterSubmitListfun">{{$t("btn118n.save")}}</el-button>
+                        @click="feecenterSubmitListfun">{{ $t("btn118n.save") }}</el-button>
                     <el-button v-if="isFeeEditD" type="info" plain size="small" :disabled="disabled"
-                        @click="feecenterEditfun('D')">{{$t("btn118n.edit")}}
+                        @click="feecenterEditfun('D')">{{ $t("btn118n.edit") }}
                     </el-button>
                     <el-button v-if="isFeeEditC" type="primary" plain size="small"
-                        :disabled="disabled || pleasereviewType" @click="copyfun('D')">{{$t("btn118n.toCredit")}}</el-button>
-                    <el-button v-if="isFeeEditD" type="primary" plain size="small"
-                         @click="allClick('发票申请', 'D')">{{$t("btn118n.applyInvoice")}}</el-button>
+                        :disabled="disabled || pleasereviewType" @click="copyfun('D')">{{ $t("btn118n.toCredit")
+                        }}</el-button>
+                    <el-button v-if="isFeeEditD" type="primary" plain size="small" @click="allClick('发票申请', 'D')">{{
+                        $t("btn118n.applyInvoice") }}</el-button>
                     <el-button type="primary" plain size="small" :disabled="disabled || selectionDList.length == 0"
-                        @click="allClick('D费用申请')">{{$t("btn118n.applyFee")}}</el-button>
+                        @click="allClick('D费用申请')">{{ $t("btn118n.applyFee") }}</el-button>
                     <el-button type="danger" plain size="small" :disabled="disabled || selectionDList.length == 0"
-                        @click="allClick('D撤销请核')">{{$t("btn118n.unApplyFee")}}</el-button>
-                    <el-button type="primary" plain size="small" :disabled="selectionDList.length != 1||showLock"
-                        @click="allClick('D申请修改')">{{$t("btn118n.applyModify")}}</el-button>
-                    <el-button type="success" plain size="small" :disabled="selectionDList.length != 1||showLock"
-                        @click="allClick('D申请删除')">{{$t("btn118n.applyDelete")}}</el-button>
-                    <el-button type="danger" plain size="small" :disabled="selectionDList.length != 1||showLock"
-                        @click="allClick('D取消申请')">{{$t("btn118n.unAplly")}}</el-button>
+                        @click="allClick('D撤销请核')">{{ $t("btn118n.unApplyFee") }}</el-button>
+                    <el-button type="primary" plain size="small" :disabled="selectionDList.length != 1 || showLock"
+                        @click="allClick('D申请修改')">{{ $t("btn118n.applyModify") }}</el-button>
+                    <el-button type="success" plain size="small" :disabled="selectionDList.length != 1 || showLock"
+                        @click="allClick('D申请删除')">{{ $t("btn118n.applyDelete") }}</el-button>
+                    <el-button type="danger" plain size="small" :disabled="selectionDList.length != 1 || showLock"
+                        @click="allClick('D取消申请')">{{ $t("btn118n.unAplly") }}</el-button>
                 </template>
                 <template slot="indexHeader" slot-scope="scope">
                     <el-button v-if="isFeeEditD" type="primary" size="small" icon="el-icon-plus" circle
@@ -215,11 +217,11 @@
                 <template slot="menuLeft">
                     <div style="display: inline-block;margin-right: 20px" class="disabledBox meetSize">
                         <i class="el-icon-coin"></i>
-                        <span>{{$t("sea118n.credit")}}</span>
+                        <span>{{ $t("sea118n.credit") }}</span>
                     </div>
                     <el-button v-if="isFeeEditC" type="danger" plain size="small"
-                        :disabled="!selectionCList.length || disabled"
-                        @click="batchDelete('C')">{{$t("btn118n.deleted")}}
+                        :disabled="!selectionCList.length || disabled" @click="batchDelete('C')">{{
+                            $t("btn118n.deleted") }}
                     </el-button>
                     <!-- <el-button v-if="isFeeEditC" type="primary" plain size="small"
                         :disabled="!selectionCList.length || disabled || pleasereviewType"
@@ -229,34 +231,35 @@
                         :disabled="!selectionCList.length || disabled || pleasereviewType"
                         @click="RevokingBillsfun('C')">撤销账单
                     </el-button> -->
-                    <el-button type="primary" plain size="small" @click="printingCostsfun('C')">{{$t("btn118n.printBill")}}</el-button>
+                    <el-button type="primary" plain size="small" @click="printingCostsfun('C')">{{
+                        $t("btn118n.printBill") }}</el-button>
                     <el-button v-if="isFeeEditC" type="success" plain size="small"
-                        :disabled="!this.assemblyForm.id || disabled || pleasereviewType"
-                        @click="templateClick('C')">{{$t("btn118n.creditTemplate")}}
+                        :disabled="!this.assemblyForm.id || disabled || pleasereviewType" @click="templateClick('C')">{{
+                            $t("btn118n.creditTemplate") }}
                     </el-button>
                     <el-button v-if="isFeeEditC" type="info" plain size="small" :disabled="disabled"
-                        @click="feecenterSubmitListfun">{{$t("btn118n.save")}}
+                        @click="feecenterSubmitListfun">{{ $t("btn118n.save") }}
                     </el-button>
                     <el-button v-if="isFeeEditC" type="info" plain size="small" :disabled="disabled"
-                        @click="feecenterEditfun('C')">{{$t("btn118n.edit")}}
+                        @click="feecenterEditfun('C')">{{ $t("btn118n.edit") }}
                     </el-button>
                     <el-button v-if="isFeeEditC" type="primary" plain size="small"
-                        :disabled="disabled || pleasereviewType" @click="copyfun('C')">{{$t("btn118n.applyPay")}}
+                        :disabled="disabled || pleasereviewType" @click="copyfun('C')">{{ $t("btn118n.toDebit") }}
                     </el-button>
-                    <el-button type="info" plain size="small"
-                        @click="allClick('付费申请', 'C')">{{$t("btn118n.applyPay")}}</el-button>
+                    <el-button type="info" plain size="small" @click="allClick('付费申请', 'C')">{{ $t("btn118n.applyPay")
+                    }}</el-button>
                     <el-button type="primary" plain size="small" :disabled="disabled || selectionCList.length == 0"
-                        @click="allClick('C费用申请')">{{$t("btn118n.applyFee")}}</el-button>
+                        @click="allClick('C费用申请')">{{ $t("btn118n.applyFee") }}</el-button>
                     <el-button type="danger" plain size="small" :disabled="disabled || selectionCList.length == 0"
-                        @click="allClick('C撤销请核')">{{$t("btn118n.unApplyFee")}}</el-button>
+                        @click="allClick('C撤销请核')">{{ $t("btn118n.unApplyFee") }}</el-button>
                     <!-- <el-button type="success" plain size="small" :disabled="disabled"
                         @click="allClick('提取成本')">提取成本</el-button> -->
-                    <el-button type="primary" plain size="small" :disabled="selectionCList.length != 1||showLock"
-                        @click="allClick('C申请修改')">{{$t("btn118n.applyModify")}}</el-button>
-                    <el-button type="success" plain size="small" :disabled="selectionCList.length != 1||showLock"
-                        @click="allClick('C申请删除')">{{$t("btn118n.applyDelete")}}</el-button>
-                    <el-button type="danger" plain size="small" :disabled="selectionCList.length != 1||showLock"
-                        @click="allClick('C取消申请')">{{$t("btn118n.unAplly")}}</el-button>
+                    <el-button type="primary" plain size="small" :disabled="selectionCList.length != 1 || showLock"
+                        @click="allClick('C申请修改')">{{ $t("btn118n.applyModify") }}</el-button>
+                    <el-button type="success" plain size="small" :disabled="selectionCList.length != 1 || showLock"
+                        @click="allClick('C申请删除')">{{ $t("btn118n.applyDelete") }}</el-button>
+                    <el-button type="danger" plain size="small" :disabled="selectionCList.length != 1 || showLock"
+                        @click="allClick('C取消申请')">{{ $t("btn118n.unAplly") }}</el-button>
                 </template>
                 <template slot="indexHeader" slot-scope="scope">
                     <el-button v-if="isFeeEditC" type="primary" size="small" icon="el-icon-plus" circle
@@ -1126,7 +1129,7 @@ export default {
                         overHidden: true,
                     },
                     {
-                        label:this.$t("sea118n.localCurrency"),
+                        label: this.$t("sea118n.localCurrency"),
                         prop: "rmbAmount",
                         width: "80",
                         overHidden: true,
@@ -1270,13 +1273,13 @@ export default {
                         }],
                     },
                     {
-                        label:this.$t("sea118n.corpType"),
+                        label: this.$t("sea118n.corpType"),
                         prop: "corpType",
                         width: "100",
                         overHidden: true,
                     },
                     {
-                        label:  this.$t("sea118n.payCorp"),
+                        label: this.$t("sea118n.payCorp"),
                         prop: "corpCnName",
                         width: "120",
                         overHidden: true,
@@ -1324,13 +1327,13 @@ export default {
                         overHidden: true,
                     },
                     {
-                        label:  this.$t("sea118n.localCurrency"),
+                        label: this.$t("sea118n.localCurrency"),
                         prop: "rmbAmount",
                         width: "80",
                         overHidden: true,
                     },
                     {
-                        label:  this.$t("sea118n.foreignCurrency"),
+                        label: this.$t("sea118n.foreignCurrency"),
                         prop: "usdAmount",
                         width: "80",
                         overHidden: true,
@@ -1582,7 +1585,8 @@ export default {
             isProfitView: false, // 当前登录人是否有利润查看角色
             idArr: [],
             updateSearchKey: new Date().getTime(),
-            dc: null
+            dc: null,
+            expenseApplication: 0,
         }
     },
     async created() {
@@ -1598,8 +1602,8 @@ export default {
         this.roleName = localStorage.getItem('roleName').split(',') // 获取角色数据
         console.log("roleName", this.roleName)
         this.isAdmin = this.roleName.indexOf('admin') >= 0;
-        this.isFeeViewD = this.isAdmin || this.roleName.indexOf('应收查看') >= 0;
-        this.isFeeViewC = this.isAdmin || this.roleName.indexOf('应付查看') >= 0;
+        this.isFeeViewD = this.isAdmin || this.roleName.indexOf('应收查看') >= 0|| this.roleName.indexOf('国外费用') >= 0;
+        this.isFeeViewC = this.isAdmin || this.roleName.indexOf('应付查看') >= 0|| this.roleName.indexOf('国外费用') >= 0;
         this.isFeeView = this.isAdmin || this.isFeeViewD || this.isFeeViewC;
         this.isFeeEditD = this.isAdmin || this.isFeeViewD && this.roleName.indexOf('应收修改') >= 0;
         this.isFeeEditC = this.isAdmin || this.isFeeViewC && this.roleName.indexOf('应付修改') >= 0;
@@ -1612,6 +1616,11 @@ export default {
         this.templateOption = await this.getColumnData(this.getColumnName(309.5), this.templateOptionBack);
         this.getBcorpsListfun() // 获取客户数据
         this.paymodeWorkDictsfun() // 获取预付/到付数据
+        isProcurement({ "param": "expense.application" }).then(res => {
+            if (res.data.data) {
+                this.expenseApplication = res.data.data
+            }
+        })
     },
     methods: {
         rowView(row, index) {
@@ -2099,6 +2108,9 @@ export default {
                     obj.corpCnName = this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length - 1].corpCnName
                     obj.corpEnName = this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length - 1].corpEnName
                     obj.shortName = this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length - 1].shortName
+                    obj.generationCorpId = this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length - 1].bookingAgentId
+                    obj.generationCorpEnName = this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length - 1].bookingAgentEnName
+                    obj.generationCorpCnName = this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length - 1].bookingAgentCnName
                     // // 费用简称
                     // obj.feeId = this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length - 1].feeId
                     // obj.feeCnName = this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length - 1].feeCnName
@@ -2142,6 +2154,9 @@ export default {
                     obj.paymode = this.assemblyForm.mpaymode
                     getBcorpsDetail(this.assemblyForm.corpId).then(res => {
                         obj.shortName = res.data.data.shortName
+                        obj.generationCorpId = res.data.data.bookingAgentId
+                        obj.generationCorpEnName = res.data.data.bookingAgentEnName
+                        obj.generationCorpCnName = res.data.data.bookingAgentCnName
                         this.assemblyForm.feeCenterListD.push(obj)
                     })
                 }
@@ -3223,7 +3238,7 @@ export default {
                     if (row.auditStatus == 0) {
                         return this.$message.error("未申请费用，不允许撤销");
                     }
-                    if (row.auditStatus > 2) {
+                    if (row.auditStatus > 2 && this.expenseApplication == 1) {
                         return this.$message.error("费用已经审核通过,请使用申请修改和删除功能!");
                     }
                 }
@@ -3439,7 +3454,7 @@ export default {
                     if (row.auditStatus == 0) {
                         return this.$message.error("未申请费用，不允许撤销");
                     }
-                    if (row.auditStatus > 2) {
+                    if (row.auditStatus > 2 && this.expenseApplication == 1) {
                         return this.$message.error("费用已经审核通过,请使用申请修改和删除功能!");
                     }
                 }

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

@@ -296,7 +296,7 @@
                     </div>
                 </el-tab-pane>
                 <el-tab-pane :label='$t("sea118n.feeInfo")' name="fy" class="scrollable-container"
-                    v-if="!(form.billType == 'MM' && isHq != 1) && (roleName.includes('admin') || roleName.includes('应收修改') || roleName.includes('应付修改') || roleName.includes('应收查看') || roleName.includes('应付查看'))">
+                    v-if="!(form.billType == 'MM' && isHq != 1) && (roleName.includes('admin') || roleName.includes('应收修改') || roleName.includes('应付修改') || roleName.includes('应收查看') || roleName.includes('应付查看'))|| roleName.includes('国外费用')">
                     <feecenter :assemblyForm="form" :copyFormData="copyFormData" :detailData="detailData"
                         :disabled="detailData.seeDisabled || showLock" :showLock="showLock"
                         :pleasereviewType="pleasereviewType" :pid="form.id" @billsDetailfun="billsDetailfun(form.id)">

src/views/iosBasicData/UnpaidPaymentsDetails/index.vue

@@ -196,6 +196,9 @@ export default {
                         label: "开船日期",
                         prop: "etd",
                         overHidden: true,
+                        type: "date",
+                        format: "yyyy-MM-dd",
+                        valueFormat: "yyyy-MM-dd"
                     },
                     // {
                     //     label: "提单号",

src/views/iosBasicData/financialManagement/PaymentApplication/detailsPage.vue

@@ -21,7 +21,7 @@
                     v-if="form.status == '0' || form.status == '4'" @click="allClick('提交申请')">提交申请
                 </el-button>
                 <el-button size="small" type="danger" plain :disabled="!form.id || editPower"
-                    v-if="form.status == '1' || form.status == '4' || (form.status == '3' && roleName.indexOf('admin') != -1)"
+                    v-if="form.status == '3'"
                     @click="allClick('撤销申请')">撤销申请
                 </el-button>
                 <el-button size="small" type="primary" style="margin-right: 8px" v-if="editButton" @click="inEdit">编 辑
@@ -58,7 +58,7 @@
                                         <dic-select v-model="form.corpCnName" placeholder="付费对象" key="id" res="records"
                                             label="cnName" url="/blade-los/bcorps/selectList?status=0&current=1&size=5"
                                             :filterable="true" :remote="true" dataName="cnName"
-                                            :disabled="editDisabled || !(roleName.includes('admin') || roleName.includes('总部')) || form.finStlBillsItemsList.length"
+                                            :disabled="editDisabled || form.finStlBillsItemsList.length"
                                             @selectChange="dicChange('corpCnName', $event)">
                                         </dic-select>
                                     </tempalte>
@@ -291,7 +291,7 @@ export default {
                 curCode: this.getLocalCurrency(),
                 businessDateStart: null,
                 businessDateEnd: null,
-                vesselEnName: null,
+                vesselCnName: null,
                 voyageNo: null
             },
             optionForm: {
@@ -746,7 +746,7 @@ export default {
                         overHidden: true,
                     },
                     {
-                        label: "客户英文文名",
+                        label: "客户英文名",
                         prop: "cnName",
                         overHidden: true,
                     },
@@ -879,7 +879,9 @@ export default {
                 this.form.businessTypeCode = 'FFSQ'
                 this.form.businessType = 'FFSQ' // 结算单
                 let obj = {
-                    ...this.form
+                    ...this.form,
+                    dc: this.search.accountDc,
+                    curCode: this.search.curCode // 币别
                 }
                 finstlbillsAdd(obj)
                 this.finstlbillslistAccBillV1fun()
@@ -897,7 +899,7 @@ export default {
                 curCode: null,
                 businessDateStart: null,
                 businessDateEnd: null,
-                vesselEnName: null,
+                vesselCnName: null,
                 voyageNo: null
             }
         },
@@ -1135,7 +1137,9 @@ export default {
                 this.form.businessTypeCode = 'FFSQ'
                 this.form.businessType = 'FFSQ' // 结算单
                 let obj = {
-                    ...this.form
+                    ...this.form,
+                    dc: this.search.accountDc,
+                    curCode: this.search.curCode // 币别
                 }
                 const loading = this.$loading({
                     lock: true,
@@ -1170,6 +1174,8 @@ export default {
                     this.optionForm.disabled = false
                 }
                 this.form = res.data.data
+                this.search.accountDc = res.data.data.dc
+                this.search.curCode = res.data.data.curCode
                 this.page.total = res.data.data.finStlBillsItemsList.length
                 this.saveLocalCurrency(res.data.data.branchId)
                 if (type == 'search1') {
@@ -1195,7 +1201,9 @@ export default {
             this.form.businessTypeCode = 'FFSQ'
             this.form.businessType = 'FFSQ' // 结算单
             let obj = {
-                ...this.form
+                ...this.form,
+                dc: this.search.accountDc,
+                curCode: this.search.curCode // 币别
             }
             finstlbillsAdd(obj).then(res => {
                 this.finstlbillslistAccBillV1fun()
@@ -1217,7 +1225,7 @@ export default {
             obj.checkBillNo = this.search.checkBillNo
             obj.accBillNo = this.search.accountNo // 账单编号  ACCT NO
             obj.billNo = this.search.businessNo // 单据编号  JOB NO
-            obj.vesselEnName = this.search.vesselEnName // 中文船名
+            obj.vesselCnName = this.search.vesselEnName // 中文船名
             obj.voyageNo = this.search.voyageNo // 航次
             obj.feeCnName = this.search.feeCnName//
             obj.businessDateStart = this.search.businessDateStart
@@ -1241,7 +1249,7 @@ export default {
             obj.checkBillNo = this.search.checkBillNo
             obj.accBillNo = this.search.accountNo // 账单编号  ACCT NO
             obj.billNo = this.search.businessNo // 单据编号  JOB NO
-            obj.vesselEnName = this.search.vesselEnName // 中文船名
+            obj.vesselCnName = this.search.vesselEnName // 中文船名
             obj.voyageNo = this.search.voyageNo // 航次
             obj.feeCnName = this.search.feeCnName//
             obj.businessDateStart = this.search.businessDateStart

src/views/iosBasicData/financialManagement/computationCenter/detailsPage.vue

@@ -18,7 +18,7 @@
                 <el-button type="success" size="small" :disabled="!form.id" plain @click="newbill">新建账单
                 </el-button>
                 <el-button size="small" type="danger" plain :disabled="!form.id || editPower"
-                    v-if="form.status == '1' || form.status == '4' || (form.status == '3' && roleName.indexOf('admin') != -1)"
+                    v-if="form.status == '3'"
                     @click="allClick('撤销结算')">撤销结算
                 </el-button>
                 <el-button v-if="form.status == '0' || form.status == '4'" size="small" type="success" plain
@@ -49,13 +49,13 @@
                                         <dic-select v-model="form.corpCnName" placeholder="结算单位" key="id" res="records"
                                             label="cnName" url="/blade-los/bcorps/selectList?status=0&current=1&size=5"
                                             :filterable="true" :remote="true" dataName="cnName"
-                                            :disabled="editDisabled || !(roleName.includes('admin') || roleName.includes('总部')) || form.finStlBillsItemsList.length"
+                                            :disabled="editDisabled || form.finStlBillsItemsList.length"
                                             @selectChange="dicChange('corpCnName', $event)">
                                         </dic-select>
                                     </tempalte>
                                     <tempalte slot="isExchangeToCny">
                                         <el-checkbox size="medium" true-label="1" false-label="0"
-                                            :disabled="editDisabled || !(roleName.includes('admin') || roleName.includes('总部')) || form.finStlBillsItemsList.length"
+                                            :disabled="editDisabled || form.finStlBillsItemsList.length"
                                             v-model="form.isExchangeToCny">
                                         </el-checkbox>
                                     </tempalte>
@@ -295,7 +295,7 @@ export default {
                 curCode: this.getLocalCurrency(),
                 businessDateStart: null,
                 businessDateEnd: null,
-                vesselEnName: null,
+                vesselCnName: null,
                 voyageNo: null
             },
             optionForm: {
@@ -737,10 +737,20 @@ export default {
                         overHidden: true,
                     },
                     {
-                        label: "客户英文文名",
+                        label: "客户英文名",
                         prop: "cnName",
                         overHidden: true,
                     },
+                    {
+                        label: "代收客户中文名",
+                        prop: "bookingAgentCnName",
+                        overHidden: true,
+                    },
+                    {
+                        label: "代收客户英文名",
+                        prop: "bookingAgentEnName",
+                        overHidden: true,
+                    },
                 ]
             },
             DesignreportDialog: false, // 设计报表弹窗
@@ -871,7 +881,9 @@ export default {
                 this.form.businessTypeCode = 'STL'
                 this.form.businessType = 'STL' // 结算
                 let obj = {
-                    ...this.form
+                    ...this.form,
+                    dc: this.search.accountDc,
+                    curCode: this.search.curCode // 币别
                 }
                 finstlbillsAdd(obj)
                 this.finstlbillslistAccBillV1fun()
@@ -886,7 +898,7 @@ export default {
                 curCode: null,
                 businessDateStart: null,
                 businessDateEnd: null,
-                vesselEnName: null,
+                vesselCnName: null,
                 voyageNo: null
             }
         },
@@ -1178,7 +1190,9 @@ export default {
                 this.form.businessTypeCode = 'STL'
                 this.form.businessType = 'STL' // 结算
                 let obj = {
-                    ...this.form
+                    ...this.form,
+                    dc: this.search.accountDc,
+                    curCode: this.search.curCode // 币别
                 }
                 const loading = this.$loading({
                     lock: true,
@@ -1249,6 +1263,8 @@ export default {
                     })
                 }
                 this.form = res.data.data
+                this.search.accountDc = res.data.data.dc
+                this.search.curCode = res.data.data.curCode
                 this.page.total = res.data.data.finStlBillsItemsList.length
                 this.saveLocalCurrency(res.data.data.branchId)
                 if (type == 'search1') {
@@ -1273,7 +1289,9 @@ export default {
             this.form.businessTypeCode = 'STL'
             this.form.businessType = 'STL' // 结算
             let obj = {
-                ...this.form
+                ...this.form,
+                dc: this.search.accountDc,
+                curCode: this.search.curCode // 币别
             }
             finstlbillsAdd(obj).then(res => {
                 this.finstlbillslistAccBillV1fun()
@@ -1293,7 +1311,7 @@ export default {
             obj.curCode = this.search.curCode // 币别
             obj.mblno = this.search.mblno // MB/L NO
             obj.hblno = this.search.hblno // HB/L NO
-            obj.vesselEnName = this.search.vesselEnName // 中文船名
+            obj.vesselCnName = this.search.vesselEnName // 中文船名
             obj.voyageNo = this.search.voyageNo // 航次
             obj.feeCnName = this.search.feeCnName//
             obj.businessDateStart = this.search.businessDateStart
@@ -1315,7 +1333,7 @@ export default {
             obj.curCode = this.search.curCode // 币别
             obj.mblno = this.search.mblno // MB/L NO
             obj.hblno = this.search.hblno // HB/L NO
-            obj.vesselEnName = this.search.vesselEnName // 中文船名
+            obj.vesselCnName = this.search.vesselEnName // 中文船名
             obj.voyageNo = this.search.voyageNo // 航次
             obj.feeCnName = this.search.feeCnName//
             obj.businessDateStart = this.search.businessDateStart

src/views/iosBasicData/financialManagement/computationCenter/index.vue

@@ -364,11 +364,11 @@ export default {
                         overHidden: true,
                     },
                     {
-                        label: "JOB NO",
+                        label: "业务编号",
                         prop: "businessNo",
                         width: "120",
-                        search: true,
-                        searchOrder: 3,
+                        // search: true,
+                        // searchOrder: 3,
                         overHidden: true
                     },
                     {

src/views/iosBasicData/financialManagement/fininvoicesApplyfor/detailsPage.vue

@@ -48,7 +48,7 @@
                                         <dic-select v-model="form.corpCnName" placeholder="结算单位" key="id" res="records"
                                             label="cnName" url="/blade-los/bcorps/selectList?status=0&current=1&size=5"
                                             :filterable="true" :remote="true" dataName="cnName"
-                                            :disabled="editDisabled || !(roleName.includes('admin') || roleName.includes('总部')) || form.finInvoicesItemsList.length"
+                                            :disabled="editDisabled || form.finInvoicesItemsList.length"
                                             @selectChange="dicChange('corpCnName', $event)">
                                         </dic-select>
                                     </tempalte>
@@ -56,26 +56,25 @@
                                         <dic-select v-model="form.invCorpCnName" placeholder="开票单位" key="id"
                                             res="records" label="cnName"
                                             url="/blade-los/bcorps/selectList?status=0&current=1&size=5"
-                                            :filterable="true" :remote="true" dataName="cnName"
-                                            :disabled="editDisabled || !(roleName.includes('admin') || roleName.includes('总部'))"
+                                            :filterable="true" :remote="true" dataName="cnName" :disabled="editDisabled"
                                             @selectChange="dicChange('invCorpCnName', $event)">
                                         </dic-select>
                                     </tempalte>
                                     <template slot="curCode">
-                                        <dic-select v-model="form.curCode" placeholder="开票币别" label="code"
+                                        <dic-select v-model="form.curCode" placeholder="币别" label="code"
                                             :url="'/blade-los/bcurrency/obtainRate?deptId=' + form.branchId + '&date=' + form.invoiceDate + '&type=2'"
                                             :filterable="true" @selectChange="dicChange('curCode', $event)"
-                                            :disabled="editDisabled || !(roleName.includes('admin') || roleName.includes('总部'))"></dic-select>
+                                            :disabled="editDisabled"></dic-select>
                                     </template>
                                     <tempalte slot="isExchangeToCny">
                                         <el-checkbox size="medium" true-label="1" false-label="0"
-                                            :disabled="editDisabled || !(roleName.includes('admin') || roleName.includes('总部')) || form.finInvoicesItemsList.length"
+                                            :disabled="editDisabled || form.finInvoicesItemsList.length"
                                             v-model="form.isExchangeToCny">
                                         </el-checkbox>
                                     </tempalte>
                                     <tempalte slot="isDk">
                                         <el-checkbox size="medium" :true-label="1" :false-label="0"
-                                            :disabled="editDisabled || !(roleName.includes('admin') || roleName.includes('总部')) || form.finInvoicesItemsList.length"
+                                            :disabled="editDisabled || form.finInvoicesItemsList.length"
                                             v-model="form.isDk">
                                         </el-checkbox>
                                     </tempalte>
@@ -220,7 +219,7 @@
         <!--设计报表弹窗-->
         <el-dialog append-to-body title="设计报表" class="el-dialogDeep" :visible.sync="DesignreportDialog" width="70%"
             :close-on-click-modal="false" :destroy-on-close="true" :close-on-press-escape="false" v-dialog-drag>
-            <reports :id="form.id" :assemblyForm="form" businessValue="DZZX"></reports>
+            <reports :id="form.id" :assemblyForm="form" businessValue="FPSQ"></reports>
         </el-dialog>
 
         <!--预览-->
@@ -307,7 +306,7 @@ export default {
                 curCode: this.getLocalCurrency(),
                 businessDateStart: null,
                 businessDateEnd: null,
-                vesselEnName: null,
+                vesselCnName: null,
                 voyageNo: null
             },
             optionForm: {
@@ -791,10 +790,20 @@ export default {
                         overHidden: true,
                     },
                     {
-                        label: "客户英文文名",
+                        label: "客户英文名",
                         prop: "cnName",
                         overHidden: true,
                     },
+                    {
+                        label: "代收客户中文名",
+                        prop: "bookingAgentCnName",
+                        overHidden: true,
+                    },
+                    {
+                        label: "代收客户英文名",
+                        prop: "bookingAgentEnName",
+                        overHidden: true,
+                    },
                 ]
             },
             DesignreportDialog: false, // 设计报表弹窗
@@ -917,7 +926,7 @@ export default {
             if (!this.form.id) {
                 return this.$message.error("请保存数据");
             }
-            if (!this.form.corpId && (this.search.hblno || this.search.mblno)) {
+            if (!this.form.corpId && (this.search.hblno || this.search.mblno || this.form.invCorpId)) {
                 this.finstlbillslistAccBillByCorpfun()
             } else {
                 if (!this.form.corpId) {
@@ -942,7 +951,7 @@ export default {
                 curCode: null,
                 businessDateStart: null,
                 businessDateEnd: null,
-                vesselEnName: null,
+                vesselCnName: null,
                 voyageNo: null
             }
         },
@@ -1096,7 +1105,7 @@ export default {
         upDate(list) {
             this.form.fileList = list
         },
-        dicChange(name, row) {
+        async dicChange(name, row) {
             if (name == 'branchName') {
                 if (row) {
                     this.form.branchId = row.id
@@ -1127,6 +1136,7 @@ export default {
                 }
             }
             if (name == 'curCode') {
+                await this.checkRate(row.code, this.form.invoiceDate, null, 2, this.form.branchId)
                 this.$set(this.form, 'exrate', this.getExchangeRate(row.code, this.form.dc ? this.form.dc : 'D', 2))
             }
         },
@@ -1137,7 +1147,7 @@ export default {
                 billId: this.form.id,
                 reportCode: val.classifyCode,
                 groupCode: val.groupCode,
-                type: 'DZZX'
+                type: 'FPSQ'
             }).then(res => {
                 this.handleReportPreview(val.url, res.data.data.data)
             })
@@ -1145,7 +1155,7 @@ export default {
         // 报表预览
         previewreportfun() {
             getreportsList(1, 10, {
-                businessType: 'DZZX',
+                businessType: 'FPSQ',
                 // classifyCode:'结算中心',
                 // groupCode:'付费结算'
             }).then(res => {
@@ -1160,7 +1170,7 @@ export default {
                     }
                     this.$nextTick(() => {
                         this.$refs.reportformsList.onLoad(page, {
-                            businessType: 'DZZX',
+                            businessType: 'FPSQ',
                             // classifyCode:'结算中心',
                             // groupCode:'付费结算'
                         })
@@ -1234,10 +1244,14 @@ export default {
         // 弹窗选择
         retrievePopupsSelect(row) {
             // this.form = row
-            this.$set(this.form, 'corpId', row.id)
-            this.$set(this.form, 'corpCnName', row.cnName)
-            this.$set(this.form, 'corpEnName', row.enName)
-            this.$set(this.form, 'corpArgreementNo', row.enName)
+            if (this.form.isDk != 1) {
+                this.$set(this.form, 'corpId', row.id)
+                this.$set(this.form, 'corpCnName', row.cnName)
+                this.$set(this.form, 'corpEnName', row.enName)
+                this.$set(this.form, 'corpArgreementNo', row.enName)
+                this.$set(this.form, 'invCorpId', row.id)
+                this.$set(this.form, 'invCorpCnName', row.cnName)
+            }
             this.retrievePopupsType = false
             this.form.billNoFormat = 'FPSQ'
             this.form.businessTypeCode = 'FPSQ'
@@ -1258,12 +1272,14 @@ export default {
             obj.branchId = this.form.branchId
             obj.branchName = this.form.branchName
             obj.corpCnName = this.form.corpId ? this.form.corpId : null
+            obj.invCorpCnName = this.form.invCorpId ? this.form.invCorpId : null
             obj.isExchangeToCny = this.form.isExchangeToCny
+            obj.isDk = this.form.isDk
             obj.dc = this.search.accountDc // 收付 D=收 C=付
             obj.curCode = this.search.curCode // 币别
             obj.mblno = this.search.mblno // MB/L NO
             obj.hblno = this.search.hblno // HB/L NO
-            obj.vesselEnName = this.search.vesselEnName // 中文船名
+            obj.vesselCnName = this.search.vesselEnName // 中文船名
             obj.voyageNo = this.search.voyageNo // 航次
             obj.feeCnName = this.search.feeCnName//
             obj.businessDateStart = this.search.businessDateStart
@@ -1279,13 +1295,15 @@ export default {
             obj.type = '3'
             obj.branchId = this.form.branchId
             obj.branchName = this.form.branchName
-            obj.corpCnName = this.form.corpId // 结算单位
+            obj.corpCnName = this.form.corpId ? this.form.corpId : null
+            obj.invCorpCnName = this.form.invCorpId ? this.form.invCorpId : null
             obj.isExchangeToCny = this.form.isExchangeToCny
+            obj.isDk = this.form.isDk
             obj.dc = this.search.accountDc // 收付 D=收 C=付
             obj.curCode = this.search.curCode // 币别
             obj.mblno = this.search.mblno // MB/L NO
             obj.hblno = this.search.hblno // HB/L NO
-            obj.vesselEnName = this.search.vesselEnName // 中文船名
+            obj.vesselCnName = this.search.vesselEnName // 中文船名
             obj.voyageNo = this.search.voyageNo // 航次
             obj.feeCnName = this.search.feeCnName//
             obj.businessDateStart = this.search.businessDateStart

src/views/iosBasicData/financialManagement/fininvoicesOutput/detailsPage.vue

@@ -47,7 +47,7 @@
                                         <dic-select v-model="form.corpCnName" placeholder="结算单位" key="id" res="records"
                                             label="cnName" url="/blade-los/bcorps/selectList?status=0&current=1&size=5"
                                             :filterable="true" :remote="true" dataName="cnName"
-                                            :disabled="editDisabled || !(roleName.includes('admin') || roleName.includes('总部')) || form.finInvoicesItemsList.length"
+                                            :disabled="editDisabled  || form.finInvoicesItemsList.length"
                                             @selectChange="dicChange('corpCnName', $event)">
                                         </dic-select>
                                     </tempalte>
@@ -56,7 +56,7 @@
                                             res="records" label="cnName"
                                             url="/blade-los/bcorps/selectList?status=0&current=1&size=5"
                                             :filterable="true" :remote="true" dataName="cnName"
-                                            :disabled="editDisabled || !(roleName.includes('admin') || roleName.includes('总部'))"
+                                            :disabled="editDisabled "
                                             @selectChange="dicChange('invCorpCnName', $event)">
                                         </dic-select>
                                     </tempalte>
@@ -64,20 +64,24 @@
                                         <dic-select v-model="form.curCode" placeholder="开票币别" label="code"
                                             :url="'/blade-los/bcurrency/obtainRate?deptId=' + form.branchId + '&date=' + form.invoiceDate + '&type=2'"
                                             :filterable="true" @selectChange="dicChange('curCode', $event)"
-                                            :disabled="editDisabled || !(roleName.includes('admin') || roleName.includes('总部'))"></dic-select>
+                                            :disabled="editDisabled "></dic-select>
                                     </template>
                                     <tempalte slot="isExchangeToCny">
                                         <el-checkbox size="medium" true-label="1" false-label="0"
-                                            :disabled="editDisabled || !(roleName.includes('admin') || roleName.includes('总部')) || form.finInvoicesItemsList.length"
+                                            :disabled="editDisabled  || form.finInvoicesItemsList.length"
                                             v-model="form.isExchangeToCny">
                                         </el-checkbox>
                                     </tempalte>
                                     <tempalte slot="isDk">
                                         <el-checkbox size="medium" :true-label="1" :false-label="0"
-                                            :disabled="editDisabled || !(roleName.includes('admin') || roleName.includes('总部')) || form.finInvoicesItemsList.length"
+                                            :disabled="editDisabled  || form.finInvoicesItemsList.length"
                                             v-model="form.isDk">
                                         </el-checkbox>
                                     </tempalte>
+                                    <tempalte slot="taxInvoiceNo">
+                                        <el-input  placeholder="请输入 税控发票号" v-model="form.taxInvoiceNo"  :disabled="editButton ">
+                                        </el-input>
+                                    </tempalte>
                                     <tempalte slot="remarks">
                                         <el-input type="textarea" :rows="2" placeholder="请输入 备注" v-model="form.remarks">
                                         </el-input>
@@ -223,7 +227,7 @@
         <!--设计报表弹窗-->
         <el-dialog append-to-body title="设计报表" class="el-dialogDeep" :visible.sync="DesignreportDialog" width="70%"
             :close-on-click-modal="false" :destroy-on-close="true" :close-on-press-escape="false" v-dialog-drag>
-            <reports :id="form.id" :assemblyForm="form" businessValue="DZZX"></reports>
+            <reports :id="form.id" :assemblyForm="form" businessValue="FPSQ"></reports>
         </el-dialog>
 
         <!--预览-->
@@ -312,7 +316,7 @@ export default {
                 curCode: this.getLocalCurrency(),
                 businessDateStart: null,
                 businessDateEnd: null,
-                vesselEnName: null,
+                vesselCnName: null,
                 voyageNo: null
             },
             optionForm: {
@@ -795,10 +799,20 @@ export default {
                         overHidden: true,
                     },
                     {
-                        label: "客户英文文名",
+                        label: "客户英文名",
                         prop: "cnName",
                         overHidden: true,
                     },
+                    {
+                        label: "代收客户中文名",
+                        prop: "bookingAgentCnName",
+                        overHidden: true,
+                    },
+                    {
+                        label: "代收客户英文名",
+                        prop: "bookingAgentEnName",
+                        overHidden: true,
+                    },
                 ]
             },
             DesignreportDialog: false, // 设计报表弹窗
@@ -924,7 +938,7 @@ export default {
             if (!this.form.id) {
                 return this.$message.error("请保存数据");
             }
-            if (!this.form.corpId && (this.search.hblno || this.search.mblno)) {
+            if (!this.form.corpId && (this.search.hblno || this.search.mblno||this.form.invCorpId)) {
                 this.finstlbillslistAccBillByCorpfun()
             } else {
                 if (!this.form.corpId) {
@@ -949,7 +963,7 @@ export default {
                 curCode: null,
                 businessDateStart: null,
                 businessDateEnd: null,
-                vesselEnName: null,
+                vesselCnName: null,
                 voyageNo: null
             }
         },
@@ -1131,7 +1145,7 @@ export default {
         upDate(list) {
             this.form.fileList = list
         },
-        dicChange(name, row) {
+        async dicChange(name, row) {
             if (name == 'branchName') {
                 if (row) {
                     this.form.branchId = row.id
@@ -1162,6 +1176,7 @@ export default {
                 }
             }
             if (name == 'curCode') {
+                await this.checkRate(row.code, this.form.invoiceDate, null, 2, this.form.branchId)
                 this.$set(this.form, 'exrate', this.getExchangeRate(row.code, this.form.dc ? this.form.dc : 'D', 2))
             }
         },
@@ -1172,7 +1187,7 @@ export default {
                 billId: this.form.id,
                 reportCode: val.classifyCode,
                 groupCode: val.groupCode,
-                type: 'DZZX'
+                type: 'FPSQ'
             }).then(res => {
                 this.handleReportPreview(val.url, res.data.data.data)
             })
@@ -1180,7 +1195,7 @@ export default {
         // 报表预览
         previewreportfun() {
             getreportsList(1, 10, {
-                businessType: 'DZZX',
+                businessType: 'FPSQ',
                 // classifyCode:'结算中心',
                 // groupCode:'付费结算'
             }).then(res => {
@@ -1195,7 +1210,7 @@ export default {
                     }
                     this.$nextTick(() => {
                         this.$refs.reportformsList.onLoad(page, {
-                            businessType: 'DZZX',
+                            businessType: 'FPSQ',
                             // classifyCode:'结算中心',
                             // groupCode:'付费结算'
                         })
@@ -1297,10 +1312,14 @@ export default {
         // 弹窗选择
         retrievePopupsSelect(row) {
             // this.form = row
-            this.$set(this.form, 'corpId', row.id)
-            this.$set(this.form, 'corpCnName', row.cnName)
-            this.$set(this.form, 'corpEnName', row.enName)
-            this.$set(this.form, 'corpArgreementNo', row.enName)
+            if (this.form.isDk != 1) {
+                this.$set(this.form, 'corpId', row.id)
+                this.$set(this.form, 'corpCnName', row.cnName)
+                this.$set(this.form, 'corpEnName', row.enName)
+                this.$set(this.form, 'corpArgreementNo', row.enName)
+                this.$set(this.form, 'invCorpId', row.id)
+                this.$set(this.form, 'invCorpCnName', row.cnName)
+            }
             this.retrievePopupsType = false
             this.form.billNoFormat = 'XXFP'
             this.form.businessTypeCode = 'XXFP'
@@ -1321,13 +1340,14 @@ export default {
             obj.branchId = this.form.branchId
             obj.branchName = this.form.branchName
             obj.corpCnName = this.form.corpId ? this.form.corpId : null
+            obj.invCorpCnName = this.form.invCorpId ? this.form.invCorpId : null
             obj.isExchangeToCny = this.form.isExchangeToCny
             obj.isDk = this.form.isDk
             obj.dc = this.search.accountDc // 收付 D=收 C=付
             obj.curCode = this.search.curCode // 币别
             obj.mblno = this.search.mblno // MB/L NO
             obj.hblno = this.search.hblno // HB/L NO
-            obj.vesselEnName = this.search.vesselEnName // 中文船名
+            obj.vesselCnName = this.search.vesselEnName // 中文船名
             obj.voyageNo = this.search.voyageNo // 航次
             obj.feeCnName = this.search.feeCnName//
             obj.businessDateStart = this.search.businessDateStart
@@ -1344,13 +1364,14 @@ export default {
             obj.branchId = this.form.branchId
             obj.branchName = this.form.branchName
             obj.corpCnName = this.form.corpId // 结算单位
+            obj.invCorpCnName = this.form.invCorpId ? this.form.invCorpId : null
             obj.isExchangeToCny = this.form.isExchangeToCny
             obj.isDk = this.form.isDk
             obj.dc = this.search.accountDc // 收付 D=收 C=付
             obj.curCode = this.search.curCode // 币别
             obj.mblno = this.search.mblno // MB/L NO
             obj.hblno = this.search.hblno // HB/L NO
-            obj.vesselEnName = this.search.vesselEnName // 中文船名
+            obj.vesselCnName = this.search.vesselEnName // 中文船名
             obj.voyageNo = this.search.voyageNo // 航次
             obj.feeCnName = this.search.feeCnName//
             obj.businessDateStart = this.search.businessDateStart

src/views/iosBasicData/financialManagement/finstlbills/detailsPage.vue

@@ -48,7 +48,7 @@
                                         <dic-select v-model="form.corpCnName" placeholder="对账单位" key="id" res="records"
                                             label="cnName" url="/blade-los/bcorps/selectList?status=0&current=1&size=5"
                                             :filterable="true" :remote="true" dataName="cnName"
-                                            :disabled="editDisabled || !(roleName.includes('admin') || roleName.includes('总部')) || form.finStlBillsItemsList.length"
+                                            :disabled="editDisabled || form.finStlBillsItemsList.length"
                                             @selectChange="dicChange('corpCnName', $event)">
                                         </dic-select>
                                     </tempalte>
@@ -141,6 +141,11 @@
                                             :filterable="true" :remote="true" dataName="enName" :slotRight="true"
                                             rightLabel="code"></dic-select>
                                     </tempalte>
+                                    <tempalte slot="isStlSearch">
+                                        <el-checkbox size="medium" true-label="1" false-label="0"
+                                            v-model="search.isStl">
+                                        </el-checkbox>
+                                    </tempalte>
                                 </avue-crud>
                             </trade-card>
                         </el-col>
@@ -274,8 +279,9 @@ export default {
                 curCode: this.getLocalCurrency(),
                 businessDateStart: null,
                 businessDateEnd: null,
-                vesselEnName: null,
-                voyageNo: null
+                vesselCnName: null,
+                voyageNo: null,
+                isStl:'0',
             },
             optionForm: {
                 menuBtn: false,
@@ -449,7 +455,7 @@ export default {
                 calcHeight: 30,
                 menuWidth: 60,
                 searchShow: true,
-                searchMenuSpan: 18,
+                searchMenuSpan: 12,
                 searchIcon: true,
                 searchIndex: 3,
                 tip: false,
@@ -612,6 +618,12 @@ export default {
                         overHidden: true
                     },
                     {
+                        label: "是否结算",
+                        prop: "isStl",
+                        search: true,
+                        hide: true,
+                    },
+                    {
                         label: "备注",
                         prop: "remarks",
                         width: 120,
@@ -708,7 +720,7 @@ export default {
                         overHidden: true,
                     },
                     {
-                        label: "客户英文文名",
+                        label: "客户英文名",
                         prop: "cnName",
                         overHidden: true,
                     },
@@ -822,7 +834,6 @@ export default {
             if (!this.form.id) {
                 return this.$message.error("请保存数据");
             }
-            finstlbillsAdd(obj)
             if (!this.form.corpId && (this.search.hblno || this.search.mblno)) {
                 this.finstlbillslistAccBillByCorpfun()
             } else {
@@ -833,8 +844,11 @@ export default {
                 this.form.businessTypeCode = 'HYDZ'
                 this.form.businessType = 'CHK' // 对账
                 let obj = {
-                    ...this.form
+                    ...this.form,
+                    dc: this.search.accountDc,
+                    curCode: this.search.curCode // 币别
                 }
+                finstlbillsAdd(obj)
                 this.finstlbillslistAccBillV1fun()
             }
         },
@@ -847,8 +861,9 @@ export default {
                 curCode: null,
                 businessDateStart: null,
                 businessDateEnd: null,
-                vesselEnName: null,
-                voyageNo: null
+                vesselCnName: null,
+                voyageNo: null,
+                isStl:'0',
             }
         },
         allClick(name) {
@@ -1084,7 +1099,9 @@ export default {
                 this.form.businessTypeCode = 'HYDZ'
                 this.form.businessType = 'CHK' // 对账
                 let obj = {
-                    ...this.form
+                    ...this.form,
+                    dc: this.search.accountDc,
+                    curCode: this.search.curCode // 币别
                 }
                 const loading = this.$loading({
                     lock: true,
@@ -1119,6 +1136,8 @@ export default {
                     this.optionForm.disabled = false
                 }
                 this.form = res.data.data
+                this.search.accountDc = res.data.data.dc
+                this.search.curCode = res.data.data.curCode
                 this.page.total = res.data.data.finStlBillsItemsList.length
                 this.saveLocalCurrency(res.data.data.branchId)
                 if (type == 'search1') {
@@ -1143,7 +1162,9 @@ export default {
             this.form.businessTypeCode = 'HYDZ'
             this.form.businessType = 'CHK' // 对账
             let obj = {
-                ...this.form
+                ...this.form,
+                dc: this.search.accountDc,
+                curCode: this.search.curCode // 币别
             }
             finstlbillsAdd(obj).then(res => {
                 this.finstlbillslistAccBillV1fun()
@@ -1162,11 +1183,12 @@ export default {
             obj.curCode = this.search.curCode // 币别
             obj.mblno = this.search.mblno // MB/L NO
             obj.hblno = this.search.hblno // HB/L NO
-            obj.vesselEnName = this.search.vesselEnName // 中文船名
+            obj.vesselCnName = this.search.vesselEnName // 中文船名
             obj.voyageNo = this.search.voyageNo // 航次
             obj.feeCnName = this.search.feeCnName//
             obj.businessDateStart = this.search.businessDateStart
             obj.businessDateEnd = this.search.businessDateEnd
+            obj.isStl =this.search.isStl
             finstlbillslistAccBillByCorp(obj).then(res => {
                 this.retrievePopupsType = true
                 this.retrievePopupsData = res.data.data
@@ -1183,11 +1205,12 @@ export default {
             obj.curCode = this.search.curCode // 币别
             obj.mblno = this.search.mblno // MB/L NO
             obj.hblno = this.search.hblno // HB/L NO
-            obj.vesselEnName = this.search.vesselEnName // 中文船名
+            obj.vesselCnName = this.search.vesselEnName // 中文船名
             obj.voyageNo = this.search.voyageNo // 航次
             obj.feeCnName = this.search.feeCnName//
             obj.businessDateStart = this.search.businessDateStart
             obj.businessDateEnd = this.search.businessDateEnd
+            obj.isStl =this.search.isStl
             const loading = this.$loading({
                 lock: true,
                 text: '加载中',

src/views/ow/owTask/detailsPage.vue

@@ -57,7 +57,7 @@
                   @selectChange="dicChange('ownerName', $event)"
                   :disabled="editDisabled || (fixData && form.whetherEnable == '是')"
                   url="/blade-los/bcorps/selectList?status=0&current=1&size=5&corpTypeName=箱东" :filterable="true"
-                  :remote="true" dataName="enName" :slotRight="true" rightLabel="code">
+                  :remote="true" dataName="shortName" :slotRight="true" rightLabel="code">
                 </dic-select>
               </tempalte>
               <!-- <tempalte slot="polStationCname">

vue.config.js

@@ -50,10 +50,10 @@ module.exports = {
       '/api': {
         //本地服务接口地址
         // target: 'http://192.168.168.73:1080',
-        // target: 'http://192.168.8.104:1080',
+        // target: 'http://192.168.8.114:1080',
         // target: 'http://127.0.0.1:1080',
         // 打包地址
-        target: 'http://139.9.191.155:10004',//服务器ip
+        target: 'http://113.44.105.66:10004',//服务器ip
         // target: 'http://192.168.161.11:10004',//服务器ip
         //  target: 'http://127.0.0.1:10004',
         // target: 'http://trade.tubaosoft.com:10004',//服务器域名