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-25 18:04:35 +08:00
parent fc43422f22
commit d34c375f20
12 changed files with 306 additions and 249 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/views/userCenter/processCenter/finishProcess.vue
+8 -3
View File
@@ -30,9 +30,14 @@
<vxe-column show-overflow show-header-overflow field="taskBackAssignee"
title="上一处理人"></vxe-column>
<vxe-column show-overflow show-header-overflow field="creatTime" title="创建时间"></vxe-column>
<vxe-column show-overflow show-header-overflow field="overTime"
<vxe-column show-overflow show-header-overflow field="endTime"
title="完成时间"></vxe-column>
<vxe-column show-overflow show-header-overflow field="status" title="状态"></vxe-column>
<vxe-column show-overflow show-header-overflow field="status" title="状态">
<template #default="{ row }">
<span v-if="row.isEnd === '0'">未完成</span>
<span v-if="row.isEnd === '1'">已完成</span>
</template>
</vxe-column>
<vxe-column show-overflow show-header-overflow title="操作" width="200" fixed="right">
<template #default="{ row }">
<el-button @click.native.prevent="view(row)" type="text" size="small">
@@ -113,7 +118,7 @@ export default {
taskDefinitionKey: row.taskDefinitionKey,
prcNum: row.prcNum,
prcId: row.prcId,
prcName: row.prcName
prcName: row.prcName,
}
})
}else{
src/views/userCenter/processCenter/gencyProcess.vue
+4 -2
View File
@@ -106,7 +106,8 @@ export default {
taskId:row.taskId,
prcNum: row.prcNum,
prcId: row.prcId,
prcName: row.prcName
prcName: row.prcName,
taskDefinitionKey: row.taskDefinitionKey
}
})
}else{
@@ -117,7 +118,8 @@ export default {
taskId:row.taskId,
prcNum: row.prcNum,
prcId: row.prcId,
prcName: row.prcName
prcName: row.prcName,
taskDefinitionKey: row.taskDefinitionKey
}
})
}
src/views/userCenter/processCenter/monitorProcesses.vue
+8 -2
View File
@@ -30,9 +30,14 @@
<vxe-column show-overflow show-header-overflow field="taskBackAssignee"
title="上一处理人"></vxe-column>
<vxe-column show-overflow show-header-overflow field="creatTime" title="创建时间"></vxe-column>
<vxe-column show-overflow show-header-overflow field="overTime"
<vxe-column show-overflow show-header-overflow field="endTime"
title="完成时间"></vxe-column>
<vxe-column show-overflow show-header-overflow field="status" title="状态"></vxe-column>
<vxe-column show-overflow show-header-overflow field="status" title="状态">
<template #default="{ row }">
<span v-if="row.isEnd === '0'">未完成</span>
<span v-if="row.isEnd === '1'">已完成</span>
</template>
</vxe-column>
<vxe-column show-overflow show-header-overflow title="操作" width="200" fixed="right">
<template #default="{ row }">
<el-button @click.native.prevent="view(row)" type="text" size="small">
@@ -107,6 +112,7 @@ export default {
id: this.$route.query.id,
prcNum: row.prcNum,
prcType: row.prcType,
prcId: row.prcId,
tabsName: 'MonitorProcess'
}
})
src/views/userCenter/processCenter/monitorProcesses/monitorDetail.vue
+16 -8
View File
@@ -64,7 +64,12 @@
<vxe-column show-overflow show-header-overflow field="approvalOpinion"
title="审批意见"></vxe-column>
<vxe-column show-overflow show-header-overflow field="status"
title="状态"></vxe-column>
title="状态">
<template #default="{ row }">
<span v-if="row.endTime">已完成</span>
<span v-else>未完成</span>
</template>
</vxe-column>
</vxe-table>
</div>
<monitorModal ref="monitorModal" :prcId="prcId"></monitorModal>
@@ -72,18 +77,15 @@
</template>
<script>
import {PROCESSSTATE} from '@/utils/Enum/enum'
import monitorModal from './monitorModal.vue'
import ProcessMixin from "@/components/ProcessMixin";
import { formatDate } from '@/utils/date'
export default {
name: 'processDetail',
mixins: [ProcessMixin],
data () {
return {
formatDate,
PROCESSSTATE,
assigneeNewLoading: false, // 调整处理人确定loading
loginPeople: '',
// 调整处理人抽屉状态
@@ -113,7 +115,8 @@ export default {
checkIds: [],
checkList: [],
tabsName:'',
prcNum:''
prcNum:'',
prcId:''
}
},
methods: {
@@ -214,19 +217,23 @@ export default {
},
showDialog() {
if(this.checkList.length < 1){
this.$message.warning("至少选择一条数据")
this.$message.warning("请选择一条数据")
return
}else{
if(this.checkList.length > 2){
this.$message.warning("请选择一条数据")
return
}
let check=[]
check = this.checkList.filter(item=>{
if(+item.state == this.PROCESSSTATE['COMPLETED'].index){
if(item.endTime ){
return item
}
})
if(check.length > 0){
this.$message.warning("请选择状态为未完成的数据")
}else{
this.$refs.monitorModal.open(this.checkIds,this.checkList[0].id)
this.$refs.monitorModal.open(this.checkIds,this.checkList[0].taskId,this.checkList[0].assigneeId)
}
}
},
@@ -276,6 +283,7 @@ export default {
this.tabsName=this.$route.query.tabsName
this.prcType=this.$route.query.prcType
this.prcNum=this.$route.query.prcNum
this.prcId=this.$route.query.prcId
this.processNum()
this.processTable()
}
src/views/userCenter/processCenter/monitorProcesses/monitorModal.vue
+92 -84
View File
@@ -1,99 +1,104 @@
<template>
<div>
<el-dialog title="调整处理人" :visible.sync="dialogVisible" width="500px">
<div class="label-input-form addModel">
<el-form ref="form" :model="form" label-width="120px" :rules="rules" class="formData">
<el-form-item label="选择人员" prop="assignee" class="el-form-item">
<el-select v-model="form.assignee" class="icon-auth" collapse-tags
placeholder="请选择">
<template v-for="item in userList">
<el-option :label="item.USNAME" :value="item.USID" :key="item.USID"></el-option>
</template>
</el-select>
</el-form-item>
</el-form>
</div>
<span slot="footer" class="dialog-footer">
<div>
<el-dialog title="调整处理人" :visible.sync="dialogVisible" width="500px">
<div class="label-input-form addModel">
<el-form ref="form" :model="form" label-width="120px" :rules="rules" class="formData">
<el-form-item label="选择人员" prop="assignee" class="el-form-item">
<el-select v-model="form.assignee" class="icon-auth" collapse-tags
placeholder="请选择">
<template v-for="item in userList">
<el-option :label="item.USNAME" :value="item.USID" :key="item.USID"></el-option>
</template>
</el-select>
</el-form-item>
</el-form>
</div>
<span slot="footer" class="dialog-footer">
<el-button @click="dialogVisible = false" class="btn">取 消</el-button>
<el-button type="primary" @click="submit" class="btn">确 定</el-button>
</span>
</el-dialog>
</div>
</el-dialog>
</div>
</template>
<script>
export default {
name: 'modal',
data() {
return {
userList: [],
dialogVisible: false,
form: {
assignee:''
},
rules: {
assignee: [
{
required: 'true',
trigger: 'change',
message: '请选择调整处理人'
}
]
},
taskId:'',
pId:''
};
},
name: 'modal',
data() {
return {
userList: [],
dialogVisible: false,
form: {
assignee: ''
},
rules: {
assignee: [
{
required: 'true',
trigger: 'change',
message: '请选择调整处理人'
}
]
},
taskId: '',
pId: ''
};
},
mounted() {
this.sysUserList()
mounted() {
this.sysUserList()
},
methods: {
changeSelect(val) {
this.checked = (val.length || this.reportF.reportUserIdList.length) === this.userList.length;
// this.$emit('update:updateMultipleSelect',this.reportF.reportUserIdList);
},
methods: {
changeSelect(val) {
this.checked = (val.length || this.reportF.reportUserIdList.length) === this.userList.length;
// this.$emit('update:updateMultipleSelect',this.reportF.reportUserIdList);
},
// 获取所有用户
sysUserList() {
this.$api.user.sysUserList({ pageNo: 1, pageSize: 999999 }).then(({ data }) => {
this.userList = data.records;
})
},
open(taskId,pId) {
this.taskId=taskId
this.pId=pId
this.form.name={
assignee:''
}
this.dialogVisible = true
},
submit() {
this.$refs.form.validate((valid) => {
if (valid) {
let userId=this.form.assignee
let assignee=this.$store.getters.userInfo.usid
this.$api.process.changeAssignee({
taskId:this.taskId.join(','),
assignee:assignee,
userId: userId,
pId:this.pId
})
.then(res=>{
//转办完应该跳到哪个页面？
//转办完这个人还能看到这个监控流程吗
this.dialogVisible = false
})
}
})
// 获取所有用户
sysUserList() {
this.$api.user.sysUserList({pageNo: 1, pageSize: 999999}).then(({data}) => {
this.userList = data.records;
})
},
open(taskId, pId,assigneeId) {
this.taskId = taskId
this.pId = pId
this.form.name = {
assignee: ''
}
this.assigneeId=assigneeId
this.dialogVisible = true
},
submit() {
this.$refs.form.validate((valid) => {
if (valid) {
let userId = this.form.assignee
let assignee = this.assigneeId
if (userId == assignee) {
this.$message.warning("当前任务受理人就是您选择的")
} else {
this.$api.process.changeAssignee({
taskId: this.taskId.join(','),
assignee: assignee,
userId: userId,
pId: this.pId
})
.then(res => {
//转办完应该跳到哪个页面？
//转办完这个人还能看到这个监控流程吗
this.dialogVisible = false
})
}
}
})
}
}
}
</script>
<style lang="scss" scoped>
.dialog-footer{
margin: 20px 20px ;
.dialog-footer {
margin: 20px 20px;
.el-button {
width: 80px;
height: 36px;
@@ -101,14 +106,17 @@ export default {
font-size: 14px;
}
}
::v-deep .el-dialog__footer{
::v-deep .el-dialog__footer {
padding-bottom: 20px;
}
.addModel{
.addModel {
padding: 20px;
}
.el-form-item{
::v-deep .el-select{
.el-form-item {
::v-deep .el-select {
width: 300px;
vertical-align: center;
}
src/views/userCenter/processCenter/sentProcess.vue
+7 -2
View File
@@ -32,9 +32,14 @@
<vxe-column show-overflow show-header-overflow field="taskBackAssignee"
title="上一处理人"></vxe-column>
<vxe-column show-overflow show-header-overflow field="creatTime" title="创建时间"></vxe-column>
<vxe-column show-overflow show-header-overflow field="overTime"
<vxe-column show-overflow show-header-overflow field="endTime"
title="完成时间"></vxe-column>
<vxe-column show-overflow show-header-overflow field="status" title="状态"></vxe-column>
<vxe-column show-overflow show-header-overflow field="status" title="状态">
<template #default="{ row }">
<span v-if="row.isEnd === '0'">未完成</span>
<span v-if="row.isEnd === '1'">已完成</span>
</template>
</vxe-column>
<vxe-column show-overflow show-header-overflow title="操作" width="200" fixed="right">
<template #default="{ row,index }">
<el-button type="text" size="small" @click="view(row)">
src/views/userCenter/processCenter/tabs.vue
+6 -2
View File
@@ -65,6 +65,10 @@ export default {
}
</script>
<style lang="sass" scoped>
<style lang="scss" scoped>
::v-deep .el-tabs__header {
padding: 0;
position: relative;
margin: 0 14px 15px;
}
</style>