浏览代码

运维修改

lichao 3 年之前
父节点
当前提交
fca53c6e7d

+ 9 - 1
src/enums/column-name.js

@@ -162,7 +162,15 @@ const columnName = [{
   {
     code: 52,
     name: '产品属性Label设置'
-  }
+  },
+  {
+    code: 53,
+    name: '溢付款主表'
+  },
+  {
+    code: 54,
+    name: '积分主表'
+  },
 
 ]
 export const getColumnName = (key) => {

+ 27 - 4
src/views/maintenance/integral/index.vue

@@ -15,6 +15,7 @@
         @on-load="onLoad"
         :table-loading="loading"
         @saveColumn="saveColumn"
+        @resetColumn="resetColumn"
         @expand-change="expandChange"
       >
         <template slot-scope="scope" slot="expand">
@@ -32,7 +33,7 @@
               </template>
             </el-table-column>
             <el-table-column  label="创建时间" prop="createTime" align="center" show-overflow-tooltip width="200"></el-table-column>
-            <el-table-column  label="创建人" prop="createUser" align="center" show-overflow-tooltip width="200"></el-table-column>
+            <el-table-column  label="创建人" prop="createUserName" align="center" show-overflow-tooltip width="200"></el-table-column>
             <el-table-column  label="备注" prop="remarks" align="center" show-overflow-tooltip width="200"></el-table-column>
           </el-table>
         </template>
@@ -70,8 +71,8 @@ export default {
       loading: false,
     }
   },
-  created() {
-    this.option = option
+  async created() {
+    this.option = await this.getColumnData(this.getColumnName(54), option);
     let i = 0;
     this.option.column.forEach(item => {
       if (item.search) i++
@@ -128,7 +129,29 @@ export default {
         })
       }
     },
-    async saveColumn() {},
+    async saveColumn() {
+      const inSave = await this.saveColumnData(
+        this.getColumnName(54),
+        this.option
+      );
+      if (inSave) {
+        this.$message.success("保存成功");
+        //关闭窗口
+        this.$refs.crud.$refs.dialogColumn.columnBox = false;
+      }
+    },
+    async resetColumn() {
+      const inSave = await this.delColumnData(
+        this.getColumnName(54),
+        option
+      );
+      if (inSave) {
+        this.$message.success("重置成功");
+        this.option = option;
+        //关闭窗口
+        this.$refs.crud.$refs.dialogColumn.columnBox = false;
+      }
+    },
   },
 }
 </script>

+ 28 - 4
src/views/maintenance/overpayment/index.vue

@@ -15,6 +15,7 @@
         @on-load="onLoad"
         :table-loading="loading"
         @saveColumn="saveColumn"
+        @resetColumn="resetColumn"
         @expand-change="expandChange"
       >
         <template slot-scope="scope" slot="expand">
@@ -28,7 +29,7 @@
               </template>
             </el-table-column>
             <el-table-column  label="创建时间" prop="createTime" align="center" show-overflow-tooltip width="200"></el-table-column>
-            <el-table-column  label="创建人" prop="createUser" align="center" show-overflow-tooltip width="200"></el-table-column>
+            <el-table-column  label="创建人" prop="createUserName" align="center" show-overflow-tooltip width="200"></el-table-column>
           </el-table>
         </template>
         <template slot="corpIdSearch">
@@ -65,8 +66,9 @@ export default {
       loading: false,
     }
   },
-  created() {
-    this.option = option
+  async created() {
+    // this.option = option
+    this.option = await this.getColumnData(this.getColumnName(53), option);
     let i = 0;
     this.option.column.forEach(item => {
       if (item.search) i++
@@ -123,7 +125,29 @@ export default {
         })
       }
     },
-    async saveColumn() {},
+    async saveColumn() {
+      const inSave = await this.saveColumnData(
+        this.getColumnName(53),
+        this.option
+      );
+      if (inSave) {
+        this.$message.success("保存成功");
+        //关闭窗口
+        this.$refs.crud.$refs.dialogColumn.columnBox = false;
+      }
+    },
+    async resetColumn() {
+      const inSave = await this.delColumnData(
+        this.getColumnName(53),
+        option
+      );
+      if (inSave) {
+        this.$message.success("重置成功");
+        this.option = option;
+        //关闭窗口
+        this.$refs.crud.$refs.dialogColumn.columnBox = false;
+      }
+    },
   },
 }
 </script>

+ 12 - 0
src/views/maintenance/salesPolicy/configuration/BuyFree.json

@@ -25,6 +25,7 @@
       "index": 1,
       "width":100,
       "cell": true,
+      "overHidden": true,
       "rules": [
         {
           "required": true,
@@ -38,6 +39,7 @@
       "index": 1,
       "width":100,
       "cell": true,
+      "overHidden": true,
       "rules": [
         {
           "required": true,
@@ -51,6 +53,7 @@
       "index": 2,
       "width":100,
       "cell": true,
+      "overHidden": true,
       "rules": [
         {
           "required": false,
@@ -64,6 +67,7 @@
       "index": 3,
       "width":100,
       "cell": true,
+      "overHidden": true,
       "rules": [
         {
           "required": false,
@@ -77,6 +81,7 @@
       "index": 3,
       "width":100,
       "cell": true,
+      "overHidden": true,
       "rules": [
         {
           "required": false,
@@ -91,6 +96,7 @@
       "width":100,
       "cell": false,
       "slot": true,
+      "overHidden": true,
       "rules": [
         {
           "required": false,
@@ -104,6 +110,7 @@
       "index": 4,
       "width":100,
       "cell": true,
+      "overHidden": true,
       "rules": [
         {
           "required": false,
@@ -117,6 +124,7 @@
       "index": 5,
       "width":100,
       "cell": true,
+      "overHidden": true,
       "rules": [
         {
           "required": false,
@@ -130,6 +138,7 @@
       "index": 5,
       "width":100,
       "cell": true,
+      "overHidden": true,
       "rules": [
         {
           "required": false,
@@ -143,6 +152,7 @@
       "index": 6,
       "width":100,
       "cell": true,
+      "overHidden": true,
       "rules": [
         {
           "required": false,
@@ -156,6 +166,7 @@
       "index": 6,
       "width":100,
       "cell": false,
+      "overHidden": true,
       "rules": [
         {
           "required": false,
@@ -169,6 +180,7 @@
       "index": 6,
       "width":100,
       "cell": false,
+      "overHidden": true,
       "rules": [
         {
           "required": false,

+ 25 - 11
src/views/maintenance/salesPolicy/configuration/commodity.json

@@ -20,6 +20,7 @@
       "prop": "code",
       "search": true,
       "width": 100,
+      "overHidden": true,
       "rules": [
         {
           "required": true,
@@ -34,6 +35,7 @@
       "slot": true,
       "search": true,
       "width": 100,
+      "overHidden": true,
       "rules": [
         {
           "required": true,
@@ -51,6 +53,7 @@
       "addDisabled": false,
       "multiple": true,
       "width": 100,
+      "overHidden": true,
       "props": {
         "label": "title"
       },
@@ -64,55 +67,64 @@
       "label": "规格编码",
       "prop": "typeno",
       "search": false,
-      "width": 100
+      "width": 100,
+      "overHidden": true
     },
     {
       "label": "品牌",
       "prop": "brand",
       "slot": true,
-      "width": 100
+      "width": 100,
+      "overHidden": true
     },
     {
       "label": "花纹",
       "prop": "brandItem",
       "slot": true,
-      "width": 100
+      "width": 100,
+      "overHidden": true
     },
     {
       "label": "规格尺寸",
       "prop": "specs",
       "slot": true,
-      "width": 100
+      "width": 100,
+      "overHidden": true
     },
     {
       "label": "产品类别",
       "prop": "category",
       "slot": true,
-      "width": 100
+      "width": 100,
+      "overHidden": true
     },
     {
       "label": "产品分类",
       "prop": "categoryitem",
       "slot": true,
-      "width": 100
+      "width": 100,
+      "overHidden": true
     },
     {
       "label": "供应商",
       "prop": "corpName",
       "slot": true,
-      "width": 100
+      "width": 100,
+      "overHidden": true
     },
     {
       "label": "计量单位",
       "prop": "unit",
       "slot": true,
-      "width": 100
+      "width": 100,
+      "overHidden": true
     },
     {
       "label": "包装单位",
       "prop": "packgeunit",
       "slot": true,
-      "width": 100
+      "width": 100,
+      "overHidden": true
     },
     {
       "label": "商品图片",
@@ -127,13 +139,15 @@
       },
       "hide": true,
       "span": 24,
-      "width": 100
+      "width": 100,
+      "overHidden": true
     },
     {
       "label": "备注",
       "prop": "remarks",
       "slot": true,
-      "width": 100
+      "width": 100,
+      "overHidden": true
     }
   ]
 }

+ 11 - 0
src/views/maintenance/salesPolicy/configuration/customerContact.json

@@ -25,6 +25,7 @@
       "index": 1,
       "width":100,
       "cell": true,
+      "overHidden": true,
       "rules": [
         {
           "required": true,
@@ -38,6 +39,7 @@
       "index": 1,
       "width":100,
       "cell": true,
+      "overHidden": true,
       "rules": [
         {
           "required": true,
@@ -51,6 +53,7 @@
       "index": 2,
       "width":100,
       "cell": true,
+      "overHidden": true,
       "rules": [
         {
           "required": false,
@@ -64,6 +67,7 @@
       "index": 3,
       "width":100,
       "cell": true,
+      "overHidden": true,
       "rules": [
         {
           "required": false,
@@ -77,6 +81,7 @@
       "index": 3,
       "width":100,
       "cell": true,
+      "overHidden": true,
       "rules": [
         {
           "required": false,
@@ -91,6 +96,7 @@
       "width":100,
       "cell": false,
       "slot": true,
+      "overHidden": true,
       "rules": [
         {
           "required": false,
@@ -104,6 +110,7 @@
       "index": 4,
       "width":100,
       "cell": true,
+      "overHidden": true,
       "rules": [
         {
           "required": false,
@@ -117,6 +124,7 @@
       "index": 5,
       "width":100,
       "cell": true,
+      "overHidden": true,
       "rules": [
         {
           "required": false,
@@ -130,6 +138,7 @@
       "index": 6,
       "width":100,
       "cell": true,
+      "overHidden": true,
       "rules": [
         {
           "required": false,
@@ -143,6 +152,7 @@
       "index": 6,
       "width":100,
       "cell": false,
+      "overHidden": true,
       "rules": [
         {
           "required": false,
@@ -156,6 +166,7 @@
       "index": 6,
       "width":100,
       "cell": false,
+      "overHidden": true,
       "rules": [
         {
           "required": false,