修改公告通知

src/views/core/message/index.vue

@@ -129,7 +129,7 @@
               width="250"
               prop="orgName"
             />
-            <el-table-column
+<!--            <el-table-column
               label="消息类型"
               align="center"
               width="200"
@@ -141,7 +141,7 @@
                   :value="scope.row.messagType"
                 />
               </template>
-            </el-table-column>
+            </el-table-column>-->
             <el-table-column
               label="机构类型"
               width="200"
@@ -151,15 +151,15 @@
               <template slot-scope="scope">
                 <dict-tag
                   :options="dict.type.sys_org_type"
-                  :value="scope.row.tagOrgType"
+                  :value="scope.row.tagOrgTypes"
                 />
               </template>
             </el-table-column>
-            <el-table-column prop="tagRoleIds" width="180" label="目标角色">
+<!--            <el-table-column prop="tagRoleIds" width="180" label="目标角色">
               <template slot-scope="r">
                 <span>{{ getRolename(r.row.tagRoleIds) }}</span>
               </template>
-            </el-table-column>
+            </el-table-column>-->
             <el-table-column
               label="标题"
               align="center"
@@ -289,7 +289,7 @@
             :maxlength="100"
           />
         </el-form-item>
-        <el-form-item label="消息类型" prop="messagType">
+<!--        <el-form-item label="消息类型" prop="messagType">
           <el-select
             v-model="form.messagType"
             placeholder="请选择消息类型"
@@ -304,14 +304,14 @@
               :value="dict.value"
             ></el-option>
           </el-select>
-        </el-form-item>
-        <el-form-item label="机构类型" prop="tagOrgType">
+        </el-form-item>-->
+        <el-form-item label="下发机构类型" prop="tagOrgType">
           <el-select
-            v-model="form.tagOrgType"
-            placeholder="请选择机构类型"
+            multiple
+            v-model="form.tagOrgTypes"
+            placeholder="请选择下发机构类型"
             :disabled="!isSubmit"
             style="width: 100%"
-            @change="execOrgTypeChanged()"
           >
             <el-option
               v-for="dict in dict.type.sys_org_type"
@@ -322,9 +322,7 @@
             </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>-->
+<!--        <el-form-item label="目标机构" prop="tagOrgIds">
           <org-tree-select
             trigger="hover"
             v-model="form.tagOrgIds"
@@ -337,7 +335,6 @@
           >
           </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-select
@@ -353,7 +350,7 @@
               :value="item.id"
             ></el-option>
           </el-select>
-        </el-form-item>
+        </el-form-item>-->
 
         <el-form-item label="内容" prop="content">
           <el-input
@@ -447,17 +444,17 @@ export default {
       // 表单参数
       form: {
         title: null,
-        messagType: null,
-        tagOrgType: null,
-        tagOrgIds: [],
+        // messagType: null,
+        tagOrgTypes: [],
+        // tagOrgIds: [],
         content: null
       },
       // 表单校验
       rules: {
         title: [{required: true, message: "请输入标题"}],
-        messagType: [{required: true, message: "请选择消息类型"}],
-        tagOrgType: [{required: true, message: "请选择机构类型"}],
-        tagOrgIds: [{required: true, message: "请选择目标机构", trigger: 'change'}],
+       /* messagType: [{required: true, message: "请选择消息类型"}],*/
+        tagOrgTypes: [{required: true, message: "请选择机构类型"}],
+       /* tagOrgIds: [{required: true, message: "请选择目标机构", trigger: 'change'}],*/
         content: [{required: true, message: "请输入内容"}],
       },
     };
@@ -470,7 +467,7 @@ export default {
     this.loginOrgId = this.$store.getters.orgId;
     this.queryParams.orgId = this.$store.getters.orgId;
     this.getList();
-    this.initRoleList();
+   /* this.initRoleList();*/
   },
   methods: {
     selectNodeId(val){
@@ -570,11 +567,11 @@ export default {
     /** 新增按钮操作 */
     handleAdd() {
       this.reset();
-      this.initRoleList();
+     /* this.initRoleList();*/
       this.formFileListDefualtValue = [];
       this.open = true;
       this.isShow = false;
-      this.title = "添加公告通知";
+      this.title = "新增通知公告";
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -588,12 +585,12 @@ export default {
         if (this.form.messagType == 1) {
           this.isShow = true;
         }
-        roleList(this.form.tagOrgType).then((res) => {
+/*        roleList(this.form.tagOrgType).then((res) => {
           this.roleList = res.data;
-        });
+        });*/
         this.formFileListDefualtValue = this.form.fileList;
         this.open = true;
-        this.title = "编辑公告通知";
+        this.title = "编辑通知公告";
       });
     },
     lookThisOne(row) {
@@ -608,9 +605,9 @@ export default {
         /*    if(this.form.tagRoleIds!=null&&this.form.tagRoleIds.length>0){
           this.isShow=true;
         }*/
-        roleList(this.form.tagOrgType).then((res) => {
+  /*      roleList(this.form.tagOrgType).then((res) => {
           this.roleList = res.data;
-        });
+        });*/
         this.formFileListDefualtValue = this.form.fileList;
         this.open = true;
         this.title = "公告通知详情";
@@ -625,7 +622,6 @@ export default {
             updateNotification(this.form).then((response) => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
-              this.$refs.orgTreeSelect.clear();
               this.reset();
               this.$refs["upload"].clearFiles();
               this.form.fileList = [];
@@ -635,7 +631,6 @@ export default {
             addNotification(this.form).then((response) => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
-              this.$refs.orgTreeSelect.clear();
               this.reset();
               this.form.fileList = [];
               this.$refs["upload"].clearFiles();
@@ -699,18 +694,18 @@ export default {
       this.orgName = data.name;
       this.handleQuery();
     },
-    execOrgTypeChanged(row) {
+/*    execOrgTypeChanged(row) {
       this.form.tagRoleIds = [];
       this.$refs.orgTreeSelect.clear();
       this.initRoleList(this.form.tagOrgType);
-    },
-    initRoleList(query) {
+    },*/
+/*    initRoleList(query) {
       this.form.tagRoleIds = [];
       roleList(query).then((response) => {
         this.roleList = response.data;
         this.roleListInit = response.data;
       });
-    },
+    },*/
 
     showOrHidden() {
       if (this.form.messagType == "1") {