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

协同宣发

Browse Source
This commit is contained in:
yanran200730
2022-09-13 15:57:10 +08:00
parent 81f3a4b35d
commit fc1e0812f5
2 changed files with 168 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -438,6 +438,15 @@ export default {
methods: { methods: {
...mapActions(['initOpenData', 'transCanvas']), ...mapActions(['initOpenData', 'transCanvas']),
choose(id) {
const index = this.chooseTags.indexOf(id)
if (index === -1) {
this.chooseTags.push(id)
} else {
this.chooseTags.splice(index, 1)
}
},
getTags () { getTags () {
this.instance.post(`/app/wxcp/wxcorptag/listAll?size=100`).then(res => { this.instance.post(`/app/wxcp/wxcorptag/listAll?size=100`).then(res => {
if (res.code == 0) { if (res.code == 0) {

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

@@ -20,7 +20,7 @@
<el-radio label="2">按网格选择</el-radio> <el-radio label="2">按网格选择</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item label="选择群主" v-if="form.sendScope !== '0'" prop="wxGroupsName" style="width: 100%;" :rules="[{ required: true, message: '请选择选择群主', trigger: 'change' }]"> <el-form-item label="发送居民" v-if="form.sendScope !== '0'" prop="wxGroupsName" style="width: 100%;" :rules="[{ required: true, message: '请选择发送居民', trigger: 'change' }]">
<ai-picker <ai-picker
:instance="instance" :instance="instance"
multiple multiple
@@ -33,11 +33,11 @@
@change="onSelcetChange"> @change="onSelcetChange">
<div class="AppAnnounceDetail-select"> <div class="AppAnnounceDetail-select">
<el-input size="small" class="AppAnnounceDetail-select__input" placeholder="请选择..." disabled v-model="form.wxGroupsName"></el-input> <el-input size="small" class="AppAnnounceDetail-select__input" placeholder="请选择..." disabled v-model="form.wxGroupsName"></el-input>
<div class="select-left" v-if="form.wxGroups.length"> <div class="select-left" v-if="form.executorList.length">
<span v-for="(item, index) in form.wxGroups" :key="index" v-if="index < 9">{{ item.groupOwnerName }}</span> <span v-for="(item, index) in form.executorList" :key="index" v-if="index < 9">{{ item.executorName }}</span>
<em v-if="form.wxGroups.length > 9">等{{ form.wxGroups.length }}个</em> <em v-if="form.executorList.length > 9">等{{ form.executorList.length }}个</em>
</div> </div>
<i v-if="!form.wxGroups.length">请选择</i> <i v-if="!form.executorList.length">请选择</i>
<div class="select-right">{{ form.filterCriteria.length ? '重新选择' : '选择' }}</div> <div class="select-right">{{ form.filterCriteria.length ? '重新选择' : '选择' }}</div>
</div> </div>
</ai-picker> </ai-picker>
@@ -51,6 +51,16 @@
</el-tooltip> </el-tooltip>
</div> </div>
</el-form-item> </el-form-item>
<el-form-item label="居民标签" style="width: 100%" v-if="form.sendScope !== '0'" prop="wxGroupsName">
<div class="AppAnnounceDetail-select" @click="isShowTags = true">
<el-input class="AppAnnounceDetail-select__input" size="small" placeholder="请选择..." v-model="form.filterTagsName"></el-input>
<div class="select-left" v-if="form.filterTags.length">
<span v-for="(item, index) in form.filterTags" :key="index">{{ item.name }}</span>
</div>
<i v-if="!form.filterTags.length">请选择</i>
<div class="select-right">{{ form.filterTags.length ? '重新选择' : '选择' }}</div>
</div>
</el-form-item>
<el-form-item label="发送内容" prop="content" style="width: 100%;" :rules="[{ required: true, message: '请输入发送内容', trigger: 'blur' }]"> <el-form-item label="发送内容" prop="content" style="width: 100%;" :rules="[{ required: true, message: '请输入发送内容', trigger: 'blur' }]">
<el-input size="small" type="textarea" :rows="6" maxlength="1300" show-word-limit placeholder="请输入文本内容..." v-model="form.content"></el-input> <el-input size="small" type="textarea" :rows="6" maxlength="1300" show-word-limit placeholder="请输入文本内容..." v-model="form.content"></el-input>
<div class="add"> <div class="add">
@@ -74,48 +84,48 @@
</div> </div>
<div class="AppAnnounceDetail-content-wrapper"> <div class="AppAnnounceDetail-content-wrapper">
<el-upload <el-upload
ref="upload" ref="upload"
multiple multiple
:file-list="fileList" :file-list="fileList"
:show-file-list="false" :show-file-list="false"
:before-upload="v => handleChange(v, 10, '.jpg,.png,.jpeg')" :before-upload="v => handleChange(v, 10, '.jpg,.png,.jpeg')"
:limit="9" :limit="9"
action="/app/wxcp/upload/uploadFile" action="/app/wxcp/upload/uploadFile"
accept=".jpg,.png,.jpeg" accept=".jpg,.png,.jpeg"
:on-exceed="onExceed" :on-exceed="onExceed"
:http-request="v => submitUpload(v, '1')"> :http-request="v => submitUpload(v, '1')">
<div class="content-item" trigger> <div class="content-item" trigger>
<img src="https://cdn.cunwuyun.cn/dvcp/announce/big-img.png"/> <img src="https://cdn.cunwuyun.cn/dvcp/announce/big-img.png"/>
<p>图片</p> <p>图片</p>
</div> </div>
</el-upload> </el-upload>
<el-upload <el-upload
ref="upload" ref="upload"
multiple multiple
:file-list="fileList" :file-list="fileList"
:show-file-list="false" :show-file-list="false"
:before-upload="v => handleChange(v, 10, '.mp4')" :before-upload="v => handleChange(v, 10, '.mp4')"
:limit="9" :limit="9"
action="/app/wxcp/upload/uploadFile" action="/app/wxcp/upload/uploadFile"
accept=".mp4" accept=".mp4"
:on-exceed="onExceed" :on-exceed="onExceed"
:http-request="v => submitUpload(v, '2')"> :http-request="v => submitUpload(v, '2')">
<div class="content-item" trigger> <div class="content-item" trigger>
<img src="https://cdn.cunwuyun.cn/dvcp/announce/big-video.png"/> <img src="https://cdn.cunwuyun.cn/dvcp/announce/big-video.png"/>
<p>视频</p> <p>视频</p>
</div> </div>
</el-upload> </el-upload>
<el-upload <el-upload
ref="upload" ref="upload"
multiple multiple
:file-list="fileList" :file-list="fileList"
:show-file-list="false" :show-file-list="false"
:before-upload="v => handleChange(v, 20, '.zip,.rar,.doc,.docx,.xls,.xlsx,.ppt,.pptx,.pdf,.txt')" :before-upload="v => handleChange(v, 20, '.zip,.rar,.doc,.docx,.xls,.xlsx,.ppt,.pptx,.pdf,.txt')"
:limit="9" :limit="9"
:on-exceed="onExceed" :on-exceed="onExceed"
action="/app/wxcp/upload/uploadFile" action="/app/wxcp/upload/uploadFile"
accept=".zip,.rar,.doc,.docx,.xls,.xlsx,.ppt,.pptx,.pdf,.txt" accept=".zip,.rar,.doc,.docx,.xls,.xlsx,.ppt,.pptx,.pdf,.txt"
:http-request="v => submitUpload(v, '3')"> :http-request="v => submitUpload(v, '3')">
<div class="content-item" trigger> <div class="content-item" trigger>
<img src="https://cdn.cunwuyun.cn/dvcp/announce/folder.png"/> <img src="https://cdn.cunwuyun.cn/dvcp/announce/folder.png"/>
<p>文件</p> <p>文件</p>
@@ -134,21 +144,21 @@
</el-form-item> </el-form-item>
<el-form-item label="宣发审批" prop="enableExamine" style="width: 100%;" :rules="[{ required: true, message: '请输入任务名称', trigger: 'blur' }]"> <el-form-item label="宣发审批" prop="enableExamine" style="width: 100%;" :rules="[{ required: true, message: '请输入任务名称', trigger: 'blur' }]">
<el-switch <el-switch
v-model="form.enableExamine" v-model="form.enableExamine"
active-value="1" active-value="1"
inactive-value="0" inactive-value="0"
active-text="开启后，创建的群发任务需要审批人进行审批"> active-text="开启后，创建的群发任务需要审批人进行审批">
</el-switch> </el-switch>
</el-form-item> </el-form-item>
<el-form-item v-if="form.enableExamine === '1'" label="审批人员" prop="examines" style="width: 100%;" :rules="[{ required: true, message: '请选择审批人员', trigger: 'change' }]"> <el-form-item v-if="form.enableExamine === '1'" label="审批人员" prop="examineList" style="width: 100%;" :rules="[{ required: true, message: '请选择审批人员', trigger: 'change' }]">
<ai-wechat-selecter :instance="instance" v-model="form.examines" @change="onUserChange"> <ai-wechat-selecter :instance="instance" v-model="form.examineList" @change="onUserChange">
<div class="AppAnnounceDetail-select"> <div class="AppAnnounceDetail-select">
<el-input class="AppAnnounceDetail-select__input" size="small" placeholder="请选择..." v-model="form.examinesName"></el-input> <el-input class="AppAnnounceDetail-select__input" size="small" placeholder="请选择..." v-model="form.examinesName"></el-input>
<div class="select-left" v-if="form.examines.length"> <div class="select-left" v-if="form.examineList.length">
<span v-for="(item, index) in form.examines" :key="index">{{ item.name }}</span> <span v-for="(item, index) in form.examineList" :key="index">{{ item.name }}</span>
</div> </div>
<i v-if="!form.examines.length">请选择</i> <i v-if="!form.examineList.length">请选择</i>
<div class="select-right">{{ form.examines.length ? '重新选择' : '选择' }}</div> <div class="select-right">{{ form.examineList.length ? '重新选择' : '选择' }}</div>
</div> </div>
</ai-wechat-selecter> </ai-wechat-selecter>
</el-form-item> </el-form-item>
@@ -169,29 +179,29 @@
<div class="ai-form"> <div class="ai-form">
<el-form-item label="标题" style="width: 100%;" prop="linkTitle" :rules="[{ required: true, message: '请输入标题', trigger: 'blur' }]"> <el-form-item label="标题" style="width: 100%;" prop="linkTitle" :rules="[{ required: true, message: '请输入标题', trigger: 'blur' }]">
<el-input <el-input
size="small" size="small"
placeholder="请输入标题" placeholder="请输入标题"
maxlength="42" maxlength="42"
show-word-limit show-word-limit
v-model="linkForm.linkTitle"> v-model="linkForm.linkTitle">
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item label="链接" style="width: 100%;" prop="linkUrl" :rules="[{ required: true, message: '请输入链接', trigger: 'blur' }]"> <el-form-item label="链接" style="width: 100%;" prop="linkUrl" :rules="[{ required: true, message: '请输入链接', trigger: 'blur' }]">
<el-input <el-input
size="small" size="small"
placeholder="请输入链接" placeholder="请输入链接"
maxlength="682" maxlength="682"
show-word-limit show-word-limit
v-model="linkForm.linkUrl"> v-model="linkForm.linkUrl">
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item label="描述" style="width: 100%;" prop="linkDesc"> <el-form-item label="描述" style="width: 100%;" prop="linkDesc">
<el-input <el-input
size="small" size="small"
placeholder="请输入描述" placeholder="请输入描述"
maxlength="170" maxlength="170"
show-word-limit show-word-limit
v-model="linkForm.linkDesc"> v-model="linkForm.linkDesc">
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item label="封面图" prop="linkPicUrl" style="width: 100%;"> <el-form-item label="封面图" prop="linkPicUrl" style="width: 100%;">
@@ -225,6 +235,27 @@
<el-button @click="onDateForm" type="primary" :loading="isLoading2" style="width: 92px;">确认</el-button> <el-button @click="onDateForm" type="primary" :loading="isLoading2" style="width: 92px;">确认</el-button>
</div> </div>
</ai-dialog> </ai-dialog>
<ai-dialog
:visible.sync="isShowTags"
width="800px"
title="标签'"
@close="onClose"
@onConfirm="onTagsConfirm">
<div class="tags">
<div class="tag-item" v-for="(item, index) in tags" :key="index">
<h2>{{ item.name }}</h2>
<div class="tag-item__right">
<el-button
:type="chooseTags.map(v => v.id).indexOf(item.id) === -1 ? '' : 'primary'"
v-for="(item, index) in item.tagList"
@click="choose(item)"
:key="index">
{{ item.name }}
</el-button>
</div>
</div>
</div>
</ai-dialog>
</div> </div>
</template> </template>
<template #footer> <template #footer>
@@ -258,6 +289,7 @@ export default {
department: [], department: [],
isLoading1: false, isLoading1: false,
isLoading2: false, isLoading2: false,
isShowTags: false,
fileList: [], fileList: [],
isShowAddLink: false, isShowAddLink: false,
isShowAddMiniapp: false, isShowAddMiniapp: false,
@@ -277,12 +309,14 @@ export default {
choiceTime: '', choiceTime: '',
contents: [], contents: [],
enableExamine: '0', enableExamine: '0',
examines: [], examineList: [],
wxGroups: [], executorList: [],
wxGroupsName: '', wxGroupsName: '',
sendScope: '0', sendScope: '0',
sendType: 0, sendType: 0,
name: '', name: '',
filterTags: [],
filterTagsName: '',
filterCriteria: [], filterCriteria: [],
taskTitle: '', taskTitle: '',
examinesName: '' examinesName: ''
@@ -290,6 +324,8 @@ export default {
girdNames: '', girdNames: '',
id: '', id: '',
tagsList: [], tagsList: [],
tags: [],
chooseTags: [],
pickerOptions: { pickerOptions: {
disabledDate: e => { disabledDate: e => {
return e.getTime() < (Date.now() - 60 * 1000 * 60 * 24) return e.getTime() < (Date.now() - 60 * 1000 * 60 * 24)
@@ -302,12 +338,7 @@ export default {
...mapState(['user']), ...mapState(['user']),
groupLen() { groupLen() {
let i = 0 return this.form.executorList.length
this.form.wxGroups.forEach(v => {
i = i + v.groupIds.split(',').length
})
return i
} }
}, },
@@ -318,11 +349,37 @@ export default {
} else { } else {
this.getWxGroups() this.getWxGroups()
} }
this.getTags()
}, },
methods: { methods: {
...mapActions(['initOpenData', 'transCanvas']), ...mapActions(['initOpenData', 'transCanvas']),
choose (e) {
const index = this.chooseTags.map(v => v.id).indexOf(e.id)
if (index === -1) {
this.chooseTags.push(e)
} else {
this.chooseTags.splice(index, 1)
}
},
getTags () {
this.instance.post(`/app/wxcp/wxcorptag/listAll?size=100`).then(res => {
if (res.code == 0) {
this.tags = res.data.records
}
})
},
onTagsConfirm () {
this.form.filterTagsName = this.chooseTags.map(v => v.name).join(',')
this.form.filterTags = [...this.chooseTags]
this.isShowTags = false
},
getInfo(id) { getInfo(id) {
this.instance.post(`/app/appmasssendingtask/queryDetailById?id=${id}`).then(res => { this.instance.post(`/app/appmasssendingtask/queryDetailById?id=${id}`).then(res => {
if (res.code === 0) { if (res.code === 0) {
@@ -339,8 +396,8 @@ export default {
this.dateForm.choiceTime = '' this.dateForm.choiceTime = ''
if (res.data.examines && res.data.examines.length) { if (res.data.examineList && res.data.examineList.length) {
this.form.examines = res.data.examines.map(v => { this.form.examineList = res.data.examineList.map(v => {
return { return {
...v, ...v,
wxOpenUserId: v.examineUserId, wxOpenUserId: v.examineUserId,
@@ -372,13 +429,13 @@ export default {
if (e.length) { if (e.length) {
this.form.examinesName = '1' this.form.examinesName = '1'
} else { } else {
this.form.wxGroupsName = '' this.form.examinesName = ''
} }
}, },
onScopeChange(e) { onScopeChange(e) {
this.form.filterCriteria = [] this.form.filterCriteria = []
this.form.wxGroups = [] this.form.executorList = []
this.girdNames = '' this.girdNames = ''
if (e === '0') { if (e === '0') {
@@ -403,22 +460,19 @@ export default {
}) })
} else { } else {
this.form.wxGroupsName = '' this.form.wxGroupsName = ''
this.form.wxGroups = [] this.form.executorList = []
} }
}, },
getWxGroups() { getWxGroups() {
this.instance.post(`/app/appmasssendingtask/queryWxGroups?sendScope=${this.form.sendScope}`, null, { this.instance.post(`/app/whchatmomentstask/getSendScope`, {
data: { sendScope: this.form.sendScope,
filterCriteria: this.form.filterCriteria.join(',') filterTags: this.form.filterTags.map(v => v.id).join(','),
}, filterCriteria: this.form.filterCriteria.join(','),
headers: {'Content-Type': 'application/json;charset=utf-8'}, taskType: 0
transformRequest: [function (data) {
return data.filterCriteria
}]
}).then(res => { }).then(res => {
if (res.code === 0) { if (res.code === 0) {
this.form.wxGroups = res.data this.form.executorList = res.data
} }
}) })
}, },
@@ -534,7 +588,7 @@ export default {
confirm(sendType) { confirm(sendType) {
this.$refs.form.validate((valid) => { this.$refs.form.validate((valid) => {
if (valid) { if (valid) {
if (!this.form.wxGroups.length) { if (!this.form.executorList.length) {
return this.$message.error('居民群数量不能为0') return this.$message.error('居民群数量不能为0')
} }
@@ -556,15 +610,34 @@ export default {
} else { } else {
this.isLoading2 = true this.isLoading2 = true
} }
this.instance.post(`/app/appmasssendingtask/addOrUpdate`, {
console.log({
...this.form, ...this.form,
id: this.params.id, id: this.params.id,
wxGroups: this.form.wxGroups, executorList: this.form.executorList,
contents, contents,
sendType, sendType,
filterTags: this.form.filterTags.map(v => v.id).join(','),
choiceTime: this.dateForm.choiceTime, choiceTime: this.dateForm.choiceTime,
filterCriteria: this.form.filterCriteria.join(','), filterCriteria: this.form.filterCriteria.join(','),
examines: this.form.examines.length ? this.form.examines.map(v => { examineList: this.form.examineList.length ? this.form.examineList.map(v => {
return {
...v,
examineUserId: v.id,
examineUserName: v.name
}
}) : []
})
this.instance.post(`/app/whchatmomentstask/addOrUpdate`, {
...this.form,
id: this.params.id,
executorList: this.form.executorList,
contents,
sendType,
filterTags: this.form.filterTags.map(v => v.id).join(','),
choiceTime: this.dateForm.choiceTime,
filterCriteria: this.form.filterCriteria.join(','),
examineList: this.form.examineList.length ? this.form.examineList.map(v => {
return { return {
...v, ...v,
examineUserId: v.id, examineUserId: v.id,