From a4b3ee325c7354579d495bc74a777e494e5ec38c Mon Sep 17 00:00:00 2001
From: quanwei <419654421@qq.com>
Date: Fri, 06 Feb 2026 18:18:44 +0800
Subject: [PATCH] 商品可以价格面议 选择走访时显示输入走访企业名 分会添加活动时要总会审核 分类添加人数限制，添加活动选择了填写人数限制的分类时活动名额下显示该分类人数限制为15 同一个企业30天内只能走访一次，在30天内走访同一个企业时提示该企业已被走访xx天后才可以从新走访
---
branch_vue/src/views/activity/activity/drawer/part/edit.vue | 135 ++++++++++++++++++++++++++++++++++++++++----
1 files changed, 121 insertions(+), 14 deletions(-)
diff --git a/branch_vue/src/views/activity/activity/drawer/part/edit.vue b/branch_vue/src/views/activity/activity/drawer/part/edit.vue
index 14b4eca..e6ca209 100644
--- a/branch_vue/src/views/activity/activity/drawer/part/edit.vue
+++ b/branch_vue/src/views/activity/activity/drawer/part/edit.vue
@@ -13,7 +13,7 @@
</el-form-item> -->
<el-form-item label="活动标题" prop="name"><el-input v-model="form.name" placeholder="请输入活动标题" class="max-w460"></el-input></el-form-item>
<el-form-item label="活动分类" prop="category_id">
- <el-select v-model="form.category_id" placeholder="请选择">
+ <el-select v-model="form.category_id" placeholder="请选择" @change="handleCategoryChange">
<el-option v-for="(item, index) in category" :key="index" :label="item.name" :value="item.category_id"></el-option>
</el-select>
</el-form-item>
@@ -44,6 +44,9 @@
<el-radio :label="0">否</el-radio>
</el-radio-group>
</el-form-item>
+ <el-form-item v-if="form.is_visit" label="被走访企业名称" prop="visit_supplier_name" key="visit_supplier_name">
+ <el-input v-model="form.visit_supplier_name" placeholder="商户没有入驻时，请输入被走访企业名称" class="max-w460"></el-input>
+ </el-form-item>
<el-form-item label="被走访企业" prop="visit_supplier_id" key="visit_supplier_id" v-if="form.is_visit">
<el-row>
<el-button @click="selectSupplier('visit')" icon="el-icon-plus">选择企业</el-button>
@@ -61,6 +64,13 @@
<div class="gray9" v-if="form.space_supplier_id==''">如没有可不选</div>
</el-row>
</el-form-item>
+ <el-form-item label="促销商品" v-if="form.visit_supplier_id > 0">
+ <el-button icon="el-icon-plus" @click="selectProduct">选择商品</el-button>
+ <div class="gray9">当有走访企业时，可以选择该企业的商品进行促销</div>
+ </el-form-item>
+ <el-form-item label="商品列表" v-if="form.product_list.length > 0 && form.is_visit">
+ <ProductPrice :products="form.product_list" @confirm="handlePriceConfirm"></ProductPrice>
+ </el-form-item>
<el-form-item label="活动费用" prop="activity_fee">
<el-input v-model="form.fee" placeholder="请输入活动费用" class="max-w460">
<template slot="append">元</template>
@@ -71,7 +81,7 @@
<el-input v-model="form.limit_num" placeholder="请输入活动名额" class="max-w460">
<template slot="append">人</template>
</el-input>
- <div class="gray9">0为不限制人数</div>
+ <div class="gray9">0为不限制人数{{selectedCategory.limit_num?('，该分类最多'+selectedCategory.limit_num+'人'):''}}</div>
</el-form-item>
<el-form-item label="联系电话" prop="phone">
<el-input v-model="form.phone" placeholder="请输入联系电话" class="max-w460"></el-input>
@@ -153,6 +163,10 @@
<GetSupplier :open="open_supplier" @close="closeSupplierFunc"></GetSupplier>
<!--选择用户-->
<GetUser :is_open="open_user" @close="closeGetUserFunc"></GetUser>
+ <!--选择商品-->
+ <ProductSelect :isproduct="isproduct" :shop_supplier_id="form.visit_supplier_id" :excludeIds="excludeIds" :islist="islist" @closeDialog="closeProductDialogFunc($event)">
+ 产品列表弹出层
+ </ProductSelect>
</div>
</template>
@@ -164,6 +178,8 @@
import GetBranch from '@/components/branch/Branch.vue';
import GetSupplier from '@/components/supplier/Supplier.vue';
import GetUser from '@/components/user/GetUser.vue';
+import ProductSelect from '@/components/product/Product';
+import ProductPrice from './../../dialog/Price.vue';
export default {
components: {
/*编辑器*/
@@ -174,7 +190,9 @@
Getpoint,
GetBranch,
GetSupplier,
- GetUser
+ GetUser,
+ ProductSelect,
+ ProductPrice
},
data() {
// 被走访企业验证规则
@@ -209,6 +227,9 @@
supplier_type: 'visit',
select_list:[], // 选择的核销员列表
open_user: false,
+ excludeIds: [],
+ islist: true, //多选
+ isproduct: false,
/*验证规则*/
rules: {
name: [{ required: true, message: '请输入活动标题', trigger: 'blur' }],
@@ -221,6 +242,14 @@
};
},
props: ['form', 'category'],
+ computed: {
+ selectedCategory() {
+ if (!this.category || this.category.length === 0 || !this.form.category_id) {
+ return {};
+ }
+ return this.category.find(item => item.category_id === this.form.category_id) || {};
+ }
+ },
methods: {
/*上传*/
openUpload(t) {
@@ -272,7 +301,8 @@
this.form.space_supplier_id = this.form.space_supplier_id || '';
this.visit_supplier_name = this.form.visitSupplier ? this.form.visitSupplier.name : '';
this.space_supplier_name = this.form.spaceSupplier ? this.form.spaceSupplier.name : '';
- this.select_list = this.form.verify_user;
+ // this.select_list = this.form.verify_user;
+ this.excludeIds = this.form.product_ids;
this.loading = false;
},
@@ -281,22 +311,25 @@
let self = this;
let form = self.form;
// 整理核销人员数据
- let verify_user_ids = [];
- self.select_list.forEach((item) => {
- verify_user_ids.push(item.user_id);
- });
- form.verify_user_ids = verify_user_ids.join(',');
+ // let verify_user_ids = [];
+ // self.select_list.forEach((item) => {
+ // verify_user_ids.push(item.user_id);
+ // });
+ // form.verify_user_ids = verify_user_ids.join(',');
self.$refs.form.validate(valid => {
if (valid) {
self.loading = true;
- self.form.content = this.$refs.ue.getUEContent();
+ form.content = this.$refs.ue.getUEContent();
// 如果走访企业，则被走访企业就是场地提供者
- if (self.form.is_visit) {
- self.form.space_supplier_id = '';
+ if (form.is_visit) {
+ form.space_supplier_id = '';
} else {
- self.form.visit_supplier_id = '';
+ form.visit_supplier_id = '';
}
- BranchApi.editActivity(form, true)
+ BranchApi.editActivity({
+ activity_id: form.activity_id,
+ formData: JSON.stringify(form)
+ }, true)
.then(data => {
self.loading = false;
self.$message({
@@ -355,6 +388,10 @@
closeSupplierFunc(e) {
if (e.type != 'error') {
if (this.supplier_type == 'visit') {
+ // 如果换了走访企业，清除促销商品
+ if (this.form.visit_supplier_id != e.params.shop_supplier_id) {
+ this.form.product_list = [];
+ }
this.form.visit_supplier_id = e.params.shop_supplier_id;
this.visit_supplier_name = e.params.name;
} else {
@@ -383,6 +420,76 @@
deleteVerifyUser(i) {
this.select_list.splice(i, 1);
},
+
+ selectProduct() {
+ this.isproduct = true;
+ },
+ handlePriceConfirm(changedProducts) {
+ const excludeIds = changedProducts.map((row) => row.product_id);
+ this.excludeIds = excludeIds;
+ changedProducts;
+ this.form.product_list = changedProducts;
+ },
+ /*商品选择关闭弹窗*/
+ closeProductDialogFunc(e) {
+ const self = this;
+ self.isproduct = false;
+ const excludeIds = [];
+ if (e.type == 'success') {
+ let product = [];
+ e.params.forEach((item) => {
+ const arr1 = {
+ image: item.image,
+ product_name: item.product_name,
+ product_price: item.product_price,
+ product_id: item.product_id,
+ product_sku_id: item.sku[0].product_sku_id,
+ spec_sku_id: item.sku[0].spec_sku_id,
+ product_sku_name: '单规格'
+ };
+ if (item.specList.length > 0 && item.spec_type == 20) {
+ item.specList.forEach((cell, colIndex) => {
+ const arr2 = {
+ image: item.image,
+ product_name: item.product_name,
+ product_price: cell.spec_form.product_price,
+ product_id: item.product_id,
+ product_sku_id: cell.product_sku_id,
+ spec_sku_id: cell.spec_sku_id,
+ product_sku_name: cell.spec_name
+ };
+ product.push(arr2);
+ });
+ } else {
+ product.push(arr1);
+ }
+
+ excludeIds.push(item.product_id);
+ });
+
+ self.excludeIds = excludeIds;
+ const product_list = self.form.product_list;
+ const new_arr = self.mergeArraysByProductId(product_list, product, 'product_id');
+ self.form.product_list = new_arr;
+
+ }
+ },
+
+ /**
+ * 将 B 数组中不存在于 A 数组中的项（基于 product_id）合并到 A 数组中
+ * @param {Array} arrayA - 目标数组
+ * @param {Array} arrayB - 源数组
+ * @param {string} idKey - 用于比较的键名（默认为 'product_id'）
+ * @returns {Array} - 合并后的新数组
+ */
+ mergeArraysByProductId(arrayA, arrayB, idKey = 'product_id') {
+ // 创建 A 数组中所有 product_id 的集合
+ const idsInA = new Set(arrayA.map((item) => item[idKey]));
+ // 筛选出 B 数组中不存在于 A 数组的项
+ const itemsToAdd = arrayB.filter((item) => !idsInA.has(item[idKey]));
+ // 合并数组（不改变原数组）
+ return [...arrayA, ...itemsToAdd];
+ },
}
};
</script>
--
Gitblit v1.9.2