From 545f796578e5dbae3d1235bb11f9ba1cca01aa26 Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Thu, 15 Jun 2023 17:05:47 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=8F=E5=90=8C=E5=AE=A3=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 examples/router/axios.js                      |  1 +
 .../Announce/AppAnnounce/components/Add.vue   | 23 +++++++++++++++----
 .../AppAnnounce/components/Detail.vue         |  4 +++-
 .../Announce/AppAnnounce/components/List.vue  |  5 ++--
 4 files changed, 26 insertions(+), 7 deletions(-)

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 @@
                         </div>
                       </div>
                     </el-popover>
-                    <div class="add-material add-item" @click="$refs.ChooseMaterial.open()">
+                    <!-- <div class="add-material add-item" @click="$refs.ChooseMaterial.open()">
                       <img src="https://cdn.cunwuyun.cn/dvcp/announce/add.png"/>
                       <span style="color: #2266FF; font-size: 12px;">从素材库选择</span>
-                    </div>
+                    </div> -->
                   </div>
                   <div class="tips">
                     <em>从本地上传，图片最大支持10MB，支持JPG,PNG格式；视频最大支持10MB，支持MP4格式；文件最大支持20MB</em>
                   </div>
                 </el-form-item>
+                <el-form-item label="标签" style="width: 100%;" prop="markTag">
+                  <el-checkbox-group v-model="form.markTag">
+                    <el-checkbox
+                      v-for="(item, index) in dict.getDict('mstTag')"
+                      :key="index"
+                      :label="item.dictValue">
+                      {{ item.dictName }}
+                    </el-checkbox>
+                  </el-checkbox-group>
+                </el-form-item>
                 <el-form-item label="结束时间" style="width: 100%;" prop="taskEndTime" :rules="[{ required: true, message: '请选择结束时间', trigger: 'change' }]">
                   <el-date-picker
                     style="width: 100%;"
@@ -281,7 +291,7 @@
             <el-button @click="onDateForm" type="primary" :loading="isLoading2" style="width: 92px;">确认</el-button>
           </div>
         </ai-dialog>
-        <ChooseMaterial ref="ChooseMaterial" :instance="instance" @change="onChooseChange"></ChooseMaterial>
+        <!-- <ChooseMaterial ref="ChooseMaterial" :instance="instance" @change="onChooseChange"></ChooseMaterial> -->
       </div>
     </template>
     <template #footer>
@@ -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 @@
                 </div>
               </div>
             </ai-info-item>
-            <ai-info-item label="发送方式" isLine>
+            <ai-info-item label="发送方式">
               <span>{{ info.sendChannel === '1' ? '通知员工转发' : '成员一键群发' }}</span>
             </ai-info-item>
+            <ai-info-item label="标签" :value="info.markTag">
+            </ai-info-item>
             <ai-info-item label="创建时间" :value="info.createTime"></ai-info-item>
             <ai-info-item label="群发时间" :value="info.choiceTime"></ai-info-item>
             <ai-info-item label="结束时间" :value="info.taskEndTime" v-if="info.sendChannel === '1'"></ai-info-item>
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 @@
               <el-button type="text" @click="close(row.id)" v-if="['4'].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>
-              <el-button type="text" @click="toAdd(row.sendChannel, row.id)" v-if="['1', '3'].includes(row.status)">编辑</el-button>
+              <el-button type="text" @click="toAdd(row.id)" v-if="['1', '3'].includes(row.status)">编辑</el-button>
             </div>
           </template>
         </el-table-column>
@@ -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()
       })
     },