From b8b3415ebbd8f20a5dbe03b4e77058894649e09c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B0=B4=E6=99=B6=E5=9C=9F=E8=B1=86?= <水晶土豆@devide>
Date: Tue, 21 Nov 2023 20:12:00 +0800
Subject: [PATCH] Tue Nov 21 20:12:00 CST 2023 inscode

---
 src/component/humanResources/emp.vue          |  7 +++++++
 .../humanResources/empSelectForm.vue          | 19 ++++++++++---------
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/src/component/humanResources/emp.vue b/src/component/humanResources/emp.vue
index 2b2b92a..4b4067a 100644
--- a/src/component/humanResources/emp.vue
+++ b/src/component/humanResources/emp.vue
@@ -50,6 +50,8 @@ const tablePagination = reactive({
     total: 1
 });
 const getData = () => {
+    empSelect.value.page = tablePagination.currentPage;
+    empSelect.value.limit = tablePagination.pageSize;
     getEmpList({ page: tablePagination.currentPage, limit: tablePagination.pageSize, deptName: JSON.stringify(treeValue.value) }).then((res) => {
         if (res.data.data.code === 10000) {
             tableData.value = res.data.data.data;
@@ -125,6 +127,10 @@ const contractSelect = ref({
     page: '1',
     limit: '10'
 });
+const empSelect = ref({
+    page:'1',
+    limit:'10',
+})
 
 
 //dialog
@@ -164,6 +170,7 @@ provide("tableData", tableData);
 provide("row", row);
 provide("tablePagination", tablePagination);
 provide("contractSelect", contractSelect);
+provide("empSelect",empSelect);
 provide("changeState", () => {
     console.log(1111);
 })
diff --git a/src/component/humanResources/empSelectForm.vue b/src/component/humanResources/empSelectForm.vue
index 0633ecb..9593fe5 100644
--- a/src/component/humanResources/empSelectForm.vue
+++ b/src/component/humanResources/empSelectForm.vue
@@ -7,6 +7,10 @@ const contractType = ref({
     nature: [],
     state: []
 });
+const empType = ref({
+    employeeType:[],
+    empState:[],
+})
 
 const inputSelect = computed({
     get() {
@@ -21,6 +25,7 @@ const inputSelect = computed({
 const tableData = inject("tableData");
 const tablePagination = inject("tablePagination");
 const contractSelect = inject("contractSelect");
+const empSelect = inject("empSelect");
 const selectClick = () => {
     getContractList(contractSelect.value).then((res) => {
         if (res.data.data.code === 10000) {
@@ -37,18 +42,13 @@ onMounted(() => {
 
 <template>
     <el-form-item>
-        <el-select placeholder="请选择合同类别" @keyup.enter="selectClick" v-model="contractSelect.contractCategory" clearable >
-            <el-option v-for="item in contractType.category" :key="item" :label="item" :value="item" />
+        <el-select placeholder="选择员工类型" @keyup.enter="selectClick" v-model="empType.employeeType" clearable >
+            <el-option v-for="item in ['正式员工','实习员工','试用员工']" :key="item" :label="item" :value="item" />
         </el-select>
     </el-form-item>
     <el-form-item>
-        <el-select placeholder="请选择合同性质" @keyup.enter="selectClick" v-model="contractSelect.natureOfContract" clearable >
-            <el-option v-for="item in contractType.nature" :key="item" :label="item" :value="item" />
-        </el-select>
-    </el-form-item>
-    <el-form-item>
-        <el-select placeholder="请选择合同状态" @keyup.enter="selectClick" v-model="contractSelect.typeName" clearable >
-            <el-option v-for="item in contractType.state" :key="item" :label="item" :value="item" />
+        <el-select placeholder="选择员工状态" @keyup.enter="selectClick" v-model="empType.empState" clearable >
+            <el-option v-for="item in ['正常状态','离职状态','禁止登录']" :key="item" :label="item" :value="item" />
         </el-select>
     </el-form-item>
     <el-form-item>
@@ -58,6 +58,7 @@ onMounted(() => {
             </template>
         </el-input>
     </el-form-item>
+
 </template>
 
 <style scoped>
-- 
GitLab