From b99720f014aa025e11c92da75037f8398a887de6 Mon Sep 17 00:00:00 2001
From: yz_08 <yz_0812@outlook.com>
Date: 星期三, 10 三月 2021 11:53:11 +0800
Subject: [PATCH] 修改属性名
---
src/views/dashboard/qjUser.vue | 4 ++--
src/views/dashboard/ywUser.vue | 2 +-
src/views/user/archivesChange.vue | 2 +-
src/views/febs/system/job/Index.vue | 4 ++--
vue.config.js | 5 ++---
src/views/dashboard/cqUser.vue | 4 ++--
src/views/user/inemployees.vue | 2 +-
src/views/febs/system/job/PositionEdit.vue | 2 +-
src/views/dashboard/sbUser.vue | 2 +-
src/views/dashboard/tgUser.vue | 4 ++--
src/views/user/search.vue | 4 ++--
src/views/dashboard/yjUser.vue | 2 +-
src/views/febs/system/user/Edit.vue | 2 +-
src/views/user/archivesEdit.vue | 2 +-
src/views/febs/system/user/Index.vue | 2 +-
src/views/user/Informationinput.vue | 10 +++++-----
src/views/dashboard/tjUser.vue | 2 +-
17 files changed, 27 insertions(+), 28 deletions(-)
diff --git a/src/views/dashboard/cqUser.vue b/src/views/dashboard/cqUser.vue
index db9516d..e9ce71e 100644
--- a/src/views/dashboard/cqUser.vue
+++ b/src/views/dashboard/cqUser.vue
@@ -31,8 +31,8 @@
<el-table-column show-overflow-tooltip type="selection" :reserve-selection="false" width="55" />
<el-table-column show-overflow-tooltip prop="empNumb" label="员工编号" width="100" />
<el-table-column show-overflow-tooltip prop="deptName" label="护卫点" width="100" />
- <el-table-column show-overflow-tooltip prop="jobName" label="岗位名称" width="100" />
- <el-table-column show-overflow-tooltip prop="empName" label="员工姓名" width="80" />
+ <el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="100" />
+ <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="80" />
<el-table-column show-overflow-tooltip prop="certificateNumb" label="证件号码" />
<el-table-column show-overflow-tooltip prop="attendMonth" label="离职考勤月份" width="120" />
<el-table-column show-overflow-tooltip prop="attendDays" label="出勤天数" width="100" />
diff --git a/src/views/dashboard/qjUser.vue b/src/views/dashboard/qjUser.vue
index cf2d816..5e2c5d5 100644
--- a/src/views/dashboard/qjUser.vue
+++ b/src/views/dashboard/qjUser.vue
@@ -31,8 +31,8 @@
<el-table-column show-overflow-tooltip type="selection" :reserve-selection="false" width="55" />
<el-table-column show-overflow-tooltip prop="empNumb" label="员工编号" width="100" />
<el-table-column show-overflow-tooltip prop="deptName" label="护卫点" width="120" />
- <el-table-column show-overflow-tooltip prop="jobName" label="岗位名称" width="100" />
- <el-table-column show-overflow-tooltip prop="empName" label="员工姓名" width="80" />
+ <el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="100" />
+ <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="80" />
<el-table-column show-overflow-tooltip prop="certificateNumb" label="证件号码" />
<el-table-column show-overflow-tooltip prop="beginTime" label="开始时间" width="120" />
<el-table-column show-overflow-tooltip prop="endTime" label="结束时间" width="120" />
diff --git a/src/views/dashboard/sbUser.vue b/src/views/dashboard/sbUser.vue
index 70be548..63a1883 100644
--- a/src/views/dashboard/sbUser.vue
+++ b/src/views/dashboard/sbUser.vue
@@ -30,7 +30,7 @@
<el-table-column show-overflow-tooltip type="selection" :reserve-selection="false" width="55" />
<el-table-column show-overflow-tooltip prop="empNumb" label="员工编号" width="100" />
<el-table-column show-overflow-tooltip prop="deptName" label="护卫点" width="100" />
- <el-table-column show-overflow-tooltip prop="jobName" label="岗位名称" width="100" />
+ <el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="100" />
<el-table-column show-overflow-tooltip prop="empName" label="姓名" width="100" />
<el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" />
<el-table-column show-overflow-tooltip prop="applayDate" label="社保申请日期" />
diff --git a/src/views/dashboard/tgUser.vue b/src/views/dashboard/tgUser.vue
index 9c28f79..33f164f 100644
--- a/src/views/dashboard/tgUser.vue
+++ b/src/views/dashboard/tgUser.vue
@@ -33,9 +33,9 @@
<el-table-column show-overflow-tooltip prop="empName" label="姓名" width="100" />
<el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" />
<el-table-column show-overflow-tooltip prop="oldDeptName" label="原护卫点" width="100" />
- <el-table-column show-overflow-tooltip prop="oldJobName" label="原岗位名称" width="100" />
+ <el-table-column show-overflow-tooltip prop="oldJobName" label="原岗位" width="100" />
<el-table-column show-overflow-tooltip prop="newDeptName" label="新护卫点" width="100" />
- <el-table-column show-overflow-tooltip prop="newJobName" label="新岗位名称" width="100" />
+ <el-table-column show-overflow-tooltip prop="newJobName" label="新岗位" width="100" />
<el-table-column show-overflow-tooltip prop="certificateNumb" label="证件号码" />
<el-table-column show-overflow-tooltip prop="changeType" :formatter="changeTypeFormat" label="调岗类型" width="100" />
<el-table-column show-overflow-tooltip prop="changeDate" label="调岗位日期" width="150" />
diff --git a/src/views/dashboard/tjUser.vue b/src/views/dashboard/tjUser.vue
index cd6675f..196dad3 100644
--- a/src/views/dashboard/tjUser.vue
+++ b/src/views/dashboard/tjUser.vue
@@ -30,7 +30,7 @@
<el-table-column show-overflow-tooltip type="selection" :reserve-selection="false" width="55" />
<el-table-column show-overflow-tooltip prop="empNumb" label="员工编号" width="100" />
<el-table-column show-overflow-tooltip prop="deptName" label="护卫点" width="100" />
- <el-table-column show-overflow-tooltip prop="empName" label="员工姓名" width="100" />
+ <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="100" />
<el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" />
<el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="80" />
<el-table-column show-overflow-tooltip prop="hospital" label="体检医院" width="100" />
diff --git a/src/views/dashboard/yjUser.vue b/src/views/dashboard/yjUser.vue
index e0dd1aa..ef76e4a 100644
--- a/src/views/dashboard/yjUser.vue
+++ b/src/views/dashboard/yjUser.vue
@@ -30,7 +30,7 @@
<el-table-column show-overflow-tooltip type="selection" :reserve-selection="false" width="55" />
<el-table-column show-overflow-tooltip prop="empNumb" label="员工编号" width="100" />
<el-table-column show-overflow-tooltip prop="deptName" label="护卫点" width="100" />
- <el-table-column show-overflow-tooltip prop="jobName" label="岗位名称" width="100" />
+ <el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="100" />
<el-table-column show-overflow-tooltip prop="empName" label="姓名" width="100" />
<el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" />
<el-table-column show-overflow-tooltip prop="applayDate" label="失业金申请日期" />
diff --git a/src/views/dashboard/ywUser.vue b/src/views/dashboard/ywUser.vue
index 293e5bf..17262ba 100644
--- a/src/views/dashboard/ywUser.vue
+++ b/src/views/dashboard/ywUser.vue
@@ -30,7 +30,7 @@
<el-table-column show-overflow-tooltip type="selection" :reserve-selection="false" width="55" />
<el-table-column show-overflow-tooltip prop="empNumb" label="员工编号" width="60" />
<el-table-column show-overflow-tooltip prop="deptName" label="护卫点" width="60" />
- <el-table-column show-overflow-tooltip prop="jobName" label="岗位名称" width="60" />
+ <el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="60" />
<el-table-column show-overflow-tooltip prop="empName" label="姓名" width="60" />
<el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" />
<el-table-column show-overflow-tooltip prop="injuredTime" label="受伤日期" width="80" />
diff --git a/src/views/febs/system/job/Index.vue b/src/views/febs/system/job/Index.vue
index 1c53199..8b06d7a 100644
--- a/src/views/febs/system/job/Index.vue
+++ b/src/views/febs/system/job/Index.vue
@@ -1,7 +1,7 @@
<template>
<div class="app-container">
<div class="filter-container">
- <el-input v-model="queryParams.positionName" placeholder="岗位名称" class="filter-item search-item" />
+ <el-input v-model="queryParams.positionName" placeholder="岗位" class="filter-item search-item" />
<el-button class="hr-but-all" type="primary" @click="search">
{{ $t('table.search') }}
</el-button>
@@ -32,7 +32,7 @@
>
<el-table-column type="selection" align="center" width="40px" />
<el-table-column v-if="fsnumShow" label="" prop="positionId" :show-overflow-tooltip="false" align="center" />
- <el-table-column label="岗位名称" prop="positionName" :show-overflow-tooltip="true" align="center" min-width="100px" />
+ <el-table-column label="岗位" prop="positionName" :show-overflow-tooltip="true" align="center" min-width="100px" />
<el-table-column label="岗位编码" prop="positionCode" :show-overflow-tooltip="true" align="center" />
<el-table-column label="创建时间" prop="createTime" :show-overflow-tooltip="true" align="center" min-width="170px" />
<el-table-column label="创建人" prop="creator" :show-overflow-tooltip="true" align="center" min-width="160px" />
diff --git a/src/views/febs/system/job/PositionEdit.vue b/src/views/febs/system/job/PositionEdit.vue
index 5a1ccec..4e56470 100644
--- a/src/views/febs/system/job/PositionEdit.vue
+++ b/src/views/febs/system/job/PositionEdit.vue
@@ -8,7 +8,7 @@
:visible.sync="isVisible"
>
<el-form ref="form" :model="position" :rules="rules" label-position="right" label-width="165px">
- <el-form-item label="岗位名称" prop="positionName">
+ <el-form-item label="岗位" prop="positionName">
<el-input v-model="position.positionName" />
</el-form-item>
<el-form-item label="岗位编码" prop="positionCode">
diff --git a/src/views/febs/system/user/Edit.vue b/src/views/febs/system/user/Edit.vue
index 96c4683..7acee37 100644
--- a/src/views/febs/system/user/Edit.vue
+++ b/src/views/febs/system/user/Edit.vue
@@ -11,7 +11,7 @@
<el-form-item :label="$t('table.user.username')" prop="username">
<el-input v-model="user.username" :readonly="user.userId === '' ? false : 'readonly'" />
</el-form-item>
- <el-form-item label="员工姓名" prop="nickName">
+ <el-form-item label="姓名" prop="nickName">
<el-select v-model="user.nickName" filterable placeholder="" style="width:100%" @change="nickName">
<el-option
v-for="item in baseinfo"
diff --git a/src/views/febs/system/user/Index.vue b/src/views/febs/system/user/Index.vue
index dda49c0..2f11bc5 100644
--- a/src/views/febs/system/user/Index.vue
+++ b/src/views/febs/system/user/Index.vue
@@ -83,7 +83,7 @@
<span>{{ scope.row.username }}</span>
</template>
</el-table-column>
- <el-table-column label="员工姓名" prop="nickName" :show-overflow-tooltip="true" align="center" min-width="120px">
+ <el-table-column label="姓名" prop="nickName" :show-overflow-tooltip="true" align="center" min-width="120px">
<template slot-scope="scope">
<span>{{ scope.row.nickName }}</span>
</template>
diff --git a/src/views/user/Informationinput.vue b/src/views/user/Informationinput.vue
index cb2216e..9105e04 100644
--- a/src/views/user/Informationinput.vue
+++ b/src/views/user/Informationinput.vue
@@ -149,7 +149,7 @@
</template>
</el-table-column>
<el-table-column prop="empNumb" label="编号" width="100" />
- <el-table-column prop="empName" label="员工姓名" width="100" />
+ <el-table-column prop="empName" label="姓名" width="100" />
<el-table-column prop="certificateNumb" show-overflow-tooltip label="身份证号码" />
<el-table-column prop="workUnit" show-overflow-tooltip label="工作单位" />
<el-table-column prop="beginDate" label="开始日期" width="120" />
@@ -184,7 +184,7 @@
</el-table-column>
<el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="80" />
<el-table-column show-overflow-tooltip prop="deptName" label="部门(护卫点)" width="80" />
- <el-table-column show-overflow-tooltip prop="empName" label="员工姓名" width="80" />
+ <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="80" />
<el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" />
<el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="80" />
<el-table-column prop="hospital" show-overflow-tooltip label="体检医院" />
@@ -231,7 +231,7 @@
</el-table-column>
<el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="100" />
<el-table-column show-overflow-tooltip prop="deptName" label="部门(护卫点)" width="150" />
- <el-table-column prop="empName" label="员工姓名" width="100" />
+ <el-table-column prop="empName" label="姓名" width="100" />
<el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" />
<el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="100" />
<el-table-column show-overflow-tooltip prop="signingDate" label="合同签订日期" />
@@ -263,7 +263,7 @@
</el-table-column>
<el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="80" />
<el-table-column show-overflow-tooltip prop="deptName" label="部门(护卫点)" width="80" />
- <el-table-column show-overflow-tooltip prop="empName" label="员工姓名" width="80" />
+ <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="80" />
<el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" />
<el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="60" />
<el-table-column show-overflow-tooltip prop="attendMonth" label="离职考勤月份" width="120" />
@@ -2185,7 +2185,7 @@
message: this.$t('rules.noMoreThan20'),
trigger: 'blur'
}],
- empName: [{ required: true, message: '请输入员工姓名', trigger: 'blur' },
+ empName: [{ required: true, message: '请输入姓名', trigger: 'blur' },
{ min: 2, max: 50, message: this.$t('rules.noMoreThan50'), trigger: 'blur' }],
empNumb: [{ required: true, message: '请输入编号', trigger: 'blur' },
{ min: 2, max: 20, message: this.$t('rules.noMoreThan20'), trigger: 'blur' }],
diff --git a/src/views/user/archivesChange.vue b/src/views/user/archivesChange.vue
index 613311e..dced097 100644
--- a/src/views/user/archivesChange.vue
+++ b/src/views/user/archivesChange.vue
@@ -2634,7 +2634,7 @@
message: this.$t('rules.noMoreThan20'),
trigger: 'blur'
}],
- empName: [{ required: true, message: '请输入员工姓名', trigger: 'blur' },
+ empName: [{ required: true, message: '请输入姓名', trigger: 'blur' },
{ min: 2, max: 50, message: this.$t('rules.noMoreThan50'), trigger: 'blur' }],
empNumb: [{ required: true, message: '请输入员工编号', trigger: 'blur' },
{ min: 2, max: 20, message: this.$t('rules.noMoreThan20'), trigger: 'blur' }],
diff --git a/src/views/user/archivesEdit.vue b/src/views/user/archivesEdit.vue
index 8e7db47..87b5a19 100644
--- a/src/views/user/archivesEdit.vue
+++ b/src/views/user/archivesEdit.vue
@@ -2822,7 +2822,7 @@
message: this.$t('rules.noMoreThan20'),
trigger: 'blur'
}],
- empName: [{ required: true, message: '请输入员工姓名', trigger: 'blur' },
+ empName: [{ required: true, message: '请输入姓名', trigger: 'blur' },
{ min: 2, max: 50, message: this.$t('rules.noMoreThan50'), trigger: 'blur' }],
empNumb: [{ required: true, message: '请输入员工编号', trigger: 'blur' },
{ min: 2, max: 20, message: this.$t('rules.noMoreThan20'), trigger: 'blur' }],
diff --git a/src/views/user/inemployees.vue b/src/views/user/inemployees.vue
index 511788e..55ee0a1 100644
--- a/src/views/user/inemployees.vue
+++ b/src/views/user/inemployees.vue
@@ -991,7 +991,7 @@
message: this.$t('rules.noMoreThan20'),
trigger: 'blur'
}],
- empName: [{ required: true, message: '请输入员工姓名', trigger: 'blur' },
+ empName: [{ required: true, message: '请输入姓名', trigger: 'blur' },
{ min: 2, max: 50, message: this.$t('rules.noMoreThan50'), trigger: 'blur' }],
empNumb: [{ required: true, message: '请输入员工编号', trigger: 'blur' },
{ min: 2, max: 20, message: this.$t('rules.noMoreThan20'), trigger: 'blur' }],
diff --git a/src/views/user/search.vue b/src/views/user/search.vue
index 7605127..5c22ae7 100644
--- a/src/views/user/search.vue
+++ b/src/views/user/search.vue
@@ -845,8 +845,8 @@
<el-table-column show-overflow-tooltip prop="remark" label="备注" />
<!-- <el-table-column prop="deptName" label="护卫点" width="180" />
- <el-table-column prop="jobName" label="岗位名称" width="180" />
- <el-table-column prop="empName" label="员工姓名" width="180" />
+ <el-table-column prop="jobName" label="岗位" width="180" />
+ <el-table-column prop="empName" label="姓名" width="180" />
<el-table-column prop="certificateNumb" label="身份证号码" width="180" />
<el-table-column show-overflow-tooltip prop="attendMonth" label="离职考勤月份" width="180" /> -->
</el-table>
diff --git a/vue.config.js b/vue.config.js
index eef419f..225fd0b 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -36,9 +36,8 @@
// change xxx-api/login => mock/login
// detail: https://cli.vuejs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: {
- // target: 'http://120.24.23.155:8301/',
- // target: 'http://120.24.23.155:7301/',
- target: 'http://127.0.0.1:8301/',
+ target: 'http://120.24.23.155:8301/',
+ // target: 'http://127.0.0.1:8301/',
changeOrigin: true,
pathRewrite: {
['^' + process.env.VUE_APP_BASE_API]: ''
--
Gitblit v1.8.0