diff --git a/src/views/manage/activity/index.vue b/src/views/manage/activity/index.vue index 80f1801..64f3a28 100644 --- a/src/views/manage/activity/index.vue +++ b/src/views/manage/activity/index.vue @@ -92,10 +92,10 @@ @click="handleUpdate(scope.row)" >编辑 - 发布 - 撤销发布 { listdatatime.value = [{ activityTime: '', planContent: '' }]; dialog.title = '添加活动信息'; }; - +// 发布撤销发布 +const saveupdate = async (row?: ActivityVO, type) => { + const _id = row?.id || ids.value[0]; + const res = await getActivity(_id); + const arr = await activityprocess({ activityId: _id }); + Object.assign(form.value, res.data); + form.value.status = type == 1 ? 2 : 0; + const test = type == 1 ? '发布' : '撤销发布'; + const _ids = row?.activityName || ids.value; + await proxy?.$modal.confirm('是否确认' + test + '活动信息编号为' + _ids + '的数据项？').finally(() => (loading.value = false)); + await updateActivity(form.value).finally(() => (buttonLoading.value = false)); + proxy?.$modal.msgSuccess(test + '成功'); + await getList(); + // await updateActivity(form.value).finally(() => (buttonLoading.value = false)); +}; /** 修改按钮操作 */ const handleUpdate = async (row?: ActivityVO) => { reset(); @@ -446,7 +460,7 @@ const submitForm = () => { /** 删除按钮操作 */ const handleDelete = async (row?: ActivityVO) => { - const _ids = row?.id || ids.value; + const _ids = row?.activityName || ids.value; await proxy?.$modal.confirm('是否确认删除活动信息编号为"' + _ids + '"的数据项？').finally(() => (loading.value = false)); await delActivity(_ids); proxy?.$modal.msgSuccess('删除成功'); diff --git a/src/views/manage/hotel/index.vue b/src/views/manage/hotel/index.vue index fddf3d9..8d49a65 100644 --- a/src/views/manage/hotel/index.vue +++ b/src/views/manage/hotel/index.vue @@ -110,6 +110,7 @@ (loading.value = false)); await delHotel(_ids); proxy?.$modal.msgSuccess('删除成功'); @@ -431,5 +437,4 @@ onMounted(() => { getList(); }); - + diff --git a/src/views/manage/noteManage/index.vue b/src/views/manage/noteManage/index.vue index 55f16d0..a2db6f4 100644 --- a/src/views/manage/noteManage/index.vue +++ b/src/views/manage/noteManage/index.vue @@ -297,10 +297,14 @@ watch( */ const formatTag = (tagId: string | null) => { let tagString = ''; + let arrlist = tagId?.split(',').map(Number); for (let i = 0; i < sys_user_tagOptions.value.length; i++) { const element = sys_user_tagOptions.value[i]; - if (tagId?.includes(element.id)) { - tagString += ',' + element.title; + for (let j = 0; j < arrlist.length; j++) { + const conten = arrlist[j]; + if (conten == element.id) { + tagString += ',' + element.title; + } } } return tagString.substring(1); diff --git a/src/views/manage/banned/index.vue b/src/views/manage/report/index.vue similarity index 97% rename from src/views/manage/banned/index.vue rename to src/views/manage/report/index.vue index 39d853d..1ac7c0b 100644 --- a/src/views/manage/banned/index.vue +++ b/src/views/manage/report/index.vue @@ -77,8 +77,13 @@ - - + + + +