Merge remote-tracking branch 'origin/dev' into build

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">
@@ -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) {