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

packages/wxwork/AppMassNotification/components/Add.vue

@@ -16,19 +16,25 @@
           <template #content>
             <el-form class="ai-form" :rules="rules" ref="form" :model="form" label-width="100px" label-position="right">
 
+              <el-form-item label="发送方式" prop="sendType"  style="width: 50%">
+                <el-radio v-model="form.sendType" label="0">居民群</el-radio>
+                <el-radio v-model="form.sendType" label="1">居民</el-radio>
+              </el-form-item>
+
               <el-form-item label="地区选择" style="width: 100%">
                 <ai-area-get v-model="areaId" :root="areaRootId"  :instance="instance" @select="handleAreaSelect" multiple  size="small" placeholder="全部地区"/>
               </el-form-item>
 
-              <!-- <el-form-item label="用户选择" prop="name" style="width: 100%">
+              <el-form-item label="用户选择" prop="name" style="width: 100%">
                 <el-input size="small" v-model="form.name" placeholder="请选择" disabled>
-                  <ai-wechat-selecter slot="append" :isMultiple="false" refs="addTags" :instance="instance" v-model="users" @change="getSelectPerson">
+                  <!-- :isMultiple="true" -->
+                  <ai-wechat-selecter slot="append"  refs="addTags" :instance="instance" v-model="users" @change="getSelectPerson">
                     <el-button size="small" type="info">选择成员</el-button>
                   </ai-wechat-selecter>
                 </el-input>
-              </el-form-item> -->
+              </el-form-item>
 
-              <el-form-item label="标签选择" style="width: 100%">
+              <el-form-item label="标签选择" style="width: 100%" v-if="form.sendType == 0">
                 <div class="tags" v-for="items in subTags" :key="items.id">
                   <div class="tag_title">{{ items.name }}</div>
                   <div class="tag_item">
@@ -48,19 +54,19 @@
               <el-form-item class="el-form-item__textarea" label="群发内容" prop="content" style="width: 100%">
                 <el-input type="textarea" placeholder="请输入…" v-model="form.content" maxlength="1000" :rows="5" show-word-limit></el-input>
               </el-form-item>
-              <el-form-item label="群发方式" prop="sendType"  style="width: 50%">
+              <!-- <el-form-item label="群发方式" prop="sendType"  style="width: 50%">
                 <el-radio v-model="form.sendType" label="0">立即发送</el-radio>
                 <el-radio v-model="form.sendType" label="1">定时发送</el-radio>
-              </el-form-item>
+              </el-form-item> -->
 
-              <el-form-item label="群发时间" prop="sendTime"  style="width: 50%" v-if="form.sendType == 1">
+              <!-- <el-form-item label="群发时间" prop="sendTime"  style="width: 50%" v-if="form.sendType == 1">
                 <el-date-picker size="small"
                   v-model="form.sendTime"
                   type="datetime"
                   value-format="yyyy-MM-dd HH:mm:ss"
                   placeholder="选择日期时间">
                 </el-date-picker>
-              </el-form-item>
+              </el-form-item> -->
               <el-form-item label="其他类型" prop="explain" style="width: 100%">
                 <el-radio-group v-model="form.contentType" @change="onTypeChange">
                   <el-radio label="image">图片</el-radio>

packages/wxwork/AppMassNotification/components/List.vue

@@ -78,6 +78,7 @@ export default {
       return [
         { prop: "fileList", label: '消息类型', align: "center", width: "250px", formart: v => v?.map(e=> conType[e.contentType]).toString() },
         { prop: "fileList", label: '消息类容', align: "center", width: "250px", formart: v => v?.filter(e=> e.contentType == 'text')[0].content },
+        // { prop: "fileList", label: '消息内容', align: "center", width: "250px", formart: v => v?.filter(e => e.contentType == 'text')[0].content},
         // { slot: 'type' },
         { prop: "sendType", label: '发送类型', align: "center", width: "250px", formart: v => v == 0 ? '立即发送' : '定时发送'},
         { prop: "createTime", label: '创建时间', align: "center", width: "250px"},

project/sanjianxi/apps/AppIntegralAudit/components/Detail.vue

@@ -145,6 +145,7 @@ export default {
         pass: ''
       },
       ruleList: [],
+      num: ''
     }
   },
 

project/sanjianxi/apps/AppIntegralAudit/components/List.vue

@@ -84,7 +84,6 @@
   import { mapState } from 'vuex'
   export default {
     name: 'List',
-
     props: {
       instance: Function,
       dict: Object

project/sanjianxi/apps/AppScoreRules/AppScoreRules.vue

@@ -101,8 +101,6 @@
 
           <el-form-item label="积分分值" prop="integral" v-if="form.pass == 1">
             <ai-range v-model="form.num" ref="resetagefoo" />
-              <!-- @change="search.current = 1, getList()"
-                      @closeVal="search.age = []"/ -->
           </el-form-item>
           
           <el-form-item label="积分分值" prop="integral" v-if="form.pass == 2">