bug fix and performance improvements

This commit is contained in:
quantulr
2023-08-01 17:27:11 +08:00
parent f0bf63e43f
commit fec49d35bc
2 changed files with 278 additions and 272 deletions

View File

@ -1,30 +1,31 @@
<template> <template>
<el-form <el-form
ref="formRef" ref="formRef"
:disabled="disabled" :disabled="disabled"
:inline="inline" :inline="inline"
:label-width="labelWidth + 'px'" :label-width="labelWidth + 'px'"
:model="modelValue" :model="modelValue"
:rules="rules" :rules="rules"
:size="size" :size="size"
> >
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item :show-message="false" label="所属领域:" prop="industrys"> <!-- :show-message="false"-->
<el-form-item label="所属领域:" prop="industrys">
<el-row justify="space-between" type="flex"> <el-row justify="space-between" type="flex">
<el-col :span="6"> <el-col :span="6">
<el-form-item> <el-form-item>
<el-select <el-select
v-model="fields[0]" v-model="fields[0]"
placeholder="请选择" placeholder="请选择"
value-key="id" value-key="id"
@change="levelIChange" @change="levelIChange"
> >
<el-option <el-option
v-for="item in levelI" v-for="item in levelI"
:key="item.id" :key="item.id"
:label="item.name" :label="item.name"
:value="item.id" :value="item.id"
> >
</el-option> </el-option>
</el-select> </el-select>
@ -32,33 +33,33 @@
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-select <el-select
v-model="fields[1]" v-model="fields[1]"
:disabled="levelII.length === 0" :disabled="levelII.length === 0"
placeholder="请选择" placeholder="请选择"
value-key="id" value-key="id"
@change="levelIIChange" @change="levelIIChange"
> >
<el-option <el-option
v-for="item in levelII" v-for="item in levelII"
:key="item.id" :key="item.id"
:label="item.name" :label="item.name"
:value="item.id" :value="item.id"
> >
</el-option> </el-option>
</el-select> </el-select>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-select <el-select
v-model="fields[2]" v-model="fields[2]"
:disabled="levelIII.length === 0" :disabled="levelIII.length === 0"
placeholder="请选择" placeholder="请选择"
value-key="id" value-key="id"
> >
<el-option <el-option
v-for="item in levelIII" v-for="item in levelIII"
:key="item.id" :key="item.id"
:label="item.name" :label="item.name"
:value="item.id" :value="item.id"
> >
</el-option> </el-option>
</el-select> </el-select>
@ -70,10 +71,10 @@
</el-row> </el-row>
<div class="e_tag"> <div class="e_tag">
<el-tag <el-tag
v-for="(tag, index) in industrysTags" v-for="(tag, index) in industrysTags"
:key="index" :key="index"
:closable="!disabled" :closable="!disabled"
@close="handleFieldClose(index)" @close="handleFieldClose(index)"
> >
{{ getFieldNameById(tag) }} {{ getFieldNameById(tag) }}
<!-- <template v-if="Array.isArray(tag)"> <!-- <template v-if="Array.isArray(tag)">
@ -94,9 +95,9 @@
</template> </template>
<script name="FieldOptions" setup> <script name="FieldOptions" setup>
// import { industry } from "@/api/config"; // import { industry } from "@/api/config";
import { listSysIndustry } from "@/api/platform/industry"; import {listSysIndustry} from "@/api/platform/industry";
import { ElMessage } from "element-plus"; import {ElMessage} from "element-plus";
import { reactive, toRefs, watch } from "vue"; import {reactive, ref, toRefs, watch} from "vue";
const props = defineProps({ const props = defineProps({
modelValue: Object, modelValue: Object,
@ -117,7 +118,7 @@ const props = defineProps({
default: "default", default: "default",
}, },
}); });
const { modelValue, labelWidth, disabled } = toRefs(props); const {modelValue, labelWidth, disabled} = toRefs(props);
const formRef = ref(null); const formRef = ref(null);
const levelI = ref([]); // I级数据 const levelI = ref([]); // I级数据
const levelII = ref([]); // II级数据 const levelII = ref([]); // II级数据
@ -136,11 +137,11 @@ const data = reactive({
], ],
}, },
}); });
const { rules } = toRefs(data); const {rules} = toRefs(data);
// 获取领域树形列表 // 获取领域树形列表
const getIndustryTreeData = async () => { const getIndustryTreeData = async () => {
const { data } = await listSysIndustry(); const {data} = await listSysIndustry();
levelI.value = data; levelI.value = data;
}; };
@ -213,6 +214,7 @@ const handleFieldClose = (index) => {
}; };
const validateForm = async () => { const validateForm = async () => {
console.log(modelValue.value.industrys)
try { try {
return await formRef.value.validate(); return await formRef.value.validate();
} catch (error) { } catch (error) {
@ -221,46 +223,46 @@ const validateForm = async () => {
}; };
getIndustryTreeData(); getIndustryTreeData();
fields.value = []
watch( watch(
modelValue, modelValue,
(newVal) => { (newVal) => {
modelValue.value.industrys = []; modelValue.value.industrys = [];
// console.log(modelValue.value.industry ? 1 : 0); // console.log(modelValue.value.industry ? 1 : 0);
let industrysList = modelValue.value.industry let industrysList = modelValue.value.industry
? modelValue.value.industry.split(",") ? modelValue.value.industry.split(",")
: []; : [];
modelValue.value.industrys.push(...industrysList); modelValue.value.industrys.push(...industrysList);
for (const field of industrysList) { for (const field of industrysList) {
industrysTags.value.push(field.split("-").map((el) => parseInt(el))); industrysTags.value.push(field.split("-").map((el) => parseInt(el)));
} }
// let _key = []; // let _key = [];
// let _value = []; // let _value = [];
// for (let i = 0; i < newVal.industrys.length; i++) { // for (let i = 0; i < newVal.industrys.length; i++) {
// const item = newVal.industrys[i]; // const item = newVal.industrys[i];
// _key.push(item.key); // _key.push(item.key);
// _value.push(item.value); // _value.push(item.value);
// } // }
// newVal.industrys = _key; // newVal.industrys = _key;
// let keyObj = []; // let keyObj = [];
// for (let i = 0; i < _key.length; i++) { // for (let i = 0; i < _key.length; i++) {
// keyObj.push([]); // keyObj.push([]);
// let array = _key[i].split("-"); // let array = _key[i].split("-");
// for (let j = 0; j < array.length; j++) { // for (let j = 0; j < array.length; j++) {
// keyObj[i].push({ // keyObj[i].push({
// id: array[j], // id: array[j],
// }); // });
// } // }
// } // }
// for (let i = 0; i < _value.length; i++) { // for (let i = 0; i < _value.length; i++) {
// let array = _value[i].split(">"); // let array = _value[i].split(">");
// for (let j = 0; j < array.length; j++) { // for (let j = 0; j < array.length; j++) {
// keyObj[i][j]["name"] = array[j]; // keyObj[i][j]["name"] = array[j];
// } // }
// } // }
// industrysTags.value = keyObj; // industrysTags.value = keyObj;
}, },
{ immediate: true } {immediate: true}
); );
defineExpose({ defineExpose({

View File

@ -1,54 +1,56 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form <el-form
:model="queryParams" :model="queryParams"
ref="queryFormRef" ref="queryFormRef"
v-show="showSearch" v-show="showSearch"
:inline="true" :inline="true"
> >
<el-form-item label="活动名称" prop="title"> <el-form-item label="活动名称" prop="title">
<el-input <el-input
v-model="queryParams.title" v-model="queryParams.title"
placeholder="请输入活动名称" placeholder="请输入活动名称"
clearable clearable
size="default" size="default"
style="width: 240px" style="width: 240px"
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="所属站点" prop="tenantId"> <!-- <el-form-item label="所属站点" prop="tenantId">-->
<SiteOptions v-model="queryParams.tenantId" :site-list="siteList" /> <!-- <SiteOptions v-model="queryParams.tenantId" :site-list="siteList" />-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item label="联系人" prop="contact"> <el-form-item label="联系人" prop="contact">
<el-input <el-input
v-model="queryParams.contact" v-model="queryParams.contact"
placeholder="请输入联系人" placeholder="请输入联系人"
clearable clearable
size="default" size="default"
style="width: 240px" style="width: 240px"
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="手机号码" prop="contactMobile"> <el-form-item label="手机号码" prop="contactMobile">
<el-input <el-input
v-model="queryParams.contactMobile" v-model="queryParams.contactMobile"
placeholder="请输入手机号码" placeholder="请输入手机号码"
clearable clearable
size="default" size="default"
style="width: 240px" style="width: 240px"
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button <el-button
type="primary" type="primary"
icon="search" icon="search"
size="default" size="default"
@click="handleQuery" @click="handleQuery"
>搜索</el-button >搜索
</el-button
> >
<el-button icon="refresh" size="default" @click="resetQuery" <el-button icon="refresh" size="default" @click="resetQuery"
>重置</el-button >重置
</el-button
> >
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -56,53 +58,54 @@
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
type="primary" type="primary"
plain plain
icon="plus" icon="plus"
size="default" size="default"
@click="handleAdd" @click="handleAdd"
>新增</el-button >新增
</el-button
> >
</el-col> </el-col>
<right-toolbar <right-toolbar
v-model:showSearch="showSearch" v-model:showSearch="showSearch"
@queryTable="getList" @queryTable="getList"
></right-toolbar> ></right-toolbar>
</el-row> </el-row>
<el-table v-loading="loading" :data="dataList"> <el-table v-loading="loading" :data="dataList">
<el-table-column label="数据编号" prop="id" align="center" /> <el-table-column label="数据编号" prop="id" align="center"/>
<el-table-column <el-table-column
label="活动名称" label="活动名称"
prop="title" prop="title"
align="center" align="center"
show-overflow-tooltip show-overflow-tooltip
/> />
<el-table-column <el-table-column
label="开始时间" label="开始时间"
prop="beginTime" prop="beginTime"
align="center" align="center"
width="100" width="100"
> >
<template #default="{ row }"> <template #default="{ row }">
<span>{{ row.beginTime }}</span> <span>{{ row.beginTime }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="结束时间" label="结束时间"
prop="finishTime" prop="finishTime"
align="center" align="center"
width="100" width="100"
> >
<template #default="{ row }"> <template #default="{ row }">
<span>{{ row.finishTime }}</span> <span>{{ row.finishTime }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="截止时间" label="截止时间"
prop="joinDeadline" prop="joinDeadline"
align="center" align="center"
width="100" width="100"
> >
<template #default="{ row }"> <template #default="{ row }">
<span>{{ row.joinDeadline }}</span> <span>{{ row.joinDeadline }}</span>
@ -111,8 +114,8 @@
<el-table-column label="活动分类" align="center" show-overflow-tooltip> <el-table-column label="活动分类" align="center" show-overflow-tooltip>
<template #default="{ row }"> {{ row.industryName }}</template> <template #default="{ row }"> {{ row.industryName }}</template>
</el-table-column> </el-table-column>
<el-table-column label="人数上限" prop="maxNumber" align="center" /> <el-table-column label="人数上限" prop="maxNumber" align="center"/>
<el-table-column label="报名费用" prop="amount" align="center" /> <el-table-column label="报名费用" prop="amount" align="center"/>
<!-- <el-table-column label="已报名" prop="join_count" align="center"> <!-- <el-table-column label="已报名" prop="join_count" align="center">
<template #default="{ row }"> <template #default="{ row }">
<router-link <router-link
@ -125,103 +128,116 @@
</router-link> </router-link>
</template> </template>
</el-table-column> --> </el-table-column> -->
<el-table-column label="站点" align="center"> <!-- <el-table-column label="站点" align="center">-->
<template #default="{ row }"> <!-- <template #default="{ row }">-->
{{ siteList.find((el) => el.id === row.tenantId)?.name ?? "无" }} <!-- {{ siteList.find((el) => el.id === row.tenantId)?.name ?? "无" }}-->
</template> <!-- </template>-->
</el-table-column> <!-- </el-table-column>-->
<el-table-column label="联系人" prop="contact" align="center" /> <el-table-column label="联系人" prop="contact" align="center"/>
<el-table-column label="手机号码" prop="contactMobile" align="center" /> <el-table-column label="手机号码" prop="contactMobile" align="center"/>
<el-table-column label="发布时间" align="center" width="100"> <el-table-column label="发布时间" align="center" width="100">
<template #default="{ row }"> <template #default="{ row }">
<span>{{ row.createTime }}</span> <span>{{ row.createTime }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="操作" label="操作"
align="center" align="center"
width="120" width="120"
class-name="small-padding fixed-width" class-name="small-padding fixed-width"
> >
<template #default="{ row }"> <template #default="{ row }">
<el-button <el-button
size="small" size="small"
type="text" type="text"
icon="notebook" icon="notebook"
@click="router.push(`./signUp?id=${row.id}`)" @click="router.push(`./signUp?id=${row.id}`)"
>报名名单</el-button >报名名单
</el-button
> >
<el-button <el-button
size="small" size="small"
type="text" type="text"
icon="edit" icon="edit"
@click="handleUpdate(row)" @click="handleUpdate(row)"
>编辑</el-button >编辑
</el-button
> >
<el-button <el-button
size="small" size="small"
type="text" type="text"
icon="delete" icon="delete"
@click="handleDelete(row)" @click="handleDelete(row)"
>删除</el-button >删除
</el-button
> >
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<pagination <pagination
v-show="total > 0" v-show="total > 0"
:total="total" :total="total"
v-model:page="queryParams.pageNum" v-model:page="queryParams.pageNum"
v-model:limit="queryParams.pageSize" v-model:limit="queryParams.pageSize"
@pagination="getList" @pagination="getList"
/> />
<!-- 添加或修改对话框 --> <!-- 添加或修改对话框 -->
<el-dialog :title="title" v-model="showEditDialog" width="55%"> <el-dialog :title="title" v-model="showEditDialog" width="55%" destroy-on-close>
<el-form ref="formRef" :model="form" :rules="rules" label-width="120px"> <el-form ref="formRef" :model="form" :rules="rules" label-width="120px">
<el-form-item label="所属站点" prop="tenantId"> <!-- <el-form-item label="所属站点" prop="tenantId">-->
<SiteOptions v-model="form.tenantId" :site-list="siteList" /> <!-- <SiteOptions v-model="form.tenantId" :site-list="siteList" />-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item label="活动名称:" prop="title"> <el-form-item label="活动名称:" prop="title">
<el-input v-model="form.title" placeholder="请输入活动名称" /> <el-input v-model="form.title" placeholder="请输入活动名称"/>
</el-form-item> </el-form-item>
<el-form-item label="联系人:" prop="contact"> <el-form-item label="联系人:" prop="contact">
<el-input v-model="form.contact" placeholder="请输入联系人" /> <el-input v-model="form.contact" placeholder="请输入联系人"/>
</el-form-item> </el-form-item>
<el-form-item label="手机号码:" prop="contactMobile"> <el-form-item label="手机号码:" prop="contactMobile">
<el-input <el-input
v-model="form.contactMobile" v-model="form.contactMobile"
placeholder="请输入手机号码" placeholder="请输入手机号码"
maxlength="11" maxlength="11"
/> />
</el-form-item> </el-form-item>
<el-form-item label="开始时间:" prop="beginTime"> <el-form-item label="开始时间:" prop="beginTime">
<el-date-picker <el-date-picker
value-format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
v-model="form.beginTime" v-model="form.beginTime"
type="datetime" type="datetime"
placeholder="选择开始时间" placeholder="选择开始时间"
> >
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="结束时间:" prop="finishTime"> <el-form-item label="结束时间:" prop="finishTime">
<el-date-picker <el-date-picker
value-format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
v-model="form.finishTime" v-model="form.finishTime"
type="datetime" type="datetime"
placeholder="选择结束时间" placeholder="选择结束时间"
> >
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="截止时间:" prop="joinDeadline"> <el-form-item label="截止时间:" prop="joinDeadline">
<el-date-picker <el-date-picker
value-format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
v-model="form.joinDeadline" v-model="form.joinDeadline"
type="datetime" type="datetime"
placeholder="选择截止时间" placeholder="选择截止时间"
> >
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<CityOptions v-model="form" ref="cityOptionsRef" /> <!-- 国家-->
<el-form-item
label="国家"
prop="country"
>
<el-input
v-model="form.country"
placeholder="请输入国家"
/>
</el-form-item>
<!-- <CityOptions v-model="form" ref="cityOptionsRef"/>-->
<!-- <el-form-item label="地点:" required> <!-- <el-form-item label="地点:" required>
<el-row type="flex" justify="space-between" :gutter="10"> <el-row type="flex" justify="space-between" :gutter="10">
<el-col :span="8"> <el-col :span="8">
@ -283,9 +299,9 @@
</el-row> </el-row>
</el-form-item> --> </el-form-item> -->
<el-form-item label="详细地址:" prop="address"> <el-form-item label="详细地址:" prop="address">
<el-input v-model="form.address" placeholder="请输入详细地址" /> <el-input v-model="form.address" placeholder="请输入详细地址"/>
</el-form-item> </el-form-item>
<FieldOptions v-model="form" ref="fieldOptionsRef" /> <FieldOptions v-model="form" ref="fieldOptionsRef"/>
<!-- <el-form-item label="活动分类:" required> <!-- <el-form-item label="活动分类:" required>
<el-row type="flex" justify="space-between"> <el-row type="flex" justify="space-between">
@ -347,29 +363,35 @@
<el-form-item label="通知人群:" prop="notifyCrowds"> <el-form-item label="通知人群:" prop="notifyCrowds">
<el-select v-model="form.notifyCrowds" multiple placeholder="请选择"> <el-select v-model="form.notifyCrowds" multiple placeholder="请选择">
<el-option label="企业" value="1"> </el-option> <el-option label="企业" value="1"></el-option>
<el-option label="专家" value="2"> </el-option> <el-option label="专家" value="2"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="报名人数上限:" prop="maxNumber"> <el-form-item label="报名人数上限:" prop="maxNumber">
<el-input <el-input
v-model.number="form.maxNumber" v-model.number="form.maxNumber"
placeholder="请输入报名人数" placeholder="请输入报名人数"
/> />
</el-form-item> </el-form-item>
<el-form-item label="宣传图:" prop="image"> <el-form-item label="宣传图:" prop="image">
<ImageUpload v-model="form.image" :isShowTip="false" :limit="1" /> <ImageUpload v-model="form.image" :isShowTip="false" :limit="1"/>
</el-form-item> </el-form-item>
<el-form-item label="活动简介:" prop="description"> <el-form-item label="活动简介:" prop="description">
<el-input <el-input
v-model="form.description" v-model="form.description"
placeholder="请输入活动简介" placeholder="请输入活动简介"
type="textarea" type="textarea"
:autosize="{ minRows: 2, maxRows: 4 }" :autosize="{ minRows: 2, maxRows: 4 }"
/> />
</el-form-item> </el-form-item>
<el-form-item label="活动介绍:" prop="content"> <el-form-item label="活动介绍:" prop="content">
<WangEditor v-model="form.content" minHeight="150px" /> <!-- <WangEditor v-model="form.content" minHeight="150px" />-->
<el-input
v-model="form.content"
placeholder="请输入活动介绍"
type="textarea"
:autosize="{ minRows: 6, maxRows: 8 }"
/>
</el-form-item> </el-form-item>
<el-form-item label="报名费用:" prop="amount"> <el-form-item label="报名费用:" prop="amount">
<el-input v-model.number="form.amount"> <el-input v-model.number="form.amount">
@ -386,32 +408,17 @@
</template> </template>
<script setup name="Active"> <script setup name="Active">
import SiteOptions from "@/views/components/SiteOptions"; import {activityAdd, activityDelete, activityDetail, activityEdit, activityList,} from "@/api/website/activity";
// import CityOptions from "../../../components/CityOptions"; import {tenantSelect} from "@/api/subPlatform/tenant";
import { import {cityList, districtList, industry, provinceList,} from "@/api/config";
activityList,
activityAdd,
activityDetail,
activityEdit,
activityDelete,
} from "@/api/website/activity";
import { tenantSelect } from "@/api/subPlatform/tenant";
import {
areaList,
industry,
identity,
provinceList,
cityList,
districtList,
} from "@/api/config";
import FieldOptions from "@/views/components/FieldOptions"; import FieldOptions from "@/views/components/FieldOptions";
// import { cloneDeep } from "lodash"; // import { cloneDeep } from "lodash";
import { reactive, toRefs } from "vue"; import {reactive, ref, toRefs} from "vue";
// import { constants } from "buffer"; // import { constants } from "buffer";
import { ElMessage, ElMessageBox } from "element-plus"; import {ElMessage, ElMessageBox} from "element-plus";
import WangEditor from "@/components/WangEditor/index.vue";
// import SiteOptions from "@/views/components/SiteOptions"; // import SiteOptions from "@/views/components/SiteOptions";
import { useRouter } from "vue-router"; import {useRouter} from "vue-router";
const router = useRouter(); const router = useRouter();
const dataList = ref([]); const dataList = ref([]);
const loading = ref(true); const loading = ref(true);
@ -453,15 +460,10 @@ const data = reactive({
// industrys: [], // industrys: [],
}, },
rules: { rules: {
title: [{ required: true, message: "活动名称不能为空", trigger: "blur" }], title: [{required: true, message: "活动名称不能为空", trigger: "blur"}],
contact: [{ required: true, message: "联系人不能为空", trigger: "blur" }], contact: [{required: true, message: "联系人不能为空", trigger: "blur"}],
contactMobile: [ contactMobile: [
{ required: true, message: "手机号码不能为空", trigger: "blur" }, {required: true, message: "手机号码不能为空", trigger: "blur"},
{
pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
message: "请输入正确的手机号码",
trigger: ["blur", "change"],
},
], ],
tenantId: [ tenantId: [
{ {
@ -471,18 +473,19 @@ const data = reactive({
}, },
], ],
beginTime: [ beginTime: [
{ required: true, message: "开始时间不能为空", trigger: "change" }, {required: true, message: "开始时间不能为空", trigger: "change"},
], ],
country: [{required: true, message: "请输入国家", trigger: "change"}],
finishTime: [ finishTime: [
{ required: true, message: "结束时间不能为空", trigger: "change" }, {required: true, message: "结束时间不能为空", trigger: "change"},
], ],
joinDeadline: [ joinDeadline: [
{ required: true, message: "截止时间不能为空", trigger: "change" }, {required: true, message: "截止时间不能为空", trigger: "change"},
], ],
province: [{ required: true, message: "请选择", trigger: "change" }], province: [{required: true, message: "请选择", trigger: "change"}],
city: [{ required: true, message: "请选择", trigger: "change" }], city: [{required: true, message: "请选择", trigger: "change"}],
district: [{ required: true, message: "请选择", trigger: "change" }], district: [{required: true, message: "请选择", trigger: "change"}],
address: [{ required: true, message: "详细地址不能为空", trigger: "blur" }], address: [{required: true, message: "详细地址不能为空", trigger: "blur"}],
industrys: [ industrys: [
{ {
type: "array", type: "array",
@ -500,17 +503,17 @@ const data = reactive({
}, },
], ],
maxNumber: [ maxNumber: [
{ required: true, message: "报名人数不能为空", trigger: "blur" }, {required: true, message: "报名人数不能为空", trigger: "blur"},
], ],
image: [{ required: true, message: "请上传宣传图", trigger: "blur" }], image: [{required: true, message: "请上传宣传图", trigger: "blur"}],
description: [ description: [
{ required: true, message: "活动简介不能为空", trigger: "blur" }, {required: true, message: "活动简介不能为空", trigger: "blur"},
], ],
content: [{ required: true, message: "活动介绍不能为空", trigger: "blur" }], content: [{required: true, message: "活动介绍不能为空", trigger: "blur"}],
amount: [{ required: true, message: "报名费用不能为空", trigger: "blur" }], amount: [{required: true, message: "报名费用不能为空", trigger: "blur"}],
}, },
}); });
const { queryParams, form, rules } = toRefs(data); const {queryParams, form, rules} = toRefs(data);
const resetQuery = () => { const resetQuery = () => {
if (queryFormRef.value) { if (queryFormRef.value) {
@ -565,17 +568,17 @@ const handleAdd = () => {
// 获取省列表 // 获取省列表
const getProvinceList = async () => { const getProvinceList = async () => {
const { data } = await provinceList(); const {data} = await provinceList();
provinceSelectList.value = data; provinceSelectList.value = data;
}; };
// 根据省id获取地级市列表 // 根据省id获取地级市列表
const getCityListByProvinceId = async (provinceId) => { const getCityListByProvinceId = async (provinceId) => {
const { data } = await cityList(provinceId); const {data} = await cityList(provinceId);
citySelectList.value = data; citySelectList.value = data;
}; };
// 根据市id获取县区列表 // 根据市id获取县区列表
const getAreaListByCityId = async (cityId) => { const getAreaListByCityId = async (cityId) => {
const { data } = await districtList(cityId); const {data} = await districtList(cityId);
districtSelectList.value = data; districtSelectList.value = data;
}; };
@ -599,18 +602,18 @@ const cityChange = () => {
const getFieldByParent = (id) => { const getFieldByParent = (id) => {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
industry({ parent_id: id }) industry({parent_id: id})
.then(({ code, msg, data }) => { .then(({code, msg, data}) => {
if (code == 200) { if (code == 200) {
resolve(data); resolve(data);
} else { } else {
ElMessage.error(msg); ElMessage.error(msg);
reject({ msg, code }); reject({msg, code});
} }
}) })
.catch((error) => { .catch((error) => {
reject(error); reject(error);
}); });
}); });
}; };
const field1Change = async (id) => { const field1Change = async (id) => {
@ -648,7 +651,7 @@ const handleUpdate = async (row) => {
}; };
// const siteOptionsRef = ref(); // const siteOptionsRef = ref();
const cityOptionsRef = ref(); // const cityOptionsRef = ref();
const fieldOptionsRef = ref(); const fieldOptionsRef = ref();
const submitForm = async () => { const submitForm = async () => {
// let notifys = 0; // let notifys = 0;
@ -656,11 +659,11 @@ const submitForm = async () => {
// formData.notifyCrowd = notifys; // formData.notifyCrowd = notifys;
// formData.industrys = [form.value.industrys.join("-")]; // formData.industrys = [form.value.industrys.join("-")];
// const siteOptionsValid = // const siteOptionsValid =
const cityOptionsValid = await cityOptionsRef.value.validateForm(); // const cityOptionsValid = await cityOptionsRef.value.validateForm();
const fieldOptionsValid = await fieldOptionsRef.value.validateForm(); const fieldOptionsValid = await fieldOptionsRef.value.validateForm();
const valid = await formRef.value.validate(); const valid = await formRef.value.validate();
form.value.notifyCrowd = form.value.notifyCrowds.join(","); form.value.notifyCrowd = form.value.notifyCrowds.join(",");
if (!valid || !cityOptionsValid || !fieldOptionsValid) { if (!valid || !fieldOptionsValid) {
console.log("校验未通过"); console.log("校验未通过");
return; return;
} }
@ -682,12 +685,13 @@ const submitForm = async () => {
/** 删除按钮操作 */ /** 删除按钮操作 */
const handleDelete = (row) => { const handleDelete = (row) => {
ElMessageBox.confirm(`是否确认删除名为${row.title}的数据项?`) ElMessageBox.confirm(`是否确认删除名为${row.title}的数据项?`)
.then(async () => { .then(async () => {
await activityDelete(row.id); await activityDelete(row.id);
getList(); getList();
ElMessage.success("删除成功"); ElMessage.success("删除成功");
}) })
.catch(() => {}); .catch(() => {
});
}; };
getList(); getList();