Merge remote-tracking branch 'origin/dev' into dev

src/views/basicData/basicFeesDesc/configuration/mainList.json

@@ -6,7 +6,6 @@
   "index": true,
   "lazy": true,
   "tip": false,
-  "simplePage": true,
   "searchMenuPosition": "right",
   "searchShow": true,
   "searchMenuSpan": 8,

src/views/basicData/basicFeesDesc/index.vue

@@ -10,7 +10,7 @@
       </div>
     </el-col>
     <el-col :span="19">
-      <basic-container>
+      <basic-container class="page-crad">
         <avue-crud :option="option"
                    :data="dataList"
                    ref="crud"
@@ -73,9 +73,10 @@ export default {
       parentId:0,
       dataList: [],
       page: {
-        pageSize: 10,
-        pagerCount: 5,
+        pageSize: 20,
+        currentPage: 1,
         total: 0,
+        pageSizes: [10,20,30,40,50, 100, 200, 300, 400, 500]
       },
       treeDeptId:'',
     }
@@ -208,15 +209,15 @@ export default {
         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;
+          this.option.height = window.innerHeight - 210;
         }
       });
     },
     searchCriteriaSwitch(type){
       if (type){
-        this.option.height = this.option.height - 50
+        this.option.height = this.option.height - 46
       }else {
-        this.option.height = this.option.height + 50
+        this.option.height = this.option.height + 46
       }
       this.$refs.crud.getTableHeight()
     },
@@ -232,5 +233,7 @@ export default {
 </script>
 
 <style scoped>
-
+.page-crad ::v-deep .basic-container__card {
+  height: 94.8vh;
+}
 </style>

src/views/basicData/basicFeesType/configuration/mainList.json

@@ -6,7 +6,6 @@
   "index": true,
   "lazy": true,
   "tip": false,
-  "simplePage": true,
   "searchShow": true,
   "searchMenuSpan": 6,
   "tree": true,

src/views/basicData/basicFeesType/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <basic-container>
+  <basic-container class="page-crad">
     <avue-crud :option="option"
                :data="dataList"
                ref="crud"
@@ -46,9 +46,10 @@ export default {
       parentId:0,
       dataList: [],
       page: {
-        pageSize: 10,
-        pagerCount: 5,
+        pageSize: 20,
+        currentPage: 1,
         total: 0,
+        pageSizes: [10,20,30,40,50, 100, 200, 300, 400, 500]
       },
       query:{}
     }
@@ -185,7 +186,7 @@ export default {
         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;
+          this.option.height = window.innerHeight - 210;
         }
       }).finally(()=>{
         this.loading = false;
@@ -203,5 +204,7 @@ export default {
 </script>
 
 <style scoped>
-
+.page-crad ::v-deep .basic-container__card {
+  height: 94.8vh;
+}
 </style>

src/views/basicData/basicStorageDesc/index.vue

@@ -4,32 +4,38 @@
       <div class="box">
         <el-scrollbar>
           <basic-container>
-            <avue-tree :option="treeOption" :data="treeData" @node-click="nodeClick"/>
+            <avue-tree
+              :option="treeOption"
+              :data="treeData"
+              @node-click="nodeClick"
+            />
           </basic-container>
         </el-scrollbar>
       </div>
     </el-col>
     <el-col :span="19">
-      <basic-container>
-        <avue-crud :option="option"
-                   :data="dataList"
-                   ref="crud"
-                   v-model="form"
-                   :page.sync="page"
-                   @row-del="rowDel"
-                   @row-update="rowUpdate"
-                   :before-open="beforeOpen"
-                   :before-close="beforeClose"
-                   @row-save="rowSave"
-                   @search-change="searchChange"
-                   @search-reset="searchReset"
-                   @selection-change="selectionChange"
-                   @current-change="currentChange"
-                   @size-change="sizeChange"
-                   @refresh-change="refreshChange"
-                   @on-load="onLoad"
-                   @search-criteria-switch="searchCriteriaSwitch"
-                   @tree-load="treeLoad">
+      <basic-container class="page-crad">
+        <avue-crud
+          :option="option"
+          :data="dataList"
+          ref="crud"
+          v-model="form"
+          :page.sync="page"
+          @row-del="rowDel"
+          @row-update="rowUpdate"
+          :before-open="beforeOpen"
+          :before-close="beforeClose"
+          @row-save="rowSave"
+          @search-change="searchChange"
+          @search-reset="searchReset"
+          @selection-change="selectionChange"
+          @current-change="currentChange"
+          @size-change="sizeChange"
+          @refresh-change="refreshChange"
+          @on-load="onLoad"
+          @search-criteria-switch="searchCriteriaSwitch"
+          @tree-load="treeLoad"
+        >
         </avue-crud>
       </basic-container>
     </el-col>
@@ -38,7 +44,14 @@
 
 <script>
 import option from "./configuration/mainList.json";
-import {customerList, typeSave,detail,deleteDetails,getDeptLazyTree,getDeptTree} from "@/api/basicData/basicStorageDesc"
+import {
+  customerList,
+  typeSave,
+  detail,
+  deleteDetails,
+  getDeptLazyTree,
+  getDeptTree
+} from "@/api/basicData/basicStorageDesc";
 
 export default {
   name: "customerInformation",
@@ -47,50 +60,54 @@ export default {
       form: {},
       option: option,
       treeOption: {
-        nodeKey: 'id',
+        nodeKey: "id",
         lazy: true,
-        treeLoad: function (node, resolve) {
-          const parentId = (node.level === 0) ? 0 : node.data.id;
+        treeLoad: function(node, resolve) {
+          const parentId = node.level === 0 ? 0 : node.data.id;
           getDeptLazyTree(parentId).then(res => {
-            resolve(res.data.data.map(item => {
-              return {
-                ...item,
-                leaf: !item.hasChildren
-              }
-            }))
+            resolve(
+              res.data.data.map(item => {
+                return {
+                  ...item,
+                  leaf: !item.hasChildren
+                };
+              })
+            );
           });
         },
         addBtn: false,
         menu: false,
-        size: 'small',
+        size: "small",
         props: {
-          labelText: '标题',
-          label: 'title',
-          value: 'value',
-          children: 'children'
+          labelText: "标题",
+          label: "title",
+          value: "value",
+          children: "children"
         }
       },
-      parentId:0,
+      parentId: 0,
       dataList: [],
       page: {
-        pageSize: 10,
-        pagerCount: 5,
+        pageSize: 20,
+        currentPage: 1,
         total: 0,
+        pageSizes: [10, 20, 30, 40, 50, 100, 200, 300, 400, 500]
       },
-      treeDeptId:'',
-    }
+      treeDeptId: ""
+    };
   },
   created() {
     // customerList({parentId:0}).then(res => {
     //   console.log(res.data.data.records)
     //   this.dataList = res.data.data.records
     // })
+    this.option.height = window.innerHeight - 210;
   },
   mounted() {
-    option.height = window.innerHeight - 350 ;
     //查询服务类别字典项
     getDeptTree().then(res => {
-      this.findObject(this.option.column, "storageTypeId").dicData = res.data.data;
+      this.findObject(this.option.column, "storageTypeId").dicData =
+        res.data.data;
     });
   },
   methods: {
@@ -106,46 +123,54 @@ export default {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning"
-      }).then(() => {
-            return deleteDetails(row.id);
-          }).then(() => {
-            this.$message({
-              type: "success",
-              message: "操作成功!"
-            });
-            // 数据回调进行刷新
-            done(row);
+      })
+        .then(() => {
+          return deleteDetails(row.id);
+        })
+        .then(() => {
+          this.$message({
+            type: "success",
+            message: "操作成功!"
           });
+          // 数据回调进行刷新
+          done(row);
+        });
     },
     //修改时的修改按钮点击触发
     rowUpdate(row, index, done, loading) {
-      typeSave(row).then(() => {
-        this.$message({
-          type: "success",
-          message: "操作成功!"
-        });
-        // 数据回调进行刷新
-        done(row);
-      }, error => {
-        window.console.log(error);
-        loading();
-      });
+      typeSave(row).then(
+        () => {
+          this.$message({
+            type: "success",
+            message: "操作成功!"
+          });
+          // 数据回调进行刷新
+          done(row);
+        },
+        error => {
+          window.console.log(error);
+          loading();
+        }
+      );
     },
     //新增修改时保存触发
     rowSave(row, done, loading) {
-      console.log(row)
-      typeSave(row).then(res => {
-        console.log(res)
-        this.page.currentPage = 1;
-        this.onLoad(this.page, {});
-        done()
-      }, error => {
-        window.console.log(error);
-        loading();
-      })
+      console.log(row);
+      typeSave(row).then(
+        res => {
+          console.log(res);
+          this.page.currentPage = 1;
+          this.onLoad(this.page, {});
+          done();
+        },
+        error => {
+          window.console.log(error);
+          loading();
+        }
+      );
     },
     //查询全部
-    initData(){
+    initData() {
       getDeptTree().then(res => {
         const column = this.findObject(this.option.column, "storageTypeId");
         column.dicData = res.data.data;
@@ -162,11 +187,11 @@ export default {
     //新增子项和新增触发查询所有
     beforeOpen(done, type) {
       if (["add", "edit"].includes(type)) {
-        this.option.column.forEach(e=>{
-          if(e.prop=='storageTypeId'){
-            this.$set(this.option.column,3,{...e,value:this.treeDeptId})
+        this.option.column.forEach(e => {
+          if (e.prop == "storageTypeId") {
+            this.$set(this.option.column, 3, { ...e, value: this.treeDeptId });
           }
-        })
+        });
       }
       if (["edit", "view"].includes(type)) {
         detail(this.form.id).then(res => {
@@ -187,53 +212,54 @@ export default {
     searchChange(params, done) {
       this.page.currentPage = 1;
       this.onLoad(this.page, params);
-      done()
+      done();
     },
     searchReset() {
       this.query = {};
-      this.treeDeptId = '';
+      this.treeDeptId = "";
       this.onLoad(this.page);
     },
     selectionChange() {
-      console.log('1')
+      console.log("1");
     },
     currentChange() {
-      console.log('1')
+      console.log("1");
     },
     sizeChange() {
-      console.log('1')
+      console.log("1");
     },
     refreshChange() {
-      console.log('1')
+      console.log("1");
     },
-    onLoad(page, params = {parentId:0}) {
-      let queryParams = Object.assign({}, params, {size: page.pageSize, current: page.currentPage,parentId:0,storageTypeId:this.treeDeptId})
+    onLoad(page, params = { parentId: 0 }) {
+      let queryParams = Object.assign({}, params, {
+        size: page.pageSize,
+        current: page.currentPage,
+        parentId: 0,
+        storageTypeId: this.treeDeptId
+      });
       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;
-        }
+        this.dataList = res.data.data.records;
+        this.page.total = res.data.data.total;
       });
     },
-    searchCriteriaSwitch(type){
-      if (type){
-        this.option.height = this.option.height - 90
-      }else {
-        this.option.height = this.option.height + 90
+    searchCriteriaSwitch(type) {
+      if (type) {
+        this.option.height = this.option.height - 93;
+      } else {
+        this.option.height = this.option.height + 93;
       }
-      this.$refs.crud.getTableHeight()
+      this.$refs.crud.getTableHeight();
     },
     //树桩列点击展开触发
     treeLoad(tree, treeNode, resolve) {
       const parentId = tree.id;
-      customerList({parentId:parentId}).then(res => {
+      customerList({ parentId: parentId }).then(res => {
         resolve(res.data.data.records);
       });
-    },
+    }
   }
-
-}
+};
 // {
 //   "label": "仓库",
 //   "prop": "storageTypeId",
@@ -260,5 +286,7 @@ export default {
 </script>
 
 <style scoped>
-
+.page-crad ::v-deep .basic-container__card {
+  height: 94.8vh;
+}
 </style>

src/views/basicData/basicStorageType/index.vue

@@ -1,30 +1,32 @@
 <template>
-  <basic-container>
-    <avue-crud :option="option"
-               :data="dataList"
-               ref="crud"
-               v-model="form"
-               :page.sync="page"
-               @row-del="rowDel"
-               @row-update="rowUpdate"
-               :before-open="beforeOpen"
-               :before-close="beforeClose"
-               @row-save="rowSave"
-               @search-change="searchChange"
-               @search-reset="searchReset"
-               @selection-change="selectionChange"
-               @current-change="currentChange"
-               @size-change="sizeChange"
-               @refresh-change="refreshChange"
-               @on-load="onLoad"
-               @tree-load="treeLoad">
+  <basic-container class="page-crad">
+    <avue-crud
+      :option="option"
+      :data="dataList"
+      ref="crud"
+      v-model="form"
+      :page.sync="page"
+      @row-del="rowDel"
+      @row-update="rowUpdate"
+      :before-open="beforeOpen"
+      :before-close="beforeClose"
+      @row-save="rowSave"
+      @search-change="searchChange"
+      @search-reset="searchReset"
+      @selection-change="selectionChange"
+      @current-change="currentChange"
+      @size-change="sizeChange"
+      @refresh-change="refreshChange"
+      @on-load="onLoad"
+      @tree-load="treeLoad"
+    >
       <template slot-scope="scope" slot="menu">
         <el-button
-            type="text"
-            icon="el-icon-circle-plus-outline"
-            size="small"
-            @click.stop="handleAdd(scope.row,scope.index)"
-        >新增子项
+          type="text"
+          icon="el-icon-circle-plus-outline"
+          size="small"
+          @click.stop="handleAdd(scope.row, scope.index)"
+          >新增子项
         </el-button>
       </template>
     </avue-crud>
@@ -33,7 +35,12 @@
 
 <script>
 import option from "./configuration/mainList.json";
-import {customerList, typeSave,detail,deleteDetails} from "@/api/basicData/basicStorageType"
+import {
+  customerList,
+  typeSave,
+  detail,
+  deleteDetails
+} from "@/api/basicData/basicStorageType";
 
 export default {
   name: "customerInformation",
@@ -41,20 +48,22 @@ export default {
     return {
       form: {},
       option: option,
-      parentId:0,
+      parentId: 0,
       dataList: [],
       page: {
-        pageSize: 10,
-        pagerCount: 5,
+        pageSize: 20,
+        currentPage: 1,
         total: 0,
+        pageSizes: [10, 20, 30, 40, 50, 100, 200, 300, 400, 500]
       }
-    }
+    };
   },
   created() {
     // customerList({parentId:0}).then(res => {
     //   console.log(res.data.data.records)
     //   this.dataList = res.data.data.records
     // })
+    this.option.height = window.innerHeight - 210;
   },
   methods: {
     //删除列表后面的删除按钮触发触发(row, index, done)
@@ -63,45 +72,53 @@ export default {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning"
-      }).then(() => {
-            return deleteDetails(row.id);
-          }).then(() => {
-            this.$message({
-              type: "success",
-              message: "操作成功!"
-            });
-            // 数据回调进行刷新
-            done(row);
+      })
+        .then(() => {
+          return deleteDetails(row.id);
+        })
+        .then(() => {
+          this.$message({
+            type: "success",
+            message: "操作成功!"
           });
+          // 数据回调进行刷新
+          done(row);
+        });
     },
     //修改时的修改按钮点击触发
     rowUpdate(row, index, done, loading) {
-      typeSave(row).then(() => {
-        this.$message({
-          type: "success",
-          message: "操作成功!"
-        });
-        // 数据回调进行刷新
-        done(row);
-      }, error => {
-        window.console.log(error);
-        loading();
-      });
+      typeSave(row).then(
+        () => {
+          this.$message({
+            type: "success",
+            message: "操作成功!"
+          });
+          // 数据回调进行刷新
+          done(row);
+        },
+        error => {
+          window.console.log(error);
+          loading();
+        }
+      );
     },
     //新增修改时保存触发
     rowSave(row, done, loading) {
-      typeSave(row).then(res => {
-        console.log(res)
-        this.page.currentPage = 1;
-        this.onLoad(this.page, {parentId: 0});
-        done()
-      }, error => {
-        window.console.log(error);
-        loading();
-      })
+      typeSave(row).then(
+        res => {
+          console.log(res);
+          this.page.currentPage = 1;
+          this.onLoad(this.page, { parentId: 0 });
+          done();
+        },
+        error => {
+          window.console.log(error);
+          loading();
+        }
+      );
     },
     //查询全部
-    initData(){
+    initData() {
       customerList().then(res => {
         console.log(this.form);
         const column = this.findObject(this.option.column, "parentId");
@@ -139,46 +156,48 @@ export default {
     //点击搜索按钮触发
     searchChange(params, done) {
       this.page.currentPage = 1;
-      params.parentId = 0
+      params.parentId = 0;
       this.onLoad(this.page, params);
-      done()
+      done();
     },
     searchReset() {
-      console.log('1')
+      console.log("1");
     },
     selectionChange() {
-      console.log('1')
+      console.log("1");
     },
     currentChange() {
-      console.log('1')
+      console.log("1");
     },
     sizeChange() {
-      console.log('1')
+      console.log("1");
     },
     refreshChange() {
-      console.log('1')
+      console.log("1");
     },
-    onLoad(page, params = {parentId:0}) {
-      let queryParams = Object.assign({}, params, {size: page.pageSize, current: page.currentPage})
+    onLoad(page, params = { parentId: 0 }) {
+      let queryParams = Object.assign({}, params, {
+        size: page.pageSize,
+        current: page.currentPage
+      });
       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;
-        }
-      })
+        this.dataList = res.data.data.records;
+        this.page.total = res.data.data.total;
+      });
     },
     //树桩列点击展开触发
     treeLoad(tree, treeNode, resolve) {
       const parentId = tree.id;
-      customerList({parentId:parentId}).then(res => {
+      customerList({ parentId: parentId }).then(res => {
         resolve(res.data.data.records);
       });
-    },
+    }
   }
-}
+};
 </script>
 
 <style scoped>
-
+.page-crad ::v-deep .basic-container__card {
+  height: 94.8vh;
+}
 </style>

src/views/basicData/commodityCategory/index.vue

@@ -1,30 +1,32 @@
 <template>
-  <basic-container>
-    <avue-crud :option="option"
-               :data="dataList"
-               ref="crud"
-               v-model="form"
-               :page.sync="page"
-               @row-del="rowDel"
-               @row-update="rowUpdate"
-               :before-open="beforeOpen"
-               :before-close="beforeClose"
-               @row-save="rowSave"
-               @search-change="searchChange"
-               @search-reset="searchReset"
-               @selection-change="selectionChange"
-               @current-change="currentChange"
-               @size-change="sizeChange"
-               @refresh-change="refreshChange"
-               @on-load="onLoad"
-               @tree-load="treeLoad">
+  <basic-container class="page-crad">
+    <avue-crud
+      :option="option"
+      :data="dataList"
+      ref="crud"
+      v-model="form"
+      :page.sync="page"
+      @row-del="rowDel"
+      @row-update="rowUpdate"
+      :before-open="beforeOpen"
+      :before-close="beforeClose"
+      @row-save="rowSave"
+      @search-change="searchChange"
+      @search-reset="searchReset"
+      @selection-change="selectionChange"
+      @current-change="currentChange"
+      @size-change="sizeChange"
+      @refresh-change="refreshChange"
+      @on-load="onLoad"
+      @tree-load="treeLoad"
+    >
       <template slot-scope="scope" slot="menu">
         <el-button
-            type="text"
-            icon="el-icon-circle-plus-outline"
-            size="small"
-            @click.stop="handleAdd(scope.row,scope.index)"
-        >新增子项
+          type="text"
+          icon="el-icon-circle-plus-outline"
+          size="small"
+          @click.stop="handleAdd(scope.row, scope.index)"
+          >新增子项
         </el-button>
       </template>
     </avue-crud>
@@ -33,7 +35,13 @@
 
 <script>
 import option from "./configuration/mainList.json";
-import {customerList, typeSave,detail,deleteDetails,getTreeList} from "@/api/basicData/commodityCategory"
+import {
+  customerList,
+  typeSave,
+  detail,
+  deleteDetails,
+  getTreeList
+} from "@/api/basicData/commodityCategory";
 
 export default {
   name: "customerInformation",
@@ -41,18 +49,19 @@ export default {
     return {
       form: {},
       option: option,
-      parentId:0,
+      parentId: 0,
       dataList: [],
       page: {
-        pageSize: 10,
-        pagerCount: 5,
+        pageSize: 20,
+        currentPage: 1,
         total: 0,
+        pageSizes: [10, 20, 30, 40, 50, 100, 200, 300, 400, 500]
       },
-      query:{}
-    }
+      query: {}
+    };
   },
   created() {
-    getTreeList({parentId:0}).then(res => {
+    getTreeList({ parentId: 0 }).then(res => {
       const column = this.findObject(this.option.column, "parentId");
       column.dicData = res.data.data;
     });
@@ -64,51 +73,55 @@ export default {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning"
-      }).then(() => {
-            return deleteDetails(row.id);
-          }).then(() => {
-            this.$message({
-              type: "success",
-              message: "操作成功!"
-            });
-            // 数据回调进行刷新
-            done(row);
+      })
+        .then(() => {
+          return deleteDetails(row.id);
+        })
+        .then(() => {
+          this.$message({
+            type: "success",
+            message: "操作成功!"
           });
+          // 数据回调进行刷新
+          done(row);
+        });
     },
     //修改时的修改按钮点击触发
     rowUpdate(row, index, done, loading) {
-      typeSave(row).then(() => {
-        this.$message({
-          type: "success",
-          message: "操作成功!"
-        });
-        // 数据回调进行刷新
-        done(row);
-      }, error => {
-        window.console.log(error);
-        loading();
-      });
+      typeSave(row).then(
+        () => {
+          this.$message({
+            type: "success",
+            message: "操作成功!"
+          });
+          // 数据回调进行刷新
+          done(row);
+        },
+        error => {
+          window.console.log(error);
+          loading();
+        }
+      );
     },
     //新增修改时保存触发
     rowSave(row, done, loading) {
       typeSave(row).then(res => {
         this.page.currentPage = 1;
-        this.onLoad(this.page, {parentId: 0});
-        done()
-      })
+        this.onLoad(this.page, { parentId: 0 });
+        done();
+      });
     },
     //新增子项触发
     handleAdd(row) {
       this.parentId = row.id;
       const column = this.findObject(this.option.column, "parentId");
-      this.$set(this.form,"parentId",row.id)
+      this.$set(this.form, "parentId", row.id);
       column.addDisabled = true;
       this.$refs.crud.rowAdd();
     },
     //新增子项和新增触发查询所有
     beforeOpen(done, type) {
       if (["add", "edit"].includes(type)) {
-
       }
       if (["edit", "view"].includes(type)) {
         detail(this.form.id).then(res => {
@@ -130,61 +143,63 @@ export default {
       this.query = params;
       this.page.currentPage = 1;
       this.onLoad(this.page, params);
-      done()
+      done();
     },
     searchReset() {
-      console.log('1')
+      console.log("1");
     },
     selectionChange() {
-      console.log('1')
+      console.log("1");
     },
     currentChange() {
-      console.log('1')
+      console.log("1");
     },
     sizeChange() {
-      console.log('1')
+      console.log("1");
     },
     refreshChange() {
-      console.log('1')
+      console.log("1");
     },
     onLoad(page, params = {}) {
-      const {createTimeA} = this.query;
+      const { createTimeA } = this.query;
       let values = {
         ...params,
-        size:this.page.pageSize,
-        current:this.page.currentPage
+        size: this.page.pageSize,
+        current: this.page.currentPage
       };
       if (createTimeA) {
         values = {
           ...params,
-          createTime: createTimeA[0] + ' 00:00:00',
-          endTime: createTimeA[1] + ' 23:59:59',
-          size:this.page.pageSize,
-          current:this.page.currentPage,
-          ...this.query,
+          createTime: createTimeA[0] + " 00:00:00",
+          endTime: createTimeA[1] + " 23:59:59",
+          size: this.page.pageSize,
+          current: this.page.currentPage,
+          ...this.query
         };
         values.createTimeA = null;
       }
-      values.parentId = 0
+      values.parentId = 0;
       customerList(values).then(res => {
-        this.dataList = res.data.data.records
-        this.page.total = res.data.data.total
+        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;
+          this.option.height = window.innerHeight - 210;
         }
-      })
+      });
     },
     //树桩列点击展开触发
     treeLoad(tree, treeNode, resolve) {
       const parentId = tree.id;
-      customerList({parentId:parentId,size:10000}).then(res => {
+      customerList({ parentId: parentId, size: 10000 }).then(res => {
         resolve(res.data.data.records);
       });
-    },
+    }
   }
-}
+};
 </script>
 
 <style scoped>
-
+.page-crad ::v-deep .basic-container__card {
+  height: 94.8vh;
+}
 </style>

src/views/basicData/commodityType/detailsPageEdit.vue

@@ -59,6 +59,7 @@
                   placeholder=" "
                   type="tree"
                   size="small"
+                  dataType='string'
                   :dic="dicData"
                 />
                 <el-input

src/views/basicData/commodityType/index.vue

@@ -12,7 +12,7 @@
           </basic-container>
         </el-col>
         <el-col :span="19">
-          <basic-container>
+          <basic-container class="page-crad">
             <avue-crud
               :option="option"
               :search.sync="search"
@@ -33,6 +33,7 @@
               @size-change="sizeChange"
               @refresh-change="refreshChange"
               @on-load="onLoad"
+              @search-criteria-switch="searchCriteriaSwitch"
             >
               <template slot="menuLeft">
                 <el-button
@@ -249,9 +250,10 @@ export default {
       loading: true,
       platformLoading: false,
       page: {
-        pageSize: 10,
+        pageSize: 20,
         currentPage: 1,
-        total: 0
+        total: 0,
+        pageSizes: [10,20,30,40,50, 100, 200, 300, 400, 500]
       },
       platformPage: {
         pageSize: 10,
@@ -437,13 +439,21 @@ export default {
     }
   },
   mounted() {
-    option.height = window.innerHeight - 230;
+    option.height = window.innerHeight - 210;
     // 非租户模式默认加载管理组数据
     if (!website.tenantMode) {
       this.initData(website.tenantId);
     }
   },
   methods: {
+    searchCriteriaSwitch(type) {
+      if (type) {
+        this.option.height = this.option.height - 46;
+      } else {
+        this.option.height = this.option.height + 46;
+      }
+      this.$refs.crud.getTableHeight();
+    },
     derivation() {
       window.open(
         `/api/blade-client/goodsdesc/export-template?${
@@ -737,3 +747,8 @@ export default {
   height: 100%;
 }
 </style>
+<style scoped>
+.page-crad ::v-deep .basic-container__card {
+  height: 94.8vh;
+}
+</style>

src/views/basicData/container/index.vue

@@ -14,7 +14,7 @@
       </div>
     </el-col>
     <el-col :span="20">
-      <basic-container>
+      <basic-container class="page-crad">
         <avue-crud
           ref="crud"
           :data="data"
@@ -72,10 +72,11 @@
         treeDeptId:"",
         height: window.innerHeight - 350,
         page: {
-          currentPage: 1,
-          total: 0,
-          pageSize: 10
-        },
+        pageSize: 20,
+        currentPage: 1,
+        total: 0,
+        pageSizes: [10,20,30,40,50, 100, 200, 300, 400, 500]
+      },
         treeOption: {
           nodeKey: "id",
           lazy: true,
@@ -111,7 +112,7 @@
       reportDialog
     },
     mounted() {
-      option.height = window.innerHeight - 240 ;
+      option.height = window.innerHeight - 210 ;
       //查询服务类别字典项
       getTypeTree().then(res => {
         this.findObject(this.tableOption.column, "typeId").dicData = res.data.data;
@@ -230,4 +231,7 @@
 </script>
 
 <style scoped lang="scss">
+.page-crad ::v-deep .basic-container__card {
+  height: 94.8vh;
+}
 </style>

src/views/basicData/container/type.vue

@@ -1,5 +1,5 @@
 <template>
-  <basic-container>
+  <basic-container class="page-crad">
     <avue-crud :option="option"
                :data="dataList"
                ref="crud"
@@ -43,11 +43,12 @@
         parentId:0,
         loading:true,
         dataList: [],
-        page: {
-          pageSize: 10,
-          pagerCount: 5,
-          total: 0,
-        },
+          page: {
+        pageSize: 20,
+        currentPage: 1,
+        total: 0,
+        pageSizes: [10,20,30,40,50, 100, 200, 300, 400, 500]
+      },
         query:{}
       }
     },
@@ -55,7 +56,7 @@
 
     },
     mounted() {
-      option.height = window.innerHeight - 200 ;
+      option.height = window.innerHeight - 210 ;
     },
     methods: {
       onLoad(page, params = {}) {
@@ -169,5 +170,7 @@
 </script>
 
 <style scoped>
-
+.page-crad ::v-deep .basic-container__card {
+  height: 94.8vh;
+}
 </style>

src/views/basicData/customerCategory/configuration/mainList.json

@@ -6,7 +6,6 @@
   "index": true,
   "lazy": true,
   "tip": false,
-  "simplePage": true,
   "searchShow": true,
   "searchMenuSpan": 6,
   "tree": true,

src/views/basicData/customerCategory/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <basic-container>
+  <basic-container class="page-crad">
     <avue-crud
       :option="option"
       :data="dataList"
@@ -53,9 +53,10 @@ export default {
       parentId: 0,
       dataList: [],
       page: {
-        pageSize: 10,
-        pagerCount: 5,
-        total: 0
+        pageSize: 20,
+        currentPage: 1,
+        total: 0,
+        pageSizes: [10, 20, 30, 40, 50, 100, 200, 300, 400, 500]
       },
       query: {}
     };
@@ -120,7 +121,7 @@ export default {
     },
     //查询全部
     initData() {
-      customerList({corpType: customerParameter.code}).then(res => {
+      customerList({ corpType: customerParameter.code }).then(res => {
         const column = this.findObject(this.option.column, "parentId");
         column.dicData = res.data.data.records;
       });
@@ -197,15 +198,17 @@ export default {
         values.createTimeA = null;
       }
       values.parentId = 0;
-      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;
-      })
+      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 - 210;
+          }
+        })
+        .finally(() => {
+          this.loading = false;
+        });
     },
     //树桩列点击展开触发
     treeLoad(tree, treeNode, resolve) {
@@ -218,4 +221,8 @@ export default {
 };
 </script>
 
-<style scoped></style>
+<style scoped>
+.page-crad ::v-deep .basic-container__card {
+  height: 94.8vh;
+}
+</style>

src/views/basicData/customerInformation/configuration/mainList.json

@@ -3,7 +3,6 @@
   "lazy": true,
   "tip": false,
   "stripe": true,
-  "simplePage": true,
   "searchShow": true,
   "searchMenuSpan": 8,
   "dialogWidth": "60%",

src/views/basicData/customerInformation/index.vue

@@ -16,7 +16,7 @@
           </div>
         </el-col>
         <el-col :span="19">
-          <basic-container>
+          <basic-container class="page-crad">
             <avue-crud
               :option="option"
               :data="dataList"
@@ -183,10 +183,10 @@ export default {
         }
       },
       page: {
-        pageSize: 10,
-        pagerCount: 5,
+        pageSize: 20,
+        currentPage: 1,
         total: 0,
-        pageSizes: [10, 50, 100, 200, 300]
+        pageSizes: [10,20,30,40,50, 100, 200, 300, 400, 500]
       },
       excelBox: false,
       excelLoading: false,
@@ -380,15 +380,15 @@ export default {
         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;
+          this.option.height = window.innerHeight - 210;
         }
       });
     },
     searchCriteriaSwitch(type) {
       if (type) {
-        this.option.height = this.option.height - 90;
+        this.option.height = this.option.height - 93;
       } else {
-        this.option.height = this.option.height + 90;
+        this.option.height = this.option.height + 93;
       }
       this.$refs.crud.getTableHeight();
     },
@@ -417,4 +417,8 @@ export default {
 };
 </script>
 
-<style scoped></style>
+<style scoped>
+.page-crad ::v-deep .basic-container__card {
+  height: 94.8vh;
+}
+</style>

src/views/basicData/customerManagement/companyMaterial/configuration/mainList.json

@@ -3,9 +3,8 @@
   "lazy": true,
   "tip": false,
   "stripe": true,
-  "simplePage": true,
   "searchShow": true,
-  "searchMenuSpan": 8,
+  "searchMenuSpan": 16,
   "dialogWidth": "60%",
   "tree": true,
   "border": true,

src/views/basicData/customerManagement/companyMaterial/index.vue

@@ -16,7 +16,7 @@
           </div>
         </el-col>
         <el-col :span="19">
-          <basic-container>
+          <basic-container class="page-crad">
             <avue-crud
               :option="option"
               :data="dataList"
@@ -178,11 +178,11 @@ export default {
           children: "children"
         }
       },
-      page: {
-        pageSize: 10,
-        pagerCount: 5,
+        page: {
+        pageSize: 20,
+        currentPage: 1,
         total: 0,
-        pageSizes: [10, 50, 100, 200, 300]
+        pageSizes: [10,20,30,40,50, 100, 200, 300, 400, 500]
       },
       excelBox: false,
       excelLoading: false,
@@ -377,15 +377,15 @@ export default {
         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;
+          this.option.height = window.innerHeight - 210;
         }
       });
     },
     searchCriteriaSwitch(type) {
       if (type) {
-        this.option.height = this.option.height - 90;
+        this.option.height = this.option.height - 93;
       } else {
-        this.option.height = this.option.height + 90;
+        this.option.height = this.option.height + 93;
       }
       this.$refs.crud.getTableHeight();
     },
@@ -414,4 +414,8 @@ export default {
 };
 </script>
 
-<style scoped></style>
+<style scoped>
+.page-crad ::v-deep .basic-container__card {
+  height: 94.8vh;
+}
+</style>

src/views/basicData/customerManagement/companyType/configuration/mainList.json

@@ -6,7 +6,6 @@
   "stripe": true,
   "lazy": true,
   "tip": false,
-  "simplePage": true,
   "searchShow": true,
   "searchMenuSpan": 6,
   "tree": true,

src/views/basicData/customerManagement/companyType/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <basic-container>
+  <basic-container class="page-crad">
     <avue-crud
       :option="option"
       :data="dataList"
@@ -52,10 +52,11 @@ export default {
       loading: false,
       parentId: 0,
       dataList: [],
-      page: {
-        pageSize: 10,
-        pagerCount: 5,
-        total: 0
+           page: {
+        pageSize: 20,
+        currentPage: 1,
+        total: 0,
+        pageSizes: [10,20,30,40,50, 100, 200, 300, 400, 500]
       },
       query: {}
     };
@@ -201,7 +202,7 @@ export default {
         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;
+          this.option.height = window.innerHeight - 210;
         }
       }).finally(()=>{
         this.loading = false;
@@ -218,4 +219,8 @@ export default {
 };
 </script>
 
-<style scoped></style>
+<style scoped>
+.page-crad ::v-deep .basic-container__card {
+  height: 94.8vh;
+}
+</style>

src/views/basicData/customerManagement/supplierMaterial/configuration/mainList.json

@@ -3,7 +3,6 @@
   "lazy": true,
   "tip": false,
   "stripe": true,
-  "simplePage": true,
   "searchShow": true,
   "searchMenuSpan": 8,
   "dialogWidth": "60%",

src/views/basicData/customerManagement/supplierMaterial/index.vue

@@ -16,7 +16,7 @@
           </div>
         </el-col>
         <el-col :span="19">
-          <basic-container>
+          <basic-container class="page-crad">
             <avue-crud
               :option="option"
               :data="dataList"
@@ -183,10 +183,10 @@ export default {
         }
       },
       page: {
-        pageSize: 10,
-        pagerCount: 5,
+        pageSize: 20,
+        currentPage: 1,
         total: 0,
-        pageSizes: [10, 50, 100, 200, 300]
+        pageSizes: [10,20,30,40,50, 100, 200, 300, 400, 500]
       },
       excelBox: false,
       excelLoading: false,
@@ -381,15 +381,15 @@ export default {
         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;
+          this.option.height = window.innerHeight - 210;
         }
       });
     },
     searchCriteriaSwitch(type) {
       if (type) {
-        this.option.height = this.option.height - 90;
+        this.option.height = this.option.height - 93;
       } else {
-        this.option.height = this.option.height + 90;
+        this.option.height = this.option.height + 93;
       }
       this.$refs.crud.getTableHeight();
     },
@@ -417,5 +417,8 @@ export default {
   }
 };
 </script>
-
-<style scoped></style>
+<style scoped>
+.page-crad ::v-deep .basic-container__card {
+  height: 94.8vh;
+}
+</style>

src/views/basicData/customerManagement/supplierType/configuration/mainList.json

@@ -6,7 +6,6 @@
   "index": true,
   "lazy": true,
   "tip": false,
-  "simplePage": true,
   "searchShow": true,
   "searchMenuSpan": 6,
   "tree": true,

src/views/basicData/customerManagement/supplierType/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <basic-container>
+  <basic-container class="page-crad">
     <avue-crud
       :option="option"
       :data="dataList"
@@ -53,9 +53,10 @@ export default {
       parentId: 0,
       dataList: [],
       page: {
-        pageSize: 10,
-        pagerCount: 5,
-        total: 0
+        pageSize: 20,
+        currentPage: 1,
+        total: 0,
+        pageSizes: [10,20,30,40,50, 100, 200, 300, 400, 500]
       },
       query: {}
     };
@@ -201,7 +202,7 @@ export default {
         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;
+          this.option.height = window.innerHeight - 210;
         }
       }).finally(()=>{
         this.loading = false;
@@ -218,4 +219,8 @@ export default {
 };
 </script>
 
-<style scoped></style>
+<style scoped>
+.page-crad ::v-deep .basic-container__card {
+  height: 94.8vh;
+}
+</style>

src/views/basicData/portinformation/configuration/typeOption.json

@@ -6,7 +6,6 @@
   "index": true,
   "lazy": true,
   "tip": false,
-  "simplePage": true,
   "searchShow": true,
   "searchMenuPosition": "right",
   "searchMenuSpan": 12,

src/views/basicData/portinformation/index.vue

@@ -14,7 +14,7 @@
       </div>
     </el-col>
     <el-col :span="20">
-      <basic-container>
+      <basic-container class="page-crad">
         <avue-crud
           ref="crud"
           :data="data"
@@ -106,13 +106,12 @@
       };
     },
     created() {
-
     },
     components: {
       reportDialog
     },
     mounted() {
-      option.height = window.innerHeight - 235 ;
+      option.height = window.innerHeight - 210 ;
       //查询服务类别字典项
       getTypeTree().then(res => {
         this.findObject(this.tableOption.column, "typeId").dicData = res.data.data;
@@ -232,4 +231,7 @@
 </script>
 
 <style scoped lang="scss">
+.page-crad ::v-deep .basic-container__card {
+  height: 94.8vh;
+}
 </style>

src/views/basicData/portinformation/type.vue

@@ -1,5 +1,5 @@
 <template>
-  <basic-container>
+  <basic-container class="page-crad">
     <avue-crud :option="option"
                :data="dataList"
                ref="crud"
@@ -55,7 +55,7 @@
 
     },
     mounted() {
-      option.height = window.innerHeight - 200 ;
+      option.height = window.innerHeight - 210 ;
     },
     methods: {
       onLoad(page, params = {}) {
@@ -170,5 +170,7 @@
 </script>
 
 <style scoped>
-
+.page-crad ::v-deep .basic-container__card {
+  height: 94.8vh;
+}
 </style>

src/views/exportTrade/customerInquiry/index.vue

@@ -160,10 +160,10 @@ export default {
       parentId: 0,
       dataList: [],
       page: {
-        pageSize: 10,
+        pageSize: 20,
         currentPage: 1,
         total: 0,
-        pageSizes: [10, 50, 100, 200, 300, 400, 500]
+        pageSizes: [10,20,30,40,50, 100, 200, 300, 400, 500]
       },
       show: true,
       detailData: {},

src/views/exportTrade/invoice/index.vue

@@ -142,11 +142,11 @@ export default {
       option: {},
       parentId: 0,
       dataList: [],
-      page: {
-        pageSize: 10,
+       page: {
+        pageSize: 20,
         currentPage: 1,
         total: 0,
-        pageSizes: [10, 50, 100, 200, 300, 400, 500]
+        pageSizes: [10,20,30,40,50, 100, 200, 300, 400, 500]
       },
       show: true,
       detailData: {},

src/views/exportTrade/purchaseContract/index.vue

@@ -146,10 +146,10 @@ export default {
       parentId: 0,
       dataList: [],
       page: {
-        pageSize: 10,
+        pageSize: 20,
         currentPage: 1,
         total: 0,
-        pageSizes: [10, 50, 100, 200, 300, 400, 500]
+        pageSizes: [10, 20, 30, 40, 50, 100, 200, 300, 400, 500]
       },
       show: true,
       detailData: {},
@@ -296,8 +296,8 @@ export default {
       );
       if (inSave) {
         this.$nextTick(() => {
-          this.$refs.crud.doLayout()
-        })
+          this.$refs.crud.doLayout();
+        });
         this.$message.success("保存成功");
         //关闭窗口
         this.$refs.crud.$refs.dialogColumn.columnBox = false;
@@ -308,8 +308,8 @@ export default {
       const inSave = await this.delColumnData(this.getColumnName(2), option);
       if (inSave) {
         this.$nextTick(() => {
-          this.$refs.crud.doLayout()
-        })
+          this.$refs.crud.doLayout();
+        });
         this.$message.success("重置成功");
         this.$refs.crud.$refs.dialogColumn.columnBox = false;
       }

src/views/exportTrade/purchaseInquiry/index.vue

@@ -140,10 +140,10 @@ export default {
       parentId: 0,
       dataList: [],
       page: {
-        pageSize: 10,
+        pageSize: 20,
         currentPage: 1,
         total: 0,
-        pageSizes: [10, 50, 100, 200, 300, 400, 500]
+        pageSizes: [10, 20, 30, 40, 50, 100, 200, 300, 400, 500]
       },
       show: true,
       detailData: {},
@@ -316,8 +316,8 @@ export default {
       );
       if (inSave) {
         this.$nextTick(() => {
-          this.$refs.crud.doLayout()
-        })
+          this.$refs.crud.doLayout();
+        });
         this.$message.success("保存成功");
         //关闭窗口
         this.$refs.crud.$refs.dialogColumn.columnBox = false;
@@ -328,8 +328,8 @@ export default {
       const inSave = await this.delColumnData(this.getColumnName(10), option);
       if (inSave) {
         this.$nextTick(() => {
-          this.$refs.crud.doLayout()
-        })
+          this.$refs.crud.doLayout();
+        });
         this.$message.success("重置成功");
         this.$refs.crud.$refs.dialogColumn.columnBox = false;
       }

src/views/exportTrade/receipt/index.vue

@@ -127,10 +127,10 @@ export default {
       parentId: 0,
       dataList: [],
       page: {
-        pageSize: 10,
+        pageSize: 20,
         currentPage: 1,
         total: 0,
-        pageSizes: [10, 50, 100, 200, 300, 400, 500]
+        pageSizes: [10, 20, 30, 40, 50, 100, 200, 300, 400, 500]
       },
       show: true,
       detailData: {},
@@ -328,8 +328,8 @@ export default {
       );
       if (inSave) {
         this.$nextTick(() => {
-          this.$refs.crud.doLayout()
-        })
+          this.$refs.crud.doLayout();
+        });
         this.$message.success("保存成功");
         //关闭窗口
         this.$refs.crud.$refs.dialogColumn.columnBox = false;
@@ -340,8 +340,8 @@ export default {
       const inSave = await this.delColumnData(this.getColumnName(6), option);
       if (inSave) {
         this.$nextTick(() => {
-          this.$refs.crud.doLayout()
-        })
+          this.$refs.crud.doLayout();
+        });
         this.$message.success("重置成功");
         this.$refs.crud.$refs.dialogColumn.columnBox = false;
       }

src/views/exportTrade/salesContract/index.vue

@@ -160,10 +160,10 @@ export default {
       parentId: 0,
       dataList: [],
       page: {
-        pageSize: 10,
+        pageSize: 20,
         currentPage: 1,
         total: 0,
-        pageSizes: [10, 50, 100, 200, 300, 400, 500]
+        pageSizes: [10, 20, 30, 40, 50, 100, 200, 300, 400, 500]
       },
       show: true,
       detailData: {},
@@ -488,8 +488,8 @@ export default {
       );
       if (inSave) {
         this.$nextTick(() => {
-          this.$refs.crud.doLayout()
-        })
+          this.$refs.crud.doLayout();
+        });
         this.$message.success("保存成功");
         //关闭窗口
         this.$refs.crud.$refs.dialogColumn.columnBox = false;
@@ -500,8 +500,8 @@ export default {
       const inSave = await this.delColumnData(this.getColumnName(4), option);
       if (inSave) {
         this.$nextTick(() => {
-          this.$refs.crud.doLayout()
-        })
+          this.$refs.crud.doLayout();
+        });
         this.$message.success("重置成功");
         this.$refs.crud.$refs.dialogColumn.columnBox = false;
       }

src/views/exportTrade/shippingInquiry/index.vue

@@ -99,10 +99,10 @@ export default {
       parentId: 0,
       dataList: [],
       page: {
-        pageSize: 10,
+        pageSize: 20,
         currentPage: 1,
         total: 0,
-        pageSizes: [10, 50, 100, 200, 300, 400, 500]
+        pageSizes: [10, 20, 30, 40, 50, 100, 200, 300, 400, 500]
       },
       show: true,
       detailData: {},
@@ -199,8 +199,8 @@ export default {
       );
       if (inSave) {
         this.$nextTick(() => {
-          this.$refs.crud.doLayout()
-        })
+          this.$refs.crud.doLayout();
+        });
         this.$message.success("保存成功");
         //关闭窗口
         this.$refs.crud.$refs.dialogColumn.columnBox = false;
@@ -211,8 +211,8 @@ export default {
       const inSave = await this.delColumnData(this.getColumnName(12), option);
       if (inSave) {
         this.$nextTick(() => {
-          this.$refs.crud.doLayout()
-        })
+          this.$refs.crud.doLayout();
+        });
         this.$message.success("重置成功");
         this.$refs.crud.$refs.dialogColumn.columnBox = false;
       }

src/views/landTransportation/dispatchingCars/detailPage.vue

@@ -333,7 +333,7 @@ export default {
           }, {
             label: '司机',
             width: 115,
-            prop: 'driverId'
+            prop: 'driverName'
           }, {
             label: '电话',
             width: 160,

src/views/landTransportation/driver/index.vue

@@ -100,6 +100,7 @@ export default {
           label: '状态',
           width: 200,
           type: 'select',
+          overHidden: true,
           dicUrl: "/api/blade-system/dict-biz/dictionary?code=land_order_status",
           props: {
             label: "dictValue",
@@ -111,6 +112,7 @@ export default {
           label: '车队',
           width: 200,
           search: true,
+          overHidden: true,
           type: 'select',
           cascader: ['plateNo'],
           dicUrl: "/api/blade-client/corpsdesc/fleet-list",
@@ -123,6 +125,7 @@ export default {
           label: '尺寸箱型',
           width: 100,
           search: true,
+          overHidden: true,
           prop: 'ctnType'
         }, {
           label: '箱量',
@@ -133,12 +136,14 @@ export default {
           width: 160,
           prop: 'landWeight',
           controls: false,
+          overHidden: true,
           precision: 6,
           type: 'number'
         }, {
           label: '车号',
           width: 150,
           prop: 'vehicleId',
+          overHidden: true,
           type: 'select',
           dicUrl: "/api/blade-client/land-vehicle/vehicle-list?fleetId={{key}}",
           props: {
@@ -149,26 +154,33 @@ export default {
           label: '司机',
           width: 115,
           search: true,
+          overHidden: true,
           prop: 'driverName'
         }, {
           label: '电话',
           width: 160,
+          overHidden: true,
           prop: 'tel'
         }, {
           label: '箱号',
           cell: true,
+          overHidden: true,
           prop: 'ctnNo'
         }, {
           label: '陆运费(C)',
+          overHidden: true,
           prop: 'landAmountC'
         }, {
           label: '委托备注',
+          overHidden: true,
           prop: 'remarks'
         }, {
           label: '车队备注',
+          overHidden: true,
           prop: 'fleetRemarks'
         }, {
           label: '司机备注',
+          overHidden: true,
           cell: true,
           prop: 'driverRemarks'
         }

src/views/landTransportation/motorcadeDriver/index.vue

@@ -95,6 +95,7 @@ export default {
           }],
         column: [{
           label: '状态',
+          overHidden: true,
           width: 200,
           type: 'select',
           dicUrl: "/api/blade-system/dict-biz/dictionary?code=land_order_status",
@@ -110,6 +111,7 @@ export default {
           search: true,
           type: 'select',
           cascader: ['plateNo'],
+          overHidden: true,
           dicUrl: "/api/blade-client/corpsdesc/fleet-list",
           props: {
             label: "cname",
@@ -120,16 +122,19 @@ export default {
           label: '尺寸箱型',
           width: 100,
           search: true,
+          overHidden: true,
           prop: 'ctnType'
         }, {
           label: '箱量',
           width: 50,
+          overHidden: true,
           prop: 'ctnQuantity'
         }, {
           label: '重量',
           width: 160,
           prop: 'landWeight',
           controls: false,
+          overHidden: true,
           precision: 6,
           type: 'number'
         }, {
@@ -137,6 +142,7 @@ export default {
           width: 150,
           cell: true,
           prop: 'vehicleId',
+          overHidden: true,
           type: 'select',
           dicUrl: "/api/blade-client/land-vehicle/vehicle-list?fleetId={{key}}",
           props: {
@@ -160,27 +166,34 @@ export default {
           width: 115,
           search: true,
           // prop: 'driverId'
+          overHidden: true,
           prop: 'driverName'
         }, {
           label: '电话',
+          overHidden: true,
           width: 160,
           prop: 'tel'
         }, {
           label: '陆运费(D)',
+          overHidden: true,
           prop: 'landAmountD'
         }, {
           label: '陆运费(C)',
+          overHidden: true,
           cell: true,
           prop: 'landAmountC'
         }, {
           label: '委托备注',
+          overHidden: true,
           prop: 'remarks'
         }, {
           label: '车队备注',
           cell: true,
+          overHidden: true,
           prop: 'fleetRemarks'
         }, {
           label: '司机备注',
+          overHidden: true,
           prop: 'driverRemarks'
         }
         ]

src/views/landTransportation/placeAnOrder/detailPage.vue

@@ -135,6 +135,8 @@
           <crop-select
               :disabled="goodsForm.status === 1"
               v-model="goodsForm.corpId"
+              @getCorpData="getCorpData"
+
           ></crop-select>
         </template>
       </avue-form>
@@ -374,7 +376,7 @@ export default {
           valueFormat: 'yyyy-MM-dd HH:mm:ss',
           prop: 'arrivalTime'
         }, {
-          label: '工厂名称',
+          label: '船名航次',
           prop: 'factory'
         }, {
           label: '货物名称',
@@ -796,6 +798,10 @@ export default {
         });
       });
     },
+    //选择客户名称带出所属公司
+    getCorpData(row) {
+      this.goodsForm.belongCompany = row.belongCompany
+    },
     //自定义表头
     renderHeader(h) {
       return (

src/views/statisticAnalysis/salesProfit/index.vue

@@ -104,9 +104,11 @@ export default {
       dataList: [],
       loading: false,
       detailData: {},
-      page: {
-        pageSize: 10,
-        currentPage: 1
+        page: {
+        pageSize: 20,
+        currentPage: 1,
+        total: 0,
+        pageSizes: [10,20,30,40,50, 100, 200, 300, 400, 500]
       },
       option: {
         searchShow: true,
@@ -340,9 +342,9 @@ export default {
     },
     searchCriteriaSwitch(type) {
       if (type) {
-        this.option.height = this.option.height - 51;
+        this.option.height = this.option.height - 46;
       } else {
-        this.option.height = this.option.height + 51;
+        this.option.height = this.option.height + 46;
       }
       this.$refs.crud.getTableHeight();
     },