1.箱管 箱池动态 画新弹窗 联调8个接口 完善功能

2.集装箱管理导入不加判断
3.预定仓，订舱备注没有显示
4.预定仓生成出口，付费方式不显示
5.预订舱 修改订舱约号
6.海运进口 业务合计金额不对
7.海运进出口 分单去掉所有限制

src/views/boxManagement/agentBox/detailsPage.vue

@@ -138,7 +138,7 @@
                 <el-button type="danger" plain size="small" :disabled="editDisabled || selectionList.length == 0"
                   @click="allClick('批量删除')">批量删除</el-button>
                 <el-button type="success" size="small" @click="allClick('导入')"
-                  :disabled="!form.id || form.whetherEnable == '是'">导入</el-button>
+                  :disabled="!form.id">导入</el-button>
                 <el-button type="info" size="small" @click="allClick('启用')"
                   :disabled="selectionList.length == 0">启用</el-button>
                 <!-- <el-button type="primary" size="small" @click="allClick('卖箱')">卖箱</el-button> -->

src/views/boxManagement/boxAdjustment/detailsPage.vue

@@ -133,7 +133,7 @@
                 <el-button type="danger" plain size="small"
                   :disabled="editDisabled || selectionList.length == 0 || form.buxStaus == '已确认'"
                   @click="allClick('批量删除')">批量删除</el-button>
-                <el-button type="success" size="small">导入</el-button>
+                <el-button type="success" size="small" :disabled="!form.id">导入</el-button>
                 <!-- <el-button type="primary" size="small" @click="allClick('卖箱')">卖箱</el-button> -->
                 <el-button size="small" style="margin-right: 8px" :disabled="!form.id || true"
                   @click="$refs.print.openDialog()">打印报表

src/views/boxManagement/boxCost/detailsPage.vue

@@ -68,7 +68,7 @@
                   :disabled="editDisabled || selectionList.length == 0 || form.buxStaus == '已确认'"
                   @click="allClick('批量删除')">批量删除</el-button>
                 <el-button type="success" size="small" @click="allClick('导入')"
-                  :disabled="!form.id || form.buxStaus == '已确认'">导入</el-button>
+                  :disabled="!form.id">导入</el-button>
                 <!-- <el-button type="info" size="small" @click="allClick('启用')"
                   :disabled="selectionList.length == 0">启用</el-button> -->
                 <!-- <el-button type="primary" size="small" @click="allClick('卖箱')">卖箱</el-button> -->

src/views/boxManagement/boxExit/detailsPage.vue

@@ -119,7 +119,7 @@
                 <el-button type="danger" plain size="small"
                   :disabled="editDisabled || selectionList.length == 0 || form.buxStaus == '已确认'"
                   @click="allClick('批量删除')">批量删除</el-button>
-                <el-button type="success" size="small">导入</el-button>
+                <el-button type="success" size="small" :disabled="!form.id">导入</el-button>
                 <!-- <el-button type="primary" size="small" @click="allClick('卖箱')">卖箱</el-button> -->
                 <el-button size="small" style="margin-right: 8px" :disabled="!form.id || true"
                   @click="$refs.print.openDialog()">打印报表

src/views/boxManagement/buyContainer/detailsPage.vue

@@ -77,7 +77,7 @@
                 <el-button type="danger" plain size="small" :disabled="editDisabled || selectionList.length == 0"
                   @click="allClick('批量删除')">批量删除</el-button>
                 <el-button type="success" size="small" @click="allClick('导入')"
-                  :disabled="!form.id || form.whetherEnable == '是'">导入</el-button>
+                  :disabled="!form.id">导入</el-button>
                 <el-button type="info" size="small" @click="allClick('启用')"
                   :disabled="selectionList.length == 0">启用</el-button>
                 <!-- <el-button type="primary" size="small" @click="allClick('卖箱')">卖箱</el-button> -->

src/views/boxManagement/rentalBox/detailsPage.vue

@@ -128,7 +128,7 @@
                 <el-button type="danger" plain size="small" @click="allClick('撤销退租')"
                   :disabled="form.buxStaus != '已退租'">撤销退租</el-button>
                 <el-button type="success" size="small" @click="allClick('导入')"
-                  :disabled="!form.id || form.buxStaus != '录入'">导入</el-button>
+                  :disabled="!form.id">导入</el-button>
                 <el-button type="info" size="small" @click="allClick('启用')"
                   :disabled="selectionList.length == 0 || form.buxStaus != '已启租'">启用</el-button>
                 <!-- <el-button type="primary" size="small" @click="allClick('卖箱')">卖箱</el-button> -->

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

@@ -737,15 +737,15 @@
                                 </el-form-item>
                             </el-col>
                             <el-col :span="11">
-                                <el-form-item label="客服" prop="accDeptName" label-width="40px">
+                                <el-form-item label="客服" prop="customerServiceName" label-width="40px">
                                     <span slot="label">
                                         <span style="color: #1e9fff">客服</span>
                                     </span>
-                                    <dic-select v-model="assemblyForm.accDeptName" placeholder="客服"
+                                    <dic-select v-model="assemblyForm.customerServiceName" placeholder="客服"
                                         :key="assemblyForm.branchId" label="realName"
                                         :url="'/blade-user/userListAll?roleAlias=客服&deptId=' + assemblyForm.branchId"
                                         :filterable="true" dataName="realName"
-                                        @selectChange="dicChange('accDeptName', $event)"
+                                        @selectChange="dicChange('customerServiceName', $event)"
                                         :disabled="detailData.seeDisabled || assemblyForm.feeCenterListD.filter(item => item.auditStatus > 0).length || assemblyForm.feeCenterListC.filter(item => item.auditStatus > 0).length"></dic-select>
                                 </el-form-item>
                             </el-col>
@@ -1289,8 +1289,8 @@ export default {
         treeChange(val) {
             for (let item of this.dicTree) {
                 if (item.title == val) {
-                    this.assemblyForm.accDeptName = item.title
-                    this.assemblyForm.accDept = item.id
+                    this.assemblyForm.customerServiceName = item.title
+                    this.assemblyForm.customerServiceId = item.id
                 }
             }
         },
@@ -1405,13 +1405,13 @@ export default {
                     this.assemblyForm.operatorId = null
                 }
             }
-            if (name == 'accDeptName') {
+            if (name == 'customerServiceName') {
                 if (row) {
-                    this.assemblyForm.accDeptName = row.realName
-                    this.assemblyForm.accDept = row.id
+                    this.assemblyForm.customerServiceName = row.realName
+                    this.assemblyForm.customerServiceId = row.id
                 } else {
-                    this.assemblyForm.accDeptName = null
-                    this.assemblyForm.accDept = null
+                    this.assemblyForm.customerServiceName = null
+                    this.assemblyForm.customerServiceId = null
                 }
             }
             if (name == 'branchName') {

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

@@ -1650,21 +1650,23 @@ export default {
                 let sumD = 0
                 let sumC = 0
                 sumArr.forEach(item => {
-                    if (item.curCode == this.getLocalCurrency() && item.dc == 'D') {
-                        rmbD += Number(item.rmbAmount ? item.rmbAmount : 0)
-                        sumD += Number(item.rmbAmount ? item.rmbAmount : 0)
-                    }
-                    if (item.curCode == this.getLocalCurrency() && item.dc == 'C') {
-                        rmbC += Number(item.rmbAmount ? item.rmbAmount : 0)
-                        sumC += Number(item.rmbAmount ? item.rmbAmount : 0)
-                    }
-                    if (item.curCode != this.getLocalCurrency() && item.dc == 'D') {
-                        usdD += Number(item.usdAmount ? item.usdAmount : 0)
-                        sumD += Number(item.usdAmount ? item.usdAmount : 0) * Number(item.exrate ? item.exrate : 0)
-                    }
-                    if (item.curCode != this.getLocalCurrency() && item.dc == 'C') {
-                        usdC += Number(item.usdAmount ? item.usdAmount : 0)
-                        sumC += Number(item.usdAmount ? item.usdAmount : 0) * Number(item.exrate ? item.exrate : 0)
+                    if (e == item.shortName) {
+                        if (item.curCode == this.getLocalCurrency() && item.dc == 'D') {
+                            rmbD += Number(item.rmbAmount ? item.rmbAmount : 0)
+                            sumD += Number(item.rmbAmount ? item.rmbAmount : 0)
+                        }
+                        if (item.curCode == this.getLocalCurrency() && item.dc == 'C') {
+                            rmbC += Number(item.rmbAmount ? item.rmbAmount : 0)
+                            sumC += Number(item.rmbAmount ? item.rmbAmount : 0)
+                        }
+                        if (item.curCode != this.getLocalCurrency() && item.dc == 'D') {
+                            usdD += Number(item.usdAmount ? item.usdAmount : 0)
+                            sumD += Number(item.usdAmount ? item.usdAmount : 0) * Number(item.exrate ? item.exrate : 0)
+                        }
+                        if (item.curCode != this.getLocalCurrency() && item.dc == 'C') {
+                            usdC += Number(item.usdAmount ? item.usdAmount : 0)
+                            sumC += Number(item.usdAmount ? item.usdAmount : 0) * Number(item.exrate ? item.exrate : 0)
+                        }
                     }
                 })
                 this.sumData.push({

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

@@ -700,15 +700,15 @@
                                 </el-form-item>
                             </el-col>
                             <el-col :span="11">
-                                <el-form-item label="客服" prop="accDeptName" label-width="40px">
+                                <el-form-item label="客服" prop="customerServiceName" label-width="40px">
                                     <span slot="label">
                                         <span style="color: #1e9fff">客服</span>
                                     </span>
-                                    <dic-select v-model="assemblyForm.accDeptName" placeholder="客服"
+                                    <dic-select v-model="assemblyForm.customerServiceName" placeholder="客服"
                                         :key="assemblyForm.branchId" label="realName"
                                         :url="'/blade-user/userListAll?roleAlias=客服&deptId=' + assemblyForm.branchId"
                                         :filterable="true" dataName="realName"
-                                        @selectChange="dicChange('accDeptName', $event)"
+                                        @selectChange="dicChange('customerServiceName', $event)"
                                         :disabled="detailData.seeDisabled || assemblyForm.feeCenterListD.filter(item => item.auditStatus > 0).length || assemblyForm.feeCenterListC.filter(item => item.auditStatus > 0).length"></dic-select>
                                 </el-form-item>
                             </el-col>
@@ -1427,8 +1427,8 @@ export default {
         treeChange(val) {
             for (let item of this.dicTree) {
                 if (item.title == val) {
-                    this.assemblyForm.accDeptName = item.title
-                    this.assemblyForm.accDept = item.id
+                    this.assemblyForm.customerServiceName = item.title
+                    this.assemblyForm.customerServiceId = item.id
                 }
             }
         },
@@ -1557,13 +1557,13 @@ export default {
                     this.assemblyForm.operatorId = null
                 }
             }
-            if (name == 'accDeptName') {
+            if (name == 'customerServiceName') {
                 if (row) {
-                    this.assemblyForm.accDeptName = row.realName
-                    this.assemblyForm.accDept = row.id
+                    this.assemblyForm.customerServiceName = row.realName
+                    this.assemblyForm.customerServiceId = row.id
                 } else {
-                    this.assemblyForm.accDeptName = null
-                    this.assemblyForm.accDept = null
+                    this.assemblyForm.customerServiceName = null
+                    this.assemblyForm.customerServiceId = null
                 }
             }
             if (name == 'branchName') {

src/views/iosBasicData/businessCenter/bookingCabin/detailsPage.vue

@@ -59,10 +59,10 @@
               :url="'/blade-user/userListAll?roleAlias=操作员&deptId=' + form.branchId" :filterable="true"
               @selectChange="dicChange('operatorName', $event)" :disabled="editDisabled"></dic-select>
           </tempalte>
-          <tempalte slot="accDeptName">
-            <dic-select v-model="form.accDeptName" placeholder="客服" :key="form.branchId" label="realName"
+          <tempalte slot="customerServiceName">
+            <dic-select v-model="form.customerServiceName" placeholder="客服" :key="form.branchId" label="realName"
               :url="'/blade-user/userListAll?roleAlias=客服&deptId=' + form.branchId" :filterable="true"
-              @selectChange="dicChange('accDeptName', $event)" :disabled="editDisabled"></dic-select>
+              @selectChange="dicChange('customerServiceName', $event)" :disabled="editDisabled"></dic-select>
           </tempalte>
           <tempalte slot="polCnName">
             <dic-select v-model="form.polCnName" placeholder="起运港" key="id" label="cnName" res="records"
@@ -93,8 +93,8 @@
               :remote="true" dataName="shortName" @selectChange="dicChange('actualShippingCompanyCname', $event)"
               :slotRight="true" rightLabel="code" :disabled="editDisabled"></dic-select>
           </tempalte>
-          <tempalte slot="hpaymode">
-            <dic-select v-model="form.hpaymode" placeholder="付款方式" key="dictKey" label="dictValue" keyValue="dictKey"
+          <tempalte slot="mpaymode">
+            <dic-select v-model="form.mpaymode" placeholder="付款方式" key="dictKey" label="dictValue" keyValue="dictKey"
               url="/blade-system/dict-biz/dictionary?code=payment_method_los" :filterable="true"
               :disabled="editDisabled"></dic-select>
           </tempalte>
@@ -278,7 +278,7 @@ export default {
           },
           {
             label: '客服',
-            prop: "accDeptName",
+            prop: "customerServiceName",
             disabled: false,
           },
           {
@@ -327,8 +327,8 @@ export default {
             }]
           },
           {
-            label: 'booking NO',
-            prop: "bookingNo",
+            label: '船司约号',
+            prop: "carrierArgreementNo",
             disabled: false,
           },
           {
@@ -346,7 +346,7 @@ export default {
           },
           {
             label: '付费方式',
-            prop: "hpaymode",
+            prop: "mpaymode",
             disabled: false,
           },
           {
@@ -387,11 +387,6 @@ export default {
             label: '毛重(KGS)',
             prop: "grossWeight",
             disabled: false,
-            rules: [{
-              required: true,
-              message: " ",
-              trigger: "blur"
-            }]
           },
           {
             label: '尺码(CBM)',
@@ -413,7 +408,7 @@ export default {
           },
           {
             label: '订舱备注',
-            prop: "remarks",
+            prop: "cyRemarks",
             type: 'textarea',
             disabled: false,
             span: 24,
@@ -607,6 +602,14 @@ export default {
           this.form.operatorId = null
         }
       }
+      if (name == 'customerServiceName') {
+        if (row) {
+          this.form.customerServiceId = row.id
+        } else {
+          this.form.customerServiceName = null
+          this.form.customerServiceId = null
+        }
+      }
       if (name == 'polCnName') {
         if (row) {
           this.form.polId = row.id

src/views/ow/owPut/detailsPage.vue

@@ -47,6 +47,13 @@
                   :remote="true" dataName="cnName" :slotRight="true" rightLabel="code">
                 </dic-select>
               </tempalte>
+              <tempalte slot="containerNumber">
+                <dic-select v-model="form.containerNumber" placeholder="放箱号" :key="containerNumberKey"
+                  label="internalContainerNumber" :disabled="editDisabled || form.whetherEnable == '是'"
+                  :url="'/blade-los/putbox/selectContainerNumber?boxType=' + (form.boxTypeQuantityOne ? form.boxTypeQuantityOne : '') + '&polId=' + (form.polId ? form.polId : '') + '&podId=' + (form.podId ? form.podId : '') + '&polStationId=' + (form.polStationId ? form.polStationId : '')"
+                  :filterable="true">
+                </dic-select>
+              </tempalte>
               <!-- <tempalte slot="polStationCname">
                 <dic-select v-model="form.polStationCname" placeholder="起运港提/送箱场站" key="id" label="cnName" res="records"
                   url="/blade-los/bcorps/selectList?corpTypeName=场站&status=0" :filterable="true" :remote="true" dataName="cnName"
@@ -92,7 +99,8 @@
               <template slot="boxTypeQuantityOne">
                 <dic-select v-model="form.boxTypeQuantityOne" key="id" label="cnName" res="records"
                   url="/blade-los/bcntrtypes/list?status=0&current=1&size=20" :filterable="true" :remote="true"
-                  dataName="cnName" :disabled="editDisabled || form.whetherEnable == '是'"></dic-select>
+                  dataName="cnName" @selectChange="dicChange('boxTypeQuantityOne', $event)"
+                  :disabled="editDisabled || form.whetherEnable == '是'"></dic-select>
               </template>
               <template slot="perDiemAfterFreeDays">
                 <el-button type="primary" size="small" @click.stop="openRtDialog"
@@ -2039,6 +2047,7 @@ export default {
       updateSearchKey: new Date().getTime(),
       updateFormKey: new Date().getTime(),
       updateStationKey: new Date().getTime(),
+      containerNumberKey: new Date().getTime(),
       deptId: JSON.parse(localStorage.getItem('sysitemData')).deptId
     }
   },
@@ -2238,6 +2247,9 @@ export default {
           this.form.purchaseCompanyName = null
         }
       }
+      if (name == 'boxTypeQuantityOne') {
+        this.containerNumberKey = new Date().getTime()
+      }
       if (name == 'polStationCname') {
         if (row) {
           this.form.polStationId = row.id
@@ -2249,6 +2261,7 @@ export default {
           this.form.polStationEname = null
           this.form.polStationCname = null
         }
+        this.containerNumberKey = new Date().getTime()
       }
       if (name == 'polCyCname') {
         if (row) {
@@ -2284,7 +2297,6 @@ export default {
           this.form.polStationCode = null
           this.form.polStationCname = null
           this.form.polStationEname = null
-          this.updateFormKey = new Date().getTime()
         } else {
           this.form.polId = null
           this.form.polCode = null
@@ -2296,6 +2308,8 @@ export default {
           this.form.polStationCname = null
           this.form.polStationEname = null
         }
+        this.updateFormKey = new Date().getTime()
+        this.containerNumberKey = new Date().getTime()
       }
       if (name == 'podCname') {
         if (row) {
@@ -2305,6 +2319,7 @@ export default {
           this.form.podId = null
           this.form.podCname = null
         }
+        this.containerNumberKey = new Date().getTime()
       }
       if (name == 'polCname2') {
         if (row) {
@@ -2316,7 +2331,6 @@ export default {
           this.activationForm.polStationCode = null
           this.activationForm.polStationCname = null
           this.activationForm.polStationEname = null
-          this.updateStationKey = new Date().getTime()
         } else {
           this.activationForm.polId = null
           this.activationForm.polCode = null
@@ -2328,6 +2342,7 @@ export default {
           this.activationForm.polStationCname = null
           this.activationForm.polStationEname = null
         }
+        this.updateStationKey = new Date().getTime()
       }
       if (name == 'polStationCname2') {
         if (row) {
@@ -2354,7 +2369,7 @@ export default {
           this.activationForm.podCname = null
         }
       }
-            if (name == 'podStationCname3') {
+      if (name == 'podStationCname3') {
         if (row) {
           this.podForm.podStationId = row.id
           this.podForm.podStationCode = row.code