Skip to content

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

fix: 时间选择格式+限制不能为0+提示

parent 80f84ebc
Hide whitespace changes
Inline Side-by-side
Showing with 140 additions and 119 deletions
src/pages/Activity/releaseProduc/components/addProduc.vue
View file @ cc19e96f
......@@ -53,15 +53,17 @@
<el-table-column prop="inventory_rest" label="剩余库存"></el-table-column>
<el-table-column label="操作" width="120" fixed="right">
<template #default="scope">
<el-button
type="text"
size="small"
@click="commodity('update', scope.row)"
>修改</el-button
>
<el-button type="text" size="small" @click="removeCom(scope.row)"
>移除</el-button
>
<div class="buttons_actions">
<el-button
type="text"
size="small"
@click="commodity('update', scope.row)"
>修改</el-button
>
<el-button type="text" size="small" @click="removeCom(scope.row)"
>移除</el-button
>
</div>
</template>
</el-table-column>
</el-table>
......@@ -181,7 +183,7 @@
}
]"
>
<el-input-number
<el-input
v-model="commodityForm.num_limit"
:disabled="
commodityForm.checkedRadio === '' ||
......@@ -192,7 +194,7 @@
"
:min="0"
:controls="false"
></el-input-number>
></el-input>
</el-form-item>
<el-form-item
label="商家："
......@@ -306,8 +308,11 @@ import {
} from "../../../../service/Activity/index";
// 当选择（每人最多买时 添加验证（非空））
let checkPurseLimit = (rule, value, callback) => {
let str = /^[1-9]\d*$/;
if (value === "" || value === undefined || value === 0) {
return callback(new Error("请添加限制购买数量"));
} else if (!str.test(value)) {
return callback(new Error("请输入正确的购买数量"));
} else {
callback();
}
......@@ -350,7 +355,7 @@ var addProduct = {
inventory_total: "",
total_amount_order: "",
business1: "",
num_limit: 0, // 购买限制数量
num_limit: "", // 购买限制数量
checkedRadio: "" // 购买限制radio
},
picStr: "",
......@@ -462,7 +467,10 @@ var addProduct = {
this.inventoryRest = res.result.goods_info.inventory_rest;
this.inventoryTotal = res.result.goods_info.inventory_total;
this.commodityForm = res.result.goods_info;
this.commodityForm.num_limit = res.result.goods_info.rule_limit; // 购买限制的数量
this.commodityForm.num_limit =
res.result.goods_info.rule_limit === 0
? ""
: res.result.goods_info.rule_limit; // 购买限制的数量
this.commodityForm.checkedRadio =
res.result.goods_info.rule_limit === 0 ||
res.result.goods_info.rule_limit === undefined
......@@ -719,7 +727,11 @@ export default addProduct;
width: 90%;
margin: 0 auto;
}
.buttons_actions {
display: flex;
justify-content: space-around;
align-items: center;
}
.btnGroup {
margin-bottom: 15px;
}
......
src/pages/Groupmeal/orderManagement/index.vue
View file @ cc19e96f
......@@ -9,76 +9,83 @@
ref="ruleForm"
class="demo-form-inline"
>
<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
>
<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>
<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
>
<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>
</div>
<!-- <el-form-item label="详细地址：" prop="detailed_address">
<el-select
......@@ -192,8 +199,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
>
......@@ -280,8 +287,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
>
......@@ -397,7 +404,7 @@ import {
orderItemList,
orderRefundReject,
refundOrder,
getOrderExportURL,
getOrderExportURL
} from "@/service/Groupmeal/groupmeal";
import page from "../components/Pagination/index.vue";
import dayJs from "dayjs";
......@@ -405,7 +412,7 @@ export default {
name: "orderManagement",
components: {
Layout,
page,
page
},
data() {
return {
......@@ -421,7 +428,7 @@ export default {
sub_shop_id: "", // 自提点
// detailed_address: "", // 详细地址
create_time_start: "", // 开始时间
create_time_end: "", // 结束时间
create_time_end: "" // 结束时间
},
order_time: [], // 下单时间
// 下拉框数据
......@@ -431,36 +438,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: [],
......@@ -491,9 +498,9 @@ export default {
payment: "", // 实付
refundableQuantity: "",
refundAmount: "",
amountToRefund: "",
},
],
amountToRefund: ""
}
]
};
},
......@@ -506,7 +513,7 @@ export default {
},
exportURL3() {
return getOrderExportURL(this.orderQueryObj.marketing_id, "3");
},
}
},
methods: {
......@@ -531,7 +538,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); //自提点
......@@ -557,6 +564,7 @@ export default {
// 获取今天日期
today() {
this.order_time = []; // -lh
this.order_time[0] = dayJs(
new Date(new Date(new Date().toLocaleDateString()).getTime())
).format("YYYY-MM-DD HH:mm:ss");
......@@ -570,6 +578,7 @@ export default {
// 获取昨天日期
yesterday() {
this.order_time = []; // -lh
this.order_time[0] = dayJs(
new Date(
new Date(new Date().toLocaleDateString()).getTime() -
......@@ -622,7 +631,7 @@ export default {
this.orderQueryObj.marketing_id === "" ||
this.orderQueryObj.marketing_id === "0"
) {
this.$message.error("请选择活动名称");
this.$message.error("请选择活动后再进行操作");
return;
}
this.exportShow = true;
......@@ -633,7 +642,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;
......@@ -645,7 +654,7 @@ export default {
this.orderQueryObj.marketing_id === "" ||
this.orderQueryObj.marketing_id === "0"
) {
this.$message.error("请选择活动名称");
this.$message.error("请选择活动后再进行操作");
return;
}
......@@ -653,7 +662,7 @@ export default {
if (res.code === 0) {
this.$message({
type: "success",
message: "打印成功",
message: "打印成功"
});
return;
}
......@@ -671,7 +680,7 @@ export default {
try {
await this.$confirm(res.reason, "打印", {
cancelButtonText: "取消",
confirmButtonText: "确定",
confirmButtonText: "确定"
});
} catch (e) {
// 取消
......@@ -712,21 +721,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);
......@@ -753,7 +762,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;
......@@ -780,15 +789,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)
};
};
......@@ -814,13 +823,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