Pārlūkot izejas kodu

修改通知目标角色必填的问题

ouyang 1 gadu atpakaļ
vecāks
revīzija
7f922467c3
1 mainītis faili ar 77 papildinājumiem un 38 dzēšanām
  1. 77 38
      src/views/core/message/index.vue

+ 77 - 38
src/views/core/message/index.vue

@@ -69,7 +69,8 @@
                   icon="el-icon-search"
                   size="mini"
                   @click="handleQuery"
-                  >搜索</el-button
+                >搜索
+                </el-button
                 >
               </el-col>
               <el-col :span="1.5">
@@ -78,7 +79,8 @@
                   icon="el-icon-refresh"
                   size="mini"
                   @click="resetQuery"
-                  >重置</el-button
+                >重置
+                </el-button
                 >
               </el-col>
               <el-col :span="1.5">
@@ -88,7 +90,8 @@
                   size="mini"
                   @click="handleAdd"
                   v-hasPermi="['core:notification:add']"
-                  >新增</el-button
+                >新增
+                </el-button
                 >
               </el-col>
               <right-toolbar
@@ -113,10 +116,10 @@
             >
               <template slot-scope="scope">
                 <span>{{
-                  (queryParams.pageNum - 1) * queryParams.pageSize +
-                  scope.$index +
-                  1
-                }}</span>
+                    (queryParams.pageNum - 1) * queryParams.pageSize +
+                    scope.$index +
+                    1
+                  }}</span>
               </template>
             </el-table-column>
             <el-table-column
@@ -163,13 +166,13 @@
               prop="title"
             >
               <template slot-scope="r"
-                ><p :title="r.row.title" class="line-style">
-                  {{ r.row.title }}
-                </p></template
+              ><p :title="r.row.title" class="line-style">
+                {{ r.row.title }}
+              </p></template
               >
             </el-table-column>
 
-            <el-table-column label="创建人" align="center" prop="createBy" />
+            <el-table-column label="创建人" align="center" prop="createBy"/>
             <el-table-column
               label="发布时间"
               align="center"
@@ -203,7 +206,8 @@
                   @click="lookThisOne(scope.row)"
                   icon="el-icon-info"
                   v-hasPermi="['core:notification:query']"
-                  >详情</el-button
+                >详情
+                </el-button
                 >
                 <el-button
                   size="mini"
@@ -212,7 +216,8 @@
                   v-hasPermi="['core:notification:edit']"
                   v-if="scope.row.messagStatus == '0'"
                   icon="el-icon-edit-outline"
-                  >编辑</el-button
+                >编辑
+                </el-button
                 >
                 <el-button
                   size="mini"
@@ -224,7 +229,8 @@
                     loginOrgId == scope.row.orgId
                   "
                   icon="el-icon-delete"
-                  >删除</el-button
+                >删除
+                </el-button
                 >
                 <el-button
                   size="mini"
@@ -235,7 +241,8 @@
                     scope.row.messagStatus == '0' &&
                     loginOrgId == scope.row.orgId
                   "
-                  >发布</el-button
+                >发布
+                </el-button
                 >
                 <el-button
                   size="mini"
@@ -247,7 +254,8 @@
                     loginOrgId == scope.row.orgId
                   "
                   icon="el-icon-arrow-down"
-                  >取消发布</el-button
+                >取消发布
+                </el-button
                 >
               </template>
             </el-table-column>
@@ -269,6 +277,7 @@
       :visible.sync="open"
       width="800px"
       append-to-body
+
       @close="handleClose"
     >
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
@@ -313,7 +322,6 @@
             </el-option>
           </el-select>
         </el-form-item>
-
         <el-form-item label="目标机构" prop="tagOrgIds">
           <!--          <org-tree-select :queryData="form.tagOrgType" ref="orgTreeSelect" @selectNode="queryNode"
                            :placeholder="'请选择目标机构'" :disable="true"></org-tree-select>-->
@@ -324,11 +332,13 @@
             :enabledCheckOrgTypes="parseInt(form.tagOrgType)"
             :disable="true"
             :disabled="!isSubmit"
+            @selectNode="selectNodeId"
           >
           </org-tree-select>
         </el-form-item>
         <!-- </el-form-item>-->
-        <el-form-item label="目标角色" v-if="isShow" prop="tagRoleIds" :rules="{required: isShow?true:false, message: '请选择目标角色', trigger: 'blur'}">
+        <el-form-item label="目标角色" v-if="isShow" prop="tagRoleIds"
+                      :rules="{required: isShow?true:false, message: '请选择目标角色', trigger: 'blur'}">
           <el-select
             v-model="form.tagRoleIds"
             placeholder="请选择目标角色"
@@ -366,8 +376,9 @@
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" v-if="isSubmit" @click="submitForm"
-          >确 定</el-button
+        <el-button type="primary"  v-if="isSubmit" @click="submitForm"
+        >确 定
+        </el-button
         >
         <el-button @click="cancel" v-if="isSubmit">取 消</el-button>
         <el-button @click="cancel" v-else>关 闭</el-button>
@@ -390,9 +401,22 @@ import {
 import OrgTree from "@/components/orgTree/orgQuerySelector.vue";
 import KFileUpload from "@/components/K-FileUpload/index.vue";
 import OrgTreeSelect from "@/components/orgTreeSelect";
-import { mapGetters } from "vuex";
+import {mapGetters} from "vuex";
+
+var that=''
+var validatePass = (rule, value, callback) => {
+  console.log(that.form.tagOrgIds,'value')
+
+  if (that.form.tagOrgIds && that.form.tagOrgIds.length > 0) {
+
+
+    callback();
+  }else{
+    callback(new Error('请选择目标机构'))
+  }
+}
 export default {
-  components: { OrgTree, KFileUpload, OrgTreeSelect },
+  components: {OrgTree, KFileUpload, OrgTreeSelect},
   name: "Notification",
   dicts: ["messag_type", "message_status", "sys_org_type"],
   data() {
@@ -433,19 +457,19 @@ export default {
       formFileListDefualtValue: [],
       // 表单参数
       form: {
-        title:null,
-        messagType:null,
-        tagOrgType:null,
-        tagOrgIds:[],
-        content:null
+        title: null,
+        messagType: null,
+        tagOrgType: null,
+        tagOrgIds: [],
+        content: null
       },
       // 表单校验
       rules: {
-        title: [{ required: true, message: "请输入标题" }],
-        messagType: [{ required: true, message: "请选择消息类型" }],
-        tagOrgType: [{ required: true, message: "请选择机构类型" }],
-        tagOrgIds: [{ required: true, message: "请选择目标机构" ,trigger: 'change' }],
-        content: [{ required: true, message: "请输入内容" }],
+        title: [{required: true, message: "请输入标题"}],
+        messagType: [{required: true, message: "请选择消息类型"}],
+        tagOrgType: [{required: true, message: "请选择机构类型"}],
+        tagOrgIds: [{required: true, message: "请选择机构类型", trigger: 'change'}],
+        content: [{required: true, message: "请输入内容"}],
       },
     };
   },
@@ -453,6 +477,7 @@ export default {
     ...mapGetters(["orgId"]),
   },
   created() {
+    that=this
     this.orgId = this.$store.getters.orgId;
     this.loginOrgId = this.$store.getters.orgId;
     this.queryParams.orgId = this.$store.getters.orgId;
@@ -460,8 +485,20 @@ export default {
     this.initRoleList();
   },
   methods: {
-    checkIsNull(){
-      console.log("111111111111111",this.form.tagOrgIds);
+    selectNodeId(val){
+
+      this.form.tagOrgIds=val.map(item=>item.id)
+      this.$refs.form.validateField('tagOrgIds',(errorMessage)=>{
+        console.log(errorMessage,'errorMessage')
+        if(!errorMessage){
+
+        }else{
+          return false
+        }
+      })
+    },
+    checkIsNull() {
+      console.log("111111111111111", this.form.tagOrgIds);
     },
     /** 查询公告通知列表 */
     getList() {
@@ -515,7 +552,7 @@ export default {
         title: null,
         content: null,
         messagType: null,
-        tagOrgIds: null,
+        tagOrgIds: [],
         tagRoleIds: null,
         createBy: null,
         createTime: null,
@@ -533,7 +570,7 @@ export default {
     /** 重置按钮操作 */
     resetQuery() {
       this.resetForm("queryForm");
-      this.queryParams.orgId =this.$store.getters.orgId;
+      this.queryParams.orgId = this.$store.getters.orgId;
       this.queryParams.checkSub = true;
       this.$refs["orgTree"].setCheckSub(this.queryParams.checkSub)
       this.queryParams.dateRange = [];
@@ -635,7 +672,8 @@ export default {
           this.getList();
           this.$modal.msgSuccess("删除成功");
         })
-        .catch(() => {});
+        .catch(() => {
+        });
     },
     publish(row) {
       const id = row.id;
@@ -658,7 +696,8 @@ export default {
           this.getList();
           this.$modal.msgSuccess(returnMessage);
         })
-        .catch(() => {});
+        .catch(() => {
+        });
     },
 
     getDefaultKey(key) {