Skip to content

O
op-web-service
Commit 8fb38a18 authored by 蒙文昊's avatar 蒙文昊
Browse files
Options

Merge branch 'pyq' into 'dev' 

update:一级佣金+二级佣金需小于50%

See merge request bp/op-web-service!8
parents 45347a81 35820928
Show whitespace changes
Inline Side-by-side
Showing with 70 additions and 123 deletions
src/pages/Goods/Retail/index.vue
View file @ 8fb38a18
...@@ -328,18 +328,13 @@ function debounce(callback, delay) { ...@@ -328,18 +328,13 @@ function debounce(callback, delay) {
export default { export default {
name: "GoodsRetail", name: "GoodsRetail",
data() { data() {
// var commission = (rule, value, callback) => { var commission = (rule, value, callback) => {
// // if (!value) { if(this.ruleForm.first_commission_value + this.ruleForm.second_commission_value > 50 || value > 50) {
// // return callback(new Error("请填写一级佣金")); callback(new Error("一级佣金与二级佣金之和不可大于50%"));
// // } }else {
// setTimeout(() => { callback();
// if (!Number.isInteger(value)) { }
// callback(new Error("请输入数字值")); };
// } else {
// callback();
// }
// }, 100);
// };
return { return {
tableData: [], tableData: [],
// 详情页 // 详情页
...@@ -381,30 +376,25 @@ export default { ...@@ -381,30 +376,25 @@ export default {
life_account_id: "", life_account_id: "",
goods_sku_id: "", goods_sku_id: "",
start_time: "", start_time: "",
end_time: "", end_time: ""
}, },
rules: { rules: {
marketing_name: [ marketing_name: [
{ required: true, message: "请输入活动名称", trigger: "blur" }, { required: true, message: "请输入活动名称", trigger: "blur" },
{ min: 1, max: 50, message: "长度在 50个字符内", trigger: "blur" }, { min: 1, max: 50, message: "长度在 50个字符内", trigger: "blur" }
], ],
first_commission_value: [ first_commission_value: [
{ {
required: true, required: true,
// validator: commission,
message: "请填写一级佣金", message: "请填写一级佣金",
trigger: "blur", trigger: "blur"
}, },
{ type: "number", message: "必须为数值型" }, { type: "number", message: "必须为数值型" },
{ validator: commission }
// { validator: commission, trigger: "change" },
], ],
second_commission_value: [ second_commission_value: [
{ type: "number", message: "必须为数值型" }, { type: "number", message: "必须为数值型" },
// { { validator: commission }
// validator: commission,
// trigger: "change",
// },
], ],
}, },
allList: [], allList: [],
...@@ -414,7 +404,7 @@ export default { ...@@ -414,7 +404,7 @@ export default {
endTime: "", endTime: "",
marketing_id: "", marketing_id: "",
marketing_info: {}, marketing_info: {},
disabled: false, disabled: false
}; };
}, },
methods: { methods: {
...@@ -451,41 +441,13 @@ export default { ...@@ -451,41 +441,13 @@ export default {
ElMessage.error("请求获取营销活动失败"); ElMessage.error("请求获取营销活动失败");
} }
}, },
// 关闭状态
// async handelClose(row) {
// try {
// await updateMarketingList({
// marketing_id: row.marketing_id,
// online_status: 2,
// });
// this.getMarketingList();
// ElMessage.success("状态已关闭");
// } catch (error) {
// ElMessage.error("请求关闭失败" + error.message);
// }
// },
//启用状态
// async handelEnable(row) {
// try {
// // const res = await updateMarketingList({
// await updateMarketingList({
// marketing_id: row.marketing_id,
// online_status: 1,
// });
// this.getMarketingList();
// ElMessage("状态已启用");
// } catch (error) {
// ElMessage("请求开启状态失败");
// }
// },
// 开启关闭 // 开启关闭
handelEnable: debounce(async function (row, type) { handelEnable: debounce(async function (row, type) {
try { try {
const res = await updateMarketingList({ const res = await updateMarketingList({
marketing_id: row.marketing_id, marketing_id: row.marketing_id,
online_status: type, online_status: type
}); });
// const res = {code:4150007,reason:"更新失败",status:"failed"}
if (res.code !== 0) { if (res.code !== 0) {
ElMessage.error(res.reason); ElMessage.error(res.reason);
} else { } else {
...@@ -509,7 +471,7 @@ export default { ...@@ -509,7 +471,7 @@ export default {
goods_sku_id: "", goods_sku_id: "",
online_status: [], online_status: [],
page: 1, page: 1,
page_size: 20, page_size: 20
}), }),
this.$refs[retailActivitie].resetFields(); this.$refs[retailActivitie].resetFields();
this.getMarketingList({}); this.getMarketingList({});
...@@ -567,7 +529,7 @@ export default { ...@@ -567,7 +529,7 @@ export default {
goods_sku_id, goods_sku_id,
life_account_id, life_account_id,
start_time, start_time,
end_time, end_time
}; };
try { try {
// 发请求 // 发请求
...@@ -585,23 +547,29 @@ export default { ...@@ -585,23 +547,29 @@ export default {
async getAllList() { async getAllList() {
let all = await getMarketingList({ let all = await getMarketingList({
page: 1, page: 1,
page_size: this.retailActivitie.count, page_size: this.retailActivitie.count
}); });
this.allList = all.result; this.allList = all.result;
}, },
// 添加活动列表 // 添加活动列表
async addList() { async addList() {
this.$refs.ruleForm.validate(async (valid) => {
if (valid) {
console.log(this.ruleForm.goods_sku_id); console.log(this.ruleForm.goods_sku_id);
if (this.ruleForm.goods_sku_id.length <= 0) { if (this.ruleForm.goods_sku_id.length <= 0) {
ElMessage("请选择商品"); ElMessage("请选择商品");
return; return;
} else { } else {
var goods_sku_id = var goods_sku_id =
this.ruleForm.goods_sku_id && this.ruleForm.goods_sku_id.join(","); this.ruleForm.goods_sku_id &&
this.ruleForm.goods_sku_id.join(",");
} }
// console.log(goods_sku_id)； // console.log(goods_sku_id)；
let { marketing_name, first_commission_value, second_commission_value } = let {
this.ruleForm; marketing_name,
first_commission_value,
second_commission_value
} = this.ruleForm;
let [start_time, end_time] = this.timeSelect; let [start_time, end_time] = this.timeSelect;
if ( if (
!marketing_name || !marketing_name ||
...@@ -618,29 +586,8 @@ export default { ...@@ -618,29 +586,8 @@ export default {
first_commission_value, first_commission_value,
second_commission_value, second_commission_value,
start_time: this.formatTime(start_time), start_time: this.formatTime(start_time),
end_time: this.formatTime(end_time), end_time: this.formatTime(end_time)
}; };
// let resList = [];
// // 遍历选择的商品
// this.allList.forEach((item) => {
// // 判断该活动是否是开启状态且时间与选择时间冲突
// if (item.online_status == 1 && new Date(item.end_time) > start_time) {
// // 如果开启且重复，根据活动id请求获取这个活动的详情，判断这个活动的关联商品是否与选择商品重复
// resList.push(getMarketingInfo({ marketing_id: item.marketing_id }));
// }
// });
// let skuList = await Promise.all(resList);
// skuList = skuList.map((item) => item.result.goods_list);
// skuList = skuList.flat();
// console.log(skuList);
// const ok = this.ruleForm.goods_sku_id.every((skuId) => {
// // 遍历所有的活动，判断选择的商品是否符合条件
// return !skuList.find((item) => {
// console.log(item.goods_sku_id, skuId);
// return item.goods_sku_id == skuId;
// });
// });
// if (ok) {
try { try {
const res = await getAddMarketingList(addParams); const res = await getAddMarketingList(addParams);
if (res.status == "success") { if (res.status == "success") {
...@@ -649,13 +596,13 @@ export default { ...@@ -649,13 +596,13 @@ export default {
} else { } else {
ElMessage(res.reason); ElMessage(res.reason);
} }
// this.ruleIdForm = res.result;
} catch (error) { } catch (error) {
ElMessage.error("请求创建活动失败"); ElMessage.error("请求创建活动失败");
} }
// } else { } else {
// ElMessage("已有该关联商品，请重新选择"); return false;
// } }
});
}, },
// 清空 // 清空
...@@ -666,7 +613,7 @@ export default { ...@@ -666,7 +613,7 @@ export default {
second_commission_value: "", second_commission_value: "",
start_time: "", start_time: "",
end_time: "", end_time: "",
goods_sku_id: [], goods_sku_id: []
}), }),
(this.timeSelect = []), (this.timeSelect = []),
(this.goods_list = []), (this.goods_list = []),
...@@ -674,7 +621,7 @@ export default { ...@@ -674,7 +621,7 @@ export default {
life_account_id: "", life_account_id: "",
goods_sku_id: "", goods_sku_id: "",
start_time: "", start_time: "",
end_time: "", end_time: ""
}); });
}, },
// 取消 // 取消
...@@ -682,12 +629,12 @@ export default { ...@@ -682,12 +629,12 @@ export default {
this.dialogFormVisible = false; this.dialogFormVisible = false;
this.resetDate(); this.resetDate();
this.getMarketingList(); this.getMarketingList();
}, }
}, },
created() { created() {
this.getMarketingList(); this.getMarketingList();
this.getAllList(); this.getAllList();
}, }
}; };
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
......
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