From a9e4aae6628ee3568273cd8675d8730b8fe1e0b6 Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Mon, 27 Jun 2022 14:37:00 +0800
Subject: [PATCH] 30355

---
 .../wxwork/AppMassNotification/components/Add.vue  |  7 +++++--
 .../sanjianxi/apps/AppScoreRules/AppScoreRules.vue | 14 +++++---------
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/packages/wxwork/AppMassNotification/components/Add.vue b/packages/wxwork/AppMassNotification/components/Add.vue
index e92ca511..18a79d83 100644
--- a/packages/wxwork/AppMassNotification/components/Add.vue
+++ b/packages/wxwork/AppMassNotification/components/Add.vue
@@ -25,7 +25,7 @@
               <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="发送范围" style="width: 100%" prop="deptList">
+              <el-form-item label="发送范围" prop="deptList" style="width: 100%">
                 <select-dept-user v-model="form.deptList" v-bind="$props" :source="form.messageSource"/>
               </el-form-item>
             </el-form>
@@ -147,9 +147,9 @@ export default {
       videos: [],
       files: [],
       rules: {
+        deptList: [{required: true, message: '请选择发送范围'}],
         content: [{required: true, message: '请输入群发内容'}],
         messageSource: [{required: true, message: '请选择群发方式'}],
-        deptList: [{required: true, message: '请选择发送范围'}],
       },
     }
   },
@@ -188,6 +188,9 @@ export default {
       })
     },
     confirm() {
+      if(!this.form.deptList.length) {
+        return this.$message.error('请选择发送范围')
+      }
       this.$refs.form.validate((valid) => {
         if (valid) {
           this.form.fileList = []
diff --git a/project/sanjianxi/apps/AppScoreRules/AppScoreRules.vue b/project/sanjianxi/apps/AppScoreRules/AppScoreRules.vue
index 87f996a1..b715e943 100644
--- a/project/sanjianxi/apps/AppScoreRules/AppScoreRules.vue
+++ b/project/sanjianxi/apps/AppScoreRules/AppScoreRules.vue
@@ -6,10 +6,9 @@
       </template>
       <template slot="content">
         <ai-search-bar bottomBorder>
-
           <template slot="left">
-            <el-cascader size="small" v-model="search.eventType" placeholder="请选择事件/类型" clearable
-                         :props="{...etOps,checkStrictly:true}" @change="handleTypeSearch" ref="eventTypeSearch"/>
+            <!-- <el-cascader size="small" v-model="search.eventType" placeholder="请选择事件/类型" clearable
+                         :props="{...etOps,checkStrictly:true}" @change="handleTypeSearch" ref="eventTypeSearch"/> -->
             <ai-select
                 v-model="search.status"
                 @change="page.current = 1, getList()"
@@ -17,18 +16,16 @@
                 :selectList="dict.getDict('integralRuleStatus')">
             </ai-select>
           </template>
-
           <template slot="right">
+            <el-input size="small" placeholder="事件名称" v-model="search.partyName" clearable
+                      @change="page.current=1,getTableData()" suffix-icon="iconfont iconSearch"/>
           </template>
-
         </ai-search-bar>
 
         <ai-search-bar style="margin-top: 16px;">
-
           <template #left>
             <el-button type="primary" icon="iconfont iconAdd" @click="dialog=true">添加</el-button>
           </template>
-
         </ai-search-bar>
 
         <ai-table
@@ -195,7 +192,7 @@ export default {
       dialog: false,
       form: {
         ladderRule: [],
-        pass: 0,
+        pass: '0',
       },
       formRules: {
         eventType: [{required: true, message: "请选择事件/类型", trigger: "change"}],
@@ -257,7 +254,6 @@ export default {
     },
 
     typeChange(val) {
-      // console.log(val);
       this.form.pass = val
     },