lilei 4 months ago
parent
commit
673206dbf8

+ 6 - 14
src/views/salesManagement/salesQueryNew/comps/detailProductList.vue

@@ -2,13 +2,7 @@
   <!-- 已选配件列表 -->
   <a-spin :spinning="spinning" tip="Loading...">
     <div :style="{position:'relative'}">
-      <!-- 总计 -->
-      <div style="padding:5px 0;" v-if="activeList.length && countData">
-        总款数:<strong>{{ countData&&(countData.totalCategory || countData.totalCategory==0) ? countData.totalCategory : 0 }}</strong>;
-        总数量:<strong>{{ countData&&(countData.totalQty || countData.totalQty==0) ? countData.totalQty : 0 }}</strong>;
-        <span v-if="$hasPermissions('B_salesDetail_salesPrice')">总金额:<strong>{{ countData&&(countData.totalAmount || countData.totalAmount==0) ? toThousands(countData.totalAmount) : '0.00' }}</strong>;</span>
-      </div>
-      <div else style="padding:5px 0;"></div>
+      <div style="height:10px;"></div>
       <ve-table
         border-y
         :scroll-width="0"
@@ -140,8 +134,7 @@ export default {
       hasOutStockOfActive: false, // 产品是否存在缺货
       simpleImage: Empty.PRESENTED_IMAGE_SIMPLE, // 空图片
       showStockCol: false, // 显示第三方库存
-      hasJGtire: false, // 是否轮胎产品
-      countData: null
+      hasJGtire: false // 是否轮胎产品
     }
   },
   computed: {
@@ -220,7 +213,9 @@ export default {
                       )
                     })}
                   </template>
-                  <a-button type="link" id={'dispacth-ruleSn-' + row.productSn} size="small" class="button-info">{row.promoRuleNum}<span style="zoom:0.6;color: #666;">个∨</span></a-button>
+                  <a-button type="link" id={'dispacth-ruleSn-' + row.productSn} size="small" class="button-info">
+                    {row.promoRuleNum}<span style="zoom:0.6;color: #666;">个∨</span>
+                  </a-button>
                 </a-popover> : '--'
             )
           }
@@ -340,10 +335,7 @@ export default {
           this.transferTableData(this.chooseList)
         } else {
           // 查询正常产品明细列表
-          const normalList = await salesDetailAllList(params).then(res => res.data || [])
-          this.countData = await salesDetaiCount(params).then(res => res.data || null)
-          // 赋值
-          this.dataSource = normalList
+          this.dataSource = await salesDetailAllList(params).then(res => res.data || [])
         }
       } else {
         // 查询活动产品明细列表

+ 2 - 0
src/views/salesManagement/salesQueryNew/detail.vue

@@ -141,6 +141,7 @@
         <a-alert type="info" style="margin-top: 10px;">
           <div slot="message">
             <div>
+              总销售款数:<strong>{{ detailData&&(detailData.totalCategory || detailData.totalCategory==0) ? detailData.totalCategory : '--' }}</strong>;
               总销售数量:<strong>{{ detailData&&(detailData.totalQty || detailData.totalQty==0) ? detailData.totalQty : '--' }}</strong>;
               已取消数量:<strong>{{ detailData&&(detailData.totalCancelQty || detailData.totalCancelQty==0) ? detailData.totalCancelQty : '--' }}</strong>;
               已下推数量:<strong>{{ detailData&&(detailData.totalPushedQty || detailData.totalPushedQty==0) ? detailData.totalPushedQty : '--' }}</strong>;
@@ -202,6 +203,7 @@
           type="active"
           :maxHeight="pageHeight"
           :detailData="detailData"
+          :activeList="activeList"
           :warehouseSn="warehouseSn"
           :promoFlag="promoFlag"
           :salesBillSn="$route.params.sn || bizSn"