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

src/views/components/editResi.vue

@@ -14,7 +14,7 @@
         <el-row v-if="fixed" class="resi-row">
           <!-- <el-col v-for="n in item" :key="n.id" :span="n.itemType === 'textarea'&&24 || (24/columns)"> -->
           <el-col :span="6">
-              <el-form-item :prop="form.GRID_ID" label="所属网格" required>
+              <el-form-item prop="GRID_ID" label="所属网格" required>
               <!-- <div class="resi-cell"> -->
                 <!-- <div class="resi-cell-label">{{n.label}}</div> -->
                 <div class="resi-cell-value">
@@ -33,7 +33,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="18">
-              <el-form-item :prop="form.VILLAGE_ID" label="所属小区" required>
+              <el-form-item prop="VILLAGE_ID" label="所属小区" required>
                 <div class="resi-cell-value">
                   <el-select v-model.trim="form.VILLAGE_ID" :disabled="disabled" placeholder="请选择小区" size="small"
                   clearable class="resi-cell-select"
@@ -259,6 +259,10 @@ export default {
       type: String,
       default: 'resiForm'
     },
+    agencyId: {
+      type: String,
+      default: ''
+    },
     formList: {
       type: Array,
       default: function () {
@@ -639,7 +643,7 @@ export default {
                 _form[n] = this.fixedList[n]
               }
               if (Object.keys(_form).length > 0) {
-                if (!_form.AGENCY_ID) _form.AGENCY_ID = this.$store.state.user.agencyId
+                if (!_form.AGENCY_ID) _form.AGENCY_ID = this.agencyId
               }
               if (!_form.ID) _form.ID = ID
             }
@@ -680,8 +684,11 @@ export default {
     },
     getGridList () {
       const { user } = this.$store.state
+      let purpose = 'query'
+      if (this.disabled) purpose = 'query'
+      else purpose = 'addorupdate'
       this.$http
-        .post('/gov/org/customergrid/gridoption', { agencyId: user.agencyId })
+        .post('/gov/org/customergrid/gridoption', { agencyId: this.agencyId, purpose })
         .then(({ data: res }) => {
           if (res.code !== 0) {
             return this.$message.error(res.msg)
@@ -697,7 +704,7 @@ export default {
     getValiheList () {
       const { user } = this.$store.state
       this.$http
-        .post('/gov/org/icneighborhood/neighborhoodoption', { gridId: this.form.GRID_ID, agencyId: user.agencyId })
+        .post('/gov/org/icneighborhood/neighborhoodoption', { gridId: this.form.GRID_ID, agencyId: this.agencyId })
         .then(({ data: res }) => {
           if (res.code !== 0) {
             return this.$message.error(res.msg)

src/views/components/resiSearch.vue

@@ -455,7 +455,7 @@ export default {
     getGridList() {
       const { user } = this.$store.state
       this.$http
-        .post('/gov/org/customergrid/gridoption', { agencyId: user.agencyId })
+        .post('/gov/org/customergrid/gridoption', { agencyId: user.agencyId, purpose: 'query' })
         .then(({ data: res }) => {
           if (res.code !== 0) {
             return this.$message.error(res.msg)
@@ -473,7 +473,8 @@ export default {
       this.$http
         .post('/gov/org/icneighborhood/neighborhoodoption', {
           gridId: this.form.GRID_ID,
-          agencyId: user.agencyId
+          agencyId: ''
+          // agencyId: user.agencyId
         })
         .then(({ data: res }) => {
           if (res.code !== 0) {

src/views/modules/base/resi.vue

@@ -160,6 +160,7 @@
         :form-info="editForm"
         :fixed="true"
         :form-list="formList"
+        :agency-id="editAgencyId"
         @changegroup="handleChangeGroup"
       />
       <div v-if="dialogEditVisible" class="resi-other">
@@ -180,6 +181,7 @@
                 :muti-list="item.mutiList"
                 :form-list="item.itemList"
                 :disabled="disabled"
+                :agency-id="editAgencyId"
               />
             </el-tab-pane>
           </el-tabs>
@@ -230,6 +232,7 @@ export default {
       activeName: '',
       tableData: [],
       searchList: [],
+      editAgencyId: '',
       editForm: {
         GRID_ID: '',
         VILLAGE_ID: '',
@@ -411,11 +414,13 @@ export default {
     },
     async handleLook(row) {
       this.disabled = true
+      this.editAgencyId = row.ORG_ID
       await this.getFormList('edit')
       this.getrowInfo(row.icResiUserId)
     },
     async handleEdit(row) {
       this.disabled = false
+      this.editAgencyId = row.ORG_ID
       await this.getFormList('edit')
       await this.getrowInfo(row.icResiUserId)
     },