1121xx

src/api/sys/menu.ts

@@ -35,7 +35,7 @@ enum Api {
 export const DeleteStructure = (params) => {
   return new Promise<void>((resolve, reject) => {
     defHttp.post({ url: Api.DeleteStructure, params: tool.objectToFormData(params) }).then((res) => {
-      resolve(res.datas)
+      resolve(res)
     })
   })
 }
@@ -57,12 +57,12 @@ export const saveStructure = (params) => {
  */
 
 export const structureList = () => {
-  var list = local.getItem("structureList");
-  if (list) {
-    return new Promise<void>((resolve, reject) => {
-      resolve(list);
-    })
-  }
+  // var list = local.getItem("structureList");
+  // if (list) {
+  //   return new Promise<void>((resolve, reject) => {
+  //     resolve(list);
+  //   })
+  // }
   return new Promise<void>((resolve, reject) => {
     defHttp.post({ url: Api.GetChildDepartment }).then((res) => {
       if (res.datas && res.datas.depInfo) {

src/layouts/default/header/components/user-dropdown/PersonInfoModal.vue

@@ -6,19 +6,19 @@
                 <div class="left-list">
                     <div class="list-item">
                         <div class="item-title">用户名称：</div>
-                        <div class="item-text">{{ baseForm.userName }}</div>
+                        <div class="item-text" :title="baseForm.userName">{{ baseForm.userName }}</div>
                     </div>
                     <div class="list-item">
                         <div class="item-title">登录名称：</div>
-                        <div class="item-text">{{ baseForm.loginName }}</div>
+                        <div class="item-text" :title="baseForm.loginName">{{ baseForm.loginName }}</div>
                     </div>
                     <div class="list-item">
                         <div class="item-title">手机号码：</div>
-                        <div class="item-text">{{ baseForm.mobile }}</div>
+                        <div class="item-text" :title="baseForm.mobile">{{ baseForm.mobile }}</div>
                     </div>
                     <div class="list-item">
                         <div class="item-title">用户角色：</div>
-                        <div class="item-text">{{ baseForm.roles }}</div>
+                        <div class="item-text" :title="baseForm.roles">{{ baseForm.roles }}</div>
                     </div>
                 </div>
                 <div class="right-head">
@@ -37,7 +37,7 @@
                     </a-form-item>
                     <!-- 登录名称 -->
                     <a-form-item label="登录名称" name="loginName">
-                        <a-input v-model:value="form.loginName" style="width: 100%" placeholder="请输入" disabled/>
+                        <a-input v-model:value="form.loginName" style="width: 100%" placeholder="请输入" disabled />
                     </a-form-item>
                     <!-- 职责 -->
                     <a-form-item label="手机号码" name="mobile">
@@ -70,7 +70,7 @@ import headerImg from "/@/assets/images/header-icon.png";
 // 正则表达式验证
 import { ChineseRegexp, EmailRegexp, phoneRegexp } from '/@/utils/rules';
 import { getUserInfoByLoginCode, SaveOrUpdateUserInfo } from '/@/api/system/system';
-import { getUserIdInfo } from '/@/api/sys/user';
+import { getUserIdInfo, roleList } from '/@/api/sys/user';
 import md5 from 'js-md5';
 
 
@@ -142,7 +142,6 @@ export default defineComponent({
             //取LOGIN_NAM去查询用户的基础信息
             if (props.formData.LOGIN_NAME) {
                 getUserBaseInfo(props.formData.LOGIN_NAME);
-                baseForm.roles = props.formData.nameroles;
             }
         })
         const getUserBaseInfo = (loginName) => {
@@ -163,6 +162,21 @@ export default defineComponent({
                         form.loginName = res.user.loginName;
                         form.mobile = res.user.mobile;
                         form.pwd = "";
+                        roleList().then(res => {
+                            if (res.length) {
+                                let rolesObj = {};
+                                let rolesArr = []
+                                res.forEach(item => {
+                                    rolesObj[item.groupid] = item.groupName;
+                                })
+                                roleRes.forEach(item=>{
+                                    rolesArr.push(rolesObj[item] || '')
+                                })
+                                baseForm.roles = rolesArr.join(' ');
+                            } else {
+                                message.error('角色数据查询失败')
+                            }
+                        })
                     })
                 } else {
                     message.error('用户信息查询失败')
@@ -239,6 +253,12 @@ export default defineComponent({
                 .list-item {
                     margin: 5px 0;
                     display: flex;
+                    .item-text{
+                        width: 70%;
+                        white-space: nowrap;
+                        overflow: hidden;
+                        text-overflow: ellipsis;
+                    }
                 }
             }
 

src/views/systemAdmin/system/account/AccountModal1.vue

@@ -365,11 +365,11 @@ export default defineComponent({
                 form.loginName = form.loginName.toUpperCase();
                 form.userjs = form.userjsArr.join(';');
                 SaveOrUpdateUserInfo(form).then(res => {
-                    if (res) {
+                    if (res.resp_code === 0) {
                         message.success('操作成功')
                         emit('onSubmit', true)
-                    } else {
-                        message.success('操作失败')
+                    } else if(res.resp_code === 1) {
+                        message.info(res.resp_msg)
                         emit('onSubmit', false)
                     }
                 })

src/views/systemAdmin/system/account/index.vue

@@ -50,7 +50,7 @@ import moment from 'moment';
 import { Button, Modal, message } from 'ant-design-vue';
 import { getUserInfoByLoginCode } from '/@/api/system/system';
 import { getUserIdInfo } from '/@/api/sys/user';
-
+import { session } from '/@/utils/Memory';
 
 export default defineComponent({
   name: 'account',
@@ -127,9 +127,9 @@ export default defineComponent({
         dataIndex: 'action',
         slots: { customRender: 'action' },
       },
-      rowSelection: {
-        type: 'checkbox',
-      },
+      // rowSelection: {
+      //   type: 'checkbox',
+      // },
     });
     const formData = ref(null)
     const ifShowModal = ref(false)
@@ -183,6 +183,10 @@ export default defineComponent({
     }
     // 删除
     const handleDelete = (record) => {
+      if(record.EMPLOYEE_ID === session.getItem('userId')){
+        message.error('不能删除当前登录用户');
+        return;
+      }
       Modal.confirm({
         title: '删除提示',
         icon: createVNode(ExclamationCircleOutlined),

src/views/systemAdmin/system/structure/index.vue

@@ -63,13 +63,12 @@ export default defineComponent({
       // nextTick(()=>{
       //   expandAll()
       // })
-      let timer = setInterval(()=>{
-        let tableData = getRawDataSource();
-        if(tableData?.length){
-          expandAll()
-          clearInterval(timer)
-        }
-      },100)
+      // setTimeout(()=>{
+      //   let tableData = getRawDataSource();
+      //   if(tableData?.length){
+      //     expandAll()
+      //   }
+      // },100)
     }
 
     const [
@@ -149,11 +148,13 @@ export default defineComponent({
         onOk: (() => {
           let ids = isArray(record.departid) ? record.departid : [record.departid];
           DeleteStructure({ departid: ids }).then(res=>{
-            if(res){
+            if(res.resp_code===0){
               message.success('操作成功');
               onSubmit(true)
+            }else if(res.resp_code===1){
+              message.info(res.resp_msg);
             }else{
-              message.success('操作失败');
+              message.error('操作失败');
             }
           })
         })