diff --git a/examples/router/axios.js b/examples/router/axios.js
index d02ec70d..cd72a33e 100644
--- a/examples/router/axios.js
+++ b/examples/router/axios.js
@@ -35,6 +35,7 @@ instance.interceptors.request.use(config => {
if (['/qxn', '/analysis'].includes(config.baseURL)) {
config.url = config.url.replace(/(app|auth|admin)\//, "api/")
}
+ config.url = config.url.replace(/(app|auth|admin)\//, "api/")
return config
}, error => Message.error(error))
export default instance
diff --git a/packages/wxwork/Announce/AppAnnounce/components/Add.vue b/packages/wxwork/Announce/AppAnnounce/components/Add.vue
index 0e8c4a1f..ad8bbe64 100644
--- a/packages/wxwork/Announce/AppAnnounce/components/Add.vue
+++ b/packages/wxwork/Announce/AppAnnounce/components/Add.vue
@@ -131,15 +131,25 @@
-
+
从本地上传,图片最大支持10MB,支持JPG,PNG格式;视频最大支持10MB,支持MP4格式;文件最大支持20MB
+
+
+
+ {{ item.dictName }}
+
+
+
确认
-
+
@@ -346,6 +356,7 @@ export default {
taskEndTime: '',
examines: [],
wxGroups: [],
+ markTag: [],
wxGroupsName: '',
sendScope: '0',
sendType: 0,
@@ -382,8 +393,10 @@ export default {
if (this.params && this.params.id) {
this.id = this.params.id
this.getInfo(this.params.id)
+ this.dict.load('mstTag')
} else {
this.getWxGroups()
+ this.dict.load('mstTag')
}
},
@@ -403,7 +416,8 @@ export default {
...this.form,
...res.data,
wxGroupsName: '1',
- filterCriteria: res.data.filterCriteria.split(',')
+ filterCriteria: res.data.filterCriteria.split(','),
+ markTag: res.data.markTag.split(',')
}
if (res.data.girdNames) {
@@ -656,6 +670,7 @@ export default {
wxGroups: this.form.wxGroups,
contents,
sendType,
+ markTag: this.form.markTag.join(','),
sendChannel: this.params.sendChannel,
choiceTime: this.dateForm.choiceTime,
filterCriteria: this.form.filterCriteria.join(','),
diff --git a/packages/wxwork/Announce/AppAnnounce/components/Detail.vue b/packages/wxwork/Announce/AppAnnounce/components/Detail.vue
index 796f22bc..e6ca22aa 100644
--- a/packages/wxwork/Announce/AppAnnounce/components/Detail.vue
+++ b/packages/wxwork/Announce/AppAnnounce/components/Detail.vue
@@ -37,9 +37,11 @@
-
+
{{ info.sendChannel === '1' ? '通知员工转发' : '成员一键群发' }}
+
+
diff --git a/packages/wxwork/Announce/AppAnnounce/components/List.vue b/packages/wxwork/Announce/AppAnnounce/components/List.vue
index 26720e55..9c6dd17e 100644
--- a/packages/wxwork/Announce/AppAnnounce/components/List.vue
+++ b/packages/wxwork/Announce/AppAnnounce/components/List.vue
@@ -78,7 +78,7 @@
关闭
撤回
详情
- 编辑
+ 编辑
@@ -141,6 +141,7 @@
{ slot: 'user', label: '创建人', openType: 'userName', align: 'center' },
{ prop: 'choiceTime', label: '群发时间', align: 'center' },
{ prop: 'taskEndTime', label: '群发结束时间', align: 'center' },
+ { prop: 'markTag', label: '标签', align: 'center' },
{
prop: 'status',
align: 'center',
@@ -159,7 +160,7 @@
},
created () {
- this.dict.load('mstStatus', 'mstSendType').then(() => {
+ this.dict.load('mstStatus', 'mstSendType', 'mstTag').then(() => {
this.getList()
})
},