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) { 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() } }, 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 @@