chenrui пре 3 година
родитељ
комит
7de3ff7379
60 измењених фајлова са 110 додато и 82 уклоњено
  1. 1 1
      src/components/Menu/SideMenu.vue
  2. 44 16
      src/components/global.less
  3. 1 1
      src/layouts/BasicLayout.vue
  4. 1 1
      src/views/allocationManagement/chainTransferIn/detail.vue
  5. 1 1
      src/views/allocationManagement/chainTransferIn/edit.vue
  6. 1 1
      src/views/allocationManagement/chainTransferOut/detail.vue
  7. 1 1
      src/views/allocationManagement/chainTransferOut/edit.vue
  8. 1 1
      src/views/allocationManagement/chainTransferOut/list.vue
  9. 1 1
      src/views/allocationManagement/storeTransferOut/detail.vue
  10. 1 1
      src/views/allocationManagement/storeTransferOut/edit.vue
  11. 1 1
      src/views/allocationManagement/storeTransferOut/list.vue
  12. 1 1
      src/views/allocationManagement/warehouseAllocation/detail.vue
  13. 1 1
      src/views/allocationManagement/warehouseAllocation/edit.vue
  14. 1 1
      src/views/allocationManagement/warehouseAllocation/list.vue
  15. 1 1
      src/views/bulkManagement/bulkReturnGoods/edit.vue
  16. 1 1
      src/views/bulkManagement/bulkReturnGoods/list.vue
  17. 1 1
      src/views/bulkManagement/bulkWarehousingOrder/detail.vue
  18. 1 1
      src/views/bulkManagement/bulkWarehousingOrder/edit.vue
  19. 2 2
      src/views/bulkManagement/bulkWarehousingOrder/list.vue
  20. 1 1
      src/views/customerManagement/customerInfo/list.vue
  21. 1 1
      src/views/financialManagement/companyCollectionPayment/detail.vue
  22. 2 2
      src/views/financialManagement/companyCollectionPayment/list.vue
  23. 1 1
      src/views/financialManagement/companyReceivablePayable/collectionPayment.vue
  24. 1 1
      src/views/financialManagement/companyReceivablePayable/detail.vue
  25. 1 1
      src/views/financialManagement/companyReceivablePayable/list.vue
  26. 1 1
      src/views/financialManagement/expenseManagement/list.vue
  27. 1 1
      src/views/financialManagement/financialCollection/list.vue
  28. 1 1
      src/views/financialManagement/financialPayment/list.vue
  29. 1 1
      src/views/financialManagement/inventoryReview/detail.vue
  30. 1 1
      src/views/financialManagement/inventoryReview/list.vue
  31. 1 1
      src/views/financialManagement/ledgerRecord/list.vue
  32. 1 1
      src/views/financialManagement/warehousingAudit/list.vue
  33. 1 1
      src/views/inventoryManagement/inventoryChecking/detail.vue
  34. 1 1
      src/views/inventoryManagement/inventoryChecking/financialAuditDetail.vue
  35. 1 1
      src/views/inventoryManagement/inventoryChecking/makeInventoryDetail.vue
  36. 1 1
      src/views/inventoryManagement/inventoryChecking/selfDisk.vue
  37. 1 1
      src/views/inventoryManagement/inventoryQuery/detailModal.vue
  38. 2 2
      src/views/inventoryManagement/inventoryQuery/list.vue
  39. 1 1
      src/views/inventoryManagement/inventoryQuery/warehouseDetail.vue
  40. 1 1
      src/views/inventoryManagement/inventoryWarning/list.vue
  41. 1 1
      src/views/inventoryManagement/warehouse/list.vue
  42. 2 2
      src/views/productManagement/priceChangeRecord/list.vue
  43. 1 1
      src/views/productManagement/productBrand/list.vue
  44. 1 1
      src/views/productManagement/productCategory/list.vue
  45. 1 1
      src/views/productManagement/productInfo/list.vue
  46. 1 1
      src/views/productManagement/productInfoJg/list.vue
  47. 2 2
      src/views/purchasingManagement/purchaseOrder/detail.vue
  48. 1 1
      src/views/purchasingManagement/purchaseOrder/edit.vue
  49. 2 2
      src/views/purchasingManagement/purchaseOrder/list.vue
  50. 1 1
      src/views/purchasingManagement/purchaseOrder/warehousing.vue
  51. 1 1
      src/views/reportData/chainSalesDetailReport/list.vue
  52. 1 1
      src/views/reportData/chainSalesReport/list.vue
  53. 1 1
      src/views/reportData/chainStockReport/detailModal.vue
  54. 1 1
      src/views/reportData/chainStockReport/list.vue
  55. 1 1
      src/views/reportData/customerReport/list.vue
  56. 1 1
      src/views/salesManagement/quotation/detail.vue
  57. 1 1
      src/views/salesManagement/quotation/edit.vue
  58. 2 2
      src/views/salesManagement/salesQuery/list.vue
  59. 1 1
      src/views/salesManagement/salesReturn/list.vue
  60. 1 1
      src/views/supplierManagement/supplierInfo/list.vue

+ 1 - 1
src/components/Menu/SideMenu.vue

@@ -12,7 +12,7 @@
       :theme="theme"
       :mode="mode"
       @select="onSelect"
-      style="padding: 16px 0px;"></s-menu>
+      style="padding: 10px 0px;"></s-menu>
   </a-layout-sider>
 
 </template>

+ 44 - 16
src/components/global.less

@@ -18,7 +18,7 @@ body {
   &.tablet {
     .ant-layout-content {
       .content {
-        margin: 24px 0 0;
+        margin: 12px 0 0;
       }
     }
 
@@ -61,7 +61,7 @@ body {
   
   .trigger {
     font-size: 20px;
-    line-height: 64px;
+    line-height: 44px;
     padding: 0 24px;
     cursor: pointer;
     transition: color 0.3s;
@@ -94,7 +94,7 @@ body {
       position: fixed;
       z-index: 8;
       width: 100%;
-      top: 64px;
+      top: 44px;
       right:0;
       margin: auto;
     }
@@ -147,7 +147,7 @@ body {
       position: fixed;
       z-index: 8;
       width: 100%;
-      top: 64px;
+      top: 44px;
       right:0;
       margin: auto;
       &.ant-header-side-opened {
@@ -161,13 +161,16 @@ body {
   }
 
   .header {
-    height: 64px;
+    height: 44px;
     padding: 0 12px 0 0;
     background: #fff;
     box-shadow: 0 1px 4px rgba(0, 21, 41, 0.08);
     position: relative;
   }
-
+  .ant-layout-header{
+    height: 44px;
+    line-height: 44px;
+  }
   .header,
   .top-nav-header-index {
     .user-wrapper {
@@ -227,9 +230,9 @@ body {
           }
 
           .logo.top-nav-header {
-            flex: 0 0 56px;
+            flex: 0 0 36px;
             text-align: center;
-            line-height: 58px;
+            line-height: 38px;
             h1 {
               display: none;
             }
@@ -279,14 +282,14 @@ body {
       margin: auto;
       padding-left: 0;
       display: flex;
-      height: 64px;
+      height: 44px;
 
       .ant-menu.ant-menu-horizontal {
         max-width: 835px;
         flex: 0 1 835px;
         border: none;
-        height: 64px;
-        line-height: 64px;
+        height: 44px;
+        line-height: 44px;
       }
 
       .header-index-left {
@@ -296,9 +299,9 @@ body {
         .logo.top-nav-header {
           flex: 0 0 auto;
           width: auto;
-          height: 64px;
+          height: 44px;
           position: relative;
-          line-height: 64px;
+          line-height: 44px;
           transition: all 0.3s;
           overflow: hidden;
 
@@ -324,7 +327,7 @@ body {
       .header-index-right {
         flex: 0 0 238px;
         align-self: flex-end;
-        height: 64px;
+        height: 44px;
         overflow: hidden;
 
         .content-box {
@@ -414,10 +417,10 @@ body {
   
   .logo {
     position: relative;
-    height: 64px;
+    height: 44px;
     padding-left: 10px;
     overflow: hidden;
-    line-height: 64px;
+    line-height: 44px;
     background: #002140;
     transition: all .3s;
 
@@ -654,6 +657,21 @@ body {
     border-color: #531dab;
   }
 }
+.ant-btn-primary.button-grey {
+  background-color: #82848a;
+  border-color: #82848a;
+  margin: 0 5px;
+  font-size: 12px;
+  &:hover, &:focus {
+    background-color: #909399;
+    border-color: #909399;
+  }
+ 
+  &:active, &.active {
+    background-color: #c8c9cc;
+    border-color: #c8c9cc;
+  }
+}
 
 // btn-link
 .ant-btn-link.button-primary {
@@ -731,4 +749,14 @@ body {
   &:active, &.active {
     color: #531dab;
   }
+}
+.ant-btn-link.button-grey {
+  color: #82848a;
+  &:hover, &:focus {
+    color: #909399;
+  }
+ 
+  &:active, &.active {
+    color: #c8c9cc;
+  }
 }

+ 1 - 1
src/layouts/BasicLayout.vue

@@ -39,7 +39,7 @@
         @toggle="toggle"
       />
       <!-- layout content -->
-      <a-layout-content :style="{ height: '100%', margin: '24px 24px 0', paddingTop: multiTab&&fixedHeader ? '105px' : (!multiTab&&fixedHeader?'65px':'0') }">
+      <a-layout-content :style="{ height: '100%', margin: '24px 24px 0', paddingTop: multiTab&&fixedHeader ? '85px' : (!multiTab&&fixedHeader?'45px':'0') }">
         <transition name="page-transition">
           <route-view/>
         </transition>

+ 1 - 1
src/views/allocationManagement/chainTransferIn/detail.vue

@@ -38,7 +38,7 @@
       </a-card>
       <a-card size="small" :bordered="false" class="chainTransferInDetail-cont">
         <!-- 总计 -->
-        <a-alert type="info" showIcon style="margin-bottom:15px">
+        <a-alert type="info" showIcon style="margin-bottom:10px">
           <div slot="message">
             总款数 <strong>{{ (productTotal&&(productTotal.productTotalCategory || productTotal.productTotalCategory==0)) ? productTotal.productTotalCategory : '--' }}</strong> ,
             总数量 <strong>{{ (productTotal&&(productTotal.productTotalQty || productTotal.productTotalQty==0)) ? productTotal.productTotalQty : '--' }}</strong> ,

+ 1 - 1
src/views/allocationManagement/chainTransferIn/edit.vue

@@ -30,7 +30,7 @@
         </a-collapse>
       </a-card>
       <!-- 总计 -->
-      <a-alert type="info" showIcon style="margin-bottom:15px">
+      <a-alert type="info" showIcon style="margin-bottom:10px">
         <div slot="message">
           总款数 <strong>{{ (basicInfoData&&(basicInfoData.productTotalCategory || basicInfoData.productTotalCategory==0)) ? basicInfoData.productTotalCategory : '--' }}</strong> ,
           总数量 <strong>{{ (basicInfoData&&(basicInfoData.productTotalQty || basicInfoData.productTotalQty==0)) ? basicInfoData.productTotalQty : '--' }}</strong> ,

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

@@ -42,7 +42,7 @@
         <a-collapse :activeKey="['1']">
           <a-collapse-panel key="1" header="产品详情">
             <!-- 总计 -->
-            <a-alert type="info" showIcon style="margin-bottom:15px">
+            <a-alert type="info" showIcon style="margin-bottom:10px">
               <div slot="message">
                 总款数 <strong>{{ (productTotal&&(productTotal.productTotalCategory || productTotal.productTotalCategory==0)) ? productTotal.productTotalCategory : '--' }}</strong> ,
                 总数量 <strong>{{ (productTotal&&(productTotal.productTotalQty || productTotal.productTotalQty==0)) ? productTotal.productTotalQty : '--' }}</strong> ,

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

@@ -124,7 +124,7 @@
         <a-collapse :activeKey="['1']">
           <a-collapse-panel key="1" header="已选产品">
             <!-- 总计 -->
-            <a-alert type="info" showIcon style="margin-bottom:15px">
+            <a-alert type="info" showIcon style="margin-bottom:10px">
               <div slot="message">
                 总款数 <strong>{{ (productTotal&&(productTotal.productTotalCategory || productTotal.productTotalCategory==0)) ? productTotal.productTotalCategory : '--' }}</strong> ,
                 总数量 <strong>{{ (productTotal&&(productTotal.productTotalQty || productTotal.productTotalQty==0)) ? productTotal.productTotalQty : '--' }}</strong> ,

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

@@ -173,7 +173,7 @@ export default {
       loadData: parameter => {
         this.disabled = true
         if (this.tableHeight == 0) {
-          this.tableHeight = window.innerHeight - 380
+          this.tableHeight = window.innerHeight - 360
         }
         return allocLinkageOutList(Object.assign(parameter, this.queryParam)).then(res => {
           const data = res.data

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

@@ -40,7 +40,7 @@
       </a-card>
       <a-card size="small" :bordered="false" class="storeTransferOutDetail-cont">
         <!-- 总计 -->
-        <a-alert type="info" showIcon style="margin-bottom:15px">
+        <a-alert type="info" showIcon style="margin-bottom:10px">
           <div slot="message">
             总款数 <strong>{{ (productTotal&&(productTotal.productTotalCategory || productTotal.productTotalCategory==0)) ? productTotal.productTotalCategory : '--' }}</strong> ,
             总数量 <strong>{{ (productTotal&&(productTotal.productTotalQty || productTotal.productTotalQty==0)) ? productTotal.productTotalQty : '--' }}</strong> ,

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

@@ -108,7 +108,7 @@
         <a-collapse :activeKey="['1']">
           <a-collapse-panel key="1" header="已选产品">
             <!-- 总计 -->
-            <a-alert type="info" showIcon style="margin-bottom:15px">
+            <a-alert type="info" showIcon style="margin-bottom:10px">
               <div slot="message">
                 总款数 <strong>{{ (productTotal&&(productTotal.productTotalCategory || productTotal.productTotalCategory==0)) ? productTotal.productTotalCategory : '--' }}</strong> ,
                 总数量 <strong>{{ (productTotal&&(productTotal.productTotalQty || productTotal.productTotalQty==0)) ? productTotal.productTotalQty : '--' }}</strong> ,

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

@@ -157,7 +157,7 @@ export default {
       loadData: parameter => {
         this.disabled = true
         if (this.tableHeight == 0) {
-          this.tableHeight = window.innerHeight - 380
+          this.tableHeight = window.innerHeight - 360
         }
         return storeCallOutList(Object.assign(parameter, this.queryParam)).then(res => {
           const data = res.data

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

@@ -38,7 +38,7 @@
     </a-card>
     <a-card size="small" :bordered="false" class="warehouseAllocationDetail-cont">
       <!-- 总计 -->
-      <a-alert type="info" showIcon style="margin-bottom:15px">
+      <a-alert type="info" showIcon style="margin-bottom:10px">
         <div slot="message">
           总款数: <strong>{{ productTotal&&(productTotal.productTotalCategory || productTotal.productTotalCategory==0) ? productTotal.productTotalCategory : '--' }}</strong> ,
           总数量: <strong>{{ productTotal&&(productTotal.productTotalQty || productTotal.productTotalQty==0) ? productTotal.productTotalQty : '--' }}</strong> ,

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

@@ -134,7 +134,7 @@
         <a-collapse :activeKey="['1']">
           <a-collapse-panel key="1" header="已选产品">
             <!-- 总计 -->
-            <a-alert type="info" showIcon style="margin-bottom:15px">
+            <a-alert type="info" showIcon style="margin-bottom:10px">
               <div slot="message">
                 总款数 <strong>{{ (productTotal&&(productTotal.productTotalCategory || productTotal.productTotalCategory==0)) ? productTotal.productTotalCategory : '--' }}</strong> ,
                 总数量 <strong>{{ (productTotal&&(productTotal.productTotalQty || productTotal.productTotalQty==0)) ? productTotal.productTotalQty : '--' }}</strong> ,

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

@@ -144,7 +144,7 @@ export default {
       loadData: parameter => {
         this.disabled = true
         if (this.tableHeight == 0) {
-          this.tableHeight = window.innerHeight - 380
+          this.tableHeight = window.innerHeight - 360
         }
         return allocWarehouseList(Object.assign(parameter, this.queryParam)).then(res => {
           const data = res.data

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

@@ -116,7 +116,7 @@
           <!-- 已选产品 -->
           <div>
             <!-- 总计 -->
-            <a-alert type="info" showIcon style="margin-bottom:15px">
+            <a-alert type="info" showIcon style="margin-bottom:10px">
               <div slot="message">产品款数 <strong>6</strong> ,退货数量合计 <strong>6</strong> ,退货金额合计¥<strong>6.33</strong></div>
             </a-alert>
             <!-- 列表 -->

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

@@ -49,7 +49,7 @@
       <a-button id="bulkReturnGoodsList-add" type="primary" class="button-error" @click="handleAdd()">新增</a-button>
     </div>
     <!-- 合计 -->
-    <a-alert type="info" showIcon style="margin-bottom:15px">
+    <a-alert type="info" showIcon style="margin-bottom:10px">
       <div slot="message">共 <strong>6</strong> 条记录,总数量合计 <strong>14</strong> ,总金额合计 <strong>¥14</strong> </div>
     </a-alert>
     <!-- 列表 -->

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

@@ -58,7 +58,7 @@
         <a-collapse :activeKey="['1']">
           <a-collapse-panel key="1" header="产品详情">
             <!-- 总计 -->
-            <a-alert type="info" showIcon style="margin-bottom:15px">
+            <a-alert type="info" showIcon style="margin-bottom:10px">
               <div slot="message">
                 总款数 <strong>{{ (productTotal&&(productTotal.productTotalCategory || productTotal.productTotalCategory==0)) ? productTotal.productTotalCategory : '--' }}</strong> ,
                 总数量 <strong>{{ (productTotal&&(productTotal.productTotalQty || productTotal.productTotalQty==0)) ? productTotal.productTotalQty : '--' }}</strong> ,

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

@@ -156,7 +156,7 @@
             <!-- 已选产品 -->
             <div>
               <!-- 总计 -->
-              <a-alert type="info" showIcon style="margin-bottom:15px">
+              <a-alert type="info" showIcon style="margin-bottom:10px">
                 <div slot="message">
                   总款数 <strong>{{ (productTotal&&(productTotal.productTotalCategory || productTotal.productTotalCategory==0)) ? productTotal.productTotalCategory : '--' }}</strong> ,
                   总数量 <strong>{{ (productTotal&&(productTotal.productTotalQty || productTotal.productTotalQty==0)) ? productTotal.productTotalQty : '--' }}</strong> ,

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

@@ -82,7 +82,7 @@
         <a-button v-if="$hasPermissions('B_bulkWarehousingOrder_add')" id="bulkWarehousingOrderList-add" type="primary" class="button-error" @click="handleAdd">新增</a-button>
       </div>
       <!-- alert -->
-      <a-alert type="info" showIcon style="margin-bottom:15px">
+      <a-alert type="info" showIcon style="margin-bottom:10px">
         <div slot="message">
           共 <strong>{{ dataTotalCount }}</strong> 条记录,
           总数量合计 <strong>{{ productTotal&&(productTotal.productTotalQty || productTotal.productTotalQty==0) ? productTotal.productTotalQty : '--' }}</strong> ,
@@ -181,7 +181,7 @@ export default {
       loadData: parameter => {
         this.disabled = true
         if (this.tableHeight == 0) {
-          this.tableHeight = window.innerHeight - 440
+          this.tableHeight = window.innerHeight - 420
         }
         return sparePartsPurList(Object.assign(parameter, this.queryParam)).then(res => {
           const data = res.data

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

@@ -166,7 +166,7 @@ export default {
       loadData: parameter => {
         this.disabled = true
         if (this.tableHeight == 0) {
-          this.tableHeight = window.innerHeight - 380
+          this.tableHeight = window.innerHeight - 360
         }
         return custList(Object.assign(parameter, this.queryParam)).then(res => {
           const data = res.data

+ 1 - 1
src/views/financialManagement/companyCollectionPayment/detail.vue

@@ -35,7 +35,7 @@
       <a-collapse :activeKey="['1']">
         <a-collapse-panel key="1" header="收款明细">
           <!-- alert -->
-          <a-alert type="info" showIcon style="margin-bottom:15px">
+          <a-alert type="info" showIcon style="margin-bottom:10px">
             <div slot="message">
               共 <strong>{{ total }}</strong> 条明细,
               金额合计 <strong>{{ (basicInfoData&&(basicInfoData.totalSettleAmount || basicInfoData.totalSettleAmount==0)) ? '¥'+basicInfoData.totalSettleAmount : '--' }}</strong> ,

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

@@ -64,7 +64,7 @@
       </a-form>
     </div>
     <!-- alert -->
-    <a-alert type="info" showIcon style="margin-bottom:15px">
+    <a-alert type="info" showIcon style="margin-bottom:10px">
       <div slot="message">
         共 <strong>{{ total }}</strong> 条记录,
         其中收款单 <strong>{{ (productTotal&&(productTotal.receiptCount || productTotal.receiptCount==0)) ? productTotal.receiptCount : '--' }}</strong> 条,
@@ -129,7 +129,7 @@ export default {
       loadData: parameter => {
         this.disabled = true
         if (this.tableHeight == 0) {
-          this.tableHeight = window.innerHeight - 440
+          this.tableHeight = window.innerHeight - 420
         }
         return settleUnitList(Object.assign(parameter, this.queryParam)).then(res => {
           const data = res.data

+ 1 - 1
src/views/financialManagement/companyReceivablePayable/collectionPayment.vue

@@ -17,7 +17,7 @@
               <a-button type="primary" size="small" class="button-error" id="collectionPayment-circle-btn" @click.stop="handleChoose">选择单据</a-button>
             </template>
             <!-- 总计 -->
-            <a-alert type="info" showIcon style="margin-bottom:15px">
+            <a-alert type="info" showIcon style="margin-bottom:10px">
               <div slot="message">
                 共 <strong>{{ chooseLoadData.length }}</strong>条明细 ,
                 金额合计¥<strong>{{ totalAmount }}</strong> ,

+ 1 - 1
src/views/financialManagement/companyReceivablePayable/detail.vue

@@ -44,7 +44,7 @@
         </a-form>
       </div>
       <!-- alert -->
-      <a-alert type="info" showIcon style="margin-bottom:15px">
+      <a-alert type="info" showIcon style="margin-bottom:10px">
         <div slot="message">
           共 <strong>{{ total }}</strong> 条明细,
           金额合计 <strong>{{ (productTotal&&(productTotal.totalAmount || productTotal.totalAmount==0)) ? '¥'+productTotal.totalAmount : '--' }}</strong> ,

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

@@ -30,7 +30,7 @@
       </a-form>
     </div>
     <!-- alert -->
-    <a-alert type="info" showIcon style="margin-bottom:15px">
+    <a-alert type="info" showIcon style="margin-bottom:10px">
       <div slot="message">
         共 <strong>{{ total }}</strong> 条记录,
         应收金额合计 <strong>{{ (productTotal&&(productTotal.receipt || productTotal.receipt==0)) ? '¥'+productTotal.receipt : '--' }}</strong> ,

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

@@ -60,7 +60,7 @@
         <a-button v-if="$hasPermissions('B_expenseNew')" id="expenseManagementList-add" type="primary" class="button-error" @click="handleEdit()">新增</a-button>
       </div>
       <!-- alert -->
-      <a-alert type="info" showIcon style="margin-bottom:15px">
+      <a-alert type="info" showIcon style="margin-bottom:10px">
         <div slot="message">
           共 <strong>{{ totalData&&(totalData.count || totalData.count==0) ? totalData.count : '--' }}</strong> 条记录,
           金额共计 <strong>¥{{ totalData&&(totalData.totalAmount || totalData.totalAmount==0) ? '¥'+totalData.totalAmount : '--' }}</strong>

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

@@ -55,7 +55,7 @@
         </a-form>
       </div>
       <!-- alert -->
-      <a-alert type="info" showIcon style="margin-bottom:15px">
+      <a-alert type="info" showIcon style="margin-bottom:10px">
         <div slot="message">
           <strong>{{ totalData&&(totalData.count || totalData.count==0) ? totalData.count : '--' }}</strong>

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

@@ -54,7 +54,7 @@
         </a-form>
       </div>
       <!-- alert -->
-      <a-alert type="info" showIcon style="margin-bottom:15px">
+      <a-alert type="info" showIcon style="margin-bottom:10px">
         <div slot="message">
           <strong>{{ totalData&&(totalData.count || totalData.count==0) ? totalData.count : '--' }}</strong>

+ 1 - 1
src/views/financialManagement/inventoryReview/detail.vue

@@ -14,7 +14,7 @@
     <!-- 内容 -->
     <a-page-header title="盘点单号:CG2021010100001" ></a-page-header>
     <!-- alert -->
-    <a-alert type="info" showIcon style="margin-bottom:15px">
+    <a-alert type="info" showIcon style="margin-bottom:10px">
       <div slot="message"><strong class="red">红色代表盘盈</strong>,<strong class="green">绿色代表盈亏</strong></div>
     </a-alert>
     <!-- 盈亏统计 -->

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

@@ -35,7 +35,7 @@
       </a-form>
     </div>
     <!-- alert -->
-    <a-alert type="info" showIcon style="margin-bottom:15px">
+    <a-alert type="info" showIcon style="margin-bottom:10px">
       <div slot="message">共 <strong>6</strong> 条记录,其中待审核 <strong>14</strong> 条 </div>
     </a-alert>
     <!-- 列表 -->

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

@@ -40,7 +40,7 @@
       </a-form>
     </div>
     <!-- alert -->
-    <a-alert type="info" showIcon style="margin-bottom:15px">
+    <a-alert type="info" showIcon style="margin-bottom:10px">
       <div slot="message">
         总计:<strong>{{ total }}</strong>条 ,
         分账金额:<strong>{{ (totalAmount || totalAmount == 0) ? totalAmount+'元' : '--' }}</strong>

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

@@ -47,7 +47,7 @@
         </a-form>
       </div>
       <!-- alert -->
-      <a-alert type="info" showIcon style="margin-bottom:15px">
+      <a-alert type="info" showIcon style="margin-bottom:10px">
         <div slot="message">
           共 <strong>{{ (productTotal&&(productTotal.totalRecord || productTotal.totalRecord==0)) ? productTotal.totalRecord : '--' }}</strong> 条记录,
           其中待审核 <strong>{{ (productTotal&&(productTotal.waitAuditRecord || productTotal.waitAuditRecord==0)) ? productTotal.waitAuditRecord : '--' }}</strong> 条

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

@@ -24,7 +24,7 @@
     </a-card>
     <a-card size="small" :bordered="false" class="inventoryCheckingDetail-cont">
       <!-- 总计 -->
-      <a-alert type="info" showIcon style="margin-bottom:15px">
+      <a-alert type="info" showIcon style="margin-bottom:10px">
         <div slot="message">
           库存总数量:
           <strong>6</strong>

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

@@ -29,7 +29,7 @@
       <a-collapse :activeKey="['1']">
         <a-collapse-panel key="1" header="详情">
           <!-- 总计 -->
-          <a-alert type="info" showIcon style="margin-bottom:15px">
+          <a-alert type="info" showIcon style="margin-bottom:10px">
             <div slot="message">盘盈总数量: <strong>6</strong> ,库存总成本(¥): <strong>6</strong> ,盘亏总数量: <strong>6</strong> ,盘亏总成本(¥): <strong>6</strong>,盈亏总数量: <strong>6</strong> ,盈亏总成本(¥): <strong>6</strong> </div>
           </a-alert>
           <!-- 筛选条件 -->

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

@@ -27,7 +27,7 @@
       <a-collapse :activeKey="['1']">
         <a-collapse-panel key="1" header="详情">
           <!-- 总计 -->
-          <a-alert type="info" showIcon style="margin-bottom:15px">
+          <a-alert type="info" showIcon style="margin-bottom:10px">
             <div slot="message">库存总数量: <strong>6</strong> ,盈亏总数量: <strong>6</strong></div>
           </a-alert>
           <!-- 筛选条件 -->

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

@@ -126,7 +126,7 @@
           <!-- 已选产品 -->
           <div>
             <!-- 总计 -->
-            <a-alert type="info" showIcon style="margin-bottom:15px">
+            <a-alert type="info" showIcon style="margin-bottom:10px">
               <div slot="message">产品款数 <strong>6</strong> ,采购数量合计 <strong>6</strong> ,采购金额合计¥<strong>6.33</strong></div>
             </a-alert>
             <!-- 列表 -->

+ 1 - 1
src/views/inventoryManagement/inventoryQuery/detailModal.vue

@@ -9,7 +9,7 @@
     @cancle="isShow=false"
     :width="960">
     <!-- 合计 -->
-    <a-alert type="info" showIcon style="margin-bottom:15px">
+    <a-alert type="info" showIcon style="margin-bottom:10px">
       <div class="ftext" slot="message">
         现有库存总数量(个):<strong>{{ currentStock&&(currentStock.currentQty || currentStock.currentQty==0) ? currentStock.currentQty : '--' }}</strong>;
         现有库存总成本(¥):<strong>{{ currentStock&&(currentStock.putCost || currentStock.putCost==0) ? currentStock.putCost : '--' }}</strong>。

+ 2 - 2
src/views/inventoryManagement/inventoryQuery/list.vue

@@ -75,7 +75,7 @@
         </a-form>
       </div>
       <!-- 合计 -->
-      <a-alert type="info" showIcon style="margin-bottom:15px">
+      <a-alert type="info" showIcon style="margin-bottom:10px">
         <div class="ftext" slot="message">
           现有库存总数量(个):<strong>{{ currentStock&&(currentStock.totalCurrentStockQty || currentStock.totalCurrentStockQty==0) ? currentStock.totalCurrentStockQty : '--' }}</strong>;
           现有库存总成本(¥):<strong>{{ currentStock&&(currentStock.totalCurrentStockCost || currentStock.totalCurrentStockCost==0) ? currentStock.totalCurrentStockCost : '--' }}</strong>。
@@ -177,7 +177,7 @@ export default {
       loadData: parameter => {
         this.disabled = true
         if (this.tableHeight == 0) {
-          this.tableHeight = window.innerHeight - 370
+          this.tableHeight = window.innerHeight - 350
         }
         // 排序
         if (parameter.sortField == 'currentStockQty') {

+ 1 - 1
src/views/inventoryManagement/inventoryQuery/warehouseDetail.vue

@@ -64,7 +64,7 @@
         </a-form>
       </div>
       <!-- 合计 -->
-      <a-alert type="info" showIcon style="margin-bottom:15px">
+      <a-alert type="info" showIcon style="margin-bottom:10px">
         <div class="ftext" slot="message">
           当前库存总数量(个):<strong>{{ (productTotal&&(productTotal.totalQty || productTotal.totalQty==0)) ? productTotal.totalQty : '--' }}</strong>;
           当前库存总成本(¥):<strong>{{ (productTotal&&(productTotal.totalCost || productTotal.totalCost==0)) ? productTotal.totalCost : '--' }}</strong>。

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

@@ -247,7 +247,7 @@ export default {
     //  列表数据
     pageInit (pageNo) {
       if (this.tableHeight == 0) {
-        this.tableHeight = window.innerHeight - 380
+        this.tableHeight = window.innerHeight - 360
       }
       this.disabled = true
       this.loading = true

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

@@ -88,7 +88,7 @@ export default {
       loadData: parameter => {
         this.disabled = true
         if (this.tableHeight == 0) {
-          this.tableHeight = window.innerHeight - 380
+          this.tableHeight = window.innerHeight - 360
         }
         return warehouseList(Object.assign(parameter, this.queryParam)).then(res => {
           const data = res.data

+ 2 - 2
src/views/productManagement/priceChangeRecord/list.vue

@@ -68,7 +68,7 @@
       </a-form>
     </div>
     <!-- 总计 -->
-    <a-alert type="info" showIcon style="margin-bottom:15px">
+    <a-alert type="info" showIcon style="margin-bottom:10px">
       <div slot="message">合计:<strong>{{ total }}</strong>条</div>
     </a-alert>
     <!-- 列表 -->
@@ -150,7 +150,7 @@ export default {
       loadData: parameter => {
         this.disabled = true
         if (this.tableHeight == 0) {
-          this.tableHeight = window.innerHeight - 430
+          this.tableHeight = window.innerHeight - 400
         }
         return productPriceChangeList(Object.assign(parameter, this.queryParam)).then(res => {
           const data = res.data

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

@@ -93,7 +93,7 @@ export default {
       loadData: parameter => {
         this.disabled = true
         if (this.tableHeight == 0) {
-          this.tableHeight = window.innerHeight - 380
+          this.tableHeight = window.innerHeight - 360
         }
         return dealerProductBrandList(Object.assign(parameter, this.queryParam)).then(res => {
           const data = res.data

+ 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 - 250
+          this.tableHeight = window.innerHeight - 230
         }
         return dealerProductTypeList({}).then(res => {
           //  递归去除空children

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

@@ -175,7 +175,7 @@ export default {
       loadData: parameter => {
         this.disabled = true
         if (this.tableHeight == 0) {
-          this.tableHeight = window.innerHeight - 380
+          this.tableHeight = window.innerHeight - 360
         }
         return dealerProductList(Object.assign(parameter, this.queryParam)).then(res => {
           const data = res.data

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

@@ -123,7 +123,7 @@ export default {
       loadData: parameter => {
         this.disabled = true
         if (this.tableHeight == 0) {
-          this.tableHeight = window.innerHeight - 210
+          this.tableHeight = window.innerHeight - 190
         }
         return productList(Object.assign(parameter, this.queryParam)).then(res => {
           const data = res.data

+ 2 - 2
src/views/purchasingManagement/purchaseOrder/detail.vue

@@ -46,7 +46,7 @@
         <a-collapse :activeKey="['1']">
           <a-collapse-panel key="1" header="产品详情">
             <!-- 总计 -->
-            <a-alert type="info" showIcon style="margin-bottom:15px">
+            <a-alert type="info" showIcon style="margin-bottom:10px">
               <div slot="message">
                 产品款数:<strong>{{ detail && (detail.totalCategory || detail.totalCategory==0) ? detail.totalCategory : '--' }}</strong>,
                 采购数量合计:<strong>{{ detail && (detail.totalQty || detail.totalQty==0) ? detail.totalQty : '--' }}</strong>,
@@ -87,7 +87,7 @@
         <a-collapse :activeKey="['1']">
           <a-collapse-panel key="1" header="促销品详情">
             <!-- 总计 -->
-            <a-alert type="info" showIcon style="margin-bottom:15px">
+            <a-alert type="info" showIcon style="margin-bottom:10px">
               <div slot="message">产品款数 <strong>{{ detail&&(detail.totalCategory || detail.totalCategory==0) ? detail.totalCategory : '--' }}</strong> ,
                 采购数量合计 <strong>{{ detail&&(detail.totalQty || detail.totalQty==0) ? detail.totalQty : '--' }}</strong> ,
                 采购金额合计 <strong>{{ detail&&(detail.totalAmount || detail.totalAmount==0) ? '¥'+detail.totalAmount : '--' }}</strong></div>

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

@@ -149,7 +149,7 @@
             <!-- 已选产品 -->
             <div>
               <!-- 总计 -->
-              <a-alert type="info" showIcon style="margin-bottom:15px">
+              <a-alert type="info" showIcon style="margin-bottom:10px">
                 <div slot="message">产品款数 <strong>{{ detail && (detail.totalCategory || detail.totalCategory==0) ? detail.totalCategory : '--' }}</strong> ,
                   采购数量合计 <strong>{{ detail && (detail.totalQty || detail.totalQty==0) ? detail.totalQty : '--' }}</strong> ,
                   采购金额合计 <strong>{{ detail && (detail.discountedAmount || detail.discountedAmount==0) ? '¥'+detail.discountedAmount : '--' }}</strong></div>

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

@@ -70,7 +70,7 @@
         <a-button id="purchaseOrderList-add" type="primary" v-if="$hasPermissions('B_purchaseNew')" class="button-error" @click="handleAdd">新增</a-button>
       </div>
       <!-- alert -->
-      <a-alert type="info" showIcon style="margin-bottom:15px">
+      <a-alert type="info" showIcon style="margin-bottom:10px">
         <div slot="message">
           共 <strong>{{ totalData&&(totalData.totalRecord || totalData.totalRecord==0) ? totalData.totalRecord : '--' }}</strong> 条记录,
           采购数量合计 <strong>{{ totalData&&(totalData.totalQty || totalData.totalQty==0) ? totalData.totalQty : '--' }}</strong> ,
@@ -172,7 +172,7 @@ export default {
       loadData: parameter => {
         this.disabled = true
         if (this.tableHeight == 0) {
-          this.tableHeight = window.innerHeight - 440
+          this.tableHeight = window.innerHeight - 420
         }
         // 获取统计数据
         this.getTotalData(Object.assign(parameter, this.queryParam))

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

@@ -11,7 +11,7 @@
       <!-- 内容 -->
       <a-card size="small" v-for="(item,bindex) in detail" :key="item.id" :bordered="false" class="purchaseOrderWarehousing-cont">
         <!-- 总计 -->
-        <a-alert type="info" showIcon style="margin-bottom:15px">
+        <a-alert type="info" showIcon style="margin-bottom:10px">
           <div slot="message" >
             <div>产品款数 <strong>{{ item.totalPutCategory }}</strong> ,本次发货数量合计 <strong>{{ item.totalPutQty }}</strong> ,本次发货金额合计¥<strong>{{ item.totalPutAmount }}</strong></div>
           </div>

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

@@ -154,7 +154,7 @@
         </a-form-model>
       </div>
       <!-- 合计 -->
-      <a-alert type="info" showIcon style="margin-bottom:15px">
+      <a-alert type="info" showIcon style="margin-bottom:10px">
         <div class="ftext" slot="message">
           产品总数量:<strong>{{ (totalData && (totalData.totalQty || totalData.totalQty==0)) ? totalData.totalQty : '--' }}</strong>;
           总成本:<strong>{{ (totalData && (totalData.totalCost || totalData.totalCost==0)) ? '¥'+totalData.totalCost : '--' }}</strong>;

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

@@ -102,7 +102,7 @@
         </a-form-model>
       </div>
       <!-- 合计 -->
-      <a-alert type="info" showIcon style="margin-bottom:15px">
+      <a-alert type="info" showIcon style="margin-bottom:10px">
         <div class="ftext" slot="message">
           总单数:<strong>{{ (totalData && (totalData.totalRowSize || totalData.totalRowSize==0)) ? totalData.totalRowSize : '--' }}</strong>;
           产品总数量:<strong>{{ (totalData && (totalData.totalQty || totalData.totalQty==0)) ? totalData.totalQty : '--' }}</strong>;

+ 1 - 1
src/views/reportData/chainStockReport/detailModal.vue

@@ -9,7 +9,7 @@
     @cancle="isShow=false"
     :width="960">
     <!-- 合计 -->
-    <a-alert type="info" showIcon style="margin-bottom:15px">
+    <a-alert type="info" showIcon style="margin-bottom:10px">
       <div class="ftext" slot="message">
         现有库存总数量(个):<strong> {{ (currentStock && currentStock.totalQty) || 0 }} </strong>;
         现有库存总成本(¥):<strong> {{ (currentStock && currentStock.totalCost) || 0 }} </strong>。

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

@@ -83,7 +83,7 @@
         </a-form-model>
       </div>
       <!-- 合计 -->
-      <a-alert type="info" showIcon style="margin-bottom:15px">
+      <a-alert type="info" showIcon style="margin-bottom:10px">
         <div class="ftext" slot="message">
           现有库存总数量(个):<strong> {{ (totalData && (totalData.totalQty || totalData.totalQty==0)) ? totalData.totalQty : '--' }} </strong>;
           现有库存总成本(¥):<strong> {{ (totalData && (totalData.totalCost || totalData.totalCost==0)) ? totalData.totalCost : '--' }} </strong>。

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

@@ -72,7 +72,7 @@
         </a-form-model>
       </div>
       <!-- 合计 -->
-      <a-alert type="info" showIcon style="margin-bottom:15px">
+      <a-alert type="info" showIcon style="margin-bottom:10px">
         <div class="ftext" slot="message">
           总交易金额:<strong>{{ (totalData && (totalData.totalAmount || totalData.totalAmount==0)) ? totalData.totalAmount : '--' }}</strong>;
           总毛利率:<strong>{{ (totalData && totalData.percentage) ? totalData.percentage : '--' }}</strong>

+ 1 - 1
src/views/salesManagement/quotation/detail.vue

@@ -29,7 +29,7 @@
     </a-card>
     <a-card size="small" :bordered="false" class="quotationDetail-cont">
       <!-- 总计 -->
-      <a-alert type="info" showIcon style="margin-bottom:15px">
+      <a-alert type="info" showIcon style="margin-bottom:10px">
         <div slot="message">总款数:<strong>1</strong>,总数量:<strong>1</strong>,总赠品数量:<strong>0</strong>,总售价:<strong>14</strong>,总成本:<strong>6.33</strong>,总毛利: <strong>6</strong></div>
       </a-alert>
       <!-- 列表 -->

+ 1 - 1
src/views/salesManagement/quotation/edit.vue

@@ -122,7 +122,7 @@
           <!-- 已选产品 -->
           <div>
             <!-- 总计 -->
-            <a-alert type="info" showIcon style="margin-bottom:15px">
+            <a-alert type="info" showIcon style="margin-bottom:10px">
               <div slot="message">总售价:<strong>6</strong> ,总款数:<strong>6</strong> ,总数量:<strong>6.33</strong></div>
             </a-alert>
             <!-- 搜索条件 -->

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

@@ -76,7 +76,7 @@
         <a-button type="primary" class="button-error" v-if="$hasPermissions('B_salesNews')" @click="handleAdd">新增(零售)</a-button>
       </div>
       <!-- alert -->
-      <a-alert type="info" showIcon style="margin-bottom:15px">
+      <a-alert type="info" showIcon style="margin-bottom:10px">
         <div slot="message">
           总售价:<strong>{{ totalData&&(totalData.totalAmount || totalData.totalAmount==0) ? totalData.totalAmount : '--' }}</strong>元;
           总单数:<strong>{{ totalData&&(totalData.totalRecord || totalData.totalRecord==0) ? totalData.totalRecord : '--' }}</strong>;
@@ -225,7 +225,7 @@ export default {
       loadData: parameter => {
         this.disabled = true
         if (this.tableHeight == 0) {
-          this.tableHeight = window.innerHeight - 440
+          this.tableHeight = window.innerHeight - 420
         }
         // 查询总计
         salesCount(Object.assign(parameter, this.queryParam)).then(res => {

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

@@ -164,7 +164,7 @@ export default {
       loadData: parameter => {
         this.disabled = true
         if (this.tableHeight == 0) {
-          this.tableHeight = window.innerHeight - 440
+          this.tableHeight = window.innerHeight - 420
         }
         // 查询总计
         this.getQueryCount(Object.assign(parameter, this.queryParam))

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

@@ -86,7 +86,7 @@ export default {
       loadData: parameter => {
         this.disabled = true
         if (this.tableHeight == 0) {
-          this.tableHeight = window.innerHeight - 380
+          this.tableHeight = window.innerHeight - 360
         }
         return supplierList(Object.assign(parameter, this.queryParam)).then(res => {
           const data = res.data