增加监理人员页面

src/api/pro/supervisor-person-manage.js

@@ -0,0 +1,19 @@
+import request from '@/utils/request'
+
+// 人员入场查询列表
+export function listAdmissionRequest(query) {
+  return request({
+    url: '/project/admissionRequest/list',
+    method: 'get',
+    params: query,
+  })
+}
+
+// 人员信息列表查询
+export function listPersonnelInformation(query) {
+  return request({
+    url: '/project/admissionRequest/listPersonnelInformation',
+    method: 'get',
+    params: query,
+  })
+}

src/components/pro-tabs/bns-timeline-tabs.vue

@@ -7,7 +7,7 @@
         v-if="!items"
         style="position: absolute; top: 30%; left: 43%"
       />
-      <div style="height: 90%" v-else>
+      <div style="height: 90%" v-else-if="btnShow">
         <el-timeline :reverse="reverse">
           <el-timeline-item
             v-for="(item, index) in auditRecordList"
@@ -52,6 +52,23 @@
           <el-button type="primary" plain @click="turnDownBtn">驳回</el-button>
         </div>
       </div>
+
+      <el-table v-else :data="auditRecordList">
+        <el-table-column align="center" label="审批部门" prop="section" />
+        <el-table-column align="center" label="审批人" prop="name" />
+        <el-table-column align="center" label="审批时间" prop="time" />
+        <el-table-column align="center" label="审批状态" prop="status" />
+        <el-table-column align="center" label="审批意见">
+          <template slot-scope="{ row }">
+            {{ row.reason.replaceAll(/@@/g, ' ') || '--' }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="驳回原因">
+          <template slot-scope="{ row }">
+            {{ row.turnDownReason || '--' }}
+          </template>
+        </el-table-column>
+      </el-table>
       <el-dialog title="驳回原因" :visible.sync="dialogVisible" width="30%" :close-on-click-modal="false">
         <el-form :model="form" ref="form" :rules="rules" label-width="80px">
           <el-form-item label="请输入驳回原因" label-width="120px" prop="turnDownReason">

src/views/pro/supervisorPersonManage/index.vue

@@ -43,18 +43,17 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="deviceInformation" @selection-change="handleSelectionChange" border>
+    <el-table :data="supervisorList">
-      <el-table-column type="selection" width="55" align="center" />
       <el-table-column
+        label="序号"
         type="index"
         width="55"
-        label="序号"
         align="center"
         :index="indexContinuous(queryParams.pageNum, queryParams.pageSize)"
+        border
       />
-      <el-table-column label="姓名" show-overflow-tooltip width="150" align="center" prop="consName" />
+      <el-table-column label="姓名" align="center" prop="name" />
-      <el-table-column label="岗位" width="150" align="center" prop="post" />
+      <el-table-column label="岗位" align="center" prop="postName" />
-      <el-table-column label="特殊工种种类" width="150" align="center" prop="workType" />
       <el-table-column label="体检文件" width="100" align="center">
         <template slot-scope="scope">
           <el-button size="mini" @click="handleShow(scope.row, 1)">查看</el-button>
@@ -65,19 +64,13 @@
           <el-button size="mini" @click="handleShow(scope.row, 2)">查看</el-button>
         </template>
       </el-table-column>
-      <el-table-column label="特殊工种文件" width="100" align="center">
-        <template slot-scope="scope">
-          <el-button size="mini" @click="handleShow(scope.row, 3)">查看</el-button>
-        </template>
-      </el-table-column>
       <el-table-column label="其他文件" width="100" align="center">
         <template slot-scope="scope">
           <el-button size="mini" @click="handleShow(scope.row, 4)">查看</el-button>
         </template>
       </el-table-column>
-
+      <el-table-column label="性别" align="center" prop="sex" />
-      <el-table-column label="性别" width="60" align="center" prop="sex" />
+      <el-table-column label="年龄" align="center" prop="age" />
-      <el-table-column label="年龄" width="60" align="center" prop="age" />
       <el-table-column label="联系方式" width="120" align="center">
         <template slot-scope="scope">
           <!-- 检查是否存在身份证号 -->
@@ -85,89 +78,29 @@
           <span v-else>-</span>
         </template>
       </el-table-column>
-      <el-table-column label="籍贯" show-overflow-tooltip width="150" align="center" prop="natives" />
-      <el-table-column label="身份证号码" width="160" align="center">
-        <template slot-scope="scope">
-          <!-- 检查是否存在身份证号 -->
-          <span v-if="scope.row.idCard">{{ hideSensitiveInfo(scope.row.idCard) }}</span>
-          <span v-else>-</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="民族" width="60" align="center" prop="nation" />
-      <el-table-column label="家庭住址" show-overflow-tooltip width="150" align="center" prop="homeAddress" />
-      <el-table-column label="现住址" show-overflow-tooltip width="150" align="center" prop="address" />
       <el-table-column label="人脸照片" align="center" prop="faceUrl">
         <template slot-scope="scope">
           <el-popover placement="right" title="" trigger="hover">
             <img
-              :src="`${scope.row.facePath ? lookFaceFile + scope.row.facePath : ''}`"
+              :src="`${scope.row.faceUrl ? lookFaceFile + scope.row.faceUrl : ''}`"
               :min-width="300"
               :height="300"
               alt="照片"
             />
             <img
               slot="reference"
-              :src="`${scope.row.facePath ? lookFaceFile + scope.row.facePath : ''}`"
+              :src="`${scope.row.faceUrl ? lookFaceFile + scope.row.faceUrl : ''}`"
               style="max-height: 50px; max-width: 50px"
-              :alt="`${scope.row.facePath ? lookFaceFile + scope.row.facePath : ''}`"
+              :alt="`${scope.row.faceUrl ? lookFaceFile + scope.row.faceUrl : ''}`"
             />
           </el-popover>
         </template>
       </el-table-column>
-      <el-table-column label="审批状态" align="center" prop="intoStatus">
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
-          <!-- 检查是否存在身份证号 -->
+          <el-button size="mini" type="text" @click="onHandleAudit(scope.row)">提交审核</el-button>
-          <span v-if="scope.row.intoStatus">{{ updateStatus(scope.row.intoStatus) }}</span>
+          <el-button size="mini" type="text" @click="handleEdit(scope.row)">编辑</el-button>
-          <span v-else>-</span>
+          <el-button size="mini" type="text" @click="handleDel(scope.row)">删除</el-button>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" fixed="right" width="200" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button
-            v-if="scope.row.intoStatus == '0'"
-            size="mini"
-            type="text"
-            @click="handleSubmit(scope.row)"
-            v-hasPermi="['system:addPersonnel:query']"
-          >
-            提交审核
-          </el-button>
-          <el-button
-            v-if="scope.row.intoStatus == '3' || scope.row.intoStatus == '2'"
-            size="mini"
-            type="text"
-            @click="handleView(scope.row)"
-            v-hasPermi="['system:addPersonnel:query']"
-          >
-            查看
-          </el-button>
-          <el-button
-            v-if="scope.row.intoStatus == '0' || scope.row.intoStatus == '4' || scope.row.intoStatus == '5'"
-            size="mini"
-            type="text"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['system:addPersonnel:query']"
-          >
-            编辑
-          </el-button>
-          <el-button
-            v-if="scope.row.intoStatus == '1'"
-            size="mini"
-            type="text"
-            @click="retractApproval(scope.row)"
-            v-hasPermi="['system:addPersonnel:query']"
-          >
-            撤回
-          </el-button>
-          <el-button
-            size="mini"
-            type="text"
-            @click="auditRecord(scope.row)"
-            :style="{ color: '#f59a24' }"
-            v-hasPermi="['system:audit:query']"
-          >
-            审核记录
-          </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -435,6 +368,7 @@
 
 <script>
 import { getParams, hideSensitiveInfo, indexContinuous, lookFaceFile } from '@/utils/bonus'
+
 import { dictTableOption, downloadFile, getTemplateLink, selectFile } from '@/api/tool/select'
 import { listAdmissionRequest, submitApproval } from '@/api/pro/admissionRequest'
 import store from '../../../store'
@@ -448,7 +382,7 @@ import BnsFileListTabs from '@/components/pro-tabs/bns-file-list-tabs.vue'
 import bnsKkFilePreview from '@/components/pro-tabs/bns-kkFile-preview.vue'
 import debounce from 'lodash/debounce'
 
-import { listSupervisor } from '@/api/pro/outsourcingPro'
+import { listSupervisor, listSupervisorPerson } from '@/api/pro/outsourcingPro'
 
 export default {
   name: 'Post',
@@ -471,7 +405,7 @@ export default {
       // 总条数
       total: 0,
       // 岗位表格数据
-      deviceInformation: [],
+      supervisorList: [],
       // 日期范围
       dateRange: [],
       // 弹出层标题
@@ -615,9 +549,10 @@ export default {
       this.queryParams.proId = this.$store.state.user.thisIds.proId
       this.queryParams.contUuid = this.$store.state.user.thisIds.consUuid
       this.queryParams.subUuid = this.$store.state.user.thisIds.subUuid
-      this.queryParams.userType = this.$store.state.user.userType
+      // this.queryParams.userType = this.$store.state.user.userType
-      listSupervisor(this.queryParams).then(response => {
+      listSupervisorPerson(this.queryParams).then(response => {
-        this.deviceInformation = response.rows
+        console.log(response, 'response')
+        this.supervisorList = response.rows
         this.total = response.total
         this.loading = false
       })
@@ -1073,6 +1008,11 @@ export default {
       this.excelData = []
       this.active = 1
     },
+
+    // 提交审核
+    onHandleAudit(row) {
+      console.log(row, '行信息')
+    },
   },
 }
 </script>