diff --git a/src/component/humanResources/emp.vue b/src/component/humanResources/emp.vue
index 2b2b92a76edee8ef3c6f3e343897c112a1754af1..4b4067a573a8f0b6745738942e6c68c7099cf0a2 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 0633ecb98e96cf80c24d564e002fd5ed81e97f31..9593fe513db5dd5bac5a15f4808b795ecbb73134 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(() => {
-
-
+
+
-
-
-
-
-
-
-
+
+
@@ -58,6 +58,7 @@ onMounted(() => {
+