浏览代码

样式调整

chenrui 3 年之前
父节点
当前提交
a7f141c458
共有 29 个文件被更改,包括 70 次插入55 次删除
  1. 2 1
      src/components/custom.less
  2. 1 1
      src/components/global.less
  3. 1 1
      src/views/allocationManagement/chainTransferOut/list.vue
  4. 1 1
      src/views/allocationManagement/storeTransferOut/list.vue
  5. 1 1
      src/views/allocationManagement/warehouseAllocation/list.vue
  6. 1 1
      src/views/basicData/customerTypeManagement/list.vue
  7. 1 1
      src/views/bulkManagement/bulkReturnGoods/list.vue
  8. 1 1
      src/views/bulkManagement/bulkWarehousingOrder/list.vue
  9. 1 1
      src/views/customerManagement/customerInfo/list.vue
  10. 2 2
      src/views/financialManagement/companyReceivablePayable/list.vue
  11. 1 1
      src/views/financialManagement/expenseManagement/list.vue
  12. 1 15
      src/views/financialManagement/inventoryCheckAudit/list.vue
  13. 1 1
      src/views/financialManagement/withdrawalManagement/list.vue
  14. 1 1
      src/views/inventoryManagement/inventoryChecking/list.vue
  15. 1 1
      src/views/inventoryManagement/inventoryWarning/list.vue
  16. 1 1
      src/views/inventoryManagement/satelliteWarehouseInventory/list.vue
  17. 1 1
      src/views/inventoryManagement/warehouse/list.vue
  18. 14 2
      src/views/notice/list.vue
  19. 1 1
      src/views/power/role/roleList.vue
  20. 1 1
      src/views/power/user/userList.vue
  21. 1 1
      src/views/productManagement/productBrand/list.vue
  22. 1 1
      src/views/productManagement/productInfo/list.vue
  23. 1 1
      src/views/purchasingManagement/purchaseOrder/list.vue
  24. 1 1
      src/views/purchasingManagement/purchaseReturn/list.vue
  25. 1 1
      src/views/salesManagement/salesQuery/list.vue
  26. 1 1
      src/views/salesManagement/salesReturn/list.vue
  27. 14 6
      src/views/storeManagement/bind/list.vue
  28. 14 6
      src/views/storeManagement/userAuthorization/list.vue
  29. 1 1
      src/views/supplierManagement/supplierInfo/list.vue

+ 2 - 1
src/components/custom.less

@@ -71,7 +71,8 @@ body{
 // 内容盒子样式
 .content {
   .table-operator {
-    padding: 8px 0;
+    // padding: 8px 0;
+    padding: 0 0 8px;
   }
   .table-operator-nobor{
     padding: 0 0 10px 0;

+ 1 - 1
src/components/global.less

@@ -532,7 +532,7 @@ body {
 .content {
   .table-operator {
     padding: 15px 0;
-    border-top: 1px solid #eee;
+    // border-top: 1px solid #eee;
     button {
       margin-right: 8px;
     }

+ 1 - 1
src/views/allocationManagement/chainTransferOut/list.vue

@@ -293,7 +293,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 245
+      this.tableHeight = window.innerHeight - tableSearchH - 235
     }
   },
   mounted () {

+ 1 - 1
src/views/allocationManagement/storeTransferOut/list.vue

@@ -278,7 +278,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 245
+      this.tableHeight = window.innerHeight - tableSearchH - 235
     }
   },
   mounted () {

+ 1 - 1
src/views/allocationManagement/warehouseAllocation/list.vue

@@ -236,7 +236,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 245
+      this.tableHeight = window.innerHeight - tableSearchH - 235
     }
   },
   mounted () {

+ 1 - 1
src/views/basicData/customerTypeManagement/list.vue

@@ -140,7 +140,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 245
+      this.tableHeight = window.innerHeight - tableSearchH - 235
     }
   },
   mounted () {

+ 1 - 1
src/views/bulkManagement/bulkReturnGoods/list.vue

@@ -306,7 +306,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 245
+      this.tableHeight = window.innerHeight - tableSearchH - 235
     }
   },
   mounted () {

+ 1 - 1
src/views/bulkManagement/bulkWarehousingOrder/list.vue

@@ -336,7 +336,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 280
+      this.tableHeight = window.innerHeight - tableSearchH - 270
     }
   },
   mounted () {

+ 1 - 1
src/views/customerManagement/customerInfo/list.vue

@@ -325,7 +325,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 245
+      this.tableHeight = window.innerHeight - tableSearchH - 235
     }
   },
   mounted () {

+ 2 - 2
src/views/financialManagement/companyReceivablePayable/list.vue

@@ -143,7 +143,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 235
+      this.tableHeight = window.innerHeight - tableSearchH - 230
     }
   },
   mounted () {
@@ -157,7 +157,7 @@ export default {
 <style lang="less">
   .companyReceivablePayableList-wrap{
     .sTable{
-      margin-top: 15px;
+      margin-top: 10px;
     }
   }
 </style>

+ 1 - 1
src/views/financialManagement/expenseManagement/list.vue

@@ -305,7 +305,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 280
+      this.tableHeight = window.innerHeight - tableSearchH - 270
     }
   },
   mounted () {

+ 1 - 15
src/views/financialManagement/inventoryCheckAudit/list.vue

@@ -164,7 +164,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 238
+      this.tableHeight = window.innerHeight - tableSearchH - 195
     }
   },
   mounted () {
@@ -183,17 +183,3 @@ export default {
   }
 }
 </script>
-<style lang="less">
-  .inventoryCheckAuditList-wrap{
-    .sTable{
-      margin-top: 15px;
-    }
-	.active{
-		color: #ed1c24;
-		cursor: pointer;
-	}
-	.common{
-		color: rgba(0, 0, 0, 0.65);
-	}
-  }
-</style>

+ 1 - 1
src/views/financialManagement/withdrawalManagement/list.vue

@@ -141,7 +141,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 245 - 217.5
+      this.tableHeight = window.innerHeight - tableSearchH - 235 - 217.5
     }
   },
   mounted () {

+ 1 - 1
src/views/inventoryManagement/inventoryChecking/list.vue

@@ -267,7 +267,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 245
+      this.tableHeight = window.innerHeight - tableSearchH - 235
     }
   },
   mounted () {

+ 1 - 1
src/views/inventoryManagement/inventoryWarning/list.vue

@@ -425,7 +425,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 245
+      this.tableHeight = window.innerHeight - tableSearchH - 235
     }
   },
   mounted () {

+ 1 - 1
src/views/inventoryManagement/satelliteWarehouseInventory/list.vue

@@ -187,7 +187,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 245
+      this.tableHeight = window.innerHeight - tableSearchH - 235
     }
   },
   mounted () {

+ 1 - 1
src/views/inventoryManagement/warehouse/list.vue

@@ -155,7 +155,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 245
+      this.tableHeight = window.innerHeight - tableSearchH - 235
     }
   },
   mounted () {

+ 14 - 2
src/views/notice/list.vue

@@ -1,7 +1,7 @@
 <template>
   <a-card size="small" :bordered="false" class="noticeList-wrap">
     <!-- 搜索条件 -->
-    <div class="table-page-search-wrapper">
+    <div ref="tableSearch" class="table-page-search-wrapper">
       <a-form layout="inline" @keyup.enter.native="handelSearch(1)">
         <a-row :gutter="15">
           <a-col :md="6" :sm="24">
@@ -23,8 +23,9 @@
     </div>
     <!-- 列表 -->
     <a-table
-      class="sTable"
+      class="sTable fixPagination"
       ref="table"
+      :style="{ height: tableHeight+84.5+'px' }"
       size="small"
       :rowKey="(record) => record.id"
       :columns="columns"
@@ -69,6 +70,7 @@ export default {
           title: ''
         }
       },
+      tableHeight: 0,
       disabled: false, //  查询、重置按钮是否可操作
       columns: [
         { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
@@ -193,8 +195,18 @@ export default {
     closeModal () {
       this.itemId = ''
       this.openModal = false
+    },
+    setTableH () {
+      const tableSearchH = this.$refs.tableSearch.offsetHeight
+      this.tableHeight = window.innerHeight - tableSearchH - 210
     }
   },
+  mounted () {
+    const _this = this
+    this.$nextTick(() => { // 页面渲染完成后的回调
+      _this.setTableH()
+    })
+  },
   beforeRouteEnter (to, from, next) {
     next(vm => {
       vm.openModal = false

+ 1 - 1
src/views/power/role/roleList.vue

@@ -218,7 +218,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 245
+      this.tableHeight = window.innerHeight - tableSearchH - 235
     }
   },
   mounted () {

+ 1 - 1
src/views/power/user/userList.vue

@@ -223,7 +223,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 245
+      this.tableHeight = window.innerHeight - tableSearchH - 235
     }
   },
   mounted () {

+ 1 - 1
src/views/productManagement/productBrand/list.vue

@@ -156,7 +156,7 @@ export default {
     handleImport () {},
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 245
+      this.tableHeight = window.innerHeight - tableSearchH - 235
     }
   },
   mounted () {

+ 1 - 1
src/views/productManagement/productInfo/list.vue

@@ -321,7 +321,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 245
+      this.tableHeight = window.innerHeight - tableSearchH - 235
     }
   },
   mounted () {

+ 1 - 1
src/views/purchasingManagement/purchaseOrder/list.vue

@@ -292,7 +292,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 285
+      this.tableHeight = window.innerHeight - tableSearchH - 275
     }
   },
   mounted () {

+ 1 - 1
src/views/purchasingManagement/purchaseReturn/list.vue

@@ -259,7 +259,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 245
+      this.tableHeight = window.innerHeight - tableSearchH - 235
     }
   },
   mounted () {

+ 1 - 1
src/views/salesManagement/salesQuery/list.vue

@@ -415,7 +415,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 285
+      this.tableHeight = window.innerHeight - tableSearchH - 275
     }
   },
   mounted () {

+ 1 - 1
src/views/salesManagement/salesReturn/list.vue

@@ -268,7 +268,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 280
+      this.tableHeight = window.innerHeight - tableSearchH - 270
     }
   },
   mounted () {

+ 14 - 6
src/views/storeManagement/bind/list.vue

@@ -2,7 +2,7 @@
   <a-card size="small" :bordered="false" class="bindList-wrap">
     <a-spin :spinning="spinning" tip="Loading...">
       <!-- 搜索条件 -->
-      <div class="table-page-search-wrapper">
+      <div ref="tableSearch" class="table-page-search-wrapper">
         <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
           <a-row :gutter="15">
             <a-col :md="6" :sm="24">
@@ -28,8 +28,9 @@
       </div>
       <!-- 列表 -->
       <s-table
-        class="sTable"
+        class="sTable fixPagination"
         ref="table"
+        :style="{ height: tableHeight+84.5+'px' }"
         size="small"
         :rowKey="(record) => record.orgSn"
         :columns="columns"
@@ -52,7 +53,7 @@
             @click="handleDel(record)"
             v-if="$hasPermissions('B_storeManagementBind_del')"
             id="bindList-del-btn">删除</a-button>
-            <span v-if="!$hasPermissions('B_storeManagementBind_edit') &&!$hasPermissions('B_storeManagementBind_del')">--</span>
+          <span v-if="!$hasPermissions('B_storeManagementBind_edit') &&!$hasPermissions('B_storeManagementBind_del')">--</span>
         </template>
       </s-table>
     </a-spin>
@@ -85,9 +86,6 @@ export default {
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
         this.disabled = true
-        if (this.tableHeight == 0) {
-          this.tableHeight = window.innerHeight - 380
-        }
         return jxsorgRelationList(Object.assign(parameter, this.queryParam)).then(res => {
           const data = res.data
           const no = (data.pageNo - 1) * data.pageSize
@@ -143,7 +141,17 @@ export default {
           })
         }
       })
+    },
+    setTableH () {
+      const tableSearchH = this.$refs.tableSearch.offsetHeight
+      this.tableHeight = window.innerHeight - tableSearchH - 235
     }
+  },
+  mounted () {
+    const _this = this
+    this.$nextTick(() => { // 页面渲染完成后的回调
+      _this.setTableH()
+    })
   }
 }
 </script>

+ 14 - 6
src/views/storeManagement/userAuthorization/list.vue

@@ -2,7 +2,7 @@
   <a-card size="small" :bordered="false" class="userAuthList-wrap">
     <a-spin :spinning="spinning" tip="Loading...">
       <!-- 搜索条件 -->
-      <div class="table-page-search-wrapper">
+      <div ref="tableSearch" class="table-page-search-wrapper">
         <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
           <a-row :gutter="15">
             <a-col :md="6" :sm="24">
@@ -33,8 +33,9 @@
       </div>
       <!-- 列表 -->
       <s-table
-        class="sTable"
+        class="sTable fixPagination"
         ref="table"
+        :style="{ height: tableHeight+84.5+'px' }"
         size="small"
         :rowKey="(record) => record.userSn"
         :columns="columns"
@@ -61,7 +62,7 @@
             @click="handleDel(record)"
             v-if="$hasPermissions('B_storeManagementUserAuth_del')"
             id="userAuthList-del-btn">删除</a-button>
-            <span v-if="!$hasPermissions('B_storeManagementUserAuth_edit') && !$hasPermissions('B_storeManagementUserAuth_del')">--</span>
+          <span v-if="!$hasPermissions('B_storeManagementUserAuth_edit') && !$hasPermissions('B_storeManagementUserAuth_del')">--</span>
         </template>
       </s-table>
     </a-spin>
@@ -96,9 +97,6 @@ export default {
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
         this.disabled = true
-        if (this.tableHeight == 0) {
-          this.tableHeight = window.innerHeight - 380
-        }
         return userOrgList(Object.assign(parameter, this.queryParam)).then(res => {
           const data = res.data
           const no = (data.pageNo - 1) * data.pageSize
@@ -153,7 +151,17 @@ export default {
           })
         }
       })
+    },
+    setTableH () {
+      const tableSearchH = this.$refs.tableSearch.offsetHeight
+      this.tableHeight = window.innerHeight - tableSearchH - 235
     }
+  },
+  mounted () {
+    const _this = this
+    this.$nextTick(() => { // 页面渲染完成后的回调
+      _this.setTableH()
+    })
   }
 }
 </script>

+ 1 - 1
src/views/supplierManagement/supplierInfo/list.vue

@@ -127,7 +127,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 245
+      this.tableHeight = window.innerHeight - tableSearchH - 235
     }
   },
   mounted () {