diff --git a/src/views/manage/activity/index.vue b/src/views/manage/activity/index.vue index 64f3a28..4ee001d 100644 --- a/src/views/manage/activity/index.vue +++ b/src/views/manage/activity/index.vue @@ -128,7 +128,12 @@ - 人 + 人
@@ -210,11 +215,42 @@ v-model:page="queryAnswerings.pageNum" v-model:limit="queryAnswerings.pageSize" :total="Answeringtotal" - @pagination="wendalist" + @pagination="wendalistid" /> - + + + + + + + + + + + + + + + + + + +
@@ -230,9 +266,14 @@ import { activityUsersList } from '@/api/manage/activity'; import { ActivityVO, ActivityQuery, ActivityForm } from '@/api/manage/activity/types'; -import { Search } from '@element-plus/icons-vue'; const { proxy } = getCurrentInstance() as ComponentInternalInstance; +const { dy_banned_handling_method, sys_user_sex, dy_banned_ban_reason, dy_user_ban_days } = toRefs( + proxy?.useDict('dy_banned_handling_method', 'sys_user_sex', 'dy_banned_ban_reason', 'dy_user_ban_days') +); + +import { Search } from '@element-plus/icons-vue'; + const activityList = ref([]); const buttonLoading = ref(false); const loading = ref(true); @@ -243,7 +284,7 @@ const multiple = ref(true); const total = ref(0); const Answeringtotal = ref(0); const activityUserstotal = ref(0); - +const queryUsersactivityId = ref(''); const listdatatime = ref([{ activityTime: '', planContent: '' }]); const Answeringlist = ref([]); const activityUsersListarr = ref([]); @@ -487,7 +528,11 @@ const dellistdata = (index) => { }; //问答弹窗 const wendalist = async (row) => { - queryAnswerings.activityId = row.id; + queryUsersactivityId.value = row.id; + wendalistid(queryUsersactivityId.value); +}; +const wendalistid = async () => { + queryAnswerings.activityId = queryUsersactivityId.value; const res = await activityAnsweringlist(queryAnswerings); console.log(res); Answeringlist.value = res.rows; @@ -496,7 +541,11 @@ const wendalist = async (row) => { }; //报名人数弹窗 const registrationCountnum = async (row) => { - queryUsers.activityId = row.id; + queryUsersactivityId.value = row.id; + registrationCountnumlist(queryUsersactivityId.value); +}; +const registrationCountnumlist = async () => { + queryUsers.activityId = queryUsersactivityId.value; const res = await activityUsersList(queryUsers); activityUsersListarr.value = res.rows; activityUserstotal.value = res.total; diff --git a/src/views/manage/noteManage/index.vue b/src/views/manage/noteManage/index.vue index a2db6f4..a988f86 100644 --- a/src/views/manage/noteManage/index.vue +++ b/src/views/manage/noteManage/index.vue @@ -96,9 +96,14 @@ - + @@ -150,7 +160,7 @@
取 消 - 提 交 + 提 交
@@ -158,8 +168,8 @@
{{ form.title }}
-
{{ formatTag(form.tagId) }}
-
{{ formatlocation(form.location) }}
+
{{formatTag(form.tagId) }}
+
{{formatlocation(form.location) }}
 @@ -181,7 +191,7 @@ import { listNotebook, getNotebook, delNotebook, addNotebook, updateNotebook, ta import { NotebookVO, NotebookQuery, NotebookForm } from '@/api/manage/notebook/types'; import { hotelall } from '@/api/manage/route'; import { reactive } from 'vue'; -import { string } from "vue-types"; +import { string } from 'vue-types'; const { proxy } = getCurrentInstance() as ComponentInternalInstance; const notebookList = ref([]); @@ -223,7 +233,7 @@ const props = defineProps({ }); const addressvalue = ref(''); -const statusoptions = ref([ +const statusoptions = ref([ { label: '已发布', value: 3 }, { label: '审核中', value: 2 }, { label: '未发布', value: 0 }, @@ -398,12 +408,13 @@ const handleUpdate = async (row?: NotebookVO) => { const fabudata = async (row?: NotebookVO) => { const _id = row?.id || ids.value[0]; + const _idtitle = row?.title ; const res = await getNotebook(_id); Object.assign(form.value, res.data); - form.value.status = row.status == 2 ? 0 : 2; - const text = row.status == 2 ? '撤销发布' : '发布'; - const textmessage = row.status == 2 ? '撤销发布成功' : '发布成功'; - await proxy?.$modal.confirm('是否确认' + text + '笔记编号为' + _id + '"的数据项？').finally(() => (loading.value = false)); + form.value.status = row.status == 3 ? 0 : 2; + const text = row.status == 3 ? '撤销发布' : '确认发布'; + const textmessage = row.status == 3 ? '撤销发布成功' : '发布成功'; + await proxy?.$modal.confirm('是否' + text + '笔记标题为' + _idtitle + '"的数据项？').finally(() => (loading.value = false)); await updateNotebook(form.value).finally(() => (buttonLoading.value = false)); proxy?.$modal.msgSuccess(`${textmessage}`); await getList(); @@ -415,13 +426,13 @@ const contenttext = async (row?: NotebookVO) => { concentdialog.visible = true; }; /** 提交按钮 */ -const submitForm = async(type) => { +const submitForm = async (type) => { form.value.tagId = tagvalue.value.join(','); form.value.location = addressvalue.value.join(','); form.value.cover = ''; form.value.status = Number(type); form.value.content = form.value.content == '


' ? '' : form.value.content; - if(type == 1){ + if (type == 1) { buttonLoading.value = true; if (form.value.id) { await updateNotebook(form.value).finally(() => (buttonLoading.value = false)); @@ -432,7 +443,7 @@ const submitForm = async(type) => { proxy?.$modal.msgSuccess('操作成功'); await getList(); - }else{ + } else { notebookFormRef.value?.validate(async (valid: boolean) => { if (valid) { buttonLoading.value = true; @@ -449,20 +460,21 @@ const submitForm = async(type) => { } }); } - - }; /** 删除按钮操作 */ const handleDelete = async (row?: NotebookVO) => { const _ids = row?.id || ids.value; - await proxy?.$modal.confirm('是否确认删除笔记编号为"' + _ids + '"的数据项？').finally(() => (loading.value = false)); + const _idsname = row?.title; + await proxy?.$modal.confirm('是否确认删除笔记标题为"' + _idsname + '"的数据项？').finally(() => (loading.value = false)); await delNotebook(_ids); proxy?.$modal.msgSuccess('删除成功'); await getList(); }; // 预览 const yulansave = () => { + form.value.tagId = tagvalue.value.join(','); + form.value.location = addressvalue.value.join(','); concentdialog.visible = true; }; diff --git a/src/views/manage/route/index.vue b/src/views/manage/route/index.vue index d61a289..4467ef2 100644 --- a/src/views/manage/route/index.vue +++ b/src/views/manage/route/index.vue @@ -91,10 +91,10 @@ @click="handleDelete(scope.row)" >删除 - 发布 - 撤销发布 @@ -234,7 +234,7 @@
线路标题：{{ form.title }}
-
路线标签：{{ formatTag(tagvalue) }}
+
路线标签：{{ formatTag(form.tagId) }}
涉及的行政区域：{{ addressdata(form.region) }}
@@ -286,6 +286,7 @@ import { RouteVO, RouteQuery, RouteForm } from '@/api/manage/route/types'; import { Plus } from '@element-plus/icons-vue'; import { contentall, tagall } from '@/api/manage/notebook'; import { ElMessage } from 'element-plus'; +import { updateActivity } from '@/api/manage/activity'; const { proxy } = getCurrentInstance() as ComponentInternalInstance; const autoTableHeight = ref(750); const RouteList = ref([]); @@ -666,16 +667,16 @@ const yulanform = () => { const yulanquxiao = () => { yulandialog.visible = false; }; -const savelistrow = async (row) => { - reset(); - // tagvalue.value=[] +const savelistrow = async (row, type) => { const _id = row?.id || ids.value[0]; const res = await getRoute(_id); Object.assign(form.value, res.data); - form.value.status = Number(res.data.status == 3 ? 0 : 2); - console.log(form.value); + form.value.status = type == 1 ? 2 : 0; + const test = type == 1 ? '发布' : '撤销发布'; + const _ids = row?.title || ids.value; + await proxy?.$modal.confirm('是否确认' + test + '行程标题为' + _ids + '的数据项？').finally(() => (loading.value = false)); await updateRoute(form.value).finally(() => (buttonLoading.value = false)); - proxy?.$modal.msgSuccess('操作成功'); + proxy?.$modal.msgSuccess(test + '成功'); await getList(); }; //查看详情