diff --git a/src/views/modules/communityParty/regionalParty/activitysDetail.vue b/src/views/modules/communityParty/regionalParty/activitysDetail.vue index 9306cea3f..9195fe7a8 100644 --- a/src/views/modules/communityParty/regionalParty/activitysDetail.vue +++ b/src/views/modules/communityParty/regionalParty/activitysDetail.vue @@ -191,4 +191,9 @@ export default { height: auto; } } +.div-btn{ + display: flex; + justify-content: flex-end; + margin-right: 16px; +} diff --git a/src/views/modules/communityParty/regionalParty/activitysForm.vue b/src/views/modules/communityParty/regionalParty/activitysForm.vue index fed357721..58d508716 100644 --- a/src/views/modules/communityParty/regionalParty/activitysForm.vue +++ b/src/views/modules/communityParty/regionalParty/activitysForm.vue @@ -24,32 +24,16 @@ - - - - {{item.label}} - - - - - + + - { + if (res.code !== 0) { + return this.$message.error(res.msg); + } else { + this.demandOptions = this.getFlagData( + this.getTreeData(res.data), + "usableFlag" + ); + } + }) + .catch(() => { + return this.$message.error("网络错误"); + }); + }, + getFlagData(data, flag) { + if (!Array.isArray(data)) return []; + let arr1 = data.filter((item) => item[flag]); + let arr2 = arr1.map((item) => { + if (item.childCateList) + return { ...item, childCateList: this.getFlagData(item.childCateList, flag) }; + else return item; + }); + // console.log('arrr-oppp', arr2) + return arr2; + }, + getTreeData(data) { + if (!Array.isArray(data)) return []; + let arr = data.map((item) => { + let _item = {}; + if (item.childCateList) { + if (item.childCateList.length === 0) + _item = { ...item, childCateList: undefined }; + else _item = { ...item, childCateList: this.getTreeData(item.childCateList) }; + } else { + _item = { ...item }; + } + return _item; + }); + return arr; + }, async loadGrid () { const url = "/gov/org/customergrid/gridoption" @@ -313,26 +343,7 @@ export default { }, - //获取服务事项下拉框 - async loadService () { - const url = "/actual/base/serviceitem/dict-list" - - let params = { - type: 'usable' - // parentCategoryCode: '1010' - } - - const { data, code, msg } = await requestPost(url, params) - - if (code === 0) { - this.serviceList = data - - } else { - this.$message.error(msg) - } - - }, - + //加载组织 async loadFormData () { const url = '/heart/icpartyactivity/detail' diff --git a/src/views/modules/communityService/policy/addPolicy.vue b/src/views/modules/communityService/policy/addPolicy.vue index 9cabb8148..b25369ec7 100644 --- a/src/views/modules/communityService/policy/addPolicy.vue +++ b/src/views/modules/communityService/policy/addPolicy.vue @@ -523,6 +523,7 @@ export default { //点击标签触发事件 handleClickLabel() { this.showLabelForm = true; + this.$refs['ref_form'].clearValidate('resiSearchTagId') this.$nextTick(() => { this.$refs["ref_label_form"].initForm("info"); }); @@ -796,7 +797,7 @@ export default { if (res.code !== 0) { return this.$message.error(res.msg); } else { - this.demandOptions = this.getFlagData( + this.demandOptions = this.getFlagDatas( this.getTreeData(res.data), "usableFlag" ); @@ -806,12 +807,12 @@ export default { return this.$message.error("网络错误"); }); }, - getFlagData(data, flag) { + getFlagDatas(data, flag) { if (!Array.isArray(data)) return []; let arr1 = data.filter((item) => item[flag]); let arr2 = arr1.map((item) => { - if (item.children) - return { ...item, children: this.getFlagData(item.children, flag) }; + if (item.childCateList) + return { ...item, childCateList: this.getFlagData(item.childCateList, flag) }; else return item; }); // console.log('arrr-oppp', arr2) @@ -822,10 +823,10 @@ export default { if (!Array.isArray(data)) return []; let arr = data.map((item) => { let _item = {}; - if (item.children) { - if (item.children.length === 0) - _item = { ...item, children: undefined }; - else _item = { ...item, children: this.getTreeData(item.children) }; + if (item.childCateList) { + if (item.childCateList.length === 0) + _item = { ...item, childCateList: undefined }; + else _item = { ...item, childCateList: this.getTreeData(item.childCateList) }; } else { _item = { ...item }; } diff --git a/src/views/modules/workSys/serviceMatters.vue b/src/views/modules/workSys/serviceMatters.vue index df9b3800b..7660f0612 100644 --- a/src/views/modules/workSys/serviceMatters.vue +++ b/src/views/modules/workSys/serviceMatters.vue @@ -33,7 +33,7 @@ + :dialogVisible="dialogVisible" :categoryOptions="categoryOptions" :levelFlag="levelFlag" @handleClose="handleClose" /> @@ -87,6 +87,10 @@ export default { ], tableLoading: false, + + categoryOptions:[],//子组件一级分类过滤用 + + levelFlag:false }; }, components: { addForm }, @@ -134,6 +138,7 @@ export default { handleAdd(row, type) { if (row.categoryId) { this.detailId = row.categoryId; + this.levelFlag = (row.children || []).length > 0; } this.pageType = type; this.dialogVisible = true; @@ -208,7 +213,7 @@ export default { } }) : []; - + this.categoryOptions= this.tableData.map(item=>({label:item.categoryName,value:item.categoryName})) console.log(this.tableData); } else { this.$message.error(msg); diff --git a/src/views/modules/workSys/serviceMattersComponents/addForm.vue b/src/views/modules/workSys/serviceMattersComponents/addForm.vue index 813bb0362..fdc7a336a 100644 --- a/src/views/modules/workSys/serviceMattersComponents/addForm.vue +++ b/src/views/modules/workSys/serviceMattersComponents/addForm.vue @@ -16,16 +16,18 @@ :rules="dataRule" :label-width="'120px'" > - - + + > - + [] + }, + levelFlag:{ + type:Boolean, + default:false } }, @@ -182,6 +192,17 @@ export default { }, methods: { + querySearch(queryString, cb) { + console.log(this.categoryOptions); + const results = this.categoryOptions.filter(option => + option.label.includes(queryString) + ); + console.log(results); + cb(results); + }, + handleSelect(item){ + console.log(item); + }, handleAreaChange1(data) { let that = this; let demandList = []; @@ -281,7 +302,6 @@ export default { async save() { let form = this.formData; - console.log("this.formData", this.formData); const url = "/actual/base/serviceitem/saveorupdate"; var params = {}; params = { ...this.formData };