1.用箱计划 新加消息跳转后 进入详情页的监听事件

2.集装箱管理 给业务页面预留 打开消息跳转后 进入详情页的监听事件
3.海运箱量利润统计 非admin 总部 权限时 接口报错

src/views/boxManagement/agentBox/detailsPage.vue

@@ -1380,9 +1380,6 @@ export default {
       // this.optionForm.disabled = true
       this.getDetail(this.detailData.id)
     }
-    if (this.$route.query.params) {
-      this.getDetail(this.$route.query.params)
-    }
     if (this.detailData.copyId) {
       this.getCopydate(this.detailData.copyId)
     }

src/views/boxManagement/agentBox/index.vue

@@ -1,24 +1,35 @@
 <template>
   <div>
     <basic-container v-if="isShow">
-      <avue-crud :option="option" :table-loading="loading" :data="data" :page.sync="page" :search.sync="query"
-        v-model="form" id="out-table" :header-cell-class-name="headerClassName" ref="crud" @row-del="rowDel"
-        @search-change="searchChange" @search-reset="searchReset" @selection-change="selectionChange"
-        @current-change="currentChange" @size-change="sizeChange" @refresh-change="refreshChange"
+      <avue-crud
+        :option="option"
+        :table-loading="loading"
+        :data="data"
+        :page.sync="page"
+        :search.sync="query"
+        v-model="form"
+        id="out-table"
+        :header-cell-class-name="headerClassName"
+        ref="crud"
+        @row-del="rowDel"
+        @search-change="searchChange"
+        @search-reset="searchReset"
+        @selection-change="selectionChange"
+        @current-change="currentChange"
+        @size-change="sizeChange"
+        @refresh-change="refreshChange"
         @resetColumn="resetColumn('crud', 'option', 'optionBack', 474)"
-        @saveColumn="saveColumn('crud', 'option', 'optionBack', 474)" @on-load="onLoad">
+        @saveColumn="saveColumn('crud', 'option', 'optionBack', 474)"
+        @on-load="onLoad"
+      >
         <template slot="menuLeft">
-          <el-button type="primary" size="small" icon="el-icon-plus" @click="addButton">创建单据
-          </el-button>
-          <el-button type="success" size="small" :disabled="selectionList.length != 1" @click="copyButton">复制单据
-          </el-button>
-          <el-button type="warning" size="small"  disabled @click="outExport">导 出
-          </el-button>
+          <el-button type="primary" size="small" icon="el-icon-plus" @click="addButton">创建单据 </el-button>
+          <el-button type="success" size="small" :disabled="selectionList.length != 1" @click="copyButton">复制单据 </el-button>
+          <el-button type="warning" size="small" disabled @click="outExport">导 出 </el-button>
         </template>
         <template slot="menu" slot-scope="{ row, index }">
           <el-button size="small" icon="el-icon-edit" type="text" @click="rowEdit(row)">编辑</el-button>
-          <el-button size="small" icon="el-icon-delete" type="text" @click="rowDel(row, index)"
-            :disabled="row.count > 0">删 除</el-button>
+          <el-button size="small" icon="el-icon-delete" type="text" @click="rowDel(row, index)" :disabled="row.count > 0">删 除</el-button>
         </template>
         <template slot="sysNo" slot-scope="{ row }">
           <span style="color: #1e9fff;cursor: pointer;" @click="rowEdit(row)">{{ row.sysNo }}</span>
@@ -47,7 +58,7 @@ export default {
       isShow: true,
       form: {},
       query: {
-        type: "DL",
+        type: "DL"
       },
       loading: false,
       page: {
@@ -58,7 +69,7 @@ export default {
       selectionList: [],
       option: {},
       optionBack: {
-        height: 'auto',
+        height: "auto",
         calcHeight: 30,
         menuWidth: 140,
         tip: false,
@@ -72,64 +83,64 @@ export default {
         delBtn: false,
         selection: true,
         searchIcon: true,
-        align: 'center',
+        align: "center",
         searchIndex: 3,
         summaryText: "合计",
         showSummary: true,
         sumColumnList: [
           {
-            name: 'totalAmount',
-            type: 'sum',
+            name: "totalAmount",
+            type: "sum",
             decimals: 2
           }
         ],
         column: [
-        {
-            label: '箱号',
-            prop: 'code',
+          {
+            label: "箱号",
+            prop: "code",
             width: 100,
             search: true,
             searchOrder: 1,
-            overHidden: true,
+            overHidden: true
           },
           {
-            label: '代理名称',
-            prop: 'purchaseCompanyName',
+            label: "代理名称",
+            prop: "purchaseCompanyName",
             width: 200,
             overHidden: true,
             search: true,
             searchOrder: 2,
-            type: 'select',
+            type: "select",
             filterable: true,
             remote: true,
             dicUrl: "/api/blade-los/bcorps/listAll?status=0&corpTypeName=国内同行及代理,国外同行及代理&cnName={{key}}",
             props: {
-              label: 'shortName',
-              value: 'shortName',
-              desc: 'code',
+              label: "shortName",
+              value: "shortName",
+              desc: "code"
             }
           },
           {
-            label: '系统号',
-            prop: 'sysNo',
+            label: "系统号",
+            prop: "sysNo",
             width: 150,
-            overHidden: true,
+            overHidden: true
           },
           {
-            label: '合同号',
-            prop: 'contractNo',
+            label: "合同号",
+            prop: "contractNo",
             width: 150,
             search: true,
             searchOrder: 3,
             overHidden: true
           },
           {
-            label: '日期',
-            prop: 'effectiveDate',
+            label: "日期",
+            prop: "effectiveDate",
             width: 100,
             search: true,
             searchOrder: 4,
-            searchProp: 'effectiveDateList',
+            searchProp: "effectiveDateList",
             overHidden: true,
             type: "date",
             searchRange: true,
@@ -138,12 +149,12 @@ export default {
             valueFormat: "yyyy-MM-dd HH:mm:ss"
           },
           {
-            label: '到期日期',
-            prop: 'expiryDate',
+            label: "到期日期",
+            prop: "expiryDate",
             width: 100,
             search: true,
             searchOrder: 5,
-            searchProp: 'expiryDateList',
+            searchProp: "expiryDateList",
             overHidden: true,
             type: "date",
             searchRange: true,
@@ -152,20 +163,20 @@ export default {
             valueFormat: "yyyy-MM-dd HH:mm:ss"
           },
           {
-            label: '场站',
-            prop: 'stationCname',
+            label: "场站",
+            prop: "stationCname",
             width: 80,
             overHidden: true
           },
           {
-            label: '港口',
-            prop: 'addressCname',
+            label: "港口",
+            prop: "addressCname",
             width: 80,
             overHidden: true
           },
           {
-            label: '目的港',
-            prop: 'podCname',
+            label: "目的港",
+            prop: "podCname",
             width: 80,
             overHidden: true
           },
@@ -173,8 +184,9 @@ export default {
             label: "制单人",
             prop: "createUserName",
             overHidden: true,
-            width: 80,
-          }, {
+            width: 80
+          },
+          {
             label: "制单日期",
             prop: "createTime",
             type: "date",
@@ -182,12 +194,14 @@ export default {
             width: 100,
             format: "yyyy-MM-dd",
             valueFormat: "yyyy-MM-dd HH:mm:ss"
-          }, {
+          },
+          {
             label: "修改人",
             prop: "updateUserName",
             overHidden: true,
-            width: 80,
-          }, {
+            width: 80
+          },
+          {
             label: "修改日期",
             prop: "updateTime",
             type: "date",
@@ -198,7 +212,7 @@ export default {
           }
         ]
       },
-      data: [],
+      data: []
     };
   },
   components: {
@@ -208,19 +222,27 @@ export default {
     this.option = await this.getColumnData(this.getColumnName(474), this.optionBack);
   },
   activated() {
-    if (this.$route.query.id) {
+    setTimeout(() => {
+      if (this.$route.query.id) {
         this.detailData = {
           id: this.$route.query.id
         };
-        this.isShow = false
+        this.isShow = false;
       }
+      if (this.$route.query.params) {
+        this.detailData = {
+          id: this.$route.query.params
+        };
+        this.isShow = false;
+      }
+    }, 100);
   },
   methods: {
     addButton() {
-      this.isShow = false
+      this.isShow = false;
     },
     copyButton() {
-      this.isShow = false
+      this.isShow = false;
       this.detailData = {
         copyId: this.selectionList[0].id
       };
@@ -229,7 +251,7 @@ export default {
       this.detailData = {
         id: row.id
       };
-      this.isShow = false
+      this.isShow = false;
     },
     // 删除
     rowDel(row, index) {
@@ -244,9 +266,8 @@ export default {
         remove({ ids: row.id }).then(res => {
           this.onLoad(this.page, this.query);
           this.$message.success("成功删除");
-        })
-      })
-
+        });
+      });
     },
     searchReset() {
       this.query = this.$options.data().query;
@@ -271,21 +292,23 @@ export default {
       this.onLoad(this.page, this.query);
     },
     onLoad(page, params = {}) {
-      let obj = {}
+      let obj = {};
       obj = {
-        ...Object.assign(params, this.query),
-      }
+        ...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();
+      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;
-      })
     },
     // 详情的返回列表
     goBack() {
@@ -296,34 +319,34 @@ export default {
           path: "/boxManagement/buyContainer/index"
         });
       }
-      this.detailData = {}
+      this.detailData = {};
       this.isShow = true;
       this.onLoad(this.page, this.query);
     },
     outExport() {
-      let config = { params: { ...this.query } }
+      let config = { params: { ...this.query } };
       if (config.params) {
         for (const propName of Object.keys(config.params)) {
           const value = config.params[propName];
-          if (value !== null && typeof (value) !== "undefined") {
+          if (value !== null && typeof value !== "undefined") {
             if (value instanceof Array) {
               for (const key of Object.keys(value)) {
-                let params = propName + '[' + key + ']';
-                config.params[params] = value[key]
+                let params = propName + "[" + key + "]";
+                config.params[params] = value[key];
               }
-              delete config.params[propName]
+              delete config.params[propName];
             }
           }
         }
       }
       const routeData = this.$router.resolve({
-        path: '/api/blade-los/routecost/exportRouteCost',      //跳转目标窗口的地址
+        path: "/api/blade-los/routecost/exportRouteCost", //跳转目标窗口的地址
         query: {
-          ...config.params,    //括号内是要传递给新窗口的参数
+          ...config.params, //括号内是要传递给新窗口的参数
           identification: this.url
         }
-      })
-      window.open(routeData.href.slice(1, routeData.href.length) + '&' + `${this.website.tokenHeader}=${getToken()}`);
+      });
+      window.open(routeData.href.slice(1, routeData.href.length) + "&" + `${this.website.tokenHeader}=${getToken()}`);
     },
     //自定义列保存
     async saveColumn(ref, option, optionBack, code) {
@@ -337,8 +360,8 @@ export default {
         this.$message.success("保存成功");
         //关闭窗口
         this.$refs[ref].$refs.dialogColumn.columnBox = false;
-        this.selectionList=[]
-        this.searchReset()
+        this.selectionList = [];
+        this.searchReset();
       }
     },
     //自定义列重置
@@ -348,27 +371,25 @@ export default {
       if (inSave) {
         this.$message.success("重置成功");
         this.$refs[ref].$refs.dialogColumn.columnBox = false;
-        this.selectionList=[]
-        this.searchReset()
+        this.selectionList = [];
+        this.searchReset();
       }
     },
     // 更改表格颜色
     headerClassName(tab) {
       //颜色间隔
-      let back = ""
+      let back = "";
       if (tab.columnIndex >= 0 && tab.column.level === 1) {
         if (tab.columnIndex % 2 === 0) {
-          back = "back-one"
+          back = "back-one";
         } else if (tab.columnIndex % 2 === 1) {
-          back = "back-two"
+          back = "back-two";
         }
       }
       return back;
-    },
-
+    }
   }
-}
-
+};
 </script>
 
 <style lang="scss" scoped>
@@ -390,4 +411,4 @@ export default {
 ::v-deep .el-col-md-8 {
   width: 24.33333%;
 }
-</style>
+</style>

src/views/boxManagement/boxAdjustment/detailsPage.vue

@@ -1618,9 +1618,6 @@ export default {
       // this.optionForm.disabled = true
       this.getDetail(this.detailData.id);
     }
-    if (this.$route.query.params) {
-      this.getDetail(this.$route.query.params);
-    }
     if (this.detailData.copyId) {
       this.getCopydate(this.detailData.copyId);
     }

src/views/boxManagement/boxAdjustment/index.vue

@@ -1,24 +1,35 @@
 <template>
   <div>
     <basic-container v-if="isShow">
-      <avue-crud :option="option" :table-loading="loading" :data="data" :page.sync="page" :search.sync="query"
-        v-model="form" id="out-table" :header-cell-class-name="headerClassName" ref="crud" @row-del="rowDel"
-        @search-change="searchChange" @search-reset="searchReset" @selection-change="selectionChange"
-        @current-change="currentChange" @size-change="sizeChange" @refresh-change="refreshChange"
+      <avue-crud
+        :option="option"
+        :table-loading="loading"
+        :data="data"
+        :page.sync="page"
+        :search.sync="query"
+        v-model="form"
+        id="out-table"
+        :header-cell-class-name="headerClassName"
+        ref="crud"
+        @row-del="rowDel"
+        @search-change="searchChange"
+        @search-reset="searchReset"
+        @selection-change="selectionChange"
+        @current-change="currentChange"
+        @size-change="sizeChange"
+        @refresh-change="refreshChange"
         @resetColumn="resetColumn('crud', 'option', 'optionBack', 478)"
-        @saveColumn="saveColumn('crud', 'option', 'optionBack', 478)" @on-load="onLoad">
+        @saveColumn="saveColumn('crud', 'option', 'optionBack', 478)"
+        @on-load="onLoad"
+      >
         <template slot="menuLeft">
-          <el-button type="primary" size="small" icon="el-icon-plus" @click="addButton">创建单据
-          </el-button>
-          <el-button type="success" size="small" :disabled="selectionList.length != 1" @click="copyButton">复制单据
-          </el-button>
-          <el-button type="warning" size="small" disabled @click="outExport">导 出
-          </el-button>
+          <el-button type="primary" size="small" icon="el-icon-plus" @click="addButton">创建单据 </el-button>
+          <el-button type="success" size="small" :disabled="selectionList.length != 1" @click="copyButton">复制单据 </el-button>
+          <el-button type="warning" size="small" disabled @click="outExport">导 出 </el-button>
         </template>
         <template slot="menu" slot-scope="{ row, index }">
           <el-button size="small" icon="el-icon-edit" type="text" @click="rowEdit(row)">编辑</el-button>
-          <el-button size="small" icon="el-icon-delete" type="text" @click="rowDel(row, index)"
-            :disabled="form.approvalStatus != 0">删 除</el-button>
+          <el-button size="small" icon="el-icon-delete" type="text" @click="rowDel(row, index)" :disabled="form.approvalStatus != 0">删 除</el-button>
         </template>
         <template slot="sysNo" slot-scope="{ row }">
           <span style="color: #1e9fff;cursor: pointer;" @click="rowEdit(row)">{{ row.sysNo }}</span>
@@ -47,7 +58,7 @@ export default {
       isShow: true,
       form: {},
       query: {
-        type: "XGDX",
+        type: "XGDX"
       },
       loading: false,
       page: {
@@ -58,7 +69,7 @@ export default {
       selectionList: [],
       option: {},
       optionBack: {
-        height: 'auto',
+        height: "auto",
         calcHeight: 30,
         menuWidth: 140,
         searchLabelWidth: 90,
@@ -73,44 +84,44 @@ export default {
         delBtn: false,
         selection: true,
         searchIcon: true,
-        align: 'center',
+        align: "center",
         searchIndex: 3,
         summaryText: "合计",
         showSummary: true,
         sumColumnList: [
           {
-            name: 'totalAmount',
-            type: 'sum',
+            name: "totalAmount",
+            type: "sum",
             decimals: 2
           }
         ],
         column: [
           {
-            label: '船公司/车队',
-            prop: 'purchaseCompanyName',
+            label: "船公司/车队",
+            prop: "purchaseCompanyName",
             width: 150,
             overHidden: true,
             search: true,
             searchOrder: 1,
-            type: 'select',
+            type: "select",
             filterable: true,
             remote: true,
             dicUrl: "/api/blade-los/bcorps/listAll?status=0&corpTypeName=船公司,陆运公司&cnName={{key}}",
             props: {
-              label: 'shortName',
-              value: 'shortName',
-              desc: 'code',
-            },
+              label: "shortName",
+              value: "shortName",
+              desc: "code"
+            }
           },
           {
-            label: '系统号',
-            prop: 'sysNo',
+            label: "系统号",
+            prop: "sysNo",
             width: 100,
-            overHidden: true,
+            overHidden: true
           },
           {
-            label: '提单号/运单号',
-            prop: 'contractNo',
+            label: "提单号/运单号",
+            prop: "contractNo",
             searchLabelWidth: 100,
             width: 100,
             search: true,
@@ -118,20 +129,20 @@ export default {
             overHidden: true
           },
           {
-            label: '放箱号',
-            prop: 'containerNumber',
+            label: "放箱号",
+            prop: "containerNumber",
             width: 100,
             search: true,
             searchOrder: 2,
             overHidden: true
           },
           {
-            label: '调箱日期',
-            prop: 'purchaseDate',
+            label: "调箱日期",
+            prop: "purchaseDate",
             width: 100,
             search: true,
             searchOrder: 3,
-            searchProp: 'purchaseDateList',
+            searchProp: "purchaseDateList",
             overHidden: true,
             type: "date",
             searchRange: true,
@@ -140,8 +151,8 @@ export default {
             valueFormat: "yyyy-MM-dd HH:mm:ss"
           },
           {
-            label: '起运港',
-            prop: 'polCname',
+            label: "起运港",
+            prop: "polCname",
             overHidden: true,
             search: true,
             searchOrder: 4,
@@ -152,14 +163,14 @@ export default {
             props: {
               label: "cnName",
               value: "cnName",
-              desc: 'code',
+              desc: "code",
               res: "data.records"
             },
             width: 100
           },
           {
-            label: '实际起运港场站',
-            prop: 'polStationCname',
+            label: "实际起运港场站",
+            prop: "polStationCname",
             overHidden: true,
             search: true,
             searchOrder: 5,
@@ -170,14 +181,14 @@ export default {
             props: {
               label: "cnName",
               value: "cnName",
-              desc: 'code',
+              desc: "code",
               res: "data.records"
             },
             width: 140
           },
           {
-            label: '目的港',
-            prop: 'podCname',
+            label: "目的港",
+            prop: "podCname",
             overHidden: true,
             search: true,
             searchOrder: 6,
@@ -188,14 +199,14 @@ export default {
             props: {
               label: "cnName",
               value: "cnName",
-              desc: 'code',
+              desc: "code",
               res: "data.records"
             },
             width: 100
           },
           {
-            label: '目的港提/送箱场站',
-            prop: 'podStationCname',
+            label: "目的港提/送箱场站",
+            prop: "podStationCname",
             overHidden: true,
             search: true,
             searchOrder: 7,
@@ -207,14 +218,14 @@ export default {
             props: {
               label: "cnName",
               value: "cnName",
-              desc: 'code',
+              desc: "code",
               res: "data.records"
             },
             width: 140
           },
           {
-            label: '箱型',
-            prop: 'boxTypeQuantityOne',
+            label: "箱型",
+            prop: "boxTypeQuantityOne",
             width: 100,
             overHidden: true,
             search: true,
@@ -230,34 +241,34 @@ export default {
             }
           },
           {
-            label: '箱量',
-            prop: 'boxNumber',
+            label: "箱量",
+            prop: "boxNumber",
             width: 100,
             overHidden: true
           },
           {
-            label: '业务状态',
-            prop: 'approvalStatus',
+            label: "业务状态",
+            prop: "approvalStatus",
             overHidden: true,
             search: true,
             searchOrder: 10,
-            type: 'select',
+            type: "select",
             dicData: [
               {
-                label: '录入',
-                value: '0',
+                label: "录入",
+                value: "0"
               },
               {
-                label: '审核中',
-                value: '1',
+                label: "审核中",
+                value: "1"
               },
               {
-                label: '审核中',
-                value: '2',
+                label: "审核中",
+                value: "2"
               },
               {
-                label: '已通过',
-                value: '3',
+                label: "已通过",
+                value: "3"
               }
             ]
           },
@@ -278,8 +289,9 @@ export default {
             label: "制单人",
             prop: "createUserName",
             overHidden: true,
-            width: 80,
-          }, {
+            width: 80
+          },
+          {
             label: "制单日期",
             prop: "createTime",
             type: "date",
@@ -287,12 +299,14 @@ export default {
             width: 100,
             format: "yyyy-MM-dd",
             valueFormat: "yyyy-MM-dd HH:mm:ss"
-          }, {
+          },
+          {
             label: "修改人",
             prop: "updateUserName",
             overHidden: true,
-            width: 80,
-          }, {
+            width: 80
+          },
+          {
             label: "修改日期",
             prop: "updateTime",
             type: "date",
@@ -303,7 +317,7 @@ export default {
           }
         ]
       },
-      data: [],
+      data: []
     };
   },
   components: {
@@ -317,14 +331,26 @@ export default {
       if (this.$route.query.home) {
         this.addButton();
       }
+      if (this.$route.query.id) {
+        this.detailData = {
+          id: this.$route.query.id
+        };
+        this.isShow = false;
+      }
+      if (this.$route.query.params) {
+        this.detailData = {
+          id: this.$route.query.params
+        };
+        this.isShow = false;
+      }
     }, 100);
   },
   methods: {
     addButton() {
-      this.isShow = false
+      this.isShow = false;
     },
     copyButton() {
-      this.isShow = false
+      this.isShow = false;
       this.detailData = {
         copyId: this.selectionList[0].id
       };
@@ -333,7 +359,7 @@ export default {
       this.detailData = {
         id: row.id
       };
-      this.isShow = false
+      this.isShow = false;
     },
     // 删除
     rowDel(row, index) {
@@ -348,9 +374,8 @@ export default {
         remove({ ids: row.id }).then(res => {
           this.onLoad(this.page, this.query);
           this.$message.success("成功删除");
-        })
-      })
-
+        });
+      });
     },
     searchReset() {
       this.query = this.$options.data().query;
@@ -375,21 +400,23 @@ export default {
       this.onLoad(this.page, this.query);
     },
     onLoad(page, params = {}) {
-      let obj = {}
+      let obj = {};
       obj = {
-        ...Object.assign(params, this.query),
-      }
+        ...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();
+      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;
-      })
     },
     // 详情的返回列表
     goBack() {
@@ -400,34 +427,34 @@ export default {
           path: "/boxManagement/boxAdjustment/index"
         });
       }
-      this.detailData = {}
+      this.detailData = {};
       this.isShow = true;
       this.onLoad(this.page, this.query);
     },
     outExport() {
-      let config = { params: { ...this.query } }
+      let config = { params: { ...this.query } };
       if (config.params) {
         for (const propName of Object.keys(config.params)) {
           const value = config.params[propName];
-          if (value !== null && typeof (value) !== "undefined") {
+          if (value !== null && typeof value !== "undefined") {
             if (value instanceof Array) {
               for (const key of Object.keys(value)) {
-                let params = propName + '[' + key + ']';
-                config.params[params] = value[key]
+                let params = propName + "[" + key + "]";
+                config.params[params] = value[key];
               }
-              delete config.params[propName]
+              delete config.params[propName];
             }
           }
         }
       }
       const routeData = this.$router.resolve({
-        path: '/api/blade-los/routecost/exportRouteCost',      //跳转目标窗口的地址
+        path: "/api/blade-los/routecost/exportRouteCost", //跳转目标窗口的地址
         query: {
-          ...config.params,    //括号内是要传递给新窗口的参数
+          ...config.params, //括号内是要传递给新窗口的参数
           identification: this.url
         }
-      })
-      window.open(routeData.href.slice(1, routeData.href.length) + '&' + `${this.website.tokenHeader}=${getToken()}`);
+      });
+      window.open(routeData.href.slice(1, routeData.href.length) + "&" + `${this.website.tokenHeader}=${getToken()}`);
     },
     //自定义列保存
     async saveColumn(ref, option, optionBack, code) {
@@ -441,8 +468,8 @@ export default {
         this.$message.success("保存成功");
         //关闭窗口
         this.$refs[ref].$refs.dialogColumn.columnBox = false;
-        this.selectionList = []
-        this.searchReset()
+        this.selectionList = [];
+        this.searchReset();
       }
     },
     //自定义列重置
@@ -452,27 +479,25 @@ export default {
       if (inSave) {
         this.$message.success("重置成功");
         this.$refs[ref].$refs.dialogColumn.columnBox = false;
-        this.selectionList = []
-        this.searchReset()
+        this.selectionList = [];
+        this.searchReset();
       }
     },
     // 更改表格颜色
     headerClassName(tab) {
       //颜色间隔
-      let back = ""
+      let back = "";
       if (tab.columnIndex >= 0 && tab.column.level === 1) {
         if (tab.columnIndex % 2 === 0) {
-          back = "back-one"
+          back = "back-one";
         } else if (tab.columnIndex % 2 === 1) {
-          back = "back-two"
+          back = "back-two";
         }
       }
       return back;
-    },
-
+    }
   }
-}
-
+};
 </script>
 
 <style lang="scss" scoped>
@@ -494,4 +519,4 @@ export default {
 ::v-deep .el-col-md-8 {
   width: 24.33333%;
 }
-</style>
+</style>

src/views/boxManagement/boxCost/detailsPage.vue

@@ -2259,9 +2259,6 @@ export default {
       // this.optionForm.disabled = true
       this.getDetail(this.detailData.id);
     }
-    if (this.$route.query.params) {
-      this.getDetail(this.$route.query.params);
-    }
     if (this.detailData.copyId) {
       this.getCopydate(this.detailData.copyId);
     }
@@ -2825,9 +2822,11 @@ export default {
         if (row) {
           el.feeId = row.id;
           el.feeCode = row.code;
+          el.feeEnName=row.enName;
         } else {
           el.feeId = null;
           el.feeCode = null;
+          el.feeEnName=null;
           el.feeCnName = null;
         }
       }

src/views/boxManagement/boxCost/index.vue

@@ -205,6 +205,18 @@ export default {
       if (this.$route.query.home) {
         this.addButton();
       }
+       if (this.$route.query.id) {
+        this.detailData = {
+          id: this.$route.query.id
+        };
+        this.isShow = false;
+      }
+      if (this.$route.query.params) {
+        this.detailData = {
+          id: this.$route.query.params
+        };
+        this.isShow = false;
+      }
     }, 100);
   },
   methods: {

src/views/boxManagement/boxExit/detailsPage.vue

@@ -1298,9 +1298,6 @@ export default {
       // this.optionForm.disabled = true
       this.getDetail(this.detailData.id)
     }
-    if (this.$route.query.params) {
-      this.getDetail(this.$route.query.params)
-    }
     if (this.detailData.copyId) {
       this.getCopydate(this.detailData.copyId)
     }

src/views/boxManagement/boxExit/index.vue

@@ -259,6 +259,18 @@ export default {
       if (this.$route.query.home) {
         this.addButton();
       }
+       if (this.$route.query.id) {
+        this.detailData = {
+          id: this.$route.query.id
+        };
+        this.isShow = false;
+      }
+      if (this.$route.query.params) {
+        this.detailData = {
+          id: this.$route.query.params
+        };
+        this.isShow = false;
+      }
     }, 100);
   },
   methods: {

src/views/boxManagement/buyContainer/index.vue

@@ -1,24 +1,35 @@
 <template>
   <div>
     <basic-container v-if="isShow">
-      <avue-crud :option="option" :table-loading="loading" :data="data" :page.sync="page" :search.sync="query"
-        v-model="form" id="out-table" :header-cell-class-name="headerClassName" ref="crud" @row-del="rowDel"
-        @search-change="searchChange" @search-reset="searchReset" @selection-change="selectionChange"
-        @current-change="currentChange" @size-change="sizeChange" @refresh-change="refreshChange"
+      <avue-crud
+        :option="option"
+        :table-loading="loading"
+        :data="data"
+        :page.sync="page"
+        :search.sync="query"
+        v-model="form"
+        id="out-table"
+        :header-cell-class-name="headerClassName"
+        ref="crud"
+        @row-del="rowDel"
+        @search-change="searchChange"
+        @search-reset="searchReset"
+        @selection-change="selectionChange"
+        @current-change="currentChange"
+        @size-change="sizeChange"
+        @refresh-change="refreshChange"
         @resetColumn="resetColumn('crud', 'option', 'optionBack', 235)"
-        @saveColumn="saveColumn('crud', 'option', 'optionBack', 235)" @on-load="onLoad">
+        @saveColumn="saveColumn('crud', 'option', 'optionBack', 235)"
+        @on-load="onLoad"
+      >
         <template slot="menuLeft">
-          <el-button type="primary" size="small" icon="el-icon-plus" @click="addButton">创建单据
-          </el-button>
-          <el-button type="success" size="small" :disabled="selectionList.length != 1" @click="copyButton">复制单据
-          </el-button>
-          <el-button type="warning" size="small" disabled @click="outExport">导 出
-          </el-button>
+          <el-button type="primary" size="small" icon="el-icon-plus" @click="addButton">创建单据 </el-button>
+          <el-button type="success" size="small" :disabled="selectionList.length != 1" @click="copyButton">复制单据 </el-button>
+          <el-button type="warning" size="small" disabled @click="outExport">导 出 </el-button>
         </template>
         <template slot="menu" slot-scope="{ row, index }">
           <el-button size="small" icon="el-icon-edit" type="text" @click="rowEdit(row)">编辑</el-button>
-          <el-button size="small" icon="el-icon-delete" type="text" @click="rowDel(row, index)"
-            :disabled="row.count > 0">删 除</el-button>
+          <el-button size="small" icon="el-icon-delete" type="text" @click="rowDel(row, index)" :disabled="row.count > 0">删 除</el-button>
         </template>
         <template slot="sysNo" slot-scope="{ row }">
           <span style="color: #1e9fff;cursor: pointer;" @click="rowEdit(row)">{{ row.sysNo }}</span>
@@ -47,7 +58,7 @@ export default {
       isShow: true,
       form: {},
       query: {
-        type: "BUY",
+        type: "BUY"
       },
       loading: false,
       page: {
@@ -58,7 +69,7 @@ export default {
       selectionList: [],
       option: {},
       optionBack: {
-        height: 'auto',
+        height: "auto",
         calcHeight: 30,
         menuWidth: 140,
         tip: false,
@@ -72,65 +83,65 @@ export default {
         delBtn: false,
         selection: true,
         searchIcon: true,
-        align: 'center',
+        align: "center",
         searchIndex: 3,
         summaryText: "合计",
         showSummary: true,
         sumColumnList: [
           {
-            name: 'totalAmount',
-            type: 'sum',
+            name: "totalAmount",
+            type: "sum",
             decimals: 2
           }
         ],
         column: [
-        {
-            label: '箱号',
-            prop: 'code',
+          {
+            label: "箱号",
+            prop: "code",
             width: 100,
             search: true,
             searchOrder: 1,
-            overHidden: true,
+            overHidden: true
           },
           {
-            label: '出售方',
-            prop: 'purchaseCompanyName',
+            label: "出售方",
+            prop: "purchaseCompanyName",
             width: 150,
             overHidden: true,
             search: true,
             searchOrder: 2,
-            type: 'select',
+            type: "select",
             filterable: true,
             remote: true,
             dicUrl: "/api/blade-los/bcorps/selectList?status=0&current=1&size=5&corpTypeName=箱东&shortName={{key}}",
             props: {
-              label: 'shortName',
-              value: 'shortName',
-              desc: 'code',
-              res: 'data.records'
-            },
+              label: "shortName",
+              value: "shortName",
+              desc: "code",
+              res: "data.records"
+            }
           },
           {
-            label: '系统号',
-            prop: 'sysNo',
+            label: "系统号",
+            prop: "sysNo",
             width: 100,
-            overHidden: true,
+            overHidden: true
           },
           {
-            label: '合同号',
-            prop: 'contractNo',
+            label: "合同号",
+            prop: "contractNo",
             width: 100,
             search: true,
             searchOrder: 3,
             overHidden: true
           },
           {
-            label: '购买日期',
-            prop: 'purchaseDate',
+            label: "购买日期",
+            prop: "purchaseDate",
             width: 100,
             search: true,
             searchOrder: 4,
-            searchProp: 'purchaseDateList',
+            searchProp: "purchaseDateList",
             overHidden: true,
             type: "date",
             searchRange: true,
@@ -139,44 +150,44 @@ export default {
             valueFormat: "yyyy-MM-dd HH:mm:ss"
           },
           {
-            label: '箱型箱量',
-            prop: 'boxTypeQuantityOne',
+            label: "箱型箱量",
+            prop: "boxTypeQuantityOne",
             overHidden: true,
             width: 100
           },
           {
-            label: '箱型箱量2',
-            prop: 'boxTypeQuantityTwo',
+            label: "箱型箱量2",
+            prop: "boxTypeQuantityTwo",
             overHidden: true,
             width: 100
           },
           {
-            label: '提/送箱',
-            prop: 'agreement',
+            label: "提/送箱",
+            prop: "agreement",
             width: 90,
             overHidden: true
           },
           {
-            label: '场站',
-            prop: 'stationCname',
+            label: "场站",
+            prop: "stationCname",
             width: 80,
             overHidden: true
           },
           {
-            label: '港口',
-            prop: 'addressCname',
+            label: "港口",
+            prop: "addressCname",
             width: 80,
             overHidden: true
           },
           {
-            label: '箱况',
-            prop: 'boxCondition',
+            label: "箱况",
+            prop: "boxCondition",
             width: 80,
             overHidden: true
           },
           {
-            label: 'LOGO',
-            prop: 'log',
+            label: "LOGO",
+            prop: "log",
             width: 80,
             overHidden: true
           },
@@ -184,8 +195,9 @@ export default {
             label: "制单人",
             prop: "createUserName",
             overHidden: true,
-            width: 80,
-          }, {
+            width: 80
+          },
+          {
             label: "制单日期",
             prop: "createTime",
             type: "date",
@@ -193,12 +205,14 @@ export default {
             width: 100,
             format: "yyyy-MM-dd",
             valueFormat: "yyyy-MM-dd HH:mm:ss"
-          }, {
+          },
+          {
             label: "修改人",
             prop: "updateUserName",
             overHidden: true,
-            width: 80,
-          }, {
+            width: 80
+          },
+          {
             label: "修改日期",
             prop: "updateTime",
             type: "date",
@@ -209,7 +223,7 @@ export default {
           }
         ]
       },
-      data: [],
+      data: []
     };
   },
   components: {
@@ -224,16 +238,22 @@ export default {
         this.detailData = {
           id: this.$route.query.id
         };
-        this.isShow = false
+        this.isShow = false;
+      }
+      if (this.$route.query.params) {
+        this.detailData = {
+          id: this.$route.query.params
+        };
+        this.isShow = false;
       }
     }, 100);
   },
   methods: {
     addButton() {
-      this.isShow = false
+      this.isShow = false;
     },
     copyButton() {
-      this.isShow = false
+      this.isShow = false;
       this.detailData = {
         copyId: this.selectionList[0].id
       };
@@ -242,7 +262,7 @@ export default {
       this.detailData = {
         id: row.id
       };
-      this.isShow = false
+      this.isShow = false;
     },
     // 删除
     rowDel(row, index) {
@@ -257,9 +277,8 @@ export default {
         remove({ ids: row.id }).then(res => {
           this.onLoad(this.page, this.query);
           this.$message.success("成功删除");
-        })
-      })
-
+        });
+      });
     },
     searchReset() {
       this.query = this.$options.data().query;
@@ -284,21 +303,23 @@ export default {
       this.onLoad(this.page, this.query);
     },
     onLoad(page, params = {}) {
-      let obj = {}
+      let obj = {};
       obj = {
-        ...Object.assign(params, this.query),
-      }
+        ...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();
+      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;
-      })
     },
     // 详情的返回列表
     goBack() {
@@ -309,34 +330,34 @@ export default {
           path: "/boxManagement/buyContainer/index"
         });
       }
-      this.detailData = {}
+      this.detailData = {};
       this.isShow = true;
       this.onLoad(this.page, this.query);
     },
     outExport() {
-      let config = { params: { ...this.query } }
+      let config = { params: { ...this.query } };
       if (config.params) {
         for (const propName of Object.keys(config.params)) {
           const value = config.params[propName];
-          if (value !== null && typeof (value) !== "undefined") {
+          if (value !== null && typeof value !== "undefined") {
             if (value instanceof Array) {
               for (const key of Object.keys(value)) {
-                let params = propName + '[' + key + ']';
-                config.params[params] = value[key]
+                let params = propName + "[" + key + "]";
+                config.params[params] = value[key];
               }
-              delete config.params[propName]
+              delete config.params[propName];
             }
           }
         }
       }
       const routeData = this.$router.resolve({
-        path: '/api/blade-los/routecost/exportRouteCost',      //跳转目标窗口的地址
+        path: "/api/blade-los/routecost/exportRouteCost", //跳转目标窗口的地址
         query: {
-          ...config.params,    //括号内是要传递给新窗口的参数
+          ...config.params, //括号内是要传递给新窗口的参数
           identification: this.url
         }
-      })
-      window.open(routeData.href.slice(1, routeData.href.length) + '&' + `${this.website.tokenHeader}=${getToken()}`);
+      });
+      window.open(routeData.href.slice(1, routeData.href.length) + "&" + `${this.website.tokenHeader}=${getToken()}`);
     },
     //自定义列保存
     async saveColumn(ref, option, optionBack, code) {
@@ -350,8 +371,8 @@ export default {
         this.$message.success("保存成功");
         //关闭窗口
         this.$refs[ref].$refs.dialogColumn.columnBox = false;
-        this.selectionList = []
-        this.searchReset()
+        this.selectionList = [];
+        this.searchReset();
       }
     },
     //自定义列重置
@@ -361,27 +382,25 @@ export default {
       if (inSave) {
         this.$message.success("重置成功");
         this.$refs[ref].$refs.dialogColumn.columnBox = false;
-        this.selectionList = []
-        this.searchReset()
+        this.selectionList = [];
+        this.searchReset();
       }
     },
     // 更改表格颜色
     headerClassName(tab) {
       //颜色间隔
-      let back = ""
+      let back = "";
       if (tab.columnIndex >= 0 && tab.column.level === 1) {
         if (tab.columnIndex % 2 === 0) {
-          back = "back-one"
+          back = "back-one";
         } else if (tab.columnIndex % 2 === 1) {
-          back = "back-two"
+          back = "back-two";
         }
       }
       return back;
-    },
-
+    }
   }
-}
-
+};
 </script>
 
 <style lang="scss" scoped>
@@ -403,4 +422,4 @@ export default {
 ::v-deep .el-col-md-8 {
   width: 24.33333%;
 }
-</style>
+</style>

src/views/boxManagement/containerNumber/index.vue

@@ -469,7 +469,20 @@ export default {
     this.option = await this.getColumnData(this.getColumnName(459), this.optionBack);
   },
   activated() {
-    setTimeout(() => {}, 100);
+     setTimeout(() => {
+      if (this.$route.query.id) {
+        this.detailData = {
+          id: this.$route.query.id
+        };
+        this.isShow = false;
+      }
+      if (this.$route.query.params) {
+        this.detailData = {
+          id: this.$route.query.params
+        };
+        this.isShow = false;
+      }
+    }, 100);
   },
   methods: {
     addButton() {

src/views/boxManagement/rentalBox/index.vue

@@ -1,24 +1,35 @@
 <template>
   <div>
     <basic-container v-if="isShow">
-      <avue-crud :option="option" :table-loading="loading" :data="data" :page.sync="page" :search.sync="query"
-        v-model="form" id="out-table" :header-cell-class-name="headerClassName" ref="crud" @row-del="rowDel"
-        @search-change="searchChange" @search-reset="searchReset" @selection-change="selectionChange"
-        @current-change="currentChange" @size-change="sizeChange" @refresh-change="refreshChange"
+      <avue-crud
+        :option="option"
+        :table-loading="loading"
+        :data="data"
+        :page.sync="page"
+        :search.sync="query"
+        v-model="form"
+        id="out-table"
+        :header-cell-class-name="headerClassName"
+        ref="crud"
+        @row-del="rowDel"
+        @search-change="searchChange"
+        @search-reset="searchReset"
+        @selection-change="selectionChange"
+        @current-change="currentChange"
+        @size-change="sizeChange"
+        @refresh-change="refreshChange"
         @resetColumn="resetColumn('crud', 'option', 'optionBack', 472)"
-        @saveColumn="saveColumn('crud', 'option', 'optionBack', 472)" @on-load="onLoad">
+        @saveColumn="saveColumn('crud', 'option', 'optionBack', 472)"
+        @on-load="onLoad"
+      >
         <template slot="menuLeft">
-          <el-button type="primary" size="small" icon="el-icon-plus" @click="addButton">创建单据
-          </el-button>
-          <el-button type="success" size="small" :disabled="selectionList.length != 1" @click="copyButton">复制单据
-          </el-button>
-          <el-button type="warning" size="small" disabled @click="outExport">导 出
-          </el-button>
+          <el-button type="primary" size="small" icon="el-icon-plus" @click="addButton">创建单据 </el-button>
+          <el-button type="success" size="small" :disabled="selectionList.length != 1" @click="copyButton">复制单据 </el-button>
+          <el-button type="warning" size="small" disabled @click="outExport">导 出 </el-button>
         </template>
         <template slot="menu" slot-scope="{ row, index }">
           <el-button size="small" icon="el-icon-edit" type="text" @click="rowEdit(row)">编辑</el-button>
-          <el-button size="small" icon="el-icon-delete" type="text" @click="rowDel(row, index)"
-            :disabled="row.count > 0">删 除</el-button>
+          <el-button size="small" icon="el-icon-delete" type="text" @click="rowDel(row, index)" :disabled="row.count > 0">删 除</el-button>
         </template>
         <template slot="sysNo" slot-scope="{ row }">
           <span style="color: #1e9fff;cursor: pointer;" @click="rowEdit(row)">{{ row.sysNo }}</span>
@@ -47,7 +58,7 @@ export default {
       isShow: true,
       form: {},
       query: {
-        type: "ZR",
+        type: "ZR"
       },
       loading: false,
       page: {
@@ -58,7 +69,7 @@ export default {
       selectionList: [],
       option: {},
       optionBack: {
-        height: 'auto',
+        height: "auto",
         calcHeight: 30,
         menuWidth: 140,
         tip: false,
@@ -72,65 +83,65 @@ export default {
         delBtn: false,
         selection: true,
         searchIcon: true,
-        align: 'center',
+        align: "center",
         searchIndex: 3,
         summaryText: "合计",
         showSummary: true,
         sumColumnList: [
           {
-            name: 'totalAmount',
-            type: 'sum',
+            name: "totalAmount",
+            type: "sum",
             decimals: 2
           }
         ],
         column: [
-        {
-            label: '箱号',
-            prop: 'code',
+          {
+            label: "箱号",
+            prop: "code",
             width: 100,
             search: true,
             searchOrder: 1,
-            overHidden: true,
+            overHidden: true
           },
           {
-            label: '出租方',
-            prop: 'purchaseCompanyName',
+            label: "出租方",
+            prop: "purchaseCompanyName",
             width: 200,
             overHidden: true,
             search: true,
             searchOrder: 2,
-            type: 'select',
+            type: "select",
             filterable: true,
             remote: true,
             dicUrl: "/api/blade-los/bcorps/selectList?status=0&current=1&size=5&corpTypeName=箱东&shortName={{key}}",
             props: {
-              label: 'shortName',
-              value: 'shortName',
-              desc: 'code',
-              res: 'data.records'
+              label: "shortName",
+              value: "shortName",
+              desc: "code",
+              res: "data.records"
             }
           },
           {
-            label: '系统号',
-            prop: 'sysNo',
+            label: "系统号",
+            prop: "sysNo",
             width: 150,
-            overHidden: true,
+            overHidden: true
           },
           {
-            label: '合同号',
-            prop: 'contractNo',
+            label: "合同号",
+            prop: "contractNo",
             width: 150,
             search: true,
             searchOrder: 3,
             overHidden: true
           },
           {
-            label: '合同日期',
-            prop: 'effectiveDate',
+            label: "合同日期",
+            prop: "effectiveDate",
             width: 100,
             search: true,
             searchOrder: 4,
-            searchProp: 'effectiveDateList',
+            searchProp: "effectiveDateList",
             overHidden: true,
             type: "date",
             searchRange: true,
@@ -139,49 +150,49 @@ export default {
             valueFormat: "yyyy-MM-dd HH:mm:ss"
           },
           {
-            label: '租/还箱标准',
-            prop: 'standard',
+            label: "租/还箱标准",
+            prop: "standard",
             width: 100,
             overHidden: true
           },
           {
-            label: '退/还箱地',
-            prop: 'polStationCname',
+            label: "退/还箱地",
+            prop: "polStationCname",
             width: 80,
             overHidden: true
           },
           {
-            label: '场站',
-            prop: 'stationCname',
+            label: "场站",
+            prop: "stationCname",
             width: 80,
             overHidden: true
           },
           {
-            label: '港口',
-            prop: 'addressCname',
+            label: "港口",
+            prop: "addressCname",
             width: 80,
             overHidden: true
           },
           {
-            label: '业务状态',
-            prop: 'buxStaus',
+            label: "业务状态",
+            prop: "buxStaus",
             width: 100,
             overHidden: true,
             search: true,
             searchOrder: 6,
-            type: 'select',
+            type: "select",
             dicData: [
               {
-                label: '录入',
-                value: '录入',
+                label: "录入",
+                value: "录入"
               },
               {
-                label: '已启租',
-                value: '已启租',
+                label: "已启租",
+                value: "已启租"
               },
               {
-                label: '已退租',
-                value: '已退租',
+                label: "已退租",
+                value: "已退租"
               }
             ]
           },
@@ -189,8 +200,9 @@ export default {
             label: "制单人",
             prop: "createUserName",
             overHidden: true,
-            width: 80,
-          }, {
+            width: 80
+          },
+          {
             label: "制单日期",
             prop: "createTime",
             type: "date",
@@ -198,12 +210,14 @@ export default {
             width: 100,
             format: "yyyy-MM-dd",
             valueFormat: "yyyy-MM-dd HH:mm:ss"
-          }, {
+          },
+          {
             label: "修改人",
             prop: "updateUserName",
             overHidden: true,
-            width: 80,
-          }, {
+            width: 80
+          },
+          {
             label: "修改日期",
             prop: "updateTime",
             type: "date",
@@ -214,7 +228,7 @@ export default {
           }
         ]
       },
-      data: [],
+      data: []
     };
   },
   components: {
@@ -224,19 +238,27 @@ export default {
     this.option = await this.getColumnData(this.getColumnName(472), this.optionBack);
   },
   activated() {
-    if (this.$route.query.id) {
+    setTimeout(() => {
+      if (this.$route.query.id) {
         this.detailData = {
           id: this.$route.query.id
         };
-        this.isShow = false
+        this.isShow = false;
       }
+      if (this.$route.query.params) {
+        this.detailData = {
+          id: this.$route.query.params
+        };
+        this.isShow = false;
+      }
+    }, 100);
   },
   methods: {
     addButton() {
-      this.isShow = false
+      this.isShow = false;
     },
     copyButton() {
-      this.isShow = false
+      this.isShow = false;
       this.detailData = {
         copyId: this.selectionList[0].id
       };
@@ -245,7 +267,7 @@ export default {
       this.detailData = {
         id: row.id
       };
-      this.isShow = false
+      this.isShow = false;
     },
     // 删除
     rowDel(row, index) {
@@ -260,9 +282,8 @@ export default {
         remove({ ids: row.id }).then(res => {
           this.onLoad(this.page, this.query);
           this.$message.success("成功删除");
-        })
-      })
-
+        });
+      });
     },
     searchReset() {
       this.query = this.$options.data().query;
@@ -287,25 +308,27 @@ export default {
       this.onLoad(this.page, this.query);
     },
     onLoad(page, params = {}) {
-      let obj = {}
+      let obj = {};
       obj = {
-        ...Object.assign(params, this.query),
-      }
-      if(this.query.effectiveDateList&&this.query.effectiveDateList.length){
-        obj.effectiveDate=this.query.effectiveDateList[0]
-        obj.expiryDate=this.query.effectiveDateList[1]
+        ...Object.assign(params, this.query)
+      };
+      if (this.query.effectiveDateList && this.query.effectiveDateList.length) {
+        obj.effectiveDate = this.query.effectiveDateList[0];
+        obj.expiryDate = this.query.effectiveDateList[1];
       }
       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();
+      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;
-      })
     },
     // 详情的返回列表
     goBack() {
@@ -316,34 +339,34 @@ export default {
           path: "/boxManagement/buyContainer/index"
         });
       }
-      this.detailData = {}
+      this.detailData = {};
       this.isShow = true;
       this.onLoad(this.page, this.query);
     },
     outExport() {
-      let config = { params: { ...this.query } }
+      let config = { params: { ...this.query } };
       if (config.params) {
         for (const propName of Object.keys(config.params)) {
           const value = config.params[propName];
-          if (value !== null && typeof (value) !== "undefined") {
+          if (value !== null && typeof value !== "undefined") {
             if (value instanceof Array) {
               for (const key of Object.keys(value)) {
-                let params = propName + '[' + key + ']';
-                config.params[params] = value[key]
+                let params = propName + "[" + key + "]";
+                config.params[params] = value[key];
               }
-              delete config.params[propName]
+              delete config.params[propName];
             }
           }
         }
       }
       const routeData = this.$router.resolve({
-        path: '/api/blade-los/routecost/exportRouteCost',      //跳转目标窗口的地址
+        path: "/api/blade-los/routecost/exportRouteCost", //跳转目标窗口的地址
         query: {
-          ...config.params,    //括号内是要传递给新窗口的参数
+          ...config.params, //括号内是要传递给新窗口的参数
           identification: this.url
         }
-      })
-      window.open(routeData.href.slice(1, routeData.href.length) + '&' + `${this.website.tokenHeader}=${getToken()}`);
+      });
+      window.open(routeData.href.slice(1, routeData.href.length) + "&" + `${this.website.tokenHeader}=${getToken()}`);
     },
     //自定义列保存
     async saveColumn(ref, option, optionBack, code) {
@@ -357,8 +380,8 @@ export default {
         this.$message.success("保存成功");
         //关闭窗口
         this.$refs[ref].$refs.dialogColumn.columnBox = false;
-        this.selectionList=[]
-        this.searchReset()
+        this.selectionList = [];
+        this.searchReset();
       }
     },
     //自定义列重置
@@ -368,27 +391,25 @@ export default {
       if (inSave) {
         this.$message.success("重置成功");
         this.$refs[ref].$refs.dialogColumn.columnBox = false;
-        this.selectionList=[]
-        this.searchReset()
+        this.selectionList = [];
+        this.searchReset();
       }
     },
     // 更改表格颜色
     headerClassName(tab) {
       //颜色间隔
-      let back = ""
+      let back = "";
       if (tab.columnIndex >= 0 && tab.column.level === 1) {
         if (tab.columnIndex % 2 === 0) {
-          back = "back-one"
+          back = "back-one";
         } else if (tab.columnIndex % 2 === 1) {
-          back = "back-two"
+          back = "back-two";
         }
       }
       return back;
-    },
-
+    }
   }
-}
-
+};
 </script>
 
 <style lang="scss" scoped>
@@ -410,4 +431,4 @@ export default {
 ::v-deep .el-col-md-8 {
   width: 24.33333%;
 }
-</style>
+</style>

src/views/boxManagement/transferCost/detailsPage.vue

@@ -930,9 +930,6 @@ export default {
       // this.optionForm.disabled = true
       this.getDetail(this.detailData.id)
     }
-    if (this.$route.query.params) {
-      this.getDetail(this.$route.query.params)
-    }
     if (this.detailData.copyId) {
       this.getCopydate(this.detailData.copyId)
     }

src/views/boxManagement/transferCost/index.vue

@@ -144,6 +144,18 @@ export default {
   },
   activated() {
     setTimeout(() => {
+       if (this.$route.query.id) {
+        this.detailData = {
+          id: this.$route.query.id
+        };
+        this.isShow = false;
+      }
+      if (this.$route.query.params) {
+        this.detailData = {
+          id: this.$route.query.params
+        };
+        this.isShow = false;
+      }
     }, 100);
   },
   methods: {

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

@@ -851,9 +851,6 @@ export default {
       // this.optionForm.disabled = true
       this.getDetail(this.detailData.id)
     }
-    if (this.$route.query && this.$route.query.params) {
-      this.getDetail(this.$route.query.params)
-    }
     if (this.detailData && this.detailData.copyId) {
       this.getCopydate(this.detailData.copyId)
     }

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

@@ -1,31 +1,49 @@
 <template>
   <div>
     <basic-container v-if="isShow">
-      <avue-crud :option="option" :table-loading="loading" :data="data" :page.sync="page" :search.sync="query"
-        v-model="form" id="out-table" :header-cell-class-name="headerClassName" ref="crud" @row-del="rowDel"
-        @search-change="searchChange" @search-reset="searchReset" @selection-change="selectionChange"
-        @current-change="currentChange" @size-change="sizeChange" @refresh-change="refreshChange"
+      <avue-crud
+        :option="option"
+        :table-loading="loading"
+        :data="data"
+        :page.sync="page"
+        :search.sync="query"
+        v-model="form"
+        id="out-table"
+        :header-cell-class-name="headerClassName"
+        ref="crud"
+        @row-del="rowDel"
+        @search-change="searchChange"
+        @search-reset="searchReset"
+        @selection-change="selectionChange"
+        @current-change="currentChange"
+        @size-change="sizeChange"
+        @refresh-change="refreshChange"
         @resetColumn="resetColumn('crud', 'option', 'optionBack', 504)"
-        @saveColumn="saveColumn('crud', 'option', 'optionBack', 504)" @on-load="onLoad">
+        @saveColumn="saveColumn('crud', 'option', 'optionBack', 504)"
+        @on-load="onLoad"
+      >
         <template slot="menuLeft">
-          <el-button type="primary" size="small" icon="el-icon-plus" @click="addButton">创建单据
-          </el-button>
-          <el-button type="success" size="small" :disabled="selectionList.length != 1" @click="copyButton">复制单据
-          </el-button>
-          <el-button type="warning" size="small" disabled @click="outExport">导 出
-          </el-button>
+          <el-button type="primary" size="small" icon="el-icon-plus" @click="addButton">创建单据 </el-button>
+          <el-button type="success" size="small" :disabled="selectionList.length != 1" @click="copyButton">复制单据 </el-button>
+          <el-button type="warning" size="small" disabled @click="outExport">导 出 </el-button>
         </template>
         <template slot="menu" slot-scope="{ row, index }">
           <el-button size="small" icon="el-icon-edit" type="text" @click="rowEdit(row)">编辑</el-button>
-          <el-button size="small" icon="el-icon-delete" type="text" @click="rowDel(row, index)"
-            :disabled="row.status > 0">删 除</el-button>
+          <el-button size="small" icon="el-icon-delete" type="text" @click="rowDel(row, index)" :disabled="row.status > 0">删 除</el-button>
         </template>
         <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>
+          <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>
@@ -48,8 +66,8 @@ export default {
       query: {
         year: getYearDate().toString(),
         week: getWeekNumber().weekNumber,
-        startDate: getWeekNumber().mondayDate + ' 00:00:00',
-        endDate: getWeekNumber().sundayDate + ' 23:59:59'
+        startDate: getWeekNumber().mondayDate + " 00:00:00",
+        endDate: getWeekNumber().sundayDate + " 23:59:59"
       },
       loading: false,
       page: {
@@ -60,7 +78,7 @@ export default {
       selectionList: [],
       option: {},
       optionBack: {
-        height: 'auto',
+        height: "auto",
         calcHeight: 30,
         menuWidth: 140,
         tip: false,
@@ -74,7 +92,7 @@ export default {
         delBtn: false,
         selection: true,
         searchIcon: true,
-        align: 'center',
+        align: "center",
         searchIndex: 3,
         column: [
           {
@@ -87,8 +105,8 @@ export default {
             dicUrl: "/api/blade-system/dept/lazy-list",
             props: {
               label: "deptName",
-              value: "deptName",
-            },
+              value: "deptName"
+            }
           },
           {
             label: "年",
@@ -97,13 +115,13 @@ export default {
             search: true,
             type: "year",
             format: "yyyy",
-            valueFormat: "yyyy",
+            valueFormat: "yyyy"
           },
           {
             label: "WEEK",
             prop: "week",
             overHidden: true,
-            search: true,
+            search: true
           },
           {
             label: "开始日期",
@@ -115,7 +133,7 @@ export default {
             search: true,
             type: "date",
             format: "yyyy-MM-dd",
-            valueFormat: "yyyy-MM-dd 00:00:00",
+            valueFormat: "yyyy-MM-dd 00:00:00"
           },
           {
             label: "结束日期",
@@ -127,41 +145,44 @@ export default {
             search: true,
             type: "date",
             format: "yyyy-MM-dd",
-            valueFormat: "yyyy-MM-dd 23:59:59",
+            valueFormat: "yyyy-MM-dd 23:59:59"
           },
           {
             label: "等级",
             prop: "level",
             width: "100",
-            overHidden: true,
+            overHidden: true
           },
           {
             label: "制单人",
             prop: "createUserName",
-            overHidden: true,
-          }, {
+            overHidden: true
+          },
+          {
             label: "制单日期",
             prop: "createTime",
             type: "date",
             overHidden: true,
             format: "yyyy-MM-dd",
             valueFormat: "yyyy-MM-dd HH:mm:ss"
-          }, {
+          },
+          {
             label: "修改人",
             prop: "updateUserName",
-            overHidden: true,
-          }, {
+            overHidden: true
+          },
+          {
             label: "修改日期",
             prop: "updateTime",
             type: "date",
             overHidden: true,
             format: "yyyy-MM-dd",
             valueFormat: "yyyy-MM-dd HH:mm:ss"
-          },
+          }
         ]
       },
       data: [],
-      weekMax: 1,
+      weekMax: 1
     };
   },
   components: {
@@ -171,45 +192,51 @@ export default {
     this.option = await this.getColumnData(this.getColumnName(504), this.optionBack);
     this.query = {
       year: getYearDate().toString(),
-      week: getWeekNumber().weekNumber,
+      week: getWeekNumber().weekNumber
       // startDate: getWeekNumber().mondayDate + ' 00:00:00',
       // endDate: getWeekNumber().sundayDate + ' 23:59:59'
-    }
+    };
   },
   activated() {
     setTimeout(() => {
+      if (this.$route.query.params) {
+        this.detailData = {
+          id: this.$route.query.params
+        };
+        this.isShow = false;
+      }
     }, 100);
   },
   methods: {
     dicChange(name, row) {
-      if (name == 'week') {
+      if (name == "week") {
         if (row) {
-          this.weekMax = getWeeksInYear(this.query.year)
+          this.weekMax = getWeeksInYear(this.query.year);
           if (!this.query.year) {
-            this.query.week = 0
-            this.query.startDate = null
-            this.query.endDate = null
+            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 + '周');
+            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+' 00:00:00'
-            this.query.endDate = getWeekRange(this.query.year, this.query.week).end+' 23:59:59'
+            this.query.startDate = getWeekRange(this.query.year, this.query.week).start + " 00:00:00";
+            this.query.endDate = getWeekRange(this.query.year, this.query.week).end + " 23:59:59";
           }
         } else {
-          this.query.startDate = null
-          this.query.endDate = null
+          this.query.startDate = null;
+          this.query.endDate = null;
         }
       }
     },
     addButton() {
-      this.isShow = false
+      this.isShow = false;
     },
     copyButton() {
-      this.isShow = false
+      this.isShow = false;
       this.detailData = {
         copyId: this.selectionList[0].id
       };
@@ -218,7 +245,7 @@ export default {
       this.detailData = {
         id: row.id
       };
-      this.isShow = false
+      this.isShow = false;
     },
     // 删除
     rowDel(row, index) {
@@ -233,9 +260,8 @@ export default {
         remove({ ids: row.id }).then(res => {
           this.onLoad(this.page, this.query);
           this.$message.success("成功删除");
-        })
-      })
-
+        });
+      });
     },
     searchReset() {
       this.query = this.$options.data().query;
@@ -243,12 +269,12 @@ export default {
     },
     // 搜索按钮点击
     searchChange(params, done) {
-          done();
+      done();
       if (this.query.week) {
         if (!this.query.year) {
-          this.query.week = 0
-          this.query.startDate = null
-          this.query.endDate = null
+          this.query.week = 0;
+          this.query.startDate = null;
+          this.query.endDate = null;
           return this.$message.error("请选择年份");
         }
       }
@@ -268,23 +294,25 @@ export default {
       this.onLoad(this.page, this.query);
     },
     onLoad(page, params = {}) {
-      let obj = {}
-      this.query = this.deepClone(this.query)
-      console.log(params, this.query)
+      let obj = {};
+      this.query = this.deepClone(this.query);
+      console.log(params, this.query);
       obj = {
-        ...Object.assign(params, this.query),
-      }
+        ...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();
+      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;
-      })
     },
     // 详情的返回列表
     goBack() {
@@ -295,34 +323,34 @@ export default {
           path: "/iosBasicData/boxPlan/index"
         });
       }
-      this.detailData = {}
+      this.detailData = {};
       this.isShow = true;
       this.onLoad(this.page, this.query);
     },
     outExport() {
-      let config = { params: { ...this.query } }
+      let config = { params: { ...this.query } };
       if (config.params) {
         for (const propName of Object.keys(config.params)) {
           const value = config.params[propName];
-          if (value !== null && typeof (value) !== "undefined") {
+          if (value !== null && typeof value !== "undefined") {
             if (value instanceof Array) {
               for (const key of Object.keys(value)) {
-                let params = propName + '[' + key + ']';
-                config.params[params] = value[key]
+                let params = propName + "[" + key + "]";
+                config.params[params] = value[key];
               }
-              delete config.params[propName]
+              delete config.params[propName];
             }
           }
         }
       }
       const routeData = this.$router.resolve({
-        path: '/api/blade-los/routecost/exportRouteCost',      //跳转目标窗口的地址
+        path: "/api/blade-los/routecost/exportRouteCost", //跳转目标窗口的地址
         query: {
-          ...config.params,    //括号内是要传递给新窗口的参数
+          ...config.params, //括号内是要传递给新窗口的参数
           identification: this.url
         }
-      })
-      window.open(routeData.href.slice(1, routeData.href.length) + '&' + `${this.website.tokenHeader}=${getToken()}`);
+      });
+      window.open(routeData.href.slice(1, routeData.href.length) + "&" + `${this.website.tokenHeader}=${getToken()}`);
     },
     //自定义列保存
     async saveColumn(ref, option, optionBack, code) {
@@ -336,8 +364,8 @@ export default {
         this.$message.success("保存成功");
         //关闭窗口
         this.$refs[ref].$refs.dialogColumn.columnBox = false;
-        this.selectionList = []
-        this.searchReset()
+        this.selectionList = [];
+        this.searchReset();
       }
     },
     //自定义列重置
@@ -347,27 +375,25 @@ export default {
       if (inSave) {
         this.$message.success("重置成功");
         this.$refs[ref].$refs.dialogColumn.columnBox = false;
-        this.selectionList = []
-        this.searchReset()
+        this.selectionList = [];
+        this.searchReset();
       }
     },
     // 更改表格颜色
     headerClassName(tab) {
       //颜色间隔
-      let back = ""
+      let back = "";
       if (tab.columnIndex >= 0 && tab.column.level === 1) {
         if (tab.columnIndex % 2 === 0) {
-          back = "back-one"
+          back = "back-one";
         } else if (tab.columnIndex % 2 === 1) {
-          back = "back-two"
+          back = "back-two";
         }
       }
       return back;
-    },
-
+    }
   }
-}
-
+};
 </script>
 
 <style lang="scss" scoped>
@@ -389,4 +415,4 @@ export default {
 ::v-deep .el-col-md-8 {
   width: 24.33333%;
 }
-</style>
+</style>

src/views/iosBasicData/decisionAnalysis/index.vue

@@ -55,6 +55,7 @@ export default {
             search: {
                 chart: 1,
                 type: 1,
+                billType: 'DD,MH'
             },
             query: {
                 chart: 1,

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

@@ -222,7 +222,6 @@ export default {
   },
   activated() {
     setTimeout(() => {
-      console.log(this.$route.query.billId);
       if (this.$route.query.billId) {
         this.isShow = false;
       }