Browse Source

el-tree相关样式调整

bing 3 days ago
parent
commit
a91575b520

+ 1 - 1
src/assets/styles/index.scss

@@ -144,7 +144,7 @@ aside {
144 144
 }
145 145
 
146 146
 .auto-overflow-y {
147
-  overflow: auto;
147
+  overflow-y: auto;
148 148
 }
149 149
 
150 150
 

+ 1 - 0
src/views/cardCenter/cardOperation/ptCard/batchRechargeForm.vue

@@ -231,6 +231,7 @@ const submitForm = async () => {
231 231
         await api.batchRefundPtBag(data, userIds.value);
232 232
         break;
233 233
     }
234
+    proxy?.$modal.msgSuccess('操作成功');
234 235
     dialog.visible = false;
235 236
     // 发送操作成功的事件
236 237
     emit('success');

+ 7 - 1
src/views/cardCenter/cardOperation/ptCard/index.vue

@@ -25,7 +25,7 @@
25 25
             <el-card shadow="hover">
26 26
               <el-form ref="queryFormRef" :model="queryParams" :inline="true">
27 27
                 <el-form-item label="姓名" prop="realName">
28
-                  <el-input v-model="queryParams.realName" placeholder="请输入姓名" clearable @keyup.enter="handleQuery" />
28
+                  <el-input v-model="queryParams.realName" placeholder="请输入姓名1" clearable @keyup.enter="handleQuery" />
29 29
                 </el-form-item>
30 30
                 <el-form-item label="学/工号" prop="userNumb">
31 31
                   <el-input v-model="queryParams.userNumb" placeholder="请输入学/工号" clearable @keyup.enter="handleQuery" />
@@ -347,6 +347,7 @@ const handleRecharge = async (cmd: string, row?: PtUserAccountVO) => {
347 347
   const userId = row?.userId || ids.value[0];
348 348
   const realNames = row?.realName || names.value;
349 349
   //if (userIds.length > 0) {
350
+  // todo 如果是批量退款 需判断卡余是否大于退款金额
350 351
   rechargeFormRef?.value.open(cmd, userId, realNames);
351 352
   // await proxy?.$modal.confirm('确认是否充值姓名为"' + realNames + '"的数据项?');
352 353
   // await api.openAccount(userIds);
@@ -372,6 +373,7 @@ const handleBatchRecharge = (cmd: string, row?: PtUserAccountVO) => {
372 373
   const userIds = ids.value;
373 374
   const realNames = row?.realName || names.value;
374 375
   if (userIds.length > 0) {
376
+    // todo 如果是批量退款 需判断卡余是否大于退款金额
375 377
     batchRechargeFormRef?.value.open(cmd, userIds, realNames);
376 378
   } else {
377 379
     proxy?.$modal.alertWarning('请选择要' + t('action.' + cmd) + '的账户!');
@@ -411,4 +413,8 @@ onMounted(async () => {
411 413
   min-width: 100% !important;
412 414
   vertical-align: top !important; /* 清除默认的 vertical-align */
413 415
 }
416
+
417
+:deep(div.el-tree div.el-tree__drop-indicator) {
418
+  background-color: whitesmoke !important;
419
+}
414 420
 </style>

+ 4 - 0
src/views/payment/account/facePhoto.vue

@@ -402,4 +402,8 @@ const handleAvatarSuccess: UploadProps['onSuccess'] = (response, uploadFile) =>
402 402
 :deep(.el-upload-list__item .el-icon--close) {
403 403
   right: -0.8rem;
404 404
 }
405
+
406
+:deep(div.el-tree div.el-tree__drop-indicator) {
407
+  background-color: whitesmoke !important;
408
+}
405 409
 </style>

+ 4 - 0
src/views/payment/account/index.vue

@@ -435,4 +435,8 @@ onMounted(async () => {
435 435
   display: inline-block !important;
436 436
   min-width: 100% !important;
437 437
 }
438
+
439
+:deep(div.el-tree div.el-tree__drop-indicator) {
440
+  background-color: whitesmoke !important;
441
+}
438 442
 </style>

+ 35 - 4
src/views/system/right/user/index.vue

@@ -1,13 +1,14 @@
1 1
 <template>
2
-  <div class="p-2 auto-overflow-y">
2
+  <div class="p-2 auto-overflow-y" style="overflow-x: hidden">
3 3
     <el-row :gutter="20">
4 4
       <!-- 部门树-->
5 5
       <el-col :lg="4" :xs="24" style="">
6
-        <el-card shadow="hover" class="h-800px">
6
+        <el-card shadow="hover" >
7 7
           <el-input v-model="deptName" placeholder="请输入部门名称" prefix-icon="Search" clearable />
8 8
           <el-tree
9 9
             ref="deptTreeRef"
10
-            class="mt-2 w-full h-800px overflow-auto inline-block"
10
+            style="height: 44.2rem"
11
+            class="mt-2 w-300px h-800px overflow-auto inline-block"
11 12
             node-key="id"
12 13
             :data="deptOptions"
13 14
             :props="{ label: 'label', children: 'children' }"
@@ -380,8 +381,38 @@ onMounted(() => {
380 381
 </script>
381 382
 
382 383
 <style lang="scss" scoped>
383
-.el-tree > :nth-child(n + 1) {
384
+/* .el-tree > :nth-child(n + 1) {
384 385
   display: inline-block;
385 386
   min-width: 100%;
387
+} */
388
+
389
+.el-tree > :nth-child(n + 1) {
390
+  display: inline-block !important;
391
+  min-width: 100% !important;
392
+  vertical-align: top !important;
393
+}
394
+
395
+/* ::-webkit-scrollbar:vertical {
396
+  width: 10px;
397
+} */
398
+::-webkit-scrollbar {
399
+  width: 10px;
400
+  // color: red;
401
+}
402
+::-scrollbar {
403
+  width: 10px; /* 设置滚动条宽度 */
404
+}
405
+/* ::-webkit-scrollbar-track {
406
+  -webkit-box-shadow: inset006pxrgba(0, 0, 0, 0.3);
407
+  border-radius: 5px;
408
+}
409
+::-webkit-scrollbar-thumb {
410
+  border-radius: 5px;
411
+  background: rgba(229, 234, 237, 0.1);
412
+  -webkit-box-shadow: inset006pxrgba(0, 0, 0, 0.5);
413
+} */
414
+
415
+:deep(div.el-tree div.el-tree__drop-indicator) {
416
+  background-color: whitesmoke !important;
386 417
 }
387 418
 </style>

+ 7 - 3
src/views/system/user/index.vue

@@ -7,7 +7,7 @@
7 7
           <el-input v-model="deptName" placeholder="请输入部门名称" prefix-icon="Search" clearable />
8 8
           <el-tree
9 9
             ref="deptTreeRef"
10
-            class="mt-2 w-full h-700px overflow-auto inline-block"
10
+            class="mt-2 w-300px h-700px overflow-auto inline-block"
11 11
             node-key="id"
12 12
             :data="deptOptions"
13 13
             :props="{ label: 'label', children: 'children' }"
@@ -658,7 +658,11 @@ async function handleDeptChange(value: number | string) {
658 658
 
659 659
 <style lang="scss" scoped>
660 660
 .el-tree > :nth-child(n + 1) {
661
-  display: inline-block;
662
-  min-width: 100%;
661
+  display: inline-block !important;
662
+  min-width: 100% !important;
663
+}
664
+
665
+:deep(div.el-tree div.el-tree__drop-indicator) {
666
+  background-color: whitesmoke !important;
663 667
 }
664 668
 </style>