首页通知功能

src/views/modules/flowable/task/TaskForm.vue

@@ -79,7 +79,7 @@
    </el-form>
 </el-card>
 
-<div class="FlowFormFooter">
+<div class="FlowFormFooter" v-if="!procInsId || taskId">
 
   <template v-for="(button, index) in buttons">
       <template v-if="button.isHide === '0'">
@@ -159,6 +159,8 @@
         }
       }
        // 读取按钮配置
+      // 先清除缓存按钮
+      this.buttons = null
       if (this.status === 'start') {  // 送审
         this.buttons = [{code: '_flow_start', name: '启动', isHide: '0'}]
       } else if (this.status === 'startAndClose') { // 送审、关闭

src/views/modules/program/registered/ProjectList.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="page">
+  <div class="page" style="height: calc(100% - 50px)">
     <el-form size="small" :inline="true" class="query-form" ref="searchForm" :model="searchForm" @keyup.enter.native="refreshList()" @submit.native.prevent>
       <!-- 搜索框-->
       <el-form-item label="项目名称" prop="name">

src/views/modules/sys/dashboard/workBench/Pending.vue

@@ -105,6 +105,70 @@
               <user-select ref="userSelect" :limit="1" @doSubmit="selectUsersToTransferTask"></user-select>
         </div>
       </el-col>
+
+      <el-col :span="12">
+        <div class="page" style="height: 600px">
+          <div class="top bg-white">
+            <div style="height: 18px" >
+              <span>我的通知({{noticePageList.total}})</span>
+
+              <div style="float:right;align-items:center;display:flex;height: 18px">
+                <el-button type="text" style="float:right" @click="toNoticeList()">更多>></el-button>
+
+              </div>
+            </div>
+
+            <div style="height: calc(100% - 80px);margin-top: 15px">
+              <vxe-table
+                border="inner"
+                auto-resize
+                resizable
+                height="auto"
+                :loading="loading"
+                size="small"
+                ref="noticetable"
+                show-header-overflow
+                show-overflow
+                highlight-hover-row
+                :menu-config="{}"
+                :print-config="{}"
+                :import-config="{}"
+                :export-config="{}"
+                @sort-change="sortChangeHandle"
+                :sort-config="{remote:true}"
+                :data="dataNoticeList"
+                :checkbox-config="{}">
+                <vxe-column title="实例标题" field="title">
+                  <template slot-scope="scope">
+                    <el-link type="primary" :underline="false"
+                             @click="todoPage(scope.row)">{{scope.row.title}}
+                    </el-link>
+                  </template>
+                </vxe-column>
+                <vxe-column title="流程名称" field="taskName"></vxe-column>
+                <vxe-column title="流程发起人" field="createUser"></vxe-column>
+                <vxe-column
+                  field="createTime"
+                  title="创建时间">
+                </vxe-column>
+              </vxe-table>
+              <vxe-pager
+                background
+                size="small"
+                :current-page="noticePageList.currentPage"
+                :page-size="noticePageList.pageSize"
+                :total="noticePageList.total"
+                :page-sizes="[10, 20, 100, 1000, {label: '全量数据', value: 1000000}]"
+                :layouts="['PrevPage', 'JumpNumber', 'NextPage', 'FullJump', 'Sizes', 'Total']"
+                @page-change="currentChangeHandle">
+              </vxe-pager>
+            </div>
+            <!-- 弹窗, 新增 / 修改 -->
+            <NotifyForm  ref="notifyForm" @refreshDataList="refreshList"></NotifyForm>
+          </div>
+        </div>
+      </el-col>
+
       <el-col :span="12">
         <div class="page" style="height: 600px">
           <!--<el-form size="small" :inline="true" class="query-form" ref="searchForm" :model="searchForm" @keyup.enter.native="refreshList()" @submit.native.prevent>
@@ -119,7 +183,7 @@
           </el-form>-->
           <div class="top bg-white">
             <div style="height: 18px" >
-              <span>我的通告({{noticePage.total}})</span>
+              <span>公告({{noticePage.total}})</span>
 
               <div style="float:right;align-items:center;display:flex;height: 18px">
                 <el-button type="text" style="float:right" @click="toNotice()">更多>></el-button>
@@ -199,68 +263,6 @@
         </div>
       </el-col>
 
-      <el-col :span="12">
-        <div class="page" style="height: 600px">
-          <div class="top bg-white">
-            <div style="height: 18px" >
-              <span>我的通知({{noticePageList.total}})</span>
-
-              <div style="float:right;align-items:center;display:flex;height: 18px">
-                <el-button type="text" style="float:right" @click="toNoticeList()">更多>></el-button>
-
-              </div>
-            </div>
-
-            <div style="height: calc(100% - 80px);margin-top: 15px">
-              <vxe-table
-                border="inner"
-                auto-resize
-                resizable
-                height="auto"
-                :loading="loading"
-                size="small"
-                ref="noticetable"
-                show-header-overflow
-                show-overflow
-                highlight-hover-row
-                :menu-config="{}"
-                :print-config="{}"
-                :import-config="{}"
-                :export-config="{}"
-                @sort-change="sortChangeHandle"
-                :sort-config="{remote:true}"
-                :data="dataNoticeList"
-                :checkbox-config="{}">
-                <vxe-column title="实例标题" field="title">
-                  <template slot-scope="scope">
-                    <el-link type="primary" :underline="false"
-                             @click="todoPage(scope.row)">{{scope.row.title}}
-                    </el-link>
-                  </template>
-                </vxe-column>
-                <vxe-column title="流程名称" field="taskName"></vxe-column>
-                <vxe-column title="流程发起人" field="createUser"></vxe-column>
-                <vxe-column
-                  field="createTime"
-                  title="创建时间">
-                </vxe-column>
-              </vxe-table>
-              <vxe-pager
-                background
-                size="small"
-                :current-page="noticePageList.currentPage"
-                :page-size="noticePageList.pageSize"
-                :total="noticePageList.total"
-                :page-sizes="[10, 20, 100, 1000, {label: '全量数据', value: 1000000}]"
-                :layouts="['PrevPage', 'JumpNumber', 'NextPage', 'FullJump', 'Sizes', 'Total']"
-                @page-change="currentChangeHandle">
-              </vxe-pager>
-            </div>
-            <!-- 弹窗, 新增 / 修改 -->
-            <NotifyForm  ref="notifyForm" @refreshDataList="refreshList"></NotifyForm>
-          </div>
-        </div>
-      </el-col>
     </el-row>
   </div>
 </template>