财务管理新加查看更多功能

OW 海运进出口 箱管 修改报表分页功能不全的问题

public/index.html

@@ -20,8 +20,9 @@
   <script src="<%= BASE_URL %>cdn/xlsx/FileSaver.min.js"></script>
   <script src="<%= BASE_URL %>cdn/xlsx/xlsx.full.min.js"></script>
 <!--    导入拖拽-->
-  <script src="https://cdn.staticfile.org/Sortable/1.10.0-rc2/Sortable.min.js"></script>
-  <script>
+  <!-- <script src="https://cdn.staticfile.org/Sortable/1.10.0-rc2/Sortable.min.js"></script> -->
+  <script src="https://cdn.jsdelivr.net/npm/sortablejs@latest/Sortable.min.js"></script>
+ <script>
     window._AMapSecurityConfig = {
       securityJsCode: '3d1fa066dcbd64ac5460f63c189f0634',
     }

src/components/boxManagement/businessReports.vue

@@ -133,7 +133,7 @@ export default {
       },
       loading: true,
       page: {
-        pageSize: 10,
+        pageSize: 20,
         currentPage: 1,
         total: 0
       },
@@ -1128,9 +1128,11 @@ export default {
     },
     currentChange(currentPage) {
       this.page.currentPage = currentPage;
+      this.onLoad(this.page, this.query);
     },
     sizeChange(pageSize) {
       this.page.pageSize = pageSize;
+      this.onLoad(this.page, this.query);
     },
     refreshChange() {
       this.onLoad(this.page, this.query);

src/components/boxManagement/businessReportsJc.vue

@@ -137,7 +137,7 @@ export default {
       },
       loading: true,
       page: {
-        pageSize: 10,
+        pageSize: 20,
         currentPage: 1,
         total: 0
       },
@@ -1124,9 +1124,11 @@ export default {
     },
     currentChange(currentPage) {
       this.page.currentPage = currentPage;
+      this.onLoad(this.page, this.query);
     },
     sizeChange(pageSize) {
       this.page.pageSize = pageSize;
+      this.onLoad(this.page, this.query);
     },
     refreshChange() {
       this.onLoad(this.page, this.query);

src/components/boxManagement/businessReportsTS.vue

@@ -134,7 +134,7 @@ export default {
       },
       loading: true,
       page: {
-        pageSize: 10,
+        pageSize: 20,
         currentPage: 1,
         total: 0
       },
@@ -983,9 +983,11 @@ export default {
     },
     currentChange(currentPage) {
       this.page.currentPage = currentPage;
+      this.onLoad(this.page, this.query);
     },
     sizeChange(pageSize) {
       this.page.pageSize = pageSize;
+      this.onLoad(this.page, this.query);
     },
     refreshChange() {
       this.onLoad(this.page, this.query);

src/components/boxManagement/reports.vue

@@ -119,7 +119,7 @@ export default {
       query: {},
       loading: true,
       page: {
-        pageSize: 10,
+        pageSize: 20,
         currentPage: 1,
         total: 0
       },

src/components/boxManagement/reportsJc.vue

@@ -123,7 +123,7 @@ export default {
       query: {},
       loading: true,
       page: {
-        pageSize: 10,
+        pageSize: 20,
         currentPage: 1,
         total: 0,
       },

src/components/boxManagement/reportsTS.vue

@@ -119,7 +119,7 @@ export default {
       query: {},
       loading: true,
       page: {
-        pageSize: 10,
+        pageSize: 20,
         currentPage: 1,
         total: 0
       },

src/components/dicSelect/containerNumber.vue

@@ -60,7 +60,7 @@ export default {
         searchIcon: true,
         searchIndex: 3,
         searchShow: true,
-        searchMenuSpan: 18,
+        searchMenuSpan: 12,
         border: true,
         index: true,
         // selection: true,
@@ -83,9 +83,27 @@ export default {
           },
           {
             label: "场站",
+            prop: "polStationId",
+            width: 100,
+            overHidden: true,
+            hide:true,
+            search: true,
+            type: "select",
+            filterable: true,
+            remote: true,
+            dicUrl: "/api/blade-los/bcorps/selectList?corpTypeName=场站&status=0&size=10&current=1&cnName={{key}}",
+            props: {
+              label: "cnName",
+              value: "id",
+              desc: "code",
+              res: "data.records"
+            }
+          },
+          {
+            label: "场站",
             prop: "polStationCname",
             width: 100,
-            overHidden: true
+            overHidden: true,
           },
           {
             label: "箱型",
@@ -275,7 +293,8 @@ export default {
     type: {
       type: String,
       default: "select"
-    }
+    },
+
   },
   model: {
     prop: "value",
@@ -504,7 +523,7 @@ export default {
       this.loading = true;
       getDicinit(this.method, this.url, obj)
         .then(res => {
-          this.dataList = res.data.data;
+          this.dataList = res.data.data.filter(item=>item.remainingNum>0);
         })
         .finally(() => {
           this.loading = false;

src/views/boxManagement/LSCabinet/index.vue

@@ -35,14 +35,17 @@
 import { getList } from "@/api/boxManagement/LSCabinet/index.js";
 import dicSelect from "@/components/dicSelect/main";
 import { getToken } from "@/util/auth";
+import { forEach } from "lodash";
 export default {
   name: "久置柜",
   data() {
     return {
+      roleName: localStorage.getItem("roleName").split(","),
       firstPage: false,
       form: {},
       query: {
-        longTermDays: 14
+        longTermDays: 14,
+        containerNumberType:null
       },
       loading: false,
       page: {
@@ -102,6 +105,7 @@ export default {
               label: "dictValue",
               value: "dictValue"
             },
+            searchValue: null,
             overHidden: true
           },
           {
@@ -186,8 +190,20 @@ export default {
     dicSelect
   },
   async created() {
+    if (this.roleName.includes("OW")) {
+      this.query.containerNumberType = "OW(拿)";
+    }
     this.saberUserInfo = JSON.parse(localStorage.getItem("saber-userInfo")).content;
     this.option = await this.getColumnData(this.getColumnName(540), this.optionBack);
+
+    if (this.roleName.includes("OW")) {
+    this.option.column.forEach(item => {
+        if (item.prop == "containerNumberType") {
+          item.searchValue = "OW(拿)";
+        }
+      });
+    }
+      
     this.$nextTick(() => {
       this.$refs.crud.doLayout();
       this.$refs.crud.dicInit();
@@ -196,7 +212,7 @@ export default {
   methods: {
     searchReset() {
       this.query = {
-        longTermDays:0
+        longTermDays: 0
       };
     },
     // 搜索按钮点击
@@ -280,6 +296,14 @@ export default {
     async resetColumn(ref, option, optionBack, code) {
       this[option] = this[optionBack];
       const inSave = await this.delColumnData(this.getColumnName(code), this[optionBack]);
+      if (this.roleName.includes("OW")) {
+        this.query.containerNumberType = "OW(拿)";
+        this.option.column.forEach(item => {
+          if (item.prop == "containerNumberType") {
+            item.searchValue = "OW(拿)";
+          }
+        });
+      }
       if (inSave) {
         this.$message.success("重置成功");
         this.$refs[ref].$refs.dialogColumn.columnBox = false;

src/views/boxManagement/boxCost/detailsPage.vue

@@ -2676,7 +2676,7 @@ export default {
           total: 0
         };
         this.$nextTick(() => {
-          this.$refs.reportformsList.onLoad(page, {
+          this.$refs.reportformsList.openDialog({
             businessType: "XGFY",
             classifyCode: "费用",
             groupCode: groupCode

src/views/boxManagement/moveOut/detailsPage.vue

@@ -2048,7 +2048,7 @@ export default {
           total: 0
         };
         this.$nextTick(() => {
-          this.$refs.reportformsList.onLoad(page, {
+          this.$refs.reportformsList.openDialog({
             businessType: "XGFY",
             classifyCode: "费用",
             groupCode: groupCode

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

@@ -53,7 +53,7 @@ export default {
       },
       loading: true,
       page: {
-        pageSize: 10,
+        pageSize: 20,
         currentPage: 1,
         total: 0
       },

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

@@ -2583,7 +2583,7 @@ export default {
           total: 0
         };
         this.$nextTick(() => {
-          this.$refs.reportformsList.onLoad(page, {
+          this.$refs.reportformsList.openDialog({
             businessType: "HYJK",
             classifyCode: "费用",
             groupCode: groupCode

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

@@ -1,157 +1,186 @@
 <template>
-    <div>
-        <avue-crud :option="option"
-                   :table-loading="loading"
-                   :data="data"
-                   :page.sync="page"
-                   ref="crud"
-                   id="out-table"
-                   :header-cell-class-name="headerClassName"
-                   @resetColumn="resetColumnTwo('crud', 'option', 'optionBack', 312.2)"
-                   @saveColumn="saveColumnTwo('crud', 'option', 'optionBack', 312.2)"
-                   @search-change="searchChange"
-                   @search-reset="searchReset"
-                   @refresh-change="refreshChange">
-            <template slot-scope="scope" slot="menu">
-                <el-button type="text" size="small" @click="handleCurrentRowChange(scope.row)">打印预览</el-button>
-            </template>
-        </avue-crud>
-        <!--@on-load="onLoad"-->
-    </div>
+  <div>
+    <avue-crud
+      :option="option"
+      :table-loading="loading"
+      :data="data"
+      :page.sync="page"
+      ref="crud"
+      id="out-table"
+      :header-cell-class-name="headerClassName"
+      @resetColumn="resetColumnTwo('crud', 'option', 'optionBack', 312.2)"
+      @saveColumn="saveColumnTwo('crud', 'option', 'optionBack', 312.2)"
+      @search-change="searchChange"
+      @search-reset="searchReset"
+      @refresh-change="refreshChange"
+      @current-change="currentChange"
+      @size-change="sizeChange"
+    >
+      <template slot-scope="scope" slot="menu">
+        <el-button type="text" size="small" @click="handleCurrentRowChange(scope.row)">打印预览</el-button>
+      </template>
+    </avue-crud>
+    <!--@on-load="onLoad"-->
+  </div>
 </template>
 
 <script>
-    import {getList} from "@/api/iosBasicData/reports";
-    import {getUserApprovalList} from "@/api/approval/processConfig";
-    import {bbusinesstypeList} from "@/api/iosBasicData/bbusinesstype";
+import { getList } from "@/api/iosBasicData/reports";
+import { getUserApprovalList } from "@/api/approval/processConfig";
+import { bbusinesstypeList } from "@/api/iosBasicData/bbusinesstype";
 
-    export default {
-        props:{
-            // query:{
-            //     type:Object,
-            //     delete:{}
-            // }
-        },
-        data(){
-            return {
-                option: {},
-                optionBack: {
-                    height:'300px',
-                    calcHeight: 30,
-                    tip: false,
-                    searchShow: true,
-                    searchMenuSpan: 6,
-                    border: true,
-                    index: true,
-                    selection: false, // 多选
-                    // highlightCurrentRow:true, // 单选
-                    dialogClickModal: false,
-                    addBtn:false,
-                    viewBtn:false,
-                    delBtn:false,
-                    editBtn:false,
-                    menuWidth:'100',
-                    column: [
-                        {
-                            label: "报表编码",
-                            prop: "code",
-                        },
-                        {
-                            label: "中文名称",
-                            prop: "cnName",
-                        },
-                        {
-                            label: "英文名称",
-                            prop: "enName"
-                        },
-                    ]
-                },
-                loading: true,
-                query:{},
-                page: {
-                    pageSize: 10,
-                    currentPage: 1,
-                    total: 0
-                },
-                data:[]
-            }
-        },
-        async created() {
-            this.option = await this.getColumnData(this.getColumnName(312.2), this.optionBack);
-        },
-        methods:{
-            // 点击打印
-            handleCurrentRowChange(val){
-                this.$emit('reportRadio',val)
-            },
-            searchChange(params, done) {
-                this.query = params;
-                this.page.currentPage = 1;
-                this.onLoad(this.page, params);
-                done();
-            },
-            searchReset() {
-                this.query = {};
-                this.onLoad(this.page);
-            },
-            refreshChange() {
-                this.onLoad(this.page, this.query);
-            },
-            onLoad(page, params = {}) {
-                this.loading = true;
-                getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
-                    const data = res.data.data;
-                    this.page.total = data.total;
-                    this.data = data.records
-                    this.loading = false;
-                });
-            },
-            //自定义列保存
-            async saveColumnTwo(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;
-                }
-            },
-            //自定义列重置
-            async resetColumnTwo(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;
-            },
+export default {
+  props: {
+    // query:{
+    //     type:Object,
+    //     delete:{}
+    // }
+  },
+  data() {
+    return {
+      option: {},
+      optionBack: {
+        height: "300px",
+        calcHeight: 30,
+        tip: false,
+        searchShow: true,
+        searchMenuSpan: 6,
+        border: true,
+        index: true,
+        selection: false, // 多选
+        // highlightCurrentRow:true, // 单选
+        dialogClickModal: false,
+        addBtn: false,
+        viewBtn: false,
+        delBtn: false,
+        editBtn: false,
+        menuWidth: "100",
+        column: [
+          {
+            label: "报表编码",
+            prop: "code"
+          },
+          {
+            label: "中文名称",
+            prop: "cnName"
+          },
+          {
+            label: "英文名称",
+            prop: "enName"
+          }
+        ]
+      },
+      loading: true,
+      query: {},
+      page: {
+        pageSize: 20,
+        currentPage: 1,
+        total: 0
+      },
+      data: [],
+      rfObj: {}
+    };
+  },
+  async created() {
+    this.option = await this.getColumnData(this.getColumnName(312.2), this.optionBack);
+  },
+  methods: {
+    // 点击打印
+    handleCurrentRowChange(val) {
+      this.$emit("reportRadio", val);
+    },
+    searchChange(params, done) {
+      this.query = params;
+      this.page.currentPage = 1;
+      this.onLoad(this.page, params);
+      done();
+    },
+    searchReset() {
+      this.query = {};
+      this.onLoad(this.page);
+    },
+    refreshChange() {
+      this.onLoad(this.page, this.query);
+    },
+    
+    currentChange(currentPage) {
+      this.page.currentPage = currentPage;
+      this.onLoad(this.page, this.query);
+    },
+    sizeChange(pageSize) {
+      this.page.pageSize = pageSize;
+      this.onLoad(this.page, this.query);
+    },
+    openDialog(val) {
+      this.data = [];
+      this.page = {
+        pageSize: 20,
+        currentPage: 1,
+        total: 0
+      };
+      this.rfObj = {};
+      this.rfObj = val;
+      this.onLoad(this.page, this.query);
+    },
+    onLoad(page, params = {}) {
+      let obj = {
+        ...Object.assign(params, this.query),
+        ...this.rfObj
+      };
+      this.loading = true;
+      getList(page.currentPage, page.pageSize, obj).then(res => {
+        const data = res.data.data;
+        this.page.total = data.total;
+        this.data = data.records;
+        this.loading = false;
+      });
+    },
+    //自定义列保存
+    async saveColumnTwo(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;
+      }
+    },
+    //自定义列重置
+    async resetColumnTwo(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;
+  background: #ecf5ff !important;
 }
 
 ::v-deep#out-table .back-two {
-    background: #ecf5ff !important;
+  background: #ecf5ff !important;
 }
 </style>

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

@@ -103,7 +103,7 @@ export default {
       query: {},
       loading: true,
       page: {
-        pageSize: 10,
+        pageSize: 20,
         currentPage: 1,
         total: 0
       },

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

@@ -105,7 +105,7 @@
           size="small"
           type="success"
           :disabled="!form.id || detailData.seeDisabled || showLock"
-          v-if="form.status == 0 || (form.status == 4 && form.billType != 'MH')"
+          v-if="(form.status == 0 || form.status == 4) && form.billType != 'MH'"
           @click.stop="DocumentApproval"
           >{{ $t("btn118n.apply") }}
         </el-button>

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

@@ -62,7 +62,7 @@ export default {
       classifyCodeReadonly: false,
       loading: true,
       page: {
-        pageSize: 10,
+        pageSize: 20,
         currentPage: 1,
         total: 0
       },

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

@@ -2628,7 +2628,7 @@ export default {
           total: 0
         };
         this.$nextTick(() => {
-          this.$refs.reportformsList.onLoad(page, {
+          this.$refs.reportformsList.openDialog({
             businessType: "HYCK",
             classifyCode: "费用",
             groupCode: groupCode

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

@@ -1,158 +1,186 @@
 <template>
-    <div>
-        <avue-crud :option="option"
-                   :table-loading="loading"
-                   :data="data"
-                   :page.sync="page"
-                   ref="crud"
-                   id="out-table"
-                   :header-cell-class-name="headerClassName"
-                   @resetColumn="resetColumnTwo('crud', 'option', 'optionBack', 312.2)"
-                   @saveColumn="saveColumnTwo('crud', 'option', 'optionBack', 312.2)"
-                   @search-change="searchChange"
-                   @search-reset="searchReset"
-                   @refresh-change="refreshChange">
-            <template slot-scope="scope" slot="menu">
-                <el-button type="text" size="small" @click="handleCurrentRowChange(scope.row)">打印预览</el-button>
-            </template>
-        </avue-crud>
-        <!--@on-load="onLoad"-->
-    </div>
+  <div>
+    <avue-crud
+      :option="option"
+      :table-loading="loading"
+      :data="data"
+      :page.sync="page"
+      ref="crud"
+      id="out-table"
+      :header-cell-class-name="headerClassName"
+      @resetColumn="resetColumnTwo('crud', 'option', 'optionBack', 312.2)"
+      @saveColumn="saveColumnTwo('crud', 'option', 'optionBack', 312.2)"
+      @search-change="searchChange"
+      @search-reset="searchReset"
+      @refresh-change="refreshChange"
+      @current-change="currentChange"
+      @size-change="sizeChange"
+    >
+      <template slot-scope="scope" slot="menu">
+        <el-button type="text" size="small" @click="handleCurrentRowChange(scope.row)">打印预览</el-button>
+      </template>
+    </avue-crud>
+    <!--@on-load="onLoad"-->
+  </div>
 </template>
 
 <script>
-    import {getList} from "@/api/iosBasicData/reports";
-    import {getUserApprovalList} from "@/api/approval/processConfig";
-    import {bbusinesstypeList} from "@/api/iosBasicData/bbusinesstype";
+import { getList } from "@/api/iosBasicData/reports";
+import { getUserApprovalList } from "@/api/approval/processConfig";
+import { bbusinesstypeList } from "@/api/iosBasicData/bbusinesstype";
 
-    export default {
-        props:{
-            // query:{
-            //     type:Object,
-            //     delete:{}
-            // }
-        },
-        data(){
-            return {
-                option: {},
-                optionBack: {
-                    height:'300px',
-                    calcHeight: 30,
-                    tip: false,
-                    searchShow: true,
-                    searchMenuSpan: 6,
-                    border: true,
-                    index: true,
-                    selection: false, // 多选
-                    // highlightCurrentRow:true, // 单选
-                    dialogClickModal: false,
-                    addBtn:false,
-                    viewBtn:false,
-                    delBtn:false,
-                    editBtn:false,
-                    menuWidth:'100',
-                    column: [
-                        {
-                            label: "报表编码",
-                            prop: "code",
-                        },
-                        {
-                            label: "中文名称",
-                            prop: "cnName",
-                        },
-                        {
-                            label: "英文名称",
-                            prop: "enName"
-                        },
-                    ]
-                },
-                loading: true,
-                query:{},
-                page: {
-                    pageSize: 10,
-                    currentPage: 1,
-                    total: 0
-                },
-                data:[]
-            }
-        },
-        async created() {
-            this.option = await this.getColumnData(this.getColumnName(312.2), this.optionBack);
-        },
-        methods:{
-            // 点击打印
-            handleCurrentRowChange(val){
-                console.log(val,1211111)
-                this.$emit('reportRadio',val)
-            },
-            searchChange(params, done) {
-                this.query = params;
-                this.page.currentPage = 1;
-                this.onLoad(this.page, params);
-                done();
-            },
-            searchReset() {
-                this.query = {};
-                this.onLoad(this.page);
-            },
-            refreshChange() {
-                this.onLoad(this.page, this.query);
-            },
-            onLoad(page, params = {}) {
-                this.loading = true;
-                getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
-                    const data = res.data.data;
-                    this.page.total = data.total;
-                    this.data = data.records
-                    this.loading = false;
-                });
-            },
-            //自定义列保存
-            async saveColumnTwo(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;
-                }
-            },
-            //自定义列重置
-            async resetColumnTwo(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;
-            },
+export default {
+  props: {
+    // query:{
+    //     type:Object,
+    //     delete:{}
+    // }
+  },
+  data() {
+    return {
+      option: {},
+      optionBack: {
+        height: "300px",
+        calcHeight: 30,
+        tip: false,
+        searchShow: true,
+        searchMenuSpan: 6,
+        border: true,
+        index: true,
+        selection: false, // 多选
+        // highlightCurrentRow:true, // 单选
+        dialogClickModal: false,
+        addBtn: false,
+        viewBtn: false,
+        delBtn: false,
+        editBtn: false,
+        menuWidth: "100",
+        column: [
+          {
+            label: "报表编码",
+            prop: "code"
+          },
+          {
+            label: "中文名称",
+            prop: "cnName"
+          },
+          {
+            label: "英文名称",
+            prop: "enName"
+          }
+        ]
+      },
+      loading: true,
+      query: {},
+      page: {
+        pageSize: 20,
+        currentPage: 1,
+        total: 0
+      },
+      data: [],
+      rfObj: {}
+    };
+  },
+  async created() {
+    this.option = await this.getColumnData(this.getColumnName(312.2), this.optionBack);
+  },
+  methods: {
+    // 点击打印
+    handleCurrentRowChange(val) {
+      console.log(val, 1211111);
+      this.$emit("reportRadio", val);
+    },
+    searchChange(params, done) {
+      this.query = params;
+      this.page.currentPage = 1;
+      this.onLoad(this.page, params);
+      done();
+    },
+    searchReset() {
+      this.query = {};
+      this.onLoad(this.page);
+    },
+    refreshChange() {
+      this.onLoad(this.page, this.query);
+    },
+    currentChange(currentPage) {
+      this.page.currentPage = currentPage;
+      this.onLoad(this.page, this.query);
+    },
+    sizeChange(pageSize) {
+      this.page.pageSize = pageSize;
+      this.onLoad(this.page, this.query);
+    },
+    openDialog(val) {
+      this.data = [];
+      this.page = {
+        pageSize: 20,
+        currentPage: 1,
+        total: 0
+      };
+      this.rfObj = {};
+      this.rfObj = val;
+      this.onLoad(this.page, this.query);
+    },
+    onLoad(page, params = {}) {
+      let obj = {
+        ...Object.assign(params, this.query),
+        ...this.rfObj
+      };
+      this.loading = true;
+      getList(page.currentPage, page.pageSize, obj).then(res => {
+        const data = res.data.data;
+        this.page.total = data.total;
+        this.data = data.records;
+        this.loading = false;
+      });
+    },
+    //自定义列保存
+    async saveColumnTwo(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;
+      }
+    },
+    //自定义列重置
+    async resetColumnTwo(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;
+  background: #ecf5ff !important;
 }
 
 ::v-deep#out-table .back-two {
-    background: #ecf5ff !important;
+  background: #ecf5ff !important;
 }
 </style>

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

@@ -103,7 +103,7 @@ export default {
       query: {},
       loading: true,
       page: {
-        pageSize: 10,
+        pageSize: 20,
         currentPage: 1,
         total: 0
       },

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

@@ -727,14 +727,14 @@ export default {
       // 下拉的加载
       SplitLoading: false,
       page: {
-        pageSize: 10,
+        pageSize: 20,
         currentPage: 1,
         total: 0,
         pageSizes: [10, 20, 30, 40, 50, 100, 200, 300, 500]
       },
       // 弹窗分页
       mawbPage: {
-        pageSize: 10,
+        pageSize: 20,
         currentPage: 1,
         total: 0
       },

src/views/iosBasicData/bcorps/detailsPage.vue

@@ -8,7 +8,8 @@
           </el-button>
           <h4 style="margin: 0">往来单位</h4>
           <dev>
-            <el-button v-if="formData.id&&roleName.includes('admin')" type="warning" @click="merge">合并客户</el-button>
+            <!-- <el-button v-if="formData.id&&roleName.includes('admin')" type="warning" @click="merge">合并客户</el-button> -->
+                <el-button v-if="formData.id" type="warning" @click="merge">合并客户</el-button>
             <el-button v-if="formData.id" type="success" @click="fix">修改资料</el-button>
             <el-button type="primary" @click="submitForm">保存</el-button>
           </dev>

src/views/iosBasicData/financialManagement/PaymentApplication/components/viewMore.vue

@@ -0,0 +1,210 @@
+<template>
+  <div>
+    <el-dialog title="费用信息" :visible.sync="dialogVisible" top="5vh" append-to-body width="80%" :before-close="handleClose">
+      <span style="font-size:18px;font-weight:600;margin-left:10px;">
+        <span style="color: #67C23A;margin-right: 10px;"> 本币合计:{{ Number(form.amountCr || 0 - form.amountDr || 0).toFixed(2) || 0 }}元 </span>
+        <span style="color: #E6A23C;margin-right: 10px;">
+          外币合计:{{ Number(form.amountCrUsd || 0 - form.amountDrUsd || 0).toFixed(2) || 0 }}元
+        </span>
+      </span>
+      <avue-crud
+        v-if="dialogVisible"
+        :option="option"
+        :data="pageData"
+        ref="crud"
+        :page.sync="page"
+        @size-change="sizeChange"
+        @current-change="currentChange"
+      >
+      </avue-crud>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="dialogVisible = false" size="mini">关 闭</el-button>
+      </span>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+export default {
+  props: {},
+  data() {
+    return {
+      allData: [],
+      pageData: [],
+      form: {},
+      dialogVisible: false,
+      loading: false,
+      option: {
+        height: "600px",
+        calcHeight: 30,
+        menuWidth: 60,
+        tip: false,
+        menu: false,
+        border: true,
+        addBtn: false,
+        viewBtn: false,
+        editBtn: false,
+        delBtn: false,
+        refreshBtn: false,
+        header: false,
+        index: true,
+        align: "center",
+        column: [
+          {
+            label: "所属公司",
+            prop: "branchName",
+            width: 120,
+            overHidden: true
+          },
+          {
+            label: "客户名称",
+            prop: "corpCnName",
+            width: 120,
+            overHidden: true
+          },
+          {
+            label: "收付",
+            prop: "dc",
+            width: 60,
+            type: "select",
+            dicData: [
+              {
+                label: "收",
+                value: "D"
+              },
+              {
+                label: "付",
+                value: "C"
+              }
+            ],
+            overHidden: true
+          },
+          {
+            label: "费用名称",
+            prop: "feeCnName",
+            width: 80,
+            overHidden: true
+          },
+          {
+            label: "申请金额",
+            prop: "currentStlAmount",
+            width: 100,
+            overHidden: true
+          },
+          {
+            label: "币别",
+            prop: "currentStlCurCode",
+            width: 60,
+            overHidden: true
+          },
+          {
+            label: "汇率",
+            prop: "currentStlExrate",
+            width: 80,
+            overHidden: true
+          },
+          {
+            label: "MB/L NO",
+            prop: "mblno",
+            width: 100,
+            overHidden: true
+          },
+          {
+            label: "HB/L NO",
+            prop: "hblno",
+            width: 100,
+            overHidden: true
+          },
+
+          {
+            label: "起运港",
+            prop: "polCnName",
+            width: 100,
+            overHidden: true
+          },
+          {
+            label: "目的港",
+            prop: "podCnName",
+            width: 80,
+            overHidden: true
+          },
+          {
+            label: "箱型箱量",
+            prop: "quantityCntrDescr",
+            width: 80,
+            overHidden: true
+          },
+          {
+            label: "船名",
+            prop: "vesselEnName",
+            width: 80,
+            overHidden: true
+          },
+          {
+            label: "航次",
+            prop: "voyageNo",
+            width: 80,
+            overHidden: true
+          },
+          {
+            label: "备注",
+            prop: "remarks",
+            width: 120,
+            overHidden: true
+          }
+        ]
+      },
+      page: {
+        currentPage: 1,
+        total: 0,
+        pageSize: 50
+      }
+    };
+  },
+  created() {},
+  methods: {
+    openDialog(row, list) {
+      this.dialogVisible = true;
+      this.form = {};
+      this.allData = [];
+      this.page = {
+        currentPage: 1,
+        total: 0,
+        pageSize: 50
+      };
+      this.form = row;
+      this.allData = list;
+      this.page.total = list.length;
+      this.getList();
+    },
+    sizeChange(val) {
+      this.page.currentPage = 1;
+      this.page.pageSize = val;
+      this.getList();
+    },
+    currentChange(val) {
+      this.page.currentPage = val;
+      this.getList();
+    },
+    getList() {
+      const start = (this.page.currentPage - 1) * this.page.pageSize;
+      const end = start + this.page.pageSize;
+      this.pageData = this.allData.slice(start, end);
+    }
+  }
+};
+</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/financialManagement/PaymentApplication/detailsPage.vue

@@ -147,6 +147,9 @@
                       </span>
                     </span>
                   </template>
+                  <template slot="menuRight">
+                      <el-button type="text" @click="$refs.viewMore.openDialog(form,form.finStlBillsItemsList)">查看更多</el-button>
+                  </template>
                 </avue-crud>
               </trade-card>
             </el-col>
@@ -356,6 +359,7 @@
     </el-dialog>
     <!--报表组件-->
     <reportContainer ref="reportContainer"></reportContainer>
+    <view-more ref="viewMore"></view-more>
   </div>
 </template>
 
@@ -380,8 +384,9 @@ import { getList as getreportsList, reportsGetReportData } from "@/api/iosBasicD
 import checkSchedule from "@/components/checkH/checkSchedule.vue";
 import dicSelect from "@/components/dicSelect/main";
 import { getToken } from "@/util/auth";
+import viewMore from "./components/viewMore.vue";
 export default {
-  components: { dicSelect, reportContainer, reportformsList, reports, finstlbillsitems, checkSchedule },
+  components: { dicSelect, reportContainer, reportformsList, reports, finstlbillsitems, checkSchedule,viewMore },
   props: {
     detailData: {
       type: Object
@@ -931,6 +936,12 @@ export default {
             prop: "exrate",
             width: 60,
             overHidden: true
+          },
+          {
+            label: "备注",
+            prop: "remarks",
+            width: 100,
+            overHidden: true
           }
         ]
       },

src/views/iosBasicData/financialManagement/computationCenter/components/viewMore.vue

@@ -0,0 +1,211 @@
+<template>
+  <div>
+    <el-dialog title="费用信息" :visible.sync="dialogVisible" top="5vh" append-to-body width="80%" :before-close="handleClose">
+      <span style="font-size:18px;font-weight:600;margin-left:10px;">
+        <span style="color: #67C23A;margin-right: 10px;"> 应收本币:{{ form.amountDr || 0 }}元 </span>
+        <span style="color: #E6A23C;margin-right: 10px;"> 应付本币:{{ form.amountCr || 0 }}元 </span>
+        <span style="color: #67C23A;margin-right: 10px;"> 应收外币:{{ form.amountDrUsd || 0 }}元 </span>
+        <span style="color: #E6A23C;margin-right: 10px;"> 应付外币:{{ form.amountCrUsd || 0 }}元 </span>
+        <span style="color: #E6A23C;margin-right: 10px;"> 总合计:{{ form.amountSubLoc || 0 }}元 </span>
+      </span>
+      <avue-crud
+        v-if="dialogVisible"
+        :option="option"
+        :data="pageData"
+        ref="crud"
+        :page.sync="page"
+        @size-change="sizeChange"
+        @current-change="currentChange"
+      >
+      </avue-crud>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="dialogVisible = false" size="mini">关 闭</el-button>
+      </span>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+export default {
+  props: {},
+  data() {
+    return {
+      allData: [],
+      pageData: [],
+      form: {},
+      dialogVisible: false,
+      loading: false,
+      option: {
+        height: "600px",
+        calcHeight: 30,
+        menuWidth: 60,
+        tip: false,
+        menu: false,
+        border: true,
+        addBtn: false,
+        viewBtn: false,
+        editBtn: false,
+        delBtn: false,
+        refreshBtn: false,
+        header: false,
+        index: true,
+        align: "center",
+        column: [
+          {
+            label: "所属公司",
+            prop: "branchName",
+            width: 120,
+            overHidden: true
+          },
+          {
+            label: "客户名称",
+            prop: "corpCnName",
+            width: 120,
+            overHidden: true
+          },
+          {
+            label: "收付",
+            prop: "dc",
+            width: 60,
+            type: "select",
+            dicData: [
+              {
+                label: "收",
+                value: "D"
+              },
+              {
+                label: "付",
+                value: "C"
+              }
+            ],
+            overHidden: true
+          },
+          {
+            label: "费用名称",
+            prop: "feeCnName",
+            width: 80,
+            overHidden: true
+          },
+          {
+            label: "申请金额",
+            prop: "currentAmount",
+            width: 100,
+            overHidden: true
+          },
+          {
+            label: "币别",
+            prop: "curCode",
+            width: 60,
+            overHidden: true
+          },
+          {
+            label: "汇率",
+            prop: "currentExrate",
+            width: 80,
+            overHidden: true
+          },
+          {
+            label: "MB/L NO",
+            prop: "mblno",
+            width: 100,
+            overHidden: true
+          },
+          {
+            label: "HB/L NO",
+            prop: "hblno",
+            width: 100,
+            overHidden: true
+          },
+
+          {
+            label: "起运港",
+            prop: "polCnName",
+            width: 100,
+            overHidden: true
+          },
+          {
+            label: "目的港",
+            prop: "podCnName",
+            width: 80,
+            overHidden: true
+          },
+          {
+            label: "箱型箱量",
+            prop: "quantityCntrDescr",
+            width: 80,
+            overHidden: true
+          },
+          {
+            label: "船名",
+            prop: "vesselEnName",
+            width: 80,
+            overHidden: true
+          },
+          {
+            label: "航次",
+            prop: "voyageNo",
+            width: 80,
+            overHidden: true
+          },
+          {
+            label: "备注",
+            prop: "remarks",
+            width: 120,
+            overHidden: true
+          }
+        ]
+      },
+      page: {
+        currentPage: 1,
+        total: 0,
+        pageSize: 50
+      }
+    };
+  },
+  created() {},
+  methods: {
+    openDialog(row, list) {
+      this.dialogVisible = true;
+      this.form = {};
+      this.allData = [];
+      this.page = {
+        currentPage: 1,
+        total: 0,
+        pageSize: 50
+      };
+      this.form = row;
+      this.allData = list;
+      this.page.total = list.length;
+      this.getList();
+    },
+    sizeChange(val) {
+      this.page.currentPage = 1;
+      this.page.pageSize = val;
+      this.getList();
+    },
+    currentChange(val) {
+      this.page.currentPage = val;
+      this.getList();
+    },
+    getList() {
+      const start = (this.page.currentPage - 1) * this.page.pageSize;
+      const end = start + this.page.pageSize;
+      this.pageData = this.allData.slice(start, end);
+    }
+  }
+};
+</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/financialManagement/computationCenter/detailsPage.vue

@@ -138,6 +138,9 @@
                       <span style="color: #E6A23C;margin-right: 10px;"> 总合计:{{ form.amountSubLoc || 0 }}元 </span>
                     </span>
                   </template>
+                  <template slot="menuRight">
+                      <el-button type="text" @click="$refs.viewMore.openDialog(form,form.finStlBillsItemsList)">查看更多</el-button>
+                  </template>
                 </avue-crud>
               </trade-card>
             </el-col>
@@ -355,6 +358,7 @@
 
     <!--报表组件-->
     <reportContainer ref="reportContainer"></reportContainer>
+    <view-more ref="viewMore"></view-more>
   </div>
 </template>
 
@@ -385,8 +389,9 @@ import reportContainer from "@/views/iosBasicData/report-container/report-contai
 import { getList as getreportsList, reportsGetReportData } from "@/api/iosBasicData/reports";
 import dicSelect from "@/components/dicSelect/main";
 import { getToken } from "@/util/auth";
+import viewMore from "./components/viewMore.vue";
 export default {
-  components: { reportContainer, reportformsList, reports, SearchQuery, expand, finstlbillsitems, dicSelect },
+  components: { reportContainer, reportformsList, reports, SearchQuery, expand, finstlbillsitems, dicSelect,viewMore },
   props: {
     detailData: {
       type: Object
@@ -607,20 +612,20 @@ export default {
             overHidden: true
           },
           {
-            label: "结算金额",
-            prop: "currentStlAmount",
+            label: "申请金额",
+            prop: "currentAmount",
             width: 100,
             overHidden: true
           },
           {
             label: "币别",
-            prop: "currentStlCurCode",
+            prop: "curCode",
             width: 60,
             overHidden: true
           },
           {
             label: "汇率",
-            prop: "currentStlExrate",
+            prop: "currentExrate",
             width: 80,
             overHidden: true
           },
@@ -941,6 +946,12 @@ export default {
             prop: "exrate",
             width: 60,
             overHidden: true
+          },
+          {
+            label: "备注",
+            prop: "remarks",
+            width: 100,
+            overHidden: true
           }
         ]
       },

src/views/iosBasicData/financialManagement/fininvoicesApplyfor/components/viewMore.vue

@@ -0,0 +1,209 @@
+<template>
+  <div>
+    <el-dialog title="费用信息" :visible.sync="dialogVisible" top="5vh" append-to-body width="80%" :before-close="handleClose">
+      <span style="font-size:18px;font-weight:600;margin-left:10px;">
+        <span style="color: #67C23A;margin-right: 10px;"> 开票本币:{{ form.amountCny || 0 }}元 </span>
+        <span style="color: #E6A23C;margin-right: 10px;"> 开票外币:{{ form.amountUsd || 0 }}元 </span>
+        <span style="color: #67C23A;margin-right: 10px;"> 开票本币合计:{{ form.amountLoc || 0 }}元 </span>
+      </span>
+      <avue-crud
+        v-if="dialogVisible"
+        :option="option"
+        :data="pageData"
+        ref="crud"
+        :page.sync="page"
+        @size-change="sizeChange"
+        @current-change="currentChange"
+      >
+      </avue-crud>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="dialogVisible = false" size="mini">关 闭</el-button>
+      </span>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+export default {
+  props: {},
+  data() {
+    return {
+      allData: [],
+      pageData: [],
+      form: {},
+      dialogVisible: false,
+      loading: false,
+      option: {
+        height: "600px",
+        calcHeight: 30,
+        menuWidth: 60,
+        tip: false,
+        menu: false,
+        border: true,
+        addBtn: false,
+        viewBtn: false,
+        editBtn: false,
+        delBtn: false,
+        refreshBtn: false,
+        header: false,
+        index: true,
+        align: "center",
+        column: [
+          {
+            label: "所属公司",
+            prop: "branchName",
+            width: 120,
+            overHidden: true
+          },
+          {
+            label: "客户名称",
+            prop: "corpCnName",
+            width: 120,
+            overHidden: true
+          },
+          {
+            label: "收付",
+            prop: "dc",
+            width: 60,
+            type: "select",
+            dicData: [
+              {
+                label: "收",
+                value: "D"
+              },
+              {
+                label: "付",
+                value: "C"
+              }
+            ],
+            overHidden: true
+          },
+          {
+            label: "费用名称",
+            prop: "feeCnName",
+            width: 80,
+            overHidden: true
+          },
+          {
+            label: "申请金额",
+            prop: "currentAmount",
+            width: 100,
+            overHidden: true
+          },
+          {
+            label: "币别",
+            prop: "curCode",
+            width: 60,
+            overHidden: true
+          },
+          {
+            label: "汇率",
+            prop: "currentExrate",
+            width: 80,
+            overHidden: true
+          },
+          {
+            label: "MB/L NO",
+            prop: "mblno",
+            width: 100,
+            overHidden: true
+          },
+          {
+            label: "HB/L NO",
+            prop: "hblno",
+            width: 100,
+            overHidden: true
+          },
+
+          {
+            label: "起运港",
+            prop: "polCnName",
+            width: 100,
+            overHidden: true
+          },
+          {
+            label: "目的港",
+            prop: "podCnName",
+            width: 80,
+            overHidden: true
+          },
+          {
+            label: "箱型箱量",
+            prop: "quantityCntrDescr",
+            width: 80,
+            overHidden: true
+          },
+          {
+            label: "船名",
+            prop: "vesselEnName",
+            width: 80,
+            overHidden: true
+          },
+          {
+            label: "航次",
+            prop: "voyageNo",
+            width: 80,
+            overHidden: true
+          },
+          {
+            label: "备注",
+            prop: "remarks",
+            width: 120,
+            overHidden: true
+          }
+        ]
+      },
+      page: {
+        currentPage: 1,
+        total: 0,
+        pageSize: 50
+      }
+    };
+  },
+  created() {},
+  methods: {
+    openDialog(row, list) {
+      this.dialogVisible = true;
+      this.form = {};
+      this.allData = [];
+      this.page = {
+        currentPage: 1,
+        total: 0,
+        pageSize: 50
+      };
+      this.form = row;
+      this.allData = list;
+      this.page.total = list.length;
+      this.getList();
+    },
+    sizeChange(val) {
+      this.page.currentPage = 1;
+      this.page.pageSize = val;
+      this.getList();
+    },
+    currentChange(val) {
+      this.page.currentPage = val;
+      this.getList();
+    },
+    getList() {
+      const start = (this.page.currentPage - 1) * this.page.pageSize;
+      const end = start + this.page.pageSize;
+      this.pageData = this.allData.slice(start, end);
+    }
+  }
+};
+</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/financialManagement/fininvoicesApplyfor/detailsPage.vue

@@ -182,6 +182,9 @@
                       <span style="color: #67C23A;margin-right: 10px;"> 开票本币合计:{{ form.amountLoc || 0 }}元 </span>
                     </span>
                   </template>
+                  <template slot="menuRight">
+                      <el-button type="text" @click="$refs.viewMore.openDialog(form,form.finInvoicesItemsList)">查看更多</el-button>
+                  </template>
                 </avue-crud>
               </trade-card>
             </el-col>
@@ -379,6 +382,7 @@
     </el-dialog>
     <!--报表组件-->
     <reportContainer ref="reportContainer"></reportContainer>
+    <view-more ref="viewMore"></view-more>
   </div>
 </template>
 
@@ -406,8 +410,9 @@ import dicSelect from "@/components/dicSelect/main";
 import { getToken } from "@/util/auth";
 import checkSchedule from "@/components/checkH/checkSchedule.vue";
 import { isProcurement } from "@/api/basicData/configuration";
+import viewMore from "./components/viewMore.vue";
 export default {
-  components: { reportContainer, reportformsList, reports, SearchQuery, expand, finstlbillsitems, dicSelect, checkSchedule },
+  components: { reportContainer, reportformsList, reports, SearchQuery, expand, finstlbillsitems, dicSelect, checkSchedule,viewMore },
   props: {
     detailData: {
       type: Object
@@ -951,6 +956,12 @@ export default {
             prop: "exrate",
             width: 60,
             overHidden: true
+          },
+          {
+            label: "备注",
+            prop: "remarks",
+            width: 100,
+            overHidden: true
           }
         ]
       },

src/views/iosBasicData/financialManagement/fininvoicesOutput/components/viewMore.vue

@@ -0,0 +1,209 @@
+<template>
+  <div>
+    <el-dialog title="费用信息" :visible.sync="dialogVisible" top="5vh" append-to-body width="80%" :before-close="handleClose">
+      <span style="font-size:18px;font-weight:600;margin-left:10px;">
+        <span style="color: #67C23A;margin-right: 10px;"> 开票本币:{{ form.amountCny || 0 }}元 </span>
+        <span style="color: #E6A23C;margin-right: 10px;"> 开票外币:{{ form.amountUsd || 0 }}元 </span>
+        <span style="color: #67C23A;margin-right: 10px;"> 开票本币合计:{{ form.amountLoc || 0 }}元 </span>
+      </span>
+      <avue-crud
+        v-if="dialogVisible"
+        :option="option"
+        :data="pageData"
+        ref="crud"
+        :page.sync="page"
+        @size-change="sizeChange"
+        @current-change="currentChange"
+      >
+      </avue-crud>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="dialogVisible = false" size="mini">关 闭</el-button>
+      </span>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+export default {
+  props: {},
+  data() {
+    return {
+      allData: [],
+      pageData: [],
+      form: {},
+      dialogVisible: false,
+      loading: false,
+      option: {
+        height: "600px",
+        calcHeight: 30,
+        menuWidth: 60,
+        tip: false,
+        menu: false,
+        border: true,
+        addBtn: false,
+        viewBtn: false,
+        editBtn: false,
+        delBtn: false,
+        refreshBtn: false,
+        header: false,
+        index: true,
+        align: "center",
+        column: [
+          {
+            label: "所属公司",
+            prop: "branchName",
+            width: 120,
+            overHidden: true
+          },
+          {
+            label: "客户名称",
+            prop: "corpCnName",
+            width: 120,
+            overHidden: true
+          },
+          {
+            label: "收付",
+            prop: "dc",
+            width: 60,
+            type: "select",
+            dicData: [
+              {
+                label: "收",
+                value: "D"
+              },
+              {
+                label: "付",
+                value: "C"
+              }
+            ],
+            overHidden: true
+          },
+          {
+            label: "费用名称",
+            prop: "feeCnName",
+            width: 80,
+            overHidden: true
+          },
+          {
+            label: "申请金额",
+            prop: "currentAmount",
+            width: 100,
+            overHidden: true
+          },
+          {
+            label: "币别",
+            prop: "curCode",
+            width: 60,
+            overHidden: true
+          },
+          {
+            label: "汇率",
+            prop: "currentExrate",
+            width: 80,
+            overHidden: true
+          },
+          {
+            label: "MB/L NO",
+            prop: "mblno",
+            width: 100,
+            overHidden: true
+          },
+          {
+            label: "HB/L NO",
+            prop: "hblno",
+            width: 100,
+            overHidden: true
+          },
+
+          {
+            label: "起运港",
+            prop: "polCnName",
+            width: 100,
+            overHidden: true
+          },
+          {
+            label: "目的港",
+            prop: "podCnName",
+            width: 80,
+            overHidden: true
+          },
+          {
+            label: "箱型箱量",
+            prop: "quantityCntrDescr",
+            width: 80,
+            overHidden: true
+          },
+          {
+            label: "船名",
+            prop: "vesselEnName",
+            width: 80,
+            overHidden: true
+          },
+          {
+            label: "航次",
+            prop: "voyageNo",
+            width: 80,
+            overHidden: true
+          },
+          {
+            label: "备注",
+            prop: "remarks",
+            width: 120,
+            overHidden: true
+          }
+        ]
+      },
+      page: {
+        currentPage: 1,
+        total: 0,
+        pageSize: 50
+      }
+    };
+  },
+  created() {},
+  methods: {
+    openDialog(row, list) {
+      this.dialogVisible = true;
+      this.form = {};
+      this.allData = [];
+      this.page = {
+        currentPage: 1,
+        total: 0,
+        pageSize: 50
+      };
+      this.form = row;
+      this.allData = list;
+      this.page.total = list.length;
+      this.getList();
+    },
+    sizeChange(val) {
+      this.page.currentPage = 1;
+      this.page.pageSize = val;
+      this.getList();
+    },
+    currentChange(val) {
+      this.page.currentPage = val;
+      this.getList();
+    },
+    getList() {
+      const start = (this.page.currentPage - 1) * this.page.pageSize;
+      const end = start + this.page.pageSize;
+      this.pageData = this.allData.slice(start, end);
+    }
+  }
+};
+</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/financialManagement/fininvoicesOutput/detailsPage.vue

@@ -181,6 +181,9 @@
                       <span style="color: #67C23A;margin-right: 10px;"> 开票本币合计:{{ form.amountLoc || 0 }}元 </span>
                     </span>
                   </template>
+                  <template slot="menuRight">
+                      <el-button type="text" @click="$refs.viewMore.openDialog(form,form.finInvoicesItemsList)">查看更多</el-button>
+                  </template>
                 </avue-crud>
               </trade-card>
             </el-col>
@@ -366,6 +369,7 @@
 
     <!--报表组件-->
     <reportContainer ref="reportContainer"></reportContainer>
+    <view-more ref="viewMore"></view-more>
   </div>
 </template>
 
@@ -393,8 +397,9 @@ import reportContainer from "@/views/iosBasicData/report-container/report-contai
 import { getList as getreportsList, reportsGetReportData } from "@/api/iosBasicData/reports";
 import dicSelect from "@/components/dicSelect/main";
 import { getToken } from "@/util/auth";
+import viewMore from "./components/viewMore.vue";
 export default {
-  components: { reportContainer, reportformsList, reports, SearchQuery, expand, finstlbillsitems, dicSelect },
+  components: { reportContainer, reportformsList, reports, SearchQuery, expand, finstlbillsitems, dicSelect,viewMore },
   props: {
     detailData: {
       type: Object
@@ -926,6 +931,12 @@ export default {
             prop: "exrate",
             width: 60,
             overHidden: true
+          },
+          {
+            label: "备注",
+            prop: "remarks",
+            width: 100,
+            overHidden: true
           }
         ]
       },

src/views/iosBasicData/financialManagement/finstlbills/components/viewMore.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-dialog title="费用信息" :visible.sync="dialogVisible" append-to-body width="50%" :before-close="handleClose">
+    <el-dialog title="费用信息" :visible.sync="dialogVisible" top="5vh" append-to-body width="80%" :before-close="handleClose">
       <span style="font-size:18px;font-weight:600;margin-left:10px;">
         <span style="color: #67C23A;margin-right: 10px;"> 应收本币:{{ form.amountDr || 0 }}元 </span>
         <span style="color: #E6A23C;margin-right: 10px;"> 应付本币:{{ form.amountCr || 0 }}元 </span>
@@ -15,19 +15,16 @@
         :page.sync="page"
         @size-change="sizeChange"
         @current-change="currentChange"
-        @selection-change="selectionChange"
       >
       </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">拆 单</el-button>
+        <el-button @click="dialogVisible = false" size="mini">关 闭</el-button>
       </span>
     </el-dialog>
   </div>
 </template>
 
 <script>
-import { selectComplyWithData, splitBoxNumber } from "@/api/iosBasicData/bills";
 export default {
   props: {},
   data() {
@@ -51,7 +48,6 @@ export default {
         refreshBtn: false,
         header: false,
         index: true,
-        selection: true,
         align: "center",
         column: [
           {
@@ -179,6 +175,7 @@ export default {
       };
       this.form = row;
       this.allData = list;
+       this.page.total = list.length;
       this.getList();
     },
     sizeChange(val) {

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

@@ -91,8 +91,8 @@
                       <span style="color: #E6A23C;margin-right: 10px;"> 应付外币:{{ form.amountCrUsd || 0 }}元 </span>
                     </span>
                   </template>
-                  <template slot="page">
-                    <el-button type="text" @click="viewMore">查看更多</el-button>
+                  <template slot="menuRight">
+                      <el-button type="text" @click="$refs.viewMore.openDialog(form,form.finStlBillsItemsList)">查看更多</el-button>
                   </template>
                 </avue-crud>
               </trade-card>
@@ -839,6 +839,12 @@ export default {
             prop: "exrate",
             width: 60,
             overHidden: true
+          },
+          {
+            label: "备注",
+            prop: "remarks",
+            width: 100,
+            overHidden: true
           }
         ]
       },

src/views/ow/owPut/detailsPage.vue

@@ -2276,15 +2276,15 @@ export default {
             controls: false,
             overHidden: true
           },
-          {
-            label: "启用日期",
-            prop: "activationDate",
-            // cell: true,
-            overHidden: true,
-            type: "date",
-            format: "yyyy-MM-dd",
-            valueFormat: "yyyy-MM-dd HH:mm:ss"
-          },
+          // {
+          //   label: "启用日期",
+          //   prop: "activationDate",
+          //   // cell: true,
+          //   overHidden: true,
+          //   type: "date",
+          //   format: "yyyy-MM-dd",
+          //   valueFormat: "yyyy-MM-dd HH:mm:ss"
+          // },
           {
             label: "代理名称",
             prop: "agentName",
@@ -4884,11 +4884,20 @@ export default {
           id: this.form.id,
           feeCenterItemsList: this.selecPickList
         };
+        const loading = this.$loading({
+          lock: true,
+          text: "加载中",
+          spinner: "el-icon-loading",
+          background: "rgba(255,255,255,0.7)"
+        });
         mergeGenerateCost(obj).then(res => {
           this.$message.success("操作成功");
           this.getDetail(this.form.id);
           // this.getPick();
-        });
+        })
+          .catch(() => {
+            loading.close();
+          });
       }
       if (name == "撤销生成") {
         for (let item of this.selecPickList) {
@@ -4935,11 +4944,20 @@ export default {
           id: this.form.id,
           feeCenterItemsList: this.selecPerList
         };
+        const loading = this.$loading({
+          lock: true,
+          text: "加载中",
+          spinner: "el-icon-loading",
+          background: "rgba(255,255,255,0.7)"
+        });
         mergeGenerateCost(obj).then(res => {
           this.$message.success("操作成功");
           this.getDetail(this.form.id);
           // this.getPer();
-        });
+        })
+          .catch(() => {
+            loading.close();
+          });
       }
       if (name == "撤销生成2") {
         for (let item of this.selecPickList) {

src/views/ow/owTask/detailsPage.vue

@@ -349,7 +349,7 @@
                 <el-button type="primary" size="small" :disabled="editDisabled" @click="allClick('批量修改POD场站')">
                   批量修改POD场站
                 </el-button>
-                 <el-button type="primary" size="small" :disabled="editDisabled||selectionList.length==0" @click="allClick('批量修改放箱号')">
+                <el-button type="primary" size="small" :disabled="editDisabled || selectionList.length == 0" @click="allClick('批量修改放箱号')">
                   批量修改放箱号
                 </el-button>
                 <el-button type="success" size="small" :disabled="!form.id || form.tradingBoxItemsList.length == 0" @click="allClick('客户还箱')"
@@ -361,8 +361,7 @@
                   @click="$refs.print.openDialog()">打印报表
                 </el-button> -->
                 <el-tag style="margin-right: 8px;">
-                  空箱进场:{{ form.tradingBoxItemsList.filter(item => item.status != "作废").length }}
-                  {{ form.tradingBoxItemsList.filter(item => item.status != "作废").length || 0 }}
+                  空箱进场: {{ form.tradingBoxItemsList.filter(item => item.status != "作废").length || 0 }}
                 </el-tag>
                 <el-tag type="success" style="margin-right: 8px;">
                   空箱出场:
@@ -1399,7 +1398,7 @@
     ></fee-modify>
     <fee-modify-view ref="feeModifyView" :form="form"></fee-modify-view>
     <change-cn ref="changeCn" @getUpdate="getDetail(form.id)"></change-cn>
- </div>
+  </div>
 </template>
 
 <script>
@@ -2608,15 +2607,15 @@ export default {
             overHidden: true,
             width: 100
           },
-          {
-            label: "启用日期",
-            prop: "activationDate",
-            // cell: true,
-            overHidden: true,
-            type: "date",
-            format: "yyyy-MM-dd",
-            valueFormat: "yyyy-MM-dd HH:mm:ss"
-          },
+          // {
+          //   label: "启用日期",
+          //   prop: "activationDate",
+          //   // cell: true,
+          //   overHidden: true,
+          //   type: "date",
+          //   format: "yyyy-MM-dd",
+          //   valueFormat: "yyyy-MM-dd HH:mm:ss"
+          // },
           {
             label: "代理名称",
             prop: "agentName",
@@ -5461,8 +5460,13 @@ export default {
         };
         this.podDialog = true;
       }
-      if(name=='批量修改放箱号'){
-                this.$refs.changeCn.openDialog(this.form,this.selectionList)
+      if (name == "批量修改放箱号") {
+        for(let item of this.selectionList){
+          if(item.status!='待使用'){
+            return this.$message.error("请选择箱状态为待使用的数据");
+          }
+        }
+        this.$refs.changeCn.openDialog(this.form, this.selectionList);
       }
       if (name == "合并生成") {
         for (let item of this.selecPickList) {
@@ -5474,11 +5478,21 @@ export default {
           id: this.form.id,
           feeCenterItemsList: this.selecPickList
         };
-        mergeGenerateCost(obj).then(res => {
-          this.$message.success("操作成功");
-          this.getDetail(this.form.id);
-          // this.getPick();
+        const loading = this.$loading({
+          lock: true,
+          text: "加载中",
+          spinner: "el-icon-loading",
+          background: "rgba(255,255,255,0.7)"
         });
+        mergeGenerateCost(obj)
+          .then(res => {
+            this.$message.success("操作成功");
+            this.getDetail(this.form.id);
+            // this.getPick();
+          })
+          .catch(() => {
+            loading.close();
+          });
       }
       if (name == "撤销生成") {
         for (let item of this.selecPickList) {
@@ -5525,11 +5539,21 @@ export default {
           id: this.form.id,
           feeCenterItemsList: this.selecPerList
         };
-        mergeGenerateCost(obj).then(res => {
-          this.$message.success("操作成功");
-          this.getDetail(this.form.id);
-          // this.getPer();
+        const loading = this.$loading({
+          lock: true,
+          text: "加载中",
+          spinner: "el-icon-loading",
+          background: "rgba(255,255,255,0.7)"
         });
+        mergeGenerateCost(obj)
+          .then(res => {
+            this.$message.success("操作成功");
+            this.getDetail(this.form.id);
+            // this.getPer();
+          })
+          .catch(() => {
+            loading.close();
+          });
       }
       if (name == "撤销生成2") {
         for (let item of this.selecPerList) {