From dd43c95c5a020c1a828263cc5944ed6fb644b65d Mon Sep 17 00:00:00 2001
From: 马宇豪 <978517621@qq.com>
Date: 星期五, 05 五月 2023 08:53:18 +0800
Subject: [PATCH] Merge branch 'master' of https://sinanoaq.cn:8888/r/~mayuhao/HazardInvestigationSystem

---
 src/views/systemManage/userManage/index.vue |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/systemManage/userManage/index.vue b/src/views/systemManage/userManage/index.vue
index 44c892c..9805a7c 100644
--- a/src/views/systemManage/userManage/index.vue
+++ b/src/views/systemManage/userManage/index.vue
@@ -25,7 +25,7 @@
                         v-model="queryForm.company"
                         class="filter-item"
                         placeholder=""
-                        style="width: 200px;"
+                        style="width: 150px;"
                         @keyup.enter.native="queryHandle"
                     />
                 </el-form-item>
@@ -180,9 +180,9 @@
                         <span>{{ scope.row.company }}</span>
                     </template>
                 </el-table-column>
-                <el-table-column label="部门" prop="department" align="center" sortable="custom" width="100px">
+                <el-table-column label="部门" prop="departmentname" align="center" sortable="custom" width="100px">
                     <template slot-scope="scope">
-                        <span>{{ scope.row.department }}</span>
+                        <span>{{ scope.row.departmentname }}</span>
                     </template>
                 </el-table-column>
                 <el-table-column label="职位" prop="job" align="center" sortable="custom" width="100px">
@@ -365,7 +365,7 @@
                                 <el-option
                                     v-for="item in departmentList"
                                     :key="item.id"
-                                    :value="item.department"
+                                    :value="item.id"
                                     :label="item.department"
                                 >
                                 </el-option>

--
Gitblit v1.9.2