Browse Source

feature: 卡务中心-卡片操作 错扣补款界面样式
支付管理->账户管理 重置卡类有有效期无法打开界面错误

autumnal_wind@yeah.net 1 month ago
parent
commit
1d591450df

+ 3 - 3
src/views/cardCenter/cardOperation/ptCard/ErrorFillForm.vue

@@ -14,7 +14,7 @@
14
                 <el-select
14
                 <el-select
15
                   v-model="queryParams.consumeRange"
15
                   v-model="queryParams.consumeRange"
16
                   placeholder="请选择"
16
                   placeholder="请选择"
17
-                  style="width: 150px"
17
+                  style="width: 150"
18
                   clearable
18
                   clearable
19
                   filterable
19
                   filterable
20
                   @change="consumeDateChange"
20
                   @change="consumeDateChange"
@@ -42,7 +42,7 @@
42
                 </el-select>
42
                 </el-select>
43
               </el-form-item>
43
               </el-form-item>
44
               <el-form-item label="消费餐类" prop="mealType" class="form-select">
44
               <el-form-item label="消费餐类" prop="mealType" class="form-select">
45
-                <el-select v-model="queryParams.mealType" placeholder="请选择" style="width: 100px" clearable filterable @change="handleQuery">
45
+                <el-select v-model="queryParams.mealType" placeholder="请选择" style="width: 150px" clearable filterable @change="handleQuery">
46
                   <el-option v-for="item in mealOptions" :key="item.typeId" :label="item.mealName" :value="item.typeId"></el-option>
46
                   <el-option v-for="item in mealOptions" :key="item.typeId" :label="item.mealName" :value="item.typeId"></el-option>
47
                 </el-select>
47
                 </el-select>
48
               </el-form-item>
48
               </el-form-item>
@@ -58,7 +58,7 @@
58
           v-loading="loading"
58
           v-loading="loading"
59
           :data="xfConsumeDetailList"
59
           :data="xfConsumeDetailList"
60
           stripe
60
           stripe
61
-          height="300px"
61
+          height="300"
62
           highlight-current-row
62
           highlight-current-row
63
           @current-change="handleCurrentChange"
63
           @current-change="handleCurrentChange"
64
         >
64
         >

+ 5 - 5
src/views/cardCenter/cardOperation/ptCard/index.vue

@@ -72,11 +72,11 @@
72
                   错扣补款
72
                   错扣补款
73
                 </el-button>
73
                 </el-button>
74
               </el-col>
74
               </el-col>
75
-              <el-col :span="1.5">
76
-                <el-button v-has-permi="['cardOperation:ptCard:edit']" type="warning" plain icon="Unlock" @click="handleImportBalance()">
77
-                  导入卡余
78
-                </el-button>
79
-              </el-col>
75
+<!--              <el-col :span="1.5">-->
76
+<!--                <el-button v-has-permi="['cardOperation:ptCard:edit']" type="warning" plain icon="Unlock" @click="handleImportBalance()">-->
77
+<!--                  导入卡余-->
78
+<!--                </el-button>-->
79
+<!--              </el-col>-->
80
               <el-col :span="1.5">
80
               <el-col :span="1.5">
81
                 <el-dropdown class="mt-[1px]">
81
                 <el-dropdown class="mt-[1px]">
82
                   <el-button plain type="info">
82
                   <el-button plain type="info">

+ 2 - 2
src/views/payment/account/index.vue

@@ -366,7 +366,7 @@ const handleFreezeStatus = async (status: string, row?: PtUserAccountVO) => {
366
 const resetExpiryFormRef = ref();
366
 const resetExpiryFormRef = ref();
367
 const handleResetLifespan = () => {
367
 const handleResetLifespan = () => {
368
   const userIds = ids.value;
368
   const userIds = ids.value;
369
-  const realNames = row?.realName || names.value;
369
+  const realNames = names.value;
370
   if (userIds.length > 0) {
370
   if (userIds.length > 0) {
371
     resetExpiryFormRef?.value.open(userIds, realNames);
371
     resetExpiryFormRef?.value.open(userIds, realNames);
372
   } else {
372
   } else {
@@ -377,7 +377,7 @@ const handleResetLifespan = () => {
377
 const resetCardTypeFormRef = ref();
377
 const resetCardTypeFormRef = ref();
378
 const handleResetCardType = async () => {
378
 const handleResetCardType = async () => {
379
   const userIds = ids.value;
379
   const userIds = ids.value;
380
-  const realNames = row?.realName || names.value;
380
+  const realNames = names.value;
381
   if (userIds.length > 0) {
381
   if (userIds.length > 0) {
382
     resetCardTypeFormRef?.value.open(userIds, realNames);
382
     resetCardTypeFormRef?.value.open(userIds, realNames);
383
   } else {
383
   } else {

+ 1 - 1
src/views/system/role/authUser.vue

@@ -104,7 +104,7 @@ const getList = async () => {
104
 // 返回按钮
104
 // 返回按钮
105
 const handleClose = () => {
105
 const handleClose = () => {
106
   const obj: RouteLocationNormalized = {
106
   const obj: RouteLocationNormalized = {
107
-    path: '/system/role',
107
+    path: '/system/right/role',
108
     fullPath: '',
108
     fullPath: '',
109
     hash: '',
109
     hash: '',
110
     matched: [],
110
     matched: [],