lilei 4 weeks ago
parent
commit
a98d9e09df

+ 3 - 4
src/views/salesManagement/salesQueryNew/comps/productActiveList.vue

@@ -455,7 +455,7 @@ export default {
             return (
               <div>
                 {
-                  row.promotionFlag != 'GIFT'
+                  row.regularPromotionSameFlag != '1'
                     ? <a-button
                       id={'salesEdit-upactive-' + row.id}
                       size="small"
@@ -466,7 +466,7 @@ export default {
                     >换促销</a-button> : ''
                 }
                 {
-                  row.promotionFlag != 'GIFT'
+                  row.regularPromotionSameFlag != '1'
                     ? <a-button
                       id={'salesEdit-del-' + row.id}
                       size="small"
@@ -474,7 +474,7 @@ export default {
                       disabled={_this.delLoading}
                       class="button-error"
                       onClick={() => _this.handleDel(row)}
-                    >删除{row.regularPromotionSameFlag}</a-button> : '--'
+                    >删除</a-button> : '--'
                 }
               </div>
 
@@ -555,7 +555,6 @@ export default {
             // 促销品,正促是否一致
             if (data[i].promotionFlag.indexOf('GIFT') >= 0 && data[i].promoRuleSnList) {
               const ruleObj = this.activeList.find(item => item.promoRuleSn == data[i].promoRuleSnList[0])
-              console.log(ruleObj)
               data[i].regularPromotionSameFlag = ruleObj.regularPromotionSameFlag
             }
           }