lilei 1 年間 前
コミット
5f69ae2601

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

@@ -76,6 +76,10 @@
             placeholder="请输入" />
         </div>
       </template>
+      <!-- 价格 -->
+      <template slot="productPrice" slot-scope="text, record">
+         {{ text }} (<span title="原价">{{ record.origPrice }}</span>)
+      </template>
       <!-- 产品名称 -->
       <template slot="productName" slot-scope="text, record">
         <div class="ellipsisCon">
@@ -185,7 +189,7 @@ export default {
         { title: '操作', dataIndex: 'action', scopedSlots: { customRender: 'action' }, width: '8%', align: 'center' }
       ]
       if (this.$hasPermissions('B_salesEdit_salesPrice')) { // 售价权限
-        arr.splice(6, 0, { title: '售价', dataIndex: 'productPrice', width: '8%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
+        arr.splice(6, 0, { title: '售价', dataIndex: 'productPrice', width: '8%', align: 'right', scopedSlots: { customRender: 'productPrice' } })
       }
       return arr
     }

+ 15 - 12
src/views/salesManagement/salesQueryNew/comps/productList.vue

@@ -15,27 +15,30 @@
               </span>
               <span v-else>购买满{{ descDetail.gateAmount }}元门槛产品,可使用 {{ descDetail.quotaAmount }}元配额,采购规则中的正价商品</span>
             </div>
-            <span v-else>--</span>
+            <span v-else></span>
           </a-descriptions-item>
           <a-descriptions-item label="促销规则">
-            <div v-if="descDetail.promotionRuleType == 'BUY_PROD_GIVE_PROD'">
+            {{ descDetail.regularSameFlag==='1'?'同款,':'不同款,' }}
+            <span v-if="descDetail.promotionRuleType == 'BUY_PROD_GIVE_PROD'">
               购买满{{ descDetail.regularQty }}个正价产品,送{{ descDetail.promotionQty }}个促销产品
-            </div>
-            <div v-else-if="descDetail.promotionRuleType == 'BUY_PROD_GIVE_MONEY'">
+              {{ descDetail.accrualFlag ? ',数量叠加':',数量不叠加' }}
+            </span>
+            <span v-else-if="descDetail.promotionRuleType == 'BUY_PROD_GIVE_MONEY'">
               购买满{{ descDetail.regularAmount }}元正价产品,送{{ descDetail.giveAmount }}元促销品采购额
-            </div>
-            <div v-else>
+              {{ descDetail.accrualFlag ? ',金额叠加':',金额不叠加' }}
+            </span>
+            <span v-else>
               特价产品
-            </div>
+            </span>
           </a-descriptions-item>
-          <a-descriptions-item label="显示正价产品款数">
+          <a-descriptions-item label="限制正价产品款数" v-if="descDetail.promotionRuleType!='PROMO_PROD'&&descDetail.promotionRuleType!='BUY_PROD_GIVE_MONEY'">
             {{ descDetail.restrictCategory||'--' }}
           </a-descriptions-item>
-          <a-descriptions-item label="订单起订金额">
-            {{ descDetail.minOrderAmount||'--' }}
+          <a-descriptions-item label="订单起订金额(元)">
+            {{ descDetail.minOrderAmount||'' }}
           </a-descriptions-item>
-          <a-descriptions-item label="活动经费上线">
-            {{ descDetail.upperLimitAmount||'--' }}
+          <a-descriptions-item label="活动经费上线(元)">
+            {{ descDetail.upperLimitAmount||'' }}
           </a-descriptions-item>
         </a-descriptions>
     </div>

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

@@ -24,7 +24,7 @@
                     <li><strong>促销类型:</strong> 买产品送产品</li>
                     <li><strong>促销门槛:</strong> 购买1000元门槛产品,可使用200元配额,采购正价产品</li>
                     <li><strong>促销规则:</strong> 购买满10个正价产品,送10个促销产品</li>
-                    <li><strong>显示正价产品款数:</strong> 40</li>
+                    <li><strong>限制正价产品款数</strong> 40</li>
                     <li><strong>订单起订金额:</strong> 20000</li>
                     <li><strong>活动经费上线:</strong> 5000</li>
                   </ul>

+ 10 - 2
src/views/salesManagement/salesQueryNew/edit.vue

@@ -86,9 +86,17 @@
               <a-button shape="round" size="small" v-if="detailData.totalLossAmount">优惠明细</a-button>
               <div slot="content">
                 <div v-if="yhDetail">
-                    <div class="yhdetail" style="min-width:300px;margin-bottom: 5px;" v-for="(item,index) in yhDetail.promoMapList" :key="index">
+                    <div 
+                    class="yhdetail" 
+                    style="min-width:300px;margin-bottom: 5px;" 
+                    v-for="(item,index) in yhDetail.promoMapList" 
+                    :key="index">
                       <div class="yhdetail-h" style="font-weight: bold;font-size:14px;">{{ item.title }}</div>
-                      <div style="padding-left:10px;" v-for="(sitem,sindex) in item.promoRuleMapList" :key="sindex">
+                      <div style="padding-left:10px;" 
+                      v-for="(sitem,sindex) in item.promoRuleMapList" 
+                      :key="sindex" 
+                      v-if="sitem.lossAmount"
+                      >
                         <div style="display: flex;justify-content: space-between;">
                           <span>{{sitem.promotionRuleTypeDictValue}}:</span>
                           <strong>¥{{ toThousands(sitem.lossAmount) }}</strong>