Skip to content

O
op-web-service
Commit b683ffac authored by your yuchenglong's avatar your yuchenglong
Browse files
Options

update:分页修改

parent 2e1bc89f
Hide whitespace changes
Inline Side-by-side
Showing with 157 additions and 90 deletions
src/pages/Groupmeal/orderManagement/index.vue
View file @ b683ffac
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
v-model="orderQueryObj.marketing_id" v-model="orderQueryObj.marketing_id"
placeholder="请选择" placeholder="请选择"
@change="activityNameSel" @change="activityNameSel"
filterable
> >
<el-option <el-option
v-for="item in activityNameArr" v-for="item in activityNameArr"
...@@ -34,7 +35,11 @@ ...@@ -34,7 +35,11 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="商品名称：" prop="goods_id"> <el-form-item label="商品名称：" prop="goods_id">
<el-select v-model="orderQueryObj.goods_id" placeholder="请选择"> <el-select
v-model="orderQueryObj.goods_id"
placeholder="请选择"
filterable
>
<el-option <el-option
v-for="item in tradeNameArr" v-for="item in tradeNameArr"
:key="item.goods_id" :key="item.goods_id"
...@@ -58,7 +63,11 @@ ...@@ -58,7 +63,11 @@
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="自提点：" prop="sub_shop_id"> <el-form-item label="自提点：" prop="sub_shop_id">
<el-select v-model="orderQueryObj.sub_shop_id" placeholder="请选择"> <el-select
v-model="orderQueryObj.sub_shop_id"
placeholder="请选择"
filterable
>
<el-option <el-option
v-for="item in selLiftPoinArr" v-for="item in selLiftPoinArr"
:key="item.sub_shop_id" :key="item.sub_shop_id"
...@@ -102,7 +111,8 @@ ...@@ -102,7 +111,8 @@
<el-table-column prop="order_item" label="商品信息"> <el-table-column prop="order_item" label="商品信息">
<template #default="scope"> <template #default="scope">
<div v-for="(item, index) in scope.row.order_item" :key="index"> <div v-for="(item, index) in scope.row.order_item" :key="index">
{{ item.goods_name }} {{ item.goods_name
}}<span style="color: red"> * {{ item.goods_num }} </span>
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
...@@ -124,7 +134,10 @@ ...@@ -124,7 +134,10 @@
type="text" type="text"
size="small" size="small"
@click="refund(scope.row)" @click="refund(scope.row)"
v-show="scope.row.order_status_text == '已支付'" v-show="
scope.row.order_status_text == '已支付' ||
scope.row.order_status_text == '已拒绝'
"
>退款</el-button >退款</el-button
> >
<el-button-group <el-button-group
...@@ -140,7 +153,12 @@ ...@@ -140,7 +153,12 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<page :totalNum="totalNum" @update="update" style="float: right" /> <page
@current-change="handleCurrentChange"
v-model.current-page="orderQueryObj.page"
:page-size="orderQueryObj.page_size"
:total="totalNum"
/>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="售后" name="afterSale"> <el-tab-pane label="售后" name="afterSale">
<!-- start --> <!-- start -->
...@@ -162,7 +180,8 @@ ...@@ -162,7 +180,8 @@
<el-table-column prop="order_item" label="商品信息"> <el-table-column prop="order_item" label="商品信息">
<template #default="scope"> <template #default="scope">
<div v-for="(item, index) in scope.row.order_item" :key="index"> <div v-for="(item, index) in scope.row.order_item" :key="index">
{{ item.goods_name }} {{ item.goods_name
}}<span style="color: red"> * {{ item.goods_num }} </span>
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
...@@ -184,7 +203,10 @@ ...@@ -184,7 +203,10 @@
type="text" type="text"
size="small" size="small"
@click="refund(scope.row)" @click="refund(scope.row)"
v-show="scope.row.order_status_text == '已支付'" v-show="
scope.row.order_status_text == '已支付' ||
scope.row.order_status_text == '已拒绝'
"
>退款</el-button >退款</el-button
> >
<el-button-group <el-button-group
...@@ -200,31 +222,49 @@ ...@@ -200,31 +222,49 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<page :totalNum="totalNum" @update="update" style="float: right" /> <page
@current-change="handleCurrentChange"
v-model.current-page="orderQueryObj.page"
:page-size="orderQueryObj.page_size"
:total="totalNum"
/>
<!-- end --> <!-- end -->
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
<!-- 导出弹窗 --> <!-- 导出弹窗 -->
<el-dialog title="导出订单" width="25%" top="10%" v-model="exportShow"> <el-dialog title="导出订单" width="25%" top="10%" v-model="exportShow">
<el-form-item class="exportForm" label> <el-form-item class="exportForm" label>
<div>请选择导出活动{{ exportType }}的表格类型</div> <div style="margin-bottom: 15px">
<el-checkbox-group v-model="exportSel"> 请选择导出活动{{ exportType }}的表格类型
</div>
<a :href="exportURL1" style="margin-right: 10px"
><el-button type="primary" @click="exportShow = false"
>总表</el-button
></a
>
<a :href="exportURL2" style="margin-right: 10px"
><el-button type="primary" @click="exportShow = false"
>商品表</el-button
></a
>
<a :href="exportURL3"
><el-button type="primary" @click="exportShow = false"
>配送表</el-button
></a
>
<!-- <el-checkbox-group v-model="exportSel">
<el-checkbox <el-checkbox
v-for="i in exportSelOpt" v-for="i in exportSelOpt"
:label="i.type" :label="i.type"
:key="i.type" :key="i.type"
>{{ i.name }}</el-checkbox >{{ i.name }}</el-checkbox
> >
</el-checkbox-group> </el-checkbox-group> -->
</el-form-item> </el-form-item>
<el-form-item class="exportBtn"> <!-- <el-form-item class="exportBtn">
<el-button @click="exportShow = false">取消</el-button> <el-button @click="exportShow = false">取消</el-button>
<a :href="exportURL" style="margin-left: 20px" <a :href="exportURL" style="margin-left: 20px"><el-button type="primary" @click="exportShow = false">确定导出</el-button></a>
><el-button type="primary" @click="exportShow = false" </el-form-item> -->
>确定导出</el-button
></a
>
</el-form-item>
</el-dialog> </el-dialog>
<!-- 退款弹窗 --> <!-- 退款弹窗 -->
<el-dialog title="退款" width="30%" top="10%" v-model="refundShow"> <el-dialog title="退款" width="30%" top="10%" v-model="refundShow">
...@@ -264,7 +304,7 @@ ...@@ -264,7 +304,7 @@
></el-input-number> ></el-input-number>
</el-row> </el-row>
<el-row> <el-row>
退款金额(可退金额{{ item.refundAmount }}元)： 退款金额(可退金额{{ item.payment }}元)：
<el-input <el-input
v-model="item.amountToRefund" v-model="item.amountToRefund"
style="width: 150px" style="width: 150px"
...@@ -297,7 +337,8 @@ import { ...@@ -297,7 +337,8 @@ import {
refundOrder, refundOrder,
getOrderExportURL, getOrderExportURL,
} from "@/service/Groupmeal/groupmeal"; } from "@/service/Groupmeal/groupmeal";
import page from "../../components/Pagination.vue"; // import page from "../../components/Pagination.vue";
import page from "../components/Pagination/index.vue";
export default { export default {
name: "orderManagement", name: "orderManagement",
...@@ -309,6 +350,8 @@ export default { ...@@ -309,6 +350,8 @@ export default {
return { return {
// 查询 // 查询
orderQueryObj: { orderQueryObj: {
page: 1,
page_size: 10,
marketing_id: "", // 活动名称 marketing_id: "", // 活动名称
order_status: "0", // 订单状态 order_status: "0", // 订单状态
goods_id: "", // 商品名称 goods_id: "", // 商品名称
...@@ -345,11 +388,14 @@ export default { ...@@ -345,11 +388,14 @@ export default {
value: "5", value: "5",
label: "退款中", label: "退款中",
}, },
{ {
value: "6", value: "6",
label: "已拒绝", label: "已拒绝",
}, },
{
value: "7",
label: "售后",
},
], ],
// 商品名称 // 商品名称
tradeNameArr: [], tradeNameArr: [],
...@@ -361,20 +407,17 @@ export default { ...@@ -361,20 +407,17 @@ export default {
// 导出 // 导出
exportShow: false, exportShow: false,
exportType: "xxxxx", exportType: "",
exportSel: [],
exportSelOpt: [ // exportSel: [],
{ type: "1", name: "总表" }, // exportSelOpt: [
{ type: "2", name: "商品表" }, // { type: "1", name: "总表" },
{ type: "3", name: "配送表" }, // { type: "2", name: "商品表" },
], // { type: "3", name: "配送表" },
// ],
// 表格数据 // 表格数据
orderTableData: [], orderTableData: [],
params: {
page: 1,
page_size: 10,
},
totalNum: null, //总条数 totalNum: null, //总条数
// 退款 // 退款
...@@ -397,9 +440,14 @@ export default { ...@@ -397,9 +440,14 @@ export default {
}, },
computed: { computed: {
exportURL() { exportURL1() {
return getOrderExportURL(this.orderQueryObj.marketing_id, "1");
return getOrderExportURL(this.orderQueryObj.marketing_id, this.exportSel); },
exportURL2() {
return getOrderExportURL(this.orderQueryObj.marketing_id, "2");
},
exportURL3() {
return getOrderExportURL(this.orderQueryObj.marketing_id, "3");
}, },
}, },
...@@ -439,17 +487,15 @@ export default { ...@@ -439,17 +487,15 @@ export default {
// 重置 // 重置
resetOrder(formName) { resetOrder(formName) {
this.$refs[formName].resetFields(); this.$refs[formName].resetFields();
this.params.page = 1; this.orderQueryObj.page = 1;
this.params.page_size = 10; this.orderQueryObj.page_size = 10;
Object.assign(this.params, this.orderQueryObj); this.getOrderListMet(this.orderQueryObj);
this.getOrderListMet(this.params);
}, },
// 搜索 // 搜索
searchOrder() { searchOrder() {
this.params.page = 1; this.orderQueryObj.page = 1;
this.params.page_size = 10; this.orderQueryObj.page_size = 10;
Object.assign(this.params, this.orderQueryObj);
this.getOrderListMet(this.orderQueryObj); this.getOrderListMet(this.orderQueryObj);
}, },
...@@ -464,60 +510,70 @@ export default { ...@@ -464,60 +510,70 @@ export default {
this.orderStatusArr[1].disabled = true; this.orderStatusArr[1].disabled = true;
this.orderStatusArr[2].disabled = true; this.orderStatusArr[2].disabled = true;
} }
Object.assign(this.params, this.orderQueryObj);
this.getOrderListMet(this.orderQueryObj); this.getOrderListMet(this.orderQueryObj);
}, },
// 导出 // 导出
exportOrder() { exportOrder() {
if (this.orderQueryObj.marketing_id === "") {
this.$message.error("请选择活动名称");
return;
}
this.exportShow = true; this.exportShow = true;
this.exportType = this.orderQueryObj.marketing_id;
}, },
async printOrderMet(forcePrint) { async printOrderMet(forcePrint) {
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;
}, },
// 打印 // 打印
async printOrder() { async printOrder() {
if(this.orderQueryObj.marketing_id === "") { if (this.orderQueryObj.marketing_id === "") {
this.$message.error("请选择活动名称"); this.$message.error("请选择活动名称");
return return;
} }
let res = this.printOrderMet(false); let res = await this.printOrderMet(false);
if (res.code === 0) { if (res.code === 0) {
this.$message({ this.$message({
type: "success", type: "success",
message: "打印成功", message: "打印成功",
}); });
return return;
} }
try { if (res.code !== 10) {
await this.$confirm("是否强制打印?", "打印", { this.$message.error(res.reason);
cancelButtonText: "取消", return;
confirmButtonText: "确定",
})
} catch(e) {
// 取消
return
} }
res = this.printOrderMet(true) try {
if (res.code !== 0) { await this.$confirm(res.reason, "打印", {
this.$message.error("打印失败"); cancelButtonText: "取消",
confirmButtonText: "确定",
});
} catch (e) {
// 取消
return;
} }
res = await this.printOrderMet(true);
// if (res.code !== 0) {
// this.$message.error("打印失败");
// }
}, },
// 获取订单列表 // 获取订单列表
async getOrderListMet() { async getOrderListMet() {
try { try {
const res = await getOrderList(this.params); const res = await getOrderList(this.orderQueryObj);
this.goodsNum = res.count; this.goodsNum = res.count;
this.totalNum = res.count; this.totalNum = res.count;
this.orderTableData = res.result; this.orderTableData = res.result;
...@@ -527,31 +583,37 @@ export default { ...@@ -527,31 +583,37 @@ export default {
} }
}, },
//列表分页 //列表分页
update(obj) { // 页码变化
Object.assign(this.params, obj); handleCurrentChange(e) {
// let { page, page_size } = this.parmas; this.orderQueryObj.page = e;
this.getOrderListMet(this.parmas); this.getOrderListMet();
}, },
// 拒绝 // 拒绝
refuse(val) { async refuse(val) {
this.$confirm("确定要拒绝退款么?", "拒绝", { try {
cancelButtonText: "取消", await this.$confirm("确定要拒绝退款么?", "拒绝", {
confirmButtonText: "确定", cancelButtonText: "取消",
}) confirmButtonText: "确定",
.then(() => { });
const params = { } catch (e) {
order_id: val.order_id, // 取消
}; return;
const res = orderRefundReject(params); }
console.log(res.status); const params = {
this.$message({ order_id: val.order_id,
type: "success", };
message: "此订单已驳回", const res = await orderRefundReject(params);
});
this.getOrderListMet() if (res.code === 0) {
}) this.$message({
.catch(() => {}); type: "success",
message: "订单已驳回",
});
} else {
this.$message.error(res.reason);
}
this.getOrderListMet();
}, },
// 同意 // 同意
...@@ -561,13 +623,17 @@ export default { ...@@ -561,13 +623,17 @@ export default {
// 全选 // 全选
handleCheckAllChange(val) { handleCheckAllChange(val) {
this.refundGoods.refundedGoodsSel = val; for (var i in this.refundGoods) {
this.isIndeterminate = false; this.refundGoods[i].refundedGoodsSel = val;
}
// this.isIndeterminate = false;
}, },
// 退款 // 退款
async refund(val) { async refund(val) {
this.refundShow = true; this.refundShow = true;
this.checkAll = false;
this.refundGoods = [];
const params = { const params = {
order_id: val.order_id, order_id: val.order_id,
}; };
...@@ -608,9 +674,10 @@ export default { ...@@ -608,9 +674,10 @@ export default {
const res = await refundOrder(orderId, itemsToRefund); const res = await refundOrder(orderId, itemsToRefund);
if (res.code === 0) { if (res.code === 0) {
this.$message.success("退款成功"); this.$message.success("退款成功");
this.refundShow = false;
return; return;
} }
this.refundShow = false;
this.$message.error(res.reason); this.$message.error(res.reason);
}, },
}, },
......
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