From 7ddd242332f303e839bd1609ab4c606b07cbb20e Mon Sep 17 00:00:00 2001
From: lcc <805383944@qq.com>
Date: Thu, 10 Jul 2025 00:09:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=A1=A5=E8=B4=B4=E5=AE=A1?=
 =?UTF-8?q?=E6=A0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../user/components/user-search.vue           |   6 +-
 admin/src/views/organization/user/index.vue   | 378 +++++++++---------
 admin/src/views/receiver/subsidy/index.vue    |   4 +-
 3 files changed, 192 insertions(+), 196 deletions(-)

diff --git a/admin/src/views/organization/user/components/user-search.vue b/admin/src/views/organization/user/components/user-search.vue
index f36b427..868791c 100644
--- a/admin/src/views/organization/user/components/user-search.vue
+++ b/admin/src/views/organization/user/components/user-search.vue
@@ -19,11 +19,7 @@
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 12, md: 12 } : { span: 12 }">
         <el-form-item label="机构团队">
-          <el-select
-            value=""
-            v-model="where.teamId"
-            clearable
-          >
+          <el-select value="" v-model="where.teamId" clearable>
             <el-option
               v-for="item in teamList"
               :value="item.id"
diff --git a/admin/src/views/organization/user/index.vue b/admin/src/views/organization/user/index.vue
index 087e4dd..a2843ce 100644
--- a/admin/src/views/organization/user/index.vue
+++ b/admin/src/views/organization/user/index.vue
@@ -90,199 +90,199 @@
 </template>
 
 <script>
-import UserImport from './components/user-import.vue';
-import UserSearch from './components/user-search.vue';
-import UserEdit from './components/user-edit.vue';
-import {
-  pageUsers,
-  removeUser,
-  removeUsers,
-  updateUserStatus
-} from '@/api/organization/user';
+  import UserImport from './components/user-import.vue';
+  import UserSearch from './components/user-search.vue';
+  import UserEdit from './components/user-edit.vue';
+  import {
+    pageUsers,
+    removeUser,
+    removeUsers,
+    updateUserStatus
+  } from '@/api/organization/user';
 
-export default {
-  name: 'SystemUser',
-  components: {
-    UserEdit,
-    UserImport,
-    UserSearch
-  },
-  data() {
-    return {
-      // 表格列配置
-      columns: [
-        {
-          columnKey: 'selection',
-          type: 'selection',
-          width: 50,
-          align: 'center',
-          fixed: 'left'
-        },
-        {
-          prop: 'userCode',
-          label: '工号',
-          width: 200,
-          align: 'center',
-          showOverflowTooltip: true,
-          fixed: 'left'
-        },
-        {
-          prop: 'username',
-          label: '姓名',
-          align: 'center',
-          showOverflowTooltip: true,
-          width: 120
-        },
-        {
-          prop: 'mobile',
-          label: '手机号',
-          align: 'center',
-          showOverflowTooltip: true,
-          width: 120
-        },
-        {
-          prop: 'centerNumber',
-          label: '中心',
-          align: 'center',
-          width: 120,
-          resizable: false,
-          showOverflowTooltip: true
-        },
-        {
-          prop: 'orgTeamName',
-          label: '机构团队',
-          align: 'center',
-          width: 80,
-          resizable: false,
-          showOverflowTooltip: true
-        },
-        {
-          prop: 'cityName',
-          label: '归属城市',
-          align: 'center',
-          width: 100,
-          resizable: false,
-          showOverflowTooltip: true
-        },
-        {
-          prop: 'typeCn',
-          label: '用户角色',
-          align: 'center',
-          width: 100,
-          resizable: false,
-          showOverflowTooltip: true
-        },
-        {
-          prop: 'status',
-          label: '状态',
-          align: 'center',
-          sortable: 'custom',
-          width: 80,
-          resizable: false,
-          slot: 'status',
-          showOverflowTooltip: true
-        },
-        {
-          prop: 'updateTime',
-          label: '更新时间',
-          sortable: 'updateTime',
-          showOverflowTooltip: true,
-          width: 180,
-          align: 'center',
-          formatter: (_row, _column, cellValue) => {
-            return this.$util.toDateString(cellValue);
+  export default {
+    name: 'SystemUser',
+    components: {
+      UserEdit,
+      UserImport,
+      UserSearch
+    },
+    data() {
+      return {
+        // 表格列配置
+        columns: [
+          {
+            columnKey: 'selection',
+            type: 'selection',
+            width: 50,
+            align: 'center',
+            fixed: 'left'
+          },
+          {
+            prop: 'userCode',
+            label: '工号',
+            width: 200,
+            align: 'center',
+            showOverflowTooltip: true,
+            fixed: 'left'
+          },
+          {
+            prop: 'username',
+            label: '姓名',
+            align: 'center',
+            showOverflowTooltip: true,
+            width: 120
+          },
+          {
+            prop: 'mobile',
+            label: '手机号',
+            align: 'center',
+            showOverflowTooltip: true,
+            width: 120
+          },
+          {
+            prop: 'centerNumber',
+            label: '中心',
+            align: 'center',
+            width: 120,
+            resizable: false,
+            showOverflowTooltip: true
+          },
+          {
+            prop: 'orgTeamName',
+            label: '机构团队',
+            align: 'center',
+            width: 80,
+            resizable: false,
+            showOverflowTooltip: true
+          },
+          {
+            prop: 'cityName',
+            label: '归属城市',
+            align: 'center',
+            width: 100,
+            resizable: false,
+            showOverflowTooltip: true
+          },
+          {
+            prop: 'typeCn',
+            label: '用户角色',
+            align: 'center',
+            width: 100,
+            resizable: false,
+            showOverflowTooltip: true
+          },
+          {
+            prop: 'status',
+            label: '状态',
+            align: 'center',
+            sortable: 'custom',
+            width: 80,
+            resizable: false,
+            slot: 'status',
+            showOverflowTooltip: true
+          },
+          {
+            prop: 'updateTime',
+            label: '更新时间',
+            sortable: 'updateTime',
+            showOverflowTooltip: true,
+            width: 180,
+            align: 'center',
+            formatter: (_row, _column, cellValue) => {
+              return this.$util.toDateString(cellValue);
+            }
+          },
+          {
+            columnKey: 'action',
+            label: '操作',
+            minWidth: 180,
+            align: 'center',
+            resizable: false,
+            slot: 'action',
+            showOverflowTooltip: true
           }
-        },
-        {
-          columnKey: 'action',
-          label: '操作',
-          minWidth: 180,
-          align: 'center',
-          resizable: false,
-          slot: 'action',
-          showOverflowTooltip: true
+        ],
+        // 表格选中数据
+        selection: [],
+        // 当前编辑数据
+        current: null,
+        // 是否显示编辑弹窗
+        showEdit: false,
+        // 是否显示导入弹窗
+        showImport: false
+      };
+    },
+    methods: {
+      /* 表格数据源 */
+      datasource({ page, limit, where, order }) {
+        return pageUsers({ ...where, ...order, page, limit });
+      },
+      /* 刷新表格 */
+      reload(where) {
+        this.$refs.table.reload({ page: 1, where: where });
+      },
+      /* 打开编辑弹窗 */
+      openEdit(row) {
+        this.current = row;
+        this.showEdit = true;
+      },
+      /* 打开导入弹窗 */
+      openImport() {
+        this.showImport = true;
+      },
+      /* 删除 */
+      remove(row) {
+        const loading = this.$loading({ lock: true });
+        removeUser(row.id)
+          .then((msg) => {
+            loading.close();
+            this.$message.success(msg);
+            this.reload();
+          })
+          .catch((e) => {
+            loading.close();
+            this.$message.error(e.message);
+          });
+      },
+      /* 批量删除 */
+      removeBatch() {
+        if (!this.selection.length) {
+          this.$message.error('请至少选择一条数据');
+          return;
         }
-      ],
-      // 表格选中数据
-      selection: [],
-      // 当前编辑数据
-      current: null,
-      // 是否显示编辑弹窗
-      showEdit: false,
-      // 是否显示导入弹窗
-      showImport: false
-    };
-  },
-  methods: {
-    /* 表格数据源 */
-    datasource({ page, limit, where, order }) {
-      return pageUsers({ ...where, ...order, page, limit });
-    },
-    /* 刷新表格 */
-    reload(where) {
-      this.$refs.table.reload({ page: 1, where: where });
-    },
-    /* 打开编辑弹窗 */
-    openEdit(row) {
-      this.current = row;
-      this.showEdit = true;
-    },
-    /* 打开导入弹窗 */
-    openImport() {
-      this.showImport = true;
-    },
-    /* 删除 */
-    remove(row) {
-      const loading = this.$loading({ lock: true });
-      removeUser(row.id)
-        .then((msg) => {
-          loading.close();
-          this.$message.success(msg);
-          this.reload();
+        this.$confirm('确定要删除选中的用户吗?', '提示', {
+          type: 'warning'
         })
-        .catch((e) => {
-          loading.close();
-          this.$message.error(e.message);
-        });
-    },
-    /* 批量删除 */
-    removeBatch() {
-      if (!this.selection.length) {
-        this.$message.error('请至少选择一条数据');
-        return;
+          .then(() => {
+            const loading = this.$loading({ lock: true });
+            removeUsers(this.selection.map((d) => d.id))
+              .then((msg) => {
+                loading.close();
+                this.$message.success(msg);
+                this.reload();
+              })
+              .catch((e) => {
+                loading.close();
+                this.$message.error(e.message);
+              });
+          })
+          .catch(() => {});
+      },
+      /* 更改状态 */
+      editStatus(row) {
+        const loading = this.$loading({ lock: true });
+        updateUserStatus(row.id, row.status)
+          .then((msg) => {
+            loading.close();
+            this.$message.success(msg);
+          })
+          .catch((e) => {
+            loading.close();
+            row.status = !row.status ? 1 : 0;
+            this.$message.error(e.message);
+          });
       }
-      this.$confirm('确定要删除选中的用户吗?', '提示', {
-        type: 'warning'
-      })
-        .then(() => {
-          const loading = this.$loading({ lock: true });
-          removeUsers(this.selection.map((d) => d.id))
-            .then((msg) => {
-              loading.close();
-              this.$message.success(msg);
-              this.reload();
-            })
-            .catch((e) => {
-              loading.close();
-              this.$message.error(e.message);
-            });
-        })
-        .catch(() => {});
-    },
-    /* 更改状态 */
-    editStatus(row) {
-      const loading = this.$loading({ lock: true });
-      updateUserStatus(row.id, row.status)
-        .then((msg) => {
-          loading.close();
-          this.$message.success(msg);
-        })
-        .catch((e) => {
-          loading.close();
-          row.status = !row.status ? 1 : 0;
-          this.$message.error(e.message);
-        });
     }
-  }
-};
+  };
 </script>
diff --git a/admin/src/views/receiver/subsidy/index.vue b/admin/src/views/receiver/subsidy/index.vue
index 739a2a6..18670e4 100644
--- a/admin/src/views/receiver/subsidy/index.vue
+++ b/admin/src/views/receiver/subsidy/index.vue
@@ -263,7 +263,7 @@
         })
           .then(() => {
             const loading = this.$loading({ lock: true });
-            checkSubsidy({ id: row.id, status: status })
+            checkSubsidy({ id: row.id, status: 1 })
               .then((msg) => {
                 loading.close();
                 this.$message.success(msg);
@@ -284,7 +284,7 @@
         const loading = this.$loading({ lock: true });
         checkSubsidy({
           id: this.current.id,
-          status: status,
+          status: 0,
           reason: this.reason
         })
           .then((msg) => {