Merge branch 'ch/jinrui1.0' of eta_mini/eta_mini_crm_front into debug_jr

src/utils/buttonConfig.js

@@ -9,9 +9,9 @@ export const customerManageBtn={
     customer_edit:'customer:edit', // 编辑客户
     customer_permissionSettings:'customer:permissionSettings', // 开启/关闭权限
     customer_delete:'customer:delete', // 删除客户
-    customer_add:'contact:add', // 添加/编辑联系人
-    customer_delete:'contact:delete', // 删除联系人
-    customer_move:'contact:move', // 移动联系人
+    contact_add:'contact:add', // 添加/编辑联系人
+    contact_delete:'contact:delete', // 删除联系人
+    contact_move:'contact:move', // 移动联系人
 
     /* 试用列表 */
     trial_list:'trial:list', // 查看列表

src/views/customer/PotentialUserList.vue

@@ -125,6 +125,7 @@ const showDetail=ref(false)
 const activeUserId=ref(0)
 const activeUserName=ref('')
 function handleGoReadTimes(e){
+  if(e.ReadTimes < 1) return
   activeUserId.value=e.UserId
   activeUserName.value=e.RealName
   showDetail.value=true

src/views/customer/UserList.vue

@@ -316,6 +316,7 @@ const showDetail=ref(false)
 const activeUserId=ref(0)
 const activeUserName=ref('')
 function handleGoReadTimes(e){
+  if(e.ReadTimes < 1) return
   activeUserId.value=e.UserId
   activeUserName.value=e.RealName
   showDetail.value=true

src/views/customer/UserSearch.vue

@@ -84,6 +84,7 @@ const showDetail=ref(false)
 const activeUserId=ref(0)
 const activeUserName=ref('')
 function handleGoReadTimes(e){
+  if(e.ReadTimes < 1) return
   activeUserId.value=e.UserId
   activeUserName.value=e.RealName
   showDetail.value=true

src/views/customer/components/ContactTable.vue

@@ -157,6 +157,7 @@ const showDetail=ref(false)
 const readTimesUserId=ref(0)
 const activeUserName=ref('')
 function handleGoReadTimes(e){
+  if(e.ReadTimes < 1) return
   readTimesUserId.value=e.UserId
   activeUserName.value=e.RealName
   showDetail.value=true
@@ -166,7 +167,9 @@ function handleGoReadTimes(e){
 
 <template>
   <div class="customer-user-list-page">
-    <el-button type="primary" color="#0052D9" style="width: 120px; margin-top: 10px;" @click="handleAddContact({}, 'add')"
+    <el-button
+      v-permission="permissionBtn.customerManageBtn.contact_add"
+      type="primary" color="#0052D9" style="width: 120px; margin-top: 10px;" @click="handleAddContact({}, 'add')"
       >添加联系人</el-button
     >
     <div class="userlist-wrap" style="margin-top: 30px">
@@ -217,21 +220,21 @@ function handleGoReadTimes(e){
         <el-table-column label="操作" width="200" align="center">
           <template #default="{ row }">
             <el-button
-              v-permission="permissionBtn.customerManageBtn.customer_edit"
+              v-permission="permissionBtn.customerManageBtn.contact_add"
               type="primary"
               link
               @click.stop="handleAddContact(row, 'edit')"
               >编辑</el-button
             >
             <el-button
-              v-permission="permissionBtn.customerManageBtn.customer_permissionSettings"
+              v-permission="permissionBtn.customerManageBtn.contact_move"
               type="primary"
               link
               @click.stop="handleMove(row)"
               >移动</el-button
             >
             <el-button
-              v-permission="permissionBtn.customerManageBtn.customer_delete"
+              v-permission="permissionBtn.customerManageBtn.contact_delete"
               type="danger"
               link
               @click.stop="handleDelUser(row)"

src/views/system/AuthSet.vue

@@ -69,7 +69,7 @@ function handleSave(){
     HalfMenuIds:halfKeys
   }).then(res=>{
     if(res.Ret!==200) return
-    ElMessage.success('保存成功')
+    ElMessage.success('权限设置成功')
     handlRoleChange()
   })
 }

src/views/system/userList/components/DepartWrap.vue

@@ -293,7 +293,7 @@ function getFormTitle(e) {
                 <svg-icon
                   name="edit2"
                   size="16px"
-                  v-if="hasPermission(permissionBtn.systemManageBtn.user_deleteDept)"
+                  v-if="hasPermission(permissionBtn.systemManageBtn.user_addDept)"
                   @click.stop="handleDepartOpt(node, data, 'edit')" 
                 ></svg-icon>
                 <el-dropdown>

src/views/system/userList/components/EditUser.vue

@@ -86,6 +86,7 @@ getRoleList()
 const formRules = {
   account: [{ required: true, message: '登录账号不能为空', trigger: 'blur' }],
   pwd: [{
+    required: true,
     validator: (rule, value, callback) => {
       if (value === '') {
         callback(new Error('请输入新密码'))
@@ -95,10 +96,12 @@ const formRules = {
       } else {
         callback()
       }
-    }
+    },
+    trigger: 'blur' 
   }],
   name: [{ required: true, message: '姓名不能为空', trigger: 'blur' }],
   mobile: [{
+    required: true,
     validator: (rule, value, callback) => {
       if (value === '') {
         callback(new Error('请输入手机号码'));
@@ -109,7 +112,8 @@ const formRules = {
       } else {
         callback();
       }
-    }, trigger: 'blur'
+    },
+    trigger: 'blur'
   }],
   depart: [{ required: true, message: '部门分组不能为空', trigger: 'change' }],
   role: [{ required: true, message: '角色不能为空', trigger: 'change' }],
@@ -177,10 +181,10 @@ async function handleSave() {
       ref="formRef"
       label-width="80px"
     >
-      <el-form-item label="用户名" prop="account">
+      <el-form-item label="登陆账号" prop="account">
         <el-input
           v-model="formState.account"
-          placeholder="请输入用户名"
+          placeholder="请输入登陆账号"
           clearable 
           :disabled="isEditAdmin"
         />