From b9bd29a1a81f6f7de479e3cc3fdfe3d85fc660bf Mon Sep 17 00:00:00 2001
From: he wei <858544502@qq.com>
Date: 星期三, 23 四月 2025 13:35:06 +0800
Subject: [PATCH] UA 整理提交
---
src/views/system/user/addEdit.vue | 130 -------------------------------------------
1 files changed, 0 insertions(+), 130 deletions(-)
diff --git a/src/views/system/user/addEdit.vue b/src/views/system/user/addEdit.vue
index 9e6dcad..1603198 100644
--- a/src/views/system/user/addEdit.vue
+++ b/src/views/system/user/addEdit.vue
@@ -2,8 +2,6 @@
import { ref, reactive, computed, onMounted } from "vue";
import { addUser, updateUser } from "@/api/user";
import useElement from "@/hooks/useElement.js";
- import { getAreaTreeApi } from "@/api/area";
- import { formatAreaTree } from "@/utils/tree";
const { $loading, $message, $confirm } = useElement();
const props = defineProps({
info: {
@@ -41,30 +39,6 @@
trigger: ["blur", "change"],
},
],
- urole: [
- {
- required: true,
- message: "涓嶈兘涓虹┖",
- trigger: ["blur", "change"],
- },
- ],
- areaId: [
- {
- required: true,
- message: "涓嶈兘涓虹┖",
- trigger: ["change", "blur"],
- },
- {
- validator: (rule, value, callback) => {
- if (!value.length) {
- callback(new Error("璇烽�夋嫨鍖哄煙"));
- } else {
- callback();
- }
- },
- trigger: ["change", "blur"],
- },
- ],
};
const isEdit = computed(() => !!props.info?.uid);
@@ -86,8 +60,6 @@
realName: form1.realName.trim(),
phoneNumber: form1.phoneNumber?.trim(),
address: form1.address?.trim(),
- idList: form1.areaId.map(v => v[v.length - 1]).concat(otherIdList.value),
- urole: form1.urole,
};
// 缂栬緫鐢ㄦ埛鏃�, 鍖哄煙涓笉鍦ㄧ鐞嗗憳绠＄悊鍐呯殑鍖哄煙瑕佹寫鍑烘潵 鏈�鍚庢洿鏂版椂鍐嶈拷鍔犺繘鍘�
@@ -125,8 +97,6 @@
realName: form1.realName.trim(),
phoneNumber: form1.phoneNumber?.trim(),
address: form1.address?.trim(),
- idList: form1.areaId.map(v => v[v.length - 1]),
- urole: form1.urole,
};
console.log("params", params, "=============");
@@ -148,91 +118,7 @@
});
}
- async function getAreaTree() {
- try {
- const res = await getAreaTreeApi();
- let _data = [];
- if (res.code === 1 && res.data) {
- _data = res.data2;
- }
- const treeList = [];
- let ids = _data.map((v) => v.id);
- for (let i = 0; i < _data.length; i++) {
- formatAreaTree(_data[i], ids, treeList);
- }
- // console.log(_data, 'data');
- console.log(treeList, 'treeList');
- areaList.value = treeList;
- formatAreaSelected(treeList);
- } catch (e) {
- console.log(e);
- }
- }
- // 鍖哄煙鏍� 鏍硅妭鐐�
- // const areaRoots = computed(() => {
- // if (!areaList.value) {
- // return [];
- // } else {
- // return areaList.value.map(v => v.id);
- // }
- // });
-
- function formatAreaSelected(treeList) {
- let roots = treeList.map(v => v.id);
- let otherAreas = form1.areaId.filter(v => !v.some((vv) => roots.includes(vv)));
- let otherIds = otherAreas.map(v => v[v.length - 1]);
-
- otherIdList.value = otherIds;
-
- form1.areaId = form1.areaId.filter(v => v.some((vv) => roots.includes(vv))).map(v => {
- let idx = 0;
- for (let i = 0; i < roots.length; i++) {
- if (v.includes(roots[i])) {
- idx = v.indexOf(roots[i]);
- break;
- }
- }
-
- return v.slice(idx);
- });
- console.log('form1.areaId', form1.areaId, '=============');
-
- }
-
- function handleChange(value) {
- let oldV = value.slice(0, value.length - 1);
- let newV = value[value.length - 1];
- console.log('value', value, '=============', oldV, newV);
-
- // 妫�鏌ユ柊閫変腑鐨勯」鏄惁涓庡凡閫変腑鐨勯」鏈夊寘鍚叧绯�
- const hasInclusion = checkInclusion(newV, oldV);
- if (hasInclusion) {
- // 寮瑰嚭瀵硅瘽妗嗚闂敤鎴锋槸鍚﹀彇娑堜箣鍓嶇殑椤�
- $message.error('鍙栨秷涔嬪墠鐨勯」(鏂伴�変腑鐨勯」涓庡凡閫変腑鐨勯」瀛樺湪鍖呭惈鍏崇郴)');
- form1.areaId = value.slice(0, value.length - 1);
- // $confirm('鍙栨秷涔嬪墠鐨勯」(鏂伴�変腑鐨勯」涓庡凡閫変腑鐨勯」瀛樺湪鍖呭惈鍏崇郴)', () => {
- // form1.areaId = value;
- // });
- }
- };
-
- function checkInclusion(newValue, oldValue) {
- // 閬嶅巻鏂伴�変腑鐨勯」
- for (let j = 0; j < oldValue.length; j++) {
- const oldItem = oldValue[j];
- if (isIncluded(newValue, oldItem) || isIncluded(oldItem, newValue)) {
- return true;
- }
- }
- return false;
- };
-
- function isIncluded(item1, item2) {
- // 鏂板厓绱犳槸涓�涓�夐」 鍙栨暟缁勭殑鏈�鍚庝竴涓厓绱�
- const id = item1[item1.length - 1];
- return item2.includes(id);
- };
onMounted(() => {
let info = props.info;
@@ -242,10 +128,7 @@
form1.realName = info.realName;
form1.phoneNumber = info.phoneNumber;
form1.address = info.address;
- form1.areaId = info.areaId;
- form1.urole = info.urole;
}
- getAreaTree();
});
</script>
@@ -260,19 +143,6 @@
</el-form-item>
<el-form-item label="鎵嬫満鍙�" prop="phoneNumber">
<el-input v-model="form1.phoneNumber"></el-input>
- </el-form-item>
- <el-form-item label="鎵�灞炲尯鍩�" prop="areaId">
- <el-cascader class="select" filterable clearable v-model="form1.areaId" :props="props1" @change="handleChange"
- :options="areaList"><template #default="{ node, data }">
- <span>{{ data.label }}</span>
- <span v-if="!node.isLeaf"> ({{ data.children.length }}) </span>
- </template></el-cascader>
- </el-form-item>
- <el-form-item label="鎵�灞炶鑹�" prop="urole">
- <el-select v-model="form1.urole">
- <el-option label="鏅�氱敤鎴�" :value="0" />
- <el-option label="鍖哄煙绠＄悊鍛�" :value="1" />
- </el-select>
</el-form-item>
<el-form-item label="閫氳鍦板潃" prop="address">
<el-input v-model="form1.address"></el-input>
--
Gitblit v1.9.1