kubbo/dvcp_v2_webapp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/build' into build

Browse Source
This commit is contained in:
aixianling
2023-03-01 16:45:10 +08:00
parent 7df0f128a3 74e78c8e59
commit a4476570bd
7 changed files with 88 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/wxwork/AnnounceResident/AppAnnounceResident/components/Add.vue
View File

@@ -201,7 +201,7 @@
</el-switch>
</el-form-item>
<el-form-item v-if="form.enableExamine === '1'" label="审批人员" prop="examines" style="width: 100%;" :rules="[{ required: true, message: '请选择审批人员', trigger: 'change' }]">
<ai-wechat-selecter :instance="instance" v-model="form.examines" @change="onUserChange">
<ai-user-selecter :instance="instance" v-model="form.examines" @change="onUserChange">
<div class="AppAnnounceDetail-select">
<el-input class="AppAnnounceDetail-select__input" size="small" placeholder="请选择..." v-model="form.examinesName"></el-input>
<div class="select-left" v-if="form.examines.length">
@@ -210,7 +210,7 @@
<i v-if="!form.examines.length">请选择</i>
<div class="select-right">{{ form.examines.length ? '重新选择' : '选择' }}</div>
</div>
</ai-wechat-selecter>
</ai-user-selecter>
</el-form-item>
</div>
</template>
@@ -325,7 +325,7 @@
<ai-dialog
:visible.sync="isShowTags"
width="800px"
title="批量打标签"
title="选择标签"
@close="onClose"
@onConfirm="onTagsConfirm">
<div class="tags">
@@ -346,7 +346,7 @@
<ai-dialog
:visible.sync="isShowRemoveTags"
width="800px"
title="批量移除标签"
title="剔除标签"
@close="onClose"
@onConfirm="onRemoveTagsConfirm">
<div class="tags">

53
packages/wxwork/AnnounceResident/AppAnnounceResident/components/Detail.vue
View File

@@ -133,11 +133,11 @@
:current.sync="search1.current"
:size.sync="search1.size"
@getList="getMemberInfo">
<el-table-column slot="user" label="成员" align="left">
<el-table-column slot="user" label="员工" align="left">
<template slot-scope="{ row }">
<div class="userinfo">
<span>{{ row.groupOwnerName }}</span>
<span style="color: #999">{{ row.mainDepartmentName }}</span>
<span>{{ row.userName }}</span>
<span style="color: #999">{{ row.userDepartmentName }}</span>
</div>
</template>
</el-table-column>
@@ -149,22 +149,26 @@
<ai-dialog
:visible.sync="isShowGroups"
width="890px"
customFooter
title="群发范围"
@onConfirm="isShowGroups = false">
<ai-wrapper>
<ai-info-item label="消息发送" isLine :value="info.taskTitle">
<div class="text">
<span>{{ info.sendScope === '0' ? '全部' : '按条件筛选的' }}</span>
<i>{{ info.groupList.length }}</i>
<span>个居民</span>
</div>
</ai-info-item>
<ai-info-item label="添加人" isLine :value="userNames"></ai-info-item>
<ai-info-item label="标签" isLine>{{ info.filterTagsName || '-' }}</ai-info-item>
<ai-info-item label="剔除标签" isLine>{{ info.excludeFilterTagsName || '-' }}</ai-info-item>
<ai-info-item label="性别" isLine>{{ mapGender(info.gender) }}</ai-info-item>
<ai-info-item label="添加时间" isLine>{{ info.addEndTime + '-' + info.addFromTime }}</ai-info-item>
</ai-wrapper>
<ai-wrapper>
<ai-info-item label="消息发送" isLine :value="info.taskTitle">
<div class="text">
<span>{{ info.sendScope === '0' ? '全部' : '按条件筛选的' }}</span>
<i>{{ info.groupList.length }}</i>
<span>个居民</span>
</div>
</ai-info-item>
<ai-info-item label="添加人" isLine :value="userNames"></ai-info-item>
<ai-info-item label="标签" isLine>{{ info.filterTagsName || '-' }}</ai-info-item>
<ai-info-item label="剔除标签" isLine>{{ info.excludeFilterTagsName || '-' }}</ai-info-item>
<ai-info-item label="性别" isLine>{{ mapGender(info.gender) }}</ai-info-item>
<ai-info-item label="添加时间" isLine>{{ info.addEndTime + '-' + info.addFromTime }}</ai-info-item>
</ai-wrapper>
<div class="dialog-footer" slot="footer">
<el-button @click="isShowGroups = false">关闭</el-button>
</div>
</ai-dialog>
<div class="detail-phone" v-if="isShowPhone">
<div class="mask"></div>
@@ -196,7 +200,6 @@
isShowGroups: false,
isShowPhone: false,
user1: [],
user2: [],
radio1: '未执行',
search1: {
current: 1,
@@ -206,20 +209,14 @@
sendStatus: '0'
},
memberInfo: {},
groupInfo: {},
tableData1: [],
fileList: [],
tableData2: [],
info: {},
content: '',
currIndex: 0,
colConfigs3: [
{ prop: 'groupOwnerName', label: '群主' },
{ prop: 'groupNames', label: '群名称' }
],
colConfigs1: [
{ slot: 'user', label: '成员' },
{ prop: 'groupCount', label: '预计送达居民群', align: 'center' }
{ slot: 'user', label: '员工' },
{ prop: 'groupCount', label: '预计送达居民', align: 'center' }
],
groups: [],
timer: null,
@@ -252,8 +249,8 @@
}
}).then(res => {
if (res.code === 0) {
// this.tableData1 = res.data.executedList.records
// this.total1 = res.data.executedList.total
this.tableData1 = res.data.executedList.records
this.total1 = res.data.executedList.total
this.memberInfo = res.data
}
})

17
packages/wxwork/AnnounceResident/AppAnnounceResident/components/List.vue
View File

@@ -33,14 +33,14 @@
@change="search.current = 1, getList()"
placeholder="选择群发结束日期">
</el-date-picker>
<ai-wechat-selecter :instance="instance" @change="onUserChange" :isMultiple="false" v-model="user">
<ai-user-selecter :instance="instance" @change="onUserChange" :isMultiple="false" v-model="user">
<div class="userSelcet">
<span style="color: #606266;" v-if="search.createUserId">{{ name }}</span>
<span v-else>创建人</span>
<i class="el-icon-arrow-up" v-if="!search.createUserId"></i>
<i class="el-icon-circle-close" v-if="search.createUserId" @click.stop="user = [], search.createUserId = '', name = '', search.current = 1, getList()"></i>
</div>
</ai-wechat-selecter>
</ai-user-selecter>
</template>
<template slot="right">
<el-input
@@ -74,6 +74,7 @@
<el-table-column slot="options" width="140px" fixed="right" label="操作" align="center">
<template slot-scope="{ row }">
<div class="table-options">
<el-button type="text" @click="close(row.id)" v-if="['3'].includes(row.status)">关闭</el-button>
<el-button type="text" @click="remindExamine(row.id)" v-if="['0'].includes(row.status)">催办</el-button>
<el-button type="text" @click="cancel(row.id)" v-if="['0'].includes(row.status)">撤回</el-button>
<el-button type="text" @click="toDetail(row.id)">详情</el-button>
@@ -182,7 +183,7 @@
remindExamine (id) {
this.$confirm('确认再次通知任务审核人员？').then(() => {
this.instance.post(`/app/appmasssendingtask/remindExamine?id=${id}`).then(res => {
this.instance.post(`/app/whchatmomentstask/remindExamine?id=${id}`).then(res => {
if (res.code == 0) {
this.$message.success('催办成功！')
this.getList()
@@ -193,7 +194,7 @@
cancel (id) {
this.$confirm('确认撤回该群发任务？').then(() => {
this.instance.post(`/app/appmasssendingtask/cancel?id=${id}`).then(res => {
this.instance.post(`/app/whchatmomentstask/cancel?id=${id}`).then(res => {
if (res.code == 0) {
this.$message.success('撤回成功！')
this.getList()
@@ -202,11 +203,11 @@
})
},
remove(id) {
this.$confirm('确定删除该数据？').then(() => {
this.instance.post(`/app/appmasssendingtask/delete?ids=${id}`).then(res => {
close (id) {
this.$confirm('确定关闭该群发任务？').then(() => {
this.instance.post(`/app/whchatmomentstask/closeTask?id=${id}`).then(res => {
if (res.code == 0) {
this.$message.success('删除成功！')
this.$message.success('关闭成功！')
this.getList()
}
})

6
packages/wxwork/AnnounceWeChat/AppAnnounceWeChat/AppAnnounceWeChat.vue
View File

@@ -1,8 +1,8 @@
<template>
<div class="AppAnnounceWeChat">
<!-- <keep-alive :include="['List']"> -->
<keep-alive :include="['List']">
<component ref="component" :is="component" @change="onChange" :params="params" :instance="instance" :dict="dict"></component>
<!-- </keep-alive> -->
</keep-alive>
</div>
</template>
@@ -55,7 +55,7 @@
this.params = data.params
}
if (data.type === 'list') {
if (data.type === 'List') {
this.component = 'List'
this.params = data.params

16
packages/wxwork/AnnounceWeChat/AppAnnounceWeChat/components/Add.vue
View File

@@ -53,11 +53,11 @@
</div>
</div>
<div class="tips">
<p>消息预计送达居民群数：</p>
<p>消息预计可见居民数：</p>
<span>{{ groupLen }}</span>
<el-tooltip
placement="top"
content="将由指定群主发送给TA作为群主的所有的群，由于企业微信限制，当超过1000个时将只发送到最近活跃的1000个群">
content="将由指定人员发送给TA添加的且符合所有筛选条件的居民，当多个人员添加同一个居民时，该居民只可看见第1个完成发表的人员的朋友圈">
<i class="iconfont iconModal_Warning"></i>
</el-tooltip>
</div>
@@ -147,7 +147,7 @@
</el-switch>
</el-form-item>
<el-form-item v-if="form.enableExamine === '1'" label="审批人员" prop="examines" style="width: 100%;" :rules="[{ required: true, message: '请选择审批人员', trigger: 'change' }]">
<ai-wechat-selecter :instance="instance" v-model="form.examines" @change="onUserChange">
<ai-user-selecter :instance="instance" v-model="form.examines" @change="onUserChange">
<div class="AppAnnounceDetail-select">
<el-input class="AppAnnounceDetail-select__input" size="small" placeholder="请选择..." v-model="form.examinesName"></el-input>
<div class="select-left" v-if="form.examines.length">
@@ -156,7 +156,7 @@
<i v-if="!form.examines.length">请选择</i>
<div class="select-right">{{ form.examines.length ? '重新选择' : '选择' }}</div>
</div>
</ai-wechat-selecter>
</ai-user-selecter>
</el-form-item>``
</div>
</template>
@@ -234,7 +234,7 @@
<ai-dialog
:visible.sync="isShowTags"
width="800px"
title="标签'"
title="选择标签'"
@close="onClose"
@onConfirm="onTagsConfirm">
<div class="tags">
@@ -335,7 +335,9 @@ export default {
...mapState(['user']),
groupLen() {
return this.form.executorList.length
return this.form.executorList.map(v => v.customerCount).reduce((prev, cur) => {
return prev + cur
}, 0)
}
},
@@ -663,7 +665,7 @@ export default {
cancel(isRefresh) {
this.$emit('change', {
type: 'list',
type: 'List',
isRefresh: !!isRefresh
})
}

55
packages/wxwork/AnnounceWeChat/AppAnnounceWeChat/components/Detail.vue
View File

@@ -1,7 +1,7 @@
<template>
<ai-detail class="AppAnnounceDetail">
<ai-detail class="AppAnnounceDetail" v-loading="isLoading">
<template slot="title">
<ai-title title="群发详情" isShowBack isShowBottomBorder @onBackClick="cancel(false)">
<ai-title title="群发详情" isShowBack isShowBottomBorder @onBackClick="cancel(true)">
</ai-title>
</template>
<template slot="content">
@@ -133,11 +133,11 @@
:current.sync="search1.current"
:size.sync="search1.size"
@getList="getMemberInfo">
<el-table-column slot="user" label="成员" align="left">
<el-table-column slot="user" label="员工" align="left">
<template slot-scope="{ row }">
<div class="userinfo">
<span>{{ row.groupOwnerName }}</span>
<span style="color: #999">{{ row.mainDepartmentName }}</span>
<span>{{ row.userName }}</span>
<span style="color: #999">{{ row.userDepartmentName }}</span>
</div>
</template>
</el-table-column>
@@ -149,19 +149,23 @@
<ai-dialog
:visible.sync="isShowGroups"
width="890px"
customFooter
title="群发范围"
@onConfirm="isShowGroups = false">
<ai-wrapper>
<ai-info-item label="消息发送" isLine :value="info.taskTitle">
<div class="text">
<span>{{ info.sendScope === '0' ? '全部' : '按条件筛选的' }}</span>
<i>{{ info.executorList.length }}</i>
<span>个居民</span>
</div>
</ai-info-item>
<ai-info-item label="添加人" isLine :value="userNames"></ai-info-item>
<ai-info-item label="标签" isLine>{{ info.filterTagsName || '-' }}</ai-info-item>
</ai-wrapper>
<ai-wrapper>
<ai-info-item label="消息发送" isLine :value="info.taskTitle">
<div class="text">
<span>{{ info.sendScope === '0' ? '全部' : '按条件筛选的' }}</span>
<i>{{ info.executorList.length }}</i>
<span>个居民</span>
</div>
</ai-info-item>
<ai-info-item label="添加人" isLine :value="userNames"></ai-info-item>
<ai-info-item label="标签" isLine>{{ info.filterTagsName || '-' }}</ai-info-item>
</ai-wrapper>
<div class="dialog-footer" slot="footer">
<el-button @click="isShowGroups = false">关闭</el-button>
</div>
</ai-dialog>
<div class="detail-phone" v-if="isShowPhone">
<div class="mask"></div>
@@ -210,20 +214,17 @@
info: {},
content: '',
currIndex: 0,
colConfigs3: [
{ prop: 'groupOwnerName', label: '群主' },
{ prop: 'groupNames', label: '群名称' }
],
colConfigs1: [
{ slot: 'user', label: '成员' },
{ prop: 'groupCount', label: '预计送达居民群', align: 'center' }
{ prop: 'groupCount', label: '预计发送朋友圈', align: 'center' }
],
groups: [],
timer: null,
min: 60,
isDisabled: false,
rejecterId: '',
userNames: ''
userNames: '',
isLoading: false
}
},
@@ -249,8 +250,8 @@
}
}).then(res => {
if (res.code === 0) {
// this.tableData1 = res.data.executedList.records
// this.total1 = res.data.executedList.total
this.tableData1 = res.data.executedList.records
this.total1 = res.data.executedList.total
this.memberInfo = res.data
}
})
@@ -268,7 +269,7 @@
},
sendMsg () {
this.instance.post(`/app/whchatmomentstask/remindExamine?id=${this.params.id}`).then(res => {
this.instance.post(`/app/whchatmomentstask/remindSend?id=${this.params.id}`).then(res => {
if (res.code === 0) {
this.$message.success('提醒成功')
this.getInfo(this.params.id)
@@ -292,6 +293,7 @@
},
getInfo (id) {
this.isLoading = true
this.instance.post(`/app/whchatmomentstask/queryDetailById?id=${id}`).then(res => {
if (res.code === 0) {
this.info = res.data
@@ -327,6 +329,7 @@
}
}
}
this.isLoading = false
})
},
@@ -352,7 +355,7 @@
cancel (isRefresh) {
this.$emit('change', {
type: 'list',
type: 'List',
isRefresh: !!isRefresh
})
}

17
packages/wxwork/AnnounceWeChat/AppAnnounceWeChat/components/List.vue
View File

@@ -33,14 +33,14 @@
@change="search.current = 1, getList()"
placeholder="选择群发结束日期">
</el-date-picker>
<ai-wechat-selecter :instance="instance" @change="onUserChange" :isMultiple="false" v-model="user">
<ai-user-selecter :instance="instance" @change="onUserChange" :isMultiple="false" v-model="user">
<div class="userSelcet">
<span style="color: #606266;" v-if="search.createUserId">{{ name }}</span>
<span v-else>创建人</span>
<i class="el-icon-arrow-up" v-if="!search.createUserId"></i>
<i class="el-icon-circle-close" v-if="search.createUserId" @click.stop="user = [], search.createUserId = '', name = '', search.current = 1, getList()"></i>
</div>
</ai-wechat-selecter>
</ai-user-selecter>
</template>
<template slot="right">
<el-input
@@ -74,6 +74,7 @@
<el-table-column slot="options" width="140px" fixed="right" label="操作" align="center">
<template slot-scope="{ row }">
<div class="table-options">
<el-button type="text" @click="close(row.id)" v-if="['3'].includes(row.status)">关闭</el-button>
<el-button type="text" @click="remindExamine(row.id)" v-if="['0'].includes(row.status)">催办</el-button>
<el-button type="text" @click="cancel(row.id)" v-if="['0'].includes(row.status)">撤回</el-button>
<el-button type="text" @click="toDetail(row.id)">详情</el-button>
@@ -182,7 +183,7 @@
remindExamine (id) {
this.$confirm('确认再次通知任务审核人员？').then(() => {
this.instance.post(`/app/appmasssendingtask/remindExamine?id=${id}`).then(res => {
this.instance.post(`/app/whchatmomentstask/remindExamine?id=${id}`).then(res => {
if (res.code == 0) {
this.$message.success('催办成功！')
this.getList()
@@ -193,7 +194,7 @@
cancel (id) {
this.$confirm('确认撤回该群发任务？').then(() => {
this.instance.post(`/app/appmasssendingtask/cancel?id=${id}`).then(res => {
this.instance.post(`/app/whchatmomentstask/cancel?id=${id}`).then(res => {
if (res.code == 0) {
this.$message.success('撤回成功！')
this.getList()
@@ -202,11 +203,11 @@
})
},
remove(id) {
this.$confirm('确定删除该数据？').then(() => {
this.instance.post(`/app/appmasssendingtask/delete?ids=${id}`).then(res => {
close (id) {
this.$confirm('确定关闭该群发任务？').then(() => {
this.instance.post(`/app/whchatmomentstask/closeTask?id=${id}`).then(res => {
if (res.code == 0) {
this.$message.success('删除成功！')
this.$message.success('关闭成功！')
this.getList()
}
})