From 8a917284525be2bd541bb0698147585d3f5c24e0 Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Wed, 31 Aug 2022 10:29:38 +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

---
 .../AppAnnounceResident/components/Add.vue    | 193 ++++++++++++------
 1 file changed, 134 insertions(+), 59 deletions(-)

diff --git a/project/sass/apps/AnnounceResident/AppAnnounceResident/components/Add.vue b/project/sass/apps/AnnounceResident/AppAnnounceResident/components/Add.vue
index 5115b668..6f7e403c 100644
--- a/project/sass/apps/AnnounceResident/AppAnnounceResident/components/Add.vue
+++ b/project/sass/apps/AnnounceResident/AppAnnounceResident/components/Add.vue
@@ -20,7 +20,7 @@
                     <el-radio label="2">按网格选择</el-radio>
                   </el-radio-group>
                 </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
                     :instance="instance"
                     multiple
@@ -47,15 +47,50 @@
                     </div>
                   </ai-picker>
                   <div class="tips">
-                    <p>消息预计送达居民群数：</p>
+                    <p>消息预计送达居民数：</p>
                     <span>{{ groupLen }}</span>
                     <el-tooltip
                         placement="top"
-                        content="将由指定群主发送给TA作为群主的所有的群，由于企业微信限制，当超过1000个时将只发送到最近活跃的1000个群">
+                        content="同一个居民若有多个添加人，则会由最后跟客户进行聊天互动的人员进行群发">
                       <i class="iconfont iconModal_Warning"></i>
                     </el-tooltip>
                   </div>
                 </el-form-item>
+                <el-form-item label="添加时间" v-if="form.sendScope !== '0'" prop="wxGroupsName">
+                  <el-date-picker
+                    type="daterange"
+                    align="right"
+                    unlink-panels
+                    size="small"
+                    range-separator="至"
+                    start-placeholder="开始日期"
+                    end-placeholder="结束日期">
+                  </el-date-picker>
+                </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.examinesName"></el-input>
+                    <div class="select-left" v-if="form.examines.length">
+                      <span v-for="(item, index) in form.examines" :key="index">
+                        <ai-open-data type="userName" :openid="item.wxOpenUserId"></ai-open-data>
+                      </span>
+                    </div>
+                    <i v-if="!form.examines.length">请选择</i>
+                      <div class="select-right">{{ form.examines.length ? '重新选择' : '选择' }}</div>
+                  </div>
+                </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.examinesName"></el-input>
+                    <div class="select-left" v-if="form.examines.length">
+                      <span v-for="(item, index) in form.examines" :key="index">
+                        <ai-open-data type="userName" :openid="item.wxOpenUserId"></ai-open-data>
+                      </span>
+                    </div>
+                    <i v-if="!form.examines.length">请选择</i>
+                      <div class="select-right">{{ form.examines.length ? '重新选择' : '选择' }}</div>
+                  </div>
+                </el-form-item>
                 <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>
                   <div class="add">
@@ -111,16 +146,16 @@
                           </div>
                         </el-upload>
                         <el-upload
-                            ref="upload"
-                            multiple
-                            :file-list="fileList"
-                            :show-file-list="false"
-                            :before-upload="v => handleChange(v, 20, '.zip,.rar,.doc,.docx,.xls,.xlsx,.ppt,.pptx,.pdf,.txt')"
-                            :limit="9"
-                            :on-exceed="onExceed"
-                            action="/app/wxcp/upload/uploadFile"
-                            accept=".zip,.rar,.doc,.docx,.xls,.xlsx,.ppt,.pptx,.pdf,.txt"
-                            :http-request="v => submitUpload(v, '3')">
+                          ref="upload"
+                          multiple
+                          :file-list="fileList"
+                          :show-file-list="false"
+                          :before-upload="v => handleChange(v, 20, '.zip,.rar,.doc,.docx,.xls,.xlsx,.ppt,.pptx,.pdf,.txt')"
+                          :limit="9"
+                          :on-exceed="onExceed"
+                          action="/app/wxcp/upload/uploadFile"
+                          accept=".zip,.rar,.doc,.docx,.xls,.xlsx,.ppt,.pptx,.pdf,.txt"
+                          :http-request="v => submitUpload(v, '3')">
                           <div class="content-item" trigger>
                             <img src="https://cdn.cunwuyun.cn/dvcp/announce/folder.png"/>
                             <p>文件</p>
@@ -143,10 +178,10 @@
                 </el-form-item>
                 <el-form-item label="宣发审批" prop="enableExamine" style="width: 100%;" :rules="[{ required: true, message: '请输入任务名称', trigger: 'blur' }]">
                   <el-switch
-                      v-model="form.enableExamine"
-                      active-value="1"
-                      inactive-value="0"
-                      active-text="开启后，创建的群发任务需要审批人进行审批">
+                    v-model="form.enableExamine"
+                    active-value="1"
+                    inactive-value="0"
+                    active-text="开启后，创建的群发任务需要审批人进行审批">
                   </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' }]">
@@ -180,29 +215,29 @@
             <div class="ai-form">
               <el-form-item label="标题" style="width: 100%;" prop="linkTitle" :rules="[{ required: true, message: '请输入标题', trigger: 'blur' }]">
                 <el-input
-                    size="small"
-                    placeholder="请输入标题"
-                    maxlength="42"
-                    show-word-limit
-                    v-model="linkForm.linkTitle">
+                  size="small"
+                  placeholder="请输入标题"
+                  maxlength="42"
+                  show-word-limit
+                  v-model="linkForm.linkTitle">
                 </el-input>
               </el-form-item>
               <el-form-item label="链接" style="width: 100%;" prop="linkUrl" :rules="[{ required: true, message: '请输入链接', trigger: 'blur' }]">
                 <el-input
-                    size="small"
-                    placeholder="请输入链接"
-                    maxlength="682"
-                    show-word-limit
-                    v-model="linkForm.linkUrl">
+                  size="small"
+                  placeholder="请输入链接"
+                  maxlength="682"
+                  show-word-limit
+                  v-model="linkForm.linkUrl">
                 </el-input>
               </el-form-item>
               <el-form-item label="描述" style="width: 100%;" prop="linkDesc">
                 <el-input
-                    size="small"
-                    placeholder="请输入描述"
-                    maxlength="170"
-                    show-word-limit
-                    v-model="linkForm.linkDesc">
+                  size="small"
+                  placeholder="请输入描述"
+                  maxlength="170"
+                  show-word-limit
+                  v-model="linkForm.linkDesc">
                 </el-input>
               </el-form-item>
               <el-form-item label="封面图" prop="linkPicUrl" style="width: 100%;">
@@ -212,34 +247,34 @@
           </el-form>
         </ai-dialog>
         <ai-dialog
-            :visible.sync="isShowAddMiniapp"
-            width="920px"
-            title="小程序消息"
-            @close="onClose"
-            @onConfirm="onMiniAppForm">
+          :visible.sync="isShowAddMiniapp"
+          width="920px"
+          title="小程序消息"
+          @close="onClose"
+          @onConfirm="onMiniAppForm">
           <el-form ref="miniAppForm" :model="miniAppForm" label-width="130px" label-position="right">
             <div class="ai-form">
               <el-form-item label="小程序appid" style="width: 100%;" prop="mpAppid" :rules="[{ required: true, message: '小程序appid', trigger: 'blur' }]">
                 <el-input
-                    size="small"
-                    placeholder="小程序appid"
-                    v-model="miniAppForm.mpAppid">
+                  size="small"
+                  placeholder="小程序appid"
+                  v-model="miniAppForm.mpAppid">
                 </el-input>
               </el-form-item>
               <el-form-item label="小程序page路径" style="width: 100%;" prop="mpPage" :rules="[{ required: true, message: '请输入小程序page路径', trigger: 'blur' }]">
                 <el-input
-                    size="small"
-                    placeholder="请输入小程序page路径"
-                    v-model="miniAppForm.mpPage">
+                  size="small"
+                  placeholder="请输入小程序page路径"
+                  v-model="miniAppForm.mpPage">
                 </el-input>
               </el-form-item>
               <el-form-item label="标题" style="width: 100%;" prop="mpTitle" :rules="[{ required: true, message: '请输入标题', trigger: 'blur' }]">
                 <el-input
-                    size="small"
-                    placeholder="请输入标题"
-                    maxlength="20"
-                    show-word-limit
-                    v-model="miniAppForm.mpTitle">
+                  size="small"
+                  placeholder="请输入标题"
+                  maxlength="20"
+                  show-word-limit
+                  v-model="miniAppForm.mpTitle">
                 </el-input>
               </el-form-item>
               <el-form-item label="封面图" prop="media" style="width: 100%;" :rules="[{ required: true, message: '请上传封面图', trigger: 'change' }]">
@@ -249,21 +284,21 @@
           </el-form>
         </ai-dialog>
         <ai-dialog
-            :visible.sync="isShowDate"
-            width="590px"
-            title="定时发送"
-            customFooter>
+          :visible.sync="isShowDate"
+          width="590px"
+          title="定时发送"
+          customFooter>
           <el-form ref="dateForm" :model="dateForm" label-width="130px" label-position="right">
             <div class="ai-form">
               <el-form-item label="定时发送时间" style="width: 100%;" prop="choiceTime" :rules="[{ required: true, message: '请选择定时发送时间', trigger: 'change' }]">
                 <el-date-picker
-                    style="width: 100%;"
-                    v-model="dateForm.choiceTime"
-                    type="datetime"
-                    size="small"
-                    :picker-options="pickerOptions"
-                    value-format="yyyy-MM-dd HH:mm:ss"
-                    placeholder="请选择定时发送时间">
+                  style="width: 100%;"
+                  v-model="dateForm.choiceTime"
+                  type="datetime"
+                  size="small"
+                  :picker-options="pickerOptions"
+                  value-format="yyyy-MM-dd HH:mm:ss"
+                  placeholder="请选择定时发送时间">
                 </el-date-picker>
               </el-form-item>
             </div>
@@ -273,6 +308,27 @@
             <el-button @click="onDateForm" type="primary" :loading="isLoading2" style="width: 92px;">确认</el-button>
           </div>
         </ai-dialog>
+        <ai-dialog
+          :visible.sync="isShowTags"
+          width="800px"
+          :title="isRemoveTag ? '批量移除标签' : '批量打标签'"
+          @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.indexOf(item.id) === -1 ? '' : 'primary'"
+                  v-for="(item, index) in item.tagList"
+                  @click="choose(item.id)"
+                  :key="index">
+                  {{ item.name }}
+                </el-button>
+              </div>
+            </div>
+          </div>
+        </ai-dialog>
       </div>
     </template>
     <template #footer>
@@ -305,7 +361,10 @@ export default {
       info: {},
       department: [],
       isLoading1: false,
+      tags: [],
+      isShowTags: false,
       isLoading2: false,
+      isRemoveTag: false,
       fileList: [],
       isShowAddLink: false,
       isShowAddMiniapp: false,
@@ -372,11 +431,27 @@ export default {
     } else {
       this.getWxGroups()
     }
+
+    this.getTags()
   },
 
   methods: {
     ...mapActions(['initOpenData', 'transCanvas']),
 
+    getTags () {
+      this.instance.post(`/app/wxcp/wxcorptag/listAll?size=100`).then(res => {
+        if (res.code == 0) {
+          this.tags = res.data.records
+
+          console.log(res.data.records)
+        }
+      })
+    },
+
+    onTagsConfirm () {
+
+    },
+
     getInfo(id) {
       this.instance.post(`/app/appmasssendingtask/queryDetailById?id=${id}`).then(res => {
         if (res.code === 0) {