Przeglądaj źródła

fix: 修复表格高度及样式,优化用户界面交互

闪电 11 miesięcy temu
rodzic
commit
68decce71e

+ 9 - 1
src/base-ui/table/src/table.vue

@@ -13,7 +13,7 @@
13 13
       v-loading="loading"
14 14
       :data="listData"
15 15
       border
16
-      style="width: 100%"
16
+      style="width: 100%;height: calc(100% - 50px);"
17 17
       @selection-change="handleSelectionChange"
18 18
 	  @row-click="rowClick"
19 19
       v-bind="childrenProps"
@@ -159,6 +159,11 @@ export default defineComponent({
159 159
 </script>
160 160
 
161 161
 <style scoped lang="scss">
162
+.hy-table {
163
+  display: flex;
164
+  flex-direction: column;
165
+  height: 100%;
166
+}
162 167
 .header {
163 168
   display: flex;
164 169
   height: 45px;
@@ -177,8 +182,11 @@ export default defineComponent({
177 182
 }
178 183
 
179 184
 .footer {
185
+  flex-shrink: 0;
180 186
   margin-top: 15px;
181 187
   margin-bottom: 10px;
188
+  display: flex;
189
+  justify-content: flex-end;
182 190
   .el-pagination {
183 191
     text-align: right;
184 192
   }

+ 4 - 3
src/components/workOrder/moduleList.vue

@@ -2,7 +2,7 @@
2 2
   	<div>  
3 3
 		<!-- 下转 通用列表 -->
4 4
 
5
-		<el-dialog v-model="props.dialogVisible" :title="props.title"  width="70%" :before-close="closeModal" >
5
+		<el-dialog v-model="props.dialogVisible" :title="props.title"  width="70%" :before-close="closeModal">
6 6
 			<span>
7 7
 				
8 8
 				<JyTable
@@ -12,6 +12,7 @@
12 12
 					:rowKey="''"
13 13
 					:listCount="listCount"
14 14
 					:listData="dataList"
15
+					:contentTableHeader="false"
15 16
 					v-model:page="pageInfo"
16 17
 					@update:page="getListData"
17 18
 				> 
@@ -21,11 +22,11 @@
21 22
 				</JyTable>
22 23
 				 
23 24
 			</span>
24
-			<template #footer>
25
+			<!-- <template #footer>
25 26
 				<span class="dialog-footer">
26 27
 					
27 28
 				</span>
28
-			</template>
29
+			</template> -->
29 30
 		</el-dialog>
30 31
 
31 32
 		

+ 6 - 6
src/router/index.js

@@ -210,12 +210,6 @@ export const constantRoutes = [
210 210
       }
211 211
     ]
212 212
   },
213
-
214
-]
215
-
216
-// 动态路由,基于用户权限动态去加载
217
-export const dynamicRoutes = [
218
-  
219 213
   {
220 214
     path: '/system/user-auth',
221 215
     component: Layout,
@@ -261,6 +255,12 @@ export const dynamicRoutes = [
261 255
   },
262 256
 ]
263 257
 
258
+// 动态路由,基于用户权限动态去加载
259
+export const dynamicRoutes = [
260
+  
261
+  
262
+]
263
+
264 264
 const router = createRouter({
265 265
   history: createWebHistory(),
266 266
   routes: constantRoutes,

+ 2 - 2
src/views/main/report/overdue/config/moduleList.config.js

@@ -3,8 +3,8 @@ export const moduleListConfig = {
3 3
 	propList: [
4 4
 	  { prop: 'workordercode', label: '工单编号' , slotName: 'workordercode' , minWidth: '200', fixed : 'left' },
5 5
 	  { minWidth: '170', prop: 'workordercatename', label: '工单类型' },
6
-	  { minWidth: '170', prop: 'source', label: '来源' , slotName: 'source' },
7
-	  { minWidth: '170', prop: 'projectname', label: '项目' },
6
+	//   { minWidth: '170', prop: 'source', label: '来源' , slotName: 'source' },
7
+	//   { minWidth: '170', prop: 'projectname', label: '项目' },
8 8
 	  { minWidth: '170', prop: 'content', label: '工单内容' },
9 9
 	  { minWidth: '170', prop: 'dealusername', label: '受理人' }, 
10 10
 	  { minWidth: '170', prop: 'createtime', label: '受理时间' },

+ 1 - 1
src/views/main/report/overdue/overdue.vue

@@ -25,7 +25,7 @@
25 25
 			url="/order/workorder/detaillist" 
26 26
 			:params="moduleListParams" 
27 27
 			v-model:dialogVisible="dialogVisible"
28
-			title="下 转"
28
+			title="详 情"
29 29
 		>
30 30
 		</moduleList>
31 31
     </div>

+ 3 - 1
src/views/main/system/dict/data.vue

@@ -114,7 +114,9 @@
114 114
       <el-table-column label="字典排序" align="center" prop="dictSort" />
115 115
       <el-table-column label="状态" align="center" prop="status">
116 116
         <template #default="scope">
117
-          <el-tag :options="sys_normal_disable" :value="scope.row.status" />
117
+          <el-tag :type="scope.row.status == '0' ? 'success' : 'danger'">{{
118
+            scope.row.status == '0' ? '正常' : '停用'
119
+          }}</el-tag>
118 120
         </template>
119 121
       </el-table-column>
120 122
       <el-table-column

+ 17 - 2
src/views/main/system/user/user.vue

@@ -38,7 +38,7 @@
38 38
             <span>{{ row.dept && row.dept.deptName ? row.dept.deptName : '' }}</span>
39 39
           </template>
40 40
           <template #handler="scope">
41
-              <el-button
41
+              <!-- <el-button
42 42
                 icon="Setting"
43 43
                 size="small"
44 44
                 type="primary"
@@ -55,7 +55,22 @@
55 55
                 @click="handleAllotRoleClick(scope.row)"
56 56
               >
57 57
                 分配角色
58
-              </el-button>
58
+              </el-button> -->
59
+              <el-dropdown style="margin-top: 6px;">
60
+                <span class="el-dropdown-link">
61
+                  更多
62
+                  <el-icon class="el-icon--right">
63
+                    <arrow-down />
64
+                  </el-icon>
65
+                </span>
66
+                <template #dropdown>
67
+                  <el-dropdown-menu>
68
+                    <el-dropdown-item @click="handleResetPassClick(scope.row)">重置密码</el-dropdown-item>
69
+                    <el-dropdown-item  @click="handleAllotRoleClick(scope.row)">分配角色</el-dropdown-item>
70
+                    
71
+                  </el-dropdown-menu>
72
+                </template>
73
+              </el-dropdown>
59 74
           </template>
60 75
         </page-content>
61 76
         <page-modal :defaultInfo="defaultInfo" ref="pageModalRef" pageName="/system/user"

+ 2 - 2
src/views/main/workOrderManagement/groupWorkOrder/config/content.config.js

@@ -4,8 +4,8 @@ export const contentTableConfig = {
4 4
   propList: [
5 5
     { prop: 'workordercode', label: '工单编号' , slotName: 'workordercode' , minWidth: '200',fixed : 'left'  },
6 6
     { minWidth: '170', prop: 'workordercatename', label: '工单类型' },
7
-    { minWidth: '170', prop: 'source', label: '来源' , slotName: 'source' },
8
-    { minWidth: '170', prop: 'projectname', label: '项目' },
7
+    // { minWidth: '170', prop: 'source', label: '来源' , slotName: 'source' },
8
+    // { minWidth: '170', prop: 'projectname', label: '项目' },
9 9
     { minWidth: '170', prop: 'content', label: '工单内容' },
10 10
     { minWidth: '170', prop: 'dealusername', label: '受理人' },
11 11
     { minWidth: '170', prop: 'createtime', label: '受理时间' },

+ 2 - 2
src/views/main/workOrderManagement/myReply/config/content.config.js

@@ -4,8 +4,8 @@ export const contentTableConfig = {
4 4
   propList: [
5 5
     { prop: 'workordercode', label: '工单编号' , slotName: 'workordercode' , minWidth: '200', fixed : 'left' },
6 6
     { minWidth: '170', prop: 'workordercatename', label: '工单类型' },
7
-    { minWidth: '170', prop: 'source', label: '来源' , slotName: 'source' },
8
-    { minWidth: '170', prop: 'projectname', label: '项目' },
7
+    // { minWidth: '170', prop: 'source', label: '来源' , slotName: 'source' },
8
+    // { minWidth: '170', prop: 'projectname', label: '项目' },
9 9
     { minWidth: '170', prop: 'content', label: '工单内容' },
10 10
     { minWidth: '170', prop: 'dealusername', label: '受理人' },
11 11
     { minWidth: '170', prop: 'createtime', label: '受理时间' },

+ 2 - 2
src/views/main/workOrderManagement/pendingReview/config/content.config.js

@@ -4,8 +4,8 @@ export const contentTableConfig = {
4 4
   propList: [
5 5
     { prop: 'workordercode', label: '工单编号' , slotName: 'workordercode' , minWidth: '200',  fixed : 'left' },
6 6
     { minWidth: '170', prop: 'workordercatename', label: '工单类型' },
7
-    { minWidth: '170', prop: 'source', label: '来源' , slotName: 'source' },
8
-    { minWidth: '170', prop: 'projectname', label: '项目' },
7
+    // { minWidth: '170', prop: 'source', label: '来源' , slotName: 'source' },
8
+    // { minWidth: '170', prop: 'projectname', label: '项目' },
9 9
     { minWidth: '170', prop: 'content', label: '工单内容' },
10 10
     { minWidth: '170', prop: 'dealusername', label: '受理人' },
11 11
     { minWidth: '170', prop: 'createtime', label: '受理时间' },

+ 2 - 2
src/views/main/workOrderManagement/waitForReturnVisit/config/content.config.js

@@ -4,8 +4,8 @@ export const contentTableConfig = {
4 4
   propList: [
5 5
     { prop: 'workordercode', label: '工单编号' , slotName: 'workordercode' , minWidth: '200',fixed : 'left' },
6 6
     { minWidth: '170', prop: 'workordercatename', label: '工单类型' },
7
-    { minWidth: '170', prop: 'source', label: '来源' , slotName: 'source' },
8
-    { minWidth: '170', prop: 'projectname', label: '项目' },
7
+    // { minWidth: '170', prop: 'source', label: '来源' , slotName: 'source' },
8
+    // { minWidth: '170', prop: 'projectname', label: '项目' },
9 9
     { minWidth: '170', prop: 'content', label: '工单内容' },
10 10
     { minWidth: '170', prop: 'dealusername', label: '受理人' },
11 11
     { minWidth: '170', prop: 'createtime', label: '受理时间' },