1.箱档案 新加修改箱状态功能

2.OW拿OW放 箱明细为空时不允许点客户还箱 导出箱号下载之前先判断是否能下载
3.退租 新加来源租箱合同号
4.放箱号 箱明细 新加 自有箱类型允许删除
5.OW拿 生成箱使费 不禁用日期范围
6.OW放 修改字段名称 新加启用字段显示
7.放箱号 明细的箱号和箱型不允许编辑
8.系统所有的列表页的清除按钮不走接口

src/api/box/archives.js

@@ -70,4 +70,12 @@ export function update(data){
         method:'post',
         data
     })
+}
+//修改箱状态
+export const synchronization = (params) => {
+    return request({
+        url: '/api/blade-los/putbox/synchronization',
+        method: 'get',
+        params: params
+    })
 }

src/api/boxManagement/buyContainer/index.js

@@ -349,4 +349,12 @@ export const fininvoicesGetAccBillIdList = (params) => {
     method: 'get',
     params:params
   })
+}
+// 查看发票金额记录
+export const exportTemplateById = (params) => {
+  return request({
+    url: '/api/blade-los/boxdynamicsrecord/exportTemplateById',
+    method: 'get',
+    params:params
+  })
 }

src/api/iosBasicData/bills.js

@@ -465,3 +465,18 @@ export const updateVerifyData = (data) => {
   })
 }
 
+export const selectComplyWithData = (data) => {
+  return request({
+    url: '/api/blade-los/bills/selectComplyWithData',
+    method: 'get',
+    params: data
+  })
+}
+
+export const splitBoxNumber = (data) => {
+  return request({
+    url: '/api/blade-los/boxdynamicsrecord/splitBoxNumber',
+    method: 'get',
+    params: data
+  })
+}

src/router/axios.js

@@ -74,7 +74,7 @@ axios.interceptors.response.use(res => {
   //获取状态码
   const status = res.data.code || res.status;
   const statusWhiteList = website.statusWhiteList || [];
-  const message = res.data.msg || res.data.error_description || '未知错误';
+  const message =res.data.msg || res.data.error_description || '未知错误';
   //如果在白名单里则自行catch逻辑处理
   if (statusWhiteList.includes(status)) return Promise.reject(res);
   //如果是401则跳转到登录页面

src/views/basicData/container/archives.vue

@@ -16,6 +16,7 @@
       :upload-delete="uploadDelete"
       @row-del="rowDel"
       @refresh-change="refreshChange"
+      @selection-change="selectionChange"
       @resetColumn="resetColumnTwo('crud', 'option', 'optionList', 234)"
       @saveColumn="saveColumnTwo('crud', 'option', 'optionList', 234)"
       :page.sync="page"
@@ -23,6 +24,7 @@
       <template slot="menuLeft">
         <el-button type="success" size="small" @click="importData">导入</el-button>
         <el-button type="warning" size="small" @click="outExport">导 出 </el-button>
+        <el-button type="primary" size="small" :disabled="selectionList.length == 0" @click="allClick('修改箱状态')">修改箱状态 </el-button>
       </template>
       <!-- <template slot-scope="{ type, size, row, index }" slot="menu">
         <el-button icon="el-icon-edit" :size="size" type="text" @click="$refs.crud.rowEdit(row, index)">查 看 </el-button>
@@ -210,7 +212,7 @@
 </template>
 
 <script>
-import { addUpdate, boxRemove, getList, remove, archivestrajectory, update } from "@/api/box/archives";
+import { addUpdate, boxRemove, getList, remove, archivestrajectory, update, synchronization } from "@/api/box/archives";
 import { getToken } from "@/util/auth";
 import { getAllBoxs } from "@/api/basicData/portinformation";
 import dicSelect from "@/components/dicSelect/main";
@@ -223,6 +225,7 @@ export default {
   },
   data() {
     return {
+      selectionList: [],
       excelBox: false,
       excelForm: {},
       excelLoading: false,
@@ -501,6 +504,8 @@ export default {
         menuWidth: 60,
         highlightCurrentRow: true,
         dialogWidth: "70%",
+        tip: false,
+        selection: true,
         column: [
           {
             label: "箱号",
@@ -874,6 +879,81 @@ export default {
       this.excelForm = {};
       this.excelBox = true;
     },
+    allClick(name) {
+      if (name == "修改箱状态") {
+        this.$DialogForm.show({
+          title: "修改箱状态",
+          width: "30%",
+          menuPosition: "right",
+          option: {
+            submitText: "确定",
+            emptyText: "取消",
+            column: [
+              {
+                label: "箱状态",
+                span: 24,
+                prop: "status",
+                type: "select",
+                dicUrl: "/api/blade-system/dict-biz/dictionary?code=box_archives_status",
+                props: {
+                  label: "dictValue",
+                  value: "dictKey"
+                },
+                rules: [
+                  {
+                    required: true,
+                    message: "选择箱状态",
+                    trigger: "blur"
+                  }
+                ]
+              },
+
+              {
+                label: "箱动态",
+                prop: "boxDynamics",
+                span: 24,
+                type: "select",
+                dicUrl: "/api/blade-system/dict-biz/dictionary?code=boxDynamics2",
+                props: {
+                  label: "dictValue",
+                  value: "dictValue"
+                },
+                rules: [
+                  {
+                    required: true,
+                    message: "选择箱状态",
+                    trigger: "blur"
+                  }
+                ]
+              }
+            ]
+          },
+          beforeClose: done => {
+            done();
+          },
+          callback: res => {
+            res.done();
+            let ids = [];
+            for (let item of this.selectionList) {
+              ids.push(item.id);
+            }
+            let obj = {
+              ids: ids.join(","),
+              status: res.data.status,
+              boxDynamics:res.data.boxDynamics
+            };
+            synchronization(obj).then(res => {
+              this.$message.success("操作成功！");
+              this.refreshChange();
+            });
+            res.close();
+          }
+        });
+      }
+    },
+    selectionChange(list) {
+      this.selectionList = list;
+    },
     verifyChange(name, row) {
       this.form.code = this.form.code.replace(/\s+/g, "");
       getAccurate({ accurate: this.form.code }).then(res => {

src/views/billM/billingCenter/index.vue

@@ -834,7 +834,7 @@ export default {
     },
     searchReset() {
       this.query = {};
-      this.onLoad(this.page);
+      // this.onLoad(this.page);
     },
     // 搜索点击回调
     searchChange(params, done) {

src/views/billM/expenseCenter/index.vue

@@ -1360,7 +1360,7 @@ export default {
     },
     searchReset() {
       this.query = {};
-      this.onLoad(this.page);
+      // this.onLoad(this.page);
     },
     searchChange(params, done) {
       console.log(params)

src/views/boxManagement/agentBox/detailsPage.vue

@@ -233,8 +233,8 @@
                   :disabled="selectionList.length == 0">启用</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()">打印报表 </el-button> -->
-                <span style="margin: 0 20px;color:#67C23A;"> 金额本币合计:{{ CNYSUM }} </span>
-                <span style="margin: 0 20px;color:#F56C6C;"> 金额外币合计:{{ USDSUM }} </span>
+                <!-- <span style="margin: 0 20px;color:#67C23A;"> 金额本币合计:{{ CNYSUM }} </span> -->
+                <!-- <span style="margin: 0 20px;color:#F56C6C;"> 金额外币合计:{{ USDSUM }} </span> -->
               </template>
               <template slot="indexHeader" slot-scope="{ row, index }">
                 <el-button

src/views/boxManagement/agentBox/index.vue

@@ -280,7 +280,7 @@ export default {
     },
     searchReset() {
       this.query = this.$options.data().query;
-      this.onLoad(this.page);
+      // this.onLoad(this.page);
     },
     // 搜索按钮点击
     searchChange(params, done) {

src/views/boxManagement/boxAdjustment/index.vue

@@ -414,7 +414,7 @@ export default {
     },
     searchReset() {
       this.query = this.$options.data().query;
-      this.onLoad(this.page);
+      // this.onLoad(this.page);
     },
     // 搜索按钮点击
     searchChange(params, done) {

src/views/boxManagement/boxCost/index.vue

@@ -291,7 +291,7 @@ export default {
     },
     searchReset() {
       this.query = this.$options.data().query;
-      this.onLoad(this.page);
+      // this.onLoad(this.page);
     },
     // 搜索按钮点击
     searchChange(params, done) {

src/views/boxManagement/boxExit/index.vue

@@ -316,7 +316,7 @@ export default {
     },
     searchReset() {
       this.query = this.$options.data().query;
-      this.onLoad(this.page);
+      // this.onLoad(this.page);
     },
     // 搜索按钮点击
     searchChange(params, done) {

src/views/boxManagement/boxPoolDynamics/index.vue

@@ -992,7 +992,7 @@ export default {
     },
     searchReset() {
       this.query = this.$options.data().query;
-      this.onLoad(this.page);
+      // this.onLoad(this.page);
     },
     // 搜索按钮点击
     searchChange(params, done) {
@@ -1032,7 +1032,7 @@ export default {
     },
     searchReset2() {
       this.query2 = this.$options.data().query2;
-      this.onLoad2(this.page2);
+      // this.onLoad2(this.page2);
     },
     // 搜索按钮点击
     searchChange2(params, done) {
@@ -1069,7 +1069,7 @@ export default {
     },
     searchReset3() {
       this.query3 = this.$options.data().query3;
-      this.onLoad3(this.page3);
+      // this.onLoad3(this.page3);
     },
     // 搜索按钮点击
     searchChange3(params, done) {

src/views/boxManagement/buyContainer/index.vue

@@ -290,7 +290,7 @@ export default {
     },
     searchReset() {
       this.query = this.$options.data().query;
-      this.onLoad(this.page);
+      // this.onLoad(this.page);
     },
     // 搜索按钮点击
     searchChange(params, done) {

src/views/boxManagement/containerNumber/detailsPage.vue

@@ -345,7 +345,7 @@
           <template slot="boxCodeSearch">
             <el-input v-model="query.boxCode" size="small" placeholder="请输入箱号 多个箱号用空格区分" type="textarea" autosize></el-input>
           </template>
-          <template slot="boxCodeForm" slot-scope="{ row }">
+          <!-- <template slot="boxCodeForm" slot-scope="{ row }">
             <el-input
               v-if="row.$cellEdit"
               v-model="row.boxCode"
@@ -362,8 +362,8 @@
               @change="verifyChange('boxCode', row)"
             ></el-input>
             <span v-else>{{ row.boxCode }}</span>
-          </template>
-          <template slot="boxTypeForm" slot-scope="{ row }">
+          </template> -->
+          <!-- <template slot="boxTypeForm" slot-scope="{ row }">
             <dic-select
               v-if="row.$cellEdit"
               v-model="row.boxType"
@@ -377,7 +377,7 @@
               @selectChange="rowDicChange('boxType', $event, row)"
             ></dic-select>
             <span v-else>{{ row.boxType }}</span>
-          </template>
+          </template> -->
           <tempalte v-if="form.boxClass == 'OW(拿)'" slot="boxEastName" slot-scope="{ row }">
             <span>
               <span v-if="form.boxClass == 'OW(拿)'">WINFAST</span>
@@ -1036,33 +1036,33 @@ export default {
             searchSpan: 12,
             searchPlaceholder: "请输入箱号 多个箱号用空格区分",
             search: true,
-            cell: true,
-            slot: true,
-            formslot: true,
+            // cell: true,
+            // slot: true,
+            // formslot: true,
             overHidden: true,
-            rules: [
-              {
-                required: true,
-                message: "请输入箱号",
-                trigger: "blur"
-              }
-            ]
+            // rules: [
+            //   {
+            //     required: true,
+            //     message: "请输入箱号",
+            //     trigger: "blur"
+            //   }
+            // ]
           },
           {
             label: "箱型",
             prop: "boxType",
             width: 100,
-            cell: true,
-            slot: true,
-            formslot: true,
+            // cell: true,
+            // slot: true,
+            // formslot: true,
             overHidden: true,
-            rules: [
-              {
-                required: true,
-                message: "请选择箱型",
-                trigger: "blur"
-              }
-            ]
+            // rules: [
+            //   {
+            //     required: true,
+            //     message: "请选择箱型",
+            //     trigger: "blur"
+            //   }
+            // ]
           },
           {
             label: "箱属",
@@ -1980,6 +1980,11 @@ export default {
         }
       }
       if (name == "批量删除") {
+        for(let item of this.selectionList){
+          if(item.boxClass!='自有箱'){
+             return this.$message.error("请选择自有箱的数据");
+          }
+        }
         let multiList = [];
         let arr = [];
         this.$confirm("确定将选择数据删除?", {

src/views/boxManagement/containerNumber/index.vue

@@ -660,7 +660,7 @@ export default {
     },
     searchReset() {
       this.query = this.$options.data().query;
-      this.onLoad(this.page);
+      // this.onLoad(this.page);
     },
     // 搜索按钮点击
     searchChange(params, done) {

src/views/boxManagement/enterRecord/index.vue

@@ -460,7 +460,7 @@ export default {
     },
     searchReset() {
       this.query = this.$options.data().query;
-      this.onLoad(this.page);
+      // this.onLoad(this.page);
     },
     // 搜索按钮点击
     searchChange(params, done) {

src/views/boxManagement/exitRecord/index.vue

@@ -469,7 +469,7 @@ export default {
     },
     searchReset() {
       this.query = this.$options.data().query;
-      this.onLoad(this.page);
+      // this.onLoad(this.page);
     },
     // 搜索按钮点击
     searchChange(params, done) {

src/views/boxManagement/moveOut/detailsPage.vue

@@ -717,6 +717,7 @@ export default {
       form: {
         type: "TZ",
         appearanceType: "退租",
+        effectiveDate:dateFormat(new Date())+' 00:00:00',
         tradingBoxItemsList: [],
         feeCenterList: [],
         tradingBoxFilesList: []
@@ -822,6 +823,11 @@ export default {
             disabled: true
           },
           {
+            label: "来源合同号",
+            prop: "srcContractNo",
+            disabled: true
+          },
+          {
             label: "备注",
             prop: "remarks",
             type: "textarea",

src/views/boxManagement/moveOut/index.vue

@@ -187,6 +187,12 @@ export default {
             overHidden: true
           },
           {
+            label: "来源合同号",
+            prop: "srcContractNo",
+            width: 100,
+            overHidden: true,
+          },
+          {
             label: "制单人",
             prop: "createUserName",
             overHidden: true,
@@ -282,7 +288,7 @@ export default {
     },
     searchReset() {
       this.query = this.$options.data().query;
-      this.onLoad(this.page);
+      // this.onLoad(this.page);
     },
     // 搜索按钮点击
     searchChange(params, done) {

src/views/boxManagement/podComeback/index.vue

@@ -82,6 +82,7 @@ export default {
   name: "空箱返场",
   data() {
     return {
+      firstPage: false,
       podDialog: false,
       podForm: {},
       podOption: {
@@ -199,7 +200,7 @@ export default {
             label: "放箱号类型",
             prop: "busType",
             width: 100,
-            overHidden: true,
+            overHidden: true
           },
           {
             label: "还箱日期",
@@ -488,7 +489,7 @@ export default {
     },
     searchReset() {
       this.query = { businessType: "SI" };
-      this.onLoad(this.page);
+      // this.onLoad(this.page);
     },
     // 搜索按钮点击
     searchChange(params, done) {
@@ -509,23 +510,27 @@ export default {
       this.onLoad(this.page, this.query);
     },
     onLoad(page, params = {}) {
-      let obj = {};
-      obj = {
-        ...Object.assign(params, this.query)
-      };
-      this.loading = true;
-      getList(page.currentPage, page.pageSize, obj)
-        .then(res => {
-          this.data = res.data.data.records;
-          this.page.total = res.data.data.total;
-          this.$nextTick(() => {
-            this.$refs.crud.doLayout();
-            this.$refs.crud.dicInit();
+      if (this.firstPage) {
+        let obj = {};
+        obj = {
+          ...Object.assign(params, this.query)
+        };
+        this.loading = true;
+        getList(page.currentPage, page.pageSize, obj)
+          .then(res => {
+            this.data = res.data.data.records;
+            this.page.total = res.data.data.total;
+            this.$nextTick(() => {
+              this.$refs.crud.doLayout();
+              this.$refs.crud.dicInit();
+            });
+          })
+          .finally(() => {
+            this.loading = false;
           });
-        })
-        .finally(() => {
-          this.loading = false;
-        });
+      }else{
+        this.firstPage=true
+      }
     },
     outExport() {
       let config = { params: { ...this.query } };

src/views/boxManagement/rentalBox/detailsPage.vue

@@ -1187,7 +1187,7 @@ export default {
             prop: "remarks",
             type: "textarea",
             minRows: 2,
-            span: 6
+            span: 12
           }
         ]
       },

src/views/boxManagement/rentalBox/index.vue

@@ -295,7 +295,7 @@ export default {
     },
     searchReset() {
       this.query = this.$options.data().query;
-      this.onLoad(this.page);
+      // this.onLoad(this.page);
     },
     // 搜索按钮点击
     searchChange(params, done) {

src/views/boxManagement/transferCost/index.vue

@@ -201,7 +201,7 @@ export default {
     },
     searchReset() {
       this.query = this.$options.data().query;
-      this.onLoad(this.page);
+      // this.onLoad(this.page);
     },
     // 搜索按钮点击
     searchChange(params, done) {

src/views/financialManagementF/agreementprice/index.vue

@@ -440,7 +440,7 @@
       },
       searchReset() {
         this.query = {};
-        this.onLoad(this.page);
+        // this.onLoad(this.page);
       },
       searchChange(params, done) {
         this.query = params;

src/views/financialManagementF/balancecycle/index.vue

@@ -275,7 +275,7 @@ import {
       },
       searchReset() {
         this.query = {};
-        this.onLoad(this.page);
+        // this.onLoad(this.page);
       },
       searchChange(params, done) {
         this.query = params;

src/views/iosBasicData/ImportExchange/index.vue

@@ -689,7 +689,7 @@ export default {
     rowEdit(row) {},
     searchReset() {
       this.query = this.$options.data().query;
-      this.onLoad(this.page);
+      // this.onLoad(this.page);
     },
     // 搜索按钮点击
     searchChange(params, done) {

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

@@ -2510,7 +2510,7 @@ export default {
     searchReset() {
       this.query = {};
       this.query.billSort = this.query.billSort ? this.query.billSort : "1";
-      this.onLoad(this.page);
+      // this.onLoad(this.page);
     },
     // 搜索
     searchChange(params, done) {

src/views/iosBasicData/PaymentSettlement/index.vue

@@ -550,7 +550,7 @@ export default {
     },
     searchReset() {
       this.query = {};
-      this.onLoad(this.page);
+      // this.onLoad(this.page);
     },
     searchChange(params, done) {
       this.query = params;

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

@@ -79,6 +79,7 @@ export default {
         },
         // 选择项
         selectionChange(list) {
+            console.log(list)
             this.selectionList = list
             if (list.length > 0) {
                 this.$refs.PackingBusiness.containersBillsList = this.selectionList[0].containersBillsList

src/views/iosBasicData/SeafreightExportF/bills/assembly/DistributionBox/containers.vue

@@ -17,6 +17,7 @@
         @row-save="rowSave"
         @row-del="rowDel"
         @selection-change="selectionChange"
+        @current-row-change="handleCurrentRowChange"
         @refresh-change="refreshChange"
       >
         <template slot="menuLeft">
@@ -98,7 +99,14 @@
                 >{{ $t("btn118n.deleteCtnrList") }}
               </el-button>
 
-              <!-- <el-button type="danger" size="small" plain @click.stop="$refs.splitOrder.openDialog(assemblyForm)">拆单</el-button> -->
+              <!-- <el-button
+                type="danger"
+                size="small"
+                plain
+                :disabled="detailData.seeDisabled || selectionList.length == 0 || disabled"
+                @click.stop="$refs.splitOrder.openDialog(assemblyForm, ids)"
+                >拆单</el-button
+              > -->
               <!-- <el-button type="success" size="small" plain @click.stop="$refs.splitOrder.openDialog(assemblyForm)">合票</el-button> -->
               <el-button type="success" size="small" plain @click.stop="$refs.print.openDialog()">
                 {{ $t("btn118n.preview") }}
@@ -337,7 +345,7 @@
       :treeType="false"
       :type="1"
     ></business-reports>
-    <split-order ref="splitOrder"></split-order>
+    <split-order ref="splitOrder" @getUpdata="getUpdata"></split-order>
   </div>
 </template>
 
@@ -485,6 +493,7 @@ export default {
         menuWidth: 90,
         summaryText: "合计",
         showSummary: true,
+        highlightCurrentRow: true,
         sumColumnList: [
           {
             name: "quantity",
@@ -687,6 +696,10 @@ export default {
     });
   },
   methods: {
+    handleCurrentRowChange(val) {
+      console.log(val, 111);
+      this.$emit("selectionChange", [val]);
+    },
     outExport() {
       this.$confirm("是否导出当前所有数据？", "提示", {
         confirmButtonText: "确定",
@@ -1412,6 +1425,9 @@ export default {
         });
       });
     },
+    getUpdata(){
+      this.$emit("billsDetailfun")
+    },
     beforeOpen(done, type) {
       if (["edit", "view"].includes(type)) {
         containersDetail(this.form.id).then(res => {
@@ -1422,16 +1438,17 @@ export default {
     },
     // 当选择项发生变化时会触发该事件
     selectionChange(list) {
-      let arr = [];
-      if (list.length > 1) {
-        this.$refs.crud.toggleSelection(); // 先清空所以选择的数据
-        arr = [list[list.length - 1]]; // 获取最新点击的数组
-        this.$refs.crud.toggleSelection(arr, true); // 把刚点击的数组变成选择状态
-      } else {
-        arr = list;
-      }
-      this.selectionList = arr;
-      this.$emit("selectionChange", this.selectionList);
+      // let arr = [];
+      // if (list.length > 1) {
+      //   this.$refs.crud.toggleSelection(); // 先清空所以选择的数据
+      //   arr = [list[list.length - 1]]; // 获取最新点击的数组
+      //   this.$refs.crud.toggleSelection(arr, true); // 把刚点击的数组变成选择状态
+      // } else {
+      //   arr = list;
+      // }
+      // this.selectionList = arr;
+      // this.$emit("selectionChange", this.selectionList);
+      this.selectionList = list;
     },
     inPitch() {
       this.$refs.crud.toggleRowSelection(this.assemblyForm.containersList[0], true);

src/views/iosBasicData/SeafreightExportF/bills/assembly/components/splitOrder.vue

@@ -1,8 +1,8 @@
 <template>
   <div>
     <el-dialog title="拆单" :visible.sync="dialogVisible" append-to-body width="50%" :before-close="handleClose">
-      <avue-form :option="optionForm" v-model="form" ref="form"></avue-form>
-      
+      <avue-form :option="optionForm" v-model="query" ref="form"></avue-form>
+      <el-button type="success" size="small" plain @click="getList">查询</el-button>
       <avue-crud
         v-if="dialogVisible"
         :option="option"
@@ -11,7 +11,7 @@
         ref="crud"
         id="out-table"
         :header-cell-class-name="headerClassName"
-        @on-load="onLoad"
+        @current-row-change="handleCurrentRowChange"
       >
       </avue-crud>
       <span slot="footer" class="dialog-footer">
@@ -23,43 +23,51 @@
 </template>
 
 <script>
-import { MktSlotQuotation, quotationImportBatch } from "@/api/iosBasicData/bills";
+import { selectComplyWithData, splitBoxNumber } from "@/api/iosBasicData/bills";
 export default {
   props: {},
   data() {
     return {
-      ids: null,
       data: [],
+      ids: null,
+      query: {},
+      pickObj: {},
       dialogVisible: false,
       loading: false,
 
       optionForm: {
         menuBtn: false,
-        span: 6,
+        span: 8,
         disabled: false,
         column: [
           {
             label: "客户名称",
             prop: "corpCnName",
-            disabled: false
+            disabled: true
           },
           {
-            label: "分单号",
-            prop: "hblno",
-            disabled: false
+            label: "所属公司",
+            prop: "branchName",
+            disabled: true
           },
           {
-            label: "开船日期",
-            prop: "etdList",
-            type: "daterange",
-            format: "yyyy-MM-dd",
-            valueFormat: "yyyy-MM-dd HH:mm:ss",
-            defaultTime: ["00:00:00", "23:59:59"],
-            disabled: false
+            label: "起运港",
+            prop: "polCnName",
+            disabled: true
           },
           {
-            label: "箱型箱量",
-            prop: "quantityCntrDescr",
+            label: "目的港",
+            prop: "podCnName",
+            disabled: true
+          },
+          {
+            label: "箱属",
+            prop: "boxBelongsTo",
+            disabled: true
+          },
+          {
+            label: "分单号",
+            prop: "hblno",
             disabled: false
           }
         ]
@@ -76,6 +84,7 @@ export default {
         menu: false,
         header: false,
         align: "center",
+        highlightCurrentRow: true,
         column: [
           {
             label: "客户名称",
@@ -105,21 +114,44 @@ export default {
     // this.option = await this.getColumnData(this.getColumnName(309.6), this.optionBack);
   },
   methods: {
-    openDialog(val) {
+    handleCurrentRowChange(val) {
+      this.pickObj = val;
+    },
+    openDialog(val, ids) {
       this.dialogVisible = true;
-      let obj = {
+      this.ids = null;
+      this.query = {};
+      this.pickObj = {};
+      this.query = {
         ...val
       };
-      // this.loading = true
-      // MktSlotQuotation(obj).then(res => {
-      //     this.data = res.data.data
-      // }).finally(() => {
-      //     this.loading = false
-      // })
+      this.ids = ids;
+    },
+    getList() {
+      let obj = {
+        branchId: this.query.branchId,
+        corpId: this.query.corpId,
+        polId: this.query.polId,
+        podId: this.query.podId,
+        boxBelongsTo: this.query.boxBelongsTo,
+        hblno: this.query.hblno
+      };
+      selectComplyWithData(obj).then(res => {
+        this.data = res.data.data;
+      });
     },
     submit() {
-      this.$emit("importData", this.quotationObj);
-      this.dialogVisible = false;
+      this.pickObj;
+      let obj = {
+        billId: this.query.id,
+        billIdNew: this.pickObj.id,
+        containersIds: this.ids
+      };
+      splitBoxNumber(obj).then(res => {
+        this.$message.success("操作成功");
+        this.dialogVisible = false;
+        this.$emit("getUpdata");
+      });
     },
     //自定义列保存
     async saveColumn(ref, option, optionBack, code) {

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

@@ -2689,7 +2689,7 @@ export default {
     searchReset() {
       this.query = {};
       this.query.billSort = this.query.billSort ? this.query.billSort : "1";
-      this.onLoad(this.page);
+      // this.onLoad(this.page);
     },
     // 搜索
     searchChange(params, done) {

src/views/iosBasicData/UnpaidPaymentsDetails/index.vue

@@ -656,7 +656,7 @@ export default {
         etdStart: null,
         etdEnd: null
       };
-      this.onLoad(this.page);
+      // this.onLoad(this.page);
     },
     // 搜索
     searchChange(params, done) {

src/views/iosBasicData/VoucherTemplates/index.vue

@@ -454,7 +454,7 @@ export default {
     },
     searchReset() {
       this.query = {};
-      this.onLoad(this.page);
+      // this.onLoad(this.page);
     },
     searchChange(params, done) {
       this.query = params;

src/views/iosBasicData/accounts/index.vue

@@ -676,7 +676,7 @@ export default {
     },
     searchReset() {
       this.query = {};
-      this.onLoad(this.page);
+      // this.onLoad(this.page);
     },
     // 搜索按钮点击
     searchChange(params, done) {

src/views/iosBasicData/advanceCharge/index.vue

@@ -205,7 +205,7 @@ export default {
     },
     searchReset() {
       this.query = this.$options.data().query;
-      this.onLoad(this.page);
+      // this.onLoad(this.page);
     },
     // 搜索按钮点击
     searchChange(params, done) {

src/views/iosBasicData/agencyFeeSetting/index.vue

@@ -187,7 +187,7 @@ export default {
     },
     searchReset() {
       this.query = this.$options.data().query;
-      this.onLoad(this.page);
+      // this.onLoad(this.page);
     },
     // 搜索按钮点击
     searchChange(params, done) {

src/views/iosBasicData/baccelements/index.vue

@@ -410,7 +410,7 @@ export default {
     },
     searchReset() {
       this.query = {};
-      this.onLoad(this.page);
+      // this.onLoad(this.page);
     },
     searchChange(params, done) {
       this.query = params;

src/views/iosBasicData/baccitemstype/index.vue

@@ -456,7 +456,7 @@ export default {
     },
     searchReset() {
       this.query = {};
-      this.onLoad(this.page);
+      // this.onLoad(this.page);
     },
     searchChange(params, done) {
       this.query = params;

src/views/iosBasicData/bbusinesstype/index.vue

@@ -295,7 +295,7 @@ export default {
     },
     searchReset() {
       this.query = {};
-      this.onLoad(this.page);
+      // this.onLoad(this.page);
     },
     searchChange(params, done) {
       this.query = params;

src/views/iosBasicData/bcntrtypes/index.vue

@@ -696,7 +696,7 @@ export default {
     },
     searchReset() {
       this.query = {};
-      this.onLoad(this.page);
+      // this.onLoad(this.page);
     },
     searchChange(params, done) {
       this.query = params;

src/views/iosBasicData/bcommodity/index.vue

@@ -507,7 +507,7 @@ export default {
     },
     searchReset() {
       this.query = {};
-      this.onLoad(this.page);
+      // this.onLoad(this.page);
     },
     searchChange(params, done) {
       this.query = params;

src/views/iosBasicData/bcorps/index.vue

@@ -783,7 +783,7 @@ export default {
     },
     searchReset() {
       this.query = {};
-      this.onLoad(this.page);
+      // this.onLoad(this.page);
     },
     searchChange(params, done) {
       this.query = params;

src/views/iosBasicData/bcountrys/index.vue

@@ -453,7 +453,7 @@ export default {
     // 清空搜索回调方法
     searchReset() {
       this.query = {};
-      this.onLoad(this.page);
+      // this.onLoad(this.page);
     },
     // 点击搜索后触发该事件(由于page分页信息和search搜索信息，可以直接通过this.page和this.search拿到)
     searchChange(params, done) {

src/views/iosBasicData/bfeesdefine/index.vue

@@ -742,7 +742,7 @@ export default {
     },
     searchReset() {
       this.query = {};
-      this.onLoad(this.page);
+      // this.onLoad(this.page);
     },
     searchChange(params, done) {
       this.query = params;

src/views/iosBasicData/billModify/index.vue

@@ -375,7 +375,7 @@ export default {
     },
     searchReset() {
       this.query = this.$options.data().query;
-      this.onLoad(this.page);
+      // this.onLoad(this.page);
     },
     // 搜索按钮点击
     searchChange(params, done) {

src/views/iosBasicData/blines/index.vue

@@ -624,7 +624,7 @@ export default {
     },
     searchReset() {
       this.query = {};
-      this.onLoad(this.page);
+      // this.onLoad(this.page);
     },
     searchChange(params, done) {
       this.query = params;

src/views/iosBasicData/blocations/index.vue

@@ -453,7 +453,7 @@ export default {
     },
     searchReset() {
       this.query = {};
-      this.onLoad(this.page);
+      // this.onLoad(this.page);
     },
     searchChange(params, done) {
       this.query = params;

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

@@ -273,7 +273,7 @@ export default {
     },
     searchReset() {
       this.query = this.$options.data().query;
-      this.onLoad(this.page);
+      // this.onLoad(this.page);
     },
     // 搜索按钮点击
     searchChange(params, done) {

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

@@ -192,7 +192,7 @@ export default {
   methods: {
     searchReset() {
       this.query = this.$options.data().query;
-      this.onLoad(this.page);
+      // this.onLoad(this.page);
     },
     // 搜索按钮点击
     searchChange(params, done) {

src/views/iosBasicData/bpackages/index.vue

@@ -604,7 +604,7 @@ export default {
     },
     searchReset() {
       this.query = {};
-      this.onLoad(this.page);
+      // this.onLoad(this.page);
     },
     searchChange(params, done) {
       this.query = params;

src/views/iosBasicData/bports/index.vue

@@ -629,7 +629,7 @@ export default {
     },
     searchReset() {
       this.query = {};
-      this.onLoad(this.page);
+      // this.onLoad(this.page);
     },
     searchChange(params, done) {
       this.query = params;

src/views/iosBasicData/bserviceterms/index.vue

@@ -570,7 +570,7 @@ export default {
     },
     searchReset() {
       this.query = {};
-      this.onLoad(this.page);
+      // this.onLoad(this.page);
     },
     searchChange(params, done) {
       this.query = params;

src/views/iosBasicData/btrademodes/index.vue

@@ -434,7 +434,7 @@ export default {
     },
     searchReset() {
       this.query = {};
-      this.onLoad(this.page);
+      // this.onLoad(this.page);
     },
     searchChange(params, done) {
       this.query = params;

src/views/iosBasicData/bunits/index.vue

@@ -455,7 +455,7 @@ export default {
     },
     searchReset() {
       this.query = {};
-      this.onLoad(this.page);
+      // this.onLoad(this.page);
     },
     searchChange(params, done) {
       this.query = params;

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

@@ -404,7 +404,7 @@ export default {
     },
     searchReset() {
       this.query = this.$options.data().query;
-      this.onLoad(this.page);
+      // this.onLoad(this.page);
     },
     // 搜索按钮点击
     searchChange(params, done) {

src/views/iosBasicData/businessCenter/customerBooking/index.vue

@@ -647,7 +647,7 @@ export default {
     },
     searchReset() {
       this.query = this.$options.data().query;
-      this.onLoad(this.page);
+      // this.onLoad(this.page);
     },
     // 搜索按钮点击
     searchChange(params, done) {

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

@@ -594,7 +594,7 @@ export default {
     },
     searchReset() {
       this.query = this.$options.data().query;
-      this.onLoad(this.page);
+      // this.onLoad(this.page);
     },
     // 搜索按钮点击
     searchChange(params, done) {

src/views/iosBasicData/businessCenter/mkt&slot/index.vue

@@ -271,7 +271,7 @@ export default {
     },
     searchReset() {
       this.query = this.$options.data().query;
-      this.onLoad(this.page);
+      // this.onLoad(this.page);
     },
     // 搜索按钮点击
     searchChange(params, done) {

src/views/iosBasicData/bvessels/index.vue

@@ -751,7 +751,7 @@ export default {
     },
     searchReset() {
       this.query = {};
-      this.onLoad(this.page);
+      // this.onLoad(this.page);
     },
     searchChange(params, done) {
       this.query = params;

src/views/iosBasicData/costStatistics/index.vue

@@ -443,7 +443,7 @@ export default {
     },
     searchReset() {
       this.query = {};
-      this.onLoad(this.page);
+      // this.onLoad(this.page);
     },
     // 搜索点击回调
     searchChange(params, done) {

src/views/iosBasicData/costcenter/airlineProfit/index.vue

@@ -852,7 +852,7 @@ export default {
     },
     searchReset() {
       this.query = this.$options.data().query;
-      this.onLoad(this.page);
+      // this.onLoad(this.page);
     },
     // 搜索按钮点击
     searchChange(params, done) {
@@ -893,7 +893,7 @@ export default {
     },
     searchReset2() {
       this.query2 = this.$options.data().query2;
-      this.onLoad2(this.page2);
+      // this.onLoad2(this.page2);
     },
     // 搜索按钮点击
     searchChange2(params, done) {
@@ -932,7 +932,7 @@ export default {
     },
     searchReset3() {
       this.query3 = this.$options.data().query3;
-      this.onLoad3(this.page3);
+      // this.onLoad3(this.page3);
     },
     // 搜索按钮点击
     searchChange3(params, done) {

src/views/iosBasicData/costcenter/coc/index.vue

@@ -616,7 +616,7 @@ export default {
     },
     searchReset() {
       this.query = this.$options.data().query;
-      this.onLoad(this.page);
+      // this.onLoad(this.page);
     },
     // 搜索按钮点击
     searchChange(params, done) {

src/views/iosBasicData/costcenter/rt&fd/index.vue

@@ -217,7 +217,7 @@ export default {
     },
     searchReset() {
       this.query = this.$options.data().query;
-      this.onLoad();
+      // this.onLoad();
     },
     // 搜索按钮点击
     searchChange(params, done) {

src/views/iosBasicData/costcenter/soc/index.vue

@@ -689,7 +689,7 @@ export default {
     },
     searchReset() {
       this.query = this.$options.data().query;
-      this.onLoad(this.page);
+      // this.onLoad(this.page);
     },
     // 搜索按钮点击
     searchChange(params, done) {

src/views/iosBasicData/dangerousPackaging/index.vue

@@ -604,7 +604,7 @@ export default {
     },
     searchReset() {
       this.query = {};
-      this.onLoad(this.page);
+      // this.onLoad(this.page);
     },
     searchChange(params, done) {
       this.query = params;

src/views/iosBasicData/decisionAnalysis/index.vue

@@ -898,7 +898,7 @@ export default {
         type: 1,
         billType: "DD,MH"
       };
-      this.onLoad(this.page);
+      // this.onLoad(this.page);
     },
     // searchCriteriaSwitch(type) {
     //     if (type) {
@@ -1264,7 +1264,7 @@ export default {
         chart: 1,
         type: 1
       };
-      this.chartOnLoad();
+      // this.chartOnLoad();
     },
     //自定义列保存
     async saveColumnTwo(ref, option, optionBack, code) {

src/views/iosBasicData/editypes/index.vue

@@ -505,7 +505,7 @@ export default {
     },
     searchReset() {
       this.query = {};
-      this.onLoad(this.page);
+      // this.onLoad(this.page);
     },
     searchChange(params, done) {
       this.query = params;

src/views/iosBasicData/feeApplication/index.vue

@@ -270,7 +270,7 @@ export default {
     },
     searchReset() {
       this.query = this.$options.data().query;
-      this.onLoad(this.page);
+      // this.onLoad(this.page);
     },
     // 搜索按钮点击
     searchChange(params, done) {

src/views/iosBasicData/financeProfit/index.vue

@@ -1018,7 +1018,7 @@ export default {
         examine: 0,
         examineDate: 0
       };
-      this.onLoad(this.page);
+      // this.onLoad(this.page);
     },
     // 搜索
     searchChange(params, done) {

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

@@ -768,7 +768,7 @@ export default {
     },
     searchReset() {
       this.query = {};
-      this.onLoad(this.page);
+      // this.onLoad(this.page);
     },
     searchChange(params, done) {
       this.query = params;

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

@@ -922,9 +922,8 @@ export default {
     },
     // 清空回调
     searchReset() {
-      console.log("清空回调");
       this.query = {};
-      this.onLoad(this.page);
+      // this.onLoad(this.page);
     },
     // 搜索回调
     searchChange(params, done) {

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

@@ -928,7 +928,7 @@ export default {
     },
     searchReset() {
       this.query = {};
-      this.onLoad(this.page);
+      // this.onLoad(this.page);
     },
     searchChange(params, done) {
       this.query = params;

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

@@ -1369,7 +1369,7 @@ export default {
     // 清除
     searchReset() {
       this.query = {};
-      this.onLoad(this.page);
+      // this.onLoad(this.page);
     },
     // 搜索
     searchChange(params, done) {

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

@@ -832,7 +832,7 @@ export default {
     },
     searchReset() {
       this.query = {};
-      this.onLoad(this.page);
+      // this.onLoad(this.page);
     },
     // 搜索
     searchChange(params, done) {

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

@@ -269,7 +269,7 @@ export default {
     },
     searchReset() {
       this.query = this.$options.data().query;
-      this.onLoad(this.page);
+      // this.onLoad(this.page);
     },
     // 搜索按钮点击
     searchChange(params, done) {

src/views/iosBasicData/finvouchers/index.vue

@@ -486,7 +486,7 @@ export default {
     },
     searchReset() {
       this.query = {};
-      this.onLoad(this.page);
+      // this.onLoad(this.page);
     },
     searchChange(params, done) {
       this.query = params;

src/views/iosBasicData/loloTemplate/index.vue

@@ -530,7 +530,7 @@ export default {
     },
     searchReset() {
       this.query = {};
-      this.onLoad(this.page);
+      // this.onLoad(this.page);
     },
     searchChange(params, done) {
       this.query = params;

src/views/iosBasicData/losbfeestemplate/index.vue

@@ -615,7 +615,7 @@ export default {
       this.$nextTick(() => {
         this.$refs.tree.setCurrentKey(this.currentId)
       })
-      this.onLoad(this.page);
+      // this.onLoad(this.page);
     },
     searchChange(params, done) {
       this.query = params;

src/views/iosBasicData/overdueFee/index.vue

@@ -192,7 +192,7 @@ export default {
     },
     searchReset() {
       this.query = this.$options.data().query;
-      this.onLoad(this.page);
+      // this.onLoad(this.page);
     },
     // 搜索按钮点击
     searchChange(params, done) {

src/views/iosBasicData/paymentDetail/index.vue

@@ -757,7 +757,7 @@ export default {
         etdStart: null,
         etdEnd: null
       };
-      this.onLoad(this.page);
+      // this.onLoad(this.page);
     },
     // 搜索
     searchChange(params, done) {

src/views/iosBasicData/podStation/index.vue

@@ -80,6 +80,7 @@ export default {
   name: "POD场站",
   data() {
     return {
+      firstPage: false,
       podDialog: false,
       podForm: {},
       podOption: {
@@ -180,7 +181,7 @@ export default {
             label: "放箱号类型",
             prop: "busType",
             width: 100,
-            overHidden: true,
+            overHidden: true
           },
           {
             label: "还箱日期",
@@ -221,25 +222,25 @@ export default {
             label: "目的港场站联系人",
             prop: "podCyContact",
             width: 120,
-            overHidden: true,
+            overHidden: true
           },
           {
             label: "目的港场站地址",
             prop: "podCyAddress",
             width: 120,
-            overHidden: true,
+            overHidden: true
           },
           {
             label: "目的港场站邮箱",
             prop: "podCyEmail",
             width: 120,
-            overHidden: true,
+            overHidden: true
           },
           {
             label: "目的港场站电话",
             prop: "podCyTel",
             width: 120,
-            overHidden: true,
+            overHidden: true
           },
           {
             label: "MB/L NO",
@@ -472,7 +473,7 @@ export default {
       this.query = {
         businessType: "SE"
       };
-      this.onLoad(this.page);
+      // this.onLoad(this.page);
     },
     // 搜索按钮点击
     searchChange(params, done) {
@@ -493,23 +494,27 @@ export default {
       this.onLoad(this.page, this.query);
     },
     onLoad(page, params = {}) {
-      let obj = {};
-      obj = {
-        ...Object.assign(params, this.query)
-      };
-      this.loading = true;
-      getList(page.currentPage, page.pageSize, obj)
-        .then(res => {
-          this.data = res.data.data.records;
-          this.page.total = res.data.data.total;
-          this.$nextTick(() => {
-            this.$refs.crud.doLayout();
-            this.$refs.crud.dicInit();
+      if (this.firstPage) {
+        let obj = {};
+        obj = {
+          ...Object.assign(params, this.query)
+        };
+        this.loading = true;
+        getList(page.currentPage, page.pageSize, obj)
+          .then(res => {
+            this.data = res.data.data.records;
+            this.page.total = res.data.data.total;
+            this.$nextTick(() => {
+              this.$refs.crud.doLayout();
+              this.$refs.crud.dicInit();
+            });
+          })
+          .finally(() => {
+            this.loading = false;
           });
-        })
-        .finally(() => {
-          this.loading = false;
-        });
+      } else {
+        this.firstPage = true;
+      }
     },
     outExport() {
       let config = { params: { ...this.query } };

src/views/iosBasicData/podTemplate/index.vue

@@ -550,7 +550,7 @@ export default {
     },
     searchReset() {
       this.query = {};
-      this.onLoad(this.page);
+      // this.onLoad(this.page);
     },
     searchChange(params, done) {
       this.query = params;

src/views/iosBasicData/polTemplate/index.vue

@@ -550,7 +550,7 @@ export default {
     },
     searchReset() {
       this.query = {};
-      this.onLoad(this.page);
+      // this.onLoad(this.page);
     },
     searchChange(params, done) {
       this.query = params;

src/views/iosBasicData/sailingSchedule/index.vue

@@ -524,7 +524,7 @@ export default {
     },
     searchReset() {
       this.query = this.$options.data().query;
-      this.onLoad(this.page, this.query);
+      // this.onLoad(this.page, this.query);
     },
     searchChange(params, done) {
       this.page.currentPage = 1;

src/views/iosBasicData/seamends/index.vue

@@ -435,7 +435,7 @@ export default {
     },
     searchReset() {
       this.query = {};
-      this.onLoad(this.page);
+      // this.onLoad(this.page);
     },
     searchChange(params, done) {
       this.query = params;

src/views/iosBasicData/siamends/index.vue

@@ -433,7 +433,7 @@ export default {
     },
     searchReset() {
       this.query = {};
-      this.onLoad(this.page);
+      // this.onLoad(this.page);
     },
     searchChange(params, done) {
       this.query = params;

src/views/iosBasicData/storageFeeF/index.vue

@@ -220,7 +220,7 @@ export default {
     },
     searchReset() {
       this.query = this.$options.data().query;
-      this.onLoad(this.page);
+      // this.onLoad(this.page);
     },
     // 搜索按钮点击
     searchChange(params, done) {

src/views/iosBasicData/warehouse/index.vue

@@ -449,7 +449,7 @@ export default {
     },
     searchReset() {
       this.query = {};
-      this.onLoad(this.page);
+      // this.onLoad(this.page);
     },
     searchChange(params, done) {
       this.query = params;

src/views/ow/contract/index.vue

@@ -297,7 +297,7 @@ export default {
     },
     searchReset() {
       this.query = this.$options.data().query;
-      this.onLoad(this.page);
+      // this.onLoad(this.page);
     },
     // 搜索按钮点击
     searchChange(params, done) {

src/views/ow/owNotification/index.vue

@@ -308,7 +308,7 @@ export default {
   methods: {
     searchReset() {
       this.query = this.$options.data().query;
-      this.onLoad();
+      // this.onLoad();
     },
     // 搜索按钮点击
     searchChange(params, done) {

src/views/ow/owPut/detailsPage.vue

@@ -94,11 +94,11 @@
                 <container-number
                   ref="containerNumberRef"
                   v-model="form.containerNumber"
-                  placeholder="放箱号"
+                  placeholder="自有放箱号"
                   label="containerNumber"
                   url="/blade-los/putbox/selectContainerNumber"
                   @selectChange="dicChange('containerNumber', $event)"
-                  titleDialog="放箱号"
+                  titleDialog="自有放箱号"
                   :disabled="editDisabled || form.whetherEnable == '是'"
                 ></container-number>
               </tempalte>
@@ -263,8 +263,8 @@
                 <el-button type="primary" size="small" :disabled="editDisabled || selectionList.length == 0" @click="allClick('批量修改POD场站')">
                   批量修改POD场站
                 </el-button>
-                <el-button type="success" size="small" @click="allClick('客户还箱')">客户还箱</el-button>
-                <el-button type="success" size="small" @click="allClick('导出箱号')">导出箱号</el-button>
+                <el-button type="success" size="small" :disabled="!form.id||form.tradingBoxItemsList.length==0" @click="allClick('客户还箱')">客户还箱</el-button>
+                <el-button type="success" size="small" :disabled="!form.id" @click="allClick('导出箱号')">导出箱号</el-button>
                 <!-- <el-button type="info" size="small" @click="allClick('启用')">启用</el-button> -->
                 <!-- <el-button type="primary" size="small" @click="allClick('卖箱')">卖箱</el-button> -->
                 <!-- <el-button size="small" style="margin-right: 8px" :disabled="!form.id || true"
@@ -1287,7 +1287,8 @@ import {
   revokePickUpCost,
   revokeCheckPleaseVerifyCost,
   finstlbillsGetAccBillIdList,
-  fininvoicesGetAccBillIdList
+  fininvoicesGetAccBillIdList,
+  exportTemplateById
 } from "@/api/boxManagement/buyContainer";
 import dicSelect from "@/components/dicSelect/main";
 import containerNumber from "@/components/dicSelect/containerNumber";
@@ -1432,7 +1433,7 @@ export default {
         disabled: false,
         column: [
           {
-            label: "放箱号",
+            label: "自有放箱号",
             prop: "containerNumber",
             span: 24,
             rules: [
@@ -1444,6 +1445,18 @@ export default {
             ]
           },
           {
+            label: "放箱号",
+            prop: "internalContainerNumber",
+            span: 24,
+            rules: [
+              {
+                required: true,
+                message: "",
+                trigger: "blur"
+              }
+            ]
+          },
+          {
             label: "起运港",
             prop: "polCname",
             span: 24,
@@ -1560,7 +1573,7 @@ export default {
             ]
           },
           {
-            label: "放箱号",
+            label: "自有放箱号",
             prop: "containerNumber",
             disabled: false,
             rules: [
@@ -1572,7 +1585,7 @@ export default {
             ]
           },
           {
-            label: "内部放箱号",
+            label: "放箱号",
             prop: "internalContainerNumber",
             disabled: false,
             rules: [
@@ -4034,10 +4047,14 @@ export default {
           }
         } else {
           if (this.selectionList.length == 0) {
-            return this.$message.error("请选择箱明细");
+            for (let item of this.form.tradingBoxItemsList) {
+              ids.push(item.id);
+            }
           }
-          for (let item of this.selectionList) {
-            ids.push(item.id);
+          if (this.selectionList.length) {
+            for (let item of this.selectionList) {
+              ids.push(item.id);
+            }
           }
         }
 
@@ -4045,14 +4062,17 @@ export default {
           id: this.form.id,
           ids: ids.join(",")
         };
-        const routeData = this.$router.resolve({
-          path: "/api/blade-los/boxdynamicsrecord/exportTemplateById", //跳转目标窗口的地址
-          query: {
-            "Blade-Auth": getToken(),
-            ...data //括号内是要传递给新窗口的参数
-          }
+
+        exportTemplateById(data).then(res => {
+          const routeData = this.$router.resolve({
+            path: "/api/blade-los/boxdynamicsrecord/exportTemplateById", //跳转目标窗口的地址
+            query: {
+              "Blade-Auth": getToken(),
+              ...data //括号内是要传递给新窗口的参数
+            }
+          });
+          window.open(routeData.href.slice(1, routeData.href.length));
         });
-        window.open(routeData.href.slice(1, routeData.href.length));
       }
       if (name == "启用") {
         if (!this.form.id) {
@@ -4067,6 +4087,7 @@ export default {
         this.form.cyTextOne = this.form.cyText;
         this.activationForm = {
           containerNumber: this.form.containerNumber,
+          internalContainerNumber: this.form.internalContainerNumber,
           polId: this.form.polId,
           polCode: this.form.polCode,
           polEname: this.form.polEname,

src/views/ow/owPut/index.vue

@@ -102,7 +102,7 @@ export default {
         ],
         column: [
           {
-            label: "放箱号",
+            label: "自有放箱号",
             prop: "containerNumber",
             width: 90,
             overHidden: true,
@@ -167,7 +167,7 @@ export default {
             overHidden: true
           },
           {
-            label: "内部放箱号",
+            label: "放箱号",
             prop: "internalContainerNumber",
             width: 100,
             overHidden: true
@@ -606,7 +606,7 @@ export default {
     },
     searchReset() {
       this.query = this.$options.data().query;
-      this.onLoad(this.page);
+      // this.onLoad(this.page);
     },
     // 搜索按钮点击
     searchChange(params, done) {

src/views/ow/owReminder/index.vue

@@ -308,7 +308,7 @@ export default {
   methods: {
     searchReset() {
       this.query = this.$options.data().query;
-      this.onLoad();
+      // this.onLoad();
     },
     // 搜索按钮点击
     searchChange(params, done) {

src/views/ow/owTask/detailsPage.vue

@@ -319,7 +319,7 @@
                 <el-button type="primary" size="small" :disabled="editDisabled" @click="allClick('批量修改POD场站')">
                   批量修改POD场站
                 </el-button>
-                <el-button type="success" size="small" :disabled="!form.id" @click="allClick('客户还箱')">客户还箱</el-button>
+                <el-button type="success" size="small" :disabled="!form.id||form.tradingBoxItemsList.length==0" @click="allClick('客户还箱')">客户还箱</el-button>
                 <el-button type="success" size="small" :disabled="!form.id" @click="allClick('导出箱号')"> 导出箱号</el-button>
                 <!-- <el-button type="primary" size="small" @click="allClick('卖箱')">卖箱</el-button> -->
                 <!-- <el-button size="small" style="margin-right: 8px" :disabled="!form.id || true"
@@ -1395,7 +1395,8 @@ import {
   revokePickUpCost,
   finstlbillsGetAccBillIdList,
   fininvoicesGetAccBillIdList,
-  addSubmit
+  addSubmit,
+  exportTemplateById
 } from "@/api/boxManagement/buyContainer";
 
 import { bportsDetail } from "@/api/iosBasicData/bports";
@@ -4537,24 +4538,30 @@ export default {
           }
         } else {
           if (this.selectionList.length == 0) {
-            return this.$message.error("请选择箱明细");
+            for (let item of this.form.tradingBoxItemsList) {
+              ids.push(item.id);
+            }
           }
-          for (let item of this.selectionList) {
-            ids.push(item.id);
+          if (this.selectionList.length) {
+            for (let item of this.selectionList) {
+              ids.push(item.id);
+            }
           }
         }
         let data = {
           id: this.form.id,
           ids: ids.join(",")
         };
-        const routeData = this.$router.resolve({
-          path: "/api/blade-los/boxdynamicsrecord/exportTemplateById", //跳转目标窗口的地址
-          query: {
-            "Blade-Auth": getToken(),
-            ...data //括号内是要传递给新窗口的参数
-          }
+        exportTemplateById(data).then(res => {
+          const routeData = this.$router.resolve({
+            path: "/api/blade-los/boxdynamicsrecord/exportTemplateById", //跳转目标窗口的地址
+            query: {
+              "Blade-Auth": getToken(),
+              ...data //括号内是要传递给新窗口的参数
+            }
+          });
+          window.open(routeData.href.slice(1, routeData.href.length));
         });
-        window.open(routeData.href.slice(1, routeData.href.length));
       }
       if (name == "导出") {
         let ids = [];
@@ -4923,15 +4930,15 @@ export default {
                 format: "yyyy-MM-dd",
                 valueFormat: "yyyy-MM-dd HH:mm:ss",
                 value: date,
-                pickerOptions: {
-                  disabledDate(time) {
-                    if (date) {
-                      const date2 = new Date(date);
-                      // date.setDate(date.getDate() + 1);
-                      return time.getTime() < date2.getTime();
-                    }
-                  }
-                },
+                // pickerOptions: {
+                //   disabledDate(time) {
+                //     if (date) {
+                //       const date2 = new Date(date);
+                //       // date.setDate(date.getDate() + 1);
+                //       return time.getTime() < date2.getTime();
+                //     }
+                //   }
+                // },
                 rules: [
                   {
                     required: true,

src/views/ow/owTask/index.vue

@@ -734,7 +734,7 @@ export default {
     },
     searchReset() {
       this.query = this.$options.data().query;
-      this.onLoad(this.page);
+      // this.onLoad(this.page);
     },
     // 搜索按钮点击
     searchChange(params, done) {

src/views/serviceConfiguration/businessbillno/index.vue

@@ -434,7 +434,7 @@ export default {
     },
     searchReset() {
       this.query = {};
-      this.onLoad(this.page);
+      // this.onLoad(this.page);
     },
     searchChange(params, done) {
       this.query = params;

src/views/serviceConfiguration/configurationModification/index.vue

@@ -146,7 +146,7 @@ export default {
         },
         searchReset() {
             this.query = this.$options.data().query;
-            this.onLoad(this.page);
+            // this.onLoad(this.page);
         },
         // 搜索按钮点击
         searchChange(params, done) {

src/views/serviceConfiguration/modifyData/index.vue

@@ -170,7 +170,7 @@ export default {
         },
         searchReset() {
             this.query = this.$options.data().query;
-            this.onLoad(this.page);
+            // this.onLoad(this.page);
         },
         // 搜索按钮点击
         searchChange(params, done) {