大屏

project/qianxinan/Announce/AppAnnounce/components/Add.vue

@@ -17,7 +17,7 @@
                   <el-radio-group v-model="form.sendScope" @change="onScopeChange">
                     <el-radio label="0">全部居民群</el-radio>
                     <el-radio label="1">按部门选择</el-radio>
-                    <!-- <el-radio label="2">按网格选择</el-radio> -->
+                    <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' }]">
@@ -140,6 +140,16 @@
                     <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(','),