Browse Source

流程管理/bug修复

master
xuhuajiao 10 months ago
parent
commit
f3e807f061
  1. 32
      src/api/archivesManage/library.js
  2. 4
      src/views/archiveUtilize/archiveSearch/module/resultList.vue
  3. 9
      src/views/archiveUtilize/utillizeRecord/recordList.vue
  4. 5
      src/views/archivesManage/managementLibrary/index.vue
  5. 2
      src/views/archivesManage/managementLibrary/module/collectHeader.vue
  6. 56
      src/views/archivesManage/managementLibrary/module/handOverForm.vue
  7. 1
      src/views/archivesManage/managementLibrary/module/onlineHandover/index.vue
  8. 6
      src/views/collectReorganizi/collectionLibrary/index.vue
  9. 13
      src/views/components/category/PreviewForm.vue
  10. 1
      src/views/system/processManage/runningProcess/index.vue
  11. 46
      src/views/system/processManage/runningProcess/module/businessDetails/index.vue
  12. 33
      src/views/system/processManage/runningProcess/module/detail.vue
  13. 2
      src/views/system/user/processCenter/index.vue
  14. 123
      src/views/system/user/processCenter/module/form.vue

32
src/api/archivesManage/library.js

@ -74,6 +74,33 @@ export function FetchUtilizeConfirm(data) {
}) })
} }
// 档案销毁流程确定
export function FetchArchivesDestructionConfirm(data) {
return request({
url: 'api/control/archivesDestructionConfirm',
method: 'post',
data: data
})
}
// 档案开放流程确定
export function FetchArchivesOpenConfirm(data) {
return request({
url: 'api/control/archivesOpenConfirm',
method: 'post',
data: data
})
}
// 档案退回流程确定
export function FetchArchivesReturnConfirm(data) {
return request({
url: 'api/control/archivesReturnConfirm',
method: 'post',
data: data
})
}
export default { export default {
FetchInitContorlView, FetchInitContorlView,
FetchPrintData, FetchPrintData,
@ -83,5 +110,8 @@ export default {
FetchMainData, FetchMainData,
FetchIsAuthByLookType, FetchIsAuthByLookType,
FetchBase64ByFileId, FetchBase64ByFileId,
FetchUtilizeConfirm
FetchUtilizeConfirm,
FetchArchivesDestructionConfirm,
FetchArchivesOpenConfirm,
FetchArchivesReturnConfirm
} }

4
src/views/archiveUtilize/archiveSearch/module/resultList.vue

@ -130,8 +130,8 @@
</div> </div>
<div class="item-bottom-handle"> <div class="item-bottom-handle">
<span @click.stop="handleDetail(item)">查看详情</span> <span @click.stop="handleDetail(item)">查看详情</span>
<i class="iconfont icon-liuchengfaqi" @click.stop="initiateLending(item)" />
<i class="iconfont icon-jiarujieyueche" @click.stop="addLending(item)" />
<i v-if="item.categoryLevel === 3" class="iconfont icon-liuchengfaqi" @click.stop="initiateLending(item)" />
<i v-if="item.categoryLevel === 3" class="iconfont icon-jiarujieyueche" @click.stop="addLending(item)" />
</div> </div>
</el-row> </el-row>
</div> </div>

9
src/views/archiveUtilize/utillizeRecord/recordList.vue

@ -301,16 +301,17 @@ export default {
}, },
getBusinessFlowDetails(row) { getBusinessFlowDetails(row) {
const params = { const params = {
'businessId': row.businessFlowId
'businessId': row.businessFlowId,
'page': 0,
'size': '999'
} }
FetchBusinessFlowDetails(params).then((res) => { FetchBusinessFlowDetails(params).then((res) => {
if (res.code !== 500) { if (res.code !== 500) {
console.log(res)
this.rowCurrent = res.businessFlow this.rowCurrent = res.businessFlow
res.details.forEach(item => {
res.details.content.forEach(item => {
item.utilizeType = item.utilizeType.split(',').map(Number) item.utilizeType = item.utilizeType.split(',').map(Number)
}) })
this.detailArcData = res.details
this.detailArcData = res.details.content
console.log(this.detailArcData) console.log(this.detailArcData)
} else { } else {
this.$message({ message: '获取数据失败', type: 'error', offset: 8 }) this.$message({ message: '获取数据失败', type: 'error', offset: 8 })

5
src/views/archivesManage/managementLibrary/index.vue

@ -332,16 +332,18 @@ export default {
handlePageList(isQuickFilter) { handlePageList(isQuickFilter) {
if (this.selectedCategory.arrangeType === 3) { if (this.selectedCategory.arrangeType === 3) {
const tablistEle = this.$refs.projectEle const tablistEle = this.$refs.projectEle
tablistEle.page.page = 0
// //
if (isQuickFilter) { if (isQuickFilter) {
tablistEle.$refs.collectHeaderRef.getInitArchivesClass() tablistEle.$refs.collectHeaderRef.getInitArchivesClass()
tablistEle.getTableDisplayFieldsLoading = true tablistEle.getTableDisplayFieldsLoading = true
tablistEle.getViewTableList(1, null, isQuickFilter) tablistEle.getViewTableList(1, null, isQuickFilter)
} else { } else {
this.$refs.projectEle.getCommonData(1)
tablistEle.getCommonData(1)
} }
} else if (this.selectedCategory.arrangeType === 2) { } else if (this.selectedCategory.arrangeType === 2) {
const tablistEle = this.$refs.anjuanEle.$refs.ajContent.$refs.tableList const tablistEle = this.$refs.anjuanEle.$refs.ajContent.$refs.tableList
tablistEle.page.page = 0
// //
if (isQuickFilter) { if (isQuickFilter) {
tablistEle.$refs.collectHeaderRef.getInitArchivesClass() tablistEle.$refs.collectHeaderRef.getInitArchivesClass()
@ -352,6 +354,7 @@ export default {
} }
} else if (this.selectedCategory.arrangeType === 1) { } else if (this.selectedCategory.arrangeType === 1) {
const tablistEle = this.$refs.anjuanEle.$refs.ajContent.$refs.tableList const tablistEle = this.$refs.anjuanEle.$refs.ajContent.$refs.tableList
tablistEle.page.page = 0
// //
if (isQuickFilter) { if (isQuickFilter) {
tablistEle.$refs.collectHeaderRef.getInitArchivesClass() tablistEle.$refs.collectHeaderRef.getInitArchivesClass()

2
src/views/archivesManage/managementLibrary/module/collectHeader.vue

@ -800,6 +800,7 @@ export default {
return false return false
} }
// this.$refs.offLineHandover.offLineHandoverVisible = true // this.$refs.offLineHandover.offLineHandoverVisible = true
this.$refs.formModule.activeIndex = 0
this.$refs.formModule.overType = 7 this.$refs.formModule.overType = 7
this.$refs.formModule.overDetialVisible = true this.$refs.formModule.overDetialVisible = true
this.$refs.formModule.overDetialTitle = '离线移交-流程' this.$refs.formModule.overDetialTitle = '离线移交-流程'
@ -843,6 +844,7 @@ export default {
this.$refs.formModule.overType = 4 this.$refs.formModule.overType = 4
this.$refs.formModule.overDetialTitle = '销毁鉴定-流程' this.$refs.formModule.overDetialTitle = '销毁鉴定-流程'
} }
this.$refs.formModule.activeIndex = 0
this.$refs.formModule.overDetialVisible = true this.$refs.formModule.overDetialVisible = true
}, },

56
src/views/archivesManage/managementLibrary/module/handOverForm.vue

@ -27,7 +27,7 @@
<ArchivesListModule v-if="activeIndex == 0" ref="archivesListModule" :selected-category="selectedCategory" :collect-level="collectLevel" :selections="selections" /> <ArchivesListModule v-if="activeIndex == 0" ref="archivesListModule" :selected-category="selectedCategory" :collect-level="collectLevel" :selections="selections" />
</div> </div>
<div v-if="activeIndex == 1" class="tab-img"> <div v-if="activeIndex == 1" class="tab-img">
<img :src="'data:image/jpeg;base64,'+ srcImg" alt="" :onerror="defaultImg">
<img :src="srcImg" alt="" :onerror="defaultImg">
</div> </div>
</div> </div>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
@ -41,6 +41,7 @@
import { FetchFondsDetail } from '@/api/system/fonds' import { FetchFondsDetail } from '@/api/system/fonds'
import { FetchBusinessFlowTitle } from '@/api/collect/collect' import { FetchBusinessFlowTitle } from '@/api/collect/collect'
import { FetchIntoFlowBusiness } from '@/api/archivesManage/library' import { FetchIntoFlowBusiness } from '@/api/archivesManage/library'
import { FetchInitFlowAll, FetchFindFolwImgByModelId } from '@/api/system/flowable'
import { mapGetters } from 'vuex' import { mapGetters } from 'vuex'
import ArchivesListModule from '@/views/components/archivesListModule/index' import ArchivesListModule from '@/views/components/archivesListModule/index'
import { getCurrentTime } from '@/utils/index' import { getCurrentTime } from '@/utils/index'
@ -90,7 +91,8 @@ export default {
] ]
}, },
defaultImg: 'this.src="' + require('@/assets/images/system/default-img.jpg') + '"', defaultImg: 'this.src="' + require('@/assets/images/system/default-img.jpg') + '"',
srcImg: null
srcImg: null,
modelOptions: null
} }
}, },
computed: { computed: {
@ -99,7 +101,8 @@ export default {
'baseApi' 'baseApi'
]) ])
}, },
created() {
mounted() {
this.getAllFlowable()
}, },
methods: { methods: {
opened() { opened() {
@ -126,7 +129,35 @@ export default {
if (this.activeIndex === 0) { if (this.activeIndex === 0) {
console.log('流程表单') console.log('流程表单')
} else if (this.activeIndex === 1) { } else if (this.activeIndex === 1) {
console.log('流程图')
console.log(this.overType)
console.log(this.modelOptions)
// 2 退 3 4 7 线
let procdefId
if (this.overType === 2) {
const findItem = this.findIdByModelId('archives_return')
procdefId = findItem.procdefId
} else if (this.overType === 3) {
const findItem = this.findIdByModelId('open_auditing')
procdefId = findItem.procdefId
} else if (this.overType === 4) {
const findItem = this.findIdByModelId('destroy_appraisal')
procdefId = findItem.procdefId
} else if (this.overType === 7) {
const findItem = this.findIdByModelId('offline_handover')
procdefId = findItem.procdefId
} else if (this.overType === 6) {
const findItem = this.findIdByModelId('internal_transfer')
procdefId = findItem.procdefId
}
this.getProcessImg(procdefId)
}
},
findIdByModelId(modelKey) {
const item = this.modelOptions.find(data => data.modelKey === modelKey)
if (item) {
return item
} else {
return null
} }
}, },
getBusinessFlowTitle() { getBusinessFlowTitle() {
@ -146,6 +177,21 @@ export default {
console.log(err) console.log(err)
}) })
}, },
getAllFlowable() {
FetchInitFlowAll().then((res) => {
this.modelOptions = res
}).catch(err => {
console.log(err)
})
},
getProcessImg(procdefId) {
this.srcImg = ''
FetchFindFolwImgByModelId({ 'processDefinitionId': procdefId }).then((res) => {
this.srcImg = 'data:image/jpeg;base64,' + res
}).catch(err => {
console.log(err)
})
},
submitHandOverForm() { submitHandOverForm() {
this.$refs['form'].validate((valid) => { this.$refs['form'].validate((valid) => {
if (valid) { if (valid) {
@ -205,7 +251,7 @@ export default {
overflow: hidden; overflow: hidden;
img{ img{
display: block; display: block;
width: 100%;
// width: 100%;
// height: 100%; // height: 100%;
} }
} }

1
src/views/archivesManage/managementLibrary/module/onlineHandover/index.vue

@ -117,6 +117,7 @@ export default {
this.onlineHandoverVisible = false this.onlineHandoverVisible = false
this.$refs.handoverForm.targetFondsNo = row this.$refs.handoverForm.targetFondsNo = row
this.$refs.handoverForm.overDetialVisible = true this.$refs.handoverForm.overDetialVisible = true
this.$refs.handoverForm.overType = 6
this.$refs.handoverForm.overDetialTitle = '在线移交-流程' this.$refs.handoverForm.overDetialTitle = '在线移交-流程'
}, },
handleSizeChange(size) { handleSizeChange(size) {

6
src/views/collectReorganizi/collectionLibrary/index.vue

@ -327,18 +327,19 @@ export default {
handlePageList(isQuickFilter) { handlePageList(isQuickFilter) {
if (this.selectedCategory.arrangeType === 3) { if (this.selectedCategory.arrangeType === 3) {
const tablistEle = this.$refs.projectEle const tablistEle = this.$refs.projectEle
tablistEle.page.page = 0
// //
if (isQuickFilter) { if (isQuickFilter) {
tablistEle.$refs.collectHeaderRef.getInitArchivesClass() tablistEle.$refs.collectHeaderRef.getInitArchivesClass()
tablistEle.getTableDisplayFieldsLoading = true tablistEle.getTableDisplayFieldsLoading = true
tablistEle.getViewTableList(1, null, isQuickFilter) tablistEle.getViewTableList(1, null, isQuickFilter)
} else { } else {
this.$refs.projectEle.getCommonData(1)
tablistEle.getCommonData(1)
} }
} else if (this.selectedCategory.arrangeType === 2) { } else if (this.selectedCategory.arrangeType === 2) {
const getActiveIndex = this.$refs.anjuanEle.$refs.ajContent.activeIndex const getActiveIndex = this.$refs.anjuanEle.$refs.ajContent.activeIndex
const tablistEle = this.$refs.anjuanEle.$refs.ajContent.$refs.tableList const tablistEle = this.$refs.anjuanEle.$refs.ajContent.$refs.tableList
tablistEle.page.page = 0
// //
if (isQuickFilter) { if (isQuickFilter) {
tablistEle.$refs.collectHeaderRef.getInitArchivesClass() tablistEle.$refs.collectHeaderRef.getInitArchivesClass()
@ -359,6 +360,7 @@ export default {
} }
} else if (this.selectedCategory.arrangeType === 1) { } else if (this.selectedCategory.arrangeType === 1) {
const tablistEle = this.$refs.anjuanEle.$refs.ajContent.$refs.tableList const tablistEle = this.$refs.anjuanEle.$refs.ajContent.$refs.tableList
tablistEle.page.page = 0
// //
if (isQuickFilter) { if (isQuickFilter) {
tablistEle.$refs.collectHeaderRef.getInitArchivesClass() tablistEle.$refs.collectHeaderRef.getInitArchivesClass()

13
src/views/components/category/PreviewForm.vue

@ -274,7 +274,7 @@ export default {
delete node.childArchivesClass delete node.childArchivesClass
} }
return { return {
id: node.name,
id: node.code,
label: node.name, label: node.name,
children: node.childArchivesClass children: node.childArchivesClass
} }
@ -326,13 +326,13 @@ export default {
}) })
return data return data
}, },
getClassfiyNode(list, name) {
getClassfiyNode(list, code) {
let data; let data;
(list || []).map(item => { (list || []).map(item => {
if (item.name === name) {
if (item.code === code) {
data = [item] data = [item]
} else { } else {
const child = this.getClassfiyNode(item.childArchivesClass, name)
const child = this.getClassfiyNode(item.childArchivesClass, code)
if (child) { if (child) {
data = child data = child
} }
@ -349,6 +349,7 @@ export default {
string += '' string += ''
} else { } else {
const fieldInfo = this.formPreviewData.find(element => element.fieldName === val.fieldName) const fieldInfo = this.formPreviewData.find(element => element.fieldName === val.fieldName)
console.log('fieldInfo', fieldInfo)
if (fieldInfo.isInputClass === 'select' || fieldInfo.isInputClass === 'popover') { if (fieldInfo.isInputClass === 'select' || fieldInfo.isInputClass === 'popover') {
if (fieldInfo.mateData === 3) { if (fieldInfo.mateData === 3) {
await FetchSonDictionaryList({ 'pid': fieldInfo.dictionaryId.id }).then(res => { await FetchSonDictionaryList({ 'pid': fieldInfo.dictionaryId.id }).then(res => {
@ -375,6 +376,7 @@ export default {
}) })
} }
if (fieldInfo.mateData === 2) { if (fieldInfo.mateData === 2) {
console.log('进来了')
let categoryId let categoryId
if (this.isDesFormType !== 'mergeFile' && this.isDesFormType !== 'arcives' && this.isDesFormType !== 'manageArcives') { if (this.isDesFormType !== 'mergeFile' && this.isDesFormType !== 'arcives' && this.isDesFormType !== 'manageArcives') {
categoryId = this.selectedCategory.pid categoryId = this.selectedCategory.pid
@ -382,7 +384,9 @@ export default {
categoryId = this.selectedCategory.id categoryId = this.selectedCategory.id
} }
await FetchArchivesClassTree({ 'categoryId': categoryId }).then(res => { await FetchArchivesClassTree({ 'categoryId': categoryId }).then(res => {
console.log('res', res)
const option = this.getClassfiyNode(res, this.addOrUpdateForm[val.fieldName]) const option = this.getClassfiyNode(res, this.addOrUpdateForm[val.fieldName])
console.log('option', option)
if (option) { if (option) {
const obj = {} const obj = {}
obj.name = val.name obj.name = val.name
@ -682,7 +686,6 @@ export default {
// if (this.isDesFormType === 'prearchiveLibrary' && this.archivesType === 'add') { // if (this.isDesFormType === 'prearchiveLibrary' && this.archivesType === 'add') {
// this.$set(this.addOrUpdateForm, 'fileOriginal', null) // this.$set(this.addOrUpdateForm, 'fileOriginal', null)
// } // }
this.formPreviewData.map(item => { this.formPreviewData.map(item => {
if (item.isInputClass === 'select') { if (item.isInputClass === 'select') {
this.$set(item, 'options', []) this.$set(item, 'options', [])

1
src/views/system/processManage/runningProcess/index.vue

@ -151,6 +151,7 @@ export default {
this.$refs.processDetail.detailVisible = true this.$refs.processDetail.detailVisible = true
this.$refs.processDetail.selectRow = row this.$refs.processDetail.selectRow = row
this.$refs.processDetail.activeIndex = 0 this.$refs.processDetail.activeIndex = 0
this.$refs.processDetail.setPage.page = 0
this.$refs.processDetail.getBusinessFlowDetails() this.$refs.processDetail.getBusinessFlowDetails()
} }
} }

46
src/views/system/processManage/runningProcess/module/businessDetails/index.vue

@ -1,6 +1,6 @@
<template> <template>
<div> <div>
<el-table :data="tableData" style="width: 100%" height="300" @cell-dblclick="tableDoubleClick">
<el-table :data="tableData" style="width: 100%" height="320" @cell-dblclick="tableDoubleClick">
<el-table-column type="index" align="center" width="55" /> <el-table-column type="index" align="center" width="55" />
<el-table-column prop="fondsName" label="所属全宗" min-width="120" /> <el-table-column prop="fondsName" label="所属全宗" min-width="120" />
<el-table-column prop="categoryName" label="门类名称" min-width="120" /> <el-table-column prop="categoryName" label="门类名称" min-width="120" />
@ -45,8 +45,7 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<!-- @size-change="sizeChangeHandler($event)" @current-change="pageChangeHandler" -->
<el-pagination :page-size.sync="page.size" :total="page.total" :current-page.sync="page.page" style="margin-top: 8px;" layout="total, prev, pager, next, sizes" />
<el-pagination :page-size.sync="setPage.size" :total="setPage.total" :current-page.sync="setPage.page" style="margin-top: 8px;" layout="total, prev, pager, next, sizes" @size-change="sizeChangeHandler($event)" @current-change="pageChangeHandler" />
<ArchivesInfo ref="archivesInfo" :category-id="categoryId" :arc-id="arcId" :is-title-type="isTitleType" /> <ArchivesInfo ref="archivesInfo" :category-id="categoryId" :arc-id="arcId" :is-title-type="isTitleType" />
</div> </div>
</template> </template>
@ -69,15 +68,20 @@ export default {
isFlowableForm: { isFlowableForm: {
type: Boolean, type: Boolean,
default: false default: false
}
}, },
data() {
setPage: {
type: Object,
default: function() {
return { return {
page: {
total: 0, total: 0,
size: 10, size: 10,
page: 1
page: 0
}
}
}
}, },
data() {
return {
categoryId: null, categoryId: null,
arcId: '', arcId: '',
isTitleType: 3, isTitleType: 3,
@ -119,15 +123,17 @@ export default {
] ]
} }
}, },
mounted() {
this.$nextTick(() => {
console.log(this.setPage)
})
},
methods: { methods: {
handleChange(id, value) { handleChange(id, value) {
this.$emit('select-change', { id, value }) this.$emit('select-change', { id, value })
}, },
// table - // table -
tableDoubleClick(row) { tableDoubleClick(row) {
// this.$refs.archivesDetail.archivesInfoVisible = true
// this.$refs.archivesDetail.getDetial()
// this.$refs.archivesDetail.detailTitle = ''
this.categoryId = row.categoryPid this.categoryId = row.categoryPid
this.arcId = row.archivesId this.arcId = row.archivesId
this.$nextTick(() => { this.$nextTick(() => {
@ -145,23 +151,13 @@ export default {
} }
}) })
}, },
//
sizeChangeHandler(e) {
this.loading = true
this.page.size = e
this.page.page = 1
this.params.size = e
this.params.page = 0
// this.doQuery(this.params)
this.loading = false
},
// //
pageChangeHandler(e) { pageChangeHandler(e) {
this.loading = true
this.page.page = e
this.params.page = e - 1
// this.doQuery(this.params)
this.loading = false
this.$emit('page-change', e)
},
//
sizeChangeHandler(e) {
this.$emit('size-change', e)
} }
} }
} }

33
src/views/system/processManage/runningProcess/module/detail.vue

@ -16,6 +16,7 @@
<li v-if="selectRow.endTime || selectRow.complete_time"><span>结束时间</span>{{ (selectRow.endTime || selectRow.complete_time) | parseTime }}</li> <li v-if="selectRow.endTime || selectRow.complete_time"><span>结束时间</span>{{ (selectRow.endTime || selectRow.complete_time) | parseTime }}</li>
<li v-else><span>结束时间</span>-</li> <li v-else><span>结束时间</span>-</li>
</ul> </ul>
<!-- 1.归档 index=1 2.退回 index=2 3.开放 index=6 4.销毁index=7 5.利用index=3 6.内部移交index=4 7.外部移交index=5 -->
<!-- 归档 / 退档 --> <!-- 归档 / 退档 -->
<!-- <ul class="detail-type-info"> <!-- <ul class="detail-type-info">
<li><span>原始位置</span>整编库</li> <li><span>原始位置</span>整编库</li>
@ -59,7 +60,7 @@
<li :class="{'active-tab-nav': activeIndex == 2 }" @click="changeActiveTab(2)">流程图</li> <li :class="{'active-tab-nav': activeIndex == 2 }" @click="changeActiveTab(2)">流程图</li>
</ul> </ul>
<div v-if="activeIndex == 0" class="double-click-btn"><i class="iconfont icon-zhuyi-lan" /><span>双击列表数据查看详情</span></div> <div v-if="activeIndex == 0" class="double-click-btn"><i class="iconfont icon-zhuyi-lan" /><span>双击列表数据查看详情</span></div>
<component :is="comName" class="component-cont" :table-data="tableData" :src-img="srcImg" :task-table-list="taskTableList" :is-utilize="isUtilize" />
<component :is="comName" class="component-cont" :table-data="tableData" :src-img="srcImg" :task-table-list="taskTableList" :is-utilize="isUtilize" :set-page="setPage" @page-change="pageChangeHandler" @size-change="sizeChangeHandler" />
</div> </div>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="primary" @click="detailVisible=false">确定</el-button> <el-button type="primary" @click="detailVisible=false">确定</el-button>
@ -102,7 +103,12 @@ export default {
srcImg: '', srcImg: '',
taskTableList: [], taskTableList: [],
tableData: [], tableData: [],
isUtilize: false
isUtilize: false,
setPage: {
total: 0,
size: 10,
page: 0
}
} }
}, },
computed: { computed: {
@ -124,6 +130,7 @@ export default {
changeActiveTab(data) { changeActiveTab(data) {
this.activeIndex = data this.activeIndex = data
if (this.activeIndex === 0) { if (this.activeIndex === 0) {
this.setPage.page = 0
this.getBusinessFlowDetails() this.getBusinessFlowDetails()
} else if (this.activeIndex === 1) { } else if (this.activeIndex === 1) {
this.getTaskByProcinstId() this.getTaskByProcinstId()
@ -133,7 +140,9 @@ export default {
}, },
getBusinessFlowDetails() { getBusinessFlowDetails() {
const params = { const params = {
'businessId': (this.selectRow && this.selectRow.businessId) ? this.selectRow.businessId : this.selectRow.id
'businessId': (this.selectRow && this.selectRow.businessId) ? this.selectRow.businessId : this.selectRow.id,
'page': this.setPage.page,
'size': this.setPage.size
} }
FetchBusinessFlowDetails(params).then((res) => { FetchBusinessFlowDetails(params).then((res) => {
if (res.code !== 500) { if (res.code !== 500) {
@ -141,16 +150,17 @@ export default {
this.baseInfo = res.businessFlow this.baseInfo = res.businessFlow
if (res.businessFlow.businessType === 5) { if (res.businessFlow.businessType === 5) {
this.isUtilize = true this.isUtilize = true
res.details.forEach(item => {
res.details.content.forEach(item => {
item.utilizeType = item.utilizeType.split(',').map(Number) item.utilizeType = item.utilizeType.split(',').map(Number)
}) })
} else { } else {
this.isUtilize = false this.isUtilize = false
res.details.forEach(item => {
res.details.content.forEach(item => {
item.utilizeType = [] item.utilizeType = []
}) })
} }
this.tableData = res.details
this.tableData = res.details.content
this.setPage.total = res.details.totalElements
} else { } else {
this.$message({ message: '获取数据失败', type: 'error', offset: 8 }) this.$message({ message: '获取数据失败', type: 'error', offset: 8 })
} }
@ -173,6 +183,17 @@ export default {
}).catch(err => { }).catch(err => {
console.log(err) console.log(err)
}) })
},
//
pageChangeHandler(e) {
this.setPage.page = e
this.getBusinessFlowDetails()
},
//
sizeChangeHandler(e) {
this.setPage.size = e
this.setPage.page = 0
this.getBusinessFlowDetails()
} }
} }
} }

2
src/views/system/user/processCenter/index.vue

@ -189,6 +189,7 @@ export default {
this.$refs.eForm.formVisible = true this.$refs.eForm.formVisible = true
this.$refs.eForm.selectRow = row this.$refs.eForm.selectRow = row
this.$refs.eForm.activeIndex = 0 this.$refs.eForm.activeIndex = 0
this.$refs.eForm.setPage.page = 0
this.$refs.eForm.getBusinessFlowDetails() this.$refs.eForm.getBusinessFlowDetails()
}, },
// table - // table -
@ -196,6 +197,7 @@ export default {
this.$refs.processDetail.detailVisible = true this.$refs.processDetail.detailVisible = true
this.$refs.processDetail.selectRow = row this.$refs.processDetail.selectRow = row
this.$refs.processDetail.activeIndex = 0 this.$refs.processDetail.activeIndex = 0
this.$refs.processDetail.setPage.page = 0
this.$refs.processDetail.getBusinessFlowDetails() this.$refs.processDetail.getBusinessFlowDetails()
}, },
clickRowHandler(row) { clickRowHandler(row) {

123
src/views/system/user/processCenter/module/form.vue

@ -15,14 +15,18 @@
<p style="width: 60%;"><span>实例ID</span>{{ selectRow && selectRow.procInstId }}</p> <p style="width: 60%;"><span>实例ID</span>{{ selectRow && selectRow.procInstId }}</p>
<p><span>发起人</span>{{ selectRow && selectRow.createBy }}</p> <p><span>发起人</span>{{ selectRow && selectRow.createBy }}</p>
</div> </div>
<!-- 1.归档 index=1 2.退回 index=2 3.开放 index=6 4.销毁index=7 5.利用index=3 6.内部移交index=4 7.外部移交index=5 -->
<div class="detail-list"> <div class="detail-list">
<p><span>业务类型</span>归档审批</p>
<p><span>原始位置</span>-</p>
<p><span>目标位置</span>-</p>
<p><span>赋权类型</span>-</p>
<p><span>起始时间</span>-</p>
<p><span>终止时间</span>-</p>
<p><span>利用目的</span>{{ baseInfo && baseInfo.borrowReason }}</p>
<p><span>业务类型</span>{{ businessTypeText }}</p>
<p><span>原始位置</span>{{ baseInfo && baseInfo.businessType === 1 ? '收集库' : baseInfo && baseInfo.businessType === 2 ? '管理库' : '-' }}</p>
<p><span>目标位置</span>{{ baseInfo && baseInfo.businessType === 1 ? '管理库' : baseInfo && baseInfo.businessType === 2 ? '收集库' : '-' }}</p>
<!-- <p><span>赋权类型</span>-</p> -->
<p v-if="baseInfo && baseInfo.giveStartTime"><span>起始时间</span>{{ baseInfo && baseInfo.giveStartTime | parseTime }}</p>
<p v-else><span>起始时间</span>-</p>
<p v-if="baseInfo && baseInfo.giveEndTime"><span>终止时间</span>{{ baseInfo && baseInfo.giveEndTime | parseTime }}</p>
<p v-else><span>终止时间</span>-</p>
<p v-if="baseInfo && baseInfo.businessType !== 5"><span>申请缘由</span>{{ baseInfo && baseInfo.remarks }}</p>
<p v-else><span>利用目的</span>{{ baseInfo && baseInfo.borrowReason }}</p>
<!-- <p><span>利用次数</span>-</p> --> <!-- <p><span>利用次数</span>-</p> -->
</div> </div>
<div class="opinion"> <div class="opinion">
@ -37,24 +41,11 @@
</el-form> </el-form>
</div> </div>
</div> </div>
<businessDetails :table-data="tableData" :is-utilize="isUtilize" :is-flowable-form="true" @select-change="handleSelectChange" />
<businessDetails :table-data="tableData" :is-utilize="isUtilize" :is-flowable-form="true" :set-page="setPage" @select-change="handleSelectChange" @page-change="pageChangeHandler" @size-change="sizeChangeHandler" />
</div> </div>
<div v-if="activeIndex == 1" class="detail-img"> <div v-if="activeIndex == 1" class="detail-img">
<img :src="'data:image/jpeg;base64,'+ srcImg" alt="" :onerror="defaultImg"> <img :src="'data:image/jpeg;base64,'+ srcImg" alt="" :onerror="defaultImg">
</div> </div>
<!-- <div v-if="activeIndex == 2">
<div class="detail-list">
<p><span>业务类型</span>归档审批</p>
<p><span>原始位置</span>全宗A-整理库-门类A</p>
<p><span>目标位置</span>全宗A-整理库-门类A</p>
<p><span>赋权类型</span>-</p>
<p><span>起始时间</span>-</p>
<p><span>终止时间</span>-</p>
<p><span>利用目的</span>-</p>
<p><span>利用次数</span>-</p>
</div>
<businessDetails />
</div> -->
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button @click="submitOpinion(false)">驳回</el-button> <el-button @click="submitOpinion(false)">驳回</el-button>
<el-button type="primary" @click="submitOpinion(true)">审批</el-button> <el-button type="primary" @click="submitOpinion(true)">审批</el-button>
@ -65,9 +56,13 @@
<script> <script>
import { FetchBecomeDocumentConfirm } from '@/api/collect/collect' import { FetchBecomeDocumentConfirm } from '@/api/collect/collect'
// import { FetchUtilizeConfirm } from '@/api/archivesManage/library'
import { FetchGenProcessDiagram } from '@/api/system/flowable' import { FetchGenProcessDiagram } from '@/api/system/flowable'
import { FetchBusinessFlowDetails, FetchUtilizeConfirm } from '@/api/archivesManage/library'
import { FetchBusinessFlowDetails, FetchUtilizeConfirm, FetchArchivesReturnConfirm, FetchArchivesOpenConfirm } from '@/api/archivesManage/library'
// FetchArchivesDestructionConfirm,
// FetchArchivesOpenConfirm,
// FetchArchivesReturnConfirm,
// FetchTransferConfirm,
// FetchOfflineTransferConfirm
import businessDetails from '@/views/system/processManage/runningProcess/module/businessDetails/index.vue' import businessDetails from '@/views/system/processManage/runningProcess/module/businessDetails/index.vue'
export default { export default {
name: 'Form', name: 'Form',
@ -87,10 +82,37 @@ export default {
tableData: [], tableData: [],
baseInfo: null, baseInfo: null,
isUtilize: false, isUtilize: false,
selectedValues: {}
selectedValues: {},
setPage: {
total: 0,
size: 10,
page: 0
}
} }
}, },
computed: { computed: {
businessTypeText() {
const businessType = this.baseInfo && this.baseInfo.businessType
// 1. index=1 2.退 index=2 3. index=6 4.index=7 5.index=3 6.index=4 7.index=5
switch (businessType) {
case 1 :
return '归档审批'
case 2 :
return '退回审批'
case 3:
return '开放鉴定'
case 4:
return '销毁鉴定'
case 5:
return '赋权审批'
case 6:
return '内部移交'
case 7:
return '外部移交'
default:
return '-'
}
}
}, },
methods: { methods: {
changeActiveTab(data) { changeActiveTab(data) {
@ -98,6 +120,7 @@ export default {
if (data === 1) { if (data === 1) {
this.getProcessImg() this.getProcessImg()
} else { } else {
this.setPage.page = 0
this.getBusinessFlowDetails() this.getBusinessFlowDetails()
} }
}, },
@ -117,27 +140,29 @@ export default {
}, },
getBusinessFlowDetails() { getBusinessFlowDetails() {
const params = { const params = {
'businessId': this.selectRow.id
'businessId': this.selectRow.id,
'page': this.setPage.page,
'size': this.setPage.size
} }
FetchBusinessFlowDetails(params).then((res) => { FetchBusinessFlowDetails(params).then((res) => {
if (res.code !== 500) { if (res.code !== 500) {
console.log(res)
this.baseInfo = res.businessFlow this.baseInfo = res.businessFlow
if (this.selectRow.businessType === 5) { if (this.selectRow.businessType === 5) {
this.isUtilize = true this.isUtilize = true
res.details.forEach(item => {
res.details.content.forEach(item => {
item.utilizeType = item.utilizeType.split(',').map(Number) item.utilizeType = item.utilizeType.split(',').map(Number)
}) })
} else { } else {
this.isUtilize = false this.isUtilize = false
res.details.forEach(item => {
res.details.content.forEach(item => {
item.utilizeType = [] item.utilizeType = []
}) })
} }
this.tableData = res.details
this.tableData = res.details.content
this.tableData.forEach(item => { this.tableData.forEach(item => {
this.$set(this.selectedValues, item.archivesId, item.utilizeState) this.$set(this.selectedValues, item.archivesId, item.utilizeState)
}) })
this.setPage.total = res.details.totalElements
} else { } else {
this.$message({ message: '获取数据失败', type: 'error', offset: 8 }) this.$message({ message: '获取数据失败', type: 'error', offset: 8 })
} }
@ -145,6 +170,17 @@ export default {
console.log(err) console.log(err)
}) })
}, },
//
pageChangeHandler(e) {
this.setPage.page = e
this.getBusinessFlowDetails()
},
//
sizeChangeHandler(e) {
this.setPage.size = e
this.setPage.page = 0
this.getBusinessFlowDetails()
},
submitOpinion(type) { submitOpinion(type) {
this.$refs['form'].validate((valid) => { this.$refs['form'].validate((valid) => {
if (valid) { if (valid) {
@ -170,7 +206,7 @@ export default {
if (this.selectRow.businessType === 1) { if (this.selectRow.businessType === 1) {
FetchBecomeDocumentConfirm(params).then((res) => { FetchBecomeDocumentConfirm(params).then((res) => {
if (res.code !== 500) { if (res.code !== 500) {
this.$message({ message: '操作提交成功', type: 'success', offset: 8 })
this.$message({ message: res, type: 'success', offset: 8 })
} else { } else {
this.$message({ message: '操作提交失败', type: 'error', offset: 8 }) this.$message({ message: '操作提交失败', type: 'error', offset: 8 })
} }
@ -180,8 +216,33 @@ export default {
}) })
} else if (this.selectRow.businessType === 5) { } else if (this.selectRow.businessType === 5) {
FetchUtilizeConfirm(params).then((res) => { FetchUtilizeConfirm(params).then((res) => {
console.log(res)
if (res.code !== 500) {
this.$message({ message: res, type: 'success', offset: 8 })
} else {
this.$message({ message: '操作提交失败', type: 'error', offset: 8 })
}
this.closedDialog()
}).catch(err => {
console.log(err)
})
} else if (this.selectRow.businessType === 2) {
FetchArchivesReturnConfirm(params).then((res) => {
console.log(res)
if (res.code !== 500) {
this.$message({ message: res, type: 'success', offset: 8 })
} else {
this.$message({ message: '操作提交失败', type: 'error', offset: 8 })
}
this.closedDialog()
}).catch(err => {
console.log(err)
})
} else if (this.selectRow.businessType === 3) {
FetchArchivesOpenConfirm(params).then((res) => {
console.log(res)
if (res.code !== 500) { if (res.code !== 500) {
this.$message({ message: '操作提交成功', type: 'success', offset: 8 })
this.$message({ message: res, type: 'success', offset: 8 })
} else { } else {
this.$message({ message: '操作提交失败', type: 'error', offset: 8 }) this.$message({ message: '操作提交失败', type: 'error', offset: 8 })
} }

Loading…
Cancel
Save