From 6f07f6503055e92d74cad79dc93633c3896ef3c2 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期三, 06 五月 2026 17:37:14 +0800
Subject: [PATCH] 天津军泰伟业 1.人力资源模块修改字段
---
src/views/inventoryManagement/dispatchLog/Record.vue | 18 +
src/views/personnelManagement/dimission/components/formDia.vue | 82 +++++-----
src/views/personnelManagement/employeeRecord/components/NewOrEditFormDia.vue | 131 ++++++++-------
src/views/personnelManagement/employeeRecord/index.vue | 53 +++---
src/views/inventoryManagement/stockManagement/Qualified.vue | 9 +
vite.config.js | 2
src/views/personnelManagement/contractManagement/index.vue | 45 ++--
src/views/personnelManagement/dimission/index.vue | 67 ++++----
src/views/personnelManagement/employeeRecord/components/Show.vue | 48 ++++++
src/views/inventoryManagement/receiptManagement/Record.vue | 12 +
10 files changed, 271 insertions(+), 196 deletions(-)
diff --git a/src/views/inventoryManagement/dispatchLog/Record.vue b/src/views/inventoryManagement/dispatchLog/Record.vue
index 484ddfe..a57e3d8 100644
--- a/src/views/inventoryManagement/dispatchLog/Record.vue
+++ b/src/views/inventoryManagement/dispatchLog/Record.vue
@@ -1,5 +1,5 @@
<template>
- <div class="app-container">
+ <div>
<div class="search_form">
<div>
<span class="search_title ml10">鍑哄簱鏃ユ湡锛�</span>
@@ -12,6 +12,16 @@
clearable
@change="handleQuery"
/>
+ <span class="search_title ml10">浜у搧澶х被锛�</span>
+ <el-input v-model="searchForm.productName"
+ style="width: 240px"
+ placeholder="璇疯緭鍏�"
+ clearable/>
+ <span class="search_title ml10">鍥剧焊缂栧彿锛�</span>
+ <el-input v-model="searchForm.model"
+ style="width: 240px"
+ placeholder="璇疯緭鍏�"
+ clearable/>
<span class="search_title ml10">鏉ユ簮锛�</span>
<el-select v-model="searchForm.recordType"
style="width: 240px"
@@ -34,8 +44,6 @@
>鎼滅储</el-button
>
<el-button @click="handleReset">閲嶇疆</el-button>
- </div>
- <div>
<el-button @click="handleOut">瀵煎嚭</el-button>
<el-button type="danger" plain @click="handleDelete">鍒犻櫎</el-button>
<el-button type="primary" plain @click="handlePrint">鎵撳嵃</el-button>
@@ -168,6 +176,8 @@
const data = reactive({
searchForm: {
supplierName: "",
+ productName: "",
+ model: "",
timeStr: "",
recordType: "",
type: "",
@@ -185,6 +195,8 @@
/** 閲嶇疆鎸夐挳鎿嶄綔 */
const handleReset = () => {
searchForm.value.supplierName = "";
+ searchForm.value.productName = "";
+ searchForm.value.model = "";
searchForm.value.timeStr = "";
searchForm.value.recordType = "";
searchForm.value.type = "";
diff --git a/src/views/inventoryManagement/receiptManagement/Record.vue b/src/views/inventoryManagement/receiptManagement/Record.vue
index 9b72c61..2eaf488 100644
--- a/src/views/inventoryManagement/receiptManagement/Record.vue
+++ b/src/views/inventoryManagement/receiptManagement/Record.vue
@@ -1,5 +1,5 @@
<template>
- <div class="app-container">
+ <div>
<div class="search_form">
<div>
<span class="search_title ml10">鍏ュ簱鏃ユ湡锛�</span>
@@ -12,6 +12,11 @@
@change="handleQuery"/>
<span class="search_title ml10">浜у搧澶х被锛�</span>
<el-input v-model="searchForm.productName"
+ style="width: 240px"
+ placeholder="璇疯緭鍏�"
+ clearable/>
+ <span class="search_title ml10">鍥剧焊缂栧彿锛�</span>
+ <el-input v-model="searchForm.model"
style="width: 240px"
placeholder="璇疯緭鍏�"
clearable/>
@@ -38,8 +43,6 @@
style="margin-left: 10px">鎼滅储
</el-button>
<el-button @click="handleReset">閲嶇疆</el-button>
- </div>
- <div>
<el-button @click="handleOut">瀵煎嚭</el-button>
<el-button type="danger"
plain
@@ -159,6 +162,7 @@
const data = reactive({
searchForm: {
productName: "",
+ model: "",
timeStr: "",
recordType: "",
type: "",
@@ -176,6 +180,7 @@
/** 閲嶇疆鎸夐挳鎿嶄綔 */
const handleReset = () => {
searchForm.value.productName = "";
+ searchForm.value.model = "";
searchForm.value.timeStr = "";
searchForm.value.recordType = "";
searchForm.value.type = "";
@@ -200,6 +205,7 @@
}
params.timeStr = searchForm.value.timeStr;
params.productName = searchForm.value.productName;
+ params.model = searchForm.value.model;
params.recordType = searchForm.value.recordType;
if (searchForm.value.type !== "") {
params.type = searchForm.value.type;
diff --git a/src/views/inventoryManagement/stockManagement/Qualified.vue b/src/views/inventoryManagement/stockManagement/Qualified.vue
index ed1ad1d..1932131 100644
--- a/src/views/inventoryManagement/stockManagement/Qualified.vue
+++ b/src/views/inventoryManagement/stockManagement/Qualified.vue
@@ -1,9 +1,14 @@
<template>
- <div class="app-container">
+ <div>
<div class="search_form">
<div>
<span class="search_title ml10">浜у搧澶х被锛�</span>
<el-input v-model="searchForm.productName"
+ style="width: 240px"
+ placeholder="璇疯緭鍏�"
+ clearable/>
+ <span class="search_title ml10">鍥剧焊缂栧彿锛�</span>
+ <el-input v-model="searchForm.model"
style="width: 240px"
placeholder="璇疯緭鍏�"
clearable/>
@@ -127,6 +132,7 @@
const data = reactive({
searchForm: {
productName: '',
+ model: '',
type: 0,
}
})
@@ -146,6 +152,7 @@
/** 閲嶇疆鎸夐挳鎿嶄綔 */
const handleReset = () => {
searchForm.value.productName = '';
+ searchForm.value.model = '';
searchForm.value.type = 0;
handleQuery();
}
diff --git a/src/views/personnelManagement/contractManagement/index.vue b/src/views/personnelManagement/contractManagement/index.vue
index 1d2aab7..9dd30ed 100644
--- a/src/views/personnelManagement/contractManagement/index.vue
+++ b/src/views/personnelManagement/contractManagement/index.vue
@@ -124,12 +124,18 @@
prop: "sex",
},
{
- label: "鎴风睄浣忓潃",
- prop: "nativePlace",
+ label: "姘戞棌",
+ prop: "nation",
},
{
- label: "宀椾綅",
- prop: "postJob",
+ label: "鍑虹敓鏃ユ湡",
+ prop: "birthDate",
+ width: 120
+ },
+ {
+ label: "韬唤璇佸彿",
+ prop: "identityCard",
+ width: 180
},
{
label: "鐜颁綇鍧�",
@@ -137,33 +143,28 @@
width: 200
},
{
- label: "绗竴瀛﹀巻",
- prop: "firstStudy",
- },
- {
- label: "涓撲笟",
- prop: "profession",
- width: 100
- },
- {
- label: "骞撮緞",
- prop: "age",
- },
- {
label: "鑱旂郴鐢佃瘽",
prop: "phone",
width: 150
},
{
- label: "绱ф�ヨ仈绯讳汉",
- prop: "emergencyContact",
- width: 120
- },
- {
label: "绱ф�ヨ仈绯讳汉鐢佃瘽",
prop: "emergencyContactPhone",
width: 150
},
+ {
+ label: "鍏ヨ亴鏃ユ湡",
+ prop: "entryDate",
+ width: 120
+ },
+ {
+ label: "宀椾綅",
+ prop: "postName",
+ },
+ {
+ label: "閮ㄩ棬",
+ prop: "deptName",
+ },
// {
// label: "鍚堝悓骞撮檺",
// prop: "contractTerm",
diff --git a/src/views/personnelManagement/dimission/components/formDia.vue b/src/views/personnelManagement/dimission/components/formDia.vue
index 2b8a7fd..d13aeea 100644
--- a/src/views/personnelManagement/dimission/components/formDia.vue
+++ b/src/views/personnelManagement/dimission/components/formDia.vue
@@ -40,8 +40,44 @@
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="鎴风睄浣忓潃锛�">
- {{ currentStaffRecord.nativePlace || '-' }}
+ <el-form-item label="姘戞棌锛�">
+ {{ currentStaffRecord.nation || '-' }}
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row :gutter="30">
+ <el-col :span="12">
+ <el-form-item label="鍑虹敓鏃ユ湡锛�">
+ {{ currentStaffRecord.birthDate || '-' }}
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="韬唤璇佸彿锛�">
+ {{ currentStaffRecord.identityCard || '-' }}
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row :gutter="30">
+ <el-col :span="12">
+ <el-form-item label="鐜颁綇鍧�锛�">
+ {{ currentStaffRecord.adress || '-' }}
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="鑱旂郴鐢佃瘽锛�">
+ {{ currentStaffRecord.phone || '-' }}
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row :gutter="30">
+ <el-col :span="12">
+ <el-form-item label="绱ф�ヨ仈绯讳汉鐢佃瘽锛�">
+ {{ currentStaffRecord.emergencyContactPhone || '-' }}
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="鍏ヨ亴鏃ユ湡锛�">
+ {{ currentStaffRecord.entryDate || '-' }}
</el-form-item>
</el-col>
</el-row>
@@ -52,46 +88,8 @@
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="鐜颁綇鍧�锛�">
- {{ currentStaffRecord.adress || '-' }}
- </el-form-item>
- </el-col>
- </el-row>
- <el-row :gutter="30">
- <el-col :span="12">
- <el-form-item label="绗竴瀛﹀巻锛�">
- {{ currentStaffRecord.firstStudy || '-' }}
- </el-form-item>
- </el-col>
- <el-col :span="12">
- <el-form-item label="涓撲笟锛�">
- {{ currentStaffRecord.profession || '-' }}
- </el-form-item>
- </el-col>
- </el-row>
- <el-row :gutter="30">
- <el-col :span="12">
- <el-form-item label="骞撮緞锛�">
- {{ currentStaffRecord.age || '-' }}
- </el-form-item>
- </el-col>
- </el-row>
- <el-row :gutter="30">
- <el-col :span="12">
- <el-form-item label="鑱旂郴鐢佃瘽锛�">
- {{ currentStaffRecord.phone || '-' }}
- </el-form-item>
- </el-col>
- <el-col :span="12">
- <el-form-item label="绱ф�ヨ仈绯讳汉锛�">
- {{ currentStaffRecord.emergencyContact || '-' }}
- </el-form-item>
- </el-col>
- </el-row>
- <el-row :gutter="30">
- <el-col :span="12">
- <el-form-item label="绱ф�ヨ仈绯讳汉鑱旂郴鐢佃瘽锛�">
- {{ currentStaffRecord.emergencyContactPhone || '-' }}
+ <el-form-item label="閮ㄩ棬锛�">
+ {{ currentStaffRecord.deptName || '-' }}
</el-form-item>
</el-col>
</el-row>
diff --git a/src/views/personnelManagement/dimission/index.vue b/src/views/personnelManagement/dimission/index.vue
index c6ed705..8f5a8a3 100644
--- a/src/views/personnelManagement/dimission/index.vue
+++ b/src/views/personnelManagement/dimission/index.vue
@@ -88,49 +88,46 @@
prop: "sex",
},
{
- label: "鎴风睄浣忓潃",
- prop: "nativePlace",
+ label: "姘戞棌",
+ prop: "nation",
},
{
- label: "閮ㄩ棬",
- prop: "deptName",
+ label: "鍑虹敓鏃ユ湡",
+ prop: "birthDate",
+ width: 120
+ },
+ {
+ label: "韬唤璇佸彿",
+ prop: "identityCard",
+ width: 180
+ },
+ {
+ label: "鐜颁綇鍧�",
+ prop: "adress",
+ width: 200
+ },
+ {
+ label: "鑱旂郴鐢佃瘽",
+ prop: "phone",
+ width: 150
+ },
+ {
+ label: "绱ф�ヨ仈绯讳汉鐢佃瘽",
+ prop: "emergencyContactPhone",
+ width: 150
+ },
+ {
+ label: "鍏ヨ亴鏃ユ湡",
+ prop: "entryDate",
+ width: 120
},
{
label: "宀椾綅",
prop: "postName",
},
{
- label: "鐜颁綇鍧�",
- prop: "adress",
- width:200
- },
- {
- label: "绗竴瀛﹀巻",
- prop: "firstStudy",
- },
- {
- label: "涓撲笟",
- prop: "profession",
- width:100
- },
- {
- label: "骞撮緞",
- prop: "age",
- },
- {
- label: "鑱旂郴鐢佃瘽",
- prop: "phone",
- width:150
- },
- {
- label: "绱ф�ヨ仈绯讳汉",
- prop: "emergencyContact",
- width: 120
- },
- {
- label: "绱ф�ヨ仈绯讳汉鐢佃瘽",
- prop: "emergencyContactPhone",
- width:150
+ label: "閮ㄩ棬",
+ prop: "deptName",
},
{
dataType: "action",
diff --git a/src/views/personnelManagement/employeeRecord/components/NewOrEditFormDia.vue b/src/views/personnelManagement/employeeRecord/components/NewOrEditFormDia.vue
index f65509a..ec3854e 100644
--- a/src/views/personnelManagement/employeeRecord/components/NewOrEditFormDia.vue
+++ b/src/views/personnelManagement/employeeRecord/components/NewOrEditFormDia.vue
@@ -22,22 +22,74 @@
<el-row :gutter="30">
<el-col :span="12">
<el-form-item label="鎬у埆锛�" prop="sex">
- <el-select v-model="form.sex">
+ <el-select v-model="form.sex" style="width: 100%">
<el-option label="鐢�" value="鐢�" />
<el-option label="濂�" value="濂�" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="鎴风睄浣忓潃锛�" prop="nativePlace">
- <el-input v-model="form.nativePlace" placeholder="璇疯緭鍏�" clearable/>
+ <el-form-item label="姘戞棌锛�" prop="nation">
+ <el-input v-model="form.nation" placeholder="璇疯緭鍏�" clearable/>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row :gutter="30">
+ <el-col :span="12">
+ <el-form-item label="鍑虹敓鏃ユ湡锛�" prop="birthDate">
+ <el-date-picker
+ v-model="form.birthDate"
+ type="date"
+ placeholder="璇烽�夋嫨鏃ユ湡"
+ value-format="YYYY-MM-DD"
+ format="YYYY-MM-DD"
+ clearable
+ style="width: 100%"
+ />
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="韬唤璇佸彿锛�" prop="identityCard">
+ <el-input v-model="form.identityCard" placeholder="璇疯緭鍏�" clearable/>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row :gutter="30">
+ <el-col :span="12">
+ <el-form-item label="鐜颁綇鍧�锛�" prop="adress">
+ <el-input v-model="form.adress" placeholder="璇疯緭鍏�" clearable/>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="鑱旂郴鐢佃瘽锛�" prop="phone">
+ <el-input v-model="form.phone" placeholder="璇疯緭鍏�" clearable/>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row :gutter="30">
+ <el-col :span="12">
+ <el-form-item label="绱ф�ヨ仈绯讳汉鐢佃瘽锛�" prop="emergencyContactPhone">
+ <el-input v-model="form.emergencyContactPhone" placeholder="璇疯緭鍏�" clearable/>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="鍏ヨ亴鏃ユ湡锛�" prop="entryDate">
+ <el-date-picker
+ v-model="form.entryDate"
+ type="date"
+ placeholder="璇烽�夋嫨鏃ユ湡"
+ value-format="YYYY-MM-DD"
+ format="YYYY-MM-DD"
+ clearable
+ style="width: 100%"
+ />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="30">
<el-col :span="12">
<el-form-item label="宀椾綅锛�" prop="sysPostId">
- <el-select v-model="form.sysPostId" placeholder="璇烽�夋嫨宀椾綅" clearable>
+ <el-select v-model="form.sysPostId" placeholder="璇烽�夋嫨宀椾綅" clearable style="width: 100%">
<el-option
v-for="item in postOptions"
:key="item.postId"
@@ -49,13 +101,6 @@
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="鐜颁綇鍧�锛�" prop="adress">
- <el-input v-model="form.adress" placeholder="璇疯緭鍏�" clearable/>
- </el-form-item>
- </el-col>
- </el-row>
- <el-row :gutter="30">
- <el-col :span="12">
<el-form-item label="閮ㄩ棬锛�" prop="sysDeptId">
<el-tree-select
v-model="form.sysDeptId"
@@ -64,52 +109,17 @@
value-key="id"
placeholder="璇烽�夋嫨閮ㄩ棬"
check-strictly
+ style="width: 100%"
/>
</el-form-item>
</el-col>
- <el-col :span="12">
- <el-form-item label="骞撮緞锛�" prop="age">
- <el-input-number v-model="form.age" :precision="0" :step="1" style="width: 100%"/>
- </el-form-item>
- </el-col>
</el-row>
<el-row :gutter="30">
- <el-col :span="12">
- <el-form-item label="绗竴瀛﹀巻锛�" prop="firstStudy">
- <el-input v-model="form.firstStudy" placeholder="璇疯緭鍏�" clearable/>
- </el-form-item>
- </el-col>
- <el-col :span="12">
- <el-form-item label="涓撲笟锛�" prop="profession">
- <el-input v-model="form.profession" placeholder="璇疯緭鍏�" clearable/>
- </el-form-item>
- </el-col>
- </el-row>
- <el-row :gutter="30">
- <el-col :span="12">
- <el-form-item label="鑱旂郴鐢佃瘽锛�" prop="phone">
- <el-input v-model="form.phone" placeholder="璇疯緭鍏�" clearable/>
- </el-form-item>
- </el-col>
- <el-col :span="12">
- <el-form-item label="绱ф�ヨ仈绯讳汉锛�" prop="emergencyContact">
- <el-input v-model="form.emergencyContact" placeholder="璇疯緭鍏�" clearable/>
- </el-form-item>
- </el-col>
- </el-row>
- <el-row :gutter="30">
- <el-col :span="12">
- <el-form-item label="绱ф�ヨ仈绯讳汉鑱旂郴鐢佃瘽锛�" prop="emergencyContactPhone">
- <el-input v-model="form.emergencyContactPhone" placeholder="璇疯緭鍏�" clearable/>
- </el-form-item>
- </el-col>
<el-col :span="12">
<el-form-item label="鍚堝悓骞撮檺锛�" prop="contractTerm">
<el-input-number v-model="form.contractTerm" :precision="0" :step="1" style="width: 100%" :disabled="true"/>
</el-form-item>
</el-col>
- </el-row>
- <el-row :gutter="30">
<el-col :span="12">
<el-form-item label="鍚堝悓寮�濮嬫棩鏈燂細" prop="contractStartTime">
<el-date-picker
@@ -120,10 +130,12 @@
format="YYYY-MM-DD"
clearable
style="width: 100%"
- @change="calculateContractTerm"
+ @change="calculateContractTerm"
/>
</el-form-item>
</el-col>
+ </el-row>
+ <el-row :gutter="30">
<el-col :span="12">
<el-form-item label="鍚堝悓缁撴潫鏃ユ湡锛�" prop="contractEndTime">
<el-date-picker
@@ -134,7 +146,7 @@
format="YYYY-MM-DD"
clearable
style="width: 100%"
- @change="calculateContractTerm"
+ @change="calculateContractTerm"
/>
</el-form-item>
</el-col>
@@ -167,15 +179,14 @@
staffNo: "",
staffName: "",
sex: "",
- nativePlace: "",
- postJob: "",
+ nation: "",
+ birthDate: "",
+ identityCard: "",
adress: "",
- firstStudy: "",
- profession: "",
- age: 0,
phone: "",
- emergencyContact: "",
emergencyContactPhone: "",
+ entryDate: "",
+ postJob: "",
contractTerm: 0,
contractStartTime: "",
contractEndTime: "",
@@ -186,15 +197,13 @@
staffNo: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" },],
staffName: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
sex: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
- nativePlace: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
- postJob: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
+ nation: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
+ birthDate: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
+ identityCard: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
adress: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
- firstStudy: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
- profession: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
- age: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
phone: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
- emergencyContact: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
emergencyContactPhone: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
+ entryDate: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
contractTerm: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
contractStartTime: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
contractEndTime: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
diff --git a/src/views/personnelManagement/employeeRecord/components/Show.vue b/src/views/personnelManagement/employeeRecord/components/Show.vue
index 9220d45..1ea75fb 100644
--- a/src/views/personnelManagement/employeeRecord/components/Show.vue
+++ b/src/views/personnelManagement/employeeRecord/components/Show.vue
@@ -31,6 +31,54 @@
const dialogFormVisible = ref(false);
const operationType = ref('')
const tableColumn = ref([
+ {
+ label: "鍛樺伐缂栧彿",
+ prop: "staffNo",
+ },
+ {
+ label: "濮撳悕",
+ prop: "staffName",
+ },
+ {
+ label: "鎬у埆",
+ prop: "sex",
+ },
+ {
+ label: "姘戞棌",
+ prop: "nation",
+ },
+ {
+ label: "鍑虹敓鏃ユ湡",
+ prop: "birthDate",
+ },
+ {
+ label: "韬唤璇佸彿",
+ prop: "identityCard",
+ },
+ {
+ label: "鐜颁綇鍧�",
+ prop: "adress",
+ },
+ {
+ label: "鑱旂郴鐢佃瘽",
+ prop: "phone",
+ },
+ {
+ label: "绱ф�ヨ仈绯讳汉鐢佃瘽",
+ prop: "emergencyContactPhone",
+ },
+ {
+ label: "鍏ヨ亴鏃ユ湡",
+ prop: "entryDate",
+ },
+ {
+ label: "宀椾綅",
+ prop: "postName",
+ },
+ {
+ label: "閮ㄩ棬",
+ prop: "deptName",
+ },
// {
// label: "鍚堝悓骞撮檺",
// prop: "contractTerm",
diff --git a/src/views/personnelManagement/employeeRecord/index.vue b/src/views/personnelManagement/employeeRecord/index.vue
index af1f58d..7ceaa70 100644
--- a/src/views/personnelManagement/employeeRecord/index.vue
+++ b/src/views/personnelManagement/employeeRecord/index.vue
@@ -11,7 +11,7 @@
clearable
:prefix-icon="Search"
/>
- <span style="margin-left: 10px" class="search_title">鍚堝悓缁撴潫鏃ユ湡锛�</span>
+ <span style="margin-left: 10px" class="search_title">鍏ヨ亴鏃ユ湡锛�</span>
<el-date-picker v-model="searchForm.entryDate" value-format="YYYY-MM-DD" format="YYYY-MM-DD" type="daterange"
placeholder="璇烽�夋嫨" clearable @change="changeDaterange" />
<el-button type="primary" @click="handleQuery" style="margin-left: 10px"
@@ -152,49 +152,46 @@
prop: "sex",
},
{
- label: "鎴风睄浣忓潃",
- prop: "nativePlace",
+ label: "姘戞棌",
+ prop: "nation",
},
{
- label: "閮ㄩ棬",
- prop: "deptName",
+ label: "鍑虹敓鏃ユ湡",
+ prop: "birthDate",
+ width: 120
},
{
- label: "宀椾綅",
- prop: "postJob",
+ label: "韬唤璇佸彿",
+ prop: "identityCard",
+ width: 180
},
{
label: "鐜颁綇鍧�",
prop: "adress",
- width:200
- },
- {
- label: "绗竴瀛﹀巻",
- prop: "firstStudy",
- },
- {
- label: "涓撲笟",
- prop: "profession",
- width:100
- },
- {
- label: "骞撮緞",
- prop: "age",
+ width: 200
},
{
label: "鑱旂郴鐢佃瘽",
prop: "phone",
- width:150
- },
- {
- label: "绱ф�ヨ仈绯讳汉",
- prop: "emergencyContact",
- width: 120
+ width: 150
},
{
label: "绱ф�ヨ仈绯讳汉鐢佃瘽",
prop: "emergencyContactPhone",
- width:150
+ width: 150
+ },
+ {
+ label: "鍏ヨ亴鏃ユ湡",
+ prop: "entryDate",
+ width: 120
+ },
+ {
+ label: "宀椾綅",
+ prop: "postName",
+ },
+ {
+ label: "閮ㄩ棬",
+ prop: "deptName",
},
// {
// label: "鍚堝悓骞撮檺",
diff --git a/vite.config.js b/vite.config.js
index dc687a8..71bf14c 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -8,7 +8,7 @@
const { VITE_APP_ENV } = env;
const baseUrl =
env.VITE_APP_ENV === "development"
- ? "http://1.15.17.182:9003"
+ ? "http://192.168.0.226:7005"
: env.VITE_BASE_API;
const javaUrl =
env.VITE_APP_ENV === "development"
--
Gitblit v1.9.3