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

1、自测流程混乱bug修复 

2、页面按钮样式调整
5_7_地图同步
liujun 2024-03-20 10:34:32 +08:00
parent 87552f09f9
commit 708bf7239b
2 changed files with 27 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -39,12 +39,20 @@
<el-table-column prop="USERNAME" label="用户名" align="center"/> <el-table-column prop="USERNAME" label="用户名" align="center"/>
<el-table-column prop="NAME" 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 prop="BELONG_TO_CORP_NAME" label="外派公司名称" align="center"/>
<el-table-column label="操作" align="center" width="350"> <el-table-column label="操作" align="center" width="300">
<template slot-scope="{row}"> <template slot-scope="{row}">
<el-button type="primary" icon="el-icon-edit" size="mini" @click="handleShow(row)">详情</el-button> <el-row>
<el-button v-if="row.power_flag === '1'" type="primary" icon="el-icon-s-claim" size="mini" @click="approve([row])">审批</el-button> <el-col :span="24">
<el-button v-if="row.power_flag === '1' && row.FLOWS_STEP === 1" type="primary" icon="el-icon-s-claim" size="mini" @click="entrust([row])">委托辖区单位审批</el-button> <el-button type="text" icon="el-icon-edit" size="mini" @click="handleShow(row)">详情</el-button>
<el-button v-if="false" type="success" icon="el-icon-edit" size="mini" @click="getUserInfo(row)">电子合格证</el-button> <el-button type="text" icon="el-icon-edit" size="mini" @click="handleFlowShow(row)">流程详情</el-button>
<el-button type="text" icon="el-icon-edit" size="mini" @click="handleFlowStepShow(row)">审批流程</el-button>
</el-col>
<el-col :span="24">
<el-button v-if="row.power_flag === '1'" type="text" icon="el-icon-s-claim" size="mini" @click="approve([row])">审批</el-button>
<el-button v-if="row.power_flag === '1' && row.FLOWS_STEP === 1" type="text" icon="el-icon-s-claim" size="mini" @click="entrust([row])">委托辖区单位审批</el-button>
<el-button v-if="false" type="success" icon="el-icon-edit" size="mini" @click="getUserInfo(row)">电子合格证</el-button>
</el-col>
</el-row>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -58,6 +66,8 @@
<user-info ref="userInfos" append-to-body/> <user-info ref="userInfos" append-to-body/>
<send-util ref="sendUtil" append-to-body @refresh="getList"/> <send-util ref="sendUtil" append-to-body @refresh="getList"/>
<entrust ref="entrust" append-to-body @refresh="getList"/> <entrust ref="entrust" append-to-body @refresh="getList"/>
<flow-info-list ref="flowInfo"/>
<flow-step ref="flowStep" />
</div> </div>
</template> </template>
@ -71,9 +81,11 @@ import user from './user.vue'
import SendUtil from './sendUtil.vue' import SendUtil from './sendUtil.vue'
import UserInfo from '../../flow_audit/userInfo.vue' import UserInfo from '../../flow_audit/userInfo.vue'
import Entrust from './entrust.vue' import Entrust from './entrust.vue'
import FlowInfoList from './flowInfoList.vue'
import FlowStep from './flowStep.vue'
export default { export default {
components: { Entrust, UserInfo, SendUtil, Pagination, apply, vueQr, user }, components: { FlowInfoList, FlowStep, Entrust, UserInfo, SendUtil, Pagination, apply, vueQr, user },
directives: { waves }, directives: { waves },
data() { data() {
return { return {
@ -98,7 +110,7 @@ export default {
socialPhotoFile: [], // 身份证照片 socialPhotoFile: [], // 身份证照片
listQuery: { listQuery: {
page: 1, page: 1,
limit: 10 limit: 20
}, },
total: 0, total: 0,
varList: [], varList: [],
@ -165,6 +177,12 @@ export default {
handleShow(row) { handleShow(row) {
this.$refs.userInfos.init(row) this.$refs.userInfos.init(row)
}, },
handleFlowShow(row) {
this.$refs.flowInfo.init(row)
},
handleFlowStepShow(row) {
this.$refs.flowStep.init(row)
},
approve(row) { approve(row) {
this.$refs.sendUtil.init(row) this.$refs.sendUtil.init(row)
}, },

4
src/views/xgf/peopleList/components/list.vue
View File

@ -42,8 +42,8 @@
<el-table-column label="操作" align="center" width="350"> <el-table-column label="操作" align="center" width="350">
<template slot-scope="{row}"> <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="handleShow(row)">详情</el-button>
<el-button v-if="false" type="primary" icon="el-icon-edit" size="mini" @click="handleShowStep(row)">审批详情</el-button> <el-button type="primary" icon="el-icon-edit" size="mini" @click="handleShowStep(row)">审批详情</el-button>
<el-button v-if="false" type="primary" icon="el-icon-edit" size="mini" @click="handleShowFlow(row)">审批流程</el-button> <el-button type="primary" icon="el-icon-edit" size="mini" @click="handleShowFlow(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="row.power_flag === '1'" type="primary" icon="el-icon-s-claim" size="mini" @click="approve([row])">审批</el-button>
<el-button v-if="row.power_flag === '1' && row.FLOWS_STEP === 2" type="primary" icon="el-icon-s-claim" size="mini" @click="entrust([row])">委托制单单位审批</el-button> <el-button v-if="row.power_flag === '1' && row.FLOWS_STEP === 2" type="primary" icon="el-icon-s-claim" size="mini" @click="entrust([row])">委托制单单位审批</el-button>
<el-button v-if="false" type="success" icon="el-icon-edit" size="mini" @click="getUserInfo(row)">电子合格证</el-button> <el-button v-if="false" type="success" icon="el-icon-edit" size="mini" @click="getUserInfo(row)">电子合格证</el-button>