流程标题调整、通告功能调整

src/views/modules/cw/invoice/InvoiceList.vue

@@ -565,7 +565,7 @@
       invoiceInvalidPush (row) {
         // 读取流程表单
         let title = `发起流程【发票作废】`
-        let processTitle = `${this.userName} 在 ${this.moment(new Date()).format('YYYY-MM-DD HH:mm')} 发起了[发票作废]`
+        let processTitle = `${this.userName} 发起了 ${row.no} [发票作废]`
         let status = 'startAndHold'
         if (row.status === '7') {
           status = 'startAndClose'

src/views/modules/cw/projectReportArchive/ProjectReportArchiveList.vue

@@ -438,7 +438,7 @@
       push (row) {
         // 读取流程表单
         let title = `发起流程【项目报告归档】`
-        let processTitle = `${this.userName} 在 ${this.moment(new Date()).format('YYYY-MM-DD HH:mm')} 发起了[项目报告归档]`
+        let processTitle = `${this.userName} 发起了 ${row.reportNo} - ${row.projectName} [项目报告归档]`
         let status = 'startAndHold'
         if (row.status === '3' || row.status === '4') {
           status = 'startAndClose'

src/views/modules/cw/reportManagement/ReportManagementList.vue

@@ -597,7 +597,7 @@
       pushS (row) {
         // 读取流程表单
         let title = `发起流程【报告签章-公章】`
-        let processTitle = `${this.userName} 在 ${this.moment(new Date()).format('YYYY-MM-DD HH:mm')} 发起了[报告签章-公章]`
+        let processTitle = `${this.userName} 发起了 ${row.reportNo} - ${row.projectName} [报告签章-公章]`
         let status = 'startAndClose'
         if (row.status1 === '3') {
           status = 'startAndClose'
@@ -629,7 +629,7 @@
       pushS3 (row) {
         // 读取流程表单
         let title = `发起流程【报告签章-实体公章】`
-        let processTitle = `${this.userName} 在 ${this.moment(new Date()).format('YYYY-MM-DD HH:mm')} 发起了[报告签章-实体公章]`
+        let processTitle = `${this.userName} 发起了 ${row.reportNo} - ${row.projectName} [报告签章-实体公章]`
         let status = 'startAndClose'
         if (row.status3 === '3') {
           status = 'startAndClose'
@@ -774,7 +774,7 @@
       pushS2 (row) {
         // 读取流程表单
         let title = `发起流程【报告签章-公章+执业章】`
-        let processTitle = `${this.userName} 在 ${this.moment(new Date()).format('YYYY-MM-DD HH:mm')} 发起了[报告签章-公章+执业章]`
+        let processTitle = `${this.userName} 发起了 ${row.reportNo} - ${row.projectName} [报告签章-公章+执业章]`
         let status = 'startAndClose'
         if (row.status2 === '3') {
           status = 'startAndClose'

src/views/modules/cw/workClientInfo/WorkClientList.vue

@@ -402,7 +402,7 @@
           this.$router.push({query: {}})
           // 读取流程表单
           let title = `发起流程【客户修改】`
-          let processTitle = `${this.userName} 在 ${this.moment(new Date()).format('YYYY-MM-DD HH:mm')} 发起了[客户修改]`
+          let processTitle = `${this.userName} 发起了 ${data.no} - ${data.name} [客户修改]`
           let status = 'startAndClose'
           if (data.status === '3') {
             status = 'startAndClose'
@@ -441,7 +441,7 @@
           } else {
             // 读取流程表单
             let title = `发起流程【客户修改】`
-            let processTitle = `${this.userName} 在 ${this.moment(new Date()).format('YYYY-MM-DD HH:mm')} 发起了[客户修改]`
+            let processTitle = `${this.userName} 发起了 ${row.no} - ${row.name} [客户修改]`
             let status = 'startAndClose'
             if (row.status === '3') {
               status = 'startAndClose'

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

@@ -1,6 +1,9 @@
 <template>
   <div class="page">
       <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="title">
+          <el-input size="small" v-model="searchForm.title" placeholder="实例标题" clearable></el-input>
+        </el-form-item>
         <el-form-item label="创建时间" prop="searchDates">
           <el-date-picker
             placement="bottom-start"
@@ -117,7 +120,9 @@
         mySum: this.num,
         searchForm: {
           beginDate: '',
-          endDate: ''
+          endDate: '',
+          title: '',
+          processDefinitionName: ''
         },
         searchDates: '',
         dataList: [],

src/views/modules/notify/MyNotifyList.vue

@@ -129,6 +129,7 @@
           'size': this.tablePage.pageSize,
           'orders': this.tablePage.orders,
           isSelf: true,
+          isClose: '0',
           ...this.searchForm
         }).then(({data}) => {
           this.dataList = data.records

src/views/modules/notify/NotifyList.vue

@@ -76,6 +76,12 @@
                  </span>
               </template>
             </vxe-column>
+          <vxe-column  width="100px"align="center" fixed="right" title="关闭状态" field="isClose" >
+            <template slot-scope="scope">
+              <span v-if="scope.row.isClose === '0'" style="color: #67C23A"> 未关闭 </span>
+              <span v-else-if="scope.row.isClose === '1'" style="color: #F56C6C"> 已关闭 </span>
+            </template>
+          </vxe-column>
             <vxe-column  width="100px"align="center" fixed="right" title="状态" field="status" >
               <template slot-scope="scope">
                 <el-button  type="text" @click="detail(scope.row)" effect="dark" size="mini"
@@ -90,7 +96,7 @@
 
                   <el-button v-if="hasPermission('notify:edit')&&(scope.row.status === '1' || scope.row.status === '3')&&scope.row.createBy.id === $store.state.user.id" type="text" size="small" @click="push(scope.row)">修改</el-button>
                   <el-button v-else-if="(scope.row.status === '1' || scope.row.status === '3' || scope.row.status === '5')&&isAdmin" type="text" size="small" @click="edit(scope.row.id)">修改</el-button>
-                  <el-button v-if="scope.row.status === '5'" type="text" size="small" @click="close(scope.row.id)">关闭</el-button>
+                  <el-button v-if="scope.row.status === '5' && scope.row.isClose === '0' && (scope.row.createBy.id === $store.state.user.id || isAdmin)" type="text" size="small" @click="close(scope.row.id)">关闭</el-button>
 
                   <el-button v-if="hasPermission('notify:edit')&&(scope.row.status === '2')&&scope.row.createBy.id === $store.state.user.id" type="text" size="small" @click="reback(scope.row)">撤回</el-button>
                   <el-button v-if="hasPermission('notify:del')&&(scope.row.status === '1' || scope.row.status === '3')&&(scope.row.createBy.id === $store.state.user.id || isAdmin)"  type="text" size="small" @click="del(scope.row.id)">删除</el-button>
@@ -208,10 +214,7 @@
         this.refreshList()
       },
       close (id) {
-        id = id || this.$refs.notifyTable.getCheckboxRecords().map(item => {
-          return item.id
-        })[0]
-        this.$confirm(`确定删除所选项吗?`, '提示', {
+        this.$confirm(`关闭通告后，接收人将无法查阅，确定关闭吗?`, '提示', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
           type: 'warning'
@@ -366,3 +369,14 @@
     }
   }
 </script>
+<style>
+  .box {
+    width: 400px
+  }
+  .box .top {
+    text-align: center;
+  }
+  .box .item {
+    margin: 4px;
+  }
+</style>

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

@@ -430,6 +430,7 @@
           'size': this.noticePage.pageSize,
           'orders': this.noticePage.orders,
           isSelf: true,
+          isClose: '0',
           ...this.searchForm
         }).then(({data}) => {
           this.dataLists = data.records
@@ -500,6 +501,7 @@
           'size': this.noticePage.pageSize,
           'orders': this.noticePage.orders,
           isSelf: true,
+          isClose: '0',
           ...this.searchForm
         }).then(({data}) => {
           this.dataLists = data.records