diff --git a/src/views/modules/workRecord/group-user.vue b/src/views/modules/workRecord/group-user.vue new file mode 100644 index 00000000..53745ac7 --- /dev/null +++ b/src/views/modules/workRecord/group-user.vue @@ -0,0 +1,200 @@ + + + + + + + + + + + + + + + + + + + {{ $t('query') }} + + + + + + + + + + + + + {{ $t('user.status0') }} + {{ $t('user.status1') }} + + + + + + + + {{"确定"}} + + + + + + + + \ No newline at end of file diff --git a/src/views/modules/workRecord/groupfamily-add.vue b/src/views/modules/workRecord/groupfamily-add.vue index a63e910f..3b531648 100644 --- a/src/views/modules/workRecord/groupfamily-add.vue +++ b/src/views/modules/workRecord/groupfamily-add.vue @@ -37,6 +37,15 @@ + + + + @@ -97,8 +106,13 @@ export default { createdBy: '', createdTime: '', updatedBy: '', - updatedTime: '' + updatedTime: '', + streetId: '', + communityId: '', + gridId: '' }, + ids:[], + options: [], pairingReason:[], sexList: [ {dictValue: '1', dictName: '男'}, @@ -165,8 +179,47 @@ export default { }, created: function () { this.getPairingReasonInfo() + this.getOptions() + }, + watch: { + ids: function (val) { + console.log("部门树:"+val); + if (val.length === 0) { + this.dataForm.streetId = '' + this.dataForm.communityId = '' + this.dataForm.gridId = '' + } + if (val.length === 1) { + this.dataForm.streetId = this.ids[0] + this.dataForm.communityId = '' + this.dataForm.gridId = '' + } + if (val.length === 2) { + this.dataForm.streetId = this.ids[0] + this.dataForm.communityId = this.ids[1] + this.dataForm.gridId = '' + } + if (val.length === 3) { + this.dataForm.streetId = this.ids[0] + this.dataForm.communityId = this.ids[1] + this.dataForm.gridId = this.ids[2] + } + } }, methods: { + //获取部门信息 + getOptions() { + this.$http + .get(`/sys/user/deptOptions/getByLoginUser`) + .then(({data: res}) => { + if (res.code !== 0) { + return this.$message.error(res.msg) + } + this.options = res.data.options + }) + .catch(() => { + }) + }, getPairingReasonInfo () { this.$http.get(`sys/dict/listSimple/pairing_reason`).then(({ data: res }) => { this.pairingReason = res.data diff --git a/src/views/modules/workRecord/helpgroup-add-or-update.vue b/src/views/modules/workRecord/helpgroup-add-or-update.vue index 85b43afb..280ce76a 100644 --- a/src/views/modules/workRecord/helpgroup-add-or-update.vue +++ b/src/views/modules/workRecord/helpgroup-add-or-update.vue @@ -1,27 +1,28 @@ - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + {{ $t('cancel') }} @@ -87,7 +88,7 @@ export default { }, // 获取信息 getInfo () { - this.$http.get(`/workrecord/helpgroup/${this.dataForm.id}`).then(({ data: res }) => { + this.$http.get(`/workRecord/helpgroup/${this.dataForm.id}`).then(({ data: res }) => { if (res.code !== 0) { return this.$message.error(res.msg) } @@ -103,7 +104,7 @@ export default { if (!valid) { return false } - this.$http[!this.dataForm.id ? 'post' : 'put']('/workrecord/helpgroup/', this.dataForm).then(({ data: res }) => { + this.$http[!this.dataForm.id ? 'post' : 'put']('/workRecord/helpgroup/', this.dataForm).then(({ data: res }) => { if (res.code !== 0) { return this.$message.error(res.msg) } diff --git a/src/views/modules/workRecord/helpgroup.vue b/src/views/modules/workRecord/helpgroup.vue index 4ed88ba2..90513e04 100644 --- a/src/views/modules/workRecord/helpgroup.vue +++ b/src/views/modules/workRecord/helpgroup.vue @@ -9,7 +9,7 @@ {{ $t('query') }} - {{ $t('add') }} + {{ $t('add') }} {{ $t('deleteBatch') }} @@ -30,11 +30,13 @@ - + - - - {{ $t('添加家庭') }} + {{ $t('添加家庭') }} + {{ $t('关联干部') }} + {{ '查看详情' }} + {{ $t('update') }} + {{ $t('delete') }} @@ -50,6 +52,7 @@ + @@ -58,6 +61,7 @@ import mixinViewModule from '@/mixins/view-module' import AddOrUpdate from './helpgroup-add-or-update' import GroupfamilyAdd from './groupfamily-add' +import GroupUser from './group-user' export default { mixins: [mixinViewModule], data () { @@ -71,17 +75,23 @@ export default { dataForm: { id: '' }, - familyAddVisible:false + familyAddVisible:false, + groupUserVisible:false } }, components: { AddOrUpdate, - GroupfamilyAdd + GroupfamilyAdd, + GroupUser }, created: function () { this.getDataList() }, methods: { + selectDetails (id) { + this.$parent.selectComponent = 'HelpgroupDetail' + this.$router.push({ path: '/workRecord-helpgrouproute', query: { id: id} }) + }, addFamily(infoId) { this.familyAddVisible = true this.$nextTick(() => { @@ -89,6 +99,15 @@ export default { this.$refs.groupfamilyAdd.init() }) }, + addGroupUser(infoId,userIdList) { + this.groupUserVisible = true + this.$nextTick(() => { + this.$refs.groupUser.dataForm.groupId = infoId + console.log(userIdList) + this.$refs.groupUser.userIdListl = userIdList + this.$refs.groupUser.init() + }) + }, } } diff --git a/src/views/modules/workRecord/helpgroupDetail.vue b/src/views/modules/workRecord/helpgroupDetail.vue new file mode 100644 index 00000000..c656eae9 --- /dev/null +++ b/src/views/modules/workRecord/helpgroupDetail.vue @@ -0,0 +1,200 @@ + + + + + + {{dataForm.groupName}} + + + + + + + + + {{scope.$index+1}} + + + + + + + + + {{ $t('delete') }} + + + + + + + + + + + {{scope.$index+1}} + + + + + + + + + + + {{ $t('delete') }} + + + + + + + + {{"返回"}} + + + + {{ $t('cancel') }} + {{ $t('confirm') }} + + + + + + + + diff --git a/src/views/modules/workRecord/helpgrouproute.vue b/src/views/modules/workRecord/helpgrouproute.vue index 3ae1b153..811af4c9 100644 --- a/src/views/modules/workRecord/helpgrouproute.vue +++ b/src/views/modules/workRecord/helpgrouproute.vue @@ -6,6 +6,7 @@