Merge branch 'dev-用户反馈' into dev

src/views/modules/partymember/icpartyorgtree.vue

@@ -305,7 +305,6 @@
       },
       // 查看党员
       handleLook(agencyPids, id, row,agencyId) {
-        console.log(row);
         this.lookMemberShow = true
         this.$nextTick(() => {
             this.$refs.ref_table_Member.initForm(agencyPids.split(':')[agencyPids.split(':').length - 1], id,agencyId)
@@ -316,7 +315,6 @@
       },
       lookMemberCancle () {
         this.lookMemberShow = false
-        this.$refs.ref_table_Member.searchForm = {}
       },
       lookMemberOk () {
         this.lookMemberShow = false

src/views/modules/partymember/lookMember.vue

@@ -27,6 +27,7 @@
                                :options="optionsG"
                                :props="partyProps"
                                clearable
+                               :key="cascaderKey"
                                @change="handlePartyChange"></el-cascader>
                 </el-form-item>
                 <el-form-item label="姓名"
@@ -311,6 +312,7 @@ import { requestGet } from '../../../js/dai/request'
 export default {
   data () {
     return {
+      cascaderKey:0,//级联选择器有报错监听不到数据变化
       uploadUlr: window.SITE_CONFIG['apiURL'] + '/oss/file/uploadqrcodeV2',
       importBtnTitle: '导入',
       importLoading: false,
@@ -433,6 +435,15 @@ export default {
   },
   components: {
     crateForm
+  },
+  created(){
+  },
+  watch: {
+    'optionsG': {
+        handler(newVal){
+          this.cascaderKey ++
+        } 
+    },
 },
   methods: {
     initForm (agencyId, id,agencyIds) {
@@ -442,7 +453,6 @@ export default {
       console.log('this.searchForm.partyOrgId:::::', this.searchForm.partyOrgId)
       this.tableLoading = true
 
-
       this.pageLoading = true
 
       this.getTableData()
@@ -450,6 +460,9 @@ export default {
     },
     // 取消
     handleCancle () {
+      this.partyOrgRange = []
+      console.log( this.partyOrgRange);
+      console.log(this.searchForm.partyOrgId);
       this.$emit('lookMemberCancle')
     },
 
@@ -658,6 +671,7 @@ export default {
       this.searchForm.payEndDate = ''
       this.searchForm.rdsjStartDate = ''
       this.searchForm.rdsjEndDate = ''
+      this.partyOrgRange = []
       this.$refs[formName].resetFields()
       this.searchForm.partyOrgId = this.partyOrgId
       this.handleSearch()
@@ -745,7 +759,7 @@ export default {
       this.tableLoading = true
       let params = {
         ...this.searchForm,
-        agencyId: this.agencyId,
+        // agencyId:this.agencyId,
         pageNo: this.currentPage,
         pageSize: this.pageSize
       }