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

历史bug修复

cmt1.0
liujun 2023-12-07 15:02:00 +08:00
parent 5c76e3a777
commit df4337b95a
1 changed files with 37 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
src/views/xgf/flow_audit/users.vue
View File

@ -24,7 +24,7 @@
<th>安全监督部门</th> <th>安全监督部门</th>
<td>{{ pd.SUPERVISION_DEPT_NAME }}</td> <td>{{ pd.SUPERVISION_DEPT_NAME }}</td>
<th>审核人员</th> <th>审核人员</th>
<td>{{ pd.SUPERVISION_USER_USERNAME }}</td> <td>{{ pd.SUPERVISION_USER_NAME }}</td>
<th>审核时间</th> <th>审核时间</th>
<td>{{ pd.SUPERVISION_TIME }}</td> <td>{{ pd.SUPERVISION_TIME }}</td>
</tr> </tr>
@ -32,7 +32,7 @@
<th>主管部门</th> <th>主管部门</th>
<td>{{ pd.MANAGER_DEPT_NAME }}</td> <td>{{ pd.MANAGER_DEPT_NAME }}</td>
<th>审核人员</th> <th>审核人员</th>
<td>{{ pd.MANAGER_USER_USERNAME }}</td> <td>{{ pd.MANAGER_USER_NAME }}</td>
<th>审核时间</th> <th>审核时间</th>
<td>{{ pd.MANAGER_TIME }}</td> <td>{{ pd.MANAGER_TIME }}</td>
</tr> </tr>
@ -40,7 +40,7 @@
<th>管理部门</th> <th>管理部门</th>
<td>{{ pd.ERRITORIALITY_DEPT_NAME }}</td> <td>{{ pd.ERRITORIALITY_DEPT_NAME }}</td>
<th>审核人员</th> <th>审核人员</th>
<td>{{ pd.ERRITORIALITY_USER_USERNAME }}</td> <td>{{ pd.ERRITORIALITY_USER_NAME }}</td>
<th>审核时间</th> <th>审核时间</th>
<td>{{ pd.TERRITORIALITY_TIME }}</td> <td>{{ pd.TERRITORIALITY_TIME }}</td>
</tr> </tr>
@ -53,33 +53,47 @@
<div class="level-title"> <div class="level-title">
<h1>申请人员列表</h1> <h1>申请人员列表</h1>
</div> </div>
<el-table ref="multipleTable" :data="userList" :header-cell-style="{'font-weight': 'bold','color': '#000'}" tooltip-effect="dark" border fit highlight-current-row> <el-table
<el-table-column type="selection" width="55" align="center" /> ref="multipleTable"
<el-table-column type="index" label="序号" width="50" align="center" /> :data="userList"
<el-table-column prop="USERNAME" label="用户名" /> :header-cell-style="{'font-weight': 'bold','color': '#000'}"
<el-table-column prop="NAME" label="姓名" /> tooltip-effect="dark"
<el-table-column prop="DEPARTMENT_NAME" label="部门" /> border
<el-table-column prop="STATUS" label="评审状态" > fit
highlight-current-row>
<el-table-column type="selection" width="55" align="center"/>
<el-table-column type="index" label="序号" width="50" align="center"/>
<el-table-column prop="USERNAME" label="用户名"/>
<el-table-column prop="NAME" label="姓名"/>
<el-table-column prop="DEPARTMENT_NAME" label="部门"/>
<el-table-column prop="STATUS" label="评审状态">
<template slot-scope="{row}"> <template slot-scope="{row}">
<span >{{ getType(row) }}</span> <span>{{ getType(row) }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" width="240"> <el-table-column label="操作" align="center" width="240">
<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 <el-button type="primary" icon="el-icon-edit" size="mini" @click="handleShow(row)">查看</el-button>
<el-button
v-if="row.STATUS === 2 && row.TRAIN_STATUS === '1' && row.SUPERVISION_STATE == 1 && row.MANAGER_STATE == 1 && row.TERRITORIALITY_STATE==1" v-if="row.STATUS === 2 && row.TRAIN_STATUS === '1' && row.SUPERVISION_STATE == 1 && row.MANAGER_STATE == 1 && row.TERRITORIALITY_STATE==1"
type="success" type="success"
icon="el-icon-edit" icon="el-icon-edit"
size="mini" size="mini"
@click="getUserInfo(row)">电子合格证 @click="getUserInfo(row)">电子合格证
</el-button> </el-button>
<el-button v-if="(row.STATUS === 0 || row.STATUS === 1) && viewState ==='1' && ((row.MANAGER_USER_ID === USER_ID && row.MANAGER_STATE === 9 && row.STEP_STATUS === '1' ) || (row.TERRITORIALITY_USER_ID === USER_ID && row.TERRITORIALITY_STATE === 9 && (row.STEP_STATUS === '0' || !row.STEP_STATUS))) && row.SUPERVISION_STATE != 0 && row.MANAGER_STATE != 0 && row.TERRITORIALITY_STATE != 0" type="success" icon="el-icon-edit" size="mini" @click="examineShow(row)">审核</el-button> <el-button
v-if="(row.STATUS === 0 || row.STATUS === 1) && viewState ==='1' && ((row.MANAGER_USER_ID === USER_ID && row.MANAGER_STATE === 9 && row.STEP_STATUS === '1' ) || (row.TERRITORIALITY_USER_ID === USER_ID && row.TERRITORIALITY_STATE === 9 && (row.STEP_STATUS === '0' || !row.STEP_STATUS))) && row.SUPERVISION_STATE != 0 && row.MANAGER_STATE != 0 && row.TERRITORIALITY_STATE != 0"
type="success"
icon="el-icon-edit"
size="mini"
@click="examineShow(row)">审核
</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<div class="page-btn-group"> <div class="page-btn-group">
<div/> <div/>
<pagination :total="total" :page.sync="listQuery.page" :limit.sync="listQuery.limit" @pagination="getUserList" /> <pagination :total="total" :page.sync="listQuery.page" :limit.sync="listQuery.limit" @pagination="getUserList"/>
</div> </div>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button @click="closeWindow">关 闭</el-button> <el-button @click="closeWindow">关 闭</el-button>
@ -144,7 +158,7 @@
<tr> <tr>
<th>民族</th> <th>民族</th>
<td>{{ userDetailForm.minzuName? userDetailForm.minzuName:'暂无信息' }}</td> <td>{{ userDetailForm.minzuName ? userDetailForm.minzuName : '暂无信息' }}</td>
<th>婚姻状况</th> <th>婚姻状况</th>
<td>{{ userDetailForm.MARITALSTATUS === '0' ? '未婚' : '已婚' }}</td> <td>{{ userDetailForm.MARITALSTATUS === '0' ? '未婚' : '已婚' }}</td>
<th>政治面貌</th> <th>政治面貌</th>
@ -156,9 +170,9 @@
<tr> <tr>
<th>户口所在地</th> <th>户口所在地</th>
<td>{{ userDetailForm.HKLOCAL? userDetailForm.HKLOCAL:'暂无信息' }}</td> <td>{{ userDetailForm.HKLOCAL ? userDetailForm.HKLOCAL : '暂无信息' }}</td>
<th>现住址</th> <th>现住址</th>
<td>{{ userDetailForm.ADDRESS? userDetailForm.ADDRESS:'暂无信息' }}</td> <td>{{ userDetailForm.ADDRESS ? userDetailForm.ADDRESS : '暂无信息' }}</td>
<th>联系电话</th> <th>联系电话</th>
<td>{{ userDetailForm.PHONE }}</td> <td>{{ userDetailForm.PHONE }}</td>
</tr> </tr>
@ -194,7 +208,7 @@
</tr> </tr>
<tr> <tr>
<th>是否参加三级安全培训</th> <th>是否参加三级安全培训</th>
<td >{{ formatLabel(userDetailForm.IS_LEVEL_THREE) }}</td> <td>{{ formatLabel(userDetailForm.IS_LEVEL_THREE) }}</td>
<th v-if="userDetailForm.IS_LEVEL_THREE == 1">三级安全培训照片</th> <th v-if="userDetailForm.IS_LEVEL_THREE == 1">三级安全培训照片</th>
<td v-if="userDetailForm.IS_LEVEL_THREE == 1 && photosOfLevel.length>0" colspan="3"> <td v-if="userDetailForm.IS_LEVEL_THREE == 1 && photosOfLevel.length>0" colspan="3">
<span> <span>
@ -214,18 +228,18 @@
</tr> </tr>
<tr> <tr>
<th>是否缴纳保险</th> <th>是否缴纳保险</th>
<td >{{ formatLabelBf(userDetailForm.IS_BF) }}</td> <td>{{ formatLabelBf(userDetailForm.IS_BF) }}</td>
<th>是否特殊工种</th> <th>是否特殊工种</th>
<td >{{ formatLabel(userDetailForm.IS_SPECIAL_JOB) }}</td> <td>{{ formatLabel(userDetailForm.IS_SPECIAL_JOB) }}</td>
<th>是否流动人员</th> <th>是否流动人员</th>
<td >{{ formatLabel(userDetailForm.ISFLOW) }}</td> <td>{{ formatLabel(userDetailForm.ISFLOW) }}</td>
</tr> </tr>
</table> </table>
<div v-if="userDetailForm.IS_SPECIAL_JOB == '1'" class="level-title"> <div v-if="userDetailForm.IS_SPECIAL_JOB == '1'" class="level-title">
<h1>特种作业人员信息</h1> <h1>特种作业人员信息</h1>
</div> </div>
<table v-for="(item,index) in specialUsersList" :key="index" class="table-ui" style="margin-bottom: 20px;" > <table v-for="(item,index) in specialUsersList" :key="index" class="table-ui" style="margin-bottom: 20px;">
<tr> <tr>
<th style="width: 150px">证书名称</th> <th style="width: 150px">证书名称</th>
<td style="width: 150px">{{ item.CERTIFICATE }}</td> <td style="width: 150px">{{ item.CERTIFICATE }}</td>
@ -261,7 +275,7 @@
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item v-if="form.IS_STATE===0" required label="审批意见"> <el-form-item v-if="form.IS_STATE===0" required label="审批意见">
<el-input v-model="form.OPINION" placeholder="这里输入审批意见..." /> <el-input v-model="form.OPINION" placeholder="这里输入审批意见..."/>
</el-form-item> </el-form-item>
</el-form> </el-form>