箱型默认一页100条

src/App.vue

@@ -6,6 +6,7 @@
 
 <script>
 import { delAllTabsKey } from "@/util/keyData";
+import { mapState } from "vuex";
 export default {
   name: "app",
   data() {

src/api/iosBasicData/feecenter.js

@@ -84,4 +84,20 @@ export function revokeCheckPleaseVerifyCost(data) {
     method: 'post',
     data: data
   })
+}
+// 同步结算单位
+export const synchronizationPrompt = (params) => {
+  return request({
+    url: '/api/blade-los/feecenter/synchronizationPrompt',
+    method: 'get',
+    params:params
+  })
+}
+// 同步结算单位
+export const synchronizationSettlementObject = (params) => {
+  return request({
+    url: '/api/blade-los/feecenter/synchronizationSettlementObject',
+    method: 'get',
+    params:params
+  })
 }

src/lang/en.js

@@ -64,8 +64,8 @@ export default {
     data: 'data',
     error: 'error',
     test: 'test',
-    seExport:'Export',
-    seImport:'Import'
+    seExport:'Export(F)',
+    seImport:'Import(F)'
   },
   login: {
     title: 'Login ',

src/lang/zh.js

@@ -64,8 +64,8 @@ export default {
     permission: '权限',
     error: '异常页面',
     test: '测试页面',
-    seExport:'海运出口',
-    seImport:'海运进口'
+    seExport:'海运出口(F)',
+    seImport:'海运进口(F)'
   },
   login: {
     title: '登录 ',

src/store/modules/tags.js

@@ -6,7 +6,7 @@ import {
   diff
 } from '@/util/util'
 import website from '@/config/website'
-import {delTabsKey,delAllTabsKey} from '@/util/keyData'
+import { delTabsKey, delAllTabsKey } from '@/util/keyData'
 const isFirstPage = website.isFirstPage;
 const tagWel = website.fistPage;
 const tagObj = {
@@ -42,11 +42,16 @@ const navs = {
     tag: getStore({
       name: 'tag'
     }) || tagObj,
-    tagWel: tagWel
+    tagWel: tagWel,
+    cachedViews: [] // 存储需要缓存的组件名称
   },
   actions: {},
   mutations: {
     ADD_TAG: (state, action) => {
+      if (!state.cachedViews.includes(action.label) && action.meta.keepAlive) {
+        state.cachedViews.push(action.label)
+      }
+      console.log(state.cachedViews)
       state.tag = action;
       setStore({
         name: 'tag',
@@ -61,6 +66,9 @@ const navs = {
       })
     },
     DEL_TAG: (state, action) => {
+      const index = state.cachedViews.indexOf(action.label)
+      if (index > -1) state.cachedViews.splice(index, 1)
+      console.log(state.cachedViews)
       state.tagList = state.tagList.filter(item => {
         return !diff(item, action);
       })
@@ -72,6 +80,8 @@ const navs = {
       delTabsKey(state.tag.label)
     },
     DEL_ALL_TAG: (state) => {
+      state.cachedViews = []
+      console.log(state.cachedViews)
       state.tagList = [state.tagWel];
       setStore({
         name: 'tagList',
@@ -80,6 +90,7 @@ const navs = {
       delAllTabsKey('ALL')
     },
     DEL_TAG_OTHER: (state) => {
+      state.cachedViews = state.cachedViews.filter(item => item === state.tag.label)
       state.tagList = state.tagList.filter(item => {
         if (item.value === state.tag.value) {
           return true;

src/views/approval/businessApprovalH/config/mainList.json

@@ -73,11 +73,6 @@
       "type": "select",
       "index": 3,
       "slot": true,
-      "dicUrl": "/api/blade-check/auditpaths/list",
-      "props": {
-        "label": "pathName",
-        "value": "id"
-      },
       "width": 700,
       "overHidden": true
     }

src/views/boxManagement/agentBox/detailsPage.vue

@@ -155,7 +155,7 @@
                   key="id"
                   label="cnName"
                   res="records"
-                  url="/blade-los/bcntrtypes/list?status=0&current=1&size=20"
+                 url="/blade-los/bcntrtypes/list?current=1&size=100"
                   :filterable="true"
                   :remote="true"
                   dataName="cnName"
@@ -263,7 +263,7 @@
                   key="id"
                   label="cnName"
                   res="records"
-                  url="/blade-los/bcntrtypes/list?status=0&current=1&size=20"
+                 url="/blade-los/bcntrtypes/list?current=1&size=100"
                   :filterable="true"
                   :remote="true"
                   dataName="cnName"

src/views/boxManagement/boxAdjustment/detailsPage.vue

@@ -76,7 +76,7 @@
                   key="id"
                   label="cnName"
                   res="records"
-                  url="/blade-los/bcntrtypes/list?status=0&current=1&size=20"
+                 url="/blade-los/bcntrtypes/list?current=1&size=100"
                   :filterable="true"
                   :remote="true"
                   dataName="cnName"
@@ -226,7 +226,7 @@
                   key="id"
                   label="cnName"
                   res="records"
-                  url="/blade-los/bcntrtypes/list?status=0&current=1&size=20"
+                 url="/blade-los/bcntrtypes/list?current=1&size=100"
                   :filterable="true"
                   :remote="true"
                   dataName="cnName"
@@ -300,7 +300,7 @@
                   key="id"
                   label="cnName"
                   res="records"
-                  url="/blade-los/bcntrtypes/list?status=0&current=1&size=20"
+                 url="/blade-los/bcntrtypes/list?current=1&size=100"
                   :filterable="true"
                   :remote="true"
                   dataName="cnName"

src/views/boxManagement/boxCost/detailsPage.vue

@@ -176,7 +176,7 @@
                   key="id"
                   label="cnName"
                   res="records"
-                  url="/blade-los/bcntrtypes/list?status=0&current=1&size=20"
+                 url="/blade-los/bcntrtypes/list?current=1&size=100"
                   :filterable="true"
                   :remote="true"
                   dataName="cnName"

src/views/boxManagement/boxExit/detailsPage.vue

@@ -38,7 +38,7 @@
             <avue-form :option="optionForm" v-model="form" ref="form">
               <template slot="boxTypeQuantityOne">
                 <dic-select v-model="form.boxTypeQuantityOne" key="id" label="cnName" res="records"
-                  url="/blade-los/bcntrtypes/list?status=0&current=1&size=20" :filterable="true" :remote="true"
+                 url="/blade-los/bcntrtypes/list?current=1&size=100" :filterable="true" :remote="true"
                   dataName="cnName" :disabled="editDisabled || form.buxStaus == '已确认'"></dic-select>
               </template>
               <tempalte slot="polCname">
@@ -97,7 +97,7 @@
               </template>
               <template slot="boxTypeForm" slot-scope="{ row }">
                 <dic-select v-if="row.$cellEdit" v-model="row.boxType" key="id" label="cnName" res="records"
-                  url="/blade-los/bcntrtypes/list?status=0&current=1&size=20" :filterable="true" :remote="true"
+                 url="/blade-los/bcntrtypes/list?current=1&size=100" :filterable="true" :remote="true"
                   dataName="cnName" @selectChange="rowDicChange('boxType', $event, row)"></dic-select>
                 <span v-else>{{ row.boxType }}</span>
               </template>
@@ -135,7 +135,7 @@
               </template>
               <template slot="boxTypeForm" slot-scope="{ row }">
                 <dic-select v-if="row.$cellEdit" v-model="row.boxType" key="id" label="cnName" res="records"
-                  url="/blade-los/bcntrtypes/list?status=0&current=1&size=20" :filterable="true" :remote="true"
+                 url="/blade-los/bcntrtypes/list?current=1&size=100" :filterable="true" :remote="true"
                   dataName="cnName" @selectChange="rowDicChange('boxType', $event, row)"></dic-select>
                 <span v-else>{{ row.boxType }}</span>
               </template>

src/views/boxManagement/buyContainer/detailsPage.vue

@@ -161,7 +161,7 @@
                   key="id"
                   label="cnName"
                   res="records"
-                  url="/blade-los/bcntrtypes/list?status=0&current=1&size=20"
+                  url="/blade-los/bcntrtypes/list?current=1&size=100"
                   :filterable="true"
                   :remote="true"
                   dataName="cnName"

src/views/boxManagement/containerNumber/detailsPage.vue

@@ -167,7 +167,7 @@
               label="cnName"
               res="records"
               :disabled="editDisabled"
-              url="/blade-los/bcntrtypes/list?status=0&current=1&size=20"
+             url="/blade-los/bcntrtypes/list?current=1&size=100"
               :filterable="true"
               :remote="true"
               dataName="cnName"
@@ -316,7 +316,7 @@
               key="id"
               label="cnName"
               res="records"
-              url="/blade-los/bcntrtypes/list?status=0&current=1&size=20"
+             url="/blade-los/bcntrtypes/list?current=1&size=100"
               :filterable="true"
               :remote="true"
               dataName="cnName"

src/views/boxManagement/containerNumber/index.vue

@@ -120,6 +120,12 @@ export default {
             searchOrder: 1
           },
           {
+            label: "优先等级",
+            prop: "priorityLevel",
+            overHidden: true,
+            width: 80,
+          },
+          {
             label: "箱号",
             prop: "code",
             width: 100,
@@ -469,7 +475,7 @@ export default {
     this.option = await this.getColumnData(this.getColumnName(459), this.optionBack);
   },
   activated() {
-     setTimeout(() => {
+    setTimeout(() => {
       if (this.$route.query.id) {
         this.detailData = {
           id: this.$route.query.id

src/views/boxManagement/rentalBox/detailsPage.vue

@@ -95,7 +95,7 @@
               </template>
               <template slot="boxTypeForm" slot-scope="{ row }">
                 <dic-select v-if="row.$cellEdit" v-model="row.boxType" key="id" label="cnName" res="records"
-                  url="/blade-los/bcntrtypes/list?status=0&current=1&size=20" :filterable="true" :remote="true"
+                 url="/blade-los/bcntrtypes/list?current=1&size=100" :filterable="true" :remote="true"
                   dataName="cnName" @selectChange="rowDicChange('boxType', $event, row)"></dic-select>
                 <span v-else>{{ row.boxType }}</span>
               </template>
@@ -149,7 +149,7 @@
               </template>
               <template slot="boxTypeForm" slot-scope="{ row }">
                 <dic-select v-if="row.$cellEdit" v-model="row.boxType" key="id" label="cnName" res="records"
-                  url="/blade-los/bcntrtypes/list?status=0&current=1&size=20" :filterable="true" :remote="true"
+                 url="/blade-los/bcntrtypes/list?current=1&size=100" :filterable="true" :remote="true"
                   dataName="cnName" @selectChange="rowDicChange('boxType', $event, row)"></dic-select>
                 <span v-else>{{ row.boxType }}</span>
               </template>

src/views/boxManagement/transferCost/detailsPage.vue

@@ -67,7 +67,7 @@
           </template>
           <template slot="boxTypeForm" slot-scope="{ row }">
             <dic-select v-if="row.$cellEdit" v-model="row.boxType" key="id" label="cnName" res="records"
-              url="/blade-los/bcntrtypes/list?status=0&current=1&size=20" :filterable="true" :remote="true"
+             url="/blade-los/bcntrtypes/list?current=1&size=100" :filterable="true" :remote="true"
               dataName="cnName" @selectChange="rowDicChange('boxType', $event, row)"></dic-select>
             <span v-else>{{ row.boxType }}</span>
           </template>

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

@@ -556,7 +556,7 @@ export default {
 
         // 获取箱型字典数据
         bcntrtypesListfun(cnName) {
-            bcntrtypesList(1, 10, { cnName }).then(res => {
+            bcntrtypesList(1, 100, { cnName }).then(res => {
                 this.cntrTypeCodeData = res.data.data.records
             })
         },

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

@@ -2267,7 +2267,7 @@ export default {
           this.updateSearchKey = new Date().getTime();
         } else if (row.cnName == "场站") {
           el.corpId = this.assemblyForm.cyId;
-          el.shortName = this.assemblyForm.cyShortName;
+          el.shortName = this.assemblyForm.cyCnName;
           el.corpCnName = this.assemblyForm.cyCnName;
           el.corpEnName = this.assemblyForm.cyEnName;
           this.updateSearchKey = new Date().getTime();
@@ -3857,8 +3857,9 @@ export default {
       if (name == "付费申请") {
         if (this.selectionCList.length == 0) return this.$message.error("请选择费用");
         if (this.selectionCList.filter(e => e.auditStatus != 4).length) return this.$message.error("请选择审核通过的费用");
-        if (this.selectionCList.length != this.selectionCList.filter(e => e.corpCnName == this.selectionCList[0].corpCnName).length)
+        if (this.selectionCList.length != this.selectionCList.filter(e => e.corpId == this.selectionCList[0].corpId).length) {
           return this.$message.error("请选择相同的结算单位");
+        }
         if (this.$store.getters.payAppStatus) {
           this.$alert("付费申请页面已存在,请关闭付费申请再进行操作", "温馨提示", {
             confirmButtonText: "确定",
@@ -3879,8 +3880,9 @@ export default {
       }
       if (name == "发票申请") {
         if (this.selectionDList.length == 0) return this.$message.error("请选择费用");
-        if (this.selectionDList.length != this.selectionDList.filter(e => e.corpCnName == this.selectionDList[0].corpCnName).length)
+        if (this.selectionDList.length != this.selectionDList.filter(e => e.corpId == this.selectionDList[0].corpId).length) {
           return this.$message.error("请选择相同的结算单位");
+        }
         if (this.selectionDList.filter(e => e.auditStatus != 4).length) return this.$message.error("请选择审核通过的费用");
         if (this.$store.getters.finappStatus) {
           this.$alert("发票申请页面已存在,请关闭发票申请再进行操作", "温馨提示", {

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

@@ -900,7 +900,7 @@ export default {
 
     // 获取箱型字典数据
     bcntrtypesListfun(cnName) {
-      bcntrtypesList(1, 10, { cnName }).then(res => {
+      bcntrtypesList(1, 100, { cnName }).then(res => {
         this.cntrTypeCodeData = res.data.data.records;
       });
     },

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

@@ -167,14 +167,7 @@
             @click="allClick('D申请删除')"
             >{{ $t("btn118n.applyDelete") }}</el-button
           >
-          <el-button
-            type="danger"
-            plain
-            size="small"
-            :disabled="selectionDList.length != 1 || disabled || isFeedDisabled"
-            @click="allClick('D取消申请')"
-            >{{ $t("btn118n.unAplly") }}</el-button
-          >
+          <el-button plain size="small" :disabled="disabled || isFeedDisabled" @click="allClick('同步结算单位', 'D')">同步收费对象</el-button>
         </template>
         <template slot="indexHeader" slot-scope="scope">
           <el-button v-if="isFeeEditD" type="primary" size="small" icon="el-icon-plus" circle :disabled="disabled" @click="addDfun"></el-button>
@@ -495,6 +488,7 @@
             @click="allClick('C取消申请')"
             >{{ $t("btn118n.unAplly") }}</el-button
           >
+           <el-button plain size="small" :disabled="disabled || isFeecDisabled" @click="allClick('同步结算单位', 'C')">同步付费对象</el-button>
         </template>
         <template slot="indexHeader" slot-scope="scope">
           <el-button v-if="isFeeEditC" type="primary" size="small" icon="el-icon-plus" circle :disabled="disabled" @click="addCfun"> </el-button>
@@ -1019,6 +1013,7 @@
       pageLabel="海运出口(F)"
     ></fee-modify>
     <fee-modify-view ref="feeModifyView" :form="assemblyForm"></fee-modify-view>
+    <sysn-corpName ref="sysnCorpName" @update="getData"></sysn-corpName>
   </div>
 </template>
 
@@ -1038,7 +1033,8 @@ import {
   finaccbillsRevokeBill,
   getFeeCenterCorpIds,
   pleaseVerifyCost,
-  revokeCheckPleaseVerifyCost
+  revokeCheckPleaseVerifyCost,
+  synchronizationPrompt
 } from "@/api/iosBasicData/feecenter";
 import { getWorkDicts } from "@/api/system/dictbiz";
 import { feecenterTemplateImport, listFeeCountByCorp, losbfeestemplateGetListTemplate, templateImportBatch } from "@/api/iosBasicData/bills";
@@ -1059,9 +1055,10 @@ import mailComponent from "@/components/iosbasic-data/mail-component.vue";
 import { getListTemplate, getListTemplatelist } from "@/api/iosBasicData/losbfeestemplate";
 import feeModify from "@/components/feeModify/main.vue";
 import feeModifyView from "@/components/feeModify/view.vue";
+import sysnCorpName from "./sysnCorpName"
 import _ from "lodash";
 export default {
-  components: { extractionCost, dicSelect, reportContainer, SearchQuery, reportformsList, mailComponent, feeModify, feeModifyView },
+  components: { extractionCost, dicSelect, reportContainer, SearchQuery, reportformsList, mailComponent, feeModify, feeModifyView,sysnCorpName },
   props: {
     pid: {},
     assemblyForm: {
@@ -2273,7 +2270,7 @@ export default {
           this.updateSearchKey = new Date().getTime();
         } else if (row.cnName == "场站") {
           el.corpId = this.assemblyForm.cyId;
-          el.shortName = this.assemblyForm.cyShortName;
+          el.shortName = this.assemblyForm.cyCnName;
           el.corpCnName = this.assemblyForm.cyCnName;
           el.corpEnName = this.assemblyForm.cyEnName;
           this.updateSearchKey = new Date().getTime();
@@ -2283,6 +2280,12 @@ export default {
           el.corpCnName = this.assemblyForm.shippingAgencyCname;
           el.corpEnName = this.assemblyForm.shippingAgencyEname;
           this.updateSearchKey = new Date().getTime();
+        } else if (row.cnName == "订舱代理") {
+          el.corpId = this.assemblyForm.bookingAgentId;
+          el.shortName = this.assemblyForm.bookingAgentCnName;
+          el.corpCnName = this.assemblyForm.bookingAgentCnName;
+          el.corpEnName = this.assemblyForm.bookingAgentEnName;
+          this.updateSearchKey = new Date().getTime();
         } else {
           el.corpId = null;
           el.shortName = null;
@@ -3727,11 +3730,16 @@ export default {
       this.$emit("billsDetailfun");
     },
     allClick(name, type) {
+      if (name == "同步结算单位") {
+        this.$refs.sysnCorpName.openDialog(this.assemblyForm.id,type)
+        synchronizationPrompt(obj);
+      }
       if (name == "付费申请") {
         if (this.selectionCList.length == 0) return this.$message.error("请选择费用");
         if (this.selectionCList.filter(e => e.auditStatus != 4).length) return this.$message.error("请选择审核通过的费用");
-        if (this.selectionCList.length != this.selectionCList.filter(e => e.corpCnName == this.selectionCList[0].corpCnName).length)
+        if (this.selectionCList.length != this.selectionCList.filter(e => e.corpId == this.selectionCList[0].corpId).length) {
           return this.$message.error("请选择相同的结算单位");
+        }
         if (this.$store.getters.payAppStatus) {
           this.$alert("付费申请页面已存在,请关闭付费申请再进行操作", "温馨提示", {
             confirmButtonText: "确定",
@@ -3752,8 +3760,14 @@ export default {
       }
       if (name == "发票申请") {
         if (this.selectionDList.length == 0) return this.$message.error("请选择费用");
-        if (this.selectionDList.length != this.selectionDList.filter(e => e.corpCnName == this.selectionDList[0].corpCnName).length)
+        console.log(
+          this.selectionDList,
+          this.selectionDList.filter(e => e.corpId == this.selectionDList[0].corpId)
+        );
+        if (this.selectionDList.length != this.selectionDList.filter(e => e.corpId == this.selectionDList[0].corpId).length) {
           return this.$message.error("请选择相同的结算单位");
+        }
+
         if (this.selectionDList.filter(e => e.auditStatus != 4).length) return this.$message.error("请选择审核通过的费用");
         if (this.$store.getters.finappStatus) {
           this.$alert("发票申请页面已存在,请关闭发票申请再进行操作", "温馨提示", {

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

@@ -0,0 +1,188 @@
+<template>
+  <div>
+    <el-dialog
+      :title="dc == 'D' ? '同步收费对象' : '同步付费对象'"
+      :visible.sync="dialogVisible"
+      append-to-body
+      width="60%"
+      :before-close="handleClose"
+    >
+      <avue-crud
+        v-if="dialogVisible"
+        :option="option"
+        :table-loading="loading"
+        :data="data"
+        ref="crud"
+        :header-cell-class-name="headerClassName"
+        @on-load="onLoad"
+      >
+      </avue-crud>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="dialogVisible = false" size="mini">取 消</el-button>
+        <el-button type="primary" @click="submit" size="mini" :disabled="data.length == 0">确认修改</el-button>
+      </span>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { synchronizationPrompt, synchronizationSettlementObject } from "@/api/iosBasicData/feecenter";
+export default {
+  props: {},
+  data() {
+    return {
+      quotationId: null,
+      ids: null,
+      data: [],
+      dialogVisible: false,
+      loading: false,
+      option: {
+        height: 500,
+        calcHeight: 30,
+        border: true,
+        index: true,
+        addBtn: false,
+        viewBtn: false,
+        delBtn: false,
+        editBtn: false,
+        menu: false,
+        header: false,
+        highlightCurrentRow: true,
+        column: [
+          {
+            label: "费用名称",
+            prop: "feeCnName",
+            overHidden: true
+          },
+          {
+            label: "修改后收费对象",
+            prop: "corpCnName",
+            overHidden: true
+          },
+          {
+            label: "修改后收费对象",
+            prop: "corpCnNameNew",
+            overHidden: true
+          }
+        ]
+      },
+      dc: "D",
+      id: null
+    };
+  },
+  async created() {
+    // this.option = await this.getColumnData(this.getColumnName(309.6), this.optionBack);
+  },
+  methods: {
+    openDialog(id, dc) {
+      this.dc = dc;
+      this.id = id;
+      this.option.column.forEach(item => {
+        if (dc == "D") {
+          if (item.prop == "corpCnName") {
+            item.label = "修改后收费对象";
+          }
+          if (item.prop == "corpCnNameNew") {
+            item.label = "修改后收费对象";
+          }
+        }
+        if (dc == "C") {
+          if (item.prop == "corpCnName") {
+            item.label = "修改后付费对象";
+          }
+          if (item.prop == "corpCnNameNew") {
+            item.label = "修改后付费对象";
+          }
+        }
+      });
+      this.dialogVisible = true;
+      this.quotationId = null;
+      let obj = {
+        billId: id,
+        dc: dc
+      };
+      this.loading = true;
+      synchronizationPrompt(obj)
+        .then(res => {
+          this.data = res.data.data;
+        })
+        .finally(() => {
+          this.loading = false;
+        });
+    },
+    submit() {
+      const obj = {
+        billId: this.id,
+        dc: this.dc
+      };
+      const loading = this.$loading({
+        lock: true,
+        text: "加载中",
+        spinner: "el-icon-loading",
+        background: "rgba(255,255,255,0.7)"
+      });
+      synchronizationSettlementObject(obj)
+        .then(res => {
+          this.$message.success("操作成功");
+          this.dialogVisible = false;
+          this.$emit("update");
+        })
+        .finally(() => {
+          loading.close();
+        });
+    },
+    //自定义列保存
+    async saveColumn(ref, option, optionBack, code) {
+      /**
+       * 已定义全局方法，直接使用，saveColumnData保存列数据方法,参数传值(表格名称，当前表格的option数据)
+       * 已定义全局方法，直接使用，getColumnName方法用来获取枚举值，参数根据自己定义的code值获取中文名
+       * 一定要执行异步操作，要等接口成功返回，才能执行下一行代码
+       */
+      const inSave = await this.saveColumnData(this.getColumnName(code), this[option]);
+      if (inSave) {
+        this.$message.success("保存成功");
+        //关闭窗口
+        this.$refs[ref].$refs.dialogColumn.columnBox = false;
+        this.searchReset();
+      }
+    },
+    //自定义列重置
+    async resetColumn(ref, option, optionBack, code) {
+      this[option] = this[optionBack];
+      const inSave = await this.delColumnData(this.getColumnName(code), this[optionBack]);
+      if (inSave) {
+        this.$message.success("重置成功");
+        this.$refs[ref].$refs.dialogColumn.columnBox = false;
+      }
+    },
+
+    // 更改表格颜色
+    headerClassName(tab) {
+      //颜色间隔
+      let back = "";
+      if (tab.columnIndex >= 0 && tab.column.level === 1) {
+        if (tab.columnIndex % 2 === 0) {
+          back = "back-one";
+        } else if (tab.columnIndex % 2 === 1) {
+          back = "back-two";
+        }
+      }
+      return back;
+    }
+  }
+};
+</script>
+
+<style scoped>
+::v-deep#out-table .back-one {
+  background: #ecf5ff !important;
+  text-align: center;
+  padding: 4px 0;
+}
+
+::v-deep#out-table .back-two {
+  background: #ecf5ff !important;
+  text-align: center;
+  padding: 4px 0;
+}
+</style>

src/views/iosBasicData/UnpaidPaymentsDetails/index.vue

@@ -21,6 +21,8 @@
     >
       <template slot="menuLeft">
         <el-button type="success" size="small" plain @click="exportfun">导出</el-button>
+        <!-- <el-button size="small" @click="$refs.print.openDialog()">预 览</el-button>
+        <el-button size="small" @click="$refs.report.openDialog()">报表设计</el-button> -->
       </template>
       <template slot="header">
         <el-table :data="commodityData" border size="small" @header-click="cellClick" style="width: 100%">
@@ -93,6 +95,8 @@
         <el-checkbox v-model="query.isToExamineDate" :true-label="1" :false-label="0" @change="dateChange('isToExamineDate')">按审核日期</el-checkbox>
       </template>
     </avue-crud>
+    <business-reports :id="form.id" :itemIds="itemIds" ref="print" businessValue="收付明细" :type="true"></business-reports>
+    <reports :id="form.id" :assemblyForm="form" businessValue="收付明细" ref="report"></reports>
   </basic-container>
 </template>
 
@@ -105,9 +109,10 @@ import { getWorkDicts } from "@/api/system/dictbiz";
 import { getDeptLazyTree } from "@/api/system/dept";
 import { getList as userGetList } from "@/api/system/user";
 import { getToken } from "@/util/auth";
-
+import businessReports from "@/components/boxManagement/businessReports.vue";
+import reports from "@/components/boxManagement/reports.vue";
 export default {
-  components: { SearchQuery },
+  components: { SearchQuery, businessReports, reports },
   data() {
     return {
       form: {},

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

@@ -150,7 +150,7 @@
           </template>
           <tempalte slot="cntrTypeCodeForm" slot-scope="{row,index}">
             <dic-select v-if="row.$cellEdit" v-model="row.cntrTypeCode" placeholder="箱型" key="id" label="cnName"
-              res="records" url="/blade-los/bcntrtypes/list?current=1&size=5" :filterable="true" :remote="true"
+              res="records" url="/blade-los/bcntrtypes/list?current=1&size=100" :filterable="true" :remote="true"
               dataName="cnName" @selectChange="rowDicChange('cntrTypeCode', $event, row)" :slotRight="true"
               rightLabel="code"></dic-select>
             <span v-else>{{ row.corpCnName }}</span>

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

@@ -892,7 +892,7 @@
                   key="id"
                   label="cnName"
                   res="records"
-                  url="/blade-los/bcntrtypes/list?current=1&size=5"
+                  url="/blade-los/bcntrtypes/list?current=1&size=100"
                   :filterable="true"
                   :remote="true"
                   dataName="cnName"

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

@@ -790,7 +790,7 @@
                   key="id"
                   label="cnName"
                   res="records"
-                  url="/blade-los/bcntrtypes/list?current=1&size=5"
+                  url="/blade-los/bcntrtypes/list?current=1&size=100"
                   :filterable="true"
                   :remote="true"
                   dataName="cnName"

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

@@ -252,7 +252,7 @@
               key="id"
               label="cnName"
               res="records"
-              url="/blade-los/bcntrtypes/list?status=0&current=1&size=20"
+             url="/blade-los/bcntrtypes/list?current=1&size=100"
               :filterable="true"
               :remote="true"
               dataName="cnName"
@@ -361,7 +361,7 @@
                     <template slot="boxTypeForm" slot-scope="{ row }">
                         <dic-select v-if="row.$cellEdit" v-model="row.boxType" key="id" placeholder="箱型" label="cnName"
                             res="records" @selectChange="rowDicChange('feeBoxType', $event, row)"
-                            url="/blade-los/bcntrtypes/list?status=0&current=1&size=20" :filterable="true"
+                           url="/blade-los/bcntrtypes/list?current=1&size=100" :filterable="true"
                             :remote="true" dataName="cnName"></dic-select>
                         <span v-else>{{ row.boxType }}</span>
                     </template>
@@ -451,7 +451,7 @@
                     <template slot="boxTypeForm" slot-scope="{ row }">
                         <dic-select v-if="row.$cellEdit" v-model="row.boxType" key="id" placeholder="箱型" label="cnName"
                             res="records" @selectChange="rowDicChange('feeBoxType', $event, row)"
-                            url="/blade-los/bcntrtypes/list?status=0&current=1&size=20" :filterable="true"
+                           url="/blade-los/bcntrtypes/list?current=1&size=100" :filterable="true"
                             :remote="true" dataName="cnName"></dic-select>
                         <span v-else>{{ row.boxType }}</span>
                     </template>

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

@@ -378,7 +378,7 @@
                   key="id"
                   label="cnName"
                   res="records"
-                  url="/blade-los/bcntrtypes/list?status=0&current=1&size=20"
+                 url="/blade-los/bcntrtypes/list?current=1&size=100"
                   :filterable="true"
                   :remote="true"
                   dataName="cnName"
@@ -513,7 +513,7 @@
                   label="cnName"
                   res="records"
                   @selectChange="rowDicChange('feeBoxType', $event, row)"
-                  url="/blade-los/bcntrtypes/list?status=0&current=1&size=20"
+                 url="/blade-los/bcntrtypes/list?current=1&size=100"
                   :filterable="true"
                   :remote="true"
                   dataName="cnName"
@@ -660,7 +660,7 @@
                   label="cnName"
                   res="records"
                   @selectChange="rowDicChange('feeBoxType', $event, row)"
-                  url="/blade-los/bcntrtypes/list?status=0&current=1&size=20"
+                 url="/blade-los/bcntrtypes/list?current=1&size=100"
                   :filterable="true"
                   :remote="true"
                   dataName="cnName"
@@ -795,7 +795,7 @@
                   key="id"
                   label="cnName"
                   res="records"
-                  url="/blade-los/bcntrtypes/list?status=0&current=1&size=20"
+                 url="/blade-los/bcntrtypes/list?current=1&size=100"
                   :filterable="true"
                   :remote="true"
                   dataName="cnName"
@@ -902,7 +902,7 @@
                   label="cnName"
                   res="records"
                   @selectChange="rowDicChange('feeBoxType2', $event, row)"
-                  url="/blade-los/bcntrtypes/list?status=0&current=1&size=20"
+                 url="/blade-los/bcntrtypes/list?current=1&size=100"
                   :filterable="true"
                   :remote="true"
                   dataName="cnName"
@@ -1049,7 +1049,7 @@
                   label="cnName"
                   res="records"
                   @selectChange="rowDicChange('feeBoxType2', $event, row)"
-                  url="/blade-los/bcntrtypes/list?status=0&current=1&size=20"
+                 url="/blade-los/bcntrtypes/list?current=1&size=100"
                   :filterable="true"
                   :remote="true"
                   dataName="cnName"

src/views/iosBasicData/financeProfit/index.vue

@@ -21,6 +21,8 @@
     >
       <template slot="menuLeft">
         <el-button type="success" size="small" plain @click="exportfun">导出</el-button>
+        <!-- <el-button size="small" @click="$refs.print.openDialog()">预 览 </el-button>
+        <el-button size="small" @click="$refs.report.openDialog()">报表设计 </el-button> -->
       </template>
       <template slot="header">
         <el-table v-loading="itemLoading" :data="commodityData" border size="small" @header-click="cellClick" style="width: 100%">
@@ -172,6 +174,8 @@
         <el-checkbox v-model="query.examineDate" :true-label="1" :false-label="0">按审核日期</el-checkbox>
       </template>
     </avue-crud>
+    <business-reports :id="form.id" :itemIds="itemIds" ref="print" businessValue="收付明细" :type="true"></business-reports>
+    <reports :id="form.id" :assemblyForm="form" businessValue="收付明细" ref="report"></reports>
   </basic-container>
 </template>
 
@@ -187,9 +191,10 @@ import { getList as userGetList } from "@/api/system/user";
 import TreeSelect from "@/components/iosbasic-data/TreeSelect.vue";
 import { blinesList } from "@/api/iosBasicData/blines";
 import { getToken } from "@/util/auth";
-
+import businessReports from "@/components/boxManagement/businessReports.vue";
+import reports from "@/components/boxManagement/reports.vue";
 export default {
-  components: { TreeSelect, SearchQuery },
+  components: { TreeSelect, SearchQuery, businessReports, reports },
   data() {
     return {
       firstLoad: false,
@@ -200,7 +205,7 @@ export default {
         pageSize: 20,
         currentPage: 1,
         total: 0,
-        pageSizes:[10, 20, 30, 40, 50, 100,500,1000],
+        pageSizes: [10, 20, 30, 40, 50, 100, 500, 1000]
       },
       query: {
         businessType: "SE,SI",

src/views/iosBasicData/loloTemplate/feesTemplateItems.vue

@@ -207,7 +207,7 @@
                             <dic-select
                                 v-if="row.$cellEdit && (feestemplateForm.quantityRule == '按箱型' || feestemplateForm.quantityRule == '按TEU')"
                                 v-model="row.unitNo" key="id" label="cnName" res="records"
-                                url="/blade-los/bcntrtypes/list?status=0&current=1&size=20" :filterable="true"
+                               url="/blade-los/bcntrtypes/list?current=1&size=100" :filterable="true"
                                 :remote="true" dataName="cnName"
                                 @selectChange="rowDicChange('unitNo', $event, row)"></dic-select>
                             <dic-select

src/views/iosBasicData/losbfeestemplate/feesTemplateItems.vue

@@ -154,7 +154,7 @@
                             <dic-select
                                 v-if="row.$cellEdit && (feestemplateForm.quantityRule == '按箱型' || feestemplateForm.quantityRule == '按TEU')"
                                 v-model="row.unitNo" key="id" label="cnName" res="records"
-                                url="/blade-los/bcntrtypes/list?status=0&current=1&size=20" :filterable="true"
+                               url="/blade-los/bcntrtypes/list?current=1&size=100" :filterable="true"
                                 :remote="true" dataName="cnName"
                                 @selectChange="rowDicChange('unitNo', $event, row)"></dic-select>
                             <dic-select

src/views/iosBasicData/paymentDetail/index.vue

@@ -21,6 +21,8 @@
     >
       <template slot="menuLeft">
         <el-button type="success" size="small" plain @click="exportfun">导出</el-button>
+        <!-- <el-button size="small" @click="$refs.print.openDialog()">预 览 </el-button>
+        <el-button size="small" @click="$refs.report.openDialog()">报表设计 </el-button> -->
       </template>
       <template slot="header">
         <el-table :data="commodityData" border size="small" @header-click="cellClick" style="width: 100%">
@@ -121,6 +123,8 @@
         <el-checkbox v-model="query.isBusinessDate" :true-label="1" :false-label="0" @change="dateChange('isBusinessDate')">按业务日期</el-checkbox>
         <el-checkbox v-model="query.isToExamineDate" :true-label="1" :false-label="0" @change="dateChange('isToExamineDate')">按审核日期</el-checkbox>
       </template>
+      <business-reports :id="form.id" :itemIds="itemIds" ref="print" businessValue="收付明细" :type="true"></business-reports>
+      <reports :id="form.id" :assemblyForm="form" businessValue="收付明细" ref="report"></reports>
     </avue-crud>
   </basic-container>
 </template>
@@ -134,9 +138,10 @@ import { getWorkDicts } from "@/api/system/dictbiz";
 import { getDeptLazyTree } from "@/api/system/dept";
 import { getList as userGetList } from "@/api/system/user";
 import { getToken } from "@/util/auth";
-
+import businessReports from "@/components/boxManagement/businessReports.vue";
+import reports from "@/components/boxManagement/reports.vue";
 export default {
-  components: { SearchQuery },
+  components: { SearchQuery,businessReports,reports },
   data() {
     return {
       form: {},
@@ -145,7 +150,7 @@ export default {
         pageSize: 20,
         currentPage: 1,
         total: 0,
-        pageSizes:[10, 20, 30, 40, 50, 100,500,1000],
+        pageSizes: [10, 20, 30, 40, 50, 100, 500, 1000]
       },
       query: {
         dc: "D",
@@ -445,7 +450,7 @@ export default {
           id: 2,
           label: "应收人民币",
           prop: "amount",
-          minWidth:90
+          minWidth: 90
         },
         {
           id: 3,
@@ -456,37 +461,37 @@ export default {
           id: 4,
           label: "已收款美金",
           prop: "amountUsdAlready",
-          minWidth:90
+          minWidth: 90
         },
         {
           id: 5,
           label: "已收款人民币",
           prop: "amountAlready",
-          minWidth:100
+          minWidth: 100
         },
         {
           id: 6,
           label: "已收款其他",
           prop: "amountOtherAlready",
-          minWidth:90
+          minWidth: 90
         },
         {
           id: 7,
           label: "未收款美金",
           prop: "amountUsdNot",
-          minWidth:90
+          minWidth: 90
         },
         {
           id: 8,
           label: "未收款人民币",
           prop: "amountNot",
-          minWidth:100
+          minWidth: 100
         },
         {
           id: 9,
           label: "未收款其他",
           prop: "amountOtherNot",
-          minWidth:90
+          minWidth: 90
         },
         {
           id: 10,
@@ -497,7 +502,7 @@ export default {
           id: 11,
           label: "开票人民币",
           prop: "amountInvoicing",
-          minWidth:90
+          minWidth: 90
         },
         {
           id: 12,
@@ -513,7 +518,7 @@ export default {
           id: 14,
           label: "未开人民币",
           prop: "amountInvoicingNot",
-          minWidth:90
+          minWidth: 90
         },
         {
           id: 15,

src/views/iosBasicData/paymentSummary/index.vue

@@ -22,8 +22,8 @@
     >
       <template slot="menuLeft">
         <el-button type="success" size="small" plain @click="exportfun">导出</el-button>
-        <el-button type="primary" size="small" plain>打印报表</el-button>
-        <el-button type="info" size="small" plain @click="designReportStart">设计报表</el-button>
+        <!-- <el-button type="primary" size="small" plain>打印报表</el-button>
+        <el-button type="info" size="small" plain @click="designReportStart">设计报表</el-button> -->
       </template>
       <template slot="header">
         <el-table :data="commodityData" border size="small" @header-click="cellClick" style="width: 100%">

src/views/iosBasicData/podTemplate/feesTemplateItems.vue

@@ -141,7 +141,7 @@
                             <dic-select
                                 v-if="row.$cellEdit && (feestemplateForm.quantityRule == '按箱型' || feestemplateForm.quantityRule == '按TEU')"
                                 v-model="row.unitNo" key="id" label="cnName" res="records"
-                                url="/blade-los/bcntrtypes/list?status=0&current=1&size=20" :filterable="true"
+                               url="/blade-los/bcntrtypes/list?current=1&size=100" :filterable="true"
                                 :remote="true" dataName="cnName"
                                 @selectChange="rowDicChange('unitNo', $event, row)"></dic-select>
                             <dic-select

src/views/iosBasicData/polTemplate/feesTemplateItems.vue

@@ -141,7 +141,7 @@
                             <dic-select
                                 v-if="row.$cellEdit && (feestemplateForm.quantityRule == '按箱型' || feestemplateForm.quantityRule == '按TEU')"
                                 v-model="row.unitNo" key="id" label="cnName" res="records"
-                                url="/blade-los/bcntrtypes/list?status=0&current=1&size=20" :filterable="true"
+                               url="/blade-los/bcntrtypes/list?current=1&size=100" :filterable="true"
                                 :remote="true" dataName="cnName"
                                 @selectChange="rowDicChange('unitNo', $event, row)"></dic-select>
                             <dic-select

src/views/ow/contract/detailsPage.vue

@@ -46,7 +46,7 @@
           </tempalte>
           <template slot="boxTypeQuantityOne">
             <dic-select v-model="form.boxTypeQuantityOne" key="id" label="cnName" res="records"
-              url="/blade-los/bcntrtypes/list?status=0&current=1&size=20" :filterable="true" :remote="true"
+             url="/blade-los/bcntrtypes/list?current=1&size=100" :filterable="true" :remote="true"
               dataName="cnName" @selectChange="dicChange('boxTypeQuantityOne', $event)"
               :disabled="editDisabled"></dic-select>
           </template>

src/views/ow/owPut/detailsPage.vue

@@ -196,7 +196,7 @@
                   key="id"
                   label="cnName"
                   res="records"
-                  url="/blade-los/bcntrtypes/list?status=0&current=1&size=20"
+                 url="/blade-los/bcntrtypes/list?current=1&size=100"
                   :filterable="true"
                   :remote="true"
                   dataName="cnName"
@@ -286,7 +286,7 @@
                   key="id"
                   label="cnName"
                   res="records"
-                  url="/blade-los/bcntrtypes/list?status=0&current=1&size=20"
+                 url="/blade-los/bcntrtypes/list?current=1&size=100"
                   :filterable="true"
                   :remote="true"
                   dataName="cnName"

src/views/ow/owTask/detailsPage.vue

@@ -236,7 +236,7 @@
                   key="id"
                   label="cnName"
                   res="records"
-                  url="/blade-los/bcntrtypes/list?status=0&current=1&size=20"
+                 url="/blade-los/bcntrtypes/list?current=1&size=100"
                   :filterable="true"
                   :remote="true"
                   dataName="cnName"
@@ -253,8 +253,7 @@
                   :disabled="
                     editDisabled ||
                       (fixData && form.whetherEnable == '是') ||
-                      form.suitcaseNum != 0 ||
-                      form.feeCenterList.filter(item => item.auditStatus > 0).length
+                      form.suitcaseNum != 0
                   "
                   :min="1"
                   :controls="false"
@@ -335,7 +334,7 @@
                   key="id"
                   label="cnName"
                   res="records"
-                  url="/blade-los/bcntrtypes/list?status=0&current=1&size=20"
+                 url="/blade-los/bcntrtypes/list?current=1&size=100"
                   :filterable="true"
                   :remote="true"
                   dataName="cnName"

src/views/ow/owTask/index.vue

@@ -164,6 +164,12 @@ export default {
             ]
           },
           {
+            label: "优先等级",
+            prop: "priorityLevel",
+            overHidden: true,
+            width: 80
+          },
+          {
             label: "系统号",
             prop: "sysNo",
             width: 100,