diff --git a/src/views/PersonManager/depart/components/edit.vue b/src/views/PersonManager/depart/components/edit.vue
index eeb39b4..4e899f9 100644
--- a/src/views/PersonManager/depart/components/edit.vue
+++ b/src/views/PersonManager/depart/components/edit.vue
@@ -60,8 +60,8 @@
{{ dataForm.MARITALSTATUS === '0' ? '未婚' : '已婚' }} |
政治面貌 |
{{ dataForm.zzName }} {{
- dataForm.zzName == '中共党员' ? '入党时间' + dataForm.POLITICAL_TIME : ''
- }}
+ dataForm.zzName == '中共党员' ? '入党时间' + dataForm.POLITICAL_TIME : ''
+ }}
|
diff --git a/src/views/train/apply/components/apply.vue b/src/views/train/apply/components/apply.vue
index 4bc6a2d..199811d 100644
--- a/src/views/train/apply/components/apply.vue
+++ b/src/views/train/apply/components/apply.vue
@@ -33,7 +33,11 @@
>
-
+
@@ -67,7 +71,11 @@
>
-
+
@@ -109,7 +117,7 @@
-
+
@@ -126,6 +134,7 @@
import { requestFN } from '@/utils/request'
import Treeselect from '@riophae/vue-treeselect'
import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+
export default {
components: {
Treeselect
@@ -142,11 +151,11 @@ export default {
loading: false,
treeData: [],
companyTreeData: [],
- corpinfo:{},
+ corpinfo: {},
userList: [],
companyUserList: [],
managercompanyUserList: [],
- jituanDanwei : '',
+ jituanDanwei: '',
jituanDanweiTreeData: [],
normalizer(node) {
return {
@@ -179,13 +188,12 @@ export default {
* 根据集团单位 找到 对应的 企业id
*/
await this.getCorpinfo()
-
},
- getCorpinfo(){
+ getCorpinfo() {
requestFN(
'/corpinfo/getDataForEditByCorpInfoId',
{
- CORPINFO_ID: JSON.parse(sessionStorage.getItem('user')).CORPINFO_ID,
+ CORPINFO_ID: JSON.parse(sessionStorage.getItem('user')).CORPINFO_ID,
tm: new Date().getTime()
}
).then((data) => {
@@ -195,16 +203,16 @@ export default {
// 河港检测 jtdw004 020578a4c1f04bc692ee25145c2efbe5
// 方宇物业 jtdw005 90966974de3c4b83aca6f8fd6432d5c2
- if (data.pd.CORP_TYPE =='jtdw002'){
- this.jituanDanwei = '1e6dbbe16004402f8d2c0e52afd9a676'
+ if (data.pd.CORP_TYPE == 'jtdw002') {
+ this.jituanDanwei = '1e6dbbe16004402f8d2c0e52afd9a676'
}
- if (data.pd.CORP_TYPE =='jtdw003'){
+ if (data.pd.CORP_TYPE == 'jtdw003') {
this.jituanDanwei = '3a854eefa7894e06aaa1a2611bca80f6'
}
- if (data.pd.CORP_TYPE =='jtdw004'){
+ if (data.pd.CORP_TYPE == 'jtdw004') {
this.jituanDanwei = '020578a4c1f04bc692ee25145c2efbe5'
}
- if (data.pd.CORP_TYPE =='jtdw005'){
+ if (data.pd.CORP_TYPE == 'jtdw005') {
this.jituanDanwei = '90966974de3c4b83aca6f8fd6432d5c2'
}
this.getTreeData()
@@ -223,18 +231,10 @@ export default {
this.getRegulatoryUserList(this.form.SUPERVISION)
this.getmanagerUserList(this.corpinfo.MAIN_DEPARTMENT)
}).catch((e) => {
+ console.log(e)
})
- // if(this.corpinfo.MAIN_DEPARTMENT){ fcb67bc02de54a0abd18e91f29dd4690
- // requestFN(
- // '/regulatoryApi/department/listTree',
- // { CORPINFO_ID: this.corpinfo.MAIN_DEPARTMENT }
- // ).then((data) => {
- // this.companyTreeData = JSON.parse(data.zTreeNodes)
- // }).catch((e) => {
- // })
- // }
- if (this.jituanDanwei){
+ if (this.jituanDanwei) {
requestFN(
'/companyApi/department/listTree',
{ CORPINFO_ID: this.jituanDanwei }
@@ -272,7 +272,7 @@ export default {
requestFN(
'/regulatoryApi/user/listAll',
{
- DEPARTMENT_ID: DEPARTMENT_ID,
+ DEPARTMENT_ID: DEPARTMENT_ID
}
).then((data) => {
this.managercompanyUserList = data.userList
diff --git a/src/views/train/apply/components/list.vue b/src/views/train/apply/components/list.vue
index 5af7c69..df80853 100644
--- a/src/views/train/apply/components/list.vue
+++ b/src/views/train/apply/components/list.vue
@@ -10,7 +10,7 @@
-
+
@@ -26,17 +26,19 @@
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
未培训
@@ -55,7 +57,13 @@
详情
- 电子合格证
+ 电子合格证
+
@@ -64,7 +72,7 @@
培训申请
申请记录
-
+
@@ -152,26 +160,6 @@
岗位名称(工种) |
{{ userDetailForm.POST_ID }} |
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
是否缴纳社保 |
{{ formatLabel(userDetailForm.IS_SOCIAL) }} |
@@ -193,24 +181,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
是否参加三级安全培训 |
@@ -232,67 +202,27 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
是否缴纳保险 |
- {{ formatLabel(userDetailForm.IS_BF) }} |
+ {{ formatLabel(userDetailForm.IS_BF) }} |
是否特殊工种 |
- {{ formatLabel(userDetailForm.IS_SPECIAL_JOB) }} |
+ {{ formatLabel(userDetailForm.IS_SPECIAL_JOB) }} |
是否流动人员 |
- {{ formatLabel(userDetailForm.ISFLOW) }} |
+ {{ formatLabel(userDetailForm.ISFLOW) }} |
-
-
-
-
培训记录
-
-
-
+
+
+
@@ -303,14 +233,10 @@
-
-
-
-
特种作业人员信息
-
+
证书名称 |
{{ item.CERTIFICATE }} |
@@ -330,24 +256,32 @@
{{ item.REVIEW_TIME }} |
有效期 |
{{ item.VALIDITY_TIME_START }} 至 {{ item.VALIDITY_TIME_END }} |
-
-
-
-
+
打回信息
-
+
打回人 |
{{ detailForm.SUPERVISION_USER_NAME }} |
{{ detailForm.MANAGER_USER_NAME }} |
- {{ detailForm.TERRITORIALITY_USER_NAME }} |
+
+ {{ detailForm.TERRITORIALITY_USER_NAME }}
+ |
打回原由 |
{{ detailForm.SUPERVISION_OPINION }} |
{{ detailForm.MANAGER_OPINION }} |
- {{ detailForm.TERRITORIALITY_OPINION }} |
+
+ {{ detailForm.TERRITORIALITY_OPINION }}
+ |