diff --git a/project/pingchang/apps/AppPartyMember/components/List.vue b/project/pingchang/apps/AppPartyMember/components/List.vue index 6cde8a8b..d3ddba7b 100644 --- a/project/pingchang/apps/AppPartyMember/components/List.vue +++ b/project/pingchang/apps/AppPartyMember/components/List.vue @@ -145,7 +145,7 @@ - +
diff --git a/project/pingchang/apps/AppWishfulThinking/components/Add.vue b/project/pingchang/apps/AppWishfulThinking/components/Add.vue index 3132a8ee..11b233ba 100644 --- a/project/pingchang/apps/AppWishfulThinking/components/Add.vue +++ b/project/pingchang/apps/AppWishfulThinking/components/Add.vue @@ -7,10 +7,10 @@ - + @@ -108,10 +113,12 @@ title="事件指派" @onConfirm="onForwardConfirm"> - - + + @@ -128,37 +135,6 @@ - -
- - - -
-
-
- {{ data.isUser ? `${data.name}-${data.phone}` : data.girdName }} -
-
-
- -
- @@ -175,11 +151,10 @@ export default { return { forwardForm: { content: '', - girdId: '', - girdName: '', - girdMemberId: '', - girdMemberName: '', - name: '' + user: [], + wxUserName: '', + wxUserId: '', + files: [] }, isLoading: true, name: '', @@ -190,9 +165,6 @@ export default { userList: [], processList: [], dictList: [], - defaultProps: { - label: 'girdName' - }, isShowForward: false, tree: [], gridInfo: {}, @@ -203,7 +175,7 @@ export default { content: [], eventStatus: '2' }, - evaluation: {} + evaluation: {}, } }, @@ -225,7 +197,7 @@ export default { methods: { getDetail() { - this.instance.post('/app/appclapeventinfo/queryDetailById', null, { + this.instance.post('/app/appclapeventinfopingchang/queryDetailById', null, { params: {id: this.$route.query.id} }).then(res => { if (res?.data) { @@ -242,56 +214,27 @@ export default { this.isLoading = false }) }, - - getGirdList() { - return this.instance.post(`/app/appgirdinfo/listAllByTop`).then(res => { - if (res?.data) { - return this.tree = this.formatList([res.data]) - } - }) + onChooseUser(v) { + this.forwardForm.user = v + this.forwardForm.wxUserId = v[0].id + this.forwardForm.wxUserName = v[0].name }, - onClose() { this.form.files = [] this.form.groupId = '' this.form.groupName = '' this.form.content = '' this.form.eventStatus = '' + this.forwardForm.content = '' - this.forwardForm.girdId = '' - this.forwardForm.girdName = '' - this.forwardForm.girdMemberId = '' - this.forwardForm.girdMemberName = '' + this.forwardForm.user = [] + this.forwardForm.files = [] this.forwardForm.name = '' }, - - formatList(list) { - for (let item of list) { - item.children = [item.girdList, item.girdMemberList?.map(e => ({ - ...e, isUser: true, girdName: item.girdName, - girdId: item.id - })) || []].flat() - if (item.girdList?.length > 0) { - this.formatList(item.girdList) - } - } - return list - }, - - filterNode(value, data) { - if (!value) return true - - return (data.girdName && data.girdName.indexOf(value) !== -1) || (data.name && data.name.indexOf(value) !== -1) || (data.name && data.phone.indexOf(value) !== -1) - }, - - onTreeChange(e) { - this.gridInfo = e - }, - onForwardConfirm() { this.$refs.forwardForm.validate(v => { if (v) { - this.instance.post('/app/appclapeventinfo/transferByManager', { + this.instance.post('/app/appclapeventinfopingchang/transfer', { ...this.forwardForm, id: this.$route.query.id }).then(res => { @@ -304,22 +247,8 @@ export default { } }) }, - - onConfirm() { - if (this.gridInfo.userId) { - this.forwardForm.girdId = this.gridInfo.girdId - this.forwardForm.girdName = this.gridInfo.girdName - this.forwardForm.girdMemberId = this.gridInfo.id - this.forwardForm.girdMemberName = this.gridInfo.name - } else { - this.forwardForm.girdId = this.gridInfo.id - } - this.forwardForm.girdName = this.gridInfo.girdName - this.forwardForm.name = `${this.gridInfo.girdName}${this.gridInfo.name ? '-' + this.gridInfo.name : ''}` - this.isShowUser = false - }, getDict() { - this.instance.post(`/app/appclapeventgroup/list?current=1&size=100000`).then(res => { + this.instance.post(`/app/appclapeventgrouppingchang/list?current=1&size=100000`).then(res => { if (res.code == 0) { this.dictList = res.data.records.map(v => { return { @@ -330,25 +259,12 @@ export default { } }) }, - - close() { - this.$confirm('确定关闭该事件？').then(() => { - this.instance.post(`/app/appmininotice/delete?ids=${this.$route.query.id}`).then(res => { - if (res.code == 0) { - this.$message.success('删除成功！') - this.getList() - } - }) - }) - }, - cancel(isRefresh) { this.$emit('change', { type: 'list', isRefresh: !!isRefresh }) }, - onChange(e) { this.instance.post(`/app/appvillagerintegralrule/list?size=1000&classification=${e}&ruleStatus=1`).then(res => { if (res.code === 0) { @@ -357,12 +273,11 @@ export default { } }) }, - initMap() { let {lng, lat} = this.detail let center = [lng, lat] AMapLoader.load({ - key: 'b553334ba34f7ac3cd09df9bc8b539dc', + key: '54a02a43d9828a8f9cd4f26fe281e74e', version: '2.0' }).then(AMap => { let map = new AMap.Map('map', { @@ -376,7 +291,6 @@ export default { map.add(marker) }) }, - handleEvent() { this.$refs.form.validate(v => { if (v) { @@ -587,5 +501,86 @@ export default { } } } + .AppAnnounceDetail-select { + display: flex; + align-items: center; + min-height: 32px; + line-height: 1; + background: #F5F5F5; + border-radius: 4px; + border: 1px solid #D0D4DC; + cursor: pointer; + overflow: hidden; + transition: border-color 0.2s cubic-bezier(0.645, 0.045, 0.355, 1); + + &:hover { + border-color: #26f; + } + + & > i { + flex: 1; + height: 100%; + line-height: 32px; + padding: 0 12px; + color: #888888; + font-size: 14px; + font-style: normal; + border-right: 1px solid #D0D4DC; + background: #fff; + } + + .AppAnnounceDetail-select__input { + position: absolute; + left: 0; + top: 0; + z-index: -1; + opacity: 0; + height: 100%; + } + + .select-right { + height: 100%; + padding: 0 12px; + color: #222222; + font-size: 12px; + cursor: pointer; + transition: all ease 0.3s; + + &:hover { + opacity: 0.5; + } + } + + .select-left { + display: flex; + flex-wrap: wrap; + flex: 1; + padding: 5px 0 0px 12px; + border-right: 1px solid #D0D4DC; + border-radius: 4px 0 0 4px; + background: #fff; + + em { + height: 22px; + line-height: 22px; + margin: 0 4px 5px 0; + color: #222222; + font-size: 12px; + font-style: normal; + } + + span { + height: 22px; + line-height: 22px; + margin: 0 4px 5px 0; + padding: 0 8px; + font-size: 12px; + color: #222222; + background: #F3F4F7; + border-radius: 2px; + border: 1px solid #D0D4DC; + } + } + } } diff --git a/project/pingchang/apps/AppWishfulThinking/components/List.vue b/project/pingchang/apps/AppWishfulThinking/components/List.vue index bea26d9e..7949e448 100644 --- a/project/pingchang/apps/AppWishfulThinking/components/List.vue +++ b/project/pingchang/apps/AppWishfulThinking/components/List.vue @@ -11,10 +11,10 @@ 添加 - 导入 - + --> { - this.instance.post("/app/appclapeventinfo/delete", null, { + this.instance.post("/app/appclapeventinfopingchang/delete", null, { params: {ids} }).then(res => { if (res?.code == 0) { diff --git a/project/tianfuxing/AppMerchantList/AppMerchantList.vue b/project/tianfuxing/AppMerchantList/AppMerchantList.vue index eeda3b54..e9dcbbea 100644 --- a/project/tianfuxing/AppMerchantList/AppMerchantList.vue +++ b/project/tianfuxing/AppMerchantList/AppMerchantList.vue @@ -46,7 +46,7 @@ - +