海运进出口修改费用明细新增bug

财务管理 新加字段
OW 修改限制规则
结算中心新加已开已收模块
业务利润 新加字段
基础资料 往来单位新加修改单据模块

src/api/iosBasicData/bcorps.js

@@ -61,7 +61,13 @@ export const addBcorps = (row) => {
     data: row
   })
 }
-
+export const updateSynchronize = (row) => {
+  return request({
+    url: '/api/blade-los/bcorps/updateSynchronize',
+    method: 'post',
+    data: row
+  })
+}
 export const updateBcorps = (row) => {
   return request({
     url: '/api/blade-los/bcorps/submit',

src/api/iosBasicData/finstlbills.js

@@ -11,7 +11,13 @@ export const finstlbillsList = (current, size, params) => {
     }
   })
 }
-
+export const openedReceived = (data) => {
+  return request({
+    url: '/api/blade-los/fininvoices/openedReceived',
+    method: 'get',
+    params:data
+  })
+}
 export const finstlbillsDetail = (id) => {
   return request({
     url: '/api/blade-los/finstlbills/detail',

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

@@ -110,7 +110,7 @@
                 <template slot="corpCnName" slot-scope="{ row,index }">
                     <dic-select v-if="row.edit" :key="updateSearchKey" v-model="row.shortName" placeholder="结算单位"
                         label="shortName" res="records" :slotRight="true" rightLabel="code"
-                        :url="'/blade-los/bcorps/selectList?status=0&current=1&size=5&corpTypeName=' + row.corpType"
+                        :url="'/blade-los/bcorps/selectList?status=0&current=1&size=5&corpTypeName=' + (row.corpType?row.corpType:null)"
                         :filterable="true" :remote="true" dataName="shortName"
                         @selectChange="rowDicChange('shortName', $event, row)"></dic-select>
                     <span v-else>{{ row.shortName }}</span>
@@ -284,7 +284,7 @@
                 <template slot="corpCnName" slot-scope="{ row,index }">
                     <dic-select v-if="row.edit" :key="updateSearchKey" v-model="row.shortName" placeholder="结算单位"
                         label="shortName" res="records" :slotRight="true" rightLabel="code"
-                        :url="'/blade-los/bcorps/selectList?status=0&current=1&size=5&corpTypeName=' + row.corpType"
+                        :url="'/blade-los/bcorps/selectList?status=0&current=1&size=5&corpTypeName=' + (row.corpType?row.corpType:null)"
                         :filterable="true" :remote="true" dataName="shortName"
                         @selectChange="rowDicChange('shortNameC', $event, row)"></dic-select>
                     <span v-else>{{ row.shortName }}</span>
@@ -2094,6 +2094,7 @@ export default {
                 if (this.assemblyForm.feeCenterListD.length != 0) {
                     obj.branchId = this.assemblyForm.branchId
                     obj.branchName = this.assemblyForm.branchName
+                    obj.corpType=this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length - 1].corpType
                     // 结算单位
                     obj.corpId = this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length - 1]
                         .corpId
@@ -2106,9 +2107,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.generationCorpId = this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length - 1].generationCorpId
+                    obj.generationCorpEnName = this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length - 1].generationCorpEnName
+                    obj.generationCorpCnName = this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length - 1].generationCorpCnName
                     // // 费用简称
                     // obj.feeId = this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length - 1].feeId
                     // obj.feeCnName = this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length - 1].feeCnName
@@ -2203,6 +2204,7 @@ export default {
                 if (this.assemblyForm.feeCenterListC.length != 0) {
                     obj.branchId = this.assemblyForm.branchId
                     obj.branchName = this.assemblyForm.branchName
+                    obj.corpType=this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].corpType
                     // 结算单位
                     obj.corpId = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1]
                         .corpId

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

@@ -113,7 +113,7 @@
                 <template slot="corpCnName" slot-scope="{ row,index }">
                     <dic-select v-if="row.edit" :key="updateSearchKey" v-model="row.shortName" placeholder="结算单位"
                         label="shortName" res="records" :slotRight="true" rightLabel="code"
-                        :url="'/blade-los/bcorps/selectList?status=0&current=1&size=5&corpTypeName=' + row.corpType"
+                        :url="'/blade-los/bcorps/selectList?status=0&current=1&size=5&corpTypeName=' + (row.corpType?row.corpType:null)"
                         :filterable="true" :remote="true" dataName="shortName"
                         @selectChange="rowDicChange('shortName', $event, row)"></dic-select>
                     <span v-else>{{ row.shortName }}</span>
@@ -292,7 +292,7 @@
                 <template slot="corpCnName" slot-scope="{ row,index }">
                     <dic-select v-if="row.edit" :key="updateSearchKey" v-model="row.shortName" placeholder="结算单位"
                         label="shortName" res="records" :slotRight="true" rightLabel="code"
-                        :url="'/blade-los/bcorps/selectList?status=0&current=1&size=5&corpTypeName=' + row.corpType"
+                        :url="'/blade-los/bcorps/selectList?status=0&current=1&size=5&corpTypeName=' + (row.corpType?row.corpType:null)"
                         :filterable="true" :remote="true" dataName="shortName"
                         @selectChange="rowDicChange('shortNameC', $event, row)"></dic-select>
                     <span v-else>{{ row.shortName }}</span>
@@ -2103,14 +2103,15 @@ export default {
                 if (this.assemblyForm.feeCenterListD.length != 0) {
                     obj.branchId = this.assemblyForm.branchId
                     obj.branchName = this.assemblyForm.branchName
+                    obj.corpType=this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length - 1].corpType
                     // 结算单位
                     obj.corpId = this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length - 1].corpId
                     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.generationCorpId = this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length - 1].generationCorpId
+                    obj.generationCorpEnName = this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length - 1].generationCorpEnName
+                    obj.generationCorpCnName = this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length - 1].generationCorpCnName
                     // // 费用简称
                     // obj.feeId = this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length - 1].feeId
                     // obj.feeCnName = this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length - 1].feeCnName
@@ -2205,6 +2206,7 @@ export default {
                     obj.branchId = this.assemblyForm.branchId
                     obj.branchName = this.assemblyForm.branchName
                     // 结算单位
+                    obj.corpType=this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].corpType
                     obj.corpId = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].corpId
                     obj.corpCnName = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].corpCnName
                     obj.corpEnName = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].corpEnName

src/views/iosBasicData/bcorps/detailsPage.vue

@@ -8,6 +8,7 @@
           </el-button>
           <h4 style="margin: 0">往来单位</h4>
           <dev>
+            <el-button v-if="formData.id" type="success" @click="fix">修改资料</el-button>
             <el-button type="primary" @click="submitForm">保存</el-button>
           </dev>
         </div>
@@ -1165,6 +1166,7 @@ import {
   getBcorpsDetail,
   bcorpsattnRemove,
   bcorpsbankRemove,
+  updateSynchronize,
   bcorpsfilesRemove, bcorpsrenameRemove, corpsinvoiceheaderRemove, bcorpsbadrecordRemove, createUser
 } from "@/api/iosBasicData/bcorps";
 import { bcountrysList } from "@/api/iosBasicData/bcountrys";
@@ -1519,6 +1521,84 @@ export default {
   },
   mounted() { },
   methods: {
+    fix() {
+      this.$DialogForm.show({
+        title: '进场导入',
+        width: '30%',
+        data: {
+          ...this.formData
+        },
+        menuPosition: 'right',
+        option: {
+          submitText: '确定',
+          emptyText: '取消',
+          // labelWidth: 130,
+          column: [
+            {
+              label: "客户编号",
+              span: 24,
+              prop: "code",
+              rules: [{
+                required: true,
+                message: "请输入客户编号",
+                trigger: "blur",
+              }],
+            },
+            {
+              label: "客户简称",
+              span: 24,
+              prop: "shortName",
+              rules: [{
+                required: true,
+                message: "请输入客户简称",
+                trigger: "blur",
+              }],
+            },
+            {
+              label: "客户名称",
+              span: 24,
+              prop: "cnName",
+              rules: [{
+                required: true,
+                message: "请输入客户名称",
+                trigger: "blur",
+              }],
+            },
+            {
+              label: "英文名称",
+              span: 24,
+              prop: "enName",
+              rules: [{
+                required: true,
+                message: "请输入英文名称",
+                trigger: "blur",
+              }],
+            },
+          ]
+        },
+        beforeClose: (done) => {
+          done()
+        },
+        callback: (res) => {
+          res.done()
+          let obj = {
+            ...res.data
+          }
+          const loading = this.$loading({
+            lock: true,
+            text: '加载中',
+            spinner: 'el-icon-loading',
+            background: 'rgba(255,255,255,0.7)'
+          });
+          updateSynchronize(obj).then(res => {
+            this.getBcorpsDetailfun(this.formData.id)
+          }).finally(() => {
+            loading.close();
+          })
+          res.close()
+        }
+      })
+    },
     bookingAgentChange(value) {
       if (!value) {
         this.$set(this.formData, 'bookingAgentId', '')

src/views/iosBasicData/businessCenter/customerBooking/components/DistributionBox/containers.vue

@@ -315,11 +315,11 @@ export default {
                         minRows: 3,
                         span: 24,
                     },
-                    {
-                        label: "POD堆场",
-                        prop: "podStationCname",
-                        width: "140",
-                    },
+                    // {
+                    //     label: "POD堆场",
+                    //     prop: "podStationCname",
+                    //     width: "140",
+                    // },
                     // {
                     //     label: "MARKS",
                     //     prop: "marks",

src/views/iosBasicData/financeProfit/index.vue

@@ -408,6 +408,31 @@ export default {
                         overHidden: true,
                     },
                     {
+                        label: "人民币利润",
+                        prop: "amountProfit",
+                        overHidden: true,
+                    },
+                    {
+                        label: "美元利润",
+                        prop: "amountProfitUsd",
+                        overHidden: true,
+                    },
+                    {
+                        label: "应收海运费",
+                        prop: "oceanFreightDr",
+                        overHidden: true,
+                    },
+                    {
+                        label: "应付海运费",
+                        prop: "oceanFreightCr",
+                        overHidden: true,
+                    },
+                    {
+                        label: "海运费利润",
+                        prop: "oceanFreightProfit",
+                        overHidden: true,
+                    },
+                    {
                         label: "单票利润",
                         prop: "amountProfitLoc",
                         overHidden: true,
@@ -527,12 +552,37 @@ export default {
                     prop: 'realAmountCrLoc'
                 },
                 {
+                    id: 10,
+                    label: "人民币利润",
+                    prop: "amountProfit",
+                },
+                {
+                    id: 11,
+                    label: "美元利润",
+                    prop: "amountProfitUsd",
+                },
+                {
+                    id: 12,
+                    label: "应收海运费",
+                    prop: "oceanFreightDr",
+                },
+                {
                     id: 13,
+                    label: "应付海运费",
+                    prop: "oceanFreightCr",
+                },
+                {
+                    id: 14,
+                    label: "海运费利润",
+                    prop: "oceanFreightProfit",
+                },
+                {
+                    id: 15,
                     label: '单票利润',
                     prop: 'amountProfitLoc'
                 },
                 {
-                    id: 14,
+                    id: 16,
                     label: '实际单票利润',
                     prop: 'realAmountProfitLoc'
                 },

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

@@ -26,6 +26,8 @@
                     <el-button v-if="tabsValue == 'C' || tabsValue == 'D'" type="primary" size="small" plain
                         @click="chooseSettlement()">选择结算
                     </el-button>
+                    <el-button v-if="tabsValue == 'D'" type="success" size="small" plain @click="allClick('已开已收')">已开已收
+                    </el-button>
                     <el-button v-if="tabsValue == '业务单据'" type="primary" size="small" plain @click="addfun()">添加单据
                     </el-button>
                     <el-button v-if="tabsValue == '业务单据'" type="danger" size="small" plain @click="handleDelete()">一键删除
@@ -76,7 +78,7 @@
 
 <script>
 import { fininvoicesList, generateFinStlBills } from "@/api/iosBasicData/fininvoices";
-import { finstlbillsList, finstlbillsRemove } from "@/api/iosBasicData/finstlbills";
+import { finstlbillsList, finstlbillsRemove, openedReceived } from "@/api/iosBasicData/finstlbills";
 import finstlbillsDetails from "@/views/iosBasicData/CollectionSettlement/finstlbillsDetails.vue";
 import settlementDetails from "@/views/iosBasicData/ComputationCenter/settlementDetails.vue";
 import { getBcorpslistByType } from "@/api/iosBasicData/bcorps";
@@ -405,7 +407,7 @@ export default {
                         label: "发票汇率",
                         prop: "exrate",
                         overHidden: true,
-                        hide: true,
+                        // hide: true,
                     },
                     {
                         label: "是否转人民币",
@@ -478,6 +480,28 @@ export default {
         }, 100);
     },
     methods: {
+        allClick(name) {
+            if (name == '已开已收') {
+                let ids = []
+                for (let item of this.selectionList) {
+                    ids.push(item.id)
+                }
+                this.$confirm('是否确认处理?', '提示', {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    type: 'warning'
+                }).then(() => {
+                    openedReceived({ billId: ids.join(',') }).then(res => {
+                        this.$message({
+                            type: 'success',
+                            message: '操作成功!'
+                        });
+                        this.refreshChange()
+                    })
+                })
+
+            }
+        },
         // 获取业务类型
         bbusinesstypeListfun() {
             bbusinesstypeList(1, 50).then(res => {
@@ -717,7 +741,7 @@ export default {
                 this.findObject(this.option.column, "createUserName").search = false
                 this.findObject(this.option.column, "createUserNames").hide = false
                 this.findObject(this.option.column, "createUserNames").search = true
-                this.findObject(this.option.column, "exrate").hide = true
+                // this.findObject(this.option.column, "exrate").hide = true
                 this.findObject(this.option.column, "isExchangeToCny").hide = true
                 this.findObject(this.option.column, "invCorpCnName").hide = true
                 this.findObject(this.option.column, "type").hide = true
@@ -733,7 +757,7 @@ export default {
                 this.findObject(this.option.column, "createUserName").search = true
                 this.findObject(this.option.column, "createUserNames").hide = true
                 this.findObject(this.option.column, "createUserNames").search = false
-                this.findObject(this.option.column, "exrate").hide = false
+                // this.findObject(this.option.column, "exrate").hide = false
                 this.findObject(this.option.column, "isExchangeToCny").hide = false
                 this.findObject(this.option.column, "invCorpCnName").hide = false
                 this.findObject(this.option.column, "type").hide = false

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

@@ -78,8 +78,13 @@
                                             v-model="form.isDk">
                                         </el-checkbox>
                                     </tempalte>
-                                    <tempalte slot="remarks">
-                                        <el-input type="textarea" :rows="2" placeholder="请输入 备注" v-model="form.remarks">
+                                    <tempalte slot="email">
+                                        <el-input placeholder="请输入 邮箱" v-model="form.email" size="small">
+                                        </el-input>
+                                    </tempalte>
+                                    <tempalte slot="elecRemarks">
+                                        <el-input type="textarea" :rows="2" placeholder="请输入 全电发票"
+                                            v-model="form.elecRemarks">
                                         </el-input>
                                     </tempalte>
                                 </avue-form>
@@ -394,8 +399,13 @@ export default {
                         disabled: true
                     },
                     {
-                        label: '备注',
-                        prop: 'remarks',
+                        label: '邮箱',
+                        prop: 'email',
+                        disabled: false
+                    },
+                    {
+                        label: '全电发票',
+                        prop: 'elecRemarks',
                         type: 'textarea',
                         minRows: 2,
                     }]

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

@@ -82,8 +82,12 @@
                                         <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">
+                             <tempalte slot="email">
+                                        <el-input  placeholder="请输入 邮箱" v-model="form.email" size="small">
+                                        </el-input>
+                                    </tempalte>
+                                    <tempalte slot="elecRemarks">
+                                        <el-input type="textarea" :rows="2" placeholder="请输入 全电发票" v-model="form.elecRemarks">
                                         </el-input>
                                     </tempalte>
                                 </avue-form>
@@ -403,8 +407,13 @@ export default {
                         disabled: true
                     },
                     {
-                        label: '备注',
-                        prop: 'remarks',
+                        label: '邮箱',
+                        prop: 'email',
+                        disabled: false
+                    },
+                    {
+                        label: '全电发票',
+                        prop: 'elecRemarks',
                         type: 'textarea',
                         minRows: 2,
                     }]

src/views/ow/contract/detailsPage.vue

@@ -51,7 +51,7 @@
               :disabled="editDisabled"></dic-select>
           </template>
           <template slot="perDiemAfterFreeDays">
-            <el-button type="primary" size="small" @click.stop="openRtDialog" :disabled="editDisabled">箱租金条款</el-button>
+            <el-button type="primary" size="small" @click.stop="openRtDialog">箱租金条款</el-button>
             <!-- <el-link type="primary" :underline="false" @click.stop="openRtDialog">箱租金条款</el-link> -->
           </template>
           <template slot="boxNumber">
@@ -91,16 +91,16 @@
         </template>
         <template slot="menu" slot-scope="{ row, index }">
           <el-button size="small" icon="el-icon-edit" type="text" @click="rowEdit(row, index)"
-            :disabled="feeCenterListD.filter(item => item.feeCnName == '租箱费').length > 0">{{ row.$cellEdit ? '保存' :
+            :disabled="editDisabled||feeCenterListD.filter(item => item.feeCnName == '租箱费').length > 0">{{ row.$cellEdit ? '保存' :
               '编辑'
             }}</el-button>
           <el-button size="small" icon="el-icon-delete" type="text" @click="rowDel(row, index)"
-            :disabled="feeCenterListD.filter(item => item.feeCnName == '租箱费').length > 0">删除</el-button>
+            :disabled="editDisabled||feeCenterListD.filter(item => item.feeCnName == '租箱费').length > 0">删除</el-button>
         </template>
       </avue-crud>
       <span slot="footer" class="dialog-footer">
         <el-button type="primary" @click="rtSubmit" size="mini"
-          :disabled="feeCenterListD.filter(item => item.feeCnName == '租箱费').length > 0">保 存</el-button>
+          :disabled="editDisabled||feeCenterListD.filter(item => item.feeCnName == '租箱费').length > 0">保 存</el-button>
       </span>
     </el-dialog>
   </div>

src/views/ow/owPut/detailsPage.vue

@@ -112,8 +112,7 @@
                   :disabled="editDisabled || form.whetherEnable == '是'"></dic-select>
               </template>
               <template slot="perDiemAfterFreeDays">
-                <el-button type="primary" size="small" @click.stop="openRtDialog"
-                  :disabled="editDisabled">箱租金条款</el-button>
+                <el-button type="primary" size="small" @click.stop="openRtDialog">箱租金条款</el-button>
                 <!-- <el-link type="primary" :underline="false" @click.stop="openRtDialog">箱租金条款</el-link> -->
               </template>
               <template slot="boxNumber">
@@ -237,9 +236,9 @@
             @selection-change="pickChange" @resetColumn="resetColumn('crud5', 'pickOption', 'pickOptionBack', 518)"
             @saveColumn="saveColumn('crud5', 'pickOption', 'pickOptionBack', 518)">
             <template slot="menuLeft">
-              <el-button type="info" plain size="small" :disabled="editDisabled || selecPickList.length == 0"
+              <el-button type="info" plain size="small" :disabled="selecPickList.length == 0"
                 @click="allClick('合并生成')">合并生成费用</el-button>
-              <el-button type="danger" plain size="small" :disabled="editDisabled || selecPickList.length == 0"
+              <el-button type="danger" plain size="small" :disabled="selecPickList.length == 0"
                 @click="allClick('撤销生成')">撤销生成费用</el-button>
               <el-button type="warning" plain size="small" @click="allClick('批量导入费用')">批量导入费用</el-button>
             </template>
@@ -252,9 +251,9 @@
             @selection-change="perChange" @resetColumn="resetColumn('crud6', 'perOption', 'perOptionBack', 519)"
             @saveColumn="saveColumn('crud6', 'perOption', 'perOptionBack', 519)">
             <template slot="menuLeft">
-              <el-button type="info" plain size="small" :disabled="editDisabled || selecPerList.length == 0"
+              <el-button type="info" plain size="small" :disabled="selecPerList.length == 0"
                 @click="allClick('合并生成2')">合并生成费用</el-button>
-              <el-button type="danger" plain size="small" :disabled="editDisabled || selecPerList.length == 0"
+              <el-button type="danger" plain size="small" :disabled="selecPerList.length == 0"
                 @click="allClick('撤销生成2')">撤销生成费用</el-button>
               <el-button type="success" plain size="small" @click="allClick('生成租金')"
                 :disabled="form.tradingBoxItemsList.length == 0">生成租金</el-button>
@@ -593,16 +592,16 @@
         </template>
         <template slot="menu" slot-scope="{ row, index }">
           <el-button size="small" icon="el-icon-edit" type="text" @click="rowEdit(row, index)"
-            :disabled="feeCenterListD.filter(item => item.feeCnName == '租箱费').length > 0">{{ row.$cellEdit ? '保存' :
+            :disabled="editDisabled||feeCenterListD.filter(item => item.feeCnName == '租箱费').length > 0">{{ row.$cellEdit ? '保存' :
               '编辑'
             }}</el-button>
           <el-button size="small" icon="el-icon-delete" type="text" @click="rowDel(row, index)"
-            :disabled="feeCenterListD.filter(item => item.feeCnName == '租箱费').length > 0">删除</el-button>
+            :disabled="editDisabled||feeCenterListD.filter(item => item.feeCnName == '租箱费').length > 0">删除</el-button>
         </template>
       </avue-crud>
       <span slot="footer" class="dialog-footer">
         <el-button type="primary" @click="rtSubmit" size="mini"
-          :disabled="feeCenterListD.filter(item => item.feeCnName == '租箱费').length > 0">保 存</el-button>
+          :disabled="editDisabled||feeCenterListD.filter(item => item.feeCnName == '租箱费').length > 0">保 存</el-button>
       </span>
     </el-dialog>
     <el-dialog append-to-body title="批量修改POD场站" :visible.sync="podDialog" width="30%" v-dialog-drag>
@@ -2443,11 +2442,11 @@ export default {
     },
     countChange(row) {
       if (row.curCode == this.getLocalCurrency()) {
-        row.amountCNY = _.round(_.multiply(row.price, row.quantity), 2)
+        row.amountCNY = _.round(_.multiply(Number(row.price ? row.price : 0), Number(row.quantity ? row.quantity : 0)), 2)
         row.amountUSD = 0
       } else {
         row.amountCNY = 0
-        row.amountUSD = _.round(_.multiply(row.price, row.quantity), 2)
+        row.amountUSD = _.round(_.multiply(Number(row.price ? row.price : 0), Number(row.quantity ? row.quantity : 0)), 2)
       }
     },
     activationSubmit() {

src/views/ow/owTask/detailsPage.vue

@@ -109,8 +109,7 @@
                   dataName="cnName" :disabled="editDisabled || form.whetherEnable == '是'"></dic-select>
               </template>
               <template slot="perDiemAfterFreeDays">
-                <el-button type="primary" size="small" @click.stop="openRtDialog"
-                  :disabled="editDisabled">箱租金条款</el-button>
+                <el-button type="primary" size="small" @click.stop="openRtDialog">箱租金条款</el-button>
                 <!-- <el-link type="primary" :underline="false" @click.stop="openRtDialog">箱租金条款</el-link> -->
               </template>
               <template slot="boxNumber">
@@ -235,9 +234,9 @@
             @selection-change="pickChange" @resetColumn="resetColumn('crud5', 'pickOption', 'pickOptionBack', 518)"
             @saveColumn="saveColumn('crud5', 'pickOption', 'pickOptionBack', 518)">
             <template slot="menuLeft">
-              <el-button type="info" plain size="small" :disabled="editDisabled || selecPickList.length == 0"
+              <el-button type="info" plain size="small" :disabled="selecPickList.length == 0"
                 @click="allClick('合并生成')">合并生成费用</el-button>
-              <el-button type="danger" plain size="small" :disabled="editDisabled || selecPickList.length == 0"
+              <el-button type="danger" plain size="small" :disabled="selecPickList.length == 0"
                 @click="allClick('撤销生成')">撤销生成费用</el-button>
               <el-button type="warning" plain size="small" @click="allClick('批量导入费用')">批量导入费用</el-button>
             </template>
@@ -250,9 +249,9 @@
             @selection-change="perChange" @resetColumn="resetColumn('crud6', 'perOption', 'perOptionBack', 519)"
             @saveColumn="saveColumn('crud6', 'perOption', 'perOptionBack', 519)">
             <template slot="menuLeft">
-              <el-button type="info" plain size="small" :disabled="editDisabled || selecPerList.length == 0"
+              <el-button type="info" plain size="small" :disabled="selecPerList.length == 0"
                 @click="allClick('合并生成2')">合并生成费用</el-button>
-              <el-button type="danger" plain size="small" :disabled="editDisabled || selecPerList.length == 0"
+              <el-button type="danger" plain size="small" :disabled="selecPerList.length == 0"
                 @click="allClick('撤销生成2')">撤销生成费用</el-button>
               <el-button type="success" plain size="small" @click="allClick('生成箱使费')"
                 :disabled="form.tradingBoxItemsList.length == 0">生成箱使费</el-button>
@@ -600,16 +599,16 @@
         </template>
         <template slot="menu" slot-scope="{ row, index }">
           <el-button size="small" icon="el-icon-edit" type="text" @click="rowEdit(row, index)"
-            :disabled="feeCenterListD.filter(item => item.feeCnName == '租箱费').length > 0">{{ row.$cellEdit ? '保存' :
+            :disabled="editDisabled||feeCenterListD.filter(item => item.feeCnName == '租箱费').length > 0">{{ row.$cellEdit ? '保存' :
               '编辑'
             }}</el-button>
           <el-button size="small" icon="el-icon-delete" type="text" @click="rowDel(row, index)"
-            :disabled="feeCenterListD.filter(item => item.feeCnName == '租箱费').length > 0">删除</el-button>
+            :disabled="editDisabled||feeCenterListD.filter(item => item.feeCnName == '租箱费').length > 0">删除</el-button>
         </template>
       </avue-crud>
       <span slot="footer" class="dialog-footer">
         <el-button type="primary" @click="rtSubmit" size="mini"
-          :disabled="feeCenterListD.filter(item => item.feeCnName == '租箱费').length > 0">保 存</el-button>
+          :disabled="editDisabled||feeCenterListD.filter(item => item.feeCnName == '租箱费').length > 0">保 存</el-button>
       </span>
     </el-dialog>
     <el-dialog append-to-body title="批量修改POD场站" :visible.sync="podDialog" width="30%" v-dialog-drag>
@@ -2453,11 +2452,11 @@ export default {
     },
     countChange(row) {
       if (row.curCode == this.getLocalCurrency()) {
-        row.amountCNY = _.round(_.multiply(row.price, row.quantity), 2)
+        row.amountCNY = _.round(_.multiply(Number(row.price ? row.price : 0), Number(row.quantity ? row.quantity : 0)), 2)
         row.amountUSD = 0
       } else {
         row.amountCNY = 0
-        row.amountUSD = _.round(_.multiply(row.price, row.quantity), 2)
+        row.amountUSD = _.round(_.multiply(Number(row.price ? row.price : 0), Number(row.quantity ? row.quantity : 0)), 2)
       }
     },
     activationSubmit() {

src/views/system/dept.vue

@@ -42,9 +42,8 @@
                     >
                     </search-query> -->
                     <dic-select v-model="form.polCnName" placeholder="港口" key="id" label="code"
-                        url="/blade-los/bports/listAll?status=0" :filterable="true"  :multiple="true"
-                        :collapseTags="true" dataType="string" @selectChange="dicChange('polCnName', $event)"
-                        :slotRight="true" rightLabel="code" :multipleStrings="true"></dic-select>
+                        url="/blade-los/bports/listAll?status=0" :filterable="true"
+                        @selectChange="dicChange('polCnName', $event)" :slotRight="true" rightLabel="code"></dic-select>
                 </template>
                 <template slot="regionForm">
                     <avue-cascader :emit-path="true" showAllLevelss v-model="form.region" placeholder="请选择产品分类"
@@ -207,7 +206,8 @@ export default {
                         hide: true, // 表格里是否可见
                         addDisplay: false, //当前行数据在新增表单中是否可见
                         editDisplay: false, //当前行数据在编辑表单中是否可见
-                        viewDisplay: false // 当前行数据在查看表单中是否可见
+                        viewDisplay: false, // 当前行数据在查看表单中是否可见
+                        overHidden: true
                     },
                     {
                         label: "英文全称",
@@ -438,19 +438,11 @@ export default {
         dicChange(name, row) {
             if (name == 'polCnName') {
                 if (row) {
-                    console.log(row)
-                    let enNames = []
-                    let codes = []
-                    // let namePrints=[]
-                    for (let item of row.multipleData) {
-                        enNames.push(item.enName)
-                        codes.push(item.code)
-                    }
-                    this.form.polId = row.ids
-                    this.form.polCnName = row.names
-                    this.form.polEnName = row.names;
-                    this.form.polCode = row.names;
-                    this.form.polNamePrint = row.names;
+                    this.form.polId = row.id
+                    this.form.polCnName = row.cnName
+                    this.form.polEnName = row.enName;
+                    this.form.polCode = row.code;
+                    this.form.polNamePrint = row.enName;
                 } else {
                     this.form.polId = null
                     this.form.polCnName = null