Browse Source

Merge branch 'feature/dev_party_mange' of http://git.elinkit.com.cn:7070/r/epmet-oper-gov into feature/dev_party_mange

shibei_master
13176889840 3 years ago
parent
commit
daef128470
  1. 22
      src/utils/validate.js
  2. 4
      src/views/main-shuju/main-content.vue
  3. 32
      src/views/modules/partymember/icpartyorg-add-or-update.vue
  4. 2
      src/views/modules/partymember/icpartyorgtree.vue

22
src/utils/validate.js

@ -2,38 +2,40 @@
* 邮箱 * 邮箱
* @param {*} s * @param {*} s
*/ */
export function isEmail (s) { export function isEmail(s) {
return /^([a-zA-Z0-9._-])+@([a-zA-Z0-9_-])+((.[a-zA-Z0-9_-]{2,3}){1,2})$/.test(s) return /^([a-zA-Z0-9._-])+@([a-zA-Z0-9_-])+((.[a-zA-Z0-9_-]{2,3}){1,2})$/.test(
s
);
} }
/** /**
* 手机号码 * 手机号码
* @param {*} s * @param {*} s
*/ */
export function isMobile (s) { export function isMobile(s) {
return /^1[0-9]{10}$/.test(s) return /^1[0-9]{10}$/.test(s);
} }
/** /**
* 电话号码 * 电话号码
* @param {*} s * @param {*} s
*/ */
export function isPhone (s) { export function isPhone(s) {
return /^([0-9]{3,4}-)?[0-9]{7,8}$/.test(s) return /^([0-9]{3,4}-)?[0-9]{7,8}$/.test(s);
} }
/** /**
* URL地址 * URL地址
* @param {*} s * @param {*} s
*/ */
export function isURL (s) { export function isURL(s) {
return /^http[s]?:\/\/.*/.test(s) return /^http[s]?:\/\/.*/.test(s) || /^\/\/.*/.test(s);
} }
/** /**
* 身份证 * 身份证
* @param {*} s * @param {*} s
*/ */
export function isCard (s) { export function isCard(s) {
return /^(\d{15}$)|(^\d{17}([0-9]|X)$)/.test(s) return /^(\d{15}$)|(^\d{17}([0-9]|X)$)/.test(s);
} }

4
src/views/main-shuju/main-content.vue

@ -61,8 +61,8 @@ export default {
// "&customerId=" + // "&customerId=" +
// localStorage.getItem("customerId"); // localStorage.getItem("customerId");
return /^http[s]?:\/\/.*/.test(url) || /^\/\/.*/.test(url); // return /^http[s]?:\/\/.*/.test(url);
// return isURL(url); return isURL(url);
}, },
// tabs, tab // tabs, tab
tabSelectedHandle(tab) { tabSelectedHandle(tab) {

32
src/views/modules/partymember/icpartyorg-add-or-update.vue

@ -145,12 +145,6 @@
agencyOrgList:[] agencyOrgList:[]
} }
}, },
// mounted () {
// setTimeout(() => {
// console.log(':::::::::::::::::::::::')
// this.initMap()
// }, 800);
// },
methods: { methods: {
init() { init() {
this.visible = true this.visible = true
@ -159,10 +153,10 @@
this.dataForm.staffId = localStorage.getItem('staffId') this.dataForm.staffId = localStorage.getItem('staffId')
this.keyWords = '' this.keyWords = ''
// //
setTimeout(() => {
this.$nextTick(() => {
this.$refs['dataForm'].resetFields() this.$refs['dataForm'].resetFields()
this.dataForm.latitude = '' this.dataForm.latitude = ''
this.dataForm.agencyId = ''
if (this.dataForm.id) { if (this.dataForm.id) {
this.setPartyOrgType() this.setPartyOrgType()
this.getInfo() this.getInfo()
@ -174,14 +168,17 @@
this.dataForm.orgPid = this.dataForm.orgId this.dataForm.orgPid = this.dataForm.orgId
this.dataForm.orgPids = this.dataForm.orgPids ? this.dataForm.orgPids + ':' + this.dataForm.orgId : this.dataForm.orgId this.dataForm.orgPids = this.dataForm.orgPids ? this.dataForm.orgPids + ':' + this.dataForm.orgId : this.dataForm.orgId
this.dataForm.partyOrgType = this.dataForm._partyOrgType this.dataForm.partyOrgType = this.dataForm._partyOrgType
console.log(this.dataForm.partyOrgType, this.dataForm.orgPid, this.dataForm.orgPids)
this.setPartyOrgType_xzxj() this.setPartyOrgType_xzxj()
this.getInfoAgencyLisy() this.getInfoAgencyLisy()
} else { } else {
this.dataForm.mySelectOrg = '' this.dataForm.mySelectOrg = ''
} }
} }
}) }, 50);
// this.$nextTick(() => {
// })
}, },
// //
setPartyOrgType_xzxj() { setPartyOrgType_xzxj() {
@ -250,9 +247,22 @@
if(value == '5'){ // if(value == '5'){ //
this.dataForm.agencyId = localStorage.getItem('agencyId') this.dataForm.agencyId = localStorage.getItem('agencyId')
this.dataForm.agencyPids = '' this.dataForm.agencyPids = ''
//
this.orgList = []
this.dataForm.mySelectOrg = '', //
this.dataForm.orgPid = '', // ID,0
this.dataForm.orgPids = ''
this.getOrgList() this.getOrgList()
} else { } else {
// //
this.agencyOrgList = []
this.dataForm.agencyId = ''
//
this.orgList = []
this.dataForm.mySelectOrg = '', //
this.dataForm.orgPid = '', // ID,0
this.dataForm.orgPids = ''
this.getInfoAgencyLisy() this.getInfoAgencyLisy()
} }
}, },

2
src/views/modules/partymember/icpartyorgtree.vue

@ -1,5 +1,5 @@
<template> <template>
<el-card class="resi-card-table"> <el-card ref="searchCard" class="resi-card-table">
<div class="resi-row-btn"> <div class="resi-row-btn">
<el-button class="diy-button--add" <el-button class="diy-button--add"
size="small" size="small"

Loading…
Cancel
Save