From 08d5592659a0078017caf876b22f14e2f37bda80 Mon Sep 17 00:00:00 2001
From: BabyBoy <2019108827@qq.com>
Date: Tue, 2 Sep 2025 17:35:30 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=97=E9=93=BA=EF=BC=8C=E8=A7=92=E8=89=B2?=
 =?UTF-8?q?=EF=BC=8C=E7=94=A8=E6=88=B7=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/report/index.ts            |  2 +-
 src/api/set/messageindex.ts        |  2 +-
 src/api/ums/feedback.js            |  2 +-
 src/directive/permission/index.ts  |  2 ++
 src/views/system/article/index.vue | 14 ++++++++++++--
 src/views/system/tenant/index.vue  | 10 ++--------
 src/views/system/user/index.vue    |  4 ++--
 src/views/ums/feedback/index.vue   | 26 +++++++++++++++++---------
 8 files changed, 38 insertions(+), 24 deletions(-)

diff --git a/src/api/report/index.ts b/src/api/report/index.ts
index 1f88918..7dc2a9c 100644
--- a/src/api/report/index.ts
+++ b/src/api/report/index.ts
@@ -11,7 +11,7 @@ import request from '@/utils/request';
 
 export const listCategory = (query?: reQueryOV): AxiosPromise<[]> => {
   return request({
-    url: '/ums/feedback/list',
+    url: '/ums/feedback/page',
     method: 'post',
     data: query
   });
diff --git a/src/api/set/messageindex.ts b/src/api/set/messageindex.ts
index e22c2cb..3827dce 100644
--- a/src/api/set/messageindex.ts
+++ b/src/api/set/messageindex.ts
@@ -5,7 +5,7 @@ import request from '@/utils/request';
 
 export const listlist = (query?: LeaveQuery): AxiosPromise => {
   return request({
-    url: '/system/message/list',
+    url: '/system/message/page',
     method: 'get',
     params: query
   });
diff --git a/src/api/ums/feedback.js b/src/api/ums/feedback.js
index 45561ba..210db6e 100644
--- a/src/api/ums/feedback.js
+++ b/src/api/ums/feedback.js
@@ -18,7 +18,7 @@ export function changeHandleStatus(data) {
 
 export function listFeedbacks(query, pageReq) {
   return request({
-    url: '/ums/feedback/list',
+    url: '/ums/feedback/page',
     method: 'post',
     data: query,
     params: pageReq
diff --git a/src/directive/permission/index.ts b/src/directive/permission/index.ts
index c66da22..b7fdf6a 100644
--- a/src/directive/permission/index.ts
+++ b/src/directive/permission/index.ts
@@ -1,5 +1,7 @@
 import { Directive, DirectiveBinding } from 'vue';
+
 import { useUserStore } from '@/store/modules/user';
+
 /**
  * 操作权限处理
  */
diff --git a/src/views/system/article/index.vue b/src/views/system/article/index.vue
index 56b4c18..12e88ac 100644
--- a/src/views/system/article/index.vue
+++ b/src/views/system/article/index.vue
@@ -106,7 +106,10 @@
             </el-form-item>
 
             <el-form-item label="文章状态" prop="status">
-              <DictRadio v-model="form.status" radioData="cont_article_status" :show-all="'all'" />
+              <!-- <DictRadio v-model="form.status" radioData="cont_article_status" :show-all="'all'" /> -->
+              <el-select v-model="form.status" placeholder="请选择文章状态" style="width: 100%">
+                <el-option v-for="item in mingList" :key="item.value" :label="item.label" :value="item.value" />
+              </el-select>
             </el-form-item>
           </el-form>
           <template #footer>
@@ -153,7 +156,7 @@ const initFormData: PostForm = {
   sort: undefined,
   categoryId: undefined,
   content: '',
-  status: ''
+  status: undefined
 };
 
 const data = reactive<PageData<PostForm, PostQuery>>({
@@ -193,6 +196,7 @@ const filterNode = (value: string, data: any) => {
   return data.label.indexOf(value) !== -1;
 };
 const enterpriseList = ref([]); // 种类
+const mingList = ref([]);
 const getByKey = async () => {
   const value1 = await getDictionaryByKey('cont_article_type');
   console.log(value1);
@@ -200,6 +204,12 @@ const getByKey = async () => {
     item.value = Number(item.value);
   });
   enterpriseList.value = value1;
+  const value2 = await getDictionaryByKey('cont_article_status');
+  value2.forEach((item: any) => {
+    item.value = Number(item.value);
+  });
+  mingList.value = value2;
+  console.log(value2);
 };
 /** 根据名称筛选部门树 */
 watchEffect(
diff --git a/src/views/system/tenant/index.vue b/src/views/system/tenant/index.vue
index c28ec95..d147efa 100644
--- a/src/views/system/tenant/index.vue
+++ b/src/views/system/tenant/index.vue
@@ -233,13 +233,7 @@
             </el-col>
             <el-col :span="8">
               <el-form-item label="营业执照有效期:" prop="expireTime">
-                <el-date-picker
-                  v-model="form.expireTime"
-                  clearable
-                  type="datetime"
-                  value-format="YYYY-MM-DD HH:mm:ss"
-                  placeholder="请选择营业执照有效期"
-                >
+                <el-date-picker v-model="form.expireTime" clearable type="date" value-format="YYYY-MM-DD" placeholder="请选择营业执照有效期">
                 </el-date-picker>
               </el-form-item>
             </el-col>
@@ -374,7 +368,7 @@
           <el-row :gutter="20">
             <el-col :span="8">
               <el-form-item label="签约日期" prop="signDate">
-                <el-date-picker v-model="form.signDate" type="datetime" clearable value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择签约日期" />
+                <el-date-picker v-model="form.signDate" type="date" clearable value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择签约日期" />
               </el-form-item>
             </el-col>
             <el-col :span="8">
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index f3ca5e8..c91b6ed 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -247,8 +247,8 @@
           <el-col :span="28">
             <el-form-item label="绑定会员" prop="syncMemberFlag">
               <el-radio-group v-model="form.syncMemberFlag">
-                <el-radio :label="1">是</el-radio>
-                <el-radio :label="0">否</el-radio>
+                <el-radio :label="0">是</el-radio>
+                <el-radio :label="1">否</el-radio>
               </el-radio-group>
             </el-form-item>
           </el-col>
diff --git a/src/views/ums/feedback/index.vue b/src/views/ums/feedback/index.vue
index be021d4..9f486a6 100644
--- a/src/views/ums/feedback/index.vue
+++ b/src/views/ums/feedback/index.vue
@@ -57,7 +57,7 @@
         <el-table-column label="处理状态/时间" align="center">
           <template v-slot="scope">
             <div v-if="scope.row.handleStatus === 1">已处理</div>
-            <el-switch v-else v-model="scope.row.handleStatus" active-value="1" inactive-value="0" @change="changeStatus(scope.row)" />
+            <el-button v-else type="button" @click="handleStatusChange(scope.row)">点击处理</el-button>
             <div>{{ scope.row.handleTime ? parseTime(scope.row.handleTime) : '' }}</div>
           </template>
         </el-table-column>
@@ -68,7 +68,7 @@
           </template>
         </el-table-column>
       </el-table>
-      <pagination :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+      <pagination :total="total" v-model:page="queryParams.current" v-model:limit="queryParams.size" @pagination="getList" />
     </el-card>
     <el-dialog title="修改备注" v-model="remarkModal.visible" width="30%" append-to-body>
       <el-input type="textarea" :rows="3" placeholder="请输入内容" v-model="remarkModal.remark" />
@@ -165,13 +165,13 @@ export default {
     /** 查询会员信息列表 */
     getList() {
       this.loading = true;
-      const { current: pageNum, size: pageSize } = this.queryParams;
-      let query = { ...this.queryParams, pageNum: undefined, pageSize: undefined };
-      const pageReq = { current: pageNum - 1, size: pageSize };
-      if (!this.dateRange || this.dateRange.length > 0) {
-        query = { ...this.addDateRange2(query, this.dateRange) };
-      }
-      listFeedbacks(query, pageReq).then((response) => {
+      // const { current: pageNum, size: pageSize } = this.queryParams;
+      // let query = { ...this.queryParams, pageNum: undefined, pageSize: undefined };
+      // const pageReq = { current: pageNum - 1, size: pageSize };
+      // if (!this.dateRange || this.dateRange.length > 0) {
+      //   query = { ...this.addDateRange2(query, this.dateRange) };
+      // }
+      listFeedbacks(this.queryParams).then((response) => {
         const { records, total } = response.data || {};
         records.forEach((it) => {
           if (it.images) {
@@ -201,6 +201,14 @@ export default {
       this.single = selection.length !== 1;
       this.multiple = !selection.length;
     },
+    // 处理状态变更（新增此方法）
+    handleStatusChange(row) {
+      // 使用nextTick确保是用户主动操作触发的变更
+      this.$nextTick(() => {
+        this.changeStatus(row);
+      });
+    },
+
     // 更改账户状态
     changeStatus(row) {
       const data = {