lilei 2 weeks ago
parent
commit
19fcd73c07

+ 1 - 0
src/views/salesManagement/salesQueryNew/comps/activeQueryPart.vue

@@ -287,6 +287,7 @@ export default {
           tabList.push({ text: '正价产品', val: 'REGULAR' })
           tabList.push({ text: '正价产品', val: 'REGULAR' })
         }
         }
         if (this.promoRuleData.regularPromotionSameFlag === '0' || this.promoRuleData.scopeFlag === '0' || isMcpScge) {
         if (this.promoRuleData.regularPromotionSameFlag === '0' || this.promoRuleData.scopeFlag === '0' || isMcpScge) {
+          // 阶梯促销产品
           if (giveRuleList && isMcpScp) {
           if (giveRuleList && isMcpScp) {
             giveRuleList.forEach(giveRule => {
             giveRuleList.forEach(giveRule => {
               const levelText = '(阶梯' + giveRule.scopeLevel + ')'
               const levelText = '(阶梯' + giveRule.scopeLevel + ')'

+ 1 - 1
src/views/salesManagement/salesQueryNew/comps/activeStatisticsList.vue

@@ -168,7 +168,7 @@ export default {
       const _this = this
       const _this = this
       // 格式化数字金额单元格
       // 格式化数字金额单元格
       const formatTd = (row, column, rowIndex, uniKey, fun) => {
       const formatTd = (row, column, rowIndex, uniKey, fun) => {
-        const ismktj = column.field == 'specialPriceSelected'
+        const ismktj = column.field == 'specialPriceSelected' && row.totalPromoOrigAmount
         if (column.field != 'regularBaseVal' && column.field != 'regularNextVal' ? row[column.field] : (row[column.field] || row[column.field] == 0)) {
         if (column.field != 'regularBaseVal' && column.field != 'regularNextVal' ? row[column.field] : (row[column.field] || row[column.field] == 0)) {
           return (<div onClick={() => fun ? fun(row, uniKey) : false}><span class={fun ? 'table-link-btn' : (column.field == 'geteBalance' || column.field == 'regularBaseVal') ? 'table-word-color' : ''}>{row[column.field]}</span>{ismktj ? <span>({row.totalPromoOrigAmount})</span> : ''}<span style="font-size:10px;zoom:0.7;margin-left:3px;">{row[uniKey]}</span></div>)
           return (<div onClick={() => fun ? fun(row, uniKey) : false}><span class={fun ? 'table-link-btn' : (column.field == 'geteBalance' || column.field == 'regularBaseVal') ? 'table-word-color' : ''}>{row[column.field]}</span>{ismktj ? <span>({row.totalPromoOrigAmount})</span> : ''}<span style="font-size:10px;zoom:0.7;margin-left:3px;">{row[uniKey]}</span></div>)
         } else {
         } else {

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

@@ -22,7 +22,7 @@
       <div v-show="showEmpty" class="empty-data"><a-empty description="暂无产品" :image="simpleImage"/></div>
       <div v-show="showEmpty" class="empty-data"><a-empty description="暂无产品" :image="simpleImage"/></div>
     </div>
     </div>
     <!-- 总计 -->
     <!-- 总计 -->
-    <div v-if="countData" style="padding:6px 0 0;text-align: right;">
+    <div v-if="countData&&activeList.length>0" style="padding:6px 0 0;text-align: right;">
       总款数:<strong>{{ countData&&(countData.totalCategory || countData.totalCategory==0) ? countData.totalCategory : 0 }}</strong>;
       总款数:<strong>{{ countData&&(countData.totalCategory || countData.totalCategory==0) ? countData.totalCategory : 0 }}</strong>;
       总数量:<strong>{{ countData&&(countData.totalQty || countData.totalQty==0) ? countData.totalQty : 0 }}</strong>;
       总数量:<strong>{{ countData&&(countData.totalQty || countData.totalQty==0) ? countData.totalQty : 0 }}</strong>;
       <span v-if="$hasPermissions(authCode + '_salesPrice')">总金额:<strong>{{ countData&&(countData.totalAmount || countData.totalAmount==0) ? toThousands(countData.totalAmount) : '0.00' }}</strong>;</span>
       <span v-if="$hasPermissions(authCode + '_salesPrice')">总金额:<strong>{{ countData&&(countData.totalAmount || countData.totalAmount==0) ? toThousands(countData.totalAmount) : '0.00' }}</strong>;</span>
@@ -390,7 +390,7 @@ export default {
       // 格式化数据
       // 格式化数据
       let str = ''
       let str = ''
       this.outStockStr = ''
       this.outStockStr = ''
-      this.dataSource.map((item, i) => {
+      this.dataSource.forEach((item, i) => {
         item.no = i + 1
         item.no = i + 1
         // 格式化数据,产品编码、产品名称、原厂编码、包装数单位
         // 格式化数据,产品编码、产品名称、原厂编码、包装数单位
         const productCode = (item.productEntity && item.productEntity.code) || (item.dealerProductEntity && item.dealerProductEntity.code)
         const productCode = (item.productEntity && item.productEntity.code) || (item.dealerProductEntity && item.dealerProductEntity.code)