From 152defa3779d2d7e6744e14f5fd3d9cf3b9ab806 Mon Sep 17 00:00:00 2001 From: yanran200730 Date: Thu, 2 Mar 2023 18:01:56 +0800 Subject: [PATCH] =?UTF-8?q?=E7=B4=A0=E6=9D=90=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Announce/AppAnnounce/components/Add.vue | 62 ++-- .../AppMaterialLibrary/AppMaterialLibrary.vue | 21 +- .../AppMaterialLibrary/components/Add.vue | 119 ------- .../AppMaterialLibrary/components/List.vue | 317 +++++++++++++++--- ui/packages/basic/AiUploader.vue | 2 +- 5 files changed, 303 insertions(+), 218 deletions(-) delete mode 100644 packages/wxwork/AppMaterialLibrary/components/Add.vue diff --git a/packages/wxwork/Announce/AppAnnounce/components/Add.vue b/packages/wxwork/Announce/AppAnnounce/components/Add.vue index 1a85c7d8..f186c7dc 100644 --- a/packages/wxwork/Announce/AppAnnounce/components/Add.vue +++ b/packages/wxwork/Announce/AppAnnounce/components/Add.vue @@ -184,29 +184,29 @@
+ size="small" + placeholder="请输入标题" + maxlength="42" + show-word-limit + v-model="linkForm.linkTitle"> + size="small" + placeholder="请输入链接" + maxlength="682" + show-word-limit + v-model="linkForm.linkUrl"> + size="small" + placeholder="请输入描述" + maxlength="170" + show-word-limit + v-model="linkForm.linkDesc"> @@ -216,34 +216,34 @@ + :visible.sync="isShowAddMiniapp" + width="920px" + title="小程序消息" + @close="onClose" + @onConfirm="onMiniAppForm">
+ size="small" + placeholder="小程序appid" + v-model="miniAppForm.mpAppid"> + size="small" + placeholder="请输入小程序page路径" + v-model="miniAppForm.mpPage"> + size="small" + placeholder="请输入标题" + maxlength="20" + show-word-limit + v-model="miniAppForm.mpTitle"> diff --git a/packages/wxwork/AppMaterialLibrary/AppMaterialLibrary.vue b/packages/wxwork/AppMaterialLibrary/AppMaterialLibrary.vue index 0c1c96a3..e3adab7b 100644 --- a/packages/wxwork/AppMaterialLibrary/AppMaterialLibrary.vue +++ b/packages/wxwork/AppMaterialLibrary/AppMaterialLibrary.vue @@ -1,14 +1,13 @@ diff --git a/packages/wxwork/AppMaterialLibrary/components/Add.vue b/packages/wxwork/AppMaterialLibrary/components/Add.vue deleted file mode 100644 index 2734dbff..00000000 --- a/packages/wxwork/AppMaterialLibrary/components/Add.vue +++ /dev/null @@ -1,119 +0,0 @@ - - - - - diff --git a/packages/wxwork/AppMaterialLibrary/components/List.vue b/packages/wxwork/AppMaterialLibrary/components/List.vue index 3c322157..67d2584e 100644 --- a/packages/wxwork/AppMaterialLibrary/components/List.vue +++ b/packages/wxwork/AppMaterialLibrary/components/List.vue @@ -1,31 +1,197 @@ @@ -44,79 +210,136 @@ search: { current: 1, size: 10, - status: 0, title: '', - areaId: '' }, - defaultExpanded: [], - defaultChecked: [], - areaTree: [], - defaultProps: { - children: 'children', - label: 'name' + isShow: false, + form: { + appId: '', + content: '', + fileUrl: [], + pagePath: '', + pictureUrl: [], + title: '' }, - currIndex: -1, - total: 10, + typeList: ['话术', '图片', '小程序', '文件', '视频', '网页'], + currIndex: 0, + tableData: [], + loading: false, + total: 0, colConfigs: [ - {prop: 'codeName', label: '名称', align: 'left'}, - {prop: 'type', label: '二维码类型', align: 'left', format: v => v === '0' ? '群二维码' : '个人二维码'}, - {prop: 'createUserName', label: '创建人'}, - {prop: 'createTime', label: '创建时间'}, - {slot: 'options', label: '操作'} - ], - areaName: '', - unitName: '', - tableData: [] + { prop: 'taskTitle', label: '任务名称' }, + { prop: 'typeName', label: '群发类型', align: 'center' }, + { slot: 'user', label: '创建人', openType: 'userName', align: 'center' }, + { prop: 'choiceTime', label: '群发时间', align: 'center' }, + { prop: 'completionRate', label: '任务完成率', align: 'center', format: v => v ? v === '0.0' ? '0%' : `${v}%` : '-' } + ] } }, - mounted() { - this.search.areaId = this.user.info.areaId - this.areaName = this.user.info.areaName - this.getList() - - this.$nextTick(() => { + created () { + this.dict.load('mstStatus').then(() => { + this.getList() }) }, methods: { getList() { - this.instance.post(`/app/appeveryvillagecode/list`, null, { + this.loading = true + this.instance.post(`/app/appmasssendingtask/list`, null, { params: { - ...this.search + ...this.search, } }).then(res => { if (res.code == 0) { this.tableData = res.data.records this.total = res.data.total + + this.$nextTick(() => { + this.loading = false + }) + } else { + this.loading = false + } + }).catch(() => { + this.loading = false + }) + }, + + onClose () { + this.form.content = '' + this.form.appId = '' + this.form.fileUrl = [] + this.form.pagePath = '' + this.form.pictureUrl = [] + this.form.title = '' + }, + + confirm () { + this.$refs.form.validate((valid) => { + if (valid) { + this.instance.post(`/app/appmaterialinfo/addOrUpdate`, { + ...this.form + }).then(res => { + if (res.code == 0) { + this.$message.success('提交成功') + this.isShow = false + } + }) } }) }, - remove(id) { + remove (id) { this.$confirm('确定删除该数据？').then(() => { - this.instance.post(`/app/appeveryvillagecode/delete?ids=${id}`).then(res => { + this.instance.post(`/app/appmaterialinfo/delete?ids=${id}`).then(res => { if (res.code == 0) { this.$message.success('删除成功！') this.getList() } }) }) - }, - - toAdd(id) { - this.$emit('change', { - type: 'Add', - params: { - areaName: this.areaName, - id: id || '', - areaId: this.search.areaId - } - }) } } } diff --git a/ui/packages/basic/AiUploader.vue b/ui/packages/basic/AiUploader.vue index 0b716276..dfe1f2b2 100644 --- a/ui/packages/basic/AiUploader.vue +++ b/ui/packages/basic/AiUploader.vue @@ -343,7 +343,7 @@ export default { item.id = res.data.file.id item.path = res.data.file.url item.url = res.data.file.url, - item.media = res.data.media + item.media = res.data.media } }) this.emitChange(this.fileList)