提交

.env.development

@@ -10,7 +10,7 @@ VUE_APP_BASE_API = 'http://10.87.21.107:8080'
 #罗俊
 # VUE_APP_BASE_API = 'http://10.87.10.49:8080'
 #罗伟
-# VUE_APP_BASE_API = 'http://10.87.10.47:8080'
+# VUE_APP_BASE_API = 'http://10.87.23.62:8080'
 #高雄
 #VUE_APP_BASE_API = 'http://10.87.11.94:8080'
 #景远超

src/views/core/send/index.vue

@@ -91,15 +91,22 @@
           <el-input v-model="form.content" type="textarea" :rows="10" maxlength="2000" placeholder="输入内容" clearable/>
         </el-form-item>
 
-        <el-form-item label="发送目标" prop="sendUser" label-width="100px">
+        <el-form-item label="发送目标"  prop="sendUser" label-width="100px">
           <el-select mode="multiple"  v-model="form.sendUser" filterable placeholder="按用户选择" clearable>
             <el-option v-for="item in userOptions" :key="item.id" :label="item.name" :value="item.id"></el-option>
           </el-select>
-
+        </el-form-item>
+        <!-- <el-form-item label="发送目标" v-if="form.sendRole!=null" label-width="100px">
+          <el-select mode="multiple"  v-model="form.sendUser" filterable placeholder="按用户选择" clearable>
+            <el-option v-for="item in userOptions" :key="item.id" :label="item.name" :value="item.id"></el-option>
+          </el-select>
+        </el-form-item> -->
+        <el-form-item  prop="sendRole" label-width="100px">
           <el-select mode="multiple"  v-model="form.sendRole" filterable placeholder="按角色选择" clearable>
             <el-option v-for="item in roleOptions" :key="item.id" :label="item.roleName" :value="item.id"></el-option>
           </el-select>
         </el-form-item>
+
         <el-form-item label="发送时间" prop="sendTimeType">
           <el-radio-group v-model="form.sendTimeType">
             <el-radio v-for="dict in dict.type.send_time_type" :key="dict.value" :label="dict.value">
@@ -174,6 +181,13 @@ export default {
   name: "Send",
   dicts: ['send_time_type', 'message_type', 'send_status'],
   data() {
+    var validatePass2 = (rule, value, callback) => {
+        if (this.form.sendUser==null&&(this.form.sendRole==null||this.form.sendRole=='')) {
+          callback(new Error('请选择用户!'));
+        } else {
+          callback();
+        }
+      };
     return {
       startDatepickerOptions: {
         disabledDate(time) {
@@ -236,7 +250,7 @@ export default {
           { required: true, message: '请输入标题', trigger: 'change' },
         ],
         sendUser: [
-          { required: true, message: '请选择用户', trigger: 'change' },
+        { validator: validatePass2, trigger: 'blur' }
         ],
         content: [
           { required: true, message: '请输入内容', trigger: 'change' },
@@ -247,6 +261,7 @@ export default {
       }
     };
   },
+
   created() {
     this.getList();