调试国际化 修改进出口费用修改申请 海运箱量统计，所属公司不显示；列表增加操作员和客服；数据只统计直单和分单 签单方式调整 用箱计划，提交后，增加撤销 用箱计划，复制单据报错 用箱计划，检索条件 用箱计划，港口加编码

src/api/iosBasicData/boxPlan/boxPlan.js

@@ -61,7 +61,14 @@ export function submitUseBoxPlan(data) {
         data: data
     })
 }
-
+// 撤销提交用箱计划
+export function revokeUseBoxPlan(data) {
+    return request({
+        url: '/api/blade-los/useboxplan/revokeUseBoxPlan',
+        method: 'post',
+        data: data
+    })
+}
 // 请核
 export function pleaseCheck(data) {
     return request({
@@ -82,7 +89,7 @@ export function repealCancel(data) {
 //单据复制
 export const copyAgent = (data) => {
     return request({
-        url: '/api/blade-los/bookingCabin/copyBillsBooking',
+        url: '/api/blade-los/useboxplan/copy',
         method: 'get',
         params: data
     })

src/api/system/menu.js

@@ -97,10 +97,8 @@ export const getTopMenu = () => request({
   method: 'get'
 });
 
-export const getRoutes = (topMenuId) => request({
+export const getRoutes = (data) => request({
   url: '/api/blade-system/menu/routes',
   method: 'get',
-  params: {
-    topMenuId,
-  }
+  params:data
 });

src/components/feeModify/main.vue

@@ -453,8 +453,8 @@ export default {
         ...this.oldForm,
         ...this.newForm,
         billDate: this.oldForm.billDate + ' 00:00:00',
-        etd: this.oldForm.etd + ' 00:00:00',
-        eta: this.oldForm.eta + ' 00:00:00',
+        etd: this.oldForm.etd?this.oldForm.etd + ' 00:00:00':null,
+        eta: this.oldForm.eta?this.oldForm.eta + ' 00:00:00':null,
         type: 0,
         id: null,
         pid: this.form.id,

src/router/avue-router.js

@@ -49,7 +49,6 @@ RouterPlugin.install = function (vue, option = {}) {
       if (hasKey) {
         // $t :this method from vue-i18n, inject in @/lang/index.js
         const translatedTitle = this.$vue.$t('route.' + key)
-
         return translatedTitle
       }
       return title

src/router/views/index.js

@@ -4323,7 +4323,7 @@ export default [{
     path: '/iosBasicData/boxPlan/boxPlan/index',
     name: '用箱计划',
     meta: {
-      i18n: '/iosBasicData/boxPlan/boxPlan/index',
+      i18n: 'boxPlan',
       keepAlive: true,
     },
     component: () => import( /* webpackChunkName: "views" */ '@/views/iosBasicData/boxPlan/boxPlan/index')

src/store/modules/user.js

@@ -232,7 +232,11 @@ const user = {
       dispatch
     }, topMenuId) {
       return new Promise(resolve => {
-        getRoutes(topMenuId).then((res) => {
+        const obj = {
+          topMenuId: topMenuId,
+          type:getStore({ name: 'language' })=='en'?1:0
+        }
+        getRoutes(obj).then((res) => {
           const data = res.data.data
           let menu = deepClone(data);
           menu.forEach(ele => {
@@ -273,7 +277,7 @@ const user = {
     SET_MENU_ALL: (state, menuAll) => {
       let menu = state.menuAll;
       menuAll.forEach(ele => {
-        ele.children.forEach(i=>{
+        ele.children.forEach(i => {
           delete i.source
         })
         if (!menu.find(item => item.label === ele.label && item.path === ele.path)) {

src/views/boxManagement/podComeback/index.vue

@@ -336,7 +336,7 @@ export default {
 
     },
     searchReset() {
-      this.query = this.$options.data().query;
+      this.query = { businessType: "SI", };
       this.onLoad(this.page);
     },
     // 搜索按钮点击

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

@@ -602,15 +602,15 @@ export default {
                 businessTypes: "海运",
                 billType: "DD", // 单据类型 默认 直单
                 accDeptName: "", // 核算部门 默认登录人的部门
-                issueType: "ORI", // 签单方式 默认 正本提单
+                issueType: "TER", // 签单方式 默认 正本提单
                 mpaymode: "PP", // 主单付费方式 默认PP
                 hpaymode: "PP", // 分单付费方式 默认 PP
                 polFreeBoxUseDays: 7,
                 podFreeBoxUseDays: 14,
                 loadType: "整箱", // 装箱方式默认整箱
                 srcType: "OWN", // 业务来源默认公司   来源 内容 默认登录人所属公司
-                numberOfObl: "THREE", // 正本份数 默认 THREE
-                numberOfCopy: "THREE", // 副本份数 默认 THREE
+                numberOfObl: "NONE", // 正本份数 默认 THREE
+                numberOfCopy: "NONE", // 副本份数 默认 THREE
                 seaType: "I", // 进出口 默认出口 E=出口 I=进口"
                 cargoType: "dry", // 货物类型默认普货
                 marks: "N/M",
@@ -651,15 +651,15 @@ export default {
                 businessTypes: "海运",
                 billType: "DD", // 单据类型 默认 直单
                 accDeptName: "", // 核算部门 默认登录人的部门
-                issueType: "ORI", // 签单方式 默认 正本提单
+                issueType: "TER", // 签单方式 默认 正本提单
                 mpaymode: "PP", // 主单付费方式 默认PP
                 hpaymode: "PP", // 分单付费方式 默认 PP
                 polFreeBoxUseDays: 7,
                 podFreeBoxUseDays: 14,
                 loadType: "整箱", // 装箱方式默认整箱
                 srcType: "OWN", // 业务来源默认公司   来源 内容 默认登录人所属公司
-                numberOfObl: "THREE", // 正本份数 默认 THREE
-                numberOfCopy: "THREE", // 副本份数 默认 THREE
+                numberOfObl: "NONE", // 正本份数 默认 THREE
+                numberOfCopy: "NONE", // 副本份数 默认 THREE
                 seaType: "I", // 进出口 默认出口 E=出口 I=进口"
                 cargoType: "dry", // 货物类型默认普货
                 marks: "N/M",

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

@@ -614,7 +614,7 @@
                                     <dic-select v-model="assemblyForm.issueType" placeholder="签单方式" key="dictKey"
                                         label="dictValue" keyValue="dictKey"
                                         url="/blade-system/dict-biz/dictionary?code=issue_type_F" :filterable="true"
-                                        :disabled="detailData.seeDisabled"></dic-select>
+                                        :disabled="detailData.seeDisabled" :initData="true"></dic-select>
                                 </el-form-item>
                             </el-col>
                             <el-col :span="12">
@@ -637,7 +637,7 @@
                                     </span>
                                     <el-date-picker v-model="assemblyForm.eta" type="date" style="width: 100%;"
                                         value-format="yyyy-MM-dd" size="small"
-                                        :disabled="detailData.seeDisabled || (assemblyForm.billType == 'MH' && assemblyForm.masterBillNo > 0) || assemblyForm.feeCenterListD.filter(item => item.auditStatus > 0).length || assemblyForm.feeCenterListC.filter(item => item.auditStatus > 0).length"
+                                        :disabled="detailData.seeDisabled || (assemblyForm.billType == 'MH' && assemblyForm.masterBillNo > 0)"
                                         placeholder="请选择时间">
                                     </el-date-picker>
                                 </el-form-item>

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

@@ -538,13 +538,13 @@ export default {
                 businessTypes: '海运',
                 billType: 'DD', // 单据类型 默认 直单
                 accDeptName: '',// 核算部门 默认登录人的部门
-                issueType: "ORI", // 签单方式 默认 正本提单
+                issueType: "TER", // 签单方式 默认 正本提单
                 mpaymode: 'PP', // 主单付费方式 默认PP
                 hpaymode: 'PP', // 分单付费方式 默认 PP
                 loadType: JSON.parse(localStorage.getItem('saber-tenantId')).content == '409341' ? 'FCL' : '整箱', // 装箱方式默认整箱
                 srcType: 'OWN', // 业务来源默认公司   来源 内容 默认登录人所属公司
-                numberOfObl: 'THREE', // 正本份数 默认 THREE
-                numberOfCopy: 'THREE', // 副本份数 默认 THREE
+                numberOfObl: 'NONE', // 正本份数 默认 THREE
+                numberOfCopy: 'NONE', // 副本份数 默认 THREE
                 seaType: 'E', // 进出口 默认出口 E=出口 I=进口"
                 cargoType: 'dry', // 货物类型默认普货
                 marks: 'N/M',
@@ -585,13 +585,13 @@ export default {
                 businessTypes: '海运',
                 billType: 'DD', // 单据类型 默认 直单
                 accDeptName: '',// 核算部门 默认登录人的部门
-                issueType: "ORI", // 签单方式 默认 正本提单
+                issueType: "TER", // 签单方式 默认 正本提单
                 mpaymode: 'PP', // 主单付费方式 默认PP
                 hpaymode: 'PP', // 分单付费方式 默认 PP
                 loadType: JSON.parse(localStorage.getItem('saber-tenantId')).content == '409341' ? 'FCL' : '整箱', // 装箱方式默认整箱
                 srcType: 'OWN', // 业务来源默认公司   来源 内容 默认登录人所属公司
-                numberOfObl: 'THREE', // 正本份数 默认 THREE
-                numberOfCopy: 'THREE', // 副本份数 默认 THREE
+                numberOfObl: 'NONE', // 正本份数 默认 THREE
+                numberOfCopy: 'NONE', // 副本份数 默认 THREE
                 seaType: 'E', // 进出口 默认出口 E=出口 I=进口"
                 cargoType: 'dry', // 货物类型默认普货
                 marks: 'N/M',

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

@@ -1,13 +1,14 @@
 <template>
     <div>
         <basic-container v-show="isShow">
-            <avue-crud :option="optionBack" :table-loading="loading" :data="data" :page.sync="page" id="out-table"
+            <avue-crud :option="option" :table-loading="loading" :data="data" :page.sync="page" id="out-table"
                 :header-cell-class-name="headerClassName" :permission="permissionList" :before-open="beforeOpen"
                 v-model="form" ref="crud" :search.sync="query" @row-update="rowUpdate" @row-save="rowSave"
                 @row-del="rowDel" @search-change="searchChange" @search-reset="searchReset"
                 @selection-change="selectionChange" @current-change="currentChange" @size-change="sizeChange"
                 @refresh-change="refreshChange" @on-load="onLoad" :row-style="rowStyle" :summary-method="summaryMethod"
-                @resetColumn="resetColumnTwo('crud', 309)" @saveColumn="saveColumnTwo('crud', optionBack, 309)">
+                @resetColumn="resetColumn('crud', 'option', 'optionBack', 309)"
+                @saveColumn="saveColumn('crud', 'option', 'optionBack', 309)">
                 <template slot-scope="{ disabled, size }" slot="billSortSearch">
                     <el-radio-group v-model="query.billSort">
                         <el-radio label="1">ETD</el-radio>
@@ -636,8 +637,7 @@ export default {
                         type: "select",
                         filterable: true,
                         remote: true,
-                        dicUrl:
-                            "/api/blade-los/bcorps/listByType?shortName={{key}}",
+                        dicUrl: "/api/blade-los/bcorps/listByType?shortName={{key}}",
                         props: {
                             label: "cnName",
                             value: "cnName",
@@ -646,12 +646,6 @@ export default {
                         span: 6,
                         searchOrder: 1.1
                     },
-                    /*                    {
-                                            label: "客户英文",
-                                            prop: "corpEnName",
-                                            width: "160",
-                                            overHidden: true
-                                        },*/
                     {
                         label: '箱属',
                         prop: 'boxBelongsTo',
@@ -668,13 +662,6 @@ export default {
                         span: 6,
                         searchOrder: 2
                     },
-
-                    /*                    {
-                                            label: "M/PayMode",
-                                            prop: "mpaymode",
-                                            width: "100",
-                                            overHidden: true
-                                        },*/
                     {
                         label: "HB/L NO",
                         prop: "hblno",
@@ -684,12 +671,6 @@ export default {
                         span: 6,
                         searchOrder: 3
                     },
-                    /*                    {
-                                           label: "H/PayMode",
-                                            prop: "hpaymode",
-                                            width: "100",
-                                            overHidden: true
-                                        },*/
                     {
                         label: "主业务编号",
                         prop: "masterBillNo",
@@ -824,8 +805,7 @@ export default {
                         type: "select",
                         filterable: true,
                         remote: true,
-                        dicUrl:
-                            "/api/blade-los/bcorps/listByType?cnName={{key}}",
+                        dicUrl: "/api/blade-los/bcorps/listByType?cnName={{key}}",
                         props: {
                             label: "cnName",
                             value: "cnName",
@@ -835,7 +815,6 @@ export default {
                         span: 6,
                         searchOrder: 10,
                         hide: true,
-                        //showColumn: false
                     },
                     {
                         label: "承运人",
@@ -896,12 +875,6 @@ export default {
                         span: 6,
                         searchOrder: 11
                     },
-                    // {
-                    //     label: "交货地",
-                    //     prop: "placeDeliveryName",
-                    //     width: "120",
-                    //     overHidden: true,
-                    // },
                     {
                         label: "航线",
                         prop: "lineCnName",
@@ -945,12 +918,6 @@ export default {
                         width: "120",
                         overHidden: true
                     },
-                    // {
-                    //   label: "箱量",
-                    //   prop: "CntrDescr",
-                    //     width:"120",
-                    //     overHidden:true,
-                    // },
                     {
                         label: "物流状态",
                         prop: "logisticsStatus",
@@ -1022,22 +989,6 @@ export default {
                         span: 6,
                         searchOrder: 15
                     },
-                    /*                    {
-                                            label: "装箱方式",
-                                            prop: "loadType",
-                                            type: "select",
-                                            dicData: [
-                                                {
-                                                    label: "整箱",
-                                                    value: "FCL"
-                                                },
-                                                {
-                                                    label: "拼箱",
-                                                    value: "LCL"
-                                                }
-                                            ],
-                                            overHidden: true
-                                        },*/
                     {
                         label: "货物类别",
                         prop: "cargoType",
@@ -1058,22 +1009,6 @@ export default {
                         ],
                         overHidden: true
                     },
-                    /*                    {
-                                            label: "创建部门",
-                                            prop: "createDeptName",
-                                            width: "120",
-                                            overHidden: true,
-                                            type: "tree",
-                                            dicUrl: "/api/blade-system/dept/tree",
-                                            props: {
-                                                label: "title",
-                                                value: "title",
-                                                children: "children"
-                                            },
-                                            search: true,
-                                            span: 6,
-                                            searchOrder: 16
-                                        },*/
                     {
                         label: "订舱代理",
                         prop: "bookingAgentCnName",
@@ -1085,16 +1020,6 @@ export default {
                         prop: "receivingAndShipping",
                         width: "120",
                         overHidden: true,
-                        // type: "select",
-                        // filterable: true,
-                        // remote: true,
-                        // dicUrl:
-                        //     "/api/blade-los/bcorps/listByType?cnName={{key}}",
-                        // props: {
-                        //     label: "cnName",
-                        //     value: "cnName",
-                        //     res: "data.records"
-                        // },
                         search: true,
                         span: 6,
                         searchOrder: 18
@@ -1105,9 +1030,7 @@ export default {
                         width: "120",
                         overHidden: true,
                         type: "select",
-                        // audit_status_los
-                        dicUrl:
-                            "/api/blade-system/dict-biz/dictionary?code=issue_type_F",
+                        dicUrl: "/api/blade-system/dict-biz/dictionary?code=issue_type_F",
                         props: {
                             label: "dictValue",
                             value: "dictKey"
@@ -1133,12 +1056,6 @@ export default {
                         width: "120",
                         overHidden: true
                     },
-                    /*                    {
-                                            label: "净重 (KGM)",
-                                            prop: "netWeight",
-                                            width: "120",
-                                            overHidden: true
-                                        },*/
                     {
                         label: "体积 (CBM)",
                         prop: "measurement",
@@ -1187,112 +1104,12 @@ export default {
                         width: "100",
                         overHidden: true
                     },
-                    // {
-                    //   label: "需陆运",
-                    //   prop: "isNeedLand",
-                    //     type: 'select',
-                    //     dicData: [{
-                    //         label: '否',
-                    //         value: 0
-                    //     }, {
-                    //         label: '是',
-                    //         value: 1
-                    //     }],
-                    //     overHidden:true,
-                    // },
-                    // {
-                    //   label: "需报关",
-                    //   prop: "isNeedDeclare",
-                    //     type: 'select',
-                    //     dicData: [{
-                    //         label: '否',
-                    //         value: 0
-                    //     }, {
-                    //         label: '是',
-                    //         value: 1
-                    //     }],
-                    //     overHidden:true,
-                    // },
-                    // {
-                    //   label: "需三检",
-                    //   prop: "isNeedIq",
-                    //     type: 'select',
-                    //     dicData: [{
-                    //         label: '否',
-                    //         value: 0
-                    //     }, {
-                    //         label: '是',
-                    //         value: 1
-                    //     }],
-                    //     overHidden:true,
-                    // },
-                    // {
-                    //   label: "应收",
-                    //   prop: "amountDr",
-                    //     width: "160",
-                    //     overHidden:true,
-                    // },
-                    // {
-                    //   label: "应付",
-                    //   prop: "amountCr",
-                    //     width: "160",
-                    //     overHidden:true,
-                    // },
-                    // {
-                    //   label: "利润",
-                    //   prop: "amountProfit",
-                    //     width: "160",
-                    //     overHidden:true,
-                    // },
-                    // {
-                    //     // label: "综合 USD 应付 - 非 USD 外币转换为 USD",
-                    //   label: "综合应付",
-                    //   prop: "amountCrUsd",
-                    //     width: "120",
-                    //     overHidden:true,
-                    // },
-                    // {
-                    //   label: "综合利润",
-                    //   prop: "amountProfitUsd",
-                    //     width: "120",
-                    //     overHidden:true,
-                    // },
                     {
                         label: "合计应收(CNY )",
                         prop: "amountDrLoc",
                         width: "160",
                         overHidden: true
                     },
-                    // {
-                    //     label: "合计应付",
-                    //     prop: "amountCrLoc",
-                    //     width: "160",
-                    //     overHidden: true
-                    // },
-                    // {
-                    //     label: "合计利润",
-                    //     prop: "amountProfitLoc",
-                    //     width: "160",
-                    //     overHidden: true
-                    // },
-                    // {
-                    //     label: "应收海运费",
-                    //     prop: "oceanFreightDr",
-                    //     width: "160",
-                    //     overHidden: true
-                    // },
-                    // {
-                    //     label: "应付海运费",
-                    //     prop: "oceanFreightCr",
-                    //     width: "160",
-                    //     overHidden: true
-                    // },
-                    // {
-                    //     label: "海运费利润",
-                    //     prop: "oceanFreightProfit",
-                    //     width: "160",
-                    //     overHidden: true
-                    // },
                     {
                         label: "付费申请状态",
                         prop: "checkCrStatusDescr",
@@ -1305,12 +1122,6 @@ export default {
                         width: "160",
                         overHidden: true
                     },
-                    // {
-                    //   label: "应付对账状态",
-                    //   prop: "checkCrStatusDescr",
-                    //     width:"160",
-                    //     overHidden:true,
-                    // },
                     {
                         label: "应收结算状态",
                         prop: "stlDrStatusDescr",
@@ -1377,28 +1188,6 @@ export default {
                             value: "dictKey"
                         }
                     },
-                    /*                    {
-                                            label: "客户OP",
-                                            prop: "operatorName",
-                                            width: 140,
-                                            overHidden: true,
-                                            search: true,
-                                            type: "select",
-                                            filterable: true,
-                                            remote: true,
-                                            dicUrl: "/api/blade-los/bcorpsattn/list?cname={{key}}",
-                                            props: {
-                                                label: "cname",
-                                                value: "cname",
-                                                res: "data.records"
-                                            }
-                                        },*/
-                    // {
-                    //   label: "进项发票状态",
-                    //   prop: "invoiceCrStatusDescr",
-                    //     width:"160",
-                    //     overHidden:true,
-                    // },
                     {
                         label: "创建人",
                         prop: "createUserName",
@@ -1422,46 +1211,16 @@ export default {
                         label: "排序方式",
                         prop: "billSort",
                         hide: true,
-                        //showColumn: false,
                         search: true,
                         searchValue: "1",
                         searchSpan: 12,
                         overHidden: true
                     },
-                    //   {
-                    //       label: "更新人",
-                    //       prop: "updateUserName",
-                    //       overHidden:true,
-                    //   },
-                    //   {
-                    //       label: "更新时间",
-                    //       prop: "updateTime",
-                    //       width:"160",
-                    //       overHidden:true,
-                    //   },
-                    /*                  {
-                                          label: "edi发送状态",
-                                          prop: "ediStatus",
-                                          type: "select",
-                                          dicData: [
-                                              {
-                                                  label: "未发送",
-                                                  value: "0"
-                                              },
-                                              {
-                                                  label: "已发送",
-                                                  value: "1"
-                                              }
-                                          ],
-                                          width: "100",
-                                          overHidden: true
-                                      },*/
                     {
                         label: "业务状态",
                         prop: "billStatus",
                         type: "select",
-                        dicUrl:
-                            "/api/blade-system/dict-biz/dictionary?code=bill_status",
+                        dicUrl: "/api/blade-system/dict-biz/dictionary?code=bill_status",
                         props: {
                             label: "dictValue",
                             value: "dictKey"
@@ -1473,8 +1232,7 @@ export default {
                         label: "财务状态",
                         prop: "accountStatus",
                         type: "select",
-                        dicUrl:
-                            "/api/blade-system/dict-biz/dictionary?code=account_status",
+                        dicUrl: "/api/blade-system/dict-biz/dictionary?code=account_status",
                         props: {
                             label: "dictValue",
                             value: "dictKey"
@@ -1486,8 +1244,7 @@ export default {
                         label: "审核状态",
                         prop: "status",
                         type: "select",
-                        dicUrl:
-                            "/api/blade-system/dict-biz/dictionary?code=audit_status_los",
+                        dicUrl: "/api/blade-system/dict-biz/dictionary?code=audit_status_los",
                         width: "120",
                         props: {
                             label: "dictValue",
@@ -1628,7 +1385,7 @@ export default {
             // 财务状态
             accountStatusData: [],
             saberUserInfo: {}, // 当前登录人个人信息
-            pageIds:[]
+            pageIds: []
         };
     },
     computed: {
@@ -1662,16 +1419,16 @@ export default {
         // if (this.$route.query.id) {
         //     this.rowCellfun(this.$route.query.id)
         // }
-        // this.option = await this.getColumnData(this.getColumnName(309), this.optionBack);
+        this.option = await this.getColumnData(this.getColumnName(309), this.optionBack);
         // this.mawbOption = await this.getColumnData(this.getColumnName(309.7), this.mawbOptionBack); // 主单列表
-        if (localStorage.getItem(this.getColumnName(309))) {
-            this.optionBack = JSON.parse(
-                localStorage.getItem(this.getColumnName(309))
-            );
-        }
+        // if (localStorage.getItem(this.getColumnName(309))) {
+        //     this.optionBack = JSON.parse(
+        //         localStorage.getItem(this.getColumnName(309))
+        //     );
+        // }
         if (this.saberUserInfo.role_name.indexOf('admin') != -1 || this.saberUserInfo.role_name.indexOf('总部') != -1) {
-            this.optionBack.searchMenuSpan = 12
-            this.optionBack.column.forEach(item => {
+            this.option.searchMenuSpan = 12
+            this.option.column.forEach(item => {
                 if (item.prop == 'branchId') {
                     item.search = true
                 }
@@ -1716,10 +1473,10 @@ export default {
                         let all = values.length !== 0 ? sums[index] = values.reduce((a, b) => {
                             return a + b;
                         }) : 0
-                        if (prop == 'grossWeight' || prop == 'measurement' ) {
+                        if (prop == 'grossWeight' || prop == 'measurement') {
                             sums[index] = all.toFixed(3)
                         }
-                        if (prop == 'quantity'|| prop == 'teu' || prop == 'quantityV20' || prop == 'quantityV40' || prop == 'quantityV40hc' || prop == 'quantityV45' || prop == 'quantityV48') {
+                        if (prop == 'quantity' || prop == 'teu' || prop == 'quantityV20' || prop == 'quantityV40' || prop == 'quantityV40hc' || prop == 'quantityV45' || prop == 'quantityV48') {
                             sums[index] = all
                         }
                     } else {
@@ -2325,7 +2082,7 @@ export default {
         // 详情的返回列表
         goBack() {
             // 初始化数据
-            this.pageIds=[]
+            this.pageIds = []
             // this.detailData = this.$options.data().detailData;
             if (JSON.stringify(this.$route.query) != "{}") {
                 this.$router.$avueRouter.closeTag();
@@ -2339,7 +2096,7 @@ export default {
         },
         // 新增弹窗开启
         addbtnfun(type) {
-            this.pageIds=[]
+            this.pageIds = []
             this.detailData.seeDisabled = false;
             this.detailData.billType = type;
             this.isShow = false;
@@ -2508,7 +2265,7 @@ export default {
         },
         // 编辑详情打开
         rowCellfun(id, row) {
-            this.pageIds=[]
+            this.pageIds = []
             this.data.forEach(item => {
                 this.pageIds.push(item.id)
             })
@@ -2743,30 +2500,29 @@ export default {
             this.mawbOnLoad(this.mawbPage, params);
             done();
         },
-
         //自定义列保存
-        saveColumnTwo(ref, option, code) {
+        async saveColumn(ref, option, optionBack, code) {
             /**
              * 已定义全局方法，直接使用，saveColumnData保存列数据方法,参数传值(表格名称，当前表格的option数据)
              * 已定义全局方法，直接使用，getColumnName方法用来获取枚举值，参数根据自己定义的code值获取中文名
              * 一定要执行异步操作，要等接口成功返回，才能执行下一行代码
              */
-            console.log(ref, option, code);
-            localStorage.setItem(
-                this.getColumnName(code),
-                JSON.stringify(option)
-            );
-            this.$message.success("保存成功");
-            //关闭窗口
-            this.$refs[ref].$refs.dialogColumn.columnBox = false;
+            const inSave = await this.saveColumnData(this.getColumnName(code), this[option]);
+            if (inSave) {
+                this.$message.success("保存成功");
+                //关闭窗口
+                this.$refs[ref].$refs.dialogColumn.columnBox = false;
+                this.selectionList = []
+                this.searchReset()
+            }
         },
         //自定义列重置
-        resetColumnTwo(ref, code) {
-            this.optionBack = this.$options.data().optionBack;
-            localStorage.removeItem(this.getColumnName(code));
+        async resetColumn(ref, option, optionBack, code) {
+            this[option] = this[optionBack];
+            const inSave = await this.delColumnData(this.getColumnName(code), this[optionBack]);
             if (this.saberUserInfo.role_name.indexOf('admin') != -1 || this.saberUserInfo.role_name.indexOf('总部') != -1) {
-                this.optionBack.searchMenuSpan = 12
-                this.optionBack.column.forEach(item => {
+                this.option.searchMenuSpan = 12
+                this.option.column.forEach(item => {
                     if (item.prop == 'branchId') {
                         item.search = true
                     }
@@ -2776,10 +2532,13 @@ export default {
                     }
                 })
             }
-            this.$message.success("重置成功");
-            this.$refs[ref].$refs.dialogColumn.columnBox = false;
+            if (inSave) {
+                this.$message.success("重置成功");
+                this.$refs[ref].$refs.dialogColumn.columnBox = false;
+                this.selectionList = []
+                this.searchReset()
+            }
         },
-
         // 更改表格颜色
         headerClassName(tab) {
             // //颜色间隔

src/views/iosBasicData/UnpaidPaymentsDetails/index.vue

@@ -94,7 +94,7 @@ export default {
                 calcHeight: 30,
                 tip: false,
                 searchShow: true,
-                searchMenuSpan: 8,
+                searchMenuSpan: 14,
                 border: true,
                 index: false,
                 selection: true,
@@ -158,7 +158,7 @@ export default {
                         search: true,
                         overHidden: true,
                     },
-                      {
+                    {
                         label: "分单号",
                         prop: "hblNo",
                         search: true,
@@ -166,12 +166,29 @@ export default {
                     },
                     {
                         label: "船名",
+                        prop: "vesselId",
+                        overHidden: true,
+                        type: "select",
+                        filterable: true,
+                        remote: true,
+                        dicUrl: "/api/blade-los/bvessels/list?enName={{key}}",
+                        props: {
+                            label: "enName",
+                            value: "id",
+                            res: "data.records"
+                        },
+                        hide: true,
+                        search: true
+                    },
+                    {
+                        label: "船名",
                         prop: "vesselName",
                         overHidden: true,
                     },
                     {
                         label: "航次",
                         prop: "voyageNo",
+                        search: true,
                         overHidden: true,
                     },
                     {
@@ -377,7 +394,7 @@ export default {
         ).content;
         this.option = await this.getColumnData(this.getColumnName(334), this.optionBack);
         if (this.saberUserInfo.role_name.indexOf('admin') != -1 || this.saberUserInfo.role_name.indexOf('总部') != -1) {
-            this.option.searchMenuSpan = 24
+            this.option.searchMenuSpan = 14
             this.option.column.forEach(item => {
                 if (item.prop == 'branchId') {
                     item.search = true
@@ -577,7 +594,7 @@ export default {
             this[option] = this[optionBack];
             const inSave = await this.delColumnData(this.getColumnName(code), this[optionBack]);
             if (this.saberUserInfo.role_name.indexOf('admin') != -1 || this.saberUserInfo.role_name.indexOf('总部') != -1) {
-                this.option.searchMenuSpan = 24
+                this.option.searchMenuSpan = 14
                 this.option.column.forEach(item => {
                     if (item.prop == 'branchId') {
                         item.search = true
@@ -613,7 +630,7 @@ export default {
 }
 </script>
 
-<style scoped>
+<style lang="scss" scoped>
 ::v-deep#out-table .back-one {
     background: #ecf5ff !important;
     text-align: center;

src/views/iosBasicData/boxPlan/boxPlan/detailsPage.vue

@@ -12,14 +12,14 @@
           @click="inEdit">编 辑
         </el-button>
         <el-button class="el-button--small-yh" v-else style="margin-left: 6px;" type="primary" size="small"
-          :disabled="isSaveBtn||form.status==1" @click="submit">保 存
+          :disabled="isSaveBtn || form.status == 1" @click="submit">保 存
         </el-button>
         <el-button class="el-button--small-yh" style="margin-left: 6px;" type="success" size="small"
-          :disabled="isSaveBtn||form.status==1" @click="submitUseBoxPlan">提 交
+          :disabled="isSaveBtn || form.status == 1" @click="submitUseBoxPlan">提 交
+        </el-button>
+        <el-button v-if="form.status == '1'" class="el-button--small-yh" style="margin-left: 6px;" type="danger"
+          size="small" @click="revokeUseBoxPlan">撤销提交
         </el-button>
-        <!-- <el-button v-if="form.status == '审核提交'" class="el-button--small-yh" style="margin-left: 6px;" type="danger"
-          size="small" @click="revokeApplication">撤销单据请核
-        </el-button> -->
         <!-- <el-dropdown style="line-height: 0">
           <el-button class="el-button--small-yh" style="margin-left: 6px;" type="warning" :disabled="!form.id"
             size="small">
@@ -76,7 +76,7 @@
           <tempalte slot="podCname" slot-scope="{ row }">
             <dic-select v-if="row.$cellEdit" v-model="row.podCname" placeholder="港口" label="cnName" res="records"
               url="/blade-los/bports/list?status=0&current=1&size=5" :filterable="true" :remote="true" dataName="cnName"
-              @selectChange="rowDicChange('podCname', $event, row)"></dic-select>
+              @selectChange="rowDicChange('podCname', $event, row)" :slotRight="true" rightLabel="code"></dic-select>
             <span v-else>{{ row.podCname }}</span>
           </tempalte>
         </avue-crud>
@@ -121,7 +121,8 @@ import {
   copyAgent,
   submitItemList,
   itemRemove,
-  submitUseBoxPlan
+  submitUseBoxPlan,
+  revokeUseBoxPlan
 } from "@/api/iosBasicData/boxPlan/boxPlan.js";
 import dicSelect from "@/components/dicSelect/main";
 import checkSchedule from "@/components/checkH/checkSchedule.vue";
@@ -1146,6 +1147,30 @@ export default {
         })
       });
     },
+    revokeUseBoxPlan() {
+      this.$confirm("确定撤销提交?", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(() => {
+        let obj = {}
+        obj = {
+          id: this.form.id,
+        }
+        const loading = this.$loading({
+          lock: true,
+          text: '加载中',
+          spinner: 'el-icon-loading',
+          background: 'rgba(255,255,255,0.7)'
+        });
+        revokeUseBoxPlan(obj).then(res => {
+          this.$message.success("操作成功");
+          this.getDetail(res.data.data.id)
+        }).finally(() => {
+          loading.close();
+        })
+      });
+    },
     application() {
       this.$confirm("确定请核数据?", {
         confirmButtonText: "确定",

src/views/iosBasicData/boxPlan/boxPlan/index.vue

@@ -23,6 +23,10 @@
         <template slot="sysNo" slot-scope="{ row }">
           <span style="color: #1e9fff;cursor: pointer;" @click="rowEdit(row)">{{ row.sysNo }}</span>
         </template>
+        <tempalte slot="weekSearch">
+          <el-input-number style="width: 100%;" v-model="query.week" @change="dicChange('week', $event)"
+            placeholder="请输入 周" size="small" :controls="false" :disabled="editDisabled"></el-input-number>
+        </tempalte>
       </avue-crud>
     </basic-container>
     <detailsPage v-if="!isShow" :detailData="detailData" @goBack="goBack"></detailsPage>
@@ -31,7 +35,7 @@
 
 <script>
 import { getList, remove } from "@/api/iosBasicData/boxPlan/boxPlan.js";
-import { getWeekNumber, getYearDate } from "@/util/date";
+import { getWeekNumber, getYearDate, getWeekRange, getWeeksInYear } from "@/util/date";
 import { getWorkDicts } from "@/api/system/dictbiz";
 import detailsPage from "./detailsPage";
 import { getToken } from "@/util/auth";
@@ -102,6 +106,30 @@ export default {
             search: true,
           },
           {
+            label: "开始日期",
+            prop: "startDate",
+            width: "100",
+            overHidden: true,
+            // hide: true,
+            // showColumn: false,
+            search: true,
+            type: "date",
+            format: "yyyy-MM-dd",
+            valueFormat: "yyyy-MM-dd 00:00:00",
+          },
+          {
+            label: "结束日期",
+            prop: "endDate",
+            width: "100",
+            overHidden: true,
+            // hide: true,
+            // showColumn: false,
+            search: true,
+            type: "date",
+            format: "yyyy-MM-dd",
+            valueFormat: "yyyy-MM-dd 23:59:59",
+          },
+          {
             label: "制单人",
             prop: "createUserName",
             overHidden: true,
@@ -124,33 +152,10 @@ export default {
             format: "yyyy-MM-dd",
             valueFormat: "yyyy-MM-dd HH:mm:ss"
           },
-          {
-            label: "开始日期",
-            prop: "startDate",
-            width: "100",
-            overHidden: true,
-            hide: true,
-            showColumn: false,
-            search: true,
-            type: "date",
-            format: "yyyy-MM-dd",
-            valueFormat: "yyyy-MM-dd 00:00:00",
-          },
-          {
-            label: "结束日期",
-            prop: "endDate",
-            width: "100",
-            overHidden: true,
-            hide: true,
-            showColumn: false,
-            search: true,
-            type: "date",
-            format: "yyyy-MM-dd",
-            valueFormat: "yyyy-MM-dd 23:59:59",
-          },
         ]
       },
       data: [],
+      weekMax: 1,
     };
   },
   components: {
@@ -170,6 +175,30 @@ export default {
     }, 100);
   },
   methods: {
+    dicChange(name, row) {
+      if (name == 'week') {
+        if (row) {
+          this.weekMax = getWeeksInYear(this.query.year)
+          if (!this.query.year) {
+            this.query.week = 0
+            this.query.startDate = null
+            this.query.endDate = null
+            return this.$message.error("请选择年份");
+          } else if (row > this.weekMax) {
+            this.query.week = 0
+            this.query.startDate = null
+            this.query.endDate = null
+            return this.$message.error(this.query.year + '年最多有' + this.weekMax + '周');
+          } else {
+            this.query.startDate = getWeekRange(this.query.year, this.query.week).start
+            this.query.endDate = getWeekRange(this.query.year, this.query.week).end
+          }
+        } else {
+          this.query.startDate = null
+          this.query.endDate = null
+        }
+      }
+    },
     addButton() {
       this.isShow = false
     },
@@ -208,9 +237,17 @@ export default {
     },
     // 搜索按钮点击
     searchChange(params, done) {
+          done();
+      if (this.query.week) {
+        if (!this.query.year) {
+          this.query.week = 0
+          this.query.startDate = null
+          this.query.endDate = null
+          return this.$message.error("请选择年份");
+        }
+      }
       this.page.currentPage = 1;
       this.onLoad(this.page, this.query);
-      done();
     },
     selectionChange(list) {
       this.selectionList = list;

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

@@ -1525,14 +1525,10 @@ export default {
             spinner: 'el-icon-loading',
             background: 'rgba(255,255,255,0.7)'
           });
-          submit(this.form).then(res => {
-            submitBookingCabin(this.form).then(res => {
-              this.$message.success("操作成功");
-              this.getDetails(this.form.id)
-            }).finally(() => {
-              loading.close();
-            })
-          }).catch(() => {
+          submitBookingCabin(this.form).then(res => {
+            this.$message.success("操作成功");
+            this.getDetails(this.form.id)
+          }).finally(() => {
             loading.close();
           })
 

src/views/iosBasicData/costStatistics/index.vue

@@ -58,7 +58,7 @@ export default {
                 height: '600px',
                 calcHeight: 30,
                 searchShow: true,
-                searchMenuSpan: 12,
+                searchMenuSpan: 24,
                 border: true,
                 index: true,
                 addBtn: false,
@@ -202,6 +202,29 @@ export default {
                         overHidden: true,
                     },
                     {
+                        label: "船名",
+                        prop: "vesselId",
+                        overHidden: true,
+                        type: "select",
+                        filterable: true,
+                        remote: true,
+                        dicUrl: "/api/blade-los/bvessels/list?enName={{key}}",
+                        props: {
+                            label: "enName",
+                            value: "id",
+                            res: "data.records"
+                        },
+                        hide: true,
+                        search: true
+                    },
+                    {
+                        label: "航次",
+                        prop: "voyageNo",
+                        overHidden: true,
+                        hide: true,
+                        search: true
+                    },
+                    {
                         label: "统计期间",
                         prop: "billDate",
                         search: true,
@@ -296,7 +319,7 @@ export default {
         ).content;
         this.option = await this.getColumnData(this.getColumnName(411), this.optionBack)
         if (this.saberUserInfo.role_name.indexOf('admin') != -1 || this.saberUserInfo.role_name.indexOf('总部') != -1) {
-            this.option.searchMenuSpan = 6
+            this.option.searchMenuSpan = 18
             this.option.column.forEach(item => {
                 if (item.prop == 'branchId') {
                     item.search = true
@@ -484,7 +507,7 @@ export default {
             this[option] = this[optionBack];
             const inSave = await this.delColumnData(this.getColumnName(code), this[optionBack]);
             if (this.saberUserInfo.role_name.indexOf('admin') != -1 || this.saberUserInfo.role_name.indexOf('总部') != -1) {
-                this.option.searchMenuSpan = 6
+                this.option.searchMenuSpan = 18
                 this.option.column.forEach(item => {
                     if (item.prop == 'branchId') {
                         item.search = true

src/views/iosBasicData/decisionAnalysis/index.vue

@@ -59,7 +59,7 @@ export default {
             query: {
                 chart: 1,
                 type: 1,
-                billType:'DD,MH'
+                billType: 'DD,MH'
             },
             loading: false,
             itemLoading: false,
@@ -189,12 +189,14 @@ export default {
                         prop: "mblno",
                         width: '100',
                         overHidden: true,
+                        search: true
                     },
                     {
                         label: "HB/L No",
                         prop: "hblno",
                         width: '100',
                         overHidden: true,
+                        search: true
                     },
                     {
                         label: "件数",
@@ -297,6 +299,22 @@ export default {
                     },
                     {
                         label: "船名",
+                        prop: "vesselId",
+                        overHidden: true,
+                        type: "select",
+                        filterable: true,
+                        remote: true,
+                        dicUrl: "/api/blade-los/bvessels/list?enName={{key}}",
+                        props: {
+                            label: "enName",
+                            value: "id",
+                            res: "data.records"
+                        },
+                        hide: true,
+                        search: true
+                    },
+                    {
+                        label: "船名",
                         prop: "vesselEnName",
                         width: '100',
                         overHidden: true,
@@ -306,6 +324,7 @@ export default {
                         prop: "voyageNo",
                         width: '100',
                         overHidden: true,
+                        search: true
                     },
                     {
                         label: "目的港",
@@ -838,7 +857,7 @@ export default {
             this.query = {
                 chart: 1,
                 type: 1,
-                billType:'DD,MH'
+                billType: 'DD,MH'
             };
             this.onLoad(this.page);
         },

src/views/iosBasicData/fininvoices/fininvoicesDetails.vue

@@ -653,9 +653,9 @@ export default {
                 invoiceDate: [
                     { required: true, message: '请输入开票日期', trigger: 'blur' },
                 ],
-                exrate: [
-                    { required: true, message: '请输入导入汇率', trigger: 'blur' },
-                ],
+                // exrate: [
+                //     { required: true, message: '请输入导入汇率', trigger: 'blur' },
+                // ],
                 taxRate: [
                     { required: true, message: '请输入所属税率', trigger: 'blur' },
                 ],

src/views/iosBasicData/fininvoicesApplyfor/fininvoicesDetails.vue

@@ -105,7 +105,6 @@
                                                     </el-input>
                                                 </el-form-item>
                                             </el-col>
-
                                             <el-col :span="12">
                                                 <el-form-item label="美元银行" prop="invCorpAccountBankUsd">
                                                     <el-input style="width: 100%;" v-model="form.invCorpAccountBankUsd"
@@ -721,9 +720,9 @@ export default {
                 invoiceDate: [
                     { required: true, message: '请输入开票日期', trigger: 'blur' },
                 ],
-                exrate: [
-                    { required: true, message: '请输入导入汇率', trigger: 'blur' },
-                ],
+                // exrate: [
+                //     { required: true, message: '请输入导入汇率', trigger: 'blur' },
+                // ],
                 taxRate: [
                     { required: true, message: '请输入所属税率', trigger: 'blur' },
                 ],

src/views/iosBasicData/fininvoicesOutput/fininvoicesDetails.vue

@@ -709,9 +709,9 @@ export default {
                 invoiceDate: [
                     { required: true, message: '请输入开票日期', trigger: 'blur' },
                 ],
-                exrate: [
-                    { required: true, message: '请输入导入汇率', trigger: 'blur' },
-                ],
+                // exrate: [
+                //     { required: true, message: '请输入导入汇率', trigger: 'blur' },
+                // ],
                 taxRate: [
                     { required: true, message: '请输入所属税率', trigger: 'blur' },
                 ],

src/views/iosBasicData/paymentDetail/index.vue

@@ -164,7 +164,7 @@ export default {
                         overHidden: true,
                     },
                     {
-                        label: "BILLNO",
+                        label: "业务编号",
                         prop: "billNo",
                         search: true,
                         overHidden: true,
@@ -176,6 +176,12 @@ export default {
                         overHidden: true,
                     },
                     {
+                        label: "HBLNO",
+                        prop: "hblNo",
+                        search: true,
+                        overHidden: true,
+                    },
+                    {
                         label: "ETD",
                         prop: "etdDate",
                         overHidden: true,
@@ -421,7 +427,7 @@ export default {
         }
 
     },
-      activated() {
+    activated() {
         this.$refs.crud.doLayout();
     },
     methods: {

src/views/iosBasicData/podStation/index.vue

@@ -323,7 +323,9 @@ export default {
 
     },
     searchReset() {
-      this.query = this.$options.data().query;
+      this.query = {
+        businessType: "SE"
+      };
       this.onLoad(this.page);
     },
     // 搜索按钮点击