|
@@ -35,7 +35,7 @@
|
|
|
<a-icon style="color: #FF9900;" type="bell" /> 已选产品可参加<span>【买10副刹车片送2个滤清器】、【买电瓶送滤清器】</span>的促销活动,促销产品为指定产品
|
|
|
</div>
|
|
|
</a-col>
|
|
|
- <a-col :span="6">
|
|
|
+ <!-- <a-col :span="6">
|
|
|
<div style="float:right;overflow: hidden;">
|
|
|
<a-button size="small" id="salesEdit-dru">导入明细</a-button>
|
|
|
<a-button
|
|
@@ -46,7 +46,7 @@
|
|
|
style="margin-left: 10px"
|
|
|
id="salesEdit-del-all">整单删除</a-button>
|
|
|
</div>
|
|
|
- </a-col>
|
|
|
+ </a-col> -->
|
|
|
</a-row>
|
|
|
</div>
|
|
|
<!-- 总计 -->
|
|
@@ -99,13 +99,13 @@
|
|
|
class="button-error"
|
|
|
@click="handleDel(record)"
|
|
|
>删除</a-button>
|
|
|
- <a-button
|
|
|
+ <!-- <a-button
|
|
|
size="small"
|
|
|
type="primary"
|
|
|
:loading="delLoading"
|
|
|
class="button-warning"
|
|
|
@click="handleSelCx(record)"
|
|
|
- >选择促销品</a-button>
|
|
|
+ >选择促销品</a-button> -->
|
|
|
</template>
|
|
|
</s-table>
|
|
|
</a-card>
|
|
@@ -282,7 +282,7 @@ export default {
|
|
|
purchaseBillSn: this.detailData.purchaseBillSn,
|
|
|
purchaseBillNo: this.detailData.purchaseBillNo,
|
|
|
stockSn: row.stockSn,
|
|
|
- promotableFlag: 0, // 可促销标记 有活动的传1,没活动的传0
|
|
|
+ promotableFlag: row.promotableFlag || 0, // 可促销标记 有活动的传1,没活动的传0
|
|
|
promotionFlag: promotionFlag // 促销标记 正品传0,促销品传1
|
|
|
}).then(res => {
|
|
|
if (res.status == 200) {
|