diff --git a/src/views/manage/mkJigsaw/index.vue b/src/views/manage/mkJigsaw/index.vue
index 1072676..7c3a7e5 100644
--- a/src/views/manage/mkJigsaw/index.vue
+++ b/src/views/manage/mkJigsaw/index.vue
@@ -474,6 +474,8 @@ const handleSelectionChange = (selection: MkJigsawVO[]) => {
/** 新增按钮操作 */
const handleAdd = () => {
reset();
+ getlistVendor(); //供应商列表
+ getProductCategoryList(); //商品类别列表
dialog.visible = true;
goodsdata.value = [];
value2.value = [];
diff --git a/src/views/manage/noteManage/index.vue b/src/views/manage/noteManage/index.vue
index b2b3655..3f8e16b 100644
--- a/src/views/manage/noteManage/index.vue
+++ b/src/views/manage/noteManage/index.vue
@@ -85,31 +85,34 @@
-
+ 编辑
-
+ 发布
-
+ 撤销发布
-
-
-
-
+
+
+
+ 删除
+ >
+
+
@@ -382,6 +385,9 @@ const handleSelectionChange = (selection: NotebookVO[]) => {
/** 新增按钮操作 */
const handleAdd = () => {
reset();
+ getTag(); //标签库
+ getContent();
+
dialog.visible = true;
tagvalue.value = '';
addressvalue.value = '';
diff --git a/src/views/manage/report/index.vue b/src/views/manage/report/index.vue
index 2ed3533..7ae849b 100644
--- a/src/views/manage/report/index.vue
+++ b/src/views/manage/report/index.vue
@@ -45,17 +45,17 @@
- {{ scope.row.contentName }}
+ {{ scope.row.contentName }}
- {{ scope.row.contentName }}
+ {{ scope.row.contentName }}
- {{ scope.row.contentName }}
+ {{ scope.row.contentName }}
@@ -71,12 +71,12 @@
-
+
-
+
禁言
封禁
@@ -89,15 +89,17 @@
已处理
-
+
- 封禁
+ 封禁
删除笔记
@@ -106,7 +108,7 @@
v-hasPermi="['manage:report:remove']"
link
type="primary"
- :disabled="scope.row.status == 1"
+ :disabled="scope.row.handlingStatus == 1"
@click="handleDelete(scope.row)"
>删除活动
@@ -115,7 +117,7 @@
v-hasPermi="['manage:report:remove']"
link
type="primary"
- :disabled="scope.row.status == 1"
+ :disabled="scope.row.handlingStatus == 1"
@click="handleDelete(scope.row)"
>删除评论
@@ -128,13 +130,13 @@
-
+
-
-
+
+
禁言
封禁
@@ -223,13 +225,13 @@ const data = reactive>({
id: [{ required: true, message: '唯一标识ID不能为空', trigger: 'blur' }],
contentId: [{ required: true, message: '被举报内容id不能为空', trigger: 'blur' }],
reportUserId: [{ required: true, message: '被举报用户ID不能为空', trigger: 'blur' }],
- reportReason: [{ required: true, message: '举报理由不能为空', trigger: 'blur' }],
+ reason: [{ required: true, message: '封禁理由不能为空', trigger: 'blur' }],
reportDetails: [{ required: true, message: '举报详细信息不能为空', trigger: 'blur' }],
informerUserId: [{ required: true, message: '举报人id不能为空', trigger: 'blur' }],
banReason: [{ required: true, message: '封禁理由不能为空', trigger: 'blur' }],
banDays: [{ required: true, message: '封禁天数不能为空', trigger: 'blur' }],
handlingMethod: [{ required: true, message: '处理方式(0=未处理,1=已下架)不能为空', trigger: 'change' }],
- handlingStatus: [{ required: true, message: '状态(0=已发布,1=已下架)不能为空', trigger: 'change' }]
+ status: [{ required: true, message: '处理方式不能为空', trigger: 'change' }]
}
});
@@ -290,22 +292,23 @@ const handleAdd = () => {
const handleUpdate = async (row?: BannedVO) => {
reset();
const _id = row?.id || ids.value[0];
- const res = await getBanned(_id);
- Object.assign(form.value, res.data);
+ // const res = await getBanned(_id);
+ // Object.assign(form.value, res.data);
dialog.visible = true;
- dialog.title = `封禁【${row.nickname}】`;
+ dialog.title = `封禁【${row.nickName}】`;
};
/** 提交按钮 */
const submitForm = () => {
bannedFormRef.value?.validate(async (valid: boolean) => {
+ const arr = {
+ ...form.value,
+ type: queryParams.value.type,
+ message: 0
+ }
if (valid) {
buttonLoading.value = true;
- if (form.value.id) {
- await updateBanned(form.value).finally(() => (buttonLoading.value = false));
- } else {
- await addBanned(form.value).finally(() => (buttonLoading.value = false));
- }
+ await updatemanage(form.value).finally(() => (buttonLoading.value = false));
proxy?.$modal.msgSuccess('操作成功');
dialog.visible = false;
await getList();
@@ -320,7 +323,8 @@ const handleDelete = async (row?: BannedVO) => {
const arr = {
id: row?.contentId,
type: queryParams.value.type,
- handlingStatus: 1
+ handlingStatus: 1,
+ message: 1
};
const text = queryParams.value.type == 1 ? '笔记名称为“' : queryParams.value.type == 2 ? '活动名称为“' : '评论内容为“';
await proxy?.$modal.confirm('是否确认删除' + text + _idsname + '"的数据项？').finally(() => (loading.value = false));
diff --git a/src/views/manage/route/index.vue b/src/views/manage/route/index.vue
index 31fe9b5..949676e 100644
--- a/src/views/manage/route/index.vue
+++ b/src/views/manage/route/index.vue
@@ -507,6 +507,9 @@ const handleSelectionChange = (selection: RouteVO[]) => {
/** 新增按钮操作 */
const handleAdd = () => {
reset();
+ getContent();
+ getTag();
+ gethotelall();
dialog.visible = true;
dialog.title = '添加路线';
bookrouteDetailsList.value = [];
@@ -622,7 +625,7 @@ const getTag = async () => {
sys_user_tagOptions.value = res; //标签库
};
const gethotelall = async () => {
- const res = await hotelall({ status: 1 });
+ const res = await hotelall({ status: 2 });
sys_user_hotelall.value = res;
};