XiaXxxxxx 2 năm trước cách đây
mục cha
commit
8326d4fc35

+ 34 - 9
src/views/systemAdmin/system/account/AccountModal1.vue

@@ -6,7 +6,8 @@
                 <div class="basic-info">
                     <div class="small-title">基础信息</div>
                     <a-form-item label="登录名" name="loginName">
-                        <a-input v-model:value="form.loginName" style="width: 100%" placeholder="请输入登录名" :disabled="title!=='新增用户'"/>
+                        <a-input v-model:value="form.loginName" style="width: 100%" placeholder="请输入登录名"
+                            :disabled="title !== '新增用户'" />
                     </a-form-item>
                     <a-form-item label="用户姓名" name="userName">
                         <a-input v-model:value="form.userName" style="width: 100%" placeholder="请输入姓名" />
@@ -162,7 +163,7 @@ export default defineComponent({
         };
         const checkRole = (rule, value, callback) => {
             console.log(value);
-            if (value === undefined||!value.length) {
+            if (value === undefined || !value.length) {
                 // callback(new Error("请选择角色"));
                 return Promise.reject("请选择角色")
             } else {
@@ -213,11 +214,8 @@ export default defineComponent({
         const title = ref(props.title)
         const formRef = ref()
 
-        onMounted(() => {
-            
-            structureList().then(res => {
-                data.treeData = res
-            })
+        onMounted(async () => {
+            data.treeData = await structureList();
             if (Object.keys(props.formData).length) {
                 for (let key in form) {
                     form[key] = props.formData[key]
@@ -235,6 +233,16 @@ export default defineComponent({
                     message.error('角色数据查询失败')
                 }
             })
+            let flag = true
+            if(form.ssjg){
+                flag = findValueInTree(data.treeData, form.ssjg)
+            }
+            // 如果没有找到对应的岗位
+            if(!flag){
+                form.ssjg = ''
+                form.sszw = ''
+                form.ssgw = ''
+            }
             if (props.title === '修改用户') {
                 if (form.ssjg) {
                     let params1 = {
@@ -278,6 +286,23 @@ export default defineComponent({
                 }
             }
         })
+        const findValueInTree = (tree, target) => {
+            // 遍历树的每个节点
+            for (let i = 0; i < tree.length; i++) {
+                // 如果当前节点等于目标值,则返回true
+                if (tree[i].departid === target) {
+                    return true;
+                }
+                // 如果当前节点有子节点,则递归遍历子节点
+                if (tree[i].children) {
+                    if (findValueInTree(tree[i].children, target)) {
+                        return true;
+                    }
+                }
+            }
+            // 如果没有找到目标值,返回false
+            return false;
+        }
         watch(
             () => [props.formData, props.title],
             ([newF, newD]) => {
@@ -359,7 +384,7 @@ export default defineComponent({
                 if (title.value === '新增用户') {
                     form.userid = uuidv4();
                     form.pwd = form.pwd ? md5(form.pwd) : md5('000000')
-                }else{
+                } else {
                     form.pwd = form.pwd ? md5(form.pwd) : ''
                 }
                 form.loginName = form.loginName.toUpperCase();
@@ -368,7 +393,7 @@ export default defineComponent({
                     if (res.resp_code === 0) {
                         message.success('操作成功')
                         emit('onSubmit', true)
-                    } else if(res.resp_code === 1) {
+                    } else if (res.resp_code === 1) {
                         message.info(res.resp_msg)
                         emit('onSubmit', false)
                     }

+ 4 - 2
src/views/systemAdmin/system/zhiwei/index.vue

@@ -264,10 +264,12 @@ export default defineComponent({
                         departid: id
                     }
                     delPosts(params).then(res => {
-                        if (res.datas === 1) {
+                        if (res.resp_code === 0) {
                             message.success('操作成功')
                             onSubmit(true)
-                        } else {
+                        } else if(res.resp_code === 1) {
+                            message.info(res.resp_msg)
+                        } else{
                             message.error('操作失败')
                         }
                     })