From 5253c8bd5ecd2fecd8fefe6b7c7728e3058db5d3 Mon Sep 17 00:00:00 2001
From: 孔祥富 <kongxf@daryun.com>
Date: 星期一, 15 三月 2021 15:36:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/user/selectuser.vue | 2 +-
src/views/yunpan/fujian.vue | 23 +++++++++++++++--------
src/views/user/inemployees.vue | 19 +++++++++++++++++--
src/views/febs/system/user/Index.vue | 2 +-
4 files changed, 34 insertions(+), 12 deletions(-)
diff --git a/src/views/febs/system/user/Index.vue b/src/views/febs/system/user/Index.vue
index 2f11bc5..fa23deb 100644
--- a/src/views/febs/system/user/Index.vue
+++ b/src/views/febs/system/user/Index.vue
@@ -75,7 +75,7 @@
<el-table-column label="部门(护卫点)" align="center" min-width="100px">
<template slot-scope="scope">
- <span>{{ scope.row.deptName }}</span>
+ <span>{{ scope.row.allDeptName }}</span>
</template>
</el-table-column>
<el-table-column :label="$t('table.user.username')" prop="username" :show-overflow-tooltip="true" align="center" min-width="120px">
diff --git a/src/views/user/inemployees.vue b/src/views/user/inemployees.vue
index 719dda3..2b0f65b 100644
--- a/src/views/user/inemployees.vue
+++ b/src/views/user/inemployees.vue
@@ -978,7 +978,20 @@
empStatus: 0,
version: ''
},
- ygdgForm: {},
+ ygdgForm: {
+ empIds: [],
+ empNames: [],
+ oldDeptNames: [],
+ oldJobNames: [],
+ changeType: '',
+ changeDate: '',
+ changeReason: '',
+ jobId: '',
+ newJobName: '',
+ deptId: '',
+ newDeptName: '',
+ allDeptName: ''
+ },
gbdaForm: {
dgryIds: '',
dimissionType: 1,
@@ -1670,7 +1683,7 @@
var data = selection[i]
ids.push(data.empId)
names.push(data.empName)
- deptNames.push(data.deptName)
+ deptNames.push(data.allDeptName)
jobNames.push(data.jobName)
}
this.ygdgForm = {
@@ -1720,7 +1733,9 @@
this.empBaseInfoForm.nativePlace = item.code
},
deptNameSelect(node) {
+ this.ygdgForm.deptId = node.deptId
this.ygdgForm.newDeptName = node.label
+ this.ygdgForm.allDeptName = node.allDeptName
},
querySearchJob(queryString, cb) {
const restaurants = this.restaurJob
diff --git a/src/views/user/selectuser.vue b/src/views/user/selectuser.vue
index d6d934b..6871d56 100644
--- a/src/views/user/selectuser.vue
+++ b/src/views/user/selectuser.vue
@@ -46,7 +46,7 @@
<el-table-column v-if="show" show-overflow-tooltip prop="empId" label="员工Id" />
<el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="80" />
<el-table-column show-overflow-tooltip prop="empName" label="姓名" width="110" />
- <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" width="120" />
+ <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" min-width="120" />
<el-table-column v-if="show" show-overflow-tooltip prop="deptId" label="部门Id" width="60" />
<el-table-column show-overflow-tooltip prop="allDeptName" label="部门(护卫点)" width="400" sortable="custom" :sort-orders="['ascending', 'descending']" />
<el-table-column v-if="show" show-overflow-tooltip prop="jobId" label="岗位Id" width="80" />
diff --git a/src/views/yunpan/fujian.vue b/src/views/yunpan/fujian.vue
index 9d61551..c1f7729 100644
--- a/src/views/yunpan/fujian.vue
+++ b/src/views/yunpan/fujian.vue
@@ -13,18 +13,18 @@
</el-col>
</el-row>
<el-form v-show="advancedQueryShow" ref="queryform" :model="queryform">
- <el-row>
- <el-col :span="3">员工编号：
- <el-input v-model="queryform.empNumb" size="small" maxlength="20" style="width:85px" />
+ <el-row style="margin: 10px 0px;">
+ <el-col :span="4">员工编号：
+ <el-input v-model="queryform.empNumb" size="small" maxlength="20" style="width:140px" />
</el-col>
- <el-col :span="3">姓名：
- <el-input v-model="queryform.empName" size="small" maxlength="10" style="width:110px" />
+ <el-col :span="4">姓名：
+ <el-input v-model="queryform.empName" size="small" maxlength="10" style="width:140px" />
</el-col>
<el-col :span="4">身份证号：
<el-input v-model="queryform.certificateNumb" size="small" maxlength="18" style="width:140px" />
</el-col>
- <el-col :span="3">护卫点：
- <el-input v-model="queryform.deptName" size="small" maxlength="20" style="width:100px" />
+ <el-col :span="4">护卫点：
+ <el-input v-model="queryform.deptName" size="small" maxlength="20" style="width:140px" />
</el-col>
<el-col :span="8">入职日期：
<el-date-picker
@@ -40,7 +40,13 @@
:picker-options="pickerOptions"
/>
</el-col>
- <el-col :span="3">
+ </el-row>
+ <el-row>
+ <el-col :span="20">
+ 文件名:
+ <el-input v-model="queryform.fileName" size="small" maxlength="20" style="width:140px" />
+ </el-col>
+ <el-col :span="4">
<el-button size="mini" class="hr-but-all" type="primary" @click="findEmpAccessoryAll()">查询</el-button>
<el-button size="mini" class="hr-but" type="danger" @click="resetQueryform()">重置</el-button>
</el-col>
@@ -634,6 +640,7 @@
certificateNumb: '',
deptName: '',
entryDate: '',
+ fileName: '',
sex: [],
education: [],
politics: [],
--
Gitblit v1.8.0