Merge branch 'feature/dev_zz_wgh' into dev

src/views/modules/base/organization/organization.vue

@@ -2247,6 +2247,41 @@ export default {
     // 根据id获取组织机构详细信息
     async getOrgDetailsById () {
       const url = '/gov/org/agency/agencydetail'
+            let params = {
+                gridId: this.judgeOrgInfoLevel.id
+            }
+
+            const { data, code, msg } = await requestPost(url,params)
+
+            if(code === 0){
+                this.modifyGridFrom.gridName = data.gridName
+                this.modifyGridFrom.code = data.code
+                this.modifyGridFrom.gridTypeName = data.gridTypeName
+                this.modifyGridFrom.contacts = data.contacts
+                this.modifyGridFrom.mobile = data.mobile
+                this.modifyGridFrom.agencyId = data.agencyId
+                this.modifyGridFrom.gridType = data.gridType
+                this.modifyGridFrom.manageDistrict = data.manageDistrict
+                this.modifyGridFrom.griId = data.griId
+            }else {
+                this.$message.error(msg)
+            }
+        },  
+
+        // 市级/街道/社区级组织修改确定按钮
+        async sunmitModifyCityOrgPop(){
+            const url = '/gov/org/agency/editagency'
+
+            let params = {
+                agencyId: this.OrgDetailsForm.agencyId,
+                agencyName: this.OrgDetailsForm.agencyName,
+                contacts: this.OrgDetailsForm.contacts,
+                mobile: this.OrgDetailsForm.mobile,
+                code: this.OrgDetailsForm.code,
+                latitude: this.latitude,
+                longitude: this.longitude,
+                ss:''
+            }
 
             const { data, code, msg } = await requestPost(url,params)