Merge branch 'master' into shibei_master

src/utils/validate.js

@@ -3,7 +3,9 @@
  * @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)
+  return /^([a-zA-Z0-9._-])+@([a-zA-Z0-9_-])+((.[a-zA-Z0-9_-]{2,3}){1,2})$/.test(
+    s
+  );
 }
 
 /**
@@ -11,7 +13,7 @@ export function isEmail (s) {
  * @param {*} s
  */
 export function isMobile(s) {
-  return /^1[0-9]{10}$/.test(s)
+  return /^1[0-9]{10}$/.test(s);
 }
 
 /**
@@ -19,7 +21,7 @@ export function isMobile (s) {
  * @param {*} 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);
 }
 
 /**
@@ -27,7 +29,7 @@ export function isPhone (s) {
  * @param {*} s
  */
 export function isURL(s) {
-  return /^http[s]?:\/\/.*/.test(s)
+  return /^http[s]?:\/\/.*/.test(s) || /^\/\/.*/.test(s);
 }
 
 /**
@@ -35,5 +37,5 @@ export function isURL (s) {
  * @param {*} 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);
 }

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 /^http[s]?:\/\/.*/.test(url);
-      // return isURL(url);
+      return isURL(url);
     },
     // tabs, 选中tab
     tabSelectedHandle(tab) {

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);
       }
     },
   },

src/views/main.vue

@@ -159,7 +159,7 @@ export default {
           localStorage.setItem("customerName", data.customerName || "");
         }
       } else {
-        this.$message.error(rspMsg);
+        this.$message.error(msg);
       }
     },
   },

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 = ''
                 //设置党组织类型
-                
+                setTimeout(() => {
-                this.$nextTick(() => {
                     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()
                 }
             },

src/views/modules/partymember/icpartyorgtree.vue

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

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
           }
         })

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()