Skip to content

O
op-web-service
Commit 222938af authored by v-yuchenglong's avatar v-yuchenglong
Browse files
Options

update:商品详情已售数量修改

parent 79f55c58
Hide whitespace changes
Inline Side-by-side
Showing with 114 additions and 116 deletions
src/pages/Activity/ActivityDetail/index.vue
View file @ 222938af
......@@ -100,8 +100,8 @@
<span class="originPrice">{{
`¥${goodsItem.original_price} `
}}</span>
<span class="sold"
>已售{{ goodsItem.all_have_buy_goods_count }}</span
<span class="sold" v-if="goodsItem.inventory_rest==0">抢光了</span>
<span class="sold" v-else>已售{{ goodsItem.all_have_buy_goods_count }}</span
>
</p>
</div>
......
src/pages/Groupmeal/newOrderManagement/index.vue
View file @ 222938af
......@@ -9,84 +9,77 @@
ref="ruleForm"
class="demo-form-inline"
>
<div>
<el-form-item label="活动名称：" prop="marketing_id">
<el-select
v-model="orderQueryObj.marketing_id"
placeholder="请选择"
@change="activityNameSel"
@focus="activityNameFocus"
filterable
>
<el-option
v-for="item in activityNameArr"
:key="item.marketing_id"
:label="item.marketing_name"
:value="item.marketing_id"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="订单状态：" prop="order_status">
<el-select
v-model="orderQueryObj.order_status"
placeholder="请选择"
>
<el-option
v-for="item in orderStatusArr"
:key="item.value"
:label="item.label"
:value="item.value"
:disabled="item.disabled"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="商品名称：" prop="goods_id">
<el-select
v-model="orderQueryObj.goods_id"
placeholder="请选择"
filterable
>
<el-option
v-for="item in tradeNameArr"
:key="item.goods_id"
:label="item.goods_name"
:value="item.goods_id"
></el-option>
</el-select>
</el-form-item>
</div>
<div>
<el-form-item label="收货人：" prop="cust_user">
<el-input
placeholder="请输入收货人姓名或手机号"
prefix-icon="el-icon-search"
v-model="orderQueryObj.cust_user"
style="width:220px"
></el-input>
</el-form-item>
<el-form-item label="订单编号：" prop="order_id">
<el-input
placeholder="请输入订单号"
prefix-icon="el-icon-search"
v-model="orderQueryObj.order_id"
></el-input>
</el-form-item>
<el-form-item label="自提点：" prop="sub_shop_id">
<el-select
v-model="orderQueryObj.sub_shop_id"
placeholder="请选择"
filterable
@change="subShopSel"
>
<el-option
v-for="item in selLiftPoinArr"
:key="item.take_place_id"
:label="item.take_place_name"
:value="item.take_place_id"
></el-option>
</el-select>
</el-form-item>
</div>
<el-form-item label="活动名称：" prop="marketing_id">
<el-select
v-model="orderQueryObj.marketing_id"
placeholder="请选择"
@change="activityNameSel"
@focus="activityNameFocus"
filterable
>
<el-option
v-for="item in activityNameArr"
:key="item.marketing_id"
:label="item.marketing_name"
:value="item.marketing_id"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="订单状态：" prop="order_status">
<el-select v-model="orderQueryObj.order_status" placeholder="请选择">
<el-option
v-for="item in orderStatusArr"
:key="item.value"
:label="item.label"
:value="item.value"
:disabled="item.disabled"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="商品名称：" prop="goods_id">
<el-select
v-model="orderQueryObj.goods_id"
placeholder="请选择"
filterable
>
<el-option
v-for="item in tradeNameArr"
:key="item.goods_id"
:label="item.goods_name"
:value="item.goods_id"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="收货人：" prop="cust_user">
<el-input
placeholder="请输入收货人姓名或手机号"
prefix-icon="el-icon-search"
v-model="orderQueryObj.cust_user"
style="width: 220px"
></el-input>
</el-form-item>
<el-form-item label="订单编号：" prop="order_id">
<el-input
placeholder="请输入订单号"
prefix-icon="el-icon-search"
v-model="orderQueryObj.order_id"
></el-input>
</el-form-item>
<el-form-item label="自提点：" prop="sub_shop_id">
<el-select
v-model="orderQueryObj.sub_shop_id"
placeholder="请选择"
filterable
@change="subShopSel"
>
<el-option
v-for="item in selLiftPoinArr"
:key="item.take_place_id"
:label="item.take_place_name"
:value="item.take_place_id"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="详细地址：" prop="take_place_address">
<el-select
......@@ -203,7 +196,7 @@
(scope.row.order_status == '2' ||
scope.row.order_status == '6' ||
scope.row.order_status == '8') &&
scope.row.payment !== 0
scope.row.payment !== 0
"
>退款</el-button
>
......@@ -294,7 +287,7 @@
(scope.row.order_status == '2' ||
scope.row.order_status == '6' ||
scope.row.order_status == '8') &&
scope.row.payment !== 0
scope.row.payment !== 0
"
>退款</el-button
>
......@@ -397,7 +390,7 @@ import {
newOrderItemList,
newOrderRefundReject,
newRefundOrder,
newGetOrderExportURL
newGetOrderExportURL,
} from "@/service/Groupmeal/groupmeal";
import page from "../components/Pagination/index.vue";
import dayJs from "dayjs";
......@@ -405,7 +398,7 @@ export default {
name: "orderManagement",
components: {
Layout,
page
page,
},
data() {
return {
......@@ -421,7 +414,7 @@ export default {
sub_shop_id: "", // 自提点
take_place_address: "", //详细地址
create_time_start: "", // 开始时间
create_time_end: "" // 结束时间
create_time_end: "", // 结束时间
},
order_time: [], // 下单时间
// 下拉框数据
......@@ -431,36 +424,36 @@ export default {
orderStatusArr: [
{
value: "0",
label: "全部"
label: "全部",
},
{
value: "1",
label: "未支付"
label: "未支付",
},
{
value: "2",
label: "已支付"
label: "已支付",
},
{
value: "3",
label: "待退款"
label: "待退款",
},
{
value: "4",
label: "已退款"
label: "已退款",
},
{
value: "5",
label: "退款中"
label: "退款中",
},
{
value: "6",
label: "已拒绝"
label: "已拒绝",
},
{
value: "7",
label: "售后"
}
label: "售后",
},
],
// 商品名称
tradeNameArr: [],
......@@ -489,9 +482,10 @@ export default {
refundedGoodsSel: false,
payment: "",
// restoreInventory: false,
goods_name: ""
}
]
goods_name: "",
},
],
flag: []
};
},
......@@ -504,7 +498,7 @@ export default {
},
exportURL3() {
return newGetOrderExportURL(this.orderQueryObj.marketing_id, "3");
}
},
},
methods: {
......@@ -531,7 +525,7 @@ export default {
this.orderQueryObj.sub_shop_id = "";
this.orderQueryObj.take_place_address = "";
const params = {
marketing_id: val
marketing_id: val,
};
const res = await newGetGoodsList(params); // 商品名称
this.getSubShopListMet(val); //自提点
......@@ -549,7 +543,9 @@ export default {
}
const res = await newGetSubShopList({ marketing_id: marketing_id });
this.selLiftPoinArr = res.result.take_place_list;
this.flag = res.result.take_place_list;
this.detailedAddressArr = res.result.address_list;
} catch (error) {
this.$message.error("发生未知错误,请稍后再试一下吧~~~");
console.error(error);
......@@ -583,12 +579,14 @@ export default {
arrID = [];
this.orderQueryObj.sub_shop_id = "";
this.orderQueryObj.sub_shop_list = "";
this.selLiftPoinArr = this.flag;
for (var i in this.selLiftPoinArr) {
if (val == this.selLiftPoinArr[i].address) {
arr.push(this.selLiftPoinArr[i]);
arrID.push(this.selLiftPoinArr[i].take_place_id);
}
}
this.selLiftPoinArr = arr;
if (this.orderQueryObj.sub_shop_id == "") {
this.orderQueryObj.sub_shop_list = arrID.join(",");
......@@ -627,7 +625,7 @@ export default {
resetOrder(formName) {
if (this.$route.query.marketing_type == "4") {
this.$router.push({
path: "/op/groupmeal/newOrderManagement"
path: "/op/groupmeal/newOrderManagement",
});
this.$route.query.marketing_type = "";
}
......@@ -647,7 +645,7 @@ export default {
searchOrder() {
if (this.$route.query.marketing_type == "4") {
this.$router.push({
path: "/op/groupmeal/newOrderManagement"
path: "/op/groupmeal/newOrderManagement",
});
this.$route.query.marketing_type = "";
}
......@@ -687,7 +685,7 @@ export default {
this.orderQueryObj.marketing_id === "" ||
this.orderQueryObj.marketing_id === "0"
) {
this.$message.error("请选择活动后再进行操作");
this.$message.error("请选择活动名称");
return;
}
this.exportShow = true;
......@@ -697,7 +695,7 @@ export default {
async printOrderMet(forcePrint) {
const params = {
marketing_id: this.orderQueryObj.marketing_id,
force_print: forcePrint ? "1" : ""
force_print: forcePrint ? "1" : "",
};
const res = await newOrderPrint(params);
return res;
......@@ -709,7 +707,7 @@ export default {
this.orderQueryObj.marketing_id === "" ||
this.orderQueryObj.marketing_id === "0"
) {
this.$message.error("请选择活动后再进行操作");
this.$message.error("请选择活动名称");
return;
}
......@@ -717,7 +715,7 @@ export default {
if (res.code === 0) {
this.$message({
type: "success",
message: "打印成功"
message: "打印成功",
});
return;
}
......@@ -735,7 +733,7 @@ export default {
try {
await this.$confirm(res.reason, "打印", {
cancelButtonText: "取消",
confirmButtonText: "确定"
confirmButtonText: "确定",
});
} catch (e) {
// 取消
......@@ -761,7 +759,7 @@ export default {
goods_id: "",
cust_user: "",
order_id: "",
sub_shop_id: ""
sub_shop_id: "",
});
} else {
res = await newGetOrderList(this.orderQueryObj);
......@@ -786,21 +784,21 @@ export default {
try {
await this.$confirm("确定要拒绝退款么?", "拒绝", {
cancelButtonText: "取消",
confirmButtonText: "确定"
confirmButtonText: "确定",
});
} catch (e) {
// 取消
return;
}
const params = {
order_id: val.order_id
order_id: val.order_id,
};
const res = await newOrderRefundReject(params);
if (res.code === 0) {
this.$message({
type: "success",
message: "订单已驳回"
message: "订单已驳回",
});
} else {
this.$message.error(res.reason);
......@@ -826,7 +824,7 @@ export default {
this.checkAll = false;
this.refundGoods = [];
const params = {
order_id: val.order_id
order_id: val.order_id,
};
const res = await newOrderItemList(params);
this.refundGoods = res.result;
......@@ -855,15 +853,15 @@ export default {
// }
// }
const convertToNumber = str => {
const convertToNumber = (str) => {
return !Number.isNaN(parseFloat(str)) ? parseFloat(str) : 0;
};
const processRefundItem = item => {
const processRefundItem = (item) => {
return {
order_item_id: item.order_item_id,
refund_num: item.refundableQuantity || 0,
refund_amount: convertToNumber(item.amountToRefund)
refund_amount: convertToNumber(item.amountToRefund),
// refund_type: item.refund_type
};
};
......@@ -886,13 +884,13 @@ export default {
return;
}
this.$message.error(res.reason);
}
},
},
created() {
this.getMarketingListMet(); // 活动名称
this.getSubShopListMet(); // 自提点
this.getOrderListMet(); // table列表
}
},
};
</script>
......
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