提交

ruoyi-ui/src/api/system/isses.js

@@ -165,7 +165,7 @@ export function timeu(id) {
 // 未读变已读
 export function weit(data) {
   return request({
-    url: '/boman-web-core/p/cs/objectSave',
+    url: '/boman-web-core/message/receiveMessage',
     method: 'post',
     data: data
   })

ruoyi-ui/src/views/system/election/index.vue

@@ -385,6 +385,9 @@ export default {
        eledete.push(route.id)
      })
      eledete  = eledete.join(',')
+     if(eledete == ''){
+       eledete = -1
+     }
      console.log(eledete)
      // this.elezu
      this.loading = true;
@@ -595,7 +598,7 @@ export default {
       // border: 1px solid #eee;
       // border-bottom: 1px solid #eee;
     }
-  
+
   }
 </style>
 

ruoyi-ui/src/views/system/issue/index.vue

@@ -684,6 +684,7 @@ export default {
         }
 
         // this.faerform.children[i].fixedData.receive_user_id = this.lisehtwo[i]
+        this.faerform.children[i].from_dept_name = this.jeogq.dept.deptName
         this.faerform.children[i].fixedData.message_id = 'fk.boman_message'
         this.faerform.children[i].fixedData.send_message_time = tmie
         if(this.objeuisd == -1){
@@ -842,9 +843,10 @@ export default {
         this.msgSuccess('上传成功');
         this.config.push(res.data);
         this.querjtgoe.message_upload = this.config
+        this.querjtgoe.message_title = res.data.name
         this.querjtgoe.message_upload = JSON.stringify(this.querjtgoe.message_upload)
       }
-
+      // querjtgoe.message_title
       console.log(res)
     },
     upImageFntwo(res, file) {
@@ -1154,7 +1156,7 @@ export default {
          // this.lisehtwo.push(response.data)
          this.liseh = []
          this.liseh = response.data;
-         // this.dhiuw = response.data
+         this.dhiuw = response.data
          // this.dhiuw.filter(route=>{
          //   this.lisehtwo.push(route)
          // })

ruoyi-ui/src/views/system/pdf/index.vue

@@ -115,6 +115,7 @@ export default {
     this.forew.table = 'boman_message';
     this.forew.fixedData.id = this.$route.query.id - 0;
     this.wfor.objId = this.$route.query.index - 0;
+    this.wfor.messageId = this.$route.query.id - 0;
     this.wfor.table = this.$route.query.tables;
     // 获取当前时间戳
     var  date1 =new Date();

ruoyi-ui/src/views/system/surface/index.vue

@@ -22,7 +22,7 @@
       <el-table stripe v-loading="loading" :data="postList" @selection-change="handleSelectionChange" @row-click="rowclid">
         <el-table-column type="selection" width="45" style="color: red;" align="center" />
         <template v-for="(item, index) in tabData" >
-          <el-table-column :width="item.columnName =='message_title'? '200' : tabData.length>13?zjFn(item.columnComment)*19:'auto'" :label="item.columnComment" align="center" :prop="item.columnName" :key="index" show-overflow-tooltip v-if="item.columnName !== 'send_user_id'">
+          <el-table-column :width="item.columnName =='message_title'? '200' : tabData.length>13?zjFn(item.columnComment)*19:'auto'" :label="item.columnComment" align="center" :prop="item.columnName" :key="index" show-overflow-tooltip v-if="item.columnName !== 'send_user_id' && item.columnName !== 'message_id'">
           <!-- :style="scope.row.list_class" scope.row[scope.column.property] -->
             <template slot-scope="scope"  style="width: 100%;" >
               <img class="img_icon" v-if="item.htmlType=='imageUpload' && scope.row[scope.column.property] && scope.row[scope.column.property] !== '[]'" @click="imgBtn(JSON.parse(scope.row[scope.column.property])[0].url)"