lilei 1 year ago
parent
commit
c435b22cf7

+ 4 - 2
src/views/salesManagement/salesQueryNew/comps/detailProductList.vue

@@ -17,7 +17,7 @@
             :cell-span-option="cellSpanOption"
             :cell-span-option="cellSpanOption"
             :column-width-resize-option="columnWidthResizeOption"
             :column-width-resize-option="columnWidthResizeOption"
           />
           />
-        <div v-show="showEmpty" class="empty-data"><a-empty description="暂无产品"/></div>
+        <div v-show="showEmpty" class="empty-data"><a-empty description="暂无产品" :image="simpleImage"/></div>
         <!-- 活动规则详情 -->
         <!-- 活动规则详情 -->
         <detailModal :openModal="openDetailModal" :itemSn="detailSn" @close="closeDetailModal"></detailModal>
         <detailModal :openModal="openDetailModal" :itemSn="detailSn" @close="closeDetailModal"></detailModal>
     </a-spin>
     </a-spin>
@@ -25,6 +25,7 @@
   
   
   <script>
   <script>
     import { commonMixin } from '@/utils/mixin'
     import { commonMixin } from '@/utils/mixin'
+    import { Empty } from 'ant-design-vue';
     import detailModal from '@/views/promotionRulesManagement/dealerPromotions/detailModal.vue'
     import detailModal from '@/views/promotionRulesManagement/dealerPromotions/detailModal.vue'
     import { salesPromoQueryList } from '@/api/salesNew'
     import { salesPromoQueryList } from '@/api/salesNew'
     import { salesDetailAllList, salesPromoDetailCount, salesDetaiCount } from '@/api/salesDetailNew'
     import { salesDetailAllList, salesPromoDetailCount, salesDetaiCount } from '@/api/salesDetailNew'
@@ -99,7 +100,8 @@
           outStockStr: '',
           outStockStr: '',
           showEmpty: false,
           showEmpty: false,
           showTableHead: true,
           showTableHead: true,
-          colspanNums: 13
+          colspanNums: 13,
+          simpleImage: Empty.PRESENTED_IMAGE_SIMPLE
         }
         }
       },
       },
       computed: {
       computed: {

+ 11 - 9
src/views/salesManagement/salesQueryNew/comps/productList.vue

@@ -93,7 +93,15 @@
  
  
     <div class="table-page-search-wrapper">
     <div class="table-page-search-wrapper">
       <a-row :gutter="15" type="flex" justify="space-between" align="middle">
       <a-row :gutter="15" type="flex" justify="space-between" align="middle">
-        <a-col :md="12" :sm="24" style="text-align:left;">
+        <a-col :md="8" :sm="24" style="text-align:left;">
+          <span v-if="selectTotal" style="margin-right:5px;">已选{{ selectTotal }}项</span>
+        </a-col>
+        <a-col :md="12" :sm="24" style="text-align:right;">
+          <a-button
+            type="link"
+            class="button-info"
+             @click="showSearchBox=!showSearchBox" ><a-icon type="search"/> 筛选</a-button>
+             
           <a-dropdown>
           <a-dropdown>
             <a-menu slot="overlay" @click="handleMenuClick">
             <a-menu slot="overlay" @click="handleMenuClick">
               <a-menu-item key="0" :disabled="disablePromo">
               <a-menu-item key="0" :disabled="disablePromo">
@@ -107,17 +115,11 @@
               </a-menu-item>
               </a-menu-item>
             </a-menu>
             </a-menu>
             <a-button
             <a-button
-              type="default"
+              type="link"
               class="button-info"
               class="button-info"
             > 批量操作 <a-icon type="down" /> </a-button>
             > 批量操作 <a-icon type="down" /> </a-button>
           </a-dropdown>
           </a-dropdown>
-          <span v-if="selectTotal" style="margin-left:5px;">已选{{ selectTotal }}项</span>
-        </a-col>
-        <a-col :md="12" :sm="24" style="text-align:right;">
-          <a-button
-            type="link"
-            class="button-info"
-             @click="showSearchBox=!showSearchBox" ><a-icon type="search"/> 筛选</a-button>
+          
           <a-dropdown :disabled="disablePromo">
           <a-dropdown :disabled="disablePromo">
             <a-menu slot="overlay" @click="handleImportClick">
             <a-menu slot="overlay" @click="handleImportClick">
               <a-menu-item key="GATE">
               <a-menu-item key="GATE">

+ 5 - 5
src/views/salesManagement/salesQueryNew/comps/productNormalList.vue

@@ -39,7 +39,10 @@
     
     
     <div class="table-page-search-wrapper">
     <div class="table-page-search-wrapper">
       <a-row :gutter="15" type="flex" justify="space-between" align="middle">
       <a-row :gutter="15" type="flex" justify="space-between" align="middle">
-        <a-col :md="12" :sm="24" style="text-align:left;">
+        <a-col :md="8" :sm="24" style="text-align:left;">
+          <span v-if="selectTotal" style="margin-right:5px;">已选{{ selectTotal }}项</span>
+        </a-col>
+        <a-col :md="16" :sm="24" style="text-align:right;">
           <a-dropdown>
           <a-dropdown>
             <a-menu slot="overlay" @click="handleMenuClick">
             <a-menu slot="overlay" @click="handleMenuClick">
               <a-menu-item key="0">
               <a-menu-item key="0">
@@ -53,13 +56,10 @@
               </a-menu-item>
               </a-menu-item>
             </a-menu>
             </a-menu>
             <a-button
             <a-button
-              type="default"
+              type="link"
               class="button-info"
               class="button-info"
             > 批量操作 <a-icon type="down" /> </a-button>
             > 批量操作 <a-icon type="down" /> </a-button>
           </a-dropdown>
           </a-dropdown>
-          <span v-if="selectTotal" style="margin-left:5px;">已选{{ selectTotal }}项</span>
-        </a-col>
-        <a-col :md="12" :sm="24" style="text-align:right;">
           <!-- <a-button
           <!-- <a-button
             type="link"
             type="link"
             class="button-info"
             class="button-info"

+ 3 - 2
src/views/salesManagement/waitDispatchNew/detailProductList.vue

@@ -29,7 +29,7 @@
                 :column-width-resize-option="columnWidthResizeOption"
                 :column-width-resize-option="columnWidthResizeOption"
                 :checkbox-option="checkboxOption"
                 :checkbox-option="checkboxOption"
               />
               />
-          <div v-show="showEmpty" class="empty-data"><a-empty description="暂无产品"/></div>
+          <div v-show="showEmpty" class="empty-data"><a-empty description="暂无产品" :image="simpleImage"/></div>
       </a-spin>
       </a-spin>
   
   
     </div>
     </div>
@@ -38,7 +38,7 @@
   <script>
   <script>
   import { commonMixin } from '@/utils/mixin'
   import { commonMixin } from '@/utils/mixin'
   import { deleteBatch, waitDispatchDetailAllList, updateQty } from '@/api/waitDispatchDetail'
   import { deleteBatch, waitDispatchDetailAllList, updateQty } from '@/api/waitDispatchDetail'
- 
+  import { Empty } from 'ant-design-vue';
   import { STable, VSelect } from '@/components'
   import { STable, VSelect } from '@/components'
   import chooseWarehouse from '@/views/common/chooseWarehouse'
   import chooseWarehouse from '@/views/common/chooseWarehouse'
   export default {
   export default {
@@ -66,6 +66,7 @@
         },
         },
         disabled: false, //  查询、重置按钮是否可操作
         disabled: false, //  查询、重置按钮是否可操作
         spinning: false,
         spinning: false,
+        simpleImage: Empty.PRESENTED_IMAGE_SIMPLE,
         dataSource: [],
         dataSource: [],
         tableHeight: this.maxHeight,
         tableHeight: this.maxHeight,
         cellStyleOption: {
         cellStyleOption: {

+ 3 - 1
src/views/salesManagement/waitDispatchNew/queryPart.vue

@@ -95,7 +95,7 @@
               :column-width-resize-option="columnWidthResizeOption"
               :column-width-resize-option="columnWidthResizeOption"
               :checkbox-option="checkboxOption"
               :checkbox-option="checkboxOption"
             />
             />
-        <div v-show="showEmpty" class="empty-data"><a-empty description="暂无产品"/></div>
+        <div v-show="showEmpty" class="empty-data"><a-empty description="暂无产品" :image="simpleImage"/></div>
         <!-- 活动规则详情 -->
         <!-- 活动规则详情 -->
         <detailModal :openModal="openDetailModal" :itemSn="detailSn" @close="closeDetailModal"></detailModal>
         <detailModal :openModal="openDetailModal" :itemSn="detailSn" @close="closeDetailModal"></detailModal>
     </a-spin>
     </a-spin>
@@ -107,6 +107,7 @@
 import { commonMixin } from '@/utils/mixin'
 import { commonMixin } from '@/utils/mixin'
 import { salesPromoQueryList } from '@/api/salesNew'
 import { salesPromoQueryList } from '@/api/salesNew'
 import detailModal from '@/views/promotionRulesManagement/dealerPromotions/detailModal.vue'
 import detailModal from '@/views/promotionRulesManagement/dealerPromotions/detailModal.vue'
+import { Empty } from 'ant-design-vue';
 import { salesDetailAllList, salesPromoDetailCount, salesDetaiCount } from '@/api/salesDetailNew'
 import { salesDetailAllList, salesPromoDetailCount, salesDetaiCount } from '@/api/salesDetailNew'
 import { STable, VSelect } from '@/components'
 import { STable, VSelect } from '@/components'
 import chooseWarehouse from '@/views/common/chooseWarehouse'
 import chooseWarehouse from '@/views/common/chooseWarehouse'
@@ -132,6 +133,7 @@ export default {
     return {
     return {
       advanced: true, // 高级搜索 展开/关闭
       advanced: true, // 高级搜索 展开/关闭
       openDetailModal: false,
       openDetailModal: false,
+      simpleImage: Empty.PRESENTED_IMAGE_SIMPLE,
       detailSn: null,
       detailSn: null,
       productType: [],
       productType: [],
       salesBillSn: '',
       salesBillSn: '',