Merge branch 'V0.0.2' of http://10.87.10.227:4000/jzyd_yyds/soc_web into V0.0.2

src/views/core/message/index.vue

@@ -100,6 +100,7 @@
               @click="lookThisOne(scope.row)"
               v-hasPermi="['core:notification:query']"
             >详情</el-button>
+            <div v-if="loginOrgId==scope.row.orgId">
             <el-button
               size="mini"
               type="text"
@@ -128,6 +129,7 @@
               v-hasPermi="['core:notification:cancelPublish']"
               v-if="scope.row.messagStatus=='1'"
             >取消发布</el-button>
+            </div>
           </template>
         </el-table-column>
       </el-table>
@@ -187,7 +189,7 @@
           <el-input v-model="form.content" type="textarea" placeholder="请输入内容" :disabled="!isSubmit" :autosize="{ minRows: 6, maxRows: 10}" :maxlength="2000" show-word-limit/>
         </el-form-item>
         <el-form-item label="附件" prop="fileList">
-          <K-file-upload ref="upload" :defaultValue="formFileListDefualtValue" :disabled="!isSubmit" v-model="form.fileList"/>
+          <K-file-upload ref="upload" :defaultValue="formFileListDefualtValue" :disabled="!isSubmit"  :isShowUploadBtn="!isSubmit? false:true" v-model="form.fileList"/>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -230,17 +232,20 @@ export default {
       // 是否显示弹出层
       open: false,
       orgId:null,
+      loginOrgId:null,
       // 查询参数
       queryParams: {
         pageNum: 1,
         pageSize: 10,
         title: null,
         dateRange: [],
-        messagStatus: null
+        messagStatus: null,
+        checkSub:true
       },
       isShow:false,
       isSubmit:true,
       roleList: [],
+      roleListInit: [],
       formFileListDefualtValue: [],
       // 表单参数
       form: {},
@@ -255,9 +260,11 @@ export default {
     };
   },
   created() {
+    this.orgId = this.$store.getters.orgId;
+    this.loginOrgId = this.$store.getters.orgId;
+    this.queryParams.orgId = this.$store.getters.orgId;
     this.getList();
     this.initRoleList();
-    this.orgId = this.$store.getters.orgId;
   },
   methods: {
     /** 查询公告通知列表 */
@@ -272,8 +279,8 @@ export default {
     getRolename(roleIds){
       if(roleIds!=null && roleIds.length>0){
         return roleIds.map(v => {
-          if(this.roleList.find(item => item.id === v)){
-            return this.roleList.find(item => item.id === v).name
+          if(this.roleListInit.find(item => item.id === v)){
+            return this.roleListInit.find(item => item.id === v).name
           }else {
             return "";
           }
@@ -290,6 +297,7 @@ export default {
       //this.roleList=[];
       this.reset();
       this.isSubmit=true;
+      this.isShow=false;
     },
     handleClose(){
       this.cancel();
@@ -461,6 +469,7 @@ export default {
       this.form.tagRoleIds = [];
       roleList(query).then(response => {
         this.roleList = response.data;
+        this.roleListInit = response.data;
       });
     },