DZ/faw-report-library-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

流程中心接口对接 修改日期格式化

Browse Source
This commit is contained in:
zhoulingpo
2023-04-20 17:49:10 +08:00
parent b3611568b0
commit 762be6b161
9 changed files with 112 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/api/modules/process.js
+12 -4
View File
@@ -20,7 +20,7 @@ export default {
//部署接口 //部署接口
deploy (data) { deploy (data) {
return request({ return request({
url: '/api/lawss/activiti/get_list_by_instance', url: '/api/deploy',
method: 'get', method: 'get',
params: data params: data
}) })
@@ -28,9 +28,9 @@ export default {
//获取流程配置列表 //获取流程配置列表
getModelListPage (data){ getModelListPage (data){
return request({ return request({
url: '/api/modelList', url: '/api/modelListPage',
method: 'get', method: 'get',
data: data params: data
}) })
}, },
//新增模板 //新增模板
@@ -40,6 +40,14 @@ export default {
method: 'get', method: 'get',
data: data data: data
}) })
} },
//删除模板
deleteModel (data){
return request({
url: '/api/deleteModel',
method: 'get',
params: data
})
},
} }
src/store/index.js
+2 -1
View File
@@ -15,7 +15,8 @@ export default new Vuex.Store({
}, },
getters: { getters: {
menuData: (state) => state.menuData, menuData: (state) => state.menuData,
menuName: (state) => state.menuName menuName: (state) => state.menuName,
userInfo: (state) => state.userInfo,
}, },
mutations: { mutations: {
saveUserInfo (state, data) { saveUserInfo (state, data) {
src/utils/date.js
+2
View File
@@ -28,7 +28,9 @@ export function formatDate (value, fmt) {
} }
return fmt return fmt
} else { } else {
console.log(typeof value)
value = value.trim() value = value.trim()
value = value.replace('T', ' ')
return value.substr(0, fmt.length) return value.substr(0, fmt.length)
} }
} }
src/views/userCenter/processCenter/finishProcess.vue
+19 -18
View File
@@ -4,21 +4,21 @@
<vxe-table ref="xTable" :data="tableData" :empty-render="{name: 'NotData'}" align="center" border stripe v-table-min-height="'calc(100vh - 380px)'"> <vxe-table ref="xTable" :data="tableData" :empty-render="{name: 'NotData'}" align="center" border stripe v-table-min-height="'calc(100vh - 380px)'">
<vxe-column show-overflow show-header-overflow type="seq" title="序号" width="77"> <vxe-column show-overflow show-header-overflow type="seq" title="序号" width="77">
<template #default="{ row, rowIndex }"> <template #default="{ row, rowIndex }">
{{ rowIndex + (q.pageNo - 1) * q.pageSize + 1 }} {{ rowIndex + (q.current - 1) * q.size + 1 }}
</template> </template>
</vxe-column> </vxe-column>
<vxe-column show-overflow show-header-overflow field="prcNum" <vxe-column show-overflow show-header-overflow field="prcNum"
title="流程编号"></vxe-column> title="流程编号"></vxe-column>
<vxe-column show-overflow show-header-overflow field="prcName" title="流程名称"></vxe-column> <vxe-column show-overflow show-header-overflow field="prcName" title="流程名称"></vxe-column>
<vxe-column show-overflow show-header-overflow field="labelOneName" <vxe-column show-overflow show-header-overflow field="creatUser"
title="发起人"></vxe-column> title="发起人"></vxe-column>
<vxe-column show-overflow show-header-overflow field="name" title="当前处理人"></vxe-column> <vxe-column show-overflow show-header-overflow field="taskAssignee" title="当前处理人"></vxe-column>
<vxe-column show-overflow show-header-overflow field="labelOneName" <vxe-column show-overflow show-header-overflow field="taskBackAssignee"
title="上一处理人"></vxe-column> title="上一处理人"></vxe-column>
<vxe-column show-overflow show-header-overflow field="name" title="创建时间"></vxe-column> <vxe-column show-overflow show-header-overflow field="creatTime" title="创建时间"></vxe-column>
<vxe-column show-overflow show-header-overflow field="labelOneName" <vxe-column show-overflow show-header-overflow field="overTime"
title="完成时间"></vxe-column> title="完成时间"></vxe-column>
<vxe-column show-overflow show-header-overflow field="name" title="状态"></vxe-column> <vxe-column show-overflow show-header-overflow field="status" title="状态"></vxe-column>
<vxe-column show-overflow show-header-overflow title="操作" width="200" fixed="right"> <vxe-column show-overflow show-header-overflow title="操作" width="200" fixed="right">
<template #default="{ row }"> <template #default="{ row }">
<el-button @click.native.prevent="view(scope.$index, tableData)" type="text" size="small"> <el-button @click.native.prevent="view(scope.$index, tableData)" type="text" size="small">
@@ -27,8 +27,8 @@
</template> </template>
</vxe-column> </vxe-column>
</vxe-table> </vxe-table>
<el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="q.pageNo" <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="q.current"
:page-sizes="[5, 10, 20]" :page-size="q.pageSize" layout="total, sizes, prev, pager, next, jumper" :page-sizes="[5, 10, 20]" :page-size="q.size" layout="total, sizes, prev, pager, next, jumper"
:total="total" /> :total="total" />
</div> </div>
</div> </div>
@@ -42,8 +42,8 @@ export default {
data() { data() {
return { return {
q:{ q:{
pageNo:1, current:1,
pageSize:10 size:10
}, },
total: 0, total: 0,
tableData: [] tableData: []
@@ -61,20 +61,21 @@ export default {
}, },
methods: { methods: {
loadData() { loadData() {
this.$api.processCenter.finishProcessPage({...this.q,...this.searchForm}).then(res=>{ let userId=this.$store.getters.userInfo.usid
this.tableData = res.data.list this.$api.processCenter.finishProcessPage({...this.q,...this.searchForm,userId:userId}).then(res=>{
this.total = res.count this.tableData = res.data.list
}) this.total = res.data.count
})
}, },
// 单页数据量 // 单页数据量
handleSizeChange(val) { handleSizeChange(val) {
this.q.pageSize = val; this.q.size = val;
this.q.pageNo = 1; this.q.current = 1;
this.loadData(); this.loadData();
}, },
// 第几页 // 第几页
handleCurrentChange(val) { handleCurrentChange(val) {
this.q.pageNo = val; this.q.current = val;
this.loadData(); this.loadData();
}, },
view() { view() {
src/views/userCenter/processCenter/gencyProcess.vue
+13 -12
View File
@@ -4,15 +4,15 @@
<vxe-table ref="xTable" :data="tableData" :empty-render="{name: 'NotData'}" align="center" border stripe v-table-min-height="'calc(100vh - 380px)'"> <vxe-table ref="xTable" :data="tableData" :empty-render="{name: 'NotData'}" align="center" border stripe v-table-min-height="'calc(100vh - 380px)'">
<vxe-column show-overflow show-header-overflow type="seq" title="序号" width="77"> <vxe-column show-overflow show-header-overflow type="seq" title="序号" width="77">
<template #default="{ row, rowIndex }"> <template #default="{ row, rowIndex }">
{{ rowIndex + (q.pageNo - 1) * q.pageSize + 1 }} {{ rowIndex + (q.current - 1) * q.size + 1 }}
</template> </template>
</vxe-column> </vxe-column>
<vxe-column show-overflow show-header-overflow field="prcNum" <vxe-column show-overflow show-header-overflow field="prcNum"
title="流程编号"></vxe-column> title="流程编号"></vxe-column>
<vxe-column show-overflow show-header-overflow field="prcName" title="流程名称"></vxe-column> <vxe-column show-overflow show-header-overflow field="prcName" title="流程名称"></vxe-column>
<vxe-column show-overflow show-header-overflow field="labelOneName" <vxe-column show-overflow show-header-overflow field="creatUserName"
title="发起人"></vxe-column> title="发起人"></vxe-column>
<vxe-column show-overflow show-header-overflow field="name" title="创建时间"></vxe-column> <vxe-column show-overflow show-header-overflow field="creatTime" title="创建时间"></vxe-column>
<vxe-column show-overflow show-header-overflow title="操作" width="200" fixed="right"> <vxe-column show-overflow show-header-overflow title="操作" width="200" fixed="right">
<template #default="{ row }"> <template #default="{ row }">
<el-button @click.native.prevent="handle(scope.$index, tableData)" type="text" size="small"> <el-button @click.native.prevent="handle(scope.$index, tableData)" type="text" size="small">
@@ -21,8 +21,8 @@
</template> </template>
</vxe-column> </vxe-column>
</vxe-table> </vxe-table>
<el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="q.pageNo" <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="q.current"
:page-sizes="[5, 10, 20]" :page-size="q.pageSize" layout="total, sizes, prev, pager, next, jumper" :page-sizes="[5, 10, 20]" :page-size="q.size" layout="total, sizes, prev, pager, next, jumper"
:total="total" /> :total="total" />
</div> </div>
</div> </div>
@@ -36,8 +36,8 @@ export default {
data() { data() {
return { return {
q:{ q:{
pageNo:1, current:1,
pageSize:10 size:10
}, },
total: 0, total: 0,
tableData: [] tableData: []
@@ -58,20 +58,21 @@ export default {
}, },
methods: { methods: {
loadData() { loadData() {
this.$api.processCenter.gencyProcessPage({...this.q,...this.searchForm}).then(res=>{ let userId=this.$store.getters.userInfo.usid
this.$api.processCenter.gencyProcessPage({...this.q,...this.searchForm,userId:userId}).then(res=>{
this.tableData = res.data.list this.tableData = res.data.list
this.total = res.count this.total = res.data.count
}) })
}, },
// 单页数据量 // 单页数据量
handleSizeChange(val) { handleSizeChange(val) {
this.q.pageSize = val; this.q.size = val;
this.q.pageNo = 1; this.q.current = 1;
this.loadData(); this.loadData();
}, },
// 第几页 // 第几页
handleCurrentChange(val) { handleCurrentChange(val) {
this.q.pageNo = val; this.q.current = val;
this.loadData(); this.loadData();
}, },
handle() { handle() {
src/views/userCenter/processCenter/monitorProcesses.vue
+16 -15
View File
@@ -4,7 +4,7 @@
<vxe-table ref="xTable" :data="tableData" :empty-render="{name: 'NotData'}" align="center" border stripe v-table-min-height="'calc(100vh - 380px)'"> <vxe-table ref="xTable" :data="tableData" :empty-render="{name: 'NotData'}" align="center" border stripe v-table-min-height="'calc(100vh - 380px)'">
<vxe-column show-overflow show-header-overflow type="seq" title="序号" width="77"> <vxe-column show-overflow show-header-overflow type="seq" title="序号" width="77">
<template #default="{ row, rowIndex }"> <template #default="{ row, rowIndex }">
{{ rowIndex + (q.pageNo - 1) * q.pageSize + 1 }} {{ rowIndex + (q.current - 1) * q.size + 1 }}
</template> </template>
</vxe-column> </vxe-column>
<vxe-column show-overflow show-header-overflow field="prcNum" <vxe-column show-overflow show-header-overflow field="prcNum"
@@ -12,13 +12,13 @@
<vxe-column show-overflow show-header-overflow field="prcName" title="流程名称"></vxe-column> <vxe-column show-overflow show-header-overflow field="prcName" title="流程名称"></vxe-column>
<vxe-column show-overflow show-header-overflow field="labelOneName" <vxe-column show-overflow show-header-overflow field="labelOneName"
title="发起人"></vxe-column> title="发起人"></vxe-column>
<vxe-column show-overflow show-header-overflow field="name" title="当前处理人"></vxe-column> <vxe-column show-overflow show-header-overflow field="taskAssignee" title="当前处理人"></vxe-column>
<vxe-column show-overflow show-header-overflow field="labelOneName" <vxe-column show-overflow show-header-overflow field="taskBackAssignee"
title="上一处理人"></vxe-column> title="上一处理人"></vxe-column>
<vxe-column show-overflow show-header-overflow field="name" title="创建时间"></vxe-column> <vxe-column show-overflow show-header-overflow field="creatTime" title="创建时间"></vxe-column>
<vxe-column show-overflow show-header-overflow field="labelOneName" <vxe-column show-overflow show-header-overflow field="overTime"
title="完成时间"></vxe-column> title="完成时间"></vxe-column>
<vxe-column show-overflow show-header-overflow field="name" title="状态"></vxe-column> <vxe-column show-overflow show-header-overflow field="status" title="状态"></vxe-column>
<vxe-column show-overflow show-header-overflow title="操作" width="200" fixed="right"> <vxe-column show-overflow show-header-overflow title="操作" width="200" fixed="right">
<template #default="{ row }"> <template #default="{ row }">
<el-button @click.native.prevent="view(row, tableData)" type="text" size="small"> <el-button @click.native.prevent="view(row, tableData)" type="text" size="small">
@@ -27,8 +27,8 @@
</template> </template>
</vxe-column> </vxe-column>
</vxe-table> </vxe-table>
<el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="q.pageNo" <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="q.current"
:page-sizes="[5, 10, 20]" :page-size="q.pageSize" layout="total, sizes, prev, pager, next, jumper" :page-sizes="[5, 10, 20]" :page-size="q.size" layout="total, sizes, prev, pager, next, jumper"
:total="total" /> :total="total" />
</div> </div>
@@ -42,8 +42,8 @@ export default {
data() { data() {
return { return {
q:{ q:{
pageNo:1, current:1,
pageSize:10 size:10
}, },
total: 0, total: 0,
tableData: [] tableData: []
@@ -61,20 +61,21 @@ export default {
}, },
methods: { methods: {
loadData() { loadData() {
this.$api.processCenter.monitorProcessesPage({...this.q,...this.searchForm}).then(res=>{ let userId=this.$store.getters.userInfo.usid
this.$api.processCenter.monitorProcessesPage({...this.q,...this.searchForm,userId:userId}).then(res=>{
this.tableData = res.data.list this.tableData = res.data.list
this.total = res.count this.total = res.data.count
}) })
}, },
// 单页数据量 // 单页数据量
handleSizeChange(val) { handleSizeChange(val) {
this.q.pageSize = val; this.q.size = val;
this.q.pageNo = 1; this.q.current = 1;
this.loadData(); this.loadData();
}, },
// 第几页 // 第几页
handleCurrentChange(val) { handleCurrentChange(val) {
this.q.pageNo = val; this.q.current = val;
this.loadData(); this.loadData();
}, },
view() { view() {
src/views/userCenter/processCenter/sentProcess.vue
+13 -12
View File
@@ -5,7 +5,7 @@
v-table-min-height="'calc(100vh - 380px)'"> v-table-min-height="'calc(100vh - 380px)'">
<vxe-column show-overflow show-header-overflow type="seq" title="序号" width="77"> <vxe-column show-overflow show-header-overflow type="seq" title="序号" width="77">
<template #default="{ row, rowIndex }"> <template #default="{ row, rowIndex }">
{{ rowIndex + (q.pageNo - 1) * q.pageSize + 1 }} {{ rowIndex + (q.current - 1) * q.size + 1 }}
</template> </template>
</vxe-column> </vxe-column>
<vxe-column show-overflow show-header-overflow field="prcNum" <vxe-column show-overflow show-header-overflow field="prcNum"
@@ -17,9 +17,9 @@
<vxe-column show-overflow show-header-overflow field="taskBackAssignee" <vxe-column show-overflow show-header-overflow field="taskBackAssignee"
title="上一处理人"></vxe-column> title="上一处理人"></vxe-column>
<vxe-column show-overflow show-header-overflow field="creatTime" title="创建时间"></vxe-column> <vxe-column show-overflow show-header-overflow field="creatTime" title="创建时间"></vxe-column>
<vxe-column show-overflow show-header-overflow field="endTime" <vxe-column show-overflow show-header-overflow field="overTime"
title="完成时间"></vxe-column> title="完成时间"></vxe-column>
<vxe-column show-overflow show-header-overflow field="isEnd" title="状态"></vxe-column> <vxe-column show-overflow show-header-overflow field="status" title="状态"></vxe-column>
<vxe-column show-overflow show-header-overflow title="操作" width="200" fixed="right"> <vxe-column show-overflow show-header-overflow title="操作" width="200" fixed="right">
<template #default="{ row,index }"> <template #default="{ row,index }">
<el-button type="text" size="small"> <el-button type="text" size="small">
@@ -31,8 +31,8 @@
</template> </template>
</vxe-column> </vxe-column>
</vxe-table> </vxe-table>
<el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="q.pageNo" <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="q.current"
:page-sizes="[5, 10, 20]" :page-size="q.pageSize" layout="total, sizes, prev, pager, next, jumper" :page-sizes="[5, 10, 20]" :page-size="q.size" layout="total, sizes, prev, pager, next, jumper"
:total="total"/> :total="total"/>
</div> </div>
@@ -49,8 +49,8 @@ export default {
color: 'rgb(236, 128, 141)', color: 'rgb(236, 128, 141)',
icolor: 'rgb(119,136,153)', icolor: 'rgb(119,136,153)',
q: { q: {
pageNo: 1, current: 1,
pageSize: 10 size: 10
}, },
total: 0, total: 0,
tableData: [] tableData: []
@@ -68,20 +68,21 @@ export default {
}, },
methods: { methods: {
loadData() { loadData() {
this.$api.processCenter.sentProcessPage({...this.q,...this.searchForm}).then(res=>{ let userId=this.$store.getters.userInfo.usid
this.$api.processCenter.sentProcessPage({...this.q,...this.searchForm,userId:userId}).then(res=>{
this.tableData = res.data.list this.tableData = res.data.list
this.total = res.count this.total = res.data.count
}) })
}, },
// 单页数据量 // 单页数据量
handleSizeChange(val) { handleSizeChange(val) {
this.q.pageSize = val; this.q.size = val;
this.q.pageNo = 1; this.q.current = 1;
this.loadData(); this.loadData();
}, },
// 第几页 // 第几页
handleCurrentChange(val) { handleCurrentChange(val) {
this.q.pageNo = val; this.q.current = val;
this.loadData(); this.loadData();
}, },
view() { view() {
src/views/userCenter/processConfig/ProcessMapping.vue
+1 -1
View File
@@ -17,7 +17,7 @@
return { return {
modelId : '', modelId : '',
name: '', name: '',
actUrl: 'http://localhost:17210/bat-wkflow/modeler.html?modelId=' actUrl: 'http://10.0.10.87:7060/bat-wkflow/modeler.html?modelId='
} }
}, },
created() { created() {
src/views/userCenter/processConfig/index.vue
+34 -11
View File
@@ -1,7 +1,7 @@
<template> <template>
<div class="content-height configBox"> <div class="content-height configBox">
<div class="title"> <div class="title">
<span>报告管理</span> <span>流程配置</span>
</div> </div>
<div class="search"> <div class="search">
<el-row> <el-row>
@@ -29,12 +29,17 @@
<div class="table"> <div class="table">
<vxe-table ref="xTable" :data="tableList" :empty-render="{name: 'NotData'}" align="center" border stripe v-table-min-height="'calc(100vh - 320px)'"> <vxe-table ref="xTable" :data="tableList" :empty-render="{name: 'NotData'}" align="center" border stripe v-table-min-height="'calc(100vh - 320px)'">
<vxe-column show-overflow show-header-overflow field="name" title="流程名称"></vxe-column> <vxe-column show-overflow show-header-overflow field="name" title="流程名称"></vxe-column>
<vxe-column show-overflow show-header-overflow field="categoryName" title="流程类型"></vxe-column> <!-- <vxe-column show-overflow show-header-overflow field="categoryName" title="流程类型"></vxe-column>-->
<vxe-column show-overflow show-header-overflow field="createTime" title="创建时间"></vxe-column> <vxe-column show-overflow show-header-overflow field="createTime" title="创建时间">
<vxe-column show-overflow show-header-overflow title="操作" width="200" fixed="right"> <template #default="{ row }">
{{row.createTime?formatDate(row.createTime,"yyyy-mm-dd HH:mm:ss"):''}}
</template>
</vxe-column>
<vxe-column show-overflow show-header-overflow title="操作" width="250" fixed="right">
<template #default="{ row }"> <template #default="{ row }">
<el-button type="text" @click="editRow(row)">编辑</el-button> <el-button type="text" @click="editRow(row)">编辑</el-button>
<el-button type="text" @click="deploy(row)">部署</el-button> <el-button type="text" @click="deploy(row)">部署</el-button>
<el-button type="text" @click="deleteRow(row)">删除</el-button>
</template> </template>
</vxe-column> </vxe-column>
</vxe-table> </vxe-table>
@@ -89,12 +94,13 @@
<script> <script>
import EditProcess from './components/EditProcess' import EditProcess from './components/EditProcess'
import { formatDate } from '@/utils/date'
export default { export default {
name: 'ProcessClassification', name: 'ProcessClassification',
components: { EditProcess }, components: { EditProcess },
data () { data () {
return { return {
formatDate,
formData: { formData: {
name: '', name: '',
desc: '' desc: ''
@@ -112,7 +118,24 @@ export default {
title: '添加流程' title: '添加流程'
} }
}, },
created() {
this.queryTablePage()
},
methods: { methods: {
deleteRow(row) {
this.$confirm('确认删除该条数据？', '删除', {
confirmButtonText: '确定',
cancelButtonText: '取消',
confirmButtonClass: 'common-button-primary',
type: 'warning'
}).then(() => {
this.$api.process.deleteModel({modelId: row.id}).then(res => {
this.$message.success(res.data.message)
this.queryTablePage()
})
})
},
handleCurrentChange(page) { handleCurrentChange(page) {
this.q.current = page this.q.current = page
this.queryTablePage() this.queryTablePage()
@@ -148,11 +171,11 @@ export default {
}, },
queryTablePage() { queryTablePage() {
this.$api.process.getModelListPage({...this.q,...this.searchForm}).then(res=>{ this.$api.process.getModelListPage({...this.q,...this.searchForm}).then(res=>{
this.tableList = res.result.records this.tableList = res.data.result.records
this.total = res.result.total this.total = res.data.result.total
}).catch(err=>{ }).catch(err=>{
console.log("dddddddddddddddd")
this.tableList =[ {name:1}]
}) })
}, },
@@ -165,7 +188,7 @@ export default {
}, },
confirmDialog() { confirmDialog() {
this.$api.process.addModel(this.formData).then(res=> { this.$api.process.addModel(this.formData).then(res=> {
this.$message.success(res.message) this.$message.success("新增成功")
this.visible = false this.visible = false
this.queryTablePage() this.queryTablePage()
}) })