From e16707ff7627f9f1a3491b6e60719ef1740d8a4c Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Fri, 10 Sep 2021 17:25:34 +0800
Subject: [PATCH] 保安员管理详情内部修改
---
src/api/register/honor.js | 4
src/views/management/peopleDetails.vue | 162 +-----------------------------------------------------
src/views/management/computents/train.vue | 4
3 files changed, 7 insertions(+), 163 deletions(-)
diff --git a/src/api/register/honor.js b/src/api/register/honor.js
index 4c7fec7..c7c328a 100644
--- a/src/api/register/honor.js
+++ b/src/api/register/honor.js
@@ -47,7 +47,7 @@
}
})
}
-export const getLispertrain = (current, size, params, idCardNo) => {
+export const getLispertrain = (current, size, params, userId) => {
return request({
url: '/api/trainingRegistration/page',
method: 'get',
@@ -55,7 +55,7 @@
...params,
current,
size,
- idCardNo
+ userId
}
})
}
diff --git a/src/views/management/computents/train.vue b/src/views/management/computents/train.vue
index 864f826..4f2d8c8 100644
--- a/src/views/management/computents/train.vue
+++ b/src/views/management/computents/train.vue
@@ -128,7 +128,7 @@
page.currentPage,
page.pageSize,
Object.assign(params, this.serviceQuery),
- this.form.cardid
+ this.form.id
).then((res) => {
const data = res.data.data;
@@ -137,7 +137,7 @@
for (var k in this.serviceData) {
this.serviceData[k]["name"] = this.form.realName;
}
- console.log(this.serviceData, "serviceData");
+ // console.log(this.serviceData, "serviceData");
this.serviceLoading = false;
this.$refs.serviceCrud.refreshTable();
this.$refs.serviceCrud.doLayout();
diff --git a/src/views/management/peopleDetails.vue b/src/views/management/peopleDetails.vue
index 4a429ad..6a94116 100644
--- a/src/views/management/peopleDetails.vue
+++ b/src/views/management/peopleDetails.vue
@@ -1,8 +1,8 @@
/*
* @Author: Morpheus
* @Date: 2021-07-05 16:31:54
- * @Last Modified by: Morpheus
- * @Last Modified time: 2021-07-10 16:16:26
+ * @Last Modified by: liu
+ * @Last Modified time: 2021-09-10 16:56:14
* menu-name 保安详细资料
*/
<template>
@@ -168,174 +168,18 @@
</el-tab-pane>
<el-tab-pane label="现实表现" name="second">
<performance :form="form"></performance>
- <!-- <el-table :data="manifestationData" style="width: 100%">
- <el-table-column prop="name" label="姓名" align="center">
- </el-table-column>
-
- <el-table-column
- prop="securityid"
- label="身份证号"
- align="center"
- >
- </el-table-column>
-
- <el-table-column
- prop="workingattitude"
- align="center"
- label="工作态度"
- >
- </el-table-column>
-
- <el-table-column
- prop="workingability"
- align="center"
- label="工作能力"
- >
- </el-table-column>
-
- <el-table-column
- prop="achievements"
- align="center"
- label="工作成效"
- >
- </el-table-column>
-
- <el-table-column prop="score" align="center" label="评分">
- </el-table-column>
-
- <el-table-column prop="time" align="center" label="时间">
- </el-table-column>
- </el-table> -->
</el-tab-pane>
<el-tab-pane label="派遣记录" name="third">
<dispatch :form="form"></dispatch>
- <!-- <el-table :data="dispatchData" style="width: 100%">
- <el-table-column prop="name" label="姓名" align="center">
- </el-table-column>
-
- <el-table-column prop="cardid" label="身份证号" align="center">
- </el-table-column>
-
- <el-table-column
- prop="dispatcher"
- align="center"
- label="派遣人"
- >
- </el-table-column>
-
- <el-table-column
- prop="dispatchertime"
- align="center"
- label="派遣时间"
- >
- </el-table-column>
-
- <el-table-column
- prop="dispatcheraddress"
- align="center"
- label="派遣地址"
- >
- </el-table-column>
- </el-table> -->
</el-tab-pane>
<el-tab-pane label="获取荣誉" name="fourth">
<honor :form="form"></honor>
- <!-- <el-table :data="honorchData" style="width: 100%">
- <el-table-column prop="name" label="姓名" align="center">
- </el-table-column>
-
- <el-table-column prop="cardid" label="身份证号" align="center">
- </el-table-column>
-
- <el-table-column prop="honor" align="center" label="荣誉">
- </el-table-column>
-
- <el-table-column
- prop="honortime"
- align="center"
- label="获取时间"
- >
- </el-table-column>
- </el-table> -->
</el-tab-pane>
<el-tab-pane label="培训相关" name="fifth">
<train :form="form"></train>
- <!-- <el-table :data="trainData" style="width: 100%">
- <el-table-column prop="rname" label="姓名" align="center">
- </el-table-column>
-
- <el-table-column prop="sex" label="性别" align="center">
- </el-table-column>
-
- <el-table-column prop="cardid" label="身份证号" align="center">
- </el-table-column>
-
- <el-table-column prop="train" align="center" label="培训单位">
- </el-table-column>
-
- <el-table-column
- prop="traincontent"
- align="center"
- label="培训内容"
- >
- </el-table-column>
-
- <el-table-column
- prop="traintime"
- align="center"
- label="培训时间"
- >
- </el-table-column>
-
- <el-table-column
- prop="trainaddrss"
- align="center"
- label="培训地址"
- >
- </el-table-column>
- </el-table> -->
</el-tab-pane>
<el-tab-pane label="成绩相关" name="sixth">
<achievement :form="form"></achievement>
- <!-- <el-table :data="examinationData" style="width: 100%">
- <el-table-column prop="rname" label="姓名" align="center">
- </el-table-column>
-
- <el-table-column
- prop="examinationbegintime"
- label="考试开始时间"
- align="center"
- >
- </el-table-column>
-
- <el-table-column
- prop="examinationendtime"
- label="开始结束时间"
- align="center"
- >
- </el-table-column>
-
- <el-table-column
- prop="examinationtype"
- align="center"
- label="考试类别"
- >
- </el-table-column>
-
- <el-table-column
- prop="examinationc"
- align="center"
- label="考试成绩"
- >
- </el-table-column>
-
- <el-table-column
- prop="examinationaddress"
- align="center"
- label="考试地点"
- >
- </el-table-column>
- </el-table> -->
</el-tab-pane>
</el-tabs>
</div>
@@ -383,7 +227,7 @@
ind = null;
this.$store.state.tags.tagList.forEach((item, index) => {
- if (item.label == "保安详细资料") {
+ if (item.label == "保安详细信息") {
if (flag == false) {
ind = index;
flag = true;
--
Gitblit v1.9.3