liux
/
nxdt-web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
liang.chao 2025-02-13 18:29:51 +08:00
parent 5ecd807748 1b8cad613b
commit a0e56c5024
1 changed files with 19 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
src/views/pro/apply/supervisorEnterApply.vue
View File

@ -1,13 +1,7 @@
<!--监理入场申请页面--> <!--监理入场申请页面-->
<template> <template>
<el-container> <el-container>
<el-form <el-form ref="elForm" :model="formData" :rules="rule" label-width="100px" style="height: 82vh;overflow: auto;width: 100%;">
ref="elForm"
:model="formData"
:rules="rule"
label-width="100px"
style="height: 82vh; overflow: auto; width: 100%"
>
<el-main> <el-main>
<el-tabs v-model="activeName"> <el-tabs v-model="activeName">
<el-tab-pane label="监理单位信息" name="first"> <el-tab-pane label="监理单位信息" name="first">
@ -37,40 +31,34 @@
size="mini" size="mini"
v-if="this.paramsData.type !== 'view'" v-if="this.paramsData.type !== 'view'"
@click="handleAdd" @click="handleAdd"
> >新增
新增
</el-button> </el-button>
<el-button type="primary" plain icon="el-icon-upload" size="mini" @click="handlePersonImport"> <el-button type="primary" plain icon="el-icon-upload" size="mini" @click="handlePersonImport">
基础数据上传 基础数据上传
</el-button> </el-button>
<el-button type="primary" plain icon="el-icon-upload" size="mini" @click="handleFileImport"> <el-button type="primary" plain icon="el-icon-upload" size="mini" @click="handleFileImport">文件上传
文件上传
</el-button> </el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-table v-loading="loading" :data="supervisorList"> <el-table v-loading="loading" :data="supervisorList">
<el-table-column <el-table-column label="序号" type="index" width="55" align="center"
label="序号"
type="index"
width="55"
align="center"
:index="indexContinuous(queryParams.pageNum, queryParams.pageSize)" :index="indexContinuous(queryParams.pageNum, queryParams.pageSize)"
/> />
<el-table-column label="姓名" align="center" prop="name" /> <el-table-column label="姓名" align="center" prop="name" />
<el-table-column label="岗位" align="center" prop="postName" /> <el-table-column label="岗位" align="center" prop="postName" />
<el-table-column label="体检文件" width="100" align="center"> <el-table-column label="体检文件" width="100" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button size="mini" @click="handleShow(scope.row, 1)">查看</el-button> <el-button size="mini" @click="handleShow(scope.row,1)">查看</el-button>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="保险文件" width="100" align="center"> <el-table-column label="保险文件" width="100" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button size="mini" @click="handleShow(scope.row, 2)">查看</el-button> <el-button size="mini" @click="handleShow(scope.row,2)">查看</el-button>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="其他文件" width="100" align="center"> <el-table-column label="其他文件" width="100" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button size="mini" @click="handleShow(scope.row, 4)">查看</el-button> <el-button size="mini" @click="handleShow(scope.row,4)">查看</el-button>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="性别" align="center" prop="sex" /> <el-table-column label="性别" align="center" prop="sex" />
@ -85,25 +73,15 @@
<el-table-column label="人脸照片" align="center" prop="faceUrl"> <el-table-column label="人脸照片" align="center" prop="faceUrl">
<template slot-scope="scope"> <template slot-scope="scope">
<el-popover placement="right" title="" trigger="hover"> <el-popover placement="right" title="" trigger="hover">
<img <img :src="`${scope.row.faceUrl ? lookFaceFile+scope.row.faceUrl : ''}`" :min-width="300" :height="300" alt="照片" />
:src="`${scope.row.faceUrl ? lookFaceFile + scope.row.faceUrl : ''}`" <img slot="reference" :src="`${scope.row.faceUrl ? lookFaceFile+scope.row.faceUrl : ''}`"
:min-width="300"
:height="300"
alt="照片"
/>
<img
slot="reference"
:src="`${scope.row.faceUrl ? lookFaceFile + scope.row.faceUrl : ''}`"
style="max-height: 50px; max-width: 50px" style="max-height: 50px; max-width: 50px"
:alt="`${scope.row.faceUrl ? lookFaceFile + scope.row.faceUrl : ''}`" :alt="`${scope.row.faceUrl ? lookFaceFile+scope.row.faceUrl : ''}`"
/> />
</el-popover> </el-popover>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column label="操作" align="center" class-name="small-padding fixed-width"
label="操作"
align="center"
class-name="small-padding fixed-width"
v-if="this.paramsData.type !== 'view'" v-if="this.paramsData.type !== 'view'"
> >
<template slot-scope="scope"> <template slot-scope="scope">
@ -134,12 +112,12 @@
/> />
<el-dialog title="文件查看" :visible.sync="document" width="80%" top="5vh" append-to-body> <el-dialog title="文件查看" :visible.sync="document" width="80%" top="5vh" append-to-body>
<div style="width: 100%; height: 720px"> <div style="width: 100%;height:720px">
<bns-file-list-tabs :items="fileList" /> <bns-file-list-tabs :items="fileList" />
</div> </div>
</el-dialog> </el-dialog>
<el-dialog title="文件查看" :visible.sync="documentPreview" width="80%" top="5vh" append-to-body> <el-dialog title="文件查看" :visible.sync="documentPreview" width="80%" top="5vh" append-to-body>
<div style="width: 100%; height: 720px"> <div style="width: 100%;height:720px">
<bns-kkFile-preview :items="kkFilePreview"></bns-kkFile-preview> <bns-kkFile-preview :items="kkFilePreview"></bns-kkFile-preview>
</div> </div>
</el-dialog> </el-dialog>
@ -1003,7 +981,8 @@ export default {
...this.getParams(), ...this.getParams(),
taskType: '1', taskType: '1',
taskId: this.paramsData.type === 'edit' ? this.paramsData.taskId : '', taskId: this.paramsData.type === 'edit' ? this.paramsData.taskId : '',
uuid: this.$store.state.user.thisIds.uuid, uuid: this.$store.state.user.thisIds.uuid
} }
console.log('param=' + JSON.stringify(param)) console.log('param=' + JSON.stringify(param))
submitApproval(param).then(response => { submitApproval(param).then(response => {
@ -1027,7 +1006,7 @@ export default {
submitPersonForm() { submitPersonForm() {
this.loading = true this.loading = true
this.$refs.form.validate(valid => { this.$refs.form.validate((valid) => {
if (valid) { if (valid) {
console.log(this.form) console.log(this.form)
const reqData = new FormData() const reqData = new FormData()