Commit 81cd04e9 authored by lihui's avatar lihui

fix: 8/2bug

parent 766b556a
This diff is collapsed.
...@@ -244,14 +244,13 @@ ...@@ -244,14 +244,13 @@
size="small" size="small"
@click="refund(scope.row)" @click="refund(scope.row)"
v-show=" v-show="
scope.row.order_status_text == '已支付' || scope.row.order_status == '2' ||
scope.row.order_status_text == '已拒绝' scope.row.order_status == '6' ||
scope.row.order_status == '8'
" "
>退款</el-button >退款</el-button
> >
<el-button-group <el-button-group v-show="scope.row.order_status == '3'">
v-show="scope.row.order_status_text == '待退款'"
>
<el-button type="text" size="small" @click="agree(scope.row)" <el-button type="text" size="small" @click="agree(scope.row)"
>同意</el-button >同意</el-button
> >
...@@ -323,6 +322,7 @@ ...@@ -323,6 +322,7 @@
> >
<el-row> <el-row>
<el-checkbox <el-checkbox
class="check-wrap"
v-model="item.refundedGoodsSel" v-model="item.refundedGoodsSel"
:label="item.goods_name" :label="item.goods_name"
name="type" name="type"
...@@ -506,22 +506,27 @@ export default { ...@@ -506,22 +506,27 @@ export default {
} }
}, },
// 获取商品名称 // 活动名称的change事件 获取商品名称+获取自提点
async activityNameSel(val) { async activityNameSel(val) {
this.orderQueryObj.goods_id = ""; this.orderQueryObj.goods_id = "";
const params = { const params = {
marketing_id: val, marketing_id: val,
}; };
const res = await getGoodsList(params); const res = await getGoodsList(params); // 商品名称
this.getSubShopListMet(val) //自提点
// const res = await getSubShopList(params); // const res = await getSubShopList(params);
this.tradeNameArr = res.result; this.tradeNameArr = res.result;
// this.selLiftPoinArr = res.result; // this.selLiftPoinArr = res.result;
}, },
// 获取自提点 // 获取自提点
async getSubShopListMet() { async getSubShopListMet(params) {
try { try {
const res = await getSubShopList(""); let marketing_id = ''
if(params){
marketing_id = params
}
const res = await getSubShopList({'marketing_id':marketing_id});
this.selLiftPoinArr = res.result; this.selLiftPoinArr = res.result;
} catch (error) { } catch (error) {
this.$message.error("发生未知错误,请稍后再试一下吧~~~"); this.$message.error("发生未知错误,请稍后再试一下吧~~~");
...@@ -750,11 +755,20 @@ export default { ...@@ -750,11 +755,20 @@ export default {
}, },
}, },
created() { created() {
this.getMarketingListMet(); this.getMarketingListMet(); // 活动名称
this.getSubShopListMet(); this.getSubShopListMet(); // 自提点
this.getOrderListMet(); this.getOrderListMet(); // table列表
}, },
}; };
</script> </script>
<style lang="less" src="./index.less" scope></style> <style lang="less" src="./index.less" scope></style>
<style lang="less" scoped>
.check-wrap{
/deep/ .el-checkbox__label {
white-space: normal;
word-break: break-all;
}
}
</style>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment