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-24 19:24:24 +08:00
parent 7f675d424b
commit 95b35ed77a
14 changed files with 196 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/api/modules/processCenter.js
+2 -2
View File
@@ -35,13 +35,13 @@ export default {
return request({
url: '/api/task/get_list_by_instance',
method: 'GET',
data: data
params: data
})
},
// 获取监控流程详情
getMonitorImg(data){
return request({
url: '/api/model/getImg',
url: '/api/instance/getImg',
method: 'GET',
params: data,
responseType: 'blob',
src/assets/css/process.scss
+4 -1
View File
@@ -58,5 +58,8 @@
}
}
}
.blurcolor{
color: #1890FF ;
cursor: pointer;
}
src/components/ProcessMixin.vue
+8 -12
View File
@@ -89,29 +89,25 @@
})
},
// 所有流程的完成任务
completeProcess(dataJson,submitJson,taskId,userId) {
this.$api.process.completeTask({
taskId:taskId,
userId:userId,
dataJson,
submitJson
}).then(res=>{
this.$message['success']('提交成功')
this.$router.back(-1)
})
completeProcess(obj) {
this.$api.process.completeTask(obj).then(res=>{
this.$message['success']('提交成功')
this.$router.back(-1)
})
},
// 获取流程详细信息
getProcessDetail(){
return new Promise((resolve,reject)=>{
this.$api.process.getProcessDetail({taskId:this.taskIds}).then(res=>{
let data=res.data
this.processOld=res.data
this.processOld=data.data
resolve()
}).catch(err=>{
reject()
})
})
}
},
},
computed: {},
watch: {},
src/views/Report/ReportList.vue
+13 -7
View File
@@ -155,8 +155,8 @@
</vxe-column>
<vxe-column show-overflow show-header-overflow title="操作" width="200" fixed="right">
<template #default="{ row }">
<el-button type="text" @click="previewRow(row)">预览</el-button>
<!-- <el-button type="text" @click="downloadRow(row)">下载</el-button>-->
<el-button type="text" v-if="row.power == 1" @click="previewRow(row)">预览</el-button>
<el-button type="text" v-if="row.power == 2" @click="downloadRow(row)">下载</el-button>
</template>
</vxe-column>
@@ -172,9 +172,6 @@
</el-col>
</el-row>
</div>
<!--预览-->
@@ -304,8 +301,8 @@ export default {
}
],
content: '',
checkIds: []
checkIds: [],
checkList: []
}
},
watch: {
@@ -320,17 +317,26 @@ export default {
},
selectAllEvent ({ checked }) {
const records = this.$refs.xTable.getCheckboxRecords()
this.checkList= records
this.checkIds = records.map(item => {
return item.id
})
},
selectChangeEvent ({ checked }) {
const records = this.$refs.xTable.getCheckboxRecords()
this.checkList= records
this.checkIds = records.map(item => {
return item.id
})
},
permissionApp () {
// 有预览权限的时候是否还让继续申请
let temp=this.checkList.filter(item =>{
if(item.power == 1 || item.power == 2){
return item
}
})
this.$router.push({
path: '/permission/launch',
query: { id: 'AEHJB8YNJ3', ids: this.checkIds.toString() }
src/views/permissionApplication/components/AuditOperation.vue
+11 -3
View File
@@ -69,7 +69,15 @@
export default {
name: 'AuditOperation',
props: ['query'],
props: {
isDisable:{
type:Boolean,
default:false
},
examine:{
type:Object
}
},
data () {
return {
@@ -93,8 +101,8 @@ export default {
},
created () {
// 判断穿过来的query里的参数 是不是查看
if (this.query.isViewDetails && this.query.isViewDetails === 1) {
this.examineForm = this.query
if (this.isDisable) {
this.examineForm = this.examine
this.formdisableflag = true
}
},
src/views/permissionApplication/components/reportDialog.vue
+9 -5
View File
@@ -115,9 +115,9 @@ export default {
const name = []
const ids = []
this.alreadyData.forEach(item => {
if (this.checkIds.indexOf(item.id) > -1) {
if (this.checkIds.indexOf(item.reportId) > -1) {
name.push(item.name)
ids.push(item.id)
ids.push(item.reportId)
}
})
this.checkList = this.checkList.filter(item => {
@@ -157,7 +157,11 @@ export default {
// 列表
reportList () {
this.$api.permissionProcess.getReportLisy({ ...this.q, ...this.searchForm,usid:this.$store.getters.userInfo.USID }).then(({ data }) => {
this.tableData = data.records
this.tableData = data.records.map(item=>{
item.reportId=item['id']
delete item['id']
return item
})
this.total = data.total
this.q.pageNo = data.current
this.q.pageSize = data.size
@@ -184,14 +188,14 @@ export default {
const records = this.$refs.xTable.getCheckboxRecords()
this.checkList = records
this.checkIds = records.map(item => {
return item.id
return item.reportId
})
},
selectChangeEvent ({ checked }) {
const records = this.$refs.xTable.getCheckboxRecords()
this.checkList = records
this.checkIds = records.map(item => {
return item.id
return item.reportId
})
}
}
src/views/permissionApplication/examine.vue
+19 -37
View File
@@ -52,7 +52,7 @@
</div>
<div class="process_content">
<span class="base_title">审核信息</span>
<audit-operation ref="operationRef"></audit-operation>
<audit-operation ref="operationRef" :examine="submitjson" :is-disable="disabled"></audit-operation>
</div>
</div>
<process-footer
@@ -115,6 +115,7 @@ export default {
isShowTran: true,
isShowSubmit: true,
formControl: true,
disabled:false,
assignForm: {},
tableData: [],
applicationForm: {},
@@ -123,39 +124,20 @@ export default {
pageNo: 1
},
PERMISSION,
applicationFormRule: {
name: [{
max: 1000, message: '申请原因最多填写1000字符'
}],
send: [{
required: true,
message: '请选择申请权限'
}]
},
assignFormRules: {
name1: [{
required: true,
message: '请选择一级审批人员'
}],
name2: [{
required: true,
message: '请选择二级审批人员'
}],
remark: [{
max: 1000, message: '说明最多填写1000字符'
}]
}
submitjson:{}
}
},
created () {
this.getProcessDetail().then(res=>{
this.applicationForm.name = JSON.parse(this.processOld.dataJson).name
this.applicationForm.send = JSON.parse(this.processOld.dataJson).send
this.tableData = JSON.parse(this.processOld.dataJson).tableData
this.tableData = JSON.parse(this.processOld.dataJson).dataMsg
this.processForm.prcName = JSON.parse(this.processOld.dataJson).prcName
this.disabled=false
this.formControl= true
if(this.$route.query.yiban){
this.disabled=true
this.submitjson=JSON.parse(this.processOld.submitJson)
}else{
}
@@ -176,20 +158,20 @@ export default {
},
// 选择转办
handleDblClick (treeNode) {
// changeAssigneeNew({
// taskId: this.$store.getters.getHandleInfo.taskIds, // 任务id
// taskId: this.$store.getters.getHandleInfo.taskIds, // 任务id
// assignee: treeNode[0].userId, // 转办人
// userId: this.$store.getters.userInfo.userId, // 转办人
// userId: this.$store.getters.userInfo.userId, // dangqian人
// pId: this.$store.getters.getHandleInfo.prcId // 流程实例
// }).then(res => {
// if (res.success) {
// this.$message.success('转办成功')
// this.$router.push('/processCenter')
// this.visibleTree = false
// } else {
// this.$message.warning(res.message)
// }
// })
this.$api.process.changeAssignee({
taskId:this.processOld.taskId,
assignee: treeNode[0].USID,
userId: this.$store.getters.userInfo.usid,
pId:this.processOld.pId
}).then(()=>{
this.$message.success('转办成功')
this.$router.push({path:'/processCenter',query:{id:this.$route.query.id}})
this.visibleTree = false
})
},
handleSubmit () {
if (this.$refs.operationRef.submit()) {
src/views/permissionApplication/launch.vue
+76 -37
View File
@@ -1,7 +1,8 @@
<template>
<div class="process">
<div class="process_box">
<process-header :title="'发起流程'"></process-header>
<process-header v-if="initShow" :title="'发起流程'"></process-header>
<process-header v-else :title="'发起人修改'" :proceesNum="this.processOld.prcNum"></process-header>
<div class="procedure">
<div class="process_content">
<span class="base_title">基础信息</span>
@@ -10,7 +11,7 @@
<el-row>
<el-col :span="9">
<el-form-item label="流程名称:" prop="prcName">
<el-input readonly :disabled="formControl || formControlname" v-model="processForm.prcName" @click.native="handleCheck('spr1')"
<el-input :disabled="formControl || formControlname" v-model="processForm.prcName"
placeholder="请输入流程名称"></el-input>
</el-form-item>
</el-col>
@@ -25,13 +26,13 @@
>
<el-row>
<el-col :span="9">
<el-form-item label="申请原因:" prop="name">
<el-input :disabled="formControl" type="textarea" v-model="applicationForm.name" placeholder="请输入申请原因"></el-input>
<el-form-item label="申请原因:" prop="applyReason">
<el-input :disabled="formControl" type="textarea" v-model="applicationForm.applyReason" placeholder="请输入申请原因"></el-input>
</el-form-item>
</el-col>
<el-col :span="9" :offset="6">
<el-form-item label="选择申请权限:" prop="send">
<el-select :disabled="formControl" v-model="applicationForm.send" placeholder="请选择申请权限">
<el-form-item label="选择申请权限:" prop="power">
<el-select :disabled="formControl" v-model="applicationForm.power" placeholder="请选择申请权限">
<el-option
v-for="item in PERMISSION"
:key="item.value"
@@ -102,10 +103,10 @@
@reset="handleReset"
@submit="handleSubmit"
></process-footer>
<orgTable :visible.sync="visibleOrgTable" title="人员列表" dialog-model :config="{
<orgTable :visible.sync="visibleOrgTable" title="人员列表" dialog-model :config="{
value: orgTableVal,
valueName: orgTableValName
}" :workNumFlag="true" :maxSelected="1" @confirm="isTreeOk"></orgTable>
}" :workNumFlag="true" :maxSelected="1" @confirm="isTreeOk"></orgTable>
</div>
</div>
</template>
@@ -143,12 +144,14 @@ export default {
formControlname: false,
assignForm: {
oneApprove: '',
twoApprove: ''
twoApprove: '',
twoApproveName:'',
oneApproveName:''
},
tableData: [],
applicationForm: {
name:'',
send:''
applyReason:'',
power:''
},
q: {
pageSize: 10000,
@@ -170,10 +173,10 @@ export default {
}]
},
applicationFormRule: {
name: [{
applyReason: [{
max: 1000, message: '申请原因最多填写1000字符'
}],
send: [{
power: [{
required: true,
message: '请选择申请权限'
}]
@@ -192,45 +195,59 @@ export default {
remark: [{
max: 1000, message: '说明最多填写1000字符'
}]
}
},
taskIds:''
}
},
created () {
// 第一次进入此页面 需要清楚校验
if (this.$route.query.ids) {
this.reportList(this.$route.query.ids)
if(this.$route.query.ids.split(',').length>0){
this.reportList(this.$route.query.ids)
}
this.handleReset()
}
if(this.$route.query.taskDefinitionKey){
if(this.$route.query.taskDefinitionKey == 'aid4'){
this.taskIds=this.$route.query.taskIds
this.initShow = true
this.formControlname=true
this.getProcessDetail().then(res =>{
//指派信息
this.applicationForm.name = JSON.parse(this.processOld.dataJson).name
this.applicationForm.send = JSON.parse(this.processOld.dataJson).send
this.tableData = JSON.parse(this.processOld.dataJson).tableData
this.processForm.prcName = JSON.parse(this.processOld.dataJson).prcName
//基础信息
this.applicationForm.applyReason = JSON.parse(this.processOld.dataJson).applyReason
this.applicationForm.power = JSON.parse(this.processOld.dataJson).power
this.tableData = JSON.parse(this.processOld.dataJson).dataMsg
this.processForm.prcName = JSON.parse(this.processOld.dataJson).prcName
//指派信息
this.assignForm=JSON.parse(this.processOld.submitJson)
})
}
if(this.$route.query.yiban){
this.taskIds=this.$route.query.taskIds
this.getProcessDetail().then(()=>{
this.applicationForm.applyReason = JSON.parse(this.processOld.dataJson).applyReason
this.applicationForm.power = JSON.parse(this.processOld.dataJson).power
this.tableData = JSON.parse(this.processOld.dataJson).dataMsg
this.processForm.prcName = JSON.parse(this.processOld.dataJson).prcName
//指派信息
this.assignForm=JSON.parse(this.processOld.submitJson)
})
}
console.log(this.PERMISSION, 'ddd')
},
methods: {
handleCheck (name) {
if(this.initShow){
return false
}
this.treeType = name
this.orgTableVal = ''
this.orgTableValName = ''
if (name === 'spr1') {
this.orgTableVal = this.assignForm.Approve
this.orgTableValName = this.assignForm.oneApproveName
this.orgTableVal = this.assignForm.oneApprove ?this.assignForm.oneApprove:''
this.orgTableValName = this.assignForm.oneApproveName ?this.assignForm.oneApproveName:''
} else {
this.orgTableVal = this.assignForm.twoApprove
this.orgTableValName = this.assignForm.twoApproveName
this.orgTableVal = this.assignForm.twoApprove?this.assignForm.twoApprove:''
this.orgTableValName = this.assignForm.twoApproveName?this.assignForm.twoApproveName:''
}
this.visibleOrgTable = true
},
@@ -256,26 +273,33 @@ export default {
},
// 获取表格列表 吧查询到的值传给子组件
reportList (ids) {
this.$api.report.reportList({ id: ids }).then(({ data }) => {
this.tableData = data.records
this.$api.report.reportList({ ids: ids.split(',') }).then(({ data }) => {
this.tableData = data.records.map(item=>{
item.reportId=item['id']
delete item['id']
return item
})
})
},
handleReset () {
this.applicationForm = {
name:'',
send:''
applyReason:'',
power:''
}
this.processForm.prcName=''
this.assignForm = {
oneApprove: '',
twoApprove: ''
}
this.$refs.applicationFormRef.clearValidate()
this.$refs.assignFormRef.clearValidate()
this.$nextTick(()=>{
this.$refs.applicationFormRef.clearValidate()
this.$refs.assignFormRef.clearValidate()
})
},
// 整理数据
organizeData() {
let userId = this.$store.getters.userInfo.USID
let userId = this.$store.getters.userInfo.usid
this.tableData=this.tableData.map(item=>{
item = {...item, ... this.applicationForm,userId:userId}
return item
@@ -283,6 +307,7 @@ export default {
},
// 提交
handleSubmit () {
console.log( this.$store.getters.userInfo.usid," this.$store.getters.userInfo.USID")
this.$refs.assignFormRef.validate(v => {
this.$refs.applicationFormRef.validate(m => {
this.$refs.processFormRef.validate(z =>{
@@ -298,10 +323,11 @@ export default {
this.organizeData()
//如果不是第一次
if(this.initShow){
this.completeProcess()
let dataJson=JSON.stringify({...this.applicationForm,...this.processForm,dataMsg:this.tableData})
let submitJson=JSON.stringify(this.assignForm)
this.completeProcess({dataJson,submitJson,taskId:this.taskIds,userId:form.userId})
}else{
this.startProcess()
this.completeProcess()
}
}
} else {
@@ -311,8 +337,21 @@ export default {
})
})
},
startProcess() {
//修改参数
changeParam(){
},
startProcess() {
let form = {}
form={...this.assignForm,approveData:{...this.applicationForm,...this.processForm},dataMsg:this.tableData}
form.prcType= '1'
form.prcName= this.processForm.prcName
form.userId= this.$store.getters.userInfo.usid
let dataJson=JSON.stringify({...this.applicationForm,...this.processForm,dataMsg:this.tableData})
let submitJson=JSON.stringify(this.assignForm)
this.$api.process.startProcess(form).then( ({data}) =>{
this.completeProcess({dataJson,submitJson,taskId:data.result,userId:form.userId})
})
},
//获取流程详细信息
src/views/userCenter/processCenter.vue
+4 -2
View File
@@ -9,12 +9,14 @@
<div class="search-box-left">
<label>流程编号：</label>
<el-input v-model="form.prcNum" placeholder="请输入流程编号"></el-input>
<label>流程名称：</label>
<el-select v-model="form.prcName" collapse-tags placeholder="请选择流程名称">
<label>流程类型：</label>
<el-select v-model="form.prcType" collapse-tags placeholder="请选择流程类型">
<template v-for="item in processTypeList">
<el-option :label="item.label" :value="item.value" :key="item.value"></el-option>
</template>
</el-select>
<label>流程名称：</label>
<el-input v-model="form.prcName" placeholder="请输入流程名称"></el-input>
</div>
</el-col>
<el-col :span="4" align="right">
src/views/userCenter/processCenter/finishProcess.vue
+33 -5
View File
@@ -7,16 +7,21 @@
{{ rowIndex + (q.current - 1) * q.size + 1 }}
</template>
</vxe-column>
<vxe-column show-overflow show-header-overflow field="prcNum" title="流程编号">
<template #default="{ row,index }">
<div class="blurcolor" @click="view(row)">{{row.prcNum}}</div>
</template>
</vxe-column>
<vxe-column show-overflow show-header-overflow field="prcType"
title="流程类型">
<template #default="{ row,index }">
<div>{{getPrcName(row.prcType)}}</div>
<div >{{getPrcName(row.prcType)}}</div>
</template>
</vxe-column>
<vxe-column show-overflow show-header-overflow field="prcName" title="流程名称">
<template #default="{ row,index }">
<div>{{row.prcName}}</div>
<div class="blurcolor" @click="view(row)">{{row.prcName}}</div>
</template>
</vxe-column>
<vxe-column show-overflow show-header-overflow field="creatUser"
@@ -30,7 +35,7 @@
<vxe-column show-overflow show-header-overflow field="status" title="状态"></vxe-column>
<vxe-column show-overflow show-header-overflow title="操作" width="200" fixed="right">
<template #default="{ row }">
<el-button @click.native.prevent="view(scope.$index, tableData)" type="text" size="small">
<el-button @click.native.prevent="view(row)" type="text" size="small">
查看
</el-button>
</template>
@@ -95,8 +100,31 @@ export default {
this.q.current = val;
this.loadData();
},
view() {
alert(111)
view(row) {
switch (row.prcType) {
case '1' :
if (row.taskDefinitionKey == 'aid1' || row.taskDefinitionKey == 'aid3') {
this.$router.push({
path: '/permission/launch',
query: {
id: 'AEHJB8YNJ3',
taskIds:row.taskIds,
type:'yiban',
taskDefinitionKey: row.taskDefinitionKey
}
})
}else{
this.$router.push({
path: '/permission/examine',
query: {
id: 'AEHJB8YNJ3',
taskIds:row.taskIds,
type:'yiban',
taskDefinitionKey: row.taskDefinitionKey
}
})
}
}
},
}
}
src/views/userCenter/processCenter/gencyProcess.vue
+2 -2
View File
@@ -10,7 +10,7 @@
<vxe-column show-overflow show-header-overflow field="prcNum"
title="流程编号">
<template #default="{ row,index }" >
<div @click.native.prevent="handle(row)">{{row.prcNum}}</div>
<div class="blurcolor" @click.native.prevent="handle(row)">{{row.prcNum}}</div>
</template>
</vxe-column>
<vxe-column show-overflow show-header-overflow field="prcType"
@@ -21,7 +21,7 @@
</vxe-column>
<vxe-column show-overflow show-header-overflow field="prcName" title="流程名称">
<template #default="{ row,index }" >
<div @click.native.prevent="handle(row)">{{row.prcName}}</div>
<div class="blurcolor" @click.native.prevent="handle(row)">{{row.prcName}}</div>
</template>
</vxe-column>
<vxe-column show-overflow show-header-overflow field="creatUserName"
src/views/userCenter/processCenter/monitorProcesses.vue
+7 -7
View File
@@ -9,22 +9,22 @@
</vxe-column>
<vxe-column show-overflow show-header-overflow field="prcNum"
title="流程编号">
<template #default="{ row,index }" @click.native.prevent="view(row)">
<div>{{row.prcNum}}</div>
<template #default="{ row }">
<div class="blurcolor" @click="view(row)"> {{row.prcNum}}</div>
</template>
</vxe-column>
<vxe-column show-overflow show-header-overflow field="prcType"
<vxe-column show-overflow show-header-overflow
title="流程类型">
<template #default="{ row,index }">
<div>{{getPrcName(row.prcType)}}</div>
</template>
</vxe-column>
<vxe-column show-overflow show-header-overflow field="prcName" title="流程名称">
<template #default="{ row,index }" @click.native.prevent="view(row)">
<div>{{row.prcName}}</div>
<vxe-column show-overflow show-header-overflow title="流程名称">
<template #default="{ row }" >
<div class="blurcolor" @click="view(row)">{{row.prcName}}</div>
</template>
</vxe-column>
<vxe-column show-overflow show-header-overflow field="labelOneName"
<vxe-column show-overflow show-header-overflow field="creatUserName"
title="发起人"></vxe-column>
<vxe-column show-overflow show-header-overflow field="taskAssignee" title="当前处理人"></vxe-column>
<vxe-column show-overflow show-header-overflow field="taskBackAssignee"
src/views/userCenter/processCenter/monitorProcesses/monitorDetail.vue
+5 -4
View File
@@ -103,7 +103,7 @@ export default {
checkIds: [],
checkList: [],
tabsName:'',
prcNum:''
}
},
methods: {
@@ -235,12 +235,12 @@ export default {
// modelId: row?row.id:'111s',
// }
// })
this.$api.processCenter.getMonitorImg({modelId: row?row.id:'111s'})
this.$api.processCenter.getMonitorImg({prcNum:this.prcNum})
.then(res => {
console.log(res)
// let blob = new Blob([res.data], {type: 'image/jpg'})
// let url = window.URL.createObjectURL(res.data)
this.processStep = window.URL.createObjectURL(res)
this.processStep = window.URL.createObjectURL(res.data)
}).finally(_ => {
this.imgLoading = false;
})
@@ -248,7 +248,7 @@ export default {
// 请求列表
processTable (row) {
this.$api.processCenter.getMonitorPageList({
prcNum:(row && row.parentFlowNum) || this.$route.query.prcNum,
prcNum: this.prcNum,
sortWord: this.shunxu ? this.paixu : '',
shunxu: this.shunxu
}).then(res=>{
@@ -264,6 +264,7 @@ export default {
mounted () {
this.tabsName=this.$route.query.tabsName
this.prcType=this.$route.query.prcType
this.prcNum=this.$route.query.prcNum
this.processNum()
this.processTable()
}
src/views/userCenter/processCenter/sentProcess.vue
+3 -3
View File
@@ -11,19 +11,19 @@
<vxe-column show-overflow show-header-overflow field="prcNum"
title="流程编号">
<template #default="{ row,index }">
<div @click="view(row)">{{row.prcNum}}</div>
<div class="blurcolor" @click="view(row)">{{row.prcNum}}</div>
</template>
</vxe-column>
<vxe-column show-overflow show-header-overflow field="prcType"
title="流程类型">
<template #default="{ row,index }">
<div>{{getPrcName(row.prcType)}}</div>
<div >{{getPrcName(row.prcType)}}</div>
</template>
</vxe-column>
<vxe-column show-overflow show-header-overflow field="prcName" title="流程名称">
<template #default="{ row,index }">
<div @click="view(row)">{{row.prcName}}</div>
<div class="blurcolor" @click="view(row)">{{row.prcName}}</div>
</template>
</vxe-column>
<vxe-column show-overflow show-header-overflow field="creatUserName"