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

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

@@ -37,6 +37,7 @@
             </el-form-item>
             <el-form-item v-if="!dataForm.sjdzzName"  prop="mySelectOrg" label="上级党组织">
                 <el-cascader
+                    ref="myOrg"
                     style="width:300px"
                     v-model="dataForm.mySelectOrg"
                     :options="orgList"
@@ -298,7 +299,7 @@
             handleChangeOrg(e) {
                 if (this.dataForm.mySelectOrg.length > 0 && this.dataForm.mySelectOrg) {
                     this.dataForm.orgPid = this.dataForm.mySelectOrg[this.dataForm.mySelectOrg.length - 1]
-                    this.dataForm.orgPids = ''
+                    this.dataForm.orgPids = this.$refs.myOrg.getCheckedNodes()[0].data.orgPids;
                     this.dataForm.mySelectOrg.forEach(element => {
                         this.dataForm.orgPids = this.dataForm.orgPids ? this.dataForm.orgPids + ':' + element : element
                     });
@@ -330,7 +331,7 @@
                 })
             },
             getInfoAgencyLisy(){
-                this.$http.get('/gov/org/customeragency/getOrgTreeByUserAndType', {params: {agencyId: this.agencyId, orgType: this.dataForm.partyOrgType}}).then(({data: res}) => {
+                this.$http.get('/gov/org/customeragency/getOrgTreeByUserAndType', {params: {agencyId: this.dataForm.pid?this.dataForm.pid:this.agencyId, orgType: this.dataForm.partyOrgType}}).then(({data: res}) => {
                     if (res.code !== 0) {
                         return this.$message.error(res.internalMsg ? res.internalMsg : res.msg ? res.msg : '查询失败')
                     }

src/views/modules/partymember/icpartyorgtree.vue

@@ -25,7 +25,7 @@
                           size="small"
                           class="div-table-button--detail">{{'查看党员'}}</el-button>
                 <el-button v-if="(scope.row.agencyId == agencyId || scope.row.agencyPids.includes(agencyId)) && scope.row.partyOrgType != '5'"
-                          @click="addOrUpdateHandle('', scope.row.id, scope.row.orgPids, '', scope.row.partyOrgType, scope.row.partyOrgName)"
+                          @click="addOrUpdateHandle('', scope.row.id, scope.row.orgPids, scope.row.agencyId, scope.row.partyOrgType, scope.row.partyOrgName)"
                           type="text"
                           size="small"
                           class="div-table-button--add">新增下级</el-button>