Merge branch 'master' into qinruibai

src/views/businessManagement/deliveryNotice/configuration/customerContact.json

@@ -58,6 +58,19 @@
         }
       ]
     },{
+      "label": "大字",
+      "prop": "code",
+      "index": 2,
+      "width":100,
+      "cell": false,
+      "rules": [
+        {
+          "required": false,
+          "message": "请输入大字",
+          "trigger": "blur"
+        }
+      ]
+    },{
       "label": "规格编码",
       "prop": "typeno",
       "index": 3,

src/views/businessManagement/salesOrder/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <basic-container>
+  <basic-container>1
     <avue-crud :option="option"
                :data="dataList"
                ref="crud"
@@ -11,6 +11,7 @@
                :before-close="beforeClose"
                :search.sync="search"
                @row-save="rowSave"
+               @saveColumn="saveColumn"
                @search-change="searchChange"
                @search-reset="searchReset"
                @selection-change="selectionChange"
@@ -109,6 +110,10 @@ export default {
         done()
       })
     },
+    //列保存触发
+    saveColumn(data){
+      console.log(data.objectOption)
+    },
     //查询全部
     initData() {
       customerList().then(res => {

src/views/workManagement/service-items/project.vue

@@ -52,7 +52,7 @@ export default {
         menuWidth:'140',
         column: [
           {
-            label: "类别名称",
+            label: "项目名称",
             prop: "name",
             search: true,
             rules: [
@@ -61,10 +61,11 @@ export default {
                 message: "请输入类别名称",
                 trigger: "blur"
               }
-            ]
+            ],
+            overHidden:true
           },
           {
-            label: "排序",
+            label: "收费建议",
             prop: "sort",
             rules: [
               {
@@ -72,26 +73,65 @@ export default {
                 message: "请输入排序",
                 trigger: "blur"
               }
-            ]
+            ],
+            overHidden:true
           },
           {
-            label: "状态",
+            label: "收费金额",
             prop: "status",
             search: true,
             addDisplay: false,
-            editDisplay: false
+            editDisplay: false,
+            overHidden:true
+          },
+          {
+            label: "计价单位",
+            prop: "user",
+            addDisplay: false,
+            editDisplay: false,
+            overHidden:true
+          },
+          {
+            label: "备注",
+            prop: "date",
+            addDisplay: false,
+            editDisplay: false,
+            overHidden:true
+          },
+          {
+            label: "频率",
+            prop: "date",
+            addDisplay: false,
+            editDisplay: false,
+            overHidden:true
+          },
+          {
+            label: "保质期",
+            prop: "date",
+            addDisplay: false,
+            editDisplay: false,
+            overHidden:true
+          },
+          {
+            label: "标准工时",
+            prop: "date",
+            addDisplay: false,
+            editDisplay: false,
+            overHidden:true
           },
           {
             label: "创建人",
             prop: "user",
             addDisplay: false,
-            editDisplay: false
+            editDisplay: false,
+            overHidden:true
           },
           {
             label: "创建时间",
             prop: "date",
             addDisplay: false,
-            editDisplay: false
+            editDisplay: false,
+            overHidden:true
           }
         ]
       },
@@ -135,10 +175,10 @@ export default {
         this.loading = false;
         this.data = [
           {
-            name: "类别名称1",
-            sort: "1",
-            status: "状态",
-            user: "用户名",
+            name: "公司设立",
+            sort: "2300",
+            status: "2300",
+            user: "次",
             date: "2021-07-08"
           }
         ];

src/views/workManagement/service-items/type.vue

@@ -136,6 +136,8 @@ export default {
     cellDblclick(row, column, cell, event) {
       console.log(row, column, cell, event);
       this.$refs.crud.rowEdit(row);
+    },
+    saveColumn(){
     }
   }
 };