From 279ce0a4f1ea7d96e6fb86fb3d0a00bf196f9798 Mon Sep 17 00:00:00 2001
From: gyq <875626088@qq.com>
Date: Mon, 15 Dec 2025 09:17:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=A7=92=E8=89=B2=E6=A8=A1?=
 =?UTF-8?q?=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../role/components/roleTemplateDialog.vue      | 17 ++++++++++++++++-
 .../admin/system/role_template_mange/index.vue  |  9 ++++++---
 .../points/pointsconfig/exchangerecords.vue     | 16 +++++++++++++++-
 3 files changed, 37 insertions(+), 5 deletions(-)

diff --git a/src/views/admin/system/role/components/roleTemplateDialog.vue b/src/views/admin/system/role/components/roleTemplateDialog.vue
index 1f4be55..e06a5a6 100644
--- a/src/views/admin/system/role/components/roleTemplateDialog.vue
+++ b/src/views/admin/system/role/components/roleTemplateDialog.vue
@@ -3,7 +3,8 @@
     <div class="content">
       <div class="title">选择模板，快速创建好角色</div>
       <div class="role_template">
-        <div class="item" v-for="item in list" :key="item.id" @click="selectRoleHandle(item)">
+        <div class="item" :class="{ active: item.cehcked }" v-for="item in list" :key="item.id"
+          @click="selectRoleHandle(item)">
           <div class="header">
             <div class="title">
               {{ item.name }}
@@ -84,6 +85,11 @@ async function submitHandle() {
     await saveByTemplate({
       id: item.id
     })
+    ElNotification({
+      title: '注意',
+      message: '角色创建成功',
+      type: 'success'
+    })
     emits('success')
     visible.value = false
   } catch (error) {
@@ -125,6 +131,10 @@ onMounted(() => {
       padding: 14px 18px;
       transition: all .3s ease-in-out;
 
+      &.active {
+        border-color: var(--el-color-primary);
+      }
+
       &:hover {
         cursor: pointer;
         border-color: var(--el-color-primary);
@@ -144,6 +154,7 @@ onMounted(() => {
 
       .role_list {
         display: flex;
+        gap: 2px;
 
         div {
           flex: 1;
@@ -154,6 +165,10 @@ onMounted(() => {
         }
 
         .rl_r {
+          display: flex;
+          flex-direction: column;
+          gap: 4px;
+
           .row {
             display: flex;
             justify-content: flex-end;
diff --git a/src/views/admin/system/role_template_mange/index.vue b/src/views/admin/system/role_template_mange/index.vue
index 55431b3..b24f0f6 100644
--- a/src/views/admin/system/role_template_mange/index.vue
+++ b/src/views/admin/system/role_template_mange/index.vue
@@ -20,7 +20,7 @@
           <!-- <el-table-column label="操作人" prop=""></el-table-column> -->
           <el-table-column label="操作" width="250">
             <template v-slot="scope">
-              <el-button link type="primary" @click="handleOpenAssignPermDialog(scope.row)"
+              <el-button link type="success" @click="handleOpenAssignPermDialog(scope.row)"
                 v-if="scope.row.pid !== null">分配权限</el-button>
               <el-button link type="primary" @click="addTempateDialogRef.show(2, scope.row)" v-else>添加角色</el-button>
               <el-button link type="primary" @click="addTempateDialogRef.show(2, scope.row, 2)"
@@ -156,7 +156,7 @@ function handlePlatformTypeChange(e) {
 
 // 打开分配菜单菜单弹窗
 async function handleOpenAssignPermDialog(row) {
-  const roleId = row.id;
+  const roleId = row.roleId;
   dialog.row = row;
   if (roleId) {
     assignPermDialogVisible.value = true;
@@ -288,8 +288,11 @@ const permTreeRef = ref(null)
 // 分配菜单菜单提交
 async function handleAssignPermSubmit() {
   try {
-    const roleId = checkedRole.value.roleId;
+    const roleId = checkedRole.value.id;
     const name = checkedRole.value.name;
+
+    console.log(roleId, name);
+
     if (roleId) {
       const checkedMenuIds = permTreeRef
         .value.getCheckedNodes(false, true)
diff --git a/src/views/application/marketing/points/pointsconfig/exchangerecords.vue b/src/views/application/marketing/points/pointsconfig/exchangerecords.vue
index cca74d8..5f7a416 100644
--- a/src/views/application/marketing/points/pointsconfig/exchangerecords.vue
+++ b/src/views/application/marketing/points/pointsconfig/exchangerecords.vue
@@ -21,7 +21,8 @@
             end-placeholder="结束时间" @change="timeChange" />
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" @click="searchHandle">搜索</el-button>
+          <el-button type="primary" :loading="tableData.loading" icon="Search" @click="searchHandle">搜索</el-button>
+          <el-button :loading="tableData.loading" icon="Refresh" @click="resetHandle">重置</el-button>
         </el-form-item>
       </el-form>
     </div>
@@ -206,6 +207,19 @@ function searchHandle() {
   goodsRecordTotalAjax()
 }
 
+function resetHandle() {
+  time.value = []
+  queryForm.startTime = ''
+  queryForm.endTime = ''
+  queryForm.pointsGoodsName = ''
+  queryForm.goodsCategory = ''
+  queryForm.receiveType = ''
+  queryForm.status = ''
+
+  goodsRecordPageAjax();
+  goodsRecordTotalAjax()
+}
+
 // 分页大小发生变化
 function handleSizeChange(e) {
   tableData.size = e;