Ver Fonte

基础资料固定高度

qinbai há 3 anos atrás
pai
commit
bb123b616a
37 ficheiros alterados com 223 adições e 33 exclusões
  1. 3 1
      src/views/basicData/basicFeesDesc/configuration/mainList.json
  2. 13 1
      src/views/basicData/basicFeesDesc/index.vue
  3. 3 0
      src/views/basicData/basicFeesType/index.vue
  4. 4 1
      src/views/basicData/basicStorageDesc/configuration/mainList.json
  5. 13 1
      src/views/basicData/basicStorageDesc/index.vue
  6. 0 3
      src/views/basicData/basicStorageType/configuration/mainList.json
  7. 3 0
      src/views/basicData/basicStorageType/index.vue
  8. 3 1
      src/views/basicData/commodityCategory/index.vue
  9. 18 7
      src/views/basicData/commodityType/configuration/mainList.json
  10. 1 0
      src/views/basicData/commodityType/index.vue
  11. 1 1
      src/views/basicData/container/index.vue
  12. 1 1
      src/views/basicData/container/type.vue
  13. 5 1
      src/views/basicData/customerCategory/index.vue
  14. 4 1
      src/views/basicData/customerInformation/configuration/mainList.json
  15. 12 0
      src/views/basicData/customerInformation/index.vue
  16. 4 1
      src/views/basicData/customerManagement/companyMaterial/configuration/mainList.json
  17. 12 0
      src/views/basicData/customerManagement/companyMaterial/index.vue
  18. 5 1
      src/views/basicData/customerManagement/companyType/index.vue
  19. 4 1
      src/views/basicData/customerManagement/supplierMaterial/configuration/mainList.json
  20. 12 0
      src/views/basicData/customerManagement/supplierMaterial/index.vue
  21. 5 1
      src/views/basicData/customerManagement/supplierType/index.vue
  22. 1 1
      src/views/basicData/portinformation/index.vue
  23. 1 1
      src/views/basicData/portinformation/type.vue
  24. 3 0
      src/views/basicData/productInformation/index.vue
  25. 1 1
      src/views/purchase/contract/index.vue
  26. 6 0
      src/views/statisticAnalysis/royalty/config/mainList.json
  27. 1 2
      src/views/statisticAnalysis/royalty/index.vue
  28. 1 0
      src/views/workManagement/main-items/configuration/mainList.json
  29. 17 1
      src/views/workManagement/main-items/list.vue
  30. 1 0
      src/views/workManagement/performanceAnalysis/config/mainList.json
  31. 17 1
      src/views/workManagement/performanceAnalysis/index.vue
  32. 1 0
      src/views/workManagement/receipt/configuration/statisticalList.json
  33. 16 0
      src/views/workManagement/receipt/statisticalList.vue
  34. 12 0
      src/views/workManagement/service-items/configuration/projectOption.json
  35. 2 1
      src/views/workManagement/service-items/configuration/typeOption.json
  36. 9 1
      src/views/workManagement/service-items/project.vue
  37. 8 1
      src/views/workManagement/service-items/type.vue

+ 3 - 1
src/views/basicData/basicFeesDesc/configuration/mainList.json

@@ -9,8 +9,10 @@
   "simplePage": true,
   "searchMenuPosition": "right",
   "searchShow": true,
-  "searchMenuSpan": 6,
+  "searchMenuSpan": 8,
   "searchSpan": 8,
+  "searchIcon": true,
+  "searchIndex": 2,
   "tree": true,
   "selection": true,
   "viewBtn": true,

+ 13 - 1
src/views/basicData/basicFeesDesc/index.vue

@@ -28,6 +28,7 @@
                    @size-change="sizeChange"
                    @refresh-change="refreshChange"
                    @on-load="onLoad"
+                   @search-criteria-switch="searchCriteriaSwitch"
                    @tree-load="treeLoad">
         </avue-crud>
       </basic-container>
@@ -206,7 +207,18 @@ export default {
       customerList(queryParams).then(res => {
         this.dataList = res.data.data.records
         this.page.total = res.data.data.total
-      })
+        if (this.page.total || this.page.total === 0) {
+          this.option.height = window.innerHeight - 200;
+        }
+      });
+    },
+    searchCriteriaSwitch(type){
+      if (type){
+        this.option.height = this.option.height - 50
+      }else {
+        this.option.height = this.option.height + 50
+      }
+      this.$refs.crud.getTableHeight()
     },
     //树桩列点击展开触发
     treeLoad(tree, treeNode, resolve) {

+ 3 - 0
src/views/basicData/basicFeesType/index.vue

@@ -184,6 +184,9 @@ export default {
       customerList(values).then(res => {
         this.dataList = res.data.data.records
         this.page.total = res.data.data.total
+        if (this.page.total || this.page.total === 0) {
+          this.option.height = window.innerHeight - 200;
+        }
       }).finally(()=>{
         this.loading = false;
       })

+ 4 - 1
src/views/basicData/basicStorageDesc/configuration/mainList.json

@@ -8,8 +8,11 @@
   "tip": false,
   "simplePage": true,
   "searchShow": true,
-  "searchMenuSpan": 6,
   "tree": true,
+  "searchMenuSpan": 16,
+  "searchSpan": 8,
+  "searchIcon": true,
+  "searchIndex": 2,
   "selection": true,
   "viewBtn": true,
   "menuWidth": 300,

+ 13 - 1
src/views/basicData/basicStorageDesc/index.vue

@@ -28,6 +28,7 @@
                    @size-change="sizeChange"
                    @refresh-change="refreshChange"
                    @on-load="onLoad"
+                   @search-criteria-switch="searchCriteriaSwitch"
                    @tree-load="treeLoad">
         </avue-crud>
       </basic-container>
@@ -210,7 +211,18 @@ export default {
       customerList(queryParams).then(res => {
         this.dataList = res.data.data.records
         this.page.total = res.data.data.total
-      })
+        if (this.page.total || this.page.total === 0) {
+          this.option.height = window.innerHeight - 200;
+        }
+      });
+    },
+    searchCriteriaSwitch(type){
+      if (type){
+        this.option.height = this.option.height - 90
+      }else {
+        this.option.height = this.option.height + 90
+      }
+      this.$refs.crud.getTableHeight()
     },
     //树桩列点击展开触发
     treeLoad(tree, treeNode, resolve) {

+ 0 - 3
src/views/basicData/basicStorageType/configuration/mainList.json

@@ -80,7 +80,6 @@
     {
       "label": "联系人",
       "prop": "attn",
-      "search": true,
       "overHidden": true,
       "index": 4,
       "width": 150,
@@ -95,7 +94,6 @@
     {
       "label": "电话",
       "prop": "tel",
-      "search": true,
       "index": 5,
       "overHidden": true,
       "width": 150,
@@ -110,7 +108,6 @@
     {
       "label": "库容",
       "prop": "storageCapacity",
-      "search": true,
       "overHidden": true,
       "index": 6,
       "width": 150,

+ 3 - 0
src/views/basicData/basicStorageType/index.vue

@@ -163,6 +163,9 @@ export default {
       customerList(queryParams).then(res => {
         this.dataList = res.data.data.records
         this.page.total = res.data.data.total
+        if (this.page.total || this.page.total === 0) {
+          this.option.height = window.innerHeight - 200;
+        }
       })
     },
     //树桩列点击展开触发

+ 3 - 1
src/views/basicData/commodityCategory/index.vue

@@ -169,7 +169,9 @@ export default {
       customerList(values).then(res => {
         this.dataList = res.data.data.records
         this.page.total = res.data.data.total
-        console.log()
+        if (this.page.total || this.page.total === 0) {
+          this.option.height = window.innerHeight - 200;
+        }
       })
     },
     //树桩列点击展开触发

+ 18 - 7
src/views/basicData/commodityType/configuration/mainList.json

@@ -19,6 +19,7 @@
       "prop": "code",
       "search": true,
       "width": 100,
+      "overHidden": true,
       "rules": [
         {
           "required": true,
@@ -31,6 +32,7 @@
       "label": "商品名称",
       "prop": "cname",
       "slot": true,
+      "overHidden": true,
       "width": 100,
       "rules": [
         {
@@ -46,6 +48,7 @@
       "dicData": [],
       "type": "tree",
       "hide": true,
+      "overHidden": true,
       "addDisabled": false,
       "multiple": true,
       "props": {
@@ -60,32 +63,38 @@
     {
       "label": "规格编码",
       "prop": "typeno",
-      "search": true
+      "search": true,
+      "overHidden": true
     },
     {
       "label": "品牌",
       "prop": "brand",
-      "slot": true
+      "slot": true,
+      "overHidden": true
     },
     {
       "label": "商品类别",
       "prop": "category",
-      "slot": true
+      "slot": true,
+      "overHidden": true
     },
     {
       "label": "供应商",
       "prop": "corpName",
-      "slot": true
+      "slot": true,
+      "overHidden": true
     },
     {
       "label": "计量单位",
       "prop": "unit",
-      "slot": true
+      "slot": true,
+      "overHidden": true
     },
     {
       "label": "包装单位",
       "prop": "packgeunit",
-      "slot": true
+      "slot": true,
+      "overHidden": true
     },
     {
       "label": "商品图片",
@@ -98,13 +107,15 @@
         "res": "data",
         "url": "link"
       },
+      "overHidden": true,
       "hide": true,
       "span": 24
     },
     {
       "label": "备注",
       "prop": "remarks",
-      "slot": true
+      "slot": true,
+      "overHidden": true
     }
   ]
 }

+ 1 - 0
src/views/basicData/commodityType/index.vue

@@ -385,6 +385,7 @@ export default {
     },
   },
   mounted() {
+    option.height = window.innerHeight - 230 ;
     // 非租户模式默认加载管理组数据
     if (!website.tenantMode) {
       this.initData(website.tenantId);

+ 1 - 1
src/views/basicData/container/index.vue

@@ -111,7 +111,7 @@
       reportDialog
     },
     mounted() {
-      option.height = window.innerHeight - 350 ;
+      option.height = window.innerHeight - 240 ;
       //查询服务类别字典项
       getTypeTree().then(res => {
         this.findObject(this.tableOption.column, "typeId").dicData = res.data.data;

+ 1 - 1
src/views/basicData/container/type.vue

@@ -55,7 +55,7 @@
 
     },
     mounted() {
-      option.height = window.innerHeight - 310 ;
+      option.height = window.innerHeight - 200 ;
     },
     methods: {
       onLoad(page, params = {}) {

+ 5 - 1
src/views/basicData/customerCategory/index.vue

@@ -200,8 +200,12 @@ export default {
       customerList(values).then(res => {
         this.dataList = res.data.data.records;
         this.page.total = res.data.data.total;
+        if (this.page.total || this.page.total === 0) {
+          this.option.height = window.innerHeight - 200;
+        }
+      }).finally(()=>{
         this.loading = false;
-      });
+      })
     },
     //树桩列点击展开触发
     treeLoad(tree, treeNode, resolve) {

+ 4 - 1
src/views/basicData/customerInformation/configuration/mainList.json

@@ -5,7 +5,7 @@
   "stripe": true,
   "simplePage": true,
   "searchShow": true,
-  "searchMenuSpan": 24,
+  "searchMenuSpan": 8,
   "dialogWidth": "60%",
   "tree": true,
   "border": true,
@@ -15,6 +15,9 @@
   "editBtn": false,
   "delBtn": false,
   "menuWidth": 220,
+  "searchIcon": true,
+  "searchIndex": 2,
+  "searchSpan": 8,
   "dialogClickModal": false,
   "column": [{
       "label": "编码",

+ 12 - 0
src/views/basicData/customerInformation/index.vue

@@ -34,6 +34,7 @@
           @refresh-change="refreshChange"
           @on-load="onLoad"
           @tree-load="treeLoad"
+          @search-criteria-switch="searchCriteriaSwitch"
         >
           <template slot="menuLeft">
             <el-button
@@ -368,8 +369,19 @@ export default {
       customerList(queryParams).then(res => {
         this.dataList = res.data.data.records;
         this.page.total = res.data.data.total;
+        if (this.page.total || this.page.total === 0) {
+          this.option.height = window.innerHeight - 200;
+        }
       });
     },
+    searchCriteriaSwitch(type){
+      if (type){
+        this.option.height = this.option.height - 90
+      }else {
+        this.option.height = this.option.height + 90
+      }
+      this.$refs.crud.getTableHeight()
+    },
     //树桩列点击展开触发
     treeLoad(tree, treeNode, resolve) {
       const parentId = tree.id;

+ 4 - 1
src/views/basicData/customerManagement/companyMaterial/configuration/mainList.json

@@ -5,7 +5,7 @@
   "stripe": true,
   "simplePage": true,
   "searchShow": true,
-  "searchMenuSpan": 24,
+  "searchMenuSpan": 8,
   "dialogWidth": "60%",
   "tree": true,
   "border": true,
@@ -14,6 +14,9 @@
   "viewBtn": false,
   "editBtn": false,
   "delBtn": false,
+  "searchIcon": true,
+  "searchIndex": 2,
+  "searchSpan": 8,
   "menuWidth": 220,
   "dialogClickModal": false,
   "column": [{

+ 12 - 0
src/views/basicData/customerManagement/companyMaterial/index.vue

@@ -33,6 +33,7 @@
           @size-change="sizeChange"
           @refresh-change="refreshChange"
           @on-load="onLoad"
+          @search-criteria-switch="searchCriteriaSwitch"
           @tree-load="treeLoad"
         >
           <template slot="menuLeft">
@@ -370,8 +371,19 @@ export default {
       customerList(queryParams).then(res => {
         this.dataList = res.data.data.records;
         this.page.total = res.data.data.total;
+        if (this.page.total || this.page.total === 0) {
+          this.option.height = window.innerHeight - 200;
+        }
       });
     },
+    searchCriteriaSwitch(type){
+      if (type){
+        this.option.height = this.option.height - 90
+      }else {
+        this.option.height = this.option.height + 90
+      }
+      this.$refs.crud.getTableHeight()
+    },
     //树桩列点击展开触发
     treeLoad(tree, treeNode, resolve) {
       const parentId = tree.id;

+ 5 - 1
src/views/basicData/customerManagement/companyType/index.vue

@@ -200,8 +200,12 @@ export default {
       customerList(values).then(res => {
         this.dataList = res.data.data.records;
         this.page.total = res.data.data.total;
+        if (this.page.total || this.page.total === 0) {
+          this.option.height = window.innerHeight - 200;
+        }
+      }).finally(()=>{
         this.loading = false;
-      });
+      })
     },
     //树桩列点击展开触发
     treeLoad(tree, treeNode, resolve) {

+ 4 - 1
src/views/basicData/customerManagement/supplierMaterial/configuration/mainList.json

@@ -5,7 +5,7 @@
   "stripe": true,
   "simplePage": true,
   "searchShow": true,
-  "searchMenuSpan": 24,
+  "searchMenuSpan": 8,
   "dialogWidth": "60%",
   "tree": true,
   "border": true,
@@ -14,6 +14,9 @@
   "viewBtn": false,
   "editBtn": false,
   "delBtn": false,
+  "searchIcon": true,
+  "searchIndex": 2,
+  "searchSpan": 8,
   "menuWidth": 220,
   "dialogClickModal": false,
   "column": [{

+ 12 - 0
src/views/basicData/customerManagement/supplierMaterial/index.vue

@@ -34,6 +34,7 @@
           @refresh-change="refreshChange"
           @on-load="onLoad"
           @tree-load="treeLoad"
+          @search-criteria-switch="searchCriteriaSwitch"
         >
           <template slot="menuLeft">
             <el-button
@@ -370,8 +371,19 @@ export default {
       customerList(queryParams).then(res => {
         this.dataList = res.data.data.records;
         this.page.total = res.data.data.total;
+        if (this.page.total || this.page.total === 0) {
+          this.option.height = window.innerHeight - 200;
+        }
       });
     },
+    searchCriteriaSwitch(type){
+      if (type){
+        this.option.height = this.option.height - 90
+      }else {
+        this.option.height = this.option.height + 90
+      }
+      this.$refs.crud.getTableHeight()
+    },
     //树桩列点击展开触发
     treeLoad(tree, treeNode, resolve) {
       const parentId = tree.id;

+ 5 - 1
src/views/basicData/customerManagement/supplierType/index.vue

@@ -200,8 +200,12 @@ export default {
       customerList(values).then(res => {
         this.dataList = res.data.data.records;
         this.page.total = res.data.data.total;
+        if (this.page.total || this.page.total === 0) {
+          this.option.height = window.innerHeight - 200;
+        }
+      }).finally(()=>{
         this.loading = false;
-      });
+      })
     },
     //树桩列点击展开触发
     treeLoad(tree, treeNode, resolve) {

+ 1 - 1
src/views/basicData/portinformation/index.vue

@@ -112,7 +112,7 @@
       reportDialog
     },
     mounted() {
-      option.height = window.innerHeight - 350 ;
+      option.height = window.innerHeight - 235 ;
       //查询服务类别字典项
       getTypeTree().then(res => {
         this.findObject(this.tableOption.column, "typeId").dicData = res.data.data;

+ 1 - 1
src/views/basicData/portinformation/type.vue

@@ -55,7 +55,7 @@
 
     },
     mounted() {
-      option.height = window.innerHeight - 310 ;
+      option.height = window.innerHeight - 200 ;
     },
     methods: {
       onLoad(page, params = {}) {

+ 3 - 0
src/views/basicData/productInformation/index.vue

@@ -208,6 +208,9 @@ export default {
       detailData: {},
     };
   },
+  mounted() {
+    option.height = window.innerHeight - 235 ;
+  },
   methods: {
     derivation() {
       window.open(`/api/blade-client/goodsdesc/export-template-info?${this.website.tokenHeader}=${getToken()}`);

+ 1 - 1
src/views/purchase/contract/index.vue

@@ -289,7 +289,7 @@ export default {
       selectPurchaseList(params).then(res => {
         this.dataList = res.data.data.records
         this.page.total = res.data.data.total
-        if (this.page.total) {
+        if (this.page.total || this.page.total === 0) {
           this.option.height = window.innerHeight - 200;
         }
       })

+ 6 - 0
src/views/statisticAnalysis/royalty/config/mainList.json

@@ -138,6 +138,12 @@
       "width": 170
     },
     {
+      "label": "商品",
+      "prop": "goodsName",
+      "width": 170,
+      "search": true
+    },
+    {
       "label": "销售数量",
       "children": [
         {

+ 1 - 2
src/views/statisticAnalysis/royalty/index.vue

@@ -33,8 +33,7 @@
       </template>
       <template slot="menuLeft">
         <el-button size="small"
-                   type="info"
-                   icon="el-icon-download"
+                   type="primary"
                    :loading="exportLoading"
                    @click.stop="downFile"
         >报表

+ 1 - 0
src/views/workManagement/main-items/configuration/mainList.json

@@ -18,6 +18,7 @@
   "editBtn": false,
   "viewBtn": false,
   "delBtn": false,
+  "stripe": true,
   "showSummary": true,
   "menuWidth": 120,
   "column": [

+ 17 - 1
src/views/workManagement/main-items/list.vue

@@ -9,6 +9,7 @@
       :search.sync="search"
       :table-loading="loading"
       :summary-method="summaryMethod"
+      :cell-style="cellStyle"
       @row-del="rowDel"
       @size-change="sizeChange"
       @search-change="searchChange"
@@ -17,6 +18,7 @@
       @on-load="getList"
       @saveColumn="saveColumn"
       @resetColumn="resetColumn"
+      @search-criteria-switch="searchCriteriaSwitch"
     >
       <template slot="corpIdSearch">
         <select-component
@@ -118,7 +120,7 @@ export default {
         currentPage: 1,
         total: 0,
         pageSize: 10,
-        pageSizes: [10, 50, 100, 200, 300, 400, 500,1000]
+        pageSizes: [10,20, 50, 100, 200,400, 500]
       }
     };
   },
@@ -204,6 +206,9 @@ export default {
       getList(page.currentPage, page.pageSize,params).then(res =>{
         this.data = res.data.data.records
         this.page.total = res.data.data.total
+        if (this.page.total) {
+          this.optionTable.height = window.innerHeight - 240;
+        }
       }).finally(()=>{
         this.loading = false;
       })
@@ -263,6 +268,14 @@ export default {
         });
       }
     },
+    searchCriteriaSwitch(type){
+      if (type){
+        this.optionTable.height = this.optionTable.height - 50
+      }else {
+        this.optionTable.height = this.optionTable.height + 50
+      }
+      this.$refs.crud.getTableHeight()
+    },
     summaryMethod({ columns, data }) {
       const sums = [];
       if (columns.length > 0) {
@@ -301,6 +314,9 @@ export default {
       this.show = true;
       this.getList(this.page, this.search)
     },
+    cellStyle() {
+      return "padding:0;height:40px;";
+    },
     //列保存触发
     async saveColumn() {
       const inSave = await this.saveColumnData(

+ 1 - 0
src/views/workManagement/performanceAnalysis/config/mainList.json

@@ -16,6 +16,7 @@
   "editBtn": false,
   "delBtn": false,
   "menuWidth": 80,
+  "stripe": true,
   "dialogClickModal": false,
   "searchLabelWidth": 120,
   "searchIcon": true,

+ 17 - 1
src/views/workManagement/performanceAnalysis/index.vue

@@ -7,6 +7,7 @@
                :page.sync="page"
                :search.sync="search"
                :table-loading="loading"
+               :cell-style="cellStyle"
                @search-change="searchChange"
                @search-reset="searchReset"
                @selection-change="selectionChange"
@@ -16,6 +17,7 @@
                @on-load="onLoad"
                @saveColumn="saveColumn"
                @resetColumn="resetColumn"
+               @search-criteria-switch="searchCriteriaSwitch"
     >
       <template slot="menuLeft">
         <el-button
@@ -214,10 +216,24 @@
         performanceAnalysis(page.currentPage, page.pageSize,params).then(res=>{
           this.dataList = res.data.data.records
           this.page.total = res.data.data.total
+          if (this.page.total) {
+            this.option.height = window.innerHeight - 200;
+          }
         }).finally(()=>{
-          this.loading = false;
+          this.loading = false
         })
       },
+      searchCriteriaSwitch(type){
+        if (type){
+          this.option.height = this.option.height - 50
+        }else {
+          this.option.height = this.option.height + 50
+        }
+        this.$refs.crud.getTableHeight()
+      },
+      cellStyle() {
+        return "padding:0;height:40px;";
+      },
       //列保存触发
       async saveColumn() {
         const inSave = await this.saveColumnData(

+ 1 - 0
src/views/workManagement/receipt/configuration/statisticalList.json

@@ -16,6 +16,7 @@
   "searchIndex": 2,
   "selection": false,
   "viewBtn": false,
+  "stripe": true,
   "editBtn": false,
   "delBtn": false,
   "menuWidth": 80,

+ 16 - 0
src/views/workManagement/receipt/statisticalList.vue

@@ -7,6 +7,7 @@
                v-model="form"
                :page.sync="page"
                :search.sync="search"
+               :cell-style="cellStyle"
                @search-change="searchChange"
                @search-reset="searchReset"
                @selection-change="selectionChange"
@@ -16,6 +17,7 @@
                @on-load="onLoad"
                @saveColumn="saveColumn"
                @resetColumn="resetColumn"
+               @search-criteria-switch="searchCriteriaSwitch"
     >
       <template slot="menuLeft">
         <el-button
@@ -258,10 +260,24 @@
         getFlowList(page.currentPage, page.pageSize,param).then(res =>{
           this.dataList = res.data.data.records
           this.page.total = res.data.data.total
+          if (this.page.total) {
+            this.option.height = window.innerHeight - 240;
+          }
         }).finally(()=>{
           this.loading = false
         })
       },
+      searchCriteriaSwitch(type){
+        if (type){
+          this.option.height = this.option.height - 95
+        }else {
+          this.option.height = this.option.height + 95
+        }
+        this.$refs.crud.getTableHeight()
+      },
+      cellStyle() {
+        return "padding:0;height:40px;";
+      },
       //列保存触发
       async saveColumn() {
         const inSave = await this.saveColumnData(

+ 12 - 0
src/views/workManagement/service-items/configuration/projectOption.json

@@ -13,6 +13,7 @@
   "selection": true,
   "viewBtn": false,
   "editBtn": true,
+  "stripe": true,
   "delBtn": true,
   "menuWidth": 150,
   "column": [
@@ -20,6 +21,7 @@
       "label": "项目编码",
       "prop": "code",
       "search": true,
+      "overHidden": true,
       "index": 1,
       "width": 150,
       "rules": [
@@ -34,6 +36,7 @@
       "label": "项目名称",
       "prop": "cname",
       "search": true,
+      "overHidden": true,
       "index": 2,
       "width": 150,
       "rules": [
@@ -50,6 +53,7 @@
       "dicData": [],
       "type": "tree",
       "hide": true,
+      "overHidden": true,
       "multiple": false,
       "props": {
         "label": "title"
@@ -63,6 +67,7 @@
     {
       "label": "收费建议",
       "prop": "remarks",
+      "overHidden": true,
       "index": 3,
       "width": 150
     },
@@ -70,11 +75,13 @@
       "label": "单价",
       "prop": "price",
       "index": 4,
+      "overHidden": true,
       "width": 120
     },
     {
       "label": "计价单位",
       "prop": "unit",
+      "overHidden": true,
       "index": 5,
       "width": 120
     },
@@ -82,6 +89,7 @@
       "label": "频率",
       "prop": "rate",
       "type": "select",
+      "overHidden": true,
       "dicUrl": "/api/blade-system/dict-biz/dictionary?code=frequency",
       "props": {
         "label": "dictValue",
@@ -93,6 +101,7 @@
     {
       "label": "质保期",
       "type":"date",
+      "overHidden": true,
       "prop": "warrantyPeriod",
       "format": "yyyy-MM-dd",
       "valueFormat": "yyyy-MM-dd HH:dd:ss",
@@ -101,6 +110,7 @@
     },
     {
       "label": "标准工时",
+      "overHidden": true,
       "prop": "workingHours",
       "index": 8,
       "width": 80
@@ -110,6 +120,7 @@
       "prop": "createUserName",
       "addDisplay": false,
       "editDisplay": false,
+      "overHidden": true,
       "index": 9,
       "width": 150
     },
@@ -117,6 +128,7 @@
       "label": "创建时间",
       "prop": "createTime",
       "editDisplay": false,
+      "overHidden": true,
       "addDisplay": false,
       "index": 10,
       "width": 150

+ 2 - 1
src/views/workManagement/service-items/configuration/typeOption.json

@@ -13,14 +13,15 @@
   "tree": true,
   "selection": true,
   "viewBtn": true,
+  "stripe": true,
   "menuWidth": 300,
   "column": [
     {
       "label": "类别名称",
       "prop": "cname",
       "search": true,
-      "index": 1,
       "overHidden": true,
+      "index": 1,
       "rules": [
         {
           "required": true,

+ 9 - 1
src/views/workManagement/service-items/project.vue

@@ -23,6 +23,7 @@
           :table-loading="loading"
           v-model='form'
           :search.sync="search"
+          :cell-style="cellStyle"
           :before-open="beforeOpen"
           @size-change="sizeChange"
           @current-change="currentChange"
@@ -111,7 +112,6 @@ export default {
     reportDialog
   },
   mounted() {
-    option.height = window.innerHeight - 350 ;
     //查询服务类别字典项
     getDeptTree().then(res => {
       this.findObject(this.tableOption.column, "goodsTypeId").dicData = res.data.data;
@@ -131,6 +131,11 @@ export default {
       getServiceProjectList(page.currentPage, page.pageSize, params, this.treeDeptId).then(res => {
         this.data = res.data.data.records
         this.page.total = res.data.data.total
+        if (this.page.total) {
+          this.tableOption.height = window.innerHeight - 240;
+          // this.treeOption.height = window.innerHeight - 240;
+        }
+      }).finally(()=>{
         this.loading = false
       })
 
@@ -223,6 +228,9 @@ export default {
       this.page.currentPage = 1;
       this.getList(this.page);
     },
+    cellStyle() {
+      return "padding:0;height:40px;";
+    },
     //列保存触发
     async saveColumn() {
       const inSave = await this.saveColumnData(

+ 8 - 1
src/views/workManagement/service-items/type.vue

@@ -9,6 +9,7 @@
                :search.sync="search"
                @row-del="rowDel"
                @row-update="rowUpdate"
+               :cell-style="cellStyle"
                :before-open="beforeOpen"
                :before-close="beforeClose"
                @row-save="rowSave"
@@ -56,7 +57,6 @@
 
     },
     mounted() {
-      option.height = window.innerHeight - 310 ;
     },
     methods: {
       onLoad(page, params = {}) {
@@ -70,6 +70,10 @@
         getList(values).then(res => {
           this.dataList = res.data.data.records
           this.page.total = res.data.data.total
+          if (this.page.total) {
+            this.option.height = window.innerHeight - 200;
+          }
+        }).finally(()=>{
           this.loading=false;
         })
       },
@@ -147,6 +151,9 @@
         }
         done();
       },
+      cellStyle() {
+        return "padding:0;height:40px;";
+      },
       //点击新增取消时触发
       beforeClose(done) {
         this.parentId = "";