diff --git a/package.json b/package.json
index 49fc32c90f07bd852e65c9c68ad545269e4a8de4..89088e0d1307dcc858c30fcb12fe273eb3d2b1dd 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 fac6eb40fcb2a84f06cde34441a05db664842764..a243d24cda42db87f7a9c2c63cfc6c34c4bd67e0 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 8a128f279dd9b46e90fe4da3e75e5e4718a888d0..6cbf9d057a5a2d6486853dfe63046ebb955b09fa 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 c7a8cdb77d6483b0724a441eb637787793eacc76..e2bec5148092924000895c4123dd75e980917c2c 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 979a5781cc3e41127c708b7d55c0202f570a7c83..51869ae6d413dd7f8ea1bfa1812b445e1b9bed22 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 672bbf1c4dfe41a6121eaf5e9f1f0a8926e9ea10..fa372b1118d028807732ad4922ef7732f67d8867 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 119de0be9940349df31853eb8b38d5daeed23f6d..4e63feb816592ab15fc9713a9b63293115048dcd 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 89fabbe5b018dc8a64deaa0d6eb352e4e28a79ef..a2c24e5dbd60d1dd1e8f588acda67f4f2eb077a7 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 76d89db23507dd9bc6aa2fdc6933af34852a901e..b2786b2d3a8d42e19cc7d3a4ad5ec4f0e585b1ce 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 bf07c2011413946ee24692ef3852853819c722c9..c4bad606e9abf1c1402d2526be3f63662da95b76 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 8056620255f339f0aa2ffa4272926b78911689b4..acb3e0082d157fe5609095a99e555d704a7a3d51 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 2f333642e7089c2533bf7ee33773eeb062fd3c0c..1f6df04c6189d0366798110345834dd155735310 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 6f18edf40f57d3cb9462e6b012fdc5eac7ab7fc0..c1bab5f131caefabd6127ba09e89afade7cdb029 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 ad0783cf907a4cfae601c4f1fc00039dca35feae..acca43ac73353457bb3d2662f3405050bff63105 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 @@