guoyuepeng
/
qa-prevention-gwj-vue
1
0
Fork 3
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

1、流程数据保存错误bug修改 

2、打回后无法审批bug修复
2024年2月1日V1.0.53.2
liujun 2024-01-29 13:20:27 +08:00
parent fb36e78a30
commit 8af77c02ea
4 changed files with 175 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
src/views/xgf/flow/components/flowInfo.vue Normal file
View File

@ -0,0 +1,78 @@
<template>
<el-dialog
v-if="visible"
:visible.sync="visible"
:before-close="handleClose"
:append-to-body="true"
title="审批流程"
width="60%">
<el-steps :space="200" :active="list.length" direction="vertical" finish-status="success">
<el-step v-for="item in list" :key="item.FLOW_DETAIL_ID" :value="item.FLOW_DETAIL_ID" :title="item.SORT">
<template slot="description">
<el-card class="box-card" style="width: 900px;">
<div slot="header" class="clearfix">
<span>{{ item.STEP_NAME }}</span>
</div>
<div>
<el-row>
<el-col>
审批人：{{ item.APPROVER_NAME }}
</el-col>
<el-col>
审批状态：{{ item.PASS_FLAG === '1' ? '同意' : '不同意' }}
</el-col>
<el-col>
审批时间：{{ item.APPROVER_TIME }}
</el-col>
<el-col>
审批意见：{{ item.APPROVER_OPINION }}
</el-col>
</el-row>
</div>
</el-card>
</template>
</el-step>
</el-steps>
<div slot="footer" class="dialog-footer">
<el-button @click="closeWindow">取 消</el-button>
<el-button :loading="loading" type="primary" @click="save">确 定</el-button>
</div>
</el-dialog>
</template>
<script>
import '@riophae/vue-treeselect/dist/vue-treeselect.css'
export default {
props: {
corpInfo: {
type: String,
default: ''
}
},
data() {
return {
visible: false,
loading: false,
list: [],
form: {
XGF_USER_ID: ''
}
}
},
methods: {
init(e) {
this.visible = true
this.loading = false
this.list = e.flow
},
handleClose() {
this.visible = false
this.$emit('finish', '')
},
closeWindow() {
this.handleClose()
}
}
}
</script>

88
src/views/xgf/flow/components/flowInfoList.vue Normal file
View File

@ -0,0 +1,88 @@
<template>
<el-dialog
v-if="visible"
:visible.sync="visible"
:before-close="handleClose"
:append-to-body="true"
title="审批流程"
width="60%">
<el-table
ref="multipleTable"
:data="list"
:header-cell-style="{'font-weight': 'bold','color': '#000'}"
tooltip-effect="dark"
border
fit
highlight-current-row>
<el-table-column type="index" label="序号" width="50" align="center"/>
<el-table-column prop="CREATOR_TIME" label="用户名" align="center"/>
<el-table-column label="操作" align="center" width="250">
<template slot-scope="{row}">
<el-button type="primary" icon="el-icon-edit" size="mini" @click="handleShow(row)">详情</el-button>
</template>
</el-table-column>
</el-table>
<div slot="footer" class="dialog-footer">
<el-button @click="closeWindow">取 消</el-button>
<el-button :loading="loading" type="primary" @click="save">确 定</el-button>
</div>
<flow-info ref="flowInfo" :corp-info="corpInfo" @finish="handleClose"/>
</el-dialog>
</template>
<script>
import { requestFN } from '@/utils/request'
import Treeselect from '@riophae/vue-treeselect'
import '@riophae/vue-treeselect/dist/vue-treeselect.css'
import FlowInfo from './flowInfo.vue'
export default {
components: {
FlowInfo,
Treeselect
},
props: {
corpInfo: {
type: String,
default: ''
}
},
data() {
return {
visible: false,
loading: false,
list: [],
form: {
XGF_USER_ID: ''
}
}
},
methods: {
init(e) {
this.visible = true
this.loading = false
this.form.XGF_USER_ID = e.XGF_USER_ID
this.getInfo()
},
getInfo() {
requestFN(
'/xgf/user/getApproveInfo', this.form
).then((data) => {
this.list = data.list
}).catch((e) => {
console.log(e)
})
},
handleShow(row) {
this.$refs.flowInfo.init(row)
},
handleClose() {
this.visible = false
this.$emit('finish', '')
},
closeWindow() {
this.handleClose()
}
}
}
</script>

10
src/views/xgf/flow/components/list.vue
View File

@ -39,9 +39,10 @@
<el-table-column prop="USERNAME" label="用户名" align="center"/>
<el-table-column prop="NAME" label="姓名" align="center"/>
<el-table-column prop="BELONG_TO_CORP_NAME" label="外派公司名称" align="center"/>
<el-table-column label="操作" align="center" width="250">
<el-table-column label="操作" align="center" width="450">
<template slot-scope="{row}">
<el-button type="primary" icon="el-icon-edit" size="mini" @click="handleShow(row)">详情</el-button>
<el-button type="primary" icon="el-icon-edit" size="mini" @click="handleFlowShow(row)">流程详情</el-button>
<el-button v-if="row.power_flag === '1'" type="primary" icon="el-icon-s-claim" size="mini" @click="approve([row])">审批</el-button>
<el-button v-if="false" type="success" icon="el-icon-edit" size="mini" @click="getUserInfo(row)">电子合格证</el-button>
</template>
@ -56,6 +57,7 @@
<user ref="userInfo" append-to-body/>
<user-info ref="userInfos" append-to-body/>
<send-util ref="sendUtil" append-to-body @refresh="getList"/>
<flow-info-list ref="flowInfo" :corp-info="corpInfo" @finish="handleClose"/>
</div>
</template>
@ -68,9 +70,10 @@ import apply from './apply'
import user from './user.vue'
import SendUtil from './sendUtil.vue'
import UserInfo from '../../flowApply/components/userInfo.vue'
import FlowInfoList from './flowInfoList.vue'
export default {
components: { UserInfo, SendUtil, Pagination, apply, vueQr, user },
components: { FlowInfoList, UserInfo, SendUtil, Pagination, apply, vueQr, user },
directives: { waves },
data() {
return {
@ -162,6 +165,9 @@ export default {
handleShow(row) {
this.$refs.userInfos.init(row)
},
handleFlowShow(row) {
this.$refs.flowInfo.init(row)
},
approve(row) {
this.$refs.sendUtil.init(row)
},

2
src/views/xgf/flowList/components/sendUtil.vue
View File

@ -1,4 +1,4 @@
<template>
<template>
<div>
<el-dialog :visible.sync="visible" :append-to-body="appendToBody" :before-close="beforeClose" title="头像" width="370px" destroy-on-close>
<el-form>