Skip to content

O
op-web-service
Commit e2dd540a authored by lihui's avatar lihui
Browse files
Options

Merge branch 'lihui/distributionRoute' of... 

Merge branch 'lihui/distributionRoute' of https://git.yidian-inc.com:8021/bp/op-web-service into lihui/distributionRoute
parents c4ef5199 31adafcf
Hide whitespace changes
Inline Side-by-side
Showing with 320 additions and 102 deletions
src/pages/Activity/Manage/index.vue
View file @ e2dd540a
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item style="margin-left: 50px"> <el-form-item style="margin-left: 50px">
<el-button @click="reset()">重置</el-button>
<el-button type="primary" @click="getActivityList">搜索</el-button> <el-button type="primary" @click="getActivityList">搜索</el-button>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
...@@ -189,6 +190,13 @@ export default { ...@@ -189,6 +190,13 @@ export default {
}; };
}, },
methods: { methods: {
// 重置
reset() {
this.activity.activityName = "";
this.activity.online_status = "";
this.getActivityList();
},
/* API */ /* API */
// 获取商品列表 // 获取商品列表
async getActivityList() { async getActivityList() {
......
src/pages/Activity/releaseProduc/components/addProduc.vue
View file @ e2dd540a
...@@ -11,13 +11,14 @@ ...@@ -11,13 +11,14 @@
</div> </div>
<!-- Tab --> <!-- Tab -->
<el-table :data="comTableData" border style="width: 100%"> <el-table :data="comTableData" border style="width: 100%">
<el-table-column label="显示顺序" align="center" width="140"> <el-table-column label="" align="center" width="50px">
<template #default="scope"> <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 </template>
class="el-icon-bottom" </el-table-column>
@click="upDown(scope.$index, scope.row)" <el-table-column label="" align="center" width="50px">
></i> <template #default="scope">
<i class="el-icon-bottom" @click="upDown(scope.$index, scope.row)"></i>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
...@@ -87,6 +88,7 @@ ...@@ -87,6 +88,7 @@
<el-form-item <el-form-item
label="商品标题：" label="商品标题："
prop="goods_name" prop="goods_name"
style="width:90%;"
:rules="[{ required: true, message: '请输入商品标题' }]" :rules="[{ required: true, message: '请输入商品标题' }]"
> >
<el-input <el-input
...@@ -181,7 +183,7 @@ ...@@ -181,7 +183,7 @@
</div> </div>
<el-form-item <el-form-item
label="商家" label="商家："
prop="business1" prop="business1"
:rules="[{ required: true, message: '请选择商家' }]" :rules="[{ required: true, message: '请选择商家' }]"
> >
......
src/pages/Activity/releaseProduc/index.vue
View file @ e2dd540a
...@@ -8,9 +8,9 @@ ...@@ -8,9 +8,9 @@
space="30%" space="30%"
:align-center="true" :align-center="true"
> >
<el-step title="信息编辑"></el-step> <el-step title="信息编辑" @click="step1"></el-step>
<el-step title="添加商品"></el-step> <el-step title="添加商品" @click="step2"></el-step>
<el-step title="拼单设置"></el-step> <el-step title="拼单设置" @click="step3"></el-step>
</el-steps> </el-steps>
<div class="content"> <div class="content">
<infoEditing <infoEditing
...@@ -58,13 +58,13 @@ import spellOrderSet from "./components/spellOrderSet.vue"; ...@@ -58,13 +58,13 @@ import spellOrderSet from "./components/spellOrderSet.vue";
import { import {
addMarketing, addMarketing,
marketingInfo, marketingInfo,
updateMarketing updateMarketing,
} from "../../../service/Activity/index"; } from "../../../service/Activity/index";
export default { export default {
components: { components: {
infoEditing, infoEditing,
addProduc, addProduc,
spellOrderSet spellOrderSet,
}, },
data() { data() {
return { return {
...@@ -78,11 +78,40 @@ export default { ...@@ -78,11 +78,40 @@ export default {
takePlaceIDArr: [], takePlaceIDArr: [],
startTime: "", startTime: "",
endTime: "", endTime: "",
stepTwoTitle: "" // 传给addProduct的title stepTwoTitle: "", // 传给addProduct的title
}; };
}, },
methods: { methods: {
// 步骤条点击事件
step1() {
if (this.$route.query.marketing_id != undefined) {
this.active = 1;
}
},
step2() {
if (this.$route.query.marketing_id != undefined) {
if (this.$refs.infoEdit.infoEditForm.title == "") {
ElMessage.error("请填写商品标题");
return;
}
this.active = 2;
}
},
step3() {
if (this.$route.query.marketing_id != undefined) {
if (this.$refs.infoEdit.infoEditForm.title == "") {
ElMessage.error("请填写商品标题");
return;
}else if (this.$refs.addProduc.comTableData.length == 0) {
ElMessage.error("请至少选择一个商品");
return;
}else{
this.active = 3;
}
}
},
// 上一步 // 上一步
prev() { prev() {
this.active--; this.active--;
...@@ -115,7 +144,7 @@ export default { ...@@ -115,7 +144,7 @@ export default {
} }
let params = { let params = {
marketing_id: marketingId, marketing_id: marketingId,
marketing_type: "4" marketing_type: "4",
}; };
const res = await marketingInfo(params); const res = await marketingInfo(params);
this.infoEditArr = res.result.marketing_info; this.infoEditArr = res.result.marketing_info;
...@@ -138,7 +167,7 @@ export default { ...@@ -138,7 +167,7 @@ export default {
if (reg.test(path)) return unescape(RegExp.$2.replace(/\+/g, " ")); if (reg.test(path)) return unescape(RegExp.$2.replace(/\+/g, " "));
return ""; return "";
} }
let list = this.$refs.infoEdit.picSubmitList.map(item => { let list = this.$refs.infoEdit.picSubmitList.map((item) => {
let rs = getUrlParms(item.url, "url"); let rs = getUrlParms(item.url, "url");
return rs; return rs;
}); });
...@@ -161,14 +190,14 @@ export default { ...@@ -161,14 +190,14 @@ export default {
end_time: dayJs(this.endDate).format("YYYY-MM-DD HH:mm:ss"), end_time: dayJs(this.endDate).format("YYYY-MM-DD HH:mm:ss"),
pindan_pic: picList, pindan_pic: picList,
pindan_desc: this.$refs.infoEdit.infoEditForm.desc, pindan_desc: this.$refs.infoEdit.infoEditForm.desc,
take_place_ids: this.takePlaceIDArr take_place_ids: this.takePlaceIDArr,
}; };
if (this.$route.query.marketing_id == undefined) { if (this.$route.query.marketing_id == undefined) {
const res = await addMarketing(params); const res = await addMarketing(params);
if (res.code === 0) { if (res.code === 0) {
ElMessage.success({ ElMessage.success({
message: "添加成功", message: "添加成功",
type: "success" type: "success",
}); });
this.$router.push({ path: "/op/activity/manage" }); this.$router.push({ path: "/op/activity/manage" });
} else { } else {
...@@ -179,7 +208,7 @@ export default { ...@@ -179,7 +208,7 @@ export default {
if (res.code === 0) { if (res.code === 0) {
ElMessage.success({ ElMessage.success({
message: "修改成功", message: "修改成功",
type: "success" type: "success",
}); });
this.$router.push({ path: "/op/activity/manage" }); this.$router.push({ path: "/op/activity/manage" });
} else { } else {
...@@ -189,11 +218,11 @@ export default { ...@@ -189,11 +218,11 @@ export default {
}, },
getTakeTakePlaceListFromChild(val) { getTakeTakePlaceListFromChild(val) {
this.takePlaceIDArr = val; this.takePlaceIDArr = val;
} },
}, },
created() { created() {
this.marketingInfoMet(); this.marketingInfoMet();
} },
}; };
</script> </script>
...@@ -224,8 +253,13 @@ export default { ...@@ -224,8 +253,13 @@ export default {
margin: 20px auto; margin: 20px auto;
} }
.stepsBtn { .stepsBtn {
width: 64%; width: 100%;
height: 80px;
line-height: 80px;
background: white;
position: fixed;
bottom: 0px;
text-align: center; text-align: center;
margin-top: 50px;
} }
</style> </style>
src/pages/Groupmeal/newOrderManagement/index.vue
View file @ e2dd540a
...@@ -68,6 +68,7 @@ ...@@ -68,6 +68,7 @@
v-model="orderQueryObj.sub_shop_id" v-model="orderQueryObj.sub_shop_id"
placeholder="请选择" placeholder="请选择"
filterable filterable
@change="subShopSel"
> >
<el-option <el-option
v-for="item in selLiftPoinArr" v-for="item in selLiftPoinArr"
...@@ -77,6 +78,39 @@ ...@@ -77,6 +78,39 @@
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </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 detailedAddressArr"
:key="item"
:label="item"
:value="item"
></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-form-item>
<el-button @click="resetOrder('ruleForm')">重置</el-button> <el-button @click="resetOrder('ruleForm')">重置</el-button>
<el-button type="primary" @click="searchOrder">搜索</el-button> <el-button type="primary" @click="searchOrder">搜索</el-button>
...@@ -159,7 +193,7 @@ ...@@ -159,7 +193,7 @@
(scope.row.order_status == '2' || (scope.row.order_status == '2' ||
scope.row.order_status == '6' || scope.row.order_status == '6' ||
scope.row.order_status == '8') && scope.row.order_status == '8') &&
scope.row.payment !== 0 scope.row.payment !== 0
" "
>退款</el-button >退款</el-button
> >
...@@ -250,7 +284,7 @@ ...@@ -250,7 +284,7 @@
(scope.row.order_status == '2' || (scope.row.order_status == '2' ||
scope.row.order_status == '6' || scope.row.order_status == '6' ||
scope.row.order_status == '8') && scope.row.order_status == '8') &&
scope.row.payment !== 0 scope.row.payment !== 0
" "
>退款</el-button >退款</el-button
> >
...@@ -353,15 +387,15 @@ import { ...@@ -353,15 +387,15 @@ import {
newOrderItemList, newOrderItemList,
newOrderRefundReject, newOrderRefundReject,
newRefundOrder, newRefundOrder,
newGetOrderExportURL newGetOrderExportURL,
} from "@/service/Groupmeal/groupmeal"; } from "@/service/Groupmeal/groupmeal";
import page from "../components/Pagination/index.vue"; import page from "../components/Pagination/index.vue";
import dayJs from "dayjs";
export default { export default {
name: "orderManagement", name: "orderManagement",
components: { components: {
Layout, Layout,
page page,
}, },
data() { data() {
return { return {
...@@ -369,13 +403,17 @@ export default { ...@@ -369,13 +403,17 @@ export default {
orderQueryObj: { orderQueryObj: {
page: 1, page: 1,
page_size: 10, page_size: 10,
marketing_id: "", // 活动名称 marketing_id: "0", // 活动名称
order_status: "0", // 订单状态 order_status: "0", // 订单状态
goods_id: "", // 商品名称 goods_id: "", // 商品名称
cust_user: "", // 收货人 cust_user: "", // 收货人
order_id: "", // 订单编号 order_id: "", // 订单编号
sub_shop_id: "" // 自提点 sub_shop_id: "", // 自提点
detailed_address: "", //详细地址
create_time_start: "", // 开始时间
create_time_end: "", // 结束时间
}, },
order_time: [], // 下单时间
// 下拉框数据 // 下拉框数据
// 活动名称 // 活动名称
activityNameArr: [], activityNameArr: [],
...@@ -383,41 +421,43 @@ export default { ...@@ -383,41 +421,43 @@ export default {
orderStatusArr: [ orderStatusArr: [
{ {
value: "0", value: "0",
label: "全部" label: "全部",
}, },
{ {
value: "1", value: "1",
label: "未支付" label: "未支付",
}, },
{ {
value: "2", value: "2",
label: "已支付" label: "已支付",
}, },
{ {
value: "3", value: "3",
label: "待退款" label: "待退款",
}, },
{ {
value: "4", value: "4",
label: "已退款" label: "已退款",
}, },
{ {
value: "5", value: "5",
label: "退款中" label: "退款中",
}, },
{ {
value: "6", value: "6",
label: "已拒绝" label: "已拒绝",
}, },
{ {
value: "7", value: "7",
label: "售后" label: "售后",
} },
], ],
// 商品名称 // 商品名称
tradeNameArr: [], tradeNameArr: [],
// 自提点 // 自提点
selLiftPoinArr: [], selLiftPoinArr: [],
// 详细地址
detailedAddressArr: [],
activeName: "all", // Tabs标签页 activeName: "all", // Tabs标签页
goodsNum: "", // 商品总计 goodsNum: "", // 商品总计
...@@ -439,9 +479,9 @@ export default { ...@@ -439,9 +479,9 @@ export default {
refundedGoodsSel: false, refundedGoodsSel: false,
payment: "", payment: "",
// restoreInventory: false, // restoreInventory: false,
goods_name: "" goods_name: "",
} },
] ],
}; };
}, },
...@@ -454,7 +494,7 @@ export default { ...@@ -454,7 +494,7 @@ export default {
}, },
exportURL3() { exportURL3() {
return newGetOrderExportURL(this.orderQueryObj.marketing_id, "3"); return newGetOrderExportURL(this.orderQueryObj.marketing_id, "3");
} },
}, },
methods: { methods: {
...@@ -466,7 +506,9 @@ export default { ...@@ -466,7 +506,9 @@ export default {
async getMarketingListMet() { async getMarketingListMet() {
try { try {
const res = await newGetMarketingList(); 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) { } catch (error) {
this.$message.error("发生未知错误,请稍后再试一下吧~~~"); this.$message.error("发生未知错误,请稍后再试一下吧~~~");
console.error(error); console.error(error);
...@@ -477,8 +519,9 @@ export default { ...@@ -477,8 +519,9 @@ export default {
async activityNameSel(val) { async activityNameSel(val) {
this.orderQueryObj.goods_id = ""; this.orderQueryObj.goods_id = "";
this.orderQueryObj.sub_shop_id = ""; this.orderQueryObj.sub_shop_id = "";
this.orderQueryObj.detailed_address = "";
const params = { const params = {
marketing_id: val marketing_id: val,
}; };
const res = await newGetGoodsList(params); // 商品名称 const res = await newGetGoodsList(params); // 商品名称
this.getSubShopListMet(val); //自提点 this.getSubShopListMet(val); //自提点
...@@ -495,24 +538,72 @@ export default { ...@@ -495,24 +538,72 @@ export default {
marketing_id = params; marketing_id = params;
} }
const res = await newGetSubShopList({ marketing_id: marketing_id }); const res = await newGetSubShopList({ marketing_id: marketing_id });
this.selLiftPoinArr = res.result; this.selLiftPoinArr = res.result.take_place_list;
this.detailedAddressArr = res.result.address_list;
} catch (error) { } catch (error) {
this.$message.error("发生未知错误,请稍后再试一下吧~~~"); this.$message.error("发生未知错误,请稍后再试一下吧~~~");
console.error(error); console.error(error);
} }
}, },
// 自提点获取详细地址
subShopSel(val) {
var addressVal,arr = [];
this.orderQueryObj.detailed_address = "";
for (var i in this.selLiftPoinArr) {
if (this.selLiftPoinArr[i].take_place_id == val) {
addressVal = this.selLiftPoinArr[i].address;
}
}
for (var n in this.detailedAddressArr) {
if (this.detailedAddressArr[n] == addressVal) {
arr.push(this.detailedAddressArr[n]);
}
}
this.detailedAddressArr = arr;
},
// 获取今天日期
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) { resetOrder(formName) {
if (this.$route.query.marketing_type == "4") { if (this.$route.query.marketing_type == "4") {
this.$router.push({ this.$router.push({
path: "/op/groupmeal/newOrderManagement" path: "/op/groupmeal/newOrderManagement",
}); });
this.$route.query.marketing_type = ""; 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 = 1;
this.orderQueryObj.page_size = 10; this.orderQueryObj.page_size = 10;
this.$refs[formName].resetFields();
this.getOrderListMet(this.orderQueryObj); this.getOrderListMet(this.orderQueryObj);
this.getSubShopListMet(); this.getSubShopListMet();
}, },
...@@ -521,12 +612,14 @@ export default { ...@@ -521,12 +612,14 @@ export default {
searchOrder() { searchOrder() {
if (this.$route.query.marketing_type == "4") { if (this.$route.query.marketing_type == "4") {
this.$router.push({ this.$router.push({
path: "/op/groupmeal/newOrderManagement" path: "/op/groupmeal/newOrderManagement",
}); });
this.$route.query.marketing_type = ""; this.$route.query.marketing_type = "";
} }
this.orderQueryObj.page = 1; this.orderQueryObj.page = 1;
this.orderQueryObj.page_size = 10; 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") { if (this.orderQueryObj.order_status === "0") {
this.activeName = "all"; this.activeName = "all";
this.orderStatusArr[1].disabled = false; this.orderStatusArr[1].disabled = false;
...@@ -555,7 +648,10 @@ export default { ...@@ -555,7 +648,10 @@ export default {
// 导出 // 导出
exportOrder() { exportOrder() {
if (this.orderQueryObj.marketing_id === "") { if (
this.orderQueryObj.marketing_id === "" ||
this.orderQueryObj.marketing_id === "0"
) {
this.$message.error("请选择活动名称"); this.$message.error("请选择活动名称");
return; return;
} }
...@@ -566,7 +662,7 @@ export default { ...@@ -566,7 +662,7 @@ export default {
async printOrderMet(forcePrint) { async printOrderMet(forcePrint) {
const params = { const params = {
marketing_id: this.orderQueryObj.marketing_id, marketing_id: this.orderQueryObj.marketing_id,
force_print: forcePrint ? "1" : "" force_print: forcePrint ? "1" : "",
}; };
const res = await newOrderPrint(params); const res = await newOrderPrint(params);
return res; return res;
...@@ -574,7 +670,10 @@ export default { ...@@ -574,7 +670,10 @@ export default {
// 打印 // 打印
async printOrder() { async printOrder() {
if (this.orderQueryObj.marketing_id === "") { if (
this.orderQueryObj.marketing_id === "" ||
this.orderQueryObj.marketing_id === "0"
) {
this.$message.error("请选择活动名称"); this.$message.error("请选择活动名称");
return; return;
} }
...@@ -583,7 +682,7 @@ export default { ...@@ -583,7 +682,7 @@ export default {
if (res.code === 0) { if (res.code === 0) {
this.$message({ this.$message({
type: "success", type: "success",
message: "打印成功" message: "打印成功",
}); });
return; return;
} }
...@@ -601,7 +700,7 @@ export default { ...@@ -601,7 +700,7 @@ export default {
try { try {
await this.$confirm(res.reason, "打印", { await this.$confirm(res.reason, "打印", {
cancelButtonText: "取消", cancelButtonText: "取消",
confirmButtonText: "确定" confirmButtonText: "确定",
}); });
} catch (e) { } catch (e) {
// 取消 // 取消
...@@ -627,7 +726,7 @@ export default { ...@@ -627,7 +726,7 @@ export default {
goods_id: "", goods_id: "",
cust_user: "", cust_user: "",
order_id: "", order_id: "",
sub_shop_id: "" sub_shop_id: "",
}); });
} else { } else {
res = await newGetOrderList(this.orderQueryObj); res = await newGetOrderList(this.orderQueryObj);
...@@ -652,21 +751,21 @@ export default { ...@@ -652,21 +751,21 @@ export default {
try { try {
await this.$confirm("确定要拒绝退款么?", "拒绝", { await this.$confirm("确定要拒绝退款么?", "拒绝", {
cancelButtonText: "取消", cancelButtonText: "取消",
confirmButtonText: "确定" confirmButtonText: "确定",
}); });
} catch (e) { } catch (e) {
// 取消 // 取消
return; return;
} }
const params = { const params = {
order_id: val.order_id order_id: val.order_id,
}; };
const res = await newOrderRefundReject(params); const res = await newOrderRefundReject(params);
if (res.code === 0) { if (res.code === 0) {
this.$message({ this.$message({
type: "success", type: "success",
message: "订单已驳回" message: "订单已驳回",
}); });
} else { } else {
this.$message.error(res.reason); this.$message.error(res.reason);
...@@ -692,7 +791,7 @@ export default { ...@@ -692,7 +791,7 @@ export default {
this.checkAll = false; this.checkAll = false;
this.refundGoods = []; this.refundGoods = [];
const params = { const params = {
order_id: val.order_id order_id: val.order_id,
}; };
const res = await newOrderItemList(params); const res = await newOrderItemList(params);
this.refundGoods = res.result; this.refundGoods = res.result;
...@@ -721,11 +820,11 @@ export default { ...@@ -721,11 +820,11 @@ export default {
// } // }
// } // }
const convertToNumber = str => { const convertToNumber = (str) => {
return !Number.isNaN(parseFloat(str)) ? parseFloat(str) : 0; return !Number.isNaN(parseFloat(str)) ? parseFloat(str) : 0;
}; };
const processRefundItem = item => { const processRefundItem = (item) => {
return { return {
order_item_id: item.order_item_id, order_item_id: item.order_item_id,
refund_num: item.refundableQuantity || 0, refund_num: item.refundableQuantity || 0,
...@@ -752,13 +851,13 @@ export default { ...@@ -752,13 +851,13 @@ export default {
return; return;
} }
this.$message.error(res.reason); this.$message.error(res.reason);
} },
}, },
created() { created() {
this.getMarketingListMet(); // 活动名称 this.getMarketingListMet(); // 活动名称
this.getSubShopListMet(); // 自提点 this.getSubShopListMet(); // 自提点
this.getOrderListMet(); // table列表 this.getOrderListMet(); // table列表
} },
}; };
</script> </script>
......
src/pages/Groupmeal/orderManagement/index.vue
View file @ e2dd540a
...@@ -77,6 +77,39 @@ ...@@ -77,6 +77,39 @@
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </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-form-item>
<el-button @click="resetOrder('ruleForm')">重置</el-button> <el-button @click="resetOrder('ruleForm')">重置</el-button>
<el-button type="primary" @click="searchOrder">搜索</el-button> <el-button type="primary" @click="searchOrder">搜索</el-button>
...@@ -157,8 +190,8 @@ ...@@ -157,8 +190,8 @@
@click="refund(scope.row)" @click="refund(scope.row)"
v-show=" v-show="
scope.row.order_status == '2' || scope.row.order_status == '2' ||
scope.row.order_status == '6' || scope.row.order_status == '6' ||
scope.row.order_status == '8' scope.row.order_status == '8'
" "
>退款</el-button >退款</el-button
> >
...@@ -245,8 +278,8 @@ ...@@ -245,8 +278,8 @@
@click="refund(scope.row)" @click="refund(scope.row)"
v-show=" v-show="
scope.row.order_status == '2' || scope.row.order_status == '2' ||
scope.row.order_status == '6' || scope.row.order_status == '6' ||
scope.row.order_status == '8' scope.row.order_status == '8'
" "
>退款</el-button >退款</el-button
> >
...@@ -374,16 +407,15 @@ import { ...@@ -374,16 +407,15 @@ import {
orderItemList, orderItemList,
orderRefundReject, orderRefundReject,
refundOrder, refundOrder,
getOrderExportURL getOrderExportURL,
} from "@/service/Groupmeal/groupmeal"; } from "@/service/Groupmeal/groupmeal";
// import page from "../../components/Pagination.vue";
import page from "../components/Pagination/index.vue"; import page from "../components/Pagination/index.vue";
import dayJs from "dayjs";
export default { export default {
name: "orderManagement", name: "orderManagement",
components: { components: {
Layout, Layout,
page page,
}, },
data() { data() {
return { return {
...@@ -391,13 +423,17 @@ export default { ...@@ -391,13 +423,17 @@ export default {
orderQueryObj: { orderQueryObj: {
page: 1, page: 1,
page_size: 10, page_size: 10,
marketing_id: "", // 活动名称 marketing_id: "0", // 活动名称
order_status: "0", // 订单状态 order_status: "0", // 订单状态
goods_id: "", // 商品名称 goods_id: "", // 商品名称
cust_user: "", // 收货人 cust_user: "", // 收货人
order_id: "", // 订单编号 order_id: "", // 订单编号
sub_shop_id: "" // 自提点 sub_shop_id: "", // 自提点
// detailed_address: "", // 详细地址
create_time_start: "", // 开始时间
create_time_end: "", // 结束时间
}, },
order_time: [], // 下单时间
// 下拉框数据 // 下拉框数据
// 活动名称 // 活动名称
activityNameArr: [], activityNameArr: [],
...@@ -405,36 +441,36 @@ export default { ...@@ -405,36 +441,36 @@ export default {
orderStatusArr: [ orderStatusArr: [
{ {
value: "0", value: "0",
label: "全部" label: "全部",
}, },
{ {
value: "1", value: "1",
label: "未支付" label: "未支付",
}, },
{ {
value: "2", value: "2",
label: "已支付" label: "已支付",
}, },
{ {
value: "3", value: "3",
label: "待退款" label: "待退款",
}, },
{ {
value: "4", value: "4",
label: "已退款" label: "已退款",
}, },
{ {
value: "5", value: "5",
label: "退款中" label: "退款中",
}, },
{ {
value: "6", value: "6",
label: "已拒绝" label: "已拒绝",
}, },
{ {
value: "7", value: "7",
label: "售后" label: "售后",
} },
], ],
// 商品名称 // 商品名称
tradeNameArr: [], tradeNameArr: [],
...@@ -472,9 +508,9 @@ export default { ...@@ -472,9 +508,9 @@ export default {
payment: "", // 实付 payment: "", // 实付
refundableQuantity: "", refundableQuantity: "",
refundAmount: "", refundAmount: "",
amountToRefund: "" amountToRefund: "",
} },
] ],
}; };
}, },
...@@ -487,7 +523,7 @@ export default { ...@@ -487,7 +523,7 @@ export default {
}, },
exportURL3() { exportURL3() {
return getOrderExportURL(this.orderQueryObj.marketing_id, "3"); return getOrderExportURL(this.orderQueryObj.marketing_id, "3");
} },
}, },
methods: { methods: {
...@@ -499,7 +535,9 @@ export default { ...@@ -499,7 +535,9 @@ export default {
async getMarketingListMet() { async getMarketingListMet() {
try { try {
const res = await getMarketingList(); 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) { } catch (error) {
this.$message.error("发生未知错误,请稍后再试一下吧~~~"); this.$message.error("发生未知错误,请稍后再试一下吧~~~");
console.error(error); console.error(error);
...@@ -510,7 +548,7 @@ export default { ...@@ -510,7 +548,7 @@ export default {
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); //自提点 this.getSubShopListMet(val); //自提点
...@@ -534,11 +572,40 @@ export default { ...@@ -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) { resetOrder(formName) {
this.$refs[formName].resetFields(); this.order_time = [];
this.orderQueryObj.page = 1; this.orderQueryObj.page = 1;
this.orderQueryObj.page_size = 10; this.orderQueryObj.page_size = 10;
this.orderQueryObj.create_time_start = "";
this.orderQueryObj.create_time_end = "";
this.$refs[formName].resetFields();
this.getOrderListMet(this.orderQueryObj); this.getOrderListMet(this.orderQueryObj);
}, },
...@@ -546,6 +613,8 @@ export default { ...@@ -546,6 +613,8 @@ export default {
searchOrder() { searchOrder() {
this.orderQueryObj.page = 1; this.orderQueryObj.page = 1;
this.orderQueryObj.page_size = 10; 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); this.getOrderListMet(this.orderQueryObj);
}, },
...@@ -564,7 +633,10 @@ export default { ...@@ -564,7 +633,10 @@ export default {
}, },
// 导出 // 导出
exportOrder() { exportOrder() {
if (this.orderQueryObj.marketing_id === "") { if (
this.orderQueryObj.marketing_id === "" ||
this.orderQueryObj.marketing_id === "0"
) {
this.$message.error("请选择活动名称"); this.$message.error("请选择活动名称");
return; return;
} }
...@@ -576,7 +648,7 @@ export default { ...@@ -576,7 +648,7 @@ export default {
const params = { const params = {
marketing_id: this.orderQueryObj.marketing_id, marketing_id: this.orderQueryObj.marketing_id,
// marketing_id: "1NJETU", // marketing_id: "1NJETU",
force_print: forcePrint ? "1" : "" force_print: forcePrint ? "1" : "",
}; };
const res = await orderPrint(params); const res = await orderPrint(params);
return res; return res;
...@@ -584,7 +656,10 @@ export default { ...@@ -584,7 +656,10 @@ export default {
// 打印 // 打印
async printOrder() { async printOrder() {
if (this.orderQueryObj.marketing_id === "") { if (
this.orderQueryObj.marketing_id === "" ||
this.orderQueryObj.marketing_id === "0"
) {
this.$message.error("请选择活动名称"); this.$message.error("请选择活动名称");
return; return;
} }
...@@ -593,7 +668,7 @@ export default { ...@@ -593,7 +668,7 @@ export default {
if (res.code === 0) { if (res.code === 0) {
this.$message({ this.$message({
type: "success", type: "success",
message: "打印成功" message: "打印成功",
}); });
return; return;
} }
...@@ -611,7 +686,7 @@ export default { ...@@ -611,7 +686,7 @@ export default {
try { try {
await this.$confirm(res.reason, "打印", { await this.$confirm(res.reason, "打印", {
cancelButtonText: "取消", cancelButtonText: "取消",
confirmButtonText: "确定" confirmButtonText: "确定",
}); });
} catch (e) { } catch (e) {
// 取消 // 取消
...@@ -652,21 +727,21 @@ export default { ...@@ -652,21 +727,21 @@ export default {
try { try {
await this.$confirm("确定要拒绝退款么?", "拒绝", { await this.$confirm("确定要拒绝退款么?", "拒绝", {
cancelButtonText: "取消", cancelButtonText: "取消",
confirmButtonText: "确定" confirmButtonText: "确定",
}); });
} catch (e) { } catch (e) {
// 取消 // 取消
return; return;
} }
const params = { const params = {
order_id: val.order_id order_id: val.order_id,
}; };
const res = await orderRefundReject(params); const res = await orderRefundReject(params);
if (res.code === 0) { if (res.code === 0) {
this.$message({ this.$message({
type: "success", type: "success",
message: "订单已驳回" message: "订单已驳回",
}); });
} else { } else {
this.$message.error(res.reason); this.$message.error(res.reason);
...@@ -693,7 +768,7 @@ export default { ...@@ -693,7 +768,7 @@ export default {
this.checkAll = false; this.checkAll = false;
this.refundGoods = []; this.refundGoods = [];
const params = { const params = {
order_id: val.order_id order_id: val.order_id,
}; };
const res = await orderItemList(params); const res = await orderItemList(params);
this.refundGoods = res.result; this.refundGoods = res.result;
...@@ -720,15 +795,15 @@ export default { ...@@ -720,15 +795,15 @@ export default {
return this.refundGoods.filter(isSelected); return this.refundGoods.filter(isSelected);
}; };
const convertToNumber = str => { const convertToNumber = (str) => {
return !Number.isNaN(parseFloat(str)) ? parseFloat(str) : 0; return !Number.isNaN(parseFloat(str)) ? parseFloat(str) : 0;
}; };
const processRefundItem = item => { const processRefundItem = (item) => {
return { return {
order_item_id: item.order_item_id, order_item_id: item.order_item_id,
refund_num: item.refundableQuantity || 0, refund_num: item.refundableQuantity || 0,
refund_amount: convertToNumber(item.amountToRefund) refund_amount: convertToNumber(item.amountToRefund),
}; };
}; };
...@@ -754,13 +829,13 @@ export default { ...@@ -754,13 +829,13 @@ export default {
} }
// this.refundShow = false; // this.refundShow = false;
this.$message.error(res.reason); this.$message.error(res.reason);
} },
}, },
created() { created() {
this.getMarketingListMet(); // 活动名称 this.getMarketingListMet(); // 活动名称
this.getSubShopListMet(); // 自提点 this.getSubShopListMet(); // 自提点
this.getOrderListMet(); // table列表 this.getOrderListMet(); // table列表
} },
}; };
</script> </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