chenrui hace 3 años
padre
commit
04085ca305
Se han modificado 29 ficheros con 34 adiciones y 35 borrados
  1. 7 1
      src/components/custom.less
  2. 1 1
      src/components/global.less
  3. 1 1
      src/layouts/BasicLayout.vue
  4. 1 1
      src/views/allocationManagement/transferOut/list.vue
  5. 1 1
      src/views/basicData/warehouse/list.vue
  6. 1 1
      src/views/dealerManagement/dealerAccountManagement/list.vue
  7. 1 1
      src/views/dealerManagement/merchantInfoManagement/list.vue
  8. 0 7
      src/views/financialManagement/inventoryReview/list.vue
  9. 1 1
      src/views/inventoryManagement/inventoryWarning/list.vue
  10. 1 1
      src/views/power/role/roleList.vue
  11. 1 1
      src/views/power/user/userList.vue
  12. 1 1
      src/views/productManagement/productBrand/list.vue
  13. 1 1
      src/views/productManagement/productCategory/list.vue
  14. 1 1
      src/views/productManagement/productInfo/list.vue
  15. 1 1
      src/views/productManagement/productUniversal/list.vue
  16. 1 1
      src/views/promotionRulesManagement/promotionRules/list.vue
  17. 1 1
      src/views/purchasingManagement/bulkWarehousingOrder/list.vue
  18. 1 1
      src/views/reportData/actualSalesReport/list.vue
  19. 1 1
      src/views/reportData/billingReturnReport/list.vue
  20. 1 1
      src/views/reportData/returnSlipReport/list.vue
  21. 1 1
      src/views/reportData/salesAmountReport/list.vue
  22. 1 1
      src/views/reportData/salesReturnReport/list.vue
  23. 1 1
      src/views/reportData/salesReturnsReport/list.vue
  24. 1 1
      src/views/reportData/salesSlipReport/list.vue
  25. 1 1
      src/views/salesManagement/salesQuery/list.vue
  26. 1 1
      src/views/salesManagement/salesReturn/list.vue
  27. 1 1
      src/views/salesManagement/waitDispatch/edit.vue
  28. 1 1
      src/views/setting/noticeManagement/list.vue
  29. 1 1
      src/views/supplierManagement/supplierInfo/list.vue

+ 7 - 1
src/components/custom.less

@@ -5,6 +5,9 @@ body{
   span,td,label,.ant-btn-sm{
     font-size: 13px!important;
   }
+  .ant-form-item-label > label{
+    color: #333!important;
+  }
 }
 // 查询条件样式
 .table-page-search-wrapper {
@@ -65,7 +68,8 @@ body{
 // 内容盒子样式
 .content {
   .table-operator {
-    padding: 8px 0;
+    // padding: 8px 0;
+    padding: 0 0 8px;
   }
   .table-operator-nobor{
     padding: 0 0 10px 0;
@@ -128,12 +132,14 @@ body{
       .ant-table-header tr th, .ant-table-thead tr th{
         background: #fafafa!important;
         font-weight: bold;
+        color: #333!important;
       }
     }
   }
   .ant-table-row{
     .ant-table-row-cell-break-word, td{
       padding: 6px 4px!important;
+      color: #333!important;
     }
   }
   .ant-pagination.ant-table-pagination{

+ 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/layouts/BasicLayout.vue

@@ -39,7 +39,7 @@
         @toggle="toggle"
       />
       <!-- layout content -->
-      <a-layout-content :style="{ height: '100%', margin: '31px 20px 0', paddingTop: multiTab&&fixedHeader ? '66px' : (!multiTab&&fixedHeader?'45px':'0') }">
+      <a-layout-content :style="{ height: '100%', margin: '31px 20px 0', paddingTop: multiTab&&fixedHeader ? '61px' : (!multiTab&&fixedHeader?'45px':'0') }">
         <transition name="page-transition">
           <route-view v-if="isRouterAlive"/>
         </transition>

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

@@ -283,7 +283,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/warehouse/list.vue

@@ -153,7 +153,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/dealerManagement/dealerAccountManagement/list.vue

@@ -210,7 +210,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/dealerManagement/merchantInfoManagement/list.vue

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

+ 0 - 7
src/views/financialManagement/inventoryReview/list.vue

@@ -165,10 +165,3 @@ export default {
   }
 }
 </script>
-<style lang="less">
-  .inventoryReviewList-wrap{
-    .sTable{
-      margin-top: 15px;
-    }
-  }
-</style>

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

@@ -418,7 +418,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/role/roleList.vue

@@ -219,7 +219,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

@@ -222,7 +222,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

@@ -202,7 +202,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/productCategory/list.vue

@@ -75,7 +75,7 @@ export default {
       loadData: parameter => {
         this.disabled = true
         if (this.tableHeight == 0) {
-          this.tableHeight = window.innerHeight - 200
+          this.tableHeight = window.innerHeight - 190
         }
         return productTypeQuery({}).then(res => {
           //  递归去除空children

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

@@ -577,7 +577,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/productUniversal/list.vue

@@ -208,7 +208,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/promotionRulesManagement/promotionRules/list.vue

@@ -206,7 +206,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/bulkWarehousingOrder/list.vue

@@ -272,7 +272,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/reportData/actualSalesReport/list.vue

@@ -41,7 +41,7 @@
               </a-col>
               <a-col :md="12" :sm="24">
                 <a-row>
-                  <a-form-model-item label="地区">
+                  <a-form-model-item label="地区" style="margin-bottom: 0!important;">
                     <a-col span="7">
                       <a-form-model-item prop="dealerProvinceSn" style="margin: 0;">
                         <a-select v-model="queryParam.dealer.provinceSn" allowClear @change="getCityList" placeholder="请选择省">

+ 1 - 1
src/views/reportData/billingReturnReport/list.vue

@@ -41,7 +41,7 @@
               </a-col>
               <a-col :md="12" :sm="24">
                 <a-row>
-                  <a-form-model-item label="地区">
+                  <a-form-model-item label="地区" style="margin-bottom: 0!important;">
                     <a-col span="7">
                       <a-form-model-item prop="dealerProvinceSn" style="margin: 0;">
                         <a-select v-model="queryParam.dealer.provinceSn" allowClear @change="getCityList" placeholder="请选择省">

+ 1 - 1
src/views/reportData/returnSlipReport/list.vue

@@ -46,7 +46,7 @@
               </a-col>
               <a-col :md="12" :sm="24">
                 <a-row>
-                  <a-form-model-item label="地区">
+                  <a-form-model-item label="地区" style="margin-bottom: 0!important;">
                     <a-col span="7">
                       <a-form-model-item prop="dealerProvinceSn" style="margin: 0;">
                         <a-select v-model="queryParam.dealer.provinceSn" allowClear @change="getCityList" placeholder="请选择省">

+ 1 - 1
src/views/reportData/salesAmountReport/list.vue

@@ -41,7 +41,7 @@
               </a-col>
               <a-col :md="12" :sm="24">
                 <a-row>
-                  <a-form-model-item label="地区">
+                  <a-form-model-item label="地区" style="margin-bottom: 0!important;">
                     <a-col span="7">
                       <a-form-model-item prop="dealerProvinceSn" style="margin: 0;">
                         <a-select v-model="queryParam.dealer.provinceSn" allowClear @change="getCityList" placeholder="请选择省">

+ 1 - 1
src/views/reportData/salesReturnReport/list.vue

@@ -41,7 +41,7 @@
               </a-col>
               <a-col :md="12" :sm="24">
                 <a-row>
-                  <a-form-model-item label="地区">
+                  <a-form-model-item label="地区" style="margin-bottom: 0!important;">
                     <a-col span="7">
                       <a-form-model-item prop="dealerProvinceSn" style="margin: 0;">
                         <a-select v-model="queryParam.dealer.provinceSn" allowClear @change="getCityList" placeholder="请选择省">

+ 1 - 1
src/views/reportData/salesReturnsReport/list.vue

@@ -46,7 +46,7 @@
               </a-col>
               <a-col :md="11" :sm="24">
                 <a-row>
-                  <a-form-model-item label="地区">
+                  <a-form-model-item label="地区" style="margin-bottom: 0!important;">
                     <a-col span="7">
                       <a-form-model-item prop="dealerProvinceSn" style="margin: 0;">
                         <a-select v-model="queryParam.dealerProvinceSn" allowClear @change="getCityList" placeholder="请选择省">

+ 1 - 1
src/views/reportData/salesSlipReport/list.vue

@@ -46,7 +46,7 @@
               </a-col>
               <a-col :md="12" :sm="24">
                 <a-row>
-                  <a-form-model-item label="地区">
+                  <a-form-model-item label="地区" style="margin-bottom: 0!important;">
                     <a-col span="7">
                       <a-form-model-item prop="dealerProvinceSn" style="margin: 0;">
                         <a-select v-model="queryParam.dealer.provinceSn" allowClear @change="getCityList" placeholder="请选择省">

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

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

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

@@ -378,7 +378,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/salesManagement/waitDispatch/edit.vue

@@ -43,7 +43,7 @@
         <a-alert type="info" style="margin-bottom: 10px;">
           <div slot="message" class="total-bar">
             <div>
-              本次下推款数:<strong>{{ totalData&&(totalData.totalCategory || totalData.totalCategory==0) ? totalData.totalCategory : '--' }}</strong>;
+              本次下推款数:<strong>{{ totalData&&(totalData.totalCategory || totalData.totalCategory==0) ? totalData.totalCategory : '--' }}</strong>;
               本次下推数量:<strong>{{ totalData&&(totalData.totalQty || totalData.totalQty==0) ? totalData.totalQty : '--' }}</strong>;
             </div>
             <div>

+ 1 - 1
src/views/setting/noticeManagement/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/supplierManagement/supplierInfo/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 () {