caojunjie 3 年之前
父节点
当前提交
f0f27fed75

+ 7 - 7
src/enums/column-name.js

@@ -723,12 +723,6 @@ const columnName = [{
   },{
     code: 176.1,
     name: '作业费协议-明细列表'
-  },{
-    code: 177,
-    name: '统计分析-出入库统计'
-  },{
-    code: 178,
-    name: '统计分析-利润总账(仓储)'
   },
   {
     code: 177,
@@ -745,7 +739,13 @@ const columnName = [{
   {
     code: 179,
     name: '报表分析-付款总账'
-  }
+  },{
+    code: 180,
+    name: '统计分析-出入库统计'
+  },{
+    code: 181,
+    name: '统计分析-利润总账(仓储)'
+  },
 ]
 export const getColumnName = (key) => {
   for (let index = 0; index < columnName.length; index++) {

+ 3 - 3
src/views/statisticAnalysis/profitGeneralLedger/index.vue

@@ -6,8 +6,8 @@
           :option="option"
           :data="receivableList"
           :search.sync="queryParams"
-          @resetColumn="resetColumn('crud','option','optionList',178)"
-          @saveColumn="saveColumn('crud','option','optionList',178)"
+          @resetColumn="resetColumn('crud','option','optionList',181)"
+          @saveColumn="saveColumn('crud','option','optionList',181)"
       >
         <template slot="menuLeft">
           <el-button
@@ -902,7 +902,7 @@ export default {
     },
   },
   async created() {
-    this.option = await this.getColumnData(this.getColumnName(178), this.optionList);
+    this.option = await this.getColumnData(this.getColumnName(181), this.optionList);
     this.$set(this.queryParams, 'groupBy', 1)
     this.sysType = Cookies.get("sysType");
     this.setRowList = this.tableDate;

+ 3 - 3
src/views/statisticAnalysis/statistics/index.vue

@@ -5,8 +5,8 @@
           ref="crud"
           :option="option"
           :data="whgenlegList"
-          @resetColumn="resetColumn('crud','option','optionList',177)"
-          @saveColumn="saveColumn('crud','option','optionList',177)">
+          @resetColumn="resetColumn('crud','option','optionList',180)"
+          @saveColumn="saveColumn('crud','option','optionList',180)">
         <template slot="menuLeft">
           <el-button
               type="warning"
@@ -843,7 +843,7 @@ export default {
     };
   },
   async created() {
-    this.option = await this.getColumnData(this.getColumnName(175), this.optionList);
+    this.option = await this.getColumnData(this.getColumnName(180), this.optionList);
     // let date = new Date();
     // let year = parseInt(date.getFullYear())
     // let month = parseInt(date.getMonth() + 1)