瀏覽代碼

Merge branch 'develop_cuxiao' of http://git.chelingzhu.com/jianguan-web/jg-ocs-html into develop_cuxiao

lilei 1 年之前
父節點
當前提交
b0cddf650c

+ 5 - 5
src/views/promotionRulesManagement/dealerPromotions/detail.vue

@@ -58,22 +58,22 @@
           <template slot="cillProduct" slot-scope="text, record">
             <div v-if="record.gateFlag === '1'">
               <span v-if="record.gateType==='RATIO_AMOUNT'">
-                购买门槛产品金额{{ record.gateAmount*100 }}%作为配额
+                购买门槛产品金额{{ record.gateAmount*100 }}%作为配额{{ record.promotionRuleType ==='BUY_PROD_GIVE_MONEY'?(record.accrualFlag&&record.accrualFlag==1)?'(金额叠加)':'(金额不叠加)':'' }}
               </span>
               <span v-else-if="record.gateType==='MIN_AMOUNT'">
-                购买门槛产品满最低金额{{ record.gateAmount }}元,不限制配额。
+                购买门槛产品满最低金额{{ record.gateAmount }}元,不限制配额{{ record.promotionRuleType ==='BUY_PROD_GIVE_MONEY'?(record.accrualFlag&&record.accrualFlag==1)?'(金额叠加)':'(金额不叠加)':'' }}
               </span>
-              <span v-else>购买满{{ record.gateAmount }}元门槛产品,可使用 {{ record.quotaAmount }}元配额,采购规则中的正价商品</span>
+              <span v-else>购买满{{ record.gateAmount }}元门槛产品,可使用 {{ record.quotaAmount }}元配额,采购规则中的正价商品{{ record.promotionRuleType ==='BUY_PROD_GIVE_MONEY'?(record.accrualFlag&&record.accrualFlag==1)?'(金额叠加)':'(金额不叠加)':'' }}</span>
             </div>
             <span v-else>--</span>
           </template>
           <!-- 规则 -->
           <template slot="ruleProduct" slot-scope="text, record">
             <div v-if="record.promotionRuleType == 'BUY_PROD_GIVE_PROD'">
-              购买满{{ record.regularQty }}个正价产品,送{{ record.promotionQty }}个促销产品
+              {{ record.regularSameFlag==1?'同款':'不同款' }}产品购买满{{ record.regularQty }}个正价产品,送{{ record.promotionQty }}个促销产品
             </div>
             <div v-else-if="record.promotionRuleType == 'BUY_PROD_GIVE_MONEY'">
-              购买满{{ record.regularAmount }}元正价产品,送{{ record.giveAmount }}元促销品采购额
+              {{ record.regularSameFlag==1?'同款':'不同款' }}产品购买满{{ record.regularAmount }}元正价产品,送{{ record.giveAmount }}元促销品采购额
             </div>
             <div v-else>
               特价产品

+ 1 - 1
src/views/promotionRulesManagement/dealerPromotions/tableType3.vue

@@ -278,7 +278,7 @@ export default {
       const _this = this
       const pos = _this.dataSource.findIndex(con => con.productScopeSn == sn)
       const oldPrice = typePrice + 'Price'
-      const str = Math.floor(((val / _this.dataSource[pos][oldPrice]) * 100).toFixed(2))
+      const str = ((val / _this.dataSource[pos][oldPrice]) * 100).toFixed(2)
       const name = typePrice + 'DiscountRate'
       _this.dataSource[pos][name] = str
       _this.$forceUpdate()