diff --git a/src/api/collect/collect.js b/src/api/collect/collect.js index 162fb2b..7068abb 100644 --- a/src/api/collect/collect.js +++ b/src/api/collect/collect.js @@ -232,7 +232,7 @@ export function FetchFourCheck(data) { }) } -// 归档 +// 归档确定 export function FetchBecomeDocumentConfirm(data) { return request({ url: 'api/collect/becomeDocumentConfirm', diff --git a/src/views/archiveUtilize/utillizeRecord/recordList.vue b/src/views/archiveUtilize/utillizeRecord/recordList.vue index 74e3393..8600b82 100644 --- a/src/views/archiveUtilize/utillizeRecord/recordList.vue +++ b/src/views/archiveUtilize/utillizeRecord/recordList.vue @@ -1,8 +1,9 @@ - + @@ -60,7 +59,8 @@ export default { }) }, getInitFlowByCategoryId() { - FetchInitFlowByCategoryId({ 'categoryId': this.selectedCategory.id }).then((res) => { + console.log(this.selectedCategory) + FetchInitFlowByCategoryId({ 'categoryId': this.selectedCategory.pid !== '0' ? this.selectedCategory.id : null }).then((res) => { this.flowSetting = res this.flowBaseList.forEach(item => { this.flowSetting.forEach(v => { @@ -76,7 +76,7 @@ export default { }, toProcessSelected(item) { const params = { - 'categoryId': this.selectedCategory.id, + 'categoryId': this.selectedCategory.pid !== '0' ? this.selectedCategory.id : null, 'manageId': item.id } FetchgetCategoryFlow(params).then((res) => { diff --git a/src/views/system/archivesCategory/processManage/module/form.vue b/src/views/system/archivesCategory/processManage/module/form.vue index 76cea88..6cb1865 100644 --- a/src/views/system/archivesCategory/processManage/module/form.vue +++ b/src/views/system/archivesCategory/processManage/module/form.vue @@ -206,7 +206,7 @@ export default { return json }) const params = { - 'categoryId': this.selectedCategory.id, + 'categoryId': this.selectedCategory.pid !== '0' ? this.selectedCategory.id : null, 'detailsDTOs': detailsDTOs, 'flowId': this.selectFlowVal.modelId, 'flowName': this.selectFlowVal.deployName, diff --git a/src/views/system/processManage/runningProcess/module/detail.vue b/src/views/system/processManage/runningProcess/module/detail.vue index f0fcbc9..9feac60 100644 --- a/src/views/system/processManage/runningProcess/module/detail.vue +++ b/src/views/system/processManage/runningProcess/module/detail.vue @@ -2,10 +2,18 @@
    -
  • 流程名称:{{ selectRow.flowableName }}
  • -
  • 流程结果:

    {{ !isHistroy ? '进行中' : ( selectRow.endTime ? '已完成' : '已取消') }}

  • -
  • 所属全宗:全宗A
  • -
  • 结束时间:{{ selectRow.endTime | parseTime }}
  • +
  • 流程名称:{{ selectRow.flowableName || selectRow.title }}
  • +
  • 流程结果:

    {{ !isHistroy ? '进行中' : ( selectRow.endTime ? '已完成' : '已取消') }}

  • +
  • + 流程结果: +

    运行中

    +

    已取消

    +

    已完成

    +

    不通过

    +
  • + + +
  • 结束时间:{{ (selectRow.endTime || selectRow.complete_time) | parseTime }}
  • 结束时间:-
@@ -78,6 +86,10 @@ export default { isHistroy: { type: Boolean, default: false + }, + isCenterProcess: { + type: Boolean, + default: false } }, data() { @@ -113,7 +125,7 @@ export default { }, getProcessImg() { this.srcImg = '' - FetchGenProcessDiagram({ 'processId': this.selectRow.procinstId }).then((res) => { + FetchGenProcessDiagram({ 'processId': this.selectRow.procInstId }).then((res) => { this.srcImg = res }).catch(err => { console.log(err) @@ -121,7 +133,7 @@ export default { }, getTaskByProcinstId() { this.taskTableList = [] - FetchTaskByProcinstId({ 'procinstId': this.selectRow.procinstId }).then((res) => { + FetchTaskByProcinstId({ 'procinstId': this.selectRow.procInstId }).then((res) => { this.taskTableList = res }).catch(err => { console.log(err) diff --git a/src/views/system/user/center.vue b/src/views/system/user/center.vue index b3ec03f..e217a25 100644 --- a/src/views/system/user/center.vue +++ b/src/views/system/user/center.vue @@ -40,7 +40,8 @@
  • 用户资料
  • 消息中心
  • 流程中心
  • -
  • 操作日志
  • +
  • 我的利用
  • +
  • 操作日志
  • @@ -74,8 +75,10 @@
    + + -
    +
    @@ -97,12 +100,13 @@ import { isvalidPhone } from '@/utils/validate' // import crud from '@/mixins/crud' import { editUser } from '@/api/system/user' import Avatar from '@/assets/images/avatar.png' -import messageCenter from './messageCenter/index.vue' -import processCenter from './processCenter/index.vue' +import messageCenter from './messageCenter/index' +import processCenter from './processCenter/index' +import utillizeList from '@/views/archiveUtilize/utillizeRecord/recordList' import OperateLog from '@/views/system/log/operateLog/index' export default { name: 'Center', - components: { updatePass, updateEmail, myUpload, messageCenter, processCenter, OperateLog }, + components: { updatePass, updateEmail, myUpload, messageCenter, processCenter, utillizeList, OperateLog }, // mixins: [crud], data() { // 自定义验证 @@ -171,14 +175,14 @@ export default { }, handleClick(index) { this.activeIndex = index - if (this.activeIndex === 2) { - this.init() - } + // if (this.activeIndex === 2) { + // this.init() + // } + }, + beforeInit() { + this.url = 'api/logs/user' + return true }, - // beforeInit() { - // this.url = 'api/logs/user' - // return true - // }, cropUploadSuccess(jsonData, field) { store.dispatch('GetInfo').then(() => {}) }, diff --git a/src/views/system/user/messageCenter/module/list.vue b/src/views/system/user/messageCenter/module/list.vue index b7cb605..3a75b4f 100644 --- a/src/views/system/user/messageCenter/module/list.vue +++ b/src/views/system/user/messageCenter/module/list.vue @@ -37,7 +37,7 @@ - - diff --git a/src/views/system/user/processCenter/module/form.vue b/src/views/system/user/processCenter/module/form.vue new file mode 100644 index 0000000..8e4c275 --- /dev/null +++ b/src/views/system/user/processCenter/module/form.vue @@ -0,0 +1,179 @@ + + + + +