Merge remote-tracking branch 'origin/master'

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

@@ -8,6 +8,13 @@ export function listConfig(query) {
     params: query
   })
 }
+// 查询收文个数
+export function shoueNuber(query) {
+  return request({
+    url: '/boman-web-core/messageReceive/index/' + query,
+    method: 'get'
+  })
+}
 
 export function listIndextwo(query) {
   return request({

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

@@ -88,6 +88,15 @@ export function addRole(data) {
   })
 }
 
+// 下载
+export function pdfDwon(data) {
+  return request({
+    url: '/boman-file/previewAndDownload',
+    method: 'post',
+    data: data
+  })
+}
+
 // 修改角色
 export function updateRole(data) {
   return request({
@@ -127,6 +136,23 @@ export function treeselectid() {
   })
 }
 
+// 查询时间是否超过30分钟
+export function timeu(id) {
+  return request({
+    url: '/boman-web-core/message/canDownload/' + id,
+    method: 'get'
+  })
+}
+
+// 未读变已读
+export function weit(data) {
+  return request({
+    url: '/boman-web-core/p/cs/objectSave',
+    method: 'post',
+    data: data
+  })
+}
+
 // 删除角色
 export function delRole(id) {
   return request({

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

@@ -57,6 +57,14 @@ export function delMenu(data) {
   })
 }
 
+// 撤回
+export function isech(data) {
+  return request({
+    url: '/boman-web-core/message/withdraw/' + data,
+    method: 'get'
+  })
+}
+
 // 提交
 export function tableSubimt(data) {
   return request({

ruoyi-ui/src/settings.js

@@ -1,8 +1,8 @@
 module.exports = {
   title: 'OA管理系统',
   // urls: `http://118.178.139.79:7090`,
-  urls: `http://192.168.101.11:8090`,
-  //  urls: `http://192.168.101.110:8090`,
+  // urls: `http://192.168.101.11:8090`,
+   urls: `http://192.168.101.110:8090`,
 
   /**
    * 侧边栏主题 深色主题theme-dark，浅色主题theme-light

ruoyi-ui/src/views/index.vue

@@ -1,7 +1,37 @@
 <template>
   <div class="app-container home">
+    <el-row :gutter="25">
+       <el-col :sm="24" :lg="6">
+         <div style="background-color: #fff; margin-bottom: 30px; display: flex;flex-direction: column;margin-top: 10px;  padding: 20px; border-radius: 10px;">
+            <p style="display: flex; align-items: center;"><img src="../assets/images/weyr.png" alt="" style="width: 50px;height: 50px; margin-right: 20px;"><span  style="font-size: 14px;  color: #76838f;">今日发文</span></p>
+            <p style="display: flex; justify-content: center; align-items: center;"><img style="width: 10px; height: 6px;" src="../assets/images/shang.png" alt=""><span style="font-size: 20px; margin-left: 10px;  color: #76838f;">{{seiq.toDaySend}}</span></p>
+            <p style="font-size: 14px; color: #a3afb7; text-align: center;margin-top: 10px;">发文个数</p>
+         </div>
+       </el-col>
+       <el-col :sm="24" :lg="6">
+         <div style="background-color: #fff; margin-bottom: 30px; display: flex;flex-direction: column;margin-top: 10px;  padding: 20px; border-radius: 10px;">
+            <p style="display: flex; align-items: center;"><img src="../assets/images/ying.png" alt="" style="width: 50px;height: 50px; margin-right: 20px;"><span  style="font-size: 14px;  color: #76838f;">未读</span></p>
+            <p style="display: flex; justify-content: center; align-items: center;"><img style="width: 10px; height: 6px;" src="../assets/images/xia.png" alt=""><span style="font-size: 20px; margin-left: 10px;  color: #76838f;">{{seiq.unread}}</span></p>
+            <p style="font-size: 14px; color: #a3afb7; text-align: center;margin-top: 10px;">未读个数</p>
+         </div>
+       </el-col>
+       <el-col :sm="24" :lg="6">
+         <div style="background-color: #fff; margin-bottom: 30px; display: flex;flex-direction: column;margin-top: 10px;  padding: 20px; border-radius: 10px;">
+            <p style="display: flex; align-items: center;"><img src="../assets/images/shou.png" alt="" style="width: 50px;height: 50px; margin-right: 20px;"><span  style="font-size: 14px;  color: #76838f;">已读</span></p>
+            <p style="display: flex; justify-content: center; align-items: center;"><img style="width: 10px; height: 6px;" src="../assets/images/shang.png" alt=""><span style="font-size: 20px; margin-left: 10px;  color: #76838f;">{{seiq.read}}</span></p>
+            <p style="font-size: 14px; color: #a3afb7; text-align: center;margin-top: 10px;">已读个数</p>
+         </div>
+       </el-col>
+       <el-col :sm="24" :lg="6">
+         <div style="background-color: #fff; margin-bottom: 30px; display: flex;flex-direction: column;margin-top: 10px;  padding: 20px; border-radius: 10px;">
+            <p style="display: flex; align-items: center;"><img src="../assets/images/xinh.png" alt="" style="width: 50px;height: 50px; margin-right: 20px;"><span  style="font-size: 14px;  color: #76838f;">今日收文</span></p>
+            <p style="display: flex; justify-content: center; align-items: center;"><img style="width: 10px; height: 6px;" src="../assets/images/shang.png" alt=""><span style="font-size: 20px; margin-left: 10px;  color: #76838f;">{{seiq.todayReceipt}}</span></p>
+            <p style="font-size: 14px; color: #a3afb7; text-align: center;margin-top: 10px;">收文个数</p>
+         </div>
+       </el-col>
+    </el-row>
     <el-row :gutter="5">
-      <el-col :sm="24" :lg="17" >
+      <el-col :sm="24" :lg="24" >
         <div class="index_heade">
           <img src="../assets/images/icon_more.png" alt="" class="index_headerImg">
           <p class="index_headetab">
@@ -11,8 +41,8 @@
                   <ul class="index_headerUl">
                     <li v-for="(item,index) in configList" :key="index" @click="headerCld(item)">
                         <img src="../assets/images/icon_list_sj.png" alt="">
-                        <p>{{item.notice_title}}</p>
-                        <span>{{item.create_time}}</span>
+                        <p>{{item.receive_dept_name}}</p>
+                        <span>{{item.send_message_time}}</span>
                     </li>
                   </ul>
                   <div class="index_haderPagin">
@@ -29,78 +59,6 @@
                   </div>
                 </div>
         </div>
-        <!-- 列表 -->
-          <!-- <el-col :sm="24" :lg="24"  style="margin-top: 20px;" >
-               <div class="index_heade index_headeNav" v-show="true">
-                 <img src="../assets/images/icon_more.png" alt="" class="index_headerImg">
-                 <p class="index_headetab">
-                   <span :class="[numlist == index ? ' spanto' : '']" v-for="(item,index) in attendance" :key="index" @click="tabList(index)">{{item}} <p class="tab_i">3</p></span></span>
-                 </p>
-
-                         <div v-if="num == 0">
-                           <el-table :data="tableDataalid" style="width: 100%;margin-top: 10px;"  :stripe="true"   >
-                                  <el-table-column label="序号" align="center" prop="noticeId" width="60" height="53" max-height="53" />
-                                  <el-table-column
-                                    label="申请人"
-                                    align="center"
-                                    prop="name"
-                                    :show-overflow-tooltip="true"
-                                    width="70"
-                                  />
-                                  <el-table-column
-                                    label="部门"
-                                    align="center"
-                                    prop="name"
-
-                                    width="70"
-                                  />
-                                  <el-table-column
-                                    label="请假类型"
-                                    align="center"
-                                    prop="status"
-
-                                    width="75"
-                                  />
-                                  <el-table-column label="请假事由" align="center" prop="createBy" width="100"  :show-overflow-tooltip="true"/>
-                                  <el-table-column label="请假时间" align="center" prop="date" width="150"/>
-                                  <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-                                    <template slot-scope="scope">
-                                      <el-button
-                                        size="small"
-                                        type="success"
-                                        @click="handleUpdate(scope.row)"
-                                        v-hasPermi="['system:notice:edit']"
-                                      >详情</el-button>
-                                      <el-button
-                                        size="small"
-                                        type="primary"
-                                        @click="handleDelete(scope.row)"
-                                        v-hasPermi="['system:notice:remove']"
-                                      >同意</el-button>
-                                      <el-button
-                                        size="small"
-                                        type="danger"
-                                        @click="handleDelete(scope.row)"
-                                        v-hasPermi="['system:notice:remove']"
-                                      >驳回</el-button>
-                                    </template>
-                                  </el-table-column>
-                                 </el-table>
-                           <div class="index_haderPagin">
-                             <el-pagination
-                                  @size-change="handleSizeChange"
-                                  @current-change="handleCurrentChange"
-                                  :current-page.sync="currentPage3"
-                                  :page-size="pageSize"
-                                  layout="prev, pager, next, jumper"
-                                  :total="1000">
-                             </el-pagination>
-                             <span>共 85 条  每页显示 5 条  当前 1/17 页</span>
-                           </div>
-                         </div>
-               </div>
-          </el-col> -->
-        <!-- </el-row> -->
         <!-- 公司概况 -->
         <el-col :sm="24" :lg="24">
            <div class="index_heade  index_headeProfile">
@@ -133,139 +91,14 @@
            </div>
         </el-col>
       </el-col>
-
-      <el-col :sm="24" :lg="7" style="padding-left: 15px">
-         <div class="index_nav">
-          <div class="index_navTime">
-            <p class="index_navTimep" @click="handleAdd">
-              <span>日程</span>
-              <span><i class="el-icon-date" ></i>创建日程</span>
-            </p>
-            <el-calendar id="calendar">
-                <!-- 这里使用的是 2.5 slot 语法，对于新项目请使用 2.6 slot 语法-->
-                <template
-                  slot="dateCell"
-                  slot-scope="{date, data}">
-                  <!--自定义内容-->
-                  <div>
-                    <div class="calendar-day" style="text-align: center">
-                      <el-tooltip v-if="brightDate.indexOf(data.day) != -1" class="item" effect="dark" :content="content(data.day)" placement="right">
-                        <span class="everyDay">{{ data.day.split('-').slice(2).join('-') }}</span>
-                      </el-tooltip>
-                      <span v-else>{{ data.day.split('-').slice(2).join('-') }}</span>
-                      <!-- <p :class="data.isSelected ? 'is-selected' : ''">
-                            {{ data.day.split('-').slice(1).join('-') }} {{ data.isSelected ? '✔️' : ''}}
-                      </p> -->
-                    </div>
-                  </div>
-                </template>
-              </el-calendar>
-            <img src="../assets/images/pic_kpbg.png" alt="" class="index_navTimeimg">
-          </div>
-         </div>
-         <!-- 备忘录 -->
-         <el-col :sm="24" :lg="24" >
-           <div class="index_nav index_memoranduNnavTime">
-            <div class="index_navTime ">
-              <p class="index_navTimep">
-                <span>备忘录</span>
-                <span @click="memoere"><i class="el-icon-date"></i>创建备忘录</span>
-              </p>
-              <ul >
-                <li v-for="(item,index) in getmemorandum" :key="index" >
-                  <p>{{item.memorandum_title}}
-                  </p>
-                  <div class="index_navspande">
-                    <span>
-                    {{item.remind_time}}
-                    </span>
-                    <img src="../assets/images/deletety.png" alt="" v-if="shower" @click="index_deledetfe(item.id)">
-                  </div>
-                </li>
-
-              </ul>
-              <img src="../assets/images/icon_more.png" alt="" class="imjud">
-<!--              <el-calendar v-model="value">
-              </el-calendar> -->
-
-              <img src="../assets/images/pic_kpbg.png" alt="" class="index_navTimeimg">
-            </div>
-           </div>
-         </el-col >
-         <!-- 通讯录 -->
-         <!-- <el-col :sm="24" :lg="24">
-           <div class="index_nav index_memoranduMail">
-                       <div class="index_navTime ">
-                         <p class="index_navTimep">
-                           <span>通讯录</span>
-                           <img src="../assets/images/icon_more.png" alt="" class="index_navTimeimgtwo">
-                         </p>
-                        <div class="index_memoranduMailnav">
-                           <div class="tab_tol">
-                             <el-form class="iejgu" :model="queryParamsail" ref="queryForm" :inline="true" >
-                               <dynamic-forms :type="0" :ref="item.columnName" :config="queryParamsail" @inputs="changeFn" :formConfig="item"
-                                 v-for="(item,index) in queryDataali.queryList" :key='index' />
-                               <el-form-item style="width: 20%; text-align: right;">
-                                 <el-button type="primary"  size="mini" @click="handleQuerygty">搜索</el-button>
-
-                               </el-form-item>
-                             </el-form>
-                             <el-table  stripe v-loading="loading" :data="postList.rows" @selection-change="handleSelectionChange">
-                               <el-table-column :width="item.columnComment == 'id'? '40' : item.columnComment == '姓名'? '60' : '110'"  :label="item.columnComment" align="left" :prop="item.columnName" v-for="(item,index) in postList.tableHeadList" :key="index"  />
-                             </el-table>
-                           </div>
-                          <div class="index_haderPagin index_haderPaginfoiu">
-                            <el-pagination
-                                 @size-change="handleSizeChangeali"
-                                 @current-change="handleCurrentChangeali"
-                                 :current-page.sync="currentPage3"
-                                 :page-size="queryParamsail.pageSize"
-                                 :small= "true"
-                                 layout="prev, pager, next, jumper"
-                                 :total="totalali">
-                            </el-pagination>
-                          </div>
-                        </div>
-                      <img src="../assets/images/pic_kpbg.png" alt="" class="index_navTimeimg">
-                       </div>
-            </div>
-         </el-col> -->
-
-
-      </el-col>
     </el-row>
     <!-- <el-divider /> -->
-  <!-- 添加或修改公告对话框 -->
-  <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" width="980px" append-to-body>
-            <el-form ref="form" :model="form" :rules="queryData.rules" label-width="160px" class="from_index">
-              <el-row>
-                <el-col :span="24" >
-                 <dynamic-forms @modelFn="modelFn"   :ref="item.columnName" :config="form.fixedData" @inputs = "changeFn" :formConfig="item" v-for="(item,index) in queryData.showData" :key='index' />
-                </el-col>
-              </el-row>
-            </el-form>
-            <div slot="footer" class="dialog-footer">
-              <el-button type="primary" @click="handleQuery">确 定</el-button>
-              <el-button @click="cancel">取 消</el-button>
-            </div>
-  </el-dialog>
-  <!-- 通知公告弹窗 -->
-  <el-dialog class="index_ese" :close-on-click-modal="false" :title="title" :visible.sync="openety" width="980px" append-to-body>
-           <div class="index_headertan" >
-               <p v-html="actingk.notice_title == undefined? '暂无数据' : actingk.notice_title"></p>
-               <p>{{actingk.create_time == undefined? '暂无数据' : actingk.create_time}} 发布人:{{actingk.create_by}}</p>
-               <pre>
-                 <div v-html="actingk.notice_content"></div>
-               </pre>
-           </div>
-
-  </el-dialog>
 
   </div>
 </template>
 
 <script>
-import { listIndex, getUserProfile, listIndextwo, listIndextherr, listIndexfou, listIndextanl, getConfig, delConfig, addConfig, addConfigindex, updateConfig, clearCache, delIndexnabd,listIndexber, getTableQuery } from "@/api/system/config";
+import { listIndex, getUserProfile, listIndextwo, listIndextherr, listIndexfou, listIndextanl, getConfig, delConfig, addConfig, addConfigindex, updateConfig, clearCache, delIndexnabd,listIndexber, getTableQuery,shoueNuber } from "@/api/system/config";
 import Editor from '@/components/Editor';
 export default {
   name: "index",
@@ -292,14 +125,16 @@ export default {
        editableTabsteo:[],
        configList:[],
        queryParams:{
-        table:'sys_notice',
+        table:'boman_message_receive',
         orderBy:'create_time desc',
         pageNo:1,
         pageSize:10,
         fixedData:{
           condition:{
-            notice_type:1,
-            status:0
+            visible :'Y',
+            receive_user_id:'0'
+            // notice_type:1,
+            // status:0
           }
         }
 
@@ -315,13 +150,13 @@ export default {
       },
       // 公司概况
       queryParamstabprofile:{
-        table:'sys_info',
+        table:'boman_news',
         orderBy:'create_time desc',
         pageNo:1,
         pageSize:1,
         fixedData:{
           condition:{
-            info_type:1
+            status:1
           }
         }
 
@@ -466,23 +301,25 @@ export default {
       },
       titlees:'通知公告',//通知公告弹框
       openety:false,
-      actingk:{}
+      actingk:{},
+      shouewq:1,
+      seiq:{}
     };
   },
 
   created() {
     // console.log(this.user)
     this.unique(this.arr)
-    this.getList()
+    // this.getList()
     this.getListtab()
     this.getLiser()
     this.getLisprofile()
     // 用户信息
     this.getUser()
     // this.getLismemorandum()  //备忘录
-    this.getLisail()//通讯录
-    this.getLisailtwo()
-    this.init()
+    // this.getLisail()//通讯录
+    // this.getLisailtwo()
+    // this.init()
 
   },
   computed: {
@@ -544,10 +381,10 @@ export default {
       this.loading = true;
       this.configList = []
       listIndex(this.queryParams).then(response => {
-          if(response.data.rows !== null){
+          if(response.data.rows !== null && response.data.rows.length !== 0){
             this.configList = response.data.rows;
           }else {
-            this.configList.push({notice_title: "暂无数据"});
+            this.configList.push({receive_dept_name: "暂无数据"});
           }
           this.total = response.data.total;
           this.loading = false;
@@ -568,12 +405,19 @@ export default {
     getLisprofile() {
       // this.loading = true;
       listIndexber(this.queryParamstabprofile).then(response => {
-          if(response.data !== undefined){
+          if(response.data !== undefined || response.data.rows.length !==0){
             this.getLisprofileone = response.data.rows;
-            if(response.data.rows !== null){
-              this.tieku = this.getLisprofileone[0].info_title
-              this.comg = this.getLisprofileone[0].info_content
+            if(response.data.rows !== null || response.data.rows.length !==0){
+              if(this.numprofile == 0){
+                this.tieku = this.getLisprofileone[0].title
+                this.comg = this.getLisprofileone[0].content
+              }else if(this.numprofile == 1){
+                this.tieku = this.getLisprofileone[0].notice_title
+                this.comg = this.getLisprofileone[0].notice_content
+              }
+              
             }else {
+              console.log('暂无数据')
               this.tieku = '暂无数据'
               this.comg = '暂无数据'
             }
@@ -631,7 +475,7 @@ export default {
       this.loading = true;
       listIndextwo(this.dictType).then(response => {
           this.editableTabs = response.data;
-          this.queryParams.dictType = response.data[1].dictType
+          // this.queryParams.dictType = response.data[1].dictType
           // this.total = response.total;
           this.loading = false;
         }
@@ -647,55 +491,6 @@ export default {
         }
       )
     },
-   // 通讯录表头
-   getLisail() {
-     this.loading = true;
-     listIndexfou(this.queryParamsail).then(response => {
-         if(response.data !== undefined){
-           this.tableDataalid = response.data.tableHeadList;
-           this.postList = response.data
-           if(this.postList.rows !== null){
-             this.postList.rows.filter(route => {
-               // route.dept_id = route.dept_id.value
-               for(var item in route){
-                 if(typeof route[item] == 'object'){
-                   route[item]= route[item].value
-                 }
-               }
-             })
-           }
-
-           this.totalali = response.data.total;
-         }
-         this.loading = false;
-       }
-     );
-   },
-   //日历新增弹框数据
-   getLisalendaraddd() {
-     this.loading = true;
-     this.queryData = []
-     listIndextanl(this.calendaradd).then(response => {
-         if(response.data !== undefined){
-           this.queryData = response.data
-
-         }
-         this.loading = false;
-       }
-     );
-   },
-   //备忘录新增弹框数据
-   getLisalendaradddmer() {
-     this.loading = true;
-     this.queryData = []
-     listIndextanl(this.calendaraddmer).then(response => {
-         if(response.data !== undefined){
-           this.queryData = response.data
-         }
-         this.loading = false;
-       }
-     );
-   },
     goTarget(href) {
       window.open(href, "_blank");
     },
@@ -723,8 +518,23 @@ export default {
       },
       // 第一部分tab点击
     tabSbu(index){
+      console.log(index)
+      this.shouewq = index
+      if(index == 1){
+        // 收文
+        this.queryParams.fixedData.condition.visible = 'Y'
+      }else if(index == 2){
+        //已读
+        this.queryParams.fixedData.condition.visible = 'Y'
+        this.queryParams.fixedData.condition.status = 'Y'
+      }else if(index == 3){
+        // 未读
+        this.queryParams.fixedData.condition.visible = 'Y'
+        this.queryParams.fixedData.condition.status = 'N'
+      }
+      console.log(this.queryParams)
      this.num = index - 1
-     this.queryParams.fixedData.condition.notice_type = index
+     // this.queryParams.fixedData.condition.notice_type = index
      this.getList()
     },
     // 第二部分tab点击numlist
@@ -733,8 +543,15 @@ export default {
     },
     // 第三部分tab点击
     tabSbuprofile(index){
+      if(index == 1){
+        this.queryParamstabprofile.table = 'boman_news'
+        this.queryParamstabprofile.fixedData.condition.status = 1
+      }else if(index == 2){
+        this.queryParamstabprofile.table = 'sys_notice'
+        this.queryParamstabprofile.fixedData.condition.status = 0
+      }
       this.numprofile = index - 1
-      this.queryParamstabprofile.fixedData.condition.info_type = index
+      // this.queryParamstabprofile.fixedData.condition.info_type = index
       this.getLisprofile()
     },
     // 表单重置
@@ -780,7 +597,7 @@ export default {
         addConfigindex(this.forme).then(response => {
           this.msgSuccess("新增成功");
           // this.open = false;
-          this.getLisalendar()
+          // this.getLisalendar()
           this.cancel();
         });
       }else if(this.nummer == 1){
@@ -788,14 +605,6 @@ export default {
         this.forme.table = 'sys_memorandum'
         this.forme.objId = -1
         this.forme.fixedData = this.form
-
-        //备忘录
-       addConfigindex(this.forme).then(response => {
-         this.msgSuccess("新增成功");
-         // this.open = false;
-         this.getLismemorandum()
-         this.cancel();
-       });
       }
       // this.getList();
     },
@@ -806,31 +615,6 @@ export default {
         this.form.fixedData[key] = obj[key]
       }
     },
-    // 新增备忘录
-    memoere(){
-     this.nummer = 1
-     this.open = true;
-     this.title = "添加备忘录";
-     this.getLisalendaradddmer()
-    },
-    // 备忘录删除
-    index_deledetfe(id){
-      var that =  this
-      that.deledlid.idList = []
-      that.deledlid.idList.push(id)
-
-     this.$confirm('是否确认删除', "警告", {
-         confirmButtonText: "确定",
-         cancelButtonText: "取消",
-         type: "warning"
-       }).then(function() {
-         return delIndexnabd(that.deledlid);
-       }).then(() => {
-         this.getLismemorandum();
-         this.msgSuccess("删除成功");
-         // this.$router.go(-1)
-       })
-    },
 
     handleSelectionChange() {
 
@@ -851,16 +635,13 @@ export default {
     getUser() {
       getUserProfile().then(response => {
         this.user = response.data;
-        this.getLisalendar()
-        this.getLismemorandum()
+        this.queryParams.fixedData.condition.receive_user_id = response.data.id
+        this.getList()
+        this.shouNuber()
+        // this.getLisalendar()
+        // this.getLismemorandum()
       });
     },
-    // 通知公告弹窗
-    headerCld(index){
-      this.title = '通知公告'
-       this.openety = true,
-       this.actingk=index
-    },
     // 搜索
     handleQuerygty(){
     this.queryParams.pageNo = 1;
@@ -880,15 +661,37 @@ export default {
         }
       }
     },
-    // 搜索重置  通讯录
-    resetQuery(){
-      console.log(12436)
-     this.queryParamsail.fixedData.condition = {}
-     this.queryParamsail.pageNo = 1
-     // this.resetForm("queryParamsail");
-     console.log(this.queryParamsail)
-     this.getLisail()
+    headerCld(index){
+      if(this.shouewq == 1){
+         this.$router.push({
+           path: '/business/issue',
+           query: {
+             id:index.id,
+             tables:'boman_message_receive'
+           },
+         })
+      }else{
+        this.$router.push({
+          path: '/system/pdf',
+          query: {
+            id:index.id,
+            tables:'boman_message_receive'
+          },
+        })
+      }
+
+    },
+    // 获取收文个数
+    shouNuber(){
+      this.loading = true;
+      shoueNuber(this.user.id).then(response => {
+          // this.total = response.data.total;
+          this.seiq = response.data
+          this.loading = false;
+        }
+      );
     }
+
   },
 };
 </script>

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

@@ -34,7 +34,7 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
-          v-hasPermi="['system:dept:add']"
+          v-hasPermi="['sys_dept:A']"
         >新增</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -62,22 +62,22 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['system:dept:edit']"
+            v-hasPermi="['sys_dept:M']"
           >修改</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-plus"
             @click="handleAdd(scope.row)"
-            v-hasPermi="['system:dept:add']"
+            v-hasPermi="['sys_dept:A']"
           >新增</el-button>
           <el-button
-            v-if="scope.row.parentId != 0"
+            v-if="scope.row.id != 0"
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['system:dept:remove']"
+            v-hasPermi="['sys_dept:D']"
           >删除</el-button>
         </template>
       </el-table-column>

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

@@ -171,7 +171,8 @@ export default {
       quandet:false,
       dhiuw:[],
       // 组id
-      elezu:0
+      elezu:0,
+      jeihqdcee:[]
     };
   },
   mounted() {
@@ -314,10 +315,12 @@ export default {
          that.lisehtwo.push(dueg[i]);
        }
      }
+     that.jeihqdcee = that.lisehtwo
     },
     // 点击全部删除
     eledelte(){
      this.lisehtwo = []
+     this.jeihqdcee = this.lisehtwo
     },
     // 点击删除
     lidele(index) {
@@ -326,6 +329,7 @@ export default {
           this.lisehtwo.splice(i, 1)
         }
       }
+      this.jeihqdcee = this.lisehtwo
     },
     // 点击添加
     reyantt(index) {
@@ -353,6 +357,7 @@ export default {
           that.lisehtwo.push(dueg[i]);
         }
       }
+      this.jeihqdcee = this.lisehtwo
 
       // for(var i = 0 ; i <this.lisehtwo.length; i++ ){
       //   if(this.lisehtwo[i].id == index.id){
@@ -374,8 +379,10 @@ export default {
      delRoleses(this.elezu,eledete).then(response => {
        // this.lisehtwo = response.data;
        // this.dhiuw = response.data
-       if(response.data == 200){
+       if(response.code == 200){
          this.msgSuccess('操作成功');
+         this.$router.go(-1)
+
        }
        this.loading = false;
      });
@@ -472,15 +479,39 @@ export default {
     },
     // 按照组查询人员
     members(index) {
+      let hueg = []
+      let jheugq = []
+      hueg = this.lisehtwo
       this.loading = true;
+      console.log(this.lisehtwo)
+      this.lisehtwo.splice(0,this.dhiuw.length-2)
+      console.log(this.lisehtwo)
+      console.log(this.dhiuw.length-2)
+      this.liseh = []
+      // for (let i = this.dhiuw.length - 1; i >= 0; i--) {
+      //   if (this.dhiuw[i].id == urls) {
+      //     this.config.splice(i, 1);
+      //   }
+      // }
+      // this.jeihqdcee = this.lisehtwo
       getMembers(index).then(response => {
         // this.deptOptionsthre = this.handleTree(response.data, "id");       this.liseh = response.data;
         // response.data
         // this.lisehtwo.push(response.data)
+        // this.lisehtwo = []
+        this.dhiuw = []
         this.dhiuw = response.data
-        this.dhiuw.filter(route=>{
-          this.lisehtwo.push(route)
-        })
+        console.log(this.dhiuw,87)
+        if(this.dhiuw.length == 0){
+          console.log(34,this.dhiuw)
+           this.lisehtwo = this.jeihqdcee
+        }else{
+          // this.dhiuw.filter(route=>{
+            // this.lisehtwo.push(route)
+            this.lisehtwo = this.lisehtwo.concat(this.dhiuw)
+          // })
+        }
+
         this.loading = false;
       });
     }

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

@@ -34,7 +34,7 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
-          v-hasPermi="['system:dept:add']"
+          v-hasPermi="['boman_group:A']"
         >新增</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -45,7 +45,7 @@
           size="mini"
           :disabled="single"
           @click="handleUpdate"
-          v-hasPermi="['system:notice:edit']"
+          v-hasPermi="['boman_group:M']"
         >修改</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -56,7 +56,7 @@
           size="mini"
           :disabled="single"
           @click="etup"
-          v-hasPermi="['system:notice:edit']"
+          v-hasPermi="['boman_group:A']"
         >设置用户</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -67,7 +67,7 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
-          v-hasPermi="['system:notice:remove']"
+          v-hasPermi="['boman_group:D']"
         >删除</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -97,14 +97,14 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['system:dept:edit']"
+            v-hasPermi="['boman_group:M']"
           >修改</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-plus"
             @click="handleAdd(scope.row)"
-            v-hasPermi="['system:dept:add']"
+            v-hasPermi="['boman_group:A']"
           >新增</el-button>
           <el-button
             v-if="scope.row.parentId != 0"
@@ -112,7 +112,7 @@
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['system:dept:remove']"
+            v-hasPermi="['boman_group:D']"
           >删除</el-button>
         </template>
       </el-table-column>
@@ -299,7 +299,7 @@ export default {
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
-      console.log(this.ids[0])
+      // console.log(this.ids[0])
       const id = row.id || this.ids[0]
       getDept(id).then(response => {
         this.form = response.data;

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

@@ -356,6 +356,7 @@ export default {
 
       },
       taegshouw:false,
+      jeuiygqa:''
 
 
     };
@@ -371,12 +372,13 @@ export default {
 
     this.frowtse.businessTypeName = this.$route.query.tables;
     this.frowtse.dbname = this.$route.query.tables;
-
     this.querjtgoe.message_situation = this.$route.query.tabname - 0;
+    this.jeuiygqa = this.$route.query.tabname
     if(this.$route.query.tabname == 'shouwen'){
       this.titlet = '收文'
     }else if(this.$route.query.tabname == 1){
       this.titlet = '发文'
+
     }
     if(this.objeuisd !== -1){
       this.frowtse.businessType = this.$route.query.id - 0;
@@ -408,8 +410,14 @@ export default {
               // this.config = res.data.message_upload
               this.configtwo = JSON.parse(res.data.message_enclosure)
             }
-
-            if(res.data.status == '未提交'){
+          console.log(this.jeuiygqa)
+            if(res.data.status == '未提交' && this.jeuiygqa == 1){
+              this.taegshouw = false
+            }else{
+              this.taegshouw = true
+            }
+          }else{
+            if(this.jeuiygqa == 1){
               this.taegshouw = false
             }else{
               this.taegshouw = true
@@ -582,7 +590,7 @@ export default {
             addbjectSave(this.faerform).then(response => {
               // this.msgSuccess("操作成功");
               this.frowtse.businessCodes = response.data[0].data
-              
+
               this.sbreulw()
               // this.$router.go(-1);
               // this.open = false;

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

@@ -1,22 +1,83 @@
 <template>
   <div class="pdf" v-show="fileType === 'pdf'">
-    <p class="arrow">
-    <!-- // 上一页 -->
-    <span @click="changePdfPage(0)" class="turn" :class="{grey: currentPage==1}">Preview</span>
-    {{currentPage}} / {{pageCount}}
-    <!-- // 下一页 -->
-    <span @click="changePdfPage(1)" class="turn" :class="{grey: currentPage==pageCount}">Next</span>
-    </p>
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['system:menu:add']"
+        >转收文</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['system:menu:add']"
+        >转本部门</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['system:menu:add']"
+        >分发范围</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['system:menu:add']"
+        >阅读情况</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['system:menu:add']"
+        >收藏公文</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          size="mini"
+          @click="pdfdele"
+          v-hasPermi="['system:menu:add']"
+        >退回</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['system:menu:add']"
+        >收文签收</el-button>
+      </el-col>
+    </el-row>
     <div>
       <p style="font-size: 28px; font-weight: 700;">正文:</p>
-        <a :href="src" download="测试">下载</a>
+       <a v-if="shouwe" :href="src" download="测试">{{name}}</a>
+       <span v-if="!shouwe" @click="down">{{name}}</span>
     </div>
     <p style="font-size: 28px; font-weight: 700;">附件:</p>
+    <p style="text-align: right; font-size: 20px; color: #1890FF;"><a :href="src"  target="_blank" >全屏</a></p>
     <iframe :src="src" frameborder="0" style="width: 100%; height: 100vh;"></iframe>
   </div>
 </template>
 <script>
 import Pdf from 'vue-pdf'
+import { listRoles,pdfDwon,timeu,weit} from "@/api/system/isses";
 export default {
   components: {
     Pdf
@@ -24,18 +85,115 @@ export default {
   data() {
     return {
       dialogVisible: true,
-      src: `${window.location.origin}/ceshi.pdf`,
-      fileType:'pdf'
+      // src: `${window.location.origin}/ceshi.pdf`,
+      src:'',
+      fileType:'pdf',
+      name:'',
+      forew:{
+       table:'',
+       fixedData:{
+         id:-1
+       }
+      },
+      juegh:{
+        preview:false,
+        absolutePath:''
+      },
+      shouwe:true,
+      wfor:{
+        "table": "",
+        objId:0,
+        fixedData:{
+          status:'Y'
+        }
+      }
     }
   },
   created() {
-
+    console.log(this.$route.query.tables)
+    this.forew.table = this.$route.query.tables;
+    this.forew.fixedData.id = this.$route.query.id - 0;
+    this.wfor.table = this.$route.query.tables;
+    this.wfor.objId = this.$route.query.id - 0;
+    if(this.$route.query.teiwog == 'weidu'){
+      this.weideu()
+    }
+    this.getList()
+    this.timeta()
   },
   methods: {
+    handleAdd(){},
+    // 路径
+    getList() {
+      this.loading = true;
+      console.log(this.forew)
+      listRoles(this.forew).then(
+        res => {
+          console.log(34)
+          console.log(res)
+          let pdflis = []
+          if(res.data !== undefined){
+            if(res.data.message_upload !== null && res.data.message_upload !==''){
+              pdflis = JSON.parse(res.data.message_upload)
+              this.src = pdflis[0].url
+              this.name = res.data.message_title
+              this.juegh.absolutePath = pdflis[0].absolutePath
+            }
+
+            console.log(this.src)
+          }
+        }
+      );
+    },
+    pdfdele(){
+    this.$router.go(-1)
+    },
+    // 下载
+    down(){
+      pdfDwon(this.juegh).then(response => {
+        if (response.resultCode == 0) {
+          this.msgSuccess('提交成功');
+        }
+        this.$store.dispatch('tagsView/delView', this.$route);
+        // this.reload();
+      });
+    },
+    // 判断时间是否在30分钟以内
+    timeta(){
+      timeu(this.forew.fixedData.id).then(response => {
+        console.log(response)
+        if(response.code == 200){
+          this.shouwe =  true
+        }else{
+          this.shouwe =  false
+        }
+        // if (response.resultCode == 0) {
+        //   this.msgSuccess('提交成功');
+        // }
+        // this.$store.dispatch('tagsView/delView', this.$route);
+        // this.reload();
+      });
+    },
+    // 未读变已读
+    weideu(){
+      weit(this.wfor).then(response => {
+        console.log(response)
+        if(response.code == 200){
+          this.msgSuccess('已读成功');
+          // this.shouwe =  true
+        }else{
+          // this.shouwe =  false
+        }
+        })
+    }
+
 
   }
 }
 </script>
 
 <style>
+  .pdf{
+    padding: 30px;
+  }
 </style>

ruoyi-ui/src/views/system/role/fz-index.vue

@@ -58,7 +58,7 @@
                 <div class="searName">
                   功能
                 </div>
-                <div class="searItem" v-for="item in menusList.heads" :key="item">
+                <div class="searItem" v-for="item in menusList.heads" :key="item.name">
                   {{item.name}}
                 </div>
               </div>

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

@@ -5,7 +5,8 @@
       <el-divider></el-divider> -->
       <div class="table_headerBtun" v-if="queryData.buttonList">
         <el-button type="primary" plain @click="headerBtn(item)" size="small" v-for="(item,index) in queryData.buttonList.split('').filter((res) => {return res!='S'})"
-          :key="index">{{item | btnConversion}}</el-button>
+          :key="index +'name'">{{item | btnConversion}}</el-button>
+          <el-button v-if="tabnaem == 1" type="primary" plain @click="headerBtn('H')" size="small" >撤回</el-button>
       </div>
       <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch">
         <dynamic-forms :type="0" :ref="item.columnName" :config="queryParams" @inputs="changeFn" :formConfig="item"
@@ -20,7 +21,7 @@
     <div class="table_nav">
       <el-table v-loading="loading" :data="postList" @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="45" style="color: red;" align="center" />
-        <template v-for="(item, index) in tabData">
+        <template v-for="(item, index) in tabData" >
           <el-table-column :width="item.columnComment =='编号'? '50' : tabData.length>13?zjFn(item.columnComment)*19:'auto'" :label="item.columnComment" align="center" :prop="item.columnName" :key="index" show-overflow-tooltip>
           <!-- :style="scope.row.list_class" scope.row[scope.column.property] -->
             <template slot-scope="scope"  >
@@ -28,7 +29,8 @@
                 :src="scope.row[scope.column.property] == '[]' ? '' : JSON.parse(scope.row[scope.column.property])[0].url  " alt="">
              <span :style="scope.row.list_class" v-else-if="item.htmlType=='imageUpload' && scope.row[scope.column.property] && scope.row[scope.column.property] == '[]'">暂无图片</span>
               <span :style="scope.row.list_class" v-else-if="item.columnName == 'status' ">{{ scope.row[scope.column.property] }}</span>
-              <div v-else-if="item.columnName == 'message_title' && tabnaem == 'yidu' || tabnaem == 'weidu' " @click="titey">
+              <!-- && tabnaem == 'yidu' || tabnaem == 'weidu' -->
+              <div v-else-if="item.columnName == 'message_title'  && tabnaem == 'yidu' || tabnaem == 'weidu' " @click="titey(scope.row.id)">
                  {{scope.row[scope.column.property]}}
               </div>
               <div v-else>
@@ -53,7 +55,8 @@
     addbjectSave,
     getByTableName,
     delMenu,
-    getObject
+    getObject,
+    isech
   } from '@/api/system/table.js'
   import {getUserProfile} from "@/api/system/config";
   import {
@@ -136,7 +139,8 @@
       const route = this.$route;
       const {
         meta,
-        path
+        path,
+        sysTableName
       } = route;
       let items = this.sidebarRouters.filter(res => {
         return res.path == ('/' + path.split('/')[1])
@@ -147,12 +151,16 @@
       let nmaelist = naem[naem.length - 1]
       this.tabnaem = nmaelist
       console.log(nmaelist)
-      this.tabName = items.sysTableName
-      this.queryParams.table = items.sysTableName
+      // this.tabName = items.sysTableName
+      this.tabName = naem[naem.length - 2]
+      this.queryParams.table = naem[naem.length - 2]
+      console.log( route)
       if(nmaelist == 1){
         this.queryParams.fixedData.condition.message_situation = nmaelist
       }else if(nmaelist == 'shouwen'){
-        this.queryParams.fixedData.condition.message_situation = 2
+        // this.queryParams.fixedData.condition.receive_user_id = this.queryParams.fixedData.condition.send_user_id
+        // this.queryParams.fixedData.condition.send_user_id = undefined
+        // this.queryParams.fixedData.condition.visible = 'Y'
       }else if(nmaelist == 'shenqingzhong'){
         this.queryParams.fixedData.condition.status = 4
       }else if(nmaelist == 2){
@@ -194,7 +202,7 @@
       routerFn(id, tables) {
 
         console.log(this.tabnaem)
-        if (this.tabnaem == 'shouwen' || this.tabnaem == 'yidu' || this.tabnaem == 'weidu' ) {
+        if (this.tabnaem == 'shouwen'  ) {
           console.log(34)
           this.$router.push({
             path: '/business/collection',
@@ -213,7 +221,17 @@
               tabname:this.tabnaem
             },
           })
-        } else {
+        } else if(this.tabnaem == 'yidu' || this.tabnaem == 'weidu'){
+          this.$router.push({
+            path: '/system/pdf',
+            query: {
+              id,
+              tables:this.tabName,
+              teiwog:this.tabnaem
+            },
+          })
+        }
+        else {
           this.$router.push({
             path: '/business/issue',
             query: {
@@ -241,6 +259,29 @@
               this.routerFn(id, this.tabName)
               return
             }
+            case 'H':
+              {
+               if (this.multiple) {
+                 this.msgInfo('请勾选一条信息')
+                 return
+               }
+                // _this.ids =  _this.ids.join(',')
+                const id = _this.ids.join(',')
+                this.$confirm('是否确认撤回数据项?', "警告", {
+                  confirmButtonText: "确定",
+                  cancelButtonText: "取消",
+                  type: "warning"
+                }).then(function() {
+                  console.log(id)
+                  return isech(
+                    id
+                  );
+                }).then(() => {
+                  _this.getList();
+                  _this.msgSuccess("撤回成功");
+                })
+                return
+              }
           case 'D':
             {
               if (this.multiple) {
@@ -265,7 +306,14 @@
             }
           case 'Q':
             {
-              this.handleQuery()
+              if (this.single) {
+                this.msgInfo('请勾选一条信息')
+                return
+              }
+              const id = this.ids.join(',')
+              // const id = -1
+              this.routerFn(id, this.tabName)
+              // this.handleQuery()
               return
             }
           case 'S':
@@ -357,20 +405,30 @@
         }).then(res => {
           let data = res.data
           this.queryData = data
+          let buy = data.buttonList
+          if(this.tabnaem == 1 || this.tabnaem == 'shouwen'){
+            console.log(this.tabnaem)
+            console.log(buy)
+            this.queryData.buttonList = buy
+            if(this.tabnaem == 'shouwen'){
+              this.queryData.buttonList = buy + 'Q'
+            }
+          }else{
+            this.queryData.buttonList = 'Q'
+          }
         })
       },
       handleChange(val) {},
       // 点击标题
-      titey(){
-        // query: {
-        //   id,
-        //   tables,
-        //   tabname:this.tabnaem
-        // },
-        console.log(2354)
+      titey(id){
+        console.log(id)
         this.$router.push({
-          path: '/system/pdf'
-
+          path: '/system/pdf',
+          query: {
+            id,
+            tables:this.tabName,
+            teiwog:this.tabnaem
+          },
         })
       },
 // 用户信息
@@ -387,7 +445,12 @@
             this.queryParams.fixedData.condition.status = 'N'
             this.queryParams.fixedData.condition.receive_user_id = response.data.id
             this.queryParams.fixedData.condition.send_user_id = undefined
-          }else{
+          }else if(this.tabnaem == 'shouwen'){
+            this.queryParams.fixedData.condition.visible =  'Y'
+            this.queryParams.fixedData.condition.receive_user_id = response.data.id
+            this.queryParams.fixedData.condition.send_user_id = undefined
+          }
+          else{
             this.queryParams.fixedData.condition.send_user_id = response.data.id
 
           }

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

@@ -90,7 +90,7 @@
               icon="el-icon-plus"
               size="mini"
               @click="handleAdd"
-              v-hasPermi="['system:user:add']"
+              v-hasPermi="['sys_user:A']"
             >新增</el-button>
           </el-col>
           <el-col :span="1.5">
@@ -101,7 +101,7 @@
               size="mini"
               :disabled="single"
               @click="handleUpdate"
-              v-hasPermi="['system:user:edit']"
+              v-hasPermi="['sys_user:M']"
             >修改</el-button>
           </el-col>
           <el-col :span="1.5">
@@ -112,7 +112,7 @@
               size="mini"
               :disabled="multiple"
               @click="handleDelete"
-              v-hasPermi="['system:user:remove']"
+              v-hasPermi="['sys_user:D']"
             >删除</el-button>
           </el-col>
           <el-col :span="1.5">
@@ -122,7 +122,7 @@
               icon="el-icon-upload2"
               size="mini"
               @click="handleImport"
-              v-hasPermi="['system:user:import']"
+              v-hasPermi="['sys_user:I']"
             >导入</el-button>
           </el-col>
           <el-col :span="1.5">
@@ -132,7 +132,7 @@
               icon="el-icon-download"
               size="mini"
               @click="handleExport"
-              v-hasPermi="['system:user:export']"
+              v-hasPermi="['sys_user:E']"
             >导出</el-button>
           </el-col>
           <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
@@ -172,7 +172,7 @@
                 type="text"
                 icon="el-icon-edit"
                 @click="handleUpdate(scope.row)"
-                v-hasPermi="['system:user:edit']"
+                v-hasPermi="['sys_user:M']"
               >修改</el-button>
               <el-button
                 v-if="scope.row.id !== 1"
@@ -180,14 +180,14 @@
                 type="text"
                 icon="el-icon-delete"
                 @click="handleDelete(scope.row)"
-                v-hasPermi="['system:user:remove']"
+                v-hasPermi="['sys_user:D']"
               >删除</el-button>
               <el-button
                 size="mini"
                 type="text"
                 icon="el-icon-key"
                 @click="handleResetPwd(scope.row)"
-                v-hasPermi="['system:user:resetPwd']"
+                v-hasPermi="['sys_user:M']"
               >重置</el-button>
             </template>
           </el-table-column>