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

Merge branch 'dev' into yhkp

main
dearlin 2023-11-14 17:12:06 +08:00
parent ca915c44f0 fecc7ab4b9
commit 5be33476e6
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/views/keyprojects/outsourced/components/list.vue
View File

@ -130,7 +130,12 @@
<span v-else>{{ row.DEPARTMENT_NAME }}</span> <span v-else>{{ row.DEPARTMENT_NAME }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="MANAGE_CORPS_NAME" label="监理单位" show-overflow-tooltip /> <el-table-column label="监理单位" show-overflow-tooltip >
<template slot-scope="{row}">
<span v-if="row.MANAGE_CORPS_NAME"> {{ row.MANAGE_CORPS_NAME }} </span>
<span v-else>无</span>
</template>
</el-table-column>
<el-table-column prop="STATE" label="状态" width="100" > <el-table-column prop="STATE" label="状态" width="100" >
<template slot-scope="{row}"> <template slot-scope="{row}">
<span v-if="row.STATE == 1">进行中</span> <span v-if="row.STATE == 1">进行中</span>

8
src/views/keyprojects/personnelmanagement/index.vue
View File

@ -66,12 +66,12 @@
</template> </template>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="JOBTYPE" label="作业类别" /> <!--<el-table-column prop="JOBTYPE" label="作业类别" />
<el-table-column prop="OPERATIONITEM" label="操作项目" /> <el-table-column prop="OPERATIONITEM" label="操作项目" />-->
<el-table-column prop="NAME" label="姓名" width="100" /> <el-table-column prop="NAME" label="姓名" width="100" />
<el-table-column prop="SEX" label="性别" width="50" /> <!--<el-table-column prop="SEX" label="性别" width="50" />
<el-table-column prop="CERTIFICATE_NUM" label="作业证书编号" /> <el-table-column prop="CERTIFICATE_NUM" label="作业证书编号" />
<el-table-column prop="REVIEWTIME" label="复审时间" width="120" /> <el-table-column prop="REVIEWTIME" label="复审时间" width="120" />-->
<el-table-column label="操作" align="left" width="400"> <el-table-column label="操作" align="left" width="400">
<template slot-scope="{row}"> <template slot-scope="{row}">
<el-button v-show="edit" type="success" icon="el-icon-edit" size="mini" @click="resetPwd(row.PERSONNELMANAGEMENT_ID,row.NAME)">重置密码</el-button> <el-button v-show="edit" type="success" icon="el-icon-edit" size="mini" @click="resetPwd(row.PERSONNELMANAGEMENT_ID,row.NAME)">重置密码</el-button>

2
src/views/keyprojects/units/components/list.vue
View File

@ -48,7 +48,7 @@
align="center"/> align="center"/>
<el-table-column type="index" label="序号" width="50" align="center" /> <el-table-column type="index" label="序号" width="50" align="center" />
<el-table-column prop="UNITS_NAME" label="相关方单位名称" show-overflow-tooltip /> <el-table-column prop="UNITS_NAME" label="相关方单位名称" show-overflow-tooltip />
<el-table-column prop="CODE" label="统一社会信用代码" width="200" /> <!--<el-table-column prop="CODE" label="统一社会信用代码" width="200" />-->
<el-table-column prop="CONTACTS" label="联系人" width="150" show-overflow-tooltip /> <el-table-column prop="CONTACTS" label="联系人" width="150" show-overflow-tooltip />
<el-table-column prop="CONTACTS_PHONE" label="联系人电话" width="100" /> <el-table-column prop="CONTACTS_PHONE" label="联系人电话" width="100" />
<el-table-column prop="CORP_NAME" label="创建单位" show-overflow-tooltip /> <el-table-column prop="CORP_NAME" label="创建单位" show-overflow-tooltip />