lilei hai 6 meses
pai
achega
443643e631

+ 24 - 15
src/views/salesManagement/salesQueryNew/comps/productActiveList.vue

@@ -142,6 +142,7 @@
         row-key-field-name="id"
         :checkbox-option="checkboxOption"
       />
+      <div v-show="dataSource.length==0" class="empty-data"><a-empty description="暂无数据" :image="simpleImage"/></div>
     </a-spin>
     <!-- 仓库设置 -->
     <setWarehouse :title="warehouseTit" :show="openWarehouseModal" @ok="chooseWarehouseOk" @cancel="openWarehouseModal=false"></setWarehouse>
@@ -152,6 +153,7 @@
 
 <script>
 import { commonMixin } from '@/utils/mixin'
+import { Empty } from 'ant-design-vue'
 import { VSelect } from '@/components'
 import setWarehouse from './setWarehouse.vue'
 import updateActiveModal from './updateActiveModal.vue'
@@ -214,6 +216,7 @@ export default {
   data () {
     return {
       spinning: false,
+      simpleImage: Empty.PRESENTED_IMAGE_SIMPLE,
       // 表格列宽拖到
       columnWidthResizeOption: {
         // default false
@@ -317,21 +320,22 @@ export default {
           operationColumn: false,
           renderBodyCell: ({ row, column, rowIndex }, h) => {
             return (
-              <a-popover placement="right">
-                <template slot="content">
-                  {row.promoRuleSnList.map(item => {
-                    return (
-                      <div
-                        id={'salesEdit-gzitem-' + row.id}
-                        title="点击查看详情"
-                        style="padding:5px 0;cursor: pointer;"
-                        onClick={() => _this.showRuleDetail(item)}
-                      >{ _this.activeRuleFilter(item) }</div>
-                    )
-                  })}
-                </template>
-                <a-button type="link" id={'salesEdit-gzqty-' + row.id} size="small" class="button-info">{row.promoRuleNum}<span style="zoom:0.6;color: #666;">个∨</span></a-button>
-              </a-popover>
+              row.promoRuleSnList
+                ? <a-popover placement="right">
+                  <template slot="content">
+                    {row.promoRuleSnList.map(item => {
+                      return (
+                        <div
+                          id={'salesEdit-gzitem-' + row.id}
+                          title="点击查看详情"
+                          style="padding:5px 0;cursor: pointer;"
+                          onClick={() => _this.showRuleDetail(item)}
+                        >{ _this.activeRuleFilter(item) }</div>
+                      )
+                    })}
+                  </template>
+                  <a-button type="link" id={'salesEdit-gzqty-' + row.id} size="small" class="button-info">{row.promoRuleNum}<span style="zoom:0.6;color: #666;">个∨</span></a-button>
+                </a-popover> : '--'
             )
           } },
         { title: '起订量', field: 'promoUnit', key: '5', width: 100, align: 'center', operationColumn: false, renderBodyCell: ({ row, column, rowIndex }, h) => { return row[column.field] || '--' } },
@@ -906,6 +910,11 @@ export default {
 </script>
 
 <style lang="less">
+  .empty-data{
+      color: #999;
+      text-align: center;
+      padding: 20px;
+  }
    .ant-input-number-sm input{
     text-align: center;
    }

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

@@ -163,7 +163,7 @@ import toPurchaseModal from './toPurchaseModal'
 import chooseWarehouse from '@/views/common/chooseWarehouse'
 // 接口
 import { queryAwaitDispatch, salesPromoDetailCount, salesDetaiCount } from '@/api/salesDetailNew'
-import { salesPromoQueryList, getCreatePurchaseFlag } from '@/api/salesNew'
+import { getCreatePurchaseFlag } from '@/api/salesNew'
 
 export default {
   name: 'QueryPart',