From 304e3b8bae0915e55ba2ad7dee455c72e9db9a4b Mon Sep 17 00:00:00 2001 From: dai <851733175@qq.com> Date: Tue, 14 Jun 2022 17:42:27 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=8F=AF=E8=A7=86=E5=8C=96=E8=8F=9C?= =?UTF-8?q?=E5=8D=95=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/validate.js | 22 ++++++++++++---------- src/views/main-shuju/main-content.vue | 4 ++-- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/src/utils/validate.js b/src/utils/validate.js index 0215c8c4..a130010f 100644 --- a/src/utils/validate.js +++ b/src/utils/validate.js @@ -2,38 +2,40 @@ * 邮箱 * @param {*} s */ -export function isEmail (s) { - return /^([a-zA-Z0-9._-])+@([a-zA-Z0-9_-])+((.[a-zA-Z0-9_-]{2,3}){1,2})$/.test(s) +export function isEmail(s) { + return /^([a-zA-Z0-9._-])+@([a-zA-Z0-9_-])+((.[a-zA-Z0-9_-]{2,3}){1,2})$/.test( + s + ); } /** * 手机号码 * @param {*} s */ -export function isMobile (s) { - return /^1[0-9]{10}$/.test(s) +export function isMobile(s) { + return /^1[0-9]{10}$/.test(s); } /** * 电话号码 * @param {*} s */ -export function isPhone (s) { - return /^([0-9]{3,4}-)?[0-9]{7,8}$/.test(s) +export function isPhone(s) { + return /^([0-9]{3,4}-)?[0-9]{7,8}$/.test(s); } /** * URL地址 * @param {*} s */ -export function isURL (s) { - return /^http[s]?:\/\/.*/.test(s) +export function isURL(s) { + return /^http[s]?:\/\/.*/.test(s) || /^\/\/.*/.test(s); } /** * 身份证 * @param {*} s */ -export function isCard (s) { - return /^(\d{15}$)|(^\d{17}([0-9]|X)$)/.test(s) +export function isCard(s) { + return /^(\d{15}$)|(^\d{17}([0-9]|X)$)/.test(s); } diff --git a/src/views/main-shuju/main-content.vue b/src/views/main-shuju/main-content.vue index 360e96f3..4d6a73a3 100644 --- a/src/views/main-shuju/main-content.vue +++ b/src/views/main-shuju/main-content.vue @@ -61,8 +61,8 @@ export default { // "&customerId=" + // localStorage.getItem("customerId"); - return /^http[s]?:\/\/.*/.test(url) || /^\/\/.*/.test(url); - // return isURL(url); + // return /^http[s]?:\/\/.*/.test(url); + return isURL(url); }, // tabs, 选中tab tabSelectedHandle(tab) { From 137384dfa00bfe2cba8e4cfc44c7cd3f7dfc830c Mon Sep 17 00:00:00 2001 From: 13176889840 <13176889840@163.com> Date: Thu, 16 Jun 2022 11:10:58 +0800 Subject: [PATCH 2/5] dd --- src/views/main-shuju/main.vue | 2 +- src/views/main.vue | 2 +- src/views/modules/visual/communityParty/community.vue | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/views/main-shuju/main.vue b/src/views/main-shuju/main.vue index 8d4f0bc2..4abb6808 100644 --- a/src/views/main-shuju/main.vue +++ b/src/views/main-shuju/main.vue @@ -123,7 +123,7 @@ export default { localStorage.setItem("customerName", data.customerName || ""); } } else { - this.$message.error(rspMsg); + this.$message.error(msg); } }, }, diff --git a/src/views/main.vue b/src/views/main.vue index f12112f3..eb6f306e 100644 --- a/src/views/main.vue +++ b/src/views/main.vue @@ -159,7 +159,7 @@ export default { localStorage.setItem("customerName", data.customerName || ""); } } else { - this.$message.error(rspMsg); + this.$message.error(msg); } }, }, diff --git a/src/views/modules/visual/communityParty/community.vue b/src/views/modules/visual/communityParty/community.vue index e8f825ac..34cff4b2 100644 --- a/src/views/modules/visual/communityParty/community.vue +++ b/src/views/modules/visual/communityParty/community.vue @@ -530,6 +530,7 @@ export default { this.unitTableData = data.list.map((item, index) => { return { ...item, + index: index + 1, urlIndex: index } }) From 8bc1ced9d43f5e8d6e6cb87442f64fc7d533ba37 Mon Sep 17 00:00:00 2001 From: 13176889840 <13176889840@163.com> Date: Thu, 16 Jun 2022 16:20:27 +0800 Subject: [PATCH 3/5] dd --- src/views/modules/visual/communityParty/party.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/views/modules/visual/communityParty/party.vue b/src/views/modules/visual/communityParty/party.vue index 016d7e59..53439191 100644 --- a/src/views/modules/visual/communityParty/party.vue +++ b/src/views/modules/visual/communityParty/party.vue @@ -317,6 +317,7 @@ export default { // return // } if (params.seriesIndex == 0 || params.seriesIndex == 2) { + console.log('请求了吗') this.ageCode = '' // this.getUnitList(this.agencyId) this.getAgeList() @@ -378,7 +379,7 @@ export default { // this.getEduList() // return // } - this.clickEduPie(params.dataIndex) + // this.clickEduPie(params.dataIndex) if (params.seriesIndex == 0 || params.seriesIndex == 2) { this.eduCode = '' this.getEduList() From 0e267d89622dc232a84235fc74ae0a6e3c3e41ae Mon Sep 17 00:00:00 2001 From: zhaoyongnian <541231643@qq.com> Date: Thu, 16 Jun 2022 16:56:42 +0800 Subject: [PATCH 4/5] bug --- .../partymember/icpartyorg-add-or-update.vue | 32 ++++++++++++------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/src/views/modules/partymember/icpartyorg-add-or-update.vue b/src/views/modules/partymember/icpartyorg-add-or-update.vue index 04bbde23..93c020d7 100644 --- a/src/views/modules/partymember/icpartyorg-add-or-update.vue +++ b/src/views/modules/partymember/icpartyorg-add-or-update.vue @@ -145,12 +145,6 @@ agencyOrgList:[] } }, - // mounted () { - // setTimeout(() => { - // console.log(':::::::::::::::::::::::') - // this.initMap() - // }, 800); - // }, methods: { init() { this.visible = true @@ -159,10 +153,10 @@ this.dataForm.staffId = localStorage.getItem('staffId') this.keyWords = '' //设置党组织类型 - - this.$nextTick(() => { + setTimeout(() => { this.$refs['dataForm'].resetFields() this.dataForm.latitude = '' + this.dataForm.agencyId = '' if (this.dataForm.id) { this.setPartyOrgType() this.getInfo() @@ -174,14 +168,17 @@ this.dataForm.orgPid = this.dataForm.orgId this.dataForm.orgPids = this.dataForm.orgPids ? this.dataForm.orgPids + ':' + this.dataForm.orgId : this.dataForm.orgId this.dataForm.partyOrgType = this.dataForm._partyOrgType - console.log(this.dataForm.partyOrgType, this.dataForm.orgPid, this.dataForm.orgPids) + this.setPartyOrgType_xzxj() this.getInfoAgencyLisy() } else { this.dataForm.mySelectOrg = '' } } - }) + }, 50); + // this.$nextTick(() => { + + // }) }, // 设置组织类型 新增党组织 setPartyOrgType_xzxj() { @@ -250,9 +247,22 @@ if(value == '5'){ // 支部 不选择行政组织 this.dataForm.agencyId = localStorage.getItem('agencyId') this.dataForm.agencyPids = '' + // 先清空数据 + this.orgList = [] + this.dataForm.mySelectOrg = '', // 我选中的当前党组织 + this.dataForm.orgPid = '', // 党组织的上级ID,没有上级时为0 + this.dataForm.orgPids = '' this.getOrgList() } else { - //根据组织类型获取行政组织 + // 先清空数据 + this.agencyOrgList = [] + this.dataForm.agencyId = '' + + // 先清空数据 + this.orgList = [] + this.dataForm.mySelectOrg = '', // 我选中的当前党组织 + this.dataForm.orgPid = '', // 党组织的上级ID,没有上级时为0 + this.dataForm.orgPids = '' this.getInfoAgencyLisy() } }, From 40457fc2cf51077f5f908bf197aa7da138f55adf Mon Sep 17 00:00:00 2001 From: zhaoyongnian <541231643@qq.com> Date: Thu, 16 Jun 2022 17:00:37 +0800 Subject: [PATCH 5/5] bug --- src/views/modules/partymember/icpartyorgtree.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/modules/partymember/icpartyorgtree.vue b/src/views/modules/partymember/icpartyorgtree.vue index b7935dd0..77658534 100644 --- a/src/views/modules/partymember/icpartyorgtree.vue +++ b/src/views/modules/partymember/icpartyorgtree.vue @@ -1,5 +1,5 @@