Skip to content

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

fix: 时间框

parent f5cb95f9
Hide whitespace changes
Inline Side-by-side
Showing with 114 additions and 105 deletions
src/pages/Groupmeal/newOrderManagement/index.vue
View file @ 3c8608e1
...@@ -9,77 +9,84 @@ ...@@ -9,77 +9,84 @@
ref="ruleForm" ref="ruleForm"
class="demo-form-inline" class="demo-form-inline"
> >
<el-form-item label="活动名称：" prop="marketing_id"> <div>
<el-select <el-form-item label="活动名称：" prop="marketing_id">
v-model="orderQueryObj.marketing_id" <el-select
placeholder="请选择" v-model="orderQueryObj.marketing_id"
@change="activityNameSel" placeholder="请选择"
@focus="activityNameFocus" @change="activityNameSel"
filterable @focus="activityNameFocus"
> filterable
<el-option >
v-for="item in activityNameArr" <el-option
:key="item.marketing_id" v-for="item in activityNameArr"
:label="item.marketing_name" :key="item.marketing_id"
:value="item.marketing_id" :label="item.marketing_name"
></el-option> :value="item.marketing_id"
</el-select> ></el-option>
</el-form-item> </el-select>
<el-form-item label="订单状态：" prop="order_status"> </el-form-item>
<el-select v-model="orderQueryObj.order_status" placeholder="请选择"> <el-form-item label="订单状态：" prop="order_status">
<el-option <el-select
v-for="item in orderStatusArr" v-model="orderQueryObj.order_status"
:key="item.value" placeholder="请选择"
:label="item.label" >
:value="item.value" <el-option
:disabled="item.disabled" v-for="item in orderStatusArr"
></el-option> :key="item.value"
</el-select> :label="item.label"
</el-form-item> :value="item.value"
<el-form-item label="商品名称：" prop="goods_id"> :disabled="item.disabled"
<el-select ></el-option>
v-model="orderQueryObj.goods_id" </el-select>
placeholder="请选择" </el-form-item>
filterable <el-form-item label="商品名称：" prop="goods_id">
> <el-select
<el-option v-model="orderQueryObj.goods_id"
v-for="item in tradeNameArr" placeholder="请选择"
:key="item.goods_id" filterable
:label="item.goods_name" >
:value="item.goods_id" <el-option
></el-option> v-for="item in tradeNameArr"
</el-select> :key="item.goods_id"
</el-form-item> :label="item.goods_name"
<el-form-item label="收货人：" prop="cust_user"> :value="item.goods_id"
<el-input ></el-option>
placeholder="请输入收货人姓名或手机号" </el-select>
prefix-icon="el-icon-search" </el-form-item>
v-model="orderQueryObj.cust_user" </div>
style="width:220px" <div>
></el-input> <el-form-item label="收货人：" prop="cust_user">
</el-form-item> <el-input
<el-form-item label="订单编号：" prop="order_id"> placeholder="请输入收货人姓名或手机号"
<el-input prefix-icon="el-icon-search"
placeholder="请输入订单号" v-model="orderQueryObj.cust_user"
prefix-icon="el-icon-search" style="width:220px"
v-model="orderQueryObj.order_id" ></el-input>
></el-input> </el-form-item>
</el-form-item> <el-form-item label="订单编号：" prop="order_id">
<el-form-item label="自提点：" prop="sub_shop_id"> <el-input
<el-select placeholder="请输入订单号"
v-model="orderQueryObj.sub_shop_id" prefix-icon="el-icon-search"
placeholder="请选择" v-model="orderQueryObj.order_id"
filterable ></el-input>
@change="subShopSel" </el-form-item>
> <el-form-item label="自提点：" prop="sub_shop_id">
<el-option <el-select
v-for="item in selLiftPoinArr" v-model="orderQueryObj.sub_shop_id"
:key="item.take_place_id" placeholder="请选择"
:label="item.take_place_name" filterable
:value="item.take_place_id" @change="subShopSel"
></el-option> >
</el-select> <el-option
</el-form-item> 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="take_place_address"> <el-form-item label="详细地址：" prop="take_place_address">
<el-select <el-select
...@@ -196,7 +203,7 @@ ...@@ -196,7 +203,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
> >
...@@ -287,7 +294,7 @@ ...@@ -287,7 +294,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
> >
...@@ -390,7 +397,7 @@ import { ...@@ -390,7 +397,7 @@ 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"; import dayJs from "dayjs";
...@@ -398,7 +405,7 @@ export default { ...@@ -398,7 +405,7 @@ export default {
name: "orderManagement", name: "orderManagement",
components: { components: {
Layout, Layout,
page, page
}, },
data() { data() {
return { return {
...@@ -414,7 +421,7 @@ export default { ...@@ -414,7 +421,7 @@ export default {
sub_shop_id: "", // 自提点 sub_shop_id: "", // 自提点
take_place_address: "", //详细地址 take_place_address: "", //详细地址
create_time_start: "", // 开始时间 create_time_start: "", // 开始时间
create_time_end: "", // 结束时间 create_time_end: "" // 结束时间
}, },
order_time: [], // 下单时间 order_time: [], // 下单时间
// 下拉框数据 // 下拉框数据
...@@ -424,36 +431,36 @@ export default { ...@@ -424,36 +431,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: [],
...@@ -482,9 +489,9 @@ export default { ...@@ -482,9 +489,9 @@ export default {
refundedGoodsSel: false, refundedGoodsSel: false,
payment: "", payment: "",
// restoreInventory: false, // restoreInventory: false,
goods_name: "", goods_name: ""
}, }
], ]
}; };
}, },
...@@ -497,7 +504,7 @@ export default { ...@@ -497,7 +504,7 @@ export default {
}, },
exportURL3() { exportURL3() {
return newGetOrderExportURL(this.orderQueryObj.marketing_id, "3"); return newGetOrderExportURL(this.orderQueryObj.marketing_id, "3");
}, }
}, },
methods: { methods: {
...@@ -524,7 +531,7 @@ export default { ...@@ -524,7 +531,7 @@ export default {
this.orderQueryObj.sub_shop_id = ""; this.orderQueryObj.sub_shop_id = "";
this.orderQueryObj.take_place_address = ""; this.orderQueryObj.take_place_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); //自提点
...@@ -590,6 +597,7 @@ export default { ...@@ -590,6 +597,7 @@ export default {
// 获取今天日期 // 获取今天日期
today() { today() {
this.order_time = [];
this.order_time[0] = dayJs( this.order_time[0] = dayJs(
new Date(new Date(new Date().toLocaleDateString()).getTime()) new Date(new Date(new Date().toLocaleDateString()).getTime())
).format("YYYY-MM-DD HH:mm:ss"); ).format("YYYY-MM-DD HH:mm:ss");
...@@ -603,6 +611,7 @@ export default { ...@@ -603,6 +611,7 @@ export default {
// 获取昨天日期 // 获取昨天日期
yesterday() { yesterday() {
this.order_time = [];
this.order_time[0] = dayJs( this.order_time[0] = dayJs(
new Date( new Date(
new Date(new Date().toLocaleDateString()).getTime() - new Date(new Date().toLocaleDateString()).getTime() -
...@@ -618,7 +627,7 @@ export default { ...@@ -618,7 +627,7 @@ export default {
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 = "";
} }
...@@ -638,7 +647,7 @@ export default { ...@@ -638,7 +647,7 @@ 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 = "";
} }
...@@ -688,7 +697,7 @@ export default { ...@@ -688,7 +697,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;
...@@ -708,7 +717,7 @@ export default { ...@@ -708,7 +717,7 @@ export default {
if (res.code === 0) { if (res.code === 0) {
this.$message({ this.$message({
type: "success", type: "success",
message: "打印成功", message: "打印成功"
}); });
return; return;
} }
...@@ -726,7 +735,7 @@ export default { ...@@ -726,7 +735,7 @@ export default {
try { try {
await this.$confirm(res.reason, "打印", { await this.$confirm(res.reason, "打印", {
cancelButtonText: "取消", cancelButtonText: "取消",
confirmButtonText: "确定", confirmButtonText: "确定"
}); });
} catch (e) { } catch (e) {
// 取消 // 取消
...@@ -752,7 +761,7 @@ export default { ...@@ -752,7 +761,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);
...@@ -777,21 +786,21 @@ export default { ...@@ -777,21 +786,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);
...@@ -817,7 +826,7 @@ export default { ...@@ -817,7 +826,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;
...@@ -846,15 +855,15 @@ export default { ...@@ -846,15 +855,15 @@ 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,
refund_amount: convertToNumber(item.amountToRefund), refund_amount: convertToNumber(item.amountToRefund)
// refund_type: item.refund_type // refund_type: item.refund_type
}; };
}; };
...@@ -877,13 +886,13 @@ export default { ...@@ -877,13 +886,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>
......
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