From 4b01a411f6f69313b424acdc05f783db6963511f Mon Sep 17 00:00:00 2001 From: hexiaoyong Date: Mon, 31 Oct 2022 17:58:26 +0800 Subject: [PATCH] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E8=B4=A6=E5=8F=B7=E7=AE=A1?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- src/bg-ui/bg-upload.vue | 2 +- src/bg-ui/index.scss | 4 + .../main/develop/account/add/contact-form.vue | 3 + src/page/main/develop/account/add/index.vue | 28 +------ .../main/develop/account/add/system-form.vue | 10 ++- .../main/develop/account/detail/index.vue | 2 +- src/page/main/develop/account/index.vue | 16 ++-- .../system/organization/directory-form.vue | 36 +++++++-- src/page/main/system/organization/index.vue | 28 +++---- .../system/organization/org-detail/index.vue | 4 +- .../main/system/organization/org-form.vue | 28 +++++-- .../system/organization/org-user/index.vue | 7 +- .../org-user/org-account-form.vue | 9 ++- .../organization/platform-user/index.vue | 8 +- src/page/main/system/organization/tree.vue | 2 +- .../system/organization/user-detail/index.vue | 2 +- yarn.lock | 74 +++++++++---------- 18 files changed, 148 insertions(+), 117 deletions(-) diff --git a/package.json b/package.json index 49fc32c..89088e0 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,7 @@ "clipboard": "^2.0.11", "crypto-js": "^4.1.1", "echarts": "^5.3.3", - "element-plus": "^2.2.9", + "element-plus": "^2.2.19", "html2canvas": "^1.4.1", "sass": "^1.35.1", "uuid": "^8.3.2", diff --git a/src/bg-ui/bg-upload.vue b/src/bg-ui/bg-upload.vue index fac6eb4..a243d24 100644 --- a/src/bg-ui/bg-upload.vue +++ b/src/bg-ui/bg-upload.vue @@ -127,7 +127,7 @@ export default { }, computed: { actionDisabled() { - return this.disabled || this.fileList.length === this.limit; + return this.disabled ;//|| this.fileList.length === this.limit; 文件数量 === limit 会导致无法删除已上传文件 }, }, watch: { diff --git a/src/bg-ui/index.scss b/src/bg-ui/index.scss index 8a128f2..6cbf9d0 100644 --- a/src/bg-ui/index.scss +++ b/src/bg-ui/index.scss @@ -1812,6 +1812,7 @@ a { line-height: 18px; } } + &.is-easy { > div { @@ -1833,6 +1834,9 @@ a { } } } + .el-upload__tip { + line-height: 18px; + } } .bg-upload-image { diff --git a/src/page/main/develop/account/add/contact-form.vue b/src/page/main/develop/account/add/contact-form.vue index c7a8cdb..e2bec51 100644 --- a/src/page/main/develop/account/add/contact-form.vue +++ b/src/page/main/develop/account/add/contact-form.vue @@ -51,6 +51,9 @@ const contactFormRules = reactive({ { required: true, message: '请输入联系人手机号', trigger: 'blur' }, { validator: checkPhone, trigger: 'blur' }, ], + contact_email: [ + { type: 'email', message: '请输入正确的邮箱', trigger: 'blur' }, + ] }) const contactRef = ref(null) const emit = defineEmits(['action']) diff --git a/src/page/main/develop/account/add/index.vue b/src/page/main/develop/account/add/index.vue index 979a578..51869ae 100644 --- a/src/page/main/develop/account/add/index.vue +++ b/src/page/main/develop/account/add/index.vue @@ -134,17 +134,7 @@ const getContactFormData = (data) => { let params = { ...formData, id: parseInt(route.query.id), - // business_name: formData.value.business_name, - // system_account: formData.value.system_account, - // contact_email: formData.value.contact_email, - // contact_phone: formData.value.contact_phone, - // contact_name: formData.value.contact_name, logo: formData.logo && formData.logo.length > 0 ? formData.logo[0].url : '', - // state: formData.value.state, - // business_desc: formData.value.business_desc, - // develop_id: formData.value.develop_id, - // access_address: formData.value.access_address, - // remark: formData.value.remark } $axios.post(`/apaas/system/v5/user/update`,params) .then((res) => { @@ -152,26 +142,14 @@ const getContactFormData = (data) => { successFlag.value = true; step.value = 3; }else { - $message.error(res.data.msg) + $message.error(res.data.data) } }) }else { let params = { ...formData, - // organization_id: formData.value.organization_id, logo: formData.logo && formData.logo.length > 0 ? formData.logo[0].url : '', password: CryptoJS.AES.encrypt(formData.password,"swuE9cmCZQwrkYRV").toString(), - // business_code: formData.value.business_code, - // business_name: formData.value.business_name, - // business_desc: formData.value.business_desc, - // system_account: formData.value.system_account, - // access_address: formData.value.access_address, - // develop_id: formData.value.develop_id, - // state: formData.value.state, - // contact_name: formData.value.contact_name, - // contact_phone: formData.value.contact_phone, - // contact_email: formData.value.contact_email, - // remark: formData.value.remark, } $axios.put(`/apaas/system/v5/user/create`,params) .then((res) => { @@ -179,7 +157,7 @@ const getContactFormData = (data) => { successFlag.value = true; step.value = 3; }else { - $message.error(res.data.msg) + $message.error(res.data.data) } }) } @@ -233,7 +211,7 @@ const getDetail = () => { remark: form.remark, }) }else { - $message.error(res.data.msg) + $message.error(res.data.data) } }) } diff --git a/src/page/main/develop/account/add/system-form.vue b/src/page/main/develop/account/add/system-form.vue index 672bbf1..fa372b1 100644 --- a/src/page/main/develop/account/add/system-form.vue +++ b/src/page/main/develop/account/add/system-form.vue @@ -10,7 +10,7 @@ - + @@ -155,7 +155,7 @@ const validateSystemAccount = (rule, value, callback) => { const formRules = reactive({ organization_id: [ - { required: true, message: '请选择组织机构', trigger: 'blur' }, + { required: true, message: '请选择组织机构', trigger: 'change' }, ], business_name: [ { required: true, message: '请输入业务系统名称', trigger: 'blur' }, @@ -214,9 +214,11 @@ const getOrgTree = () => { $axios.get(`/apaas/system/v5/org/tree`) .then((res) => { if (res.data.code == 200) { - orgData.value = res.data.data || []; + const orgDataTemp = res.data.data || [] + orgDataTemp.shift() + orgData.value = orgDataTemp; }else { - $message.error(res.data.msg) + $message.error(res.data.data) } }) } diff --git a/src/page/main/develop/account/detail/index.vue b/src/page/main/develop/account/detail/index.vue index 119de0b..4e63feb 100644 --- a/src/page/main/develop/account/detail/index.vue +++ b/src/page/main/develop/account/detail/index.vue @@ -170,7 +170,7 @@ const baseInfo = reactive( logo.value = detail.logo; }else { - $message.error(res.data.msg) + $message.error(res.data.data) } }) } diff --git a/src/page/main/develop/account/index.vue b/src/page/main/develop/account/index.vue index 89fabbe..a2c24e5 100644 --- a/src/page/main/develop/account/index.vue +++ b/src/page/main/develop/account/index.vue @@ -310,7 +310,7 @@ import CryptoJS from "crypto-js"; tableRows.value = res.data.data || [] tableTotal.value = res.data.total }else { - $message.error(res.data.msg) + $message.error(res.data.data) } }) } @@ -351,7 +351,7 @@ import CryptoJS from "crypto-js"; }) getTableRows() }else { - $message.error(res.data.msg) + $message.error(res.data.data) } }) } @@ -391,7 +391,7 @@ import CryptoJS from "crypto-js"; if (res.data.code == 200) { getTableRows() }else { - $message.error(res.data.msg) + $message.error(res.data.data) } }) } @@ -456,7 +456,7 @@ import CryptoJS from "crypto-js"; $message.success(res.data.msg) getTableRows() }else { - $message.error(res.data.msg) + $message.error(res.data.data) } handleCloseDelete(); }) @@ -471,7 +471,7 @@ import CryptoJS from "crypto-js"; $message.success(res.data.msg) getTableRows() }else { - $message.error(res.data.msg) + $message.error(res.data.data) } handleCloseRowDelete(); }) @@ -509,7 +509,7 @@ import CryptoJS from "crypto-js"; $message.success(res.data.msg) getTableRows() }else { - $message.error(res.data.msg) + $message.error(res.data.data) } handleCloseReset(); }) @@ -540,7 +540,7 @@ import CryptoJS from "crypto-js"; if (res.data.code == 200) { $message.success(res.data.msg) }else { - $message.error(res.data.msg) + $message.error(res.data.data) } handleCloseEdit(); }) @@ -589,7 +589,7 @@ import CryptoJS from "crypto-js"; .tree { overflow: auto; height: calc(100% - 65px); - padding: 5px; + } .tree :deep() .el-tree-node>.el-tree-node__children { overflow: unset; diff --git a/src/page/main/system/organization/directory-form.vue b/src/page/main/system/organization/directory-form.vue index 76d89db..b2786b2 100644 --- a/src/page/main/system/organization/directory-form.vue +++ b/src/page/main/system/organization/directory-form.vue @@ -9,7 +9,14 @@ > - + @@ -72,22 +79,37 @@ import { reactive, ref, onMounted, onBeforeMount, getCurrentInstance, nextTick } const treeProps = { label: 'name', children: 'Child', - value: 'organization_id' + value: 'organization_id', + disabled: 'disabled' } const getOrgTree = () => { $axios.get(`/apaas/system/v5/org/tree`) .then((res) => { if (res.data.code == 200) { - orgData.value = res.data.data || []; - // nextTick(() => { - // filterNode(); - // }) + const orgDataTemp = res.data.data || [] + orgDataTemp.shift() + orgData.value = filterOrg(orgDataTemp); }else { - $message.error(res.data.msg) + $message.error(res.data.data) } }) } + const filterOrg = (data) => { + if(data.length > 0) { + data.forEach(item => { + item.disabled = item.data_type === 0 ? false : true; + + if(item.Child){ + filterOrg(item.Child) + }else { + return + } + }) + } + return data; + } + const filterNode = (value, data) => { return data.data_type === 0 diff --git a/src/page/main/system/organization/index.vue b/src/page/main/system/organization/index.vue index bf07c20..c4bad60 100644 --- a/src/page/main/system/organization/index.vue +++ b/src/page/main/system/organization/index.vue @@ -431,11 +431,13 @@ import { downloadFileFormatNew } from '@/services/helper' ], }) - const addAccount = (params) => { + const addAccount = () => { if(selectTreeDataType.value === 1) { router.push({ path: "/system/organization/org-user", - + query: { + orgId: selectTreeData.value.organization_id + } }) }else { router.push({ @@ -506,7 +508,7 @@ import { downloadFileFormatNew } from '@/services/helper' $message.success(res.data.msg) orgTree.value.getOrgTree(); }else { - $message.error(res.data.msg) + $message.error(res.data.data) } handleCloseDirectory() }) @@ -521,7 +523,7 @@ import { downloadFileFormatNew } from '@/services/helper' $message.success(res.data.msg) orgTree.value.getOrgTree(); }else { - $message.error(res.data.msg) + $message.error(res.data.data) } handleCloseDirectory() }) @@ -556,7 +558,7 @@ import { downloadFileFormatNew } from '@/services/helper' $message.success(res.data.msg) orgTree.value.getOrgTree(); }else { - $message.error(res.data.msg) + $message.error(res.data.data) } handleCloseOrg() }) @@ -575,7 +577,7 @@ import { downloadFileFormatNew } from '@/services/helper' $message.success(res.data.msg) orgTree.value.getOrgTree(); }else { - $message.error(res.data.msg) + $message.error(res.data.data) } handleCloseOrg() }) @@ -595,7 +597,7 @@ import { downloadFileFormatNew } from '@/services/helper' $message.success(res.data.msg) orgTree.value.getOrgTree(); }else { - $message.error(res.data.msg) + $message.error(res.data.data) } handleCloseDelNode() }) @@ -608,7 +610,7 @@ import { downloadFileFormatNew } from '@/services/helper' $message.success(res.data.msg) orgTree.value.getOrgTree(); }else { - $message.error(res.data.msg) + $message.error(res.data.data) } }) } @@ -698,7 +700,7 @@ import { downloadFileFormatNew } from '@/services/helper' console.log(baseInfo) }else { - $message.error(res.data.msg) + $message.error(res.data.data) } }) } @@ -725,7 +727,7 @@ import { downloadFileFormatNew } from '@/services/helper' if (res.data.code == 200) { getTableRows() }else { - $message.error(res.data.msg) + $message.error(res.data.data) } }) } @@ -755,7 +757,7 @@ import { downloadFileFormatNew } from '@/services/helper' if (res.data.code == 200) { $message.success(res.data.msg) }else { - $message.error(res.data.msg) + $message.error(res.data.data) } handleCloseEdit(); }) @@ -787,7 +789,7 @@ import { downloadFileFormatNew } from '@/services/helper' $message.success(res.data.msg) getTableRows() }else { - $message.error(res.data.msg) + $message.error(res.data.data) } handleCloseRowDelete(); }) @@ -863,7 +865,7 @@ import { downloadFileFormatNew } from '@/services/helper' $message.success(res.data.msg) getTableRows() }else { - $message.error(res.data.msg) + $message.error(res.data.data) } handleCloseReset(); }) diff --git a/src/page/main/system/organization/org-detail/index.vue b/src/page/main/system/organization/org-detail/index.vue index 8056620..acb3e00 100644 --- a/src/page/main/system/organization/org-detail/index.vue +++ b/src/page/main/system/organization/org-detail/index.vue @@ -170,7 +170,7 @@ const baseInfo = reactive( baseInfo[4].value = detail.description; fileList.value = detail.attachment ? detail.attachment.split(',') : []; }else { - $message.error(res.data.msg) + $message.error(res.data.data) } }) } @@ -184,7 +184,7 @@ const baseInfo = reactive( tableRows.value = res.data.data || []; tableTotal.value = res.data.total; }else { - $message.error(res.data.msg) + $message.error(res.data.data) } }) } diff --git a/src/page/main/system/organization/org-form.vue b/src/page/main/system/organization/org-form.vue index 2f33364..1f6df04 100644 --- a/src/page/main/system/organization/org-form.vue +++ b/src/page/main/system/organization/org-form.vue @@ -90,22 +90,38 @@ import { reactive, ref, onMounted, onBeforeMount, getCurrentInstance } from 'vue const treeProps = { label: 'name', children: 'Child', - value: 'organization_id' + value: 'organization_id', + disabled: 'disabled' } const getOrgTree = () => { $axios.get(`/apaas/system/v5/org/tree`) .then((res) => { if (res.data.code == 200) { - orgData.value = res.data.data || []; - // nextTick(() => { - // filterNode(); - // }) + const orgDataTemp = res.data.data || [] + orgDataTemp.shift() + orgData.value = filterOrg(orgDataTemp); + }else { - $message.error(res.data.msg) + $message.error(res.data.data) } }) } + const filterOrg = (data) => { + if(data.length > 0) { + data.forEach(item => { + item.disabled = item.data_type === 0 ? false : true; + + if(item.Child){ + filterOrg(item.Child) + }else { + return + } + }) + } + return data; + } + const filterNode = (value, data) => { return data.data_type === 0 diff --git a/src/page/main/system/organization/org-user/index.vue b/src/page/main/system/organization/org-user/index.vue index 6f18edf..c1bab5f 100644 --- a/src/page/main/system/organization/org-user/index.vue +++ b/src/page/main/system/organization/org-user/index.vue @@ -108,6 +108,7 @@ const formData = reactive({ }); //账号信息表单+个人信息表单 const successFlag = ref(false) +const orgId = ref('') // 下一步 const nextStep = () => { @@ -138,7 +139,7 @@ const getOrgPersonFormData = (data) => { successFlag.value = true; step.value = 3; }else { - $message.error(res.data.msg) + $message.error(res.data.data) } }) @@ -155,7 +156,7 @@ const getOrgPersonFormData = (data) => { successFlag.value = true; step.value = 3; }else { - $message.error(res.data.msg) + $message.error(res.data.data) } }) } @@ -204,7 +205,7 @@ const getDetail = () => { remark: form.remark, }) }else { - $message.error(res.data.msg) + $message.error(res.data.data) } }) } diff --git a/src/page/main/system/organization/org-user/org-account-form.vue b/src/page/main/system/organization/org-user/org-account-form.vue index ad0783c..acca43a 100644 --- a/src/page/main/system/organization/org-user/org-account-form.vue +++ b/src/page/main/system/organization/org-user/org-account-form.vue @@ -8,7 +8,7 @@ style="max-width: 66%" > - + @@ -45,9 +45,11 @@