chenlei 4 долоо хоног өмнө
parent
commit
63508879b3

+ 5 - 5
src/views/customer/PotentialUserList.vue

@@ -23,7 +23,7 @@ const tableColOpt = [
   },
   {
     label: '手机号',
-    key: 'Phone'
+    key: 'MobileHidden'
   },
   {
     label: '注册时间',
@@ -32,12 +32,12 @@ const tableColOpt = [
   },
   {
     label: '最近一次阅读时间',
-    key: 'LastUpdateTime',
+    key: 'ModifyTime',
     sort: true
   },
   {
     label: '阅读统计',
-    key: 'ReadCnt',
+    key: 'ReadTimes',
     sort: true,
   },
 ]
@@ -178,10 +178,10 @@ function handleShowDetail(e){
         </el-table-column>
         <el-table-column label="操作" align="center" width="200">
           <template #default="{ row }">
-            <el-button type="primary" v-permission="'user:transform'" link @click="handleEditUser(row)"
+            <el-button type="primary" v-permission="permissionBtn.customerManageBtn.trial_convert" link @click="handleEditUser(row)"
               >转正式</el-button
             >
-            <el-button type="primary" v-permission="'user:transform'" link @click="handleEditUser(row)"
+            <el-button type="primary" v-permission="permissionBtn.customerManageBtn.trial_delete" link @click="handleEditUser(row)"
               >删除</el-button
             >
           </template>

+ 1 - 1
src/views/customer/UserList.vue

@@ -373,7 +373,7 @@ function handleGoReadTimes(e){
           :icon="Plus"
           size="large"
           @click="goAddUserPage"
-          v-permission="'user:add'"
+          v-permission="permissionBtn.customerManageBtn.customer_add"
           >新增</el-button
         >
       </div>

+ 1 - 1
src/views/system/AuthSet.vue

@@ -64,7 +64,7 @@ function handleSave(){
   }
   const cArr=Array.from(new Set([...keys,...halfKeys]))
   apiSystemRole.roleAuthSet({
-    SysRoleId:roleId.value,
+    SysRoleId:parseInt(roleId.value),
     SysMenuIds:cArr,
     HalfMenuIds:halfKeys
   }).then(res=>{

+ 1 - 1
src/views/system/RoleList.vue

@@ -82,7 +82,7 @@ function handleRoleAdd(params) {
   <div class="system-rolelist-page">
     <el-card>
       <div class="shadow-box top-box">
-        <el-button type="primary" @click="handleEdit('')" v-permission="'role:add'">添加角色</el-button>
+        <el-button type="primary" @click="handleEdit('')" v-permission="permissionBtn.systemManageBtn.role_convert">添加角色</el-button>
       </div>
     </el-card>
     <div class="shadow-box content-box">

+ 4 - 4
src/views/system/userList/Index.vue

@@ -183,27 +183,27 @@ async function changeStatus(e) {
               <template #default="{ row }">
                 <el-button
                   type="primary"
-                  v-permission="'sysUser:edit'"
+                  v-permission="permissionBtn.systemManageBtn.user_add"
                   link
                   @click.stop="handleAddUser(row)"
                   >编辑</el-button
                 >
                 <el-button
-                  v-permission="'sysUser:resetPassword'"
+                  v-permission="permissionBtn.systemManageBtn.user_delete"
                   type="primary"
                   link
                   @click.stop="openResetPassDialog(row)"
                   >重置密码</el-button
                 >
                 <el-button
-                  v-permission="'sysUser:move'"
+                  v-permission="permissionBtn.systemManageBtn.user_edit"
                   type="primary"
                   link
                   @click.stop="openMoveDepartDialog(row)"
                   >移动分组</el-button
                 >
                 <el-button
-                  v-permission="'sysUser:editEnabled'"
+                  v-permission="permissionBtn.systemManageBtn.user_permissionSettings"
                   v-if="row.SysUserName !== 'admin'"
                   :type="row.IsEnabled ? 'danger' : 'primary'"
                   link