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 14:07:09 +08:00
parent 56714eaa95
commit 812e7bc8fb
12 changed files with 210 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/api/modules/processCenter.js
+23 -10
View File
@@ -1,19 +1,32 @@
import { instance as request } from '@/utils/request'
export default {
// 查询
search (data) {
finishProcessPage (data) {
return request({
url: '',
method: 'POST',
data
url: '/api/doneProcess',
method: 'post',
data: data
})
},
// 重置
reset (data) {
gencyProcessPage(data) {
return request({
url: '',
method: 'POST',
data
url: '/api/todoTaskList',
method: 'post',
data: data
})
},
monitorProcessesPage(data) {
return request({
url: '/api/allProcess',
method: 'post',
data: data
})
},
sentProcessPage(data) {
return request({
url: '/api/issuedProcess',
method: 'post',
data: data
})
}
}
src/components/ProcessMixin.vue
+9
View File
@@ -23,9 +23,18 @@
},
nowOrder: '',
nowOrderBy: '',
searchForm: {}
}
},
methods: {
search(){
this.$bus.$on('getSearchItem',(data)=>{
console.log( "dd")
this.searchForm = data
this.loadData()
});
},
// 表格排序
sortChange(sortObj, tableName) {
// console.log(sortObj)
src/router/modules/userCenter.js → src/router/modules/processCenter.js
+5
View File
@@ -27,6 +27,11 @@ const routes = [
path:'monitorViews',
name:'monitorViews',
component: () => import('../../views/userCenter/processCenter/monitorProcesses/monitorDetail.vue')
},
{
path:'processMapping',
name:'processMapping',
component: () => import('../../views/userCenter/processConfig/ProcessMapping')
}
]
}
src/views/userCenter/processCenter.vue
+4 -5
View File
@@ -37,13 +37,12 @@ import tabs from '../userCenter/processCenter/tabs.vue'
}
},
created () {
;
},
mounted () {
this.$bus.$on('clearForm',()=>{
this.form={}
});
},
this.$bus.$on('clearForm',()=>{
this.form={}
});
},
methods: {
//查询
search() {
src/views/userCenter/processCenter/finishProcess.vue
+15 -33
View File
@@ -35,8 +35,10 @@
</template>
<script>
import ProcessMixin from "../../../components/ProcessMixin";
export default {
name: 'finishProcess',
mixins:[ProcessMixin],
data() {
return {
q:{
@@ -44,27 +46,7 @@ export default {
pageSize:10
},
total: 0,
tableData: [{
processId: '2016-05-1',
processName: '王小虎',
processPerson: '上海市普陀区金沙江路 1518 弄',
createTime: '2023-1-1'
}, {
processId: '2016-05-2',
processName: '王小虎',
processPerson: '上海市普陀区金沙江路 1518 弄',
createTime: '2023-1-2'
}, {
processId: '2016-05-3',
processName: '王小虎',
processPerson: '上海市普陀区金沙江路 1518 弄',
createTime: '2023-1-3'
}, {
processId: '2016-05-4',
processName: '王小虎',
processPerson: '上海市普陀区金沙江路 1518 弄',
createTime: '2023-1-4'
}]
tableData: []
}
},
props:{
@@ -74,16 +56,16 @@ export default {
}
},
mounted () {
this.$bus.$on('getSearchItem',(data)=>{
console.log('22',data)
});
},
watch: {
secondData(newValue, oldValue) {
this.tableData=newValue
}
},
this.search()
this.loadData()
},
methods: {
loadData() {
this.$api.processCenter.finishProcessPage({...this.q,...this.searchForm}).then(res=>{
this.tableData = res.data.list
this.total = res.count
})
},
// 单页数据量
handleSizeChange(val) {
this.q.pageSize = val;
@@ -95,9 +77,9 @@ export default {
this.q.pageNo = val;
this.loadData();
},
view() {
alert(111)
},
view() {
alert(111)
},
}
}
</script>
src/views/userCenter/processCenter/gencyProcess.vue
+12 -33
View File
@@ -29,8 +29,10 @@
</template>
<script>
import ProcessMixin from "../../../components/ProcessMixin";
export default {
name: "gencyProcess",
mixins:[ProcessMixin],
data() {
return {
q:{
@@ -38,32 +40,7 @@ export default {
pageSize:10
},
total: 0,
tableData: [
{
processId: "2016-05-1",
processName: "王小虎",
processPerson: "上海市普陀区金沙江路 1518 弄",
createTime: "2023-1-1",
},
{
processId: "2016-05-2",
processName: "王小虎",
processPerson: "上海市普陀区金沙江路 1518 弄",
createTime: "2023-1-2",
},
{
processId: "2016-05-3",
processName: "王小虎",
processPerson: "上海市普陀区金沙江路 1518 弄",
createTime: "2023-1-3",
},
{
processId: "2016-05-4",
processName: "王小虎",
processPerson: "上海市普陀区金沙江路 1518 弄",
createTime: "2023-1-4",
},
],
tableData: []
};
},
props:{
@@ -74,16 +51,18 @@ export default {
},
watch: {
firstData(newValue, oldValue) {
this.tableData=newValue
}
},
mounted () {
this.$bus.$on('getSearchItem',(data)=>{
console.log('11',data)
});
this.search()
this.loadData()
},
methods: {
methods: {
loadData() {
this.$api.processCenter.gencyProcessPage({...this.q,...this.searchForm}).then(res=>{
this.tableData = res.data.list
this.total = res.count
})
},
// 单页数据量
handleSizeChange(val) {
this.q.pageSize = val;
src/views/userCenter/processCenter/monitorProcesses.vue
+11 -29
View File
@@ -35,8 +35,10 @@
</div>
</template>
<script>
import ProcessMixin from "../../../components/ProcessMixin";
export default {
name: 'monitorProcess',
mixins:[ProcessMixin],
data() {
return {
q:{
@@ -44,27 +46,7 @@ export default {
pageSize:10
},
total: 0,
tableData: [{
processId: '2016-05-1',
processName: '王小虎',
processPerson: '上海市普陀区金沙江路 1518 弄',
createTime: '2023-1-1'
}, {
processId: '2016-05-2',
processName: '王小虎',
processPerson: '上海市普陀区金沙江路 1518 弄',
createTime: '2023-1-2'
}, {
processId: '2016-05-3',
processName: '王小虎',
processPerson: '上海市普陀区金沙江路 1518 弄',
createTime: '2023-1-3'
}, {
processId: '2016-05-4',
processName: '王小虎',
processPerson: '上海市普陀区金沙江路 1518 弄',
createTime: '2023-1-4'
}]
tableData: []
}
},
props:{
@@ -73,17 +55,17 @@ export default {
default:[],
}
},
watch: {
fourthData(newValue, oldValue) {
this.tableData=newValue
}
},
mounted () {
this.$bus.$on('getSearchItem',(data)=>{
console.log('44',data)
});
this.search()
this.loadData()
},
methods: {
loadData() {
this.$api.processCenter.monitorProcessesPage({...this.q,...this.searchForm}).then(res=>{
this.tableData = res.data.list
this.total = res.count
})
},
// 单页数据量
handleSizeChange(val) {
this.q.pageSize = val;
src/views/userCenter/processCenter/sentProcess.vue
+12 -36
View File
@@ -40,8 +40,10 @@
</template>
<script>
import ProcessMixin from "../../../components/ProcessMixin";
export default {
name: "sentProcess",
mixins: [ProcessMixin],
data() {
return {
color: 'rgb(236, 128, 141)',
@@ -51,33 +53,7 @@ export default {
pageSize: 10
},
total: 0,
tableData: [
{
processId: "2016-05-1",
processName: "王小虎",
processPerson: "上海市普陀区金沙江路 1518 弄",
createTime: "2023-1-1",
status: '已完成'
},
{
processId: "2016-05-2",
processName: "王小虎",
processPerson: "上海市普陀区金沙江路 1518 弄",
createTime: "2023-1-2",
},
{
processId: "2016-05-3",
processName: "王小虎",
processPerson: "上海市普陀区金沙江路 1518 弄",
createTime: "2023-1-3",
},
{
processId: "2016-05-4",
processName: "王小虎",
processPerson: "上海市普陀区金沙江路 1518 弄",
createTime: "2023-1-4",
},
],
tableData: []
};
},
props: {
@@ -86,17 +62,17 @@ export default {
default: [],
}
},
watch: {
thirdData(newValue, oldValue) {
this.tableData = newValue
}
},
mounted() {
this.$bus.$on('getSearchItem', (data) => {
console.log('33', data)
});
mounted () {
this.search()
this.loadData()
},
methods: {
loadData() {
this.$api.processCenter.sentProcessPage({...this.q,...this.searchForm}).then(res=>{
this.tableData = res.data.list
this.total = res.count
})
},
// 单页数据量
handleSizeChange(val) {
this.q.pageSize = val;
src/views/userCenter/processConfig/ProcessMapping.vue
+52
View File
@@ -0,0 +1,52 @@
<template>
<div class="execution">
<basic-container>
<iframe class="iframe" :src="src"></iframe>
</basic-container>
</div>
</template>
<script>
import BasicContainer from './basic-container/index'
export default {
name: "ProcessMapping",
components: {
BasicContainer
},
data() {
return {
modelId : '',
name: '',
actUrl: 'http://10.0.10.87:17210/bat-wkflow/modeler.html?modelId='
}
},
created() {
this.modelId = this.$route.query.modelId
},
computed: {
src() {
return `${this.actUrl}${this.modelId}`
}
},
methods: {
breaks() {
this.$router.push({path: '/'})
}
}
}
</script>
<style scoped>
.execution{
width: 100%;
}
.iframe{
width: 100%;
height: auto;
min-height: 850px;
border: 0;
overflow: hidden;
-webkit-box-sizing: border-box;
box-sizing: border-box;
}
</style>
src/views/userCenter/processConfig/basic-container/index.vue
+25
View File
@@ -0,0 +1,25 @@
<template>
<div class="basic-container"
:class="{'basic-container--block':block}">
<slot></slot>
</div>
</template>
<script>
export default {
name: "basicContainer",
props: {
block: {
type: Boolean,
default: false,
}
}
};
</script>
<style>
.basic-container{
width: 100%;
}
</style>
src/views/userCenter/processConfig/components/EditProcess.vue
+3 -3
View File
@@ -22,8 +22,8 @@
</el-form>
</div>
<div slot="footer">
<el-button round class="common-button-default" icon="el-icon-close" @click="closeDialog">{{$t('m.cancel')}}</el-button>
<el-button round class="common-button-primary" icon="el-icon-check" type="primary" @click="confirmDialog">{{$t('m.confirm')}}</el-button>
<el-button round class="common-button-default" icon="el-icon-close" @click="closeDialog">取消</el-button>
<el-button round class="common-button-primary" icon="el-icon-check" type="primary" @click="confirmDialog">确认</el-button>
</div>
</el-dialog>
</template>
@@ -63,7 +63,7 @@ export default {
},
created() {
this.queryTablePage()
// this.queryTablePage()
},
methods: {
src/views/userCenter/processConfig/index.vue
+39 -41
View File
@@ -67,8 +67,6 @@
<!--</table-tools-bar>-->
<!-- v-btn-permission="'XBRKH5BP5K'"-->
<div class="content">
<loading :loading="tableDataLoading">加载中...</loading>
<el-table
border
ref="selection"
@@ -100,9 +98,9 @@
<el-table-column
prop="createTime" sortable="custom"
label="创建时间">
<template slot-scope="scope">
<span>{{$moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss')}}</span>
</template>
<!-- <template slot-scope="scope">-->
<!-- <span>{{$moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss')}}</span>-->
<!-- </template>-->
</el-table-column>
<el-table-column label="操作" align="center" width="60" fixed="right">
@@ -111,25 +109,25 @@
<el-dropdown trigger="click" @command="handleCommand">
<el-button type="text" class="text" style="padding: 0">更多</el-button>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item v-btn-permission="'B44TL4SB6RRC6MNLBYMS'" :command="[scope.row, '编辑']">
<el-dropdown-item :command="[scope.row, '编辑']">
编辑
</el-dropdown-item>
<el-dropdown-item v-btn-permission="'THJ77DKLPVHP9FHU7BQ6'" :command="[scope.row, '部署']">
<el-dropdown-item :command="[scope.row, '部署']">
部署
</el-dropdown-item>
<el-dropdown-item v-btn-permission="'HHD8BQ2DM4T3MFY73GXL'" :command="[scope.row, '复制']">
<el-dropdown-item :command="[scope.row, '复制']">
复制
</el-dropdown-item>
<el-dropdown-item v-btn-permission="'CK8WF2ESAS7XV7MSFW5X'" :command="[scope.row, '删除']">
<el-dropdown-item :command="[scope.row, '删除']">
删除
</el-dropdown-item>
<el-dropdown-item v-btn-permission="'7U5RD92APKFDYQ8YWQ2S'" :command="[scope.row, '流程']">
<el-dropdown-item :command="[scope.row, '流程']">
流程人员配置
</el-dropdown-item>
<el-dropdown-item v-btn-permission="'SQHZVHRSX69SD96XRBSQ'" :command="[scope.row, '预设']" v-if="processId.indexOf(scope.row.id)>-1">
<el-dropdown-item :command="[scope.row, '预设']" v-if="processId.indexOf(scope.row.id)>-1">
预设人员配置
</el-dropdown-item>
<el-dropdown-item v-btn-permission="'HVTVWZ32Y32XT7XXDYF9'" :command="[scope.row, '提示']">
<el-dropdown-item :command="[scope.row, '提示']">
提示语配置
</el-dropdown-item>
</el-dropdown-menu>
@@ -213,9 +211,9 @@ export default {
searchForm: {
standardKey: ''
},
pageNo: this.$route.params.page ? (+this.$route.params.page) : 1,
pageNo: 1,
pageSize: 10,
tableList: [],
tableList: [{name:1}],
editRowDialogVisible: false,
editRowDialogData: undefined, // 新增时为 undefined null 或者 false 即可
nowOrder: 'prder',
@@ -315,30 +313,30 @@ export default {
},
// 查询、加载表格
queryTablePage () {
const formData = {
current: this.pageNo,
size: this.$store.getters.userInfo.configContent,
order: this.nowOrder,
...this.processForm
// standNumber: this.searchForm.standardKey
}
this.$http.get('lawss/activiti/modelListPage',
formData,
{
_this: this,
loading: 'tableDataLoading'
},
res => {
if (res.success) {
this.tableList = res.result.records
this.total = res.result.total
} else {
this.tableList = []
this.total = 0
this.$message.warning(res.message)
}
}, e => {
})
// const formData = {
// current: this.pageNo,
// size: this.$store.getters.userInfo.configContent,
// order: this.nowOrder,
// ...this.processForm
// // standNumber: this.searchForm.standardKey
// }
// this.$http.get('lawss/activiti/modelListPage',
// formData,
// {
// _this: this,
// loading: 'tableDataLoading'
// },
// res => {
// if (res.success) {
// this.tableList = res.result.records
// this.total = res.result.total
// } else {
// this.tableList = []
// this.total = 0
// this.$message.warning(res.message)
// }
// }, e => {
// })
},
clearAllSearchs () {
this.processForm = { name: '' }
@@ -362,8 +360,8 @@ export default {
switch (command[1]) {
case '编辑':
this.$router.push({
path: '/ProcessMapping',
query: { id: command[0].id }
path: '/userCenter/processMapping',
query: { id: 'AEHJB8YNJ3' ,modelId: command[0].id}
})
// this.editRow(command[0])
break
@@ -424,7 +422,7 @@ export default {
}, res => {
if (res.success) {
this.$router.push({
path: '/ProcessMapping',
path: '/processMapping',
query: { id: res.result }
})
}