Skip to content

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

update:新老订单增加下单时间筛选，部分测试问题修改

parent 947cffe9
Hide whitespace changes
Inline Side-by-side
Showing with 243 additions and 81 deletions
src/pages/Activity/Manage/index.vue
View file @ 473b2266
......@@ -30,6 +30,7 @@
</el-select>
</el-form-item>
<el-form-item style="margin-left: 50px">
<el-button @click="reset()">重置</el-button>
<el-button type="primary" @click="getActivityList">搜索</el-button>
</el-form-item>
<el-form-item>
......@@ -189,6 +190,13 @@ export default {
};
},
methods: {
// 重置
reset() {
this.activity.activityName = "";
this.activity.online_status = "";
this.getActivityList();
},
/* API */
// 获取商品列表
async getActivityList() {
......
src/pages/Activity/releaseProduc/components/addProduc.vue
View file @ 473b2266
......@@ -13,7 +13,7 @@
<el-table :data="comTableData" border style="width: 100%">
<el-table-column label="显示顺序" align="center" width="140">
<template #default="scope">
<i class="el-icon-top" @click="upMove(scope.$index, scope.row)"></i>
<i class="el-icon-top" @click="upMove(scope.$index, scope.row)" style="margin-right:15px;"></i>
<i
class="el-icon-bottom"
@click="upDown(scope.$index, scope.row)"
......@@ -87,6 +87,7 @@
<el-form-item
label="商品标题："
prop="goods_name"
style="width:90%;"
:rules="[{ required: true, message: '请输入商品标题' }]"
>
<el-input
......@@ -134,7 +135,7 @@
</div>
<br />
<el-form-item
label="商家"
label="商家："
prop="business1"
:rules="[{ required: true, message: '请选择商家' }]"
>
......
src/pages/Activity/releaseProduc/components/spellOrderSet.vue
View file @ 473b2266
......@@ -446,6 +446,7 @@ export default {
if (valid) {
await this.addPlace();
this.$refs.ruleForm.resetFields();
this.$refs.multipleTable.clearSelection();
this.dialogFormVisible = false;
} else {
return false;
......
src/pages/Groupmeal/newOrderManagement/index.vue
View file @ 473b2266
......@@ -77,6 +77,39 @@
></el-option>
</el-select>
</el-form-item>
<el-form-item label="详细地址：" prop="detailed_address">
<el-select
v-model="orderQueryObj.detailed_address"
placeholder="请选择"
filterable
>
<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="order_time">
<el-date-picker
v-model="order_time"
type="datetimerange"
start-placeholder="开始日期"
end-placeholder="结束日期"
format="YYYY-MM-DD HH:mm:ss"
value-format="YYYY-MM-DD HH:mm:ss"
>
</el-date-picker>
</el-form-item>
<el-form-item>
<el-button size="small" @click="today">今天</el-button>
<el-button size="small" @click="yesterday">昨天</el-button>
</el-form-item>
<el-form-item>
<el-button @click="resetOrder('ruleForm')">重置</el-button>
<el-button type="primary" @click="searchOrder">搜索</el-button>
......@@ -159,7 +192,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
>
......@@ -250,7 +283,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
>
......@@ -353,15 +386,15 @@ import {
newOrderItemList,
newOrderRefundReject,
newRefundOrder,
newGetOrderExportURL
newGetOrderExportURL,
} from "@/service/Groupmeal/groupmeal";
import page from "../components/Pagination/index.vue";
import dayJs from "dayjs";
export default {
name: "orderManagement",
components: {
Layout,
page
page,
},
data() {
return {
......@@ -369,13 +402,17 @@ export default {
orderQueryObj: {
page: 1,
page_size: 10,
marketing_id: "", // 活动名称
marketing_id: "0", // 活动名称
order_status: "0", // 订单状态
goods_id: "", // 商品名称
cust_user: "", // 收货人
order_id: "", // 订单编号
sub_shop_id: "" // 自提点
sub_shop_id: "", // 自提点
detailed_address:"", //详细地址
create_time_start: "", // 开始时间
create_time_end: "", // 结束时间
},
order_time: [], // 下单时间
// 下拉框数据
// 活动名称
activityNameArr: [],
......@@ -383,36 +420,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: [],
......@@ -439,9 +476,9 @@ export default {
refundedGoodsSel: false,
payment: "",
// restoreInventory: false,
goods_name: ""
}
]
goods_name: "",
},
],
};
},
......@@ -454,7 +491,7 @@ export default {
},
exportURL3() {
return newGetOrderExportURL(this.orderQueryObj.marketing_id, "3");
}
},
},
methods: {
......@@ -466,7 +503,9 @@ export default {
async getMarketingListMet() {
try {
const res = await newGetMarketingList();
this.activityNameArr = res.result;
let allArr = [{ marketing_id: "0", marketing_name: "全部活动" }];
let arr = allArr.concat(res.result);
this.activityNameArr = arr;
} catch (error) {
this.$message.error("发生未知错误,请稍后再试一下吧~~~");
console.error(error);
......@@ -478,7 +517,7 @@ export default {
this.orderQueryObj.goods_id = "";
this.orderQueryObj.sub_shop_id = "";
const params = {
marketing_id: val
marketing_id: val,
};
const res = await newGetGoodsList(params); // 商品名称
this.getSubShopListMet(val); //自提点
......@@ -502,17 +541,47 @@ export default {
}
},
// 获取今天日期
today() {
this.order_time[0] = dayJs(
new Date(new Date(new Date().toLocaleDateString()).getTime())
).format("YYYY-MM-DD HH:mm:ss");
this.order_time[1] = dayJs(
new Date(
new Date(new Date().toLocaleDateString()).getTime() +
24 * 60 * 60 * 1000 -
1
)
).format("YYYY-MM-DD HH:mm:ss");
},
// 获取昨天日期
yesterday() {
this.order_time[0] = dayJs(
new Date(
new Date(new Date().toLocaleDateString()).getTime() -
24 * 60 * 60 * 1000
)
).format("YYYY-MM-DD HH:mm:ss");
this.order_time[1] = dayJs(
new Date(new Date(new Date().toLocaleDateString()).getTime() - 1)
).format("YYYY-MM-DD HH:mm:ss");
},
// 重置
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 = "";
}
this.$refs[formName].resetFields();
this.order_time = [];
this.orderQueryObj.create_time_start = "";
this.orderQueryObj.create_time_end = "";
this.orderQueryObj.page = 1;
this.orderQueryObj.page_size = 10;
this.$refs[formName].resetFields();
this.getOrderListMet(this.orderQueryObj);
this.getSubShopListMet();
},
......@@ -521,12 +590,14 @@ 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 = "";
}
this.orderQueryObj.page = 1;
this.orderQueryObj.page_size = 10;
this.orderQueryObj.create_time_start = this.order_time[0];
this.orderQueryObj.create_time_end = this.order_time[1];
if (this.orderQueryObj.order_status === "0") {
this.activeName = "all";
this.orderStatusArr[1].disabled = false;
......@@ -555,7 +626,10 @@ export default {
// 导出
exportOrder() {
if (this.orderQueryObj.marketing_id === "") {
if (
this.orderQueryObj.marketing_id === "" ||
this.orderQueryObj.marketing_id === "0"
) {
this.$message.error("请选择活动名称");
return;
}
......@@ -566,7 +640,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;
......@@ -574,7 +648,10 @@ export default {
// 打印
async printOrder() {
if (this.orderQueryObj.marketing_id === "") {
if (
this.orderQueryObj.marketing_id === "" ||
this.orderQueryObj.marketing_id === "0"
) {
this.$message.error("请选择活动名称");
return;
}
......@@ -583,7 +660,7 @@ export default {
if (res.code === 0) {
this.$message({
type: "success",
message: "打印成功"
message: "打印成功",
});
return;
}
......@@ -601,7 +678,7 @@ export default {
try {
await this.$confirm(res.reason, "打印", {
cancelButtonText: "取消",
confirmButtonText: "确定"
confirmButtonText: "确定",
});
} catch (e) {
// 取消
......@@ -627,7 +704,7 @@ export default {
goods_id: "",
cust_user: "",
order_id: "",
sub_shop_id: ""
sub_shop_id: "",
});
} else {
res = await newGetOrderList(this.orderQueryObj);
......@@ -652,21 +729,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);
......@@ -692,7 +769,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;
......@@ -721,11 +798,11 @@ 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,
......@@ -752,13 +829,13 @@ export default {
return;
}
this.$message.error(res.reason);
}
},
},
created() {
this.getMarketingListMet(); // 活动名称
this.getSubShopListMet(); // 自提点
this.getOrderListMet(); // table列表
}
},
};
</script>
......
src/pages/Groupmeal/orderManagement/index.vue
View file @ 473b2266
......@@ -77,6 +77,39 @@
></el-option>
</el-select>
</el-form-item>
<!-- <el-form-item label="详细地址：" prop="detailed_address">
<el-select
v-model="orderQueryObj.detailed_address"
placeholder="请选择"
filterable
>
<el-option
v-for="item in selLiftPoinArr"
:key="item.sub_shop_id"
:label="item.sub_shop_name"
:value="item.sub_shop_id"
></el-option>
</el-select>
</el-form-item> -->
<el-form-item label="下单时间：" prop="order_time">
<el-date-picker
v-model="order_time"
type="datetimerange"
start-placeholder="开始日期"
end-placeholder="结束日期"
format="YYYY-MM-DD HH:mm:ss"
value-format="YYYY-MM-DD HH:mm:ss"
>
</el-date-picker>
</el-form-item>
<el-form-item>
<el-button size="small" @click="today">今天</el-button>
<el-button size="small" @click="yesterday">昨天</el-button>
</el-form-item>
<el-form-item>
<el-button @click="resetOrder('ruleForm')">重置</el-button>
<el-button type="primary" @click="searchOrder">搜索</el-button>
......@@ -157,8 +190,8 @@
@click="refund(scope.row)"
v-show="
scope.row.order_status == '2' ||
scope.row.order_status == '6' ||
scope.row.order_status == '8'
scope.row.order_status == '6' ||
scope.row.order_status == '8'
"
>退款</el-button
>
......@@ -245,8 +278,8 @@
@click="refund(scope.row)"
v-show="
scope.row.order_status == '2' ||
scope.row.order_status == '6' ||
scope.row.order_status == '8'
scope.row.order_status == '6' ||
scope.row.order_status == '8'
"
>退款</el-button
>
......@@ -374,16 +407,15 @@ import {
orderItemList,
orderRefundReject,
refundOrder,
getOrderExportURL
getOrderExportURL,
} from "@/service/Groupmeal/groupmeal";
// import page from "../../components/Pagination.vue";
import page from "../components/Pagination/index.vue";
import dayJs from "dayjs";
export default {
name: "orderManagement",
components: {
Layout,
page
page,
},
data() {
return {
......@@ -391,13 +423,17 @@ export default {
orderQueryObj: {
page: 1,
page_size: 10,
marketing_id: "", // 活动名称
marketing_id: "0", // 活动名称
order_status: "0", // 订单状态
goods_id: "", // 商品名称
cust_user: "", // 收货人
order_id: "", // 订单编号
sub_shop_id: "" // 自提点
sub_shop_id: "", // 自提点
// detailed_address: "", // 详细地址
create_time_start: "", // 开始时间
create_time_end: "", // 结束时间
},
order_time: [], // 下单时间
// 下拉框数据
// 活动名称
activityNameArr: [],
......@@ -405,36 +441,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: [],
......@@ -472,9 +508,9 @@ export default {
payment: "", // 实付
refundableQuantity: "",
refundAmount: "",
amountToRefund: ""
}
]
amountToRefund: "",
},
],
};
},
......@@ -487,7 +523,7 @@ export default {
},
exportURL3() {
return getOrderExportURL(this.orderQueryObj.marketing_id, "3");
}
},
},
methods: {
......@@ -499,7 +535,9 @@ export default {
async getMarketingListMet() {
try {
const res = await getMarketingList();
this.activityNameArr = res.result;
let allArr = [{ marketing_id: "0", marketing_name: "全部活动" }];
let arr = allArr.concat(res.result);
this.activityNameArr = arr;
} catch (error) {
this.$message.error("发生未知错误,请稍后再试一下吧~~~");
console.error(error);
......@@ -510,7 +548,7 @@ export default {
async activityNameSel(val) {
this.orderQueryObj.goods_id = "";
const params = {
marketing_id: val
marketing_id: val,
};
const res = await getGoodsList(params); // 商品名称
this.getSubShopListMet(val); //自提点
......@@ -534,11 +572,40 @@ export default {
}
},
// 获取今天日期
today() {
this.order_time[0] = dayJs(
new Date(new Date(new Date().toLocaleDateString()).getTime())
).format("YYYY-MM-DD HH:mm:ss");
this.order_time[1] = dayJs(
new Date(
new Date(new Date().toLocaleDateString()).getTime() +
24 * 60 * 60 * 1000
)
).format("YYYY-MM-DD HH:mm:ss");
},
// 获取昨天日期
yesterday() {
this.order_time[0] = dayJs(
new Date(
new Date(new Date().toLocaleDateString()).getTime() -
24 * 60 * 60 * 1000
)
).format("YYYY-MM-DD HH:mm:ss");
this.order_time[1] = dayJs(
new Date(new Date(new Date().toLocaleDateString()).getTime())
).format("YYYY-MM-DD HH:mm:ss");
},
// 重置
resetOrder(formName) {
this.$refs[formName].resetFields();
this.order_time = [];
this.orderQueryObj.page = 1;
this.orderQueryObj.page_size = 10;
this.orderQueryObj.create_time_start = "";
this.orderQueryObj.create_time_end = "";
this.$refs[formName].resetFields();
this.getOrderListMet(this.orderQueryObj);
},
......@@ -546,6 +613,8 @@ export default {
searchOrder() {
this.orderQueryObj.page = 1;
this.orderQueryObj.page_size = 10;
this.orderQueryObj.create_time_start = this.order_time[0];
this.orderQueryObj.create_time_end = this.order_time[1];
this.getOrderListMet(this.orderQueryObj);
},
......@@ -564,7 +633,10 @@ export default {
},
// 导出
exportOrder() {
if (this.orderQueryObj.marketing_id === "") {
if (
this.orderQueryObj.marketing_id === "" ||
this.orderQueryObj.marketing_id === "0"
) {
this.$message.error("请选择活动名称");
return;
}
......@@ -576,7 +648,7 @@ export default {
const params = {
marketing_id: this.orderQueryObj.marketing_id,
// marketing_id: "1NJETU",
force_print: forcePrint ? "1" : ""
force_print: forcePrint ? "1" : "",
};
const res = await orderPrint(params);
return res;
......@@ -584,7 +656,10 @@ export default {
// 打印
async printOrder() {
if (this.orderQueryObj.marketing_id === "") {
if (
this.orderQueryObj.marketing_id === "" ||
this.orderQueryObj.marketing_id === "0"
) {
this.$message.error("请选择活动名称");
return;
}
......@@ -593,7 +668,7 @@ export default {
if (res.code === 0) {
this.$message({
type: "success",
message: "打印成功"
message: "打印成功",
});
return;
}
......@@ -611,7 +686,7 @@ export default {
try {
await this.$confirm(res.reason, "打印", {
cancelButtonText: "取消",
confirmButtonText: "确定"
confirmButtonText: "确定",
});
} catch (e) {
// 取消
......@@ -652,21 +727,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 orderRefundReject(params);
if (res.code === 0) {
this.$message({
type: "success",
message: "订单已驳回"
message: "订单已驳回",
});
} else {
this.$message.error(res.reason);
......@@ -693,7 +768,7 @@ export default {
this.checkAll = false;
this.refundGoods = [];
const params = {
order_id: val.order_id
order_id: val.order_id,
};
const res = await orderItemList(params);
this.refundGoods = res.result;
......@@ -720,15 +795,15 @@ export default {
return this.refundGoods.filter(isSelected);
};
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),
};
};
......@@ -754,13 +829,13 @@ export default {
}
// this.refundShow = false;
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