From 896fe9155c2a3cd54b0b7605a613ed7c8c9c0cfa Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期三, 02 七月 2025 13:34:56 +0800
Subject: [PATCH] 人员管理-新增入职、新增离职页面联调
---
src/views/personnelManagement/dimission/components/formDia.vue | 163 ++++++++++----
src/views/personnelManagement/onboarding/components/formDia.vue | 161 ++++++++++----
src/api/personnelManagement/onboarding.js | 42 +++
src/views/personnelManagement/dimission/index.vue | 139 ++++++++---
src/views/personnelManagement/onboarding/index.vue | 138 ++++++++---
5 files changed, 457 insertions(+), 186 deletions(-)
diff --git a/src/api/personnelManagement/onboarding.js b/src/api/personnelManagement/onboarding.js
new file mode 100644
index 0000000..7212afa
--- /dev/null
+++ b/src/api/personnelManagement/onboarding.js
@@ -0,0 +1,42 @@
+import request from '@/utils/request'
+
+// 鏌ヨ浜哄憳鍏ヨ亴鍒楄〃
+export function staffJoinListPage(query) {
+ return request({
+ url: '/staff/staffJoinLeaveRecord/listPage',
+ method: 'get',
+ params: query,
+ })
+}
+// 鏂板浜哄憳鍏ヨ亴
+export function staffJoinAdd(query) {
+ return request({
+ url: '/staff/staffJoinLeaveRecord/add',
+ method: 'post',
+ data: query,
+ })
+}
+// 淇敼浜哄憳鍏ヨ亴
+export function staffJoinUpdate(query) {
+ return request({
+ url: '/staff/staffJoinLeaveRecord/update',
+ method: 'post',
+ data: query,
+ })
+}
+// 鏌ヨ鍛樺伐鍏ヨ亴淇℃伅
+export function getStaffJoinInfo(query) {
+ return request({
+ url: '/staff/staffJoinLeaveRecord/' + query,
+ method: 'get',
+ data: query,
+ })
+}
+// 鍒犻櫎鍛樺伐
+export function staffJoinDel(query) {
+ return request({
+ url: '/staff/staffJoinLeaveRecord/del',
+ method: 'delete',
+ data: query,
+ })
+}
\ No newline at end of file
diff --git a/src/views/personnelManagement/dimission/components/formDia.vue b/src/views/personnelManagement/dimission/components/formDia.vue
index 68185cc..6b481df 100644
--- a/src/views/personnelManagement/dimission/components/formDia.vue
+++ b/src/views/personnelManagement/dimission/components/formDia.vue
@@ -2,104 +2,123 @@
<div>
<el-dialog
v-model="dialogFormVisible"
- :title="operationType === 'add' ? '鏂板绂昏亴' : '缂栬緫浜哄憳'"
+ :title="operationType === 'add' ? '鏂板鍏ヨ亴' : '缂栬緫浜哄憳'"
width="70%"
@close="closeDia"
>
<el-form :model="form" label-width="140px" label-position="top" :rules="rules" ref="formRef">
<el-row :gutter="30">
<el-col :span="12">
- <el-form-item label="鍛樺伐缂栧彿锛�" prop="purchaseContractNumber">
- <el-input v-model="form.purchaseContractNumber" placeholder="璇疯緭鍏�" clearable/>
+ <el-form-item label="鍛樺伐缂栧彿锛�" prop="staffNo">
+ <el-input v-model="form.staffNo" placeholder="璇疯緭鍏�" clearable :disabled="operationType !== 'add'"/>
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="濮撳悕锛�" prop="salesLedgerId">
- <el-input v-model="form.purchaseContractNumber" placeholder="璇疯緭鍏�" clearable/>
+ <el-form-item label="濮撳悕锛�" prop="staffName">
+ <el-input v-model="form.staffName" placeholder="璇疯緭鍏�" clearable/>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="30">
<el-col :span="12">
- <el-form-item label="鎬у埆锛�" prop="purchaseContractNumber">
- <el-input v-model="form.purchaseContractNumber" placeholder="璇疯緭鍏�" clearable/>
+ <el-form-item label="鎬у埆锛�" prop="sex">
+ <el-select v-model="form.sex">
+ <el-option label="鐢�" value="鐢�" />
+ <el-option label="濂�" value="濂�" />
+ </el-select>
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="绫嶈疮锛�" prop="salesLedgerId">
- <el-input v-model="form.purchaseContractNumber" placeholder="璇疯緭鍏�" clearable/>
+ <el-form-item label="绫嶈疮锛�" prop="nativePlace">
+ <el-input v-model="form.nativePlace" placeholder="璇疯緭鍏�" clearable/>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="30">
<el-col :span="12">
- <el-form-item label="宀椾綅锛�" prop="purchaseContractNumber">
- <el-input v-model="form.purchaseContractNumber" placeholder="璇疯緭鍏�" clearable/>
+ <el-form-item label="宀椾綅锛�" prop="postJob">
+ <el-input v-model="form.postJob" placeholder="璇疯緭鍏�" clearable/>
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="瀹跺涵浣忓潃锛�" prop="salesLedgerId">
- <el-input v-model="form.purchaseContractNumber" placeholder="璇疯緭鍏�" clearable/>
+ <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="purchaseContractNumber">
- <el-input v-model="form.purchaseContractNumber" placeholder="璇疯緭鍏�" clearable/>
+ <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="salesLedgerId">
- <el-input v-model="form.purchaseContractNumber" placeholder="璇疯緭鍏�" clearable/>
+ <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="purchaseContractNumber">
- <el-input v-model="form.purchaseContractNumber" placeholder="璇疯緭鍏�" clearable/>
+ <el-form-item label="韬唤璇佸彿锛�" prop="identityCard">
+ <el-input v-model="form.identityCard" placeholder="璇疯緭鍏�" clearable/>
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="骞撮緞锛�" prop="salesLedgerId">
- <el-input v-model="form.purchaseContractNumber" placeholder="璇疯緭鍏�" clearable/>
+ <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="purchaseContractNumber">
- <el-input v-model="form.purchaseContractNumber" placeholder="璇疯緭鍏�" clearable/>
+ <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="salesLedgerId">
- <el-input v-model="form.purchaseContractNumber" placeholder="璇疯緭鍏�" clearable/>
+ <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="purchaseContractNumber">
- <el-input v-model="form.purchaseContractNumber" placeholder="璇疯緭鍏�" clearable/>
+ <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="salesLedgerId">
- <el-input v-model="form.purchaseContractNumber" placeholder="璇疯緭鍏�" clearable/>
+ <el-form-item label="鍚堝悓骞撮檺锛�" prop="contractTerm">
+ <el-input-number v-model="form.contractTerm" :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="purchaseContractNumber">
- <el-input v-model="form.purchaseContractNumber" placeholder="璇疯緭鍏�" clearable/>
+ <el-form-item label="鍚堝悓寮�濮嬫棩鏈燂細" prop="contractStartTime">
+ <el-date-picker
+ v-model="form.contractStartTime"
+ 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="salesLedgerId">
- <el-input v-model="form.purchaseContractNumber" placeholder="璇疯緭鍏�" clearable/>
+ <el-form-item label="鍚堝悓缁撴潫鏃ユ湡锛�" prop="contractEndTime">
+ <el-date-picker
+ v-model="form.contractEndTime"
+ type="date"
+ placeholder="璇烽�夋嫨鏃ユ湡"
+ value-format="YYYY-MM-DD"
+ format="YYYY-MM-DD"
+ clearable
+ style="width: 100%"
+ />
</el-form-item>
</el-col>
</el-row>
@@ -116,45 +135,87 @@
<script setup>
import {ref} from "vue";
+import {getStaffJoinInfo, staffJoinAdd, staffJoinUpdate} from "@/api/personnelManagement/onboarding.js";
+const { proxy } = getCurrentInstance()
+const emit = defineEmits(['confirm'])
const dialogFormVisible = ref(false);
const operationType = ref('')
const data = reactive({
- searchForm: {
- purchaseContractNumber: "",
- },
form: {
- purchaseContractNumber: "",
- salesLedgerId: "",
- projectName: "",
- recorderId: "",
- entryDate: "",
- productData: [],
- supplierName: "",
- supplierId: "",
+ staffNo: "",
+ staffName: "",
+ sex: "",
+ nativePlace: "",
+ postJob: "",
+ adress: "",
+ firstStudy: "",
+ profession: "",
+ identityCard: "",
+ age: 0,
+ phone: "",
+ emergencyContact: "",
+ emergencyContactPhone: "",
+ contractTerm: 0,
+ contractStartTime: "",
+ contractEndTime: "",
+ staffState: "",
},
rules: {
- purchaseContractNumber: [
- { required: true, message: "璇疯緭鍏�", trigger: "blur" },
- ],
- projectName: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
- supplierId: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
+ 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" }],
+ adress: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
+ firstStudy: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
+ profession: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
+ identityCard: [{ 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" }],
+ contractTerm: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
+ contractStartTime: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
+ contractEndTime: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
},
});
const { form, rules } = toRefs(data);
// 鎵撳紑寮规
const openDialog = (type, row) => {
+ operationType.value = type;
dialogFormVisible.value = true;
+ if (operationType.value === 'edit') {
+ getStaffJoinInfo(row.id).then(res => {
+ form.value = {...res.data}
+ })
+ }
}
// 鎻愪氦浜у搧琛ㄥ崟
const submitForm = () => {
-
+ proxy.$refs.formRef.validate(valid => {
+ if (valid) {
+ form.value.staffState = 0
+ if (operationType.value === "add") {
+ staffJoinAdd(form.value).then(res => {
+ proxy.$modal.msgSuccess("鎻愪氦鎴愬姛");
+ closeDia();
+ })
+ } else {
+ staffJoinUpdate(form.value).then(res => {
+ proxy.$modal.msgSuccess("鎻愪氦鎴愬姛");
+ closeDia();
+ })
+ }
+ }
+ })
}
// 鍏抽棴寮规
const closeDia = () => {
- // proxy.resetForm("formRef");
+ proxy.resetForm("formRef");
dialogFormVisible.value = false;
+ emit('close')
};
defineExpose({
openDialog,
diff --git a/src/views/personnelManagement/dimission/index.vue b/src/views/personnelManagement/dimission/index.vue
index 3692930..01305e4 100644
--- a/src/views/personnelManagement/dimission/index.vue
+++ b/src/views/personnelManagement/dimission/index.vue
@@ -4,9 +4,9 @@
<div>
<span class="search_title">濮撳悕锛�</span>
<el-input
- v-model="searchForm.customerName"
+ v-model="searchForm.staffName"
style="width: 240px"
- placeholder="璇疯緭鍏ュ悕绉版悳绱�"
+ placeholder="璇疯緭鍏ュ鍚嶆悳绱�"
@change="handleQuery"
clearable
:prefix-icon="Search"
@@ -17,6 +17,8 @@
</div>
<div>
<el-button type="primary" @click="openForm('add')">鏂板绂昏亴</el-button>
+ <el-button @click="handleOut">瀵煎嚭</el-button>
+ <el-button type="danger" plain @click="handleDelete">鍒犻櫎</el-button>
</div>
</div>
<div class="table_list">
@@ -32,50 +34,42 @@
:total="total"
></PIMTable>
</div>
- <form-dia ref="formDia"></form-dia>
+ <form-dia ref="formDia" @close="handleQuery"></form-dia>
</div>
</template>
<script setup>
import { Search } from "@element-plus/icons-vue";
-import { ref } from "vue";
-import FormDia from "@/views/personnelManagement/onboarding/components/formDia.vue";
+import {onMounted, ref} from "vue";
+import FormDia from "@/views/personnelManagement/dimission/components/formDia.vue";
+import {staffJoinDel, staffJoinListPage} from "@/api/personnelManagement/onboarding.js";
+import {ElMessageBox} from "element-plus";
const data = reactive({
searchForm: {
- customerName: "",
- },
- form: {
- salesLedgerId: "",
- customerName: "",
- salesman: "",
- projectName: "",
- productData: [],
- },
- rules: {
- salesLedgerId: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
+ staffName: "",
},
});
-const { searchForm, form, rules } = toRefs(data);
+const { searchForm } = toRefs(data);
const tableColumn = ref([
{
label: "鐘舵��",
- prop: "paymentDate",
+ prop: "staffState",
dataType: "tag",
formatData: (params) => {
if (params == 0) {
- return "鍦ㄨ亴";
- } else if (params == 1) {
return "绂昏亴";
+ } else if (params == 1) {
+ return "鍦ㄨ亴";
} else {
return null;
}
},
formatType: (params) => {
if (params == 0) {
- return "primary";
- } else if (params == 1) {
return "danger";
+ } else if (params == 1) {
+ return "primary";
} else {
return null;
}
@@ -83,67 +77,81 @@
},
{
label: "鍛樺伐缂栧彿",
- prop: "supplierName",
+ prop: "staffNo",
},
{
label: "濮撳悕",
- prop: "currentPaymentAmount",
+ prop: "staffName",
},
{
label: "鎬у埆",
- prop: "paymentMethod",
+ prop: "sex",
},
{
label: "绫嶈疮",
- prop: "registrant",
+ prop: "nativePlace",
},
{
label: "宀椾綅",
- prop: "registrationtDate",
+ prop: "postJob",
},
{
label: "瀹跺涵浣忓潃",
- prop: "registrationtDate",
+ prop: "adress",
},
{
label: "绗竴瀛﹀巻",
- prop: "registrationtDate",
+ prop: "firstStudy",
},
{
label: "涓撲笟",
- prop: "registrationtDate",
+ prop: "profession",
},
{
label: "韬唤璇佸彿",
- prop: "registrationtDate",
+ prop: "identityCard",
},
{
label: "骞撮緞",
- prop: "registrationtDate",
+ prop: "age",
},
{
label: "鑱旂郴鐢佃瘽",
- prop: "registrationtDate",
+ prop: "phone",
},
{
label: "绱ф�ヨ仈绯讳汉",
- prop: "registrationtDate",
+ prop: "emergencyContact",
},
{
label: "鑱旂郴鐢佃瘽",
- prop: "registrationtDate",
+ prop: "emergencyContactPhone",
},
{
label: "鍚堝悓骞撮檺",
- prop: "registrationtDate",
+ prop: "contractTerm",
},
{
label: "鍚堝悓寮�濮嬫棩鏈�",
- prop: "registrationtDate",
+ prop: "contractStartTime",
},
{
label: "鍚堝悓缁撴潫鏃ユ湡",
- prop: "registrationtDate",
+ prop: "contractEndTime",
+ },
+ {
+ dataType: "action",
+ label: "鎿嶄綔",
+ align: "center",
+ operation: [
+ {
+ name: "缂栬緫",
+ type: "text",
+ clickFun: (row) => {
+ openForm("edit", row);
+ },
+ },
+ ],
},
]);
const tableData = ref([]);
@@ -170,14 +178,17 @@
};
const getList = () => {
tableLoading.value = true;
-
+ staffJoinListPage({...page, ...searchForm.value, staffState: 0}).then(res => {
+ tableLoading.value = false;
+ tableData.value = res.data.records
+ total.value = res.data.total;
+ }).catch(err => {
+ tableLoading.value = false;
+ })
};
// 琛ㄦ牸閫夋嫨鏁版嵁
const handleSelectionChange = (selection) => {
- console.log("selection", selection);
- selectedRows.value = selection.filter(
- (item) => item.salesContractNo !== undefined
- );
+ selectedRows.value = selection;
};
// 鎵撳紑寮规
@@ -186,6 +197,48 @@
formDia.value?.openDialog(type, row)
})
};
+
+// 鍒犻櫎
+const handleDelete = () => {
+ let ids = [];
+ if (selectedRows.value.length > 0) {
+ ids = selectedRows.value.map((item) => item.id);
+ } else {
+ proxy.$modal.msgWarning("璇烽�夋嫨鏁版嵁");
+ return;
+ }
+ ElMessageBox.confirm("閫変腑鐨勫唴瀹瑰皢琚垹闄わ紝鏄惁纭鍒犻櫎锛�", "瀵煎嚭", {
+ confirmButtonText: "纭",
+ cancelButtonText: "鍙栨秷",
+ type: "warning",
+ })
+ .then(() => {
+ staffJoinDel(ids).then((res) => {
+ proxy.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+ getList();
+ });
+ })
+ .catch(() => {
+ proxy.$modal.msg("宸插彇娑�");
+ });
+};
+// 瀵煎嚭
+const handleOut = () => {
+ ElMessageBox.confirm("閫変腑鐨勫唴瀹瑰皢琚鍑猴紝鏄惁纭瀵煎嚭锛�", "瀵煎嚭", {
+ confirmButtonText: "纭",
+ cancelButtonText: "鍙栨秷",
+ type: "warning",
+ })
+ .then(() => {
+ proxy.download("/staff/staffJoinLeaveRecord/export", {staffState: 0}, "浜哄憳绂昏亴.xlsx");
+ })
+ .catch(() => {
+ proxy.$modal.msg("宸插彇娑�");
+ });
+};
+onMounted(() => {
+ getList();
+});
</script>
<style scoped></style>
diff --git a/src/views/personnelManagement/onboarding/components/formDia.vue b/src/views/personnelManagement/onboarding/components/formDia.vue
index c8bd008..ba9dd6f 100644
--- a/src/views/personnelManagement/onboarding/components/formDia.vue
+++ b/src/views/personnelManagement/onboarding/components/formDia.vue
@@ -9,97 +9,116 @@
<el-form :model="form" label-width="140px" label-position="top" :rules="rules" ref="formRef">
<el-row :gutter="30">
<el-col :span="12">
- <el-form-item label="鍛樺伐缂栧彿锛�" prop="purchaseContractNumber">
- <el-input v-model="form.purchaseContractNumber" placeholder="璇疯緭鍏�" clearable/>
+ <el-form-item label="鍛樺伐缂栧彿锛�" prop="staffNo">
+ <el-input v-model="form.staffNo" placeholder="璇疯緭鍏�" clearable :disabled="operationType !== 'add'"/>
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="濮撳悕锛�" prop="salesLedgerId">
- <el-input v-model="form.purchaseContractNumber" placeholder="璇疯緭鍏�" clearable/>
+ <el-form-item label="濮撳悕锛�" prop="staffName">
+ <el-input v-model="form.staffName" placeholder="璇疯緭鍏�" clearable/>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="30">
<el-col :span="12">
- <el-form-item label="鎬у埆锛�" prop="purchaseContractNumber">
- <el-input v-model="form.purchaseContractNumber" placeholder="璇疯緭鍏�" clearable/>
+ <el-form-item label="鎬у埆锛�" prop="sex">
+ <el-select v-model="form.sex">
+ <el-option label="鐢�" value="鐢�" />
+ <el-option label="濂�" value="濂�" />
+ </el-select>
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="绫嶈疮锛�" prop="salesLedgerId">
- <el-input v-model="form.purchaseContractNumber" placeholder="璇疯緭鍏�" clearable/>
+ <el-form-item label="绫嶈疮锛�" prop="nativePlace">
+ <el-input v-model="form.nativePlace" placeholder="璇疯緭鍏�" clearable/>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="30">
<el-col :span="12">
- <el-form-item label="宀椾綅锛�" prop="purchaseContractNumber">
- <el-input v-model="form.purchaseContractNumber" placeholder="璇疯緭鍏�" clearable/>
+ <el-form-item label="宀椾綅锛�" prop="postJob">
+ <el-input v-model="form.postJob" placeholder="璇疯緭鍏�" clearable/>
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="瀹跺涵浣忓潃锛�" prop="salesLedgerId">
- <el-input v-model="form.purchaseContractNumber" placeholder="璇疯緭鍏�" clearable/>
+ <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="purchaseContractNumber">
- <el-input v-model="form.purchaseContractNumber" placeholder="璇疯緭鍏�" clearable/>
+ <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="salesLedgerId">
- <el-input v-model="form.purchaseContractNumber" placeholder="璇疯緭鍏�" clearable/>
+ <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="purchaseContractNumber">
- <el-input v-model="form.purchaseContractNumber" placeholder="璇疯緭鍏�" clearable/>
+ <el-form-item label="韬唤璇佸彿锛�" prop="identityCard">
+ <el-input v-model="form.identityCard" placeholder="璇疯緭鍏�" clearable/>
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="骞撮緞锛�" prop="salesLedgerId">
- <el-input v-model="form.purchaseContractNumber" placeholder="璇疯緭鍏�" clearable/>
+ <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="purchaseContractNumber">
- <el-input v-model="form.purchaseContractNumber" placeholder="璇疯緭鍏�" clearable/>
+ <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="salesLedgerId">
- <el-input v-model="form.purchaseContractNumber" placeholder="璇疯緭鍏�" clearable/>
+ <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="purchaseContractNumber">
- <el-input v-model="form.purchaseContractNumber" placeholder="璇疯緭鍏�" clearable/>
+ <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="salesLedgerId">
- <el-input v-model="form.purchaseContractNumber" placeholder="璇疯緭鍏�" clearable/>
+ <el-form-item label="鍚堝悓骞撮檺锛�" prop="contractTerm">
+ <el-input-number v-model="form.contractTerm" :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="purchaseContractNumber">
- <el-input v-model="form.purchaseContractNumber" placeholder="璇疯緭鍏�" clearable/>
+ <el-form-item label="鍚堝悓寮�濮嬫棩鏈燂細" prop="contractStartTime">
+ <el-date-picker
+ v-model="form.contractStartTime"
+ 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="salesLedgerId">
- <el-input v-model="form.purchaseContractNumber" placeholder="璇疯緭鍏�" clearable/>
+ <el-form-item label="鍚堝悓缁撴潫鏃ユ湡锛�" prop="contractEndTime">
+ <el-date-picker
+ v-model="form.contractEndTime"
+ type="date"
+ placeholder="璇烽�夋嫨鏃ユ湡"
+ value-format="YYYY-MM-DD"
+ format="YYYY-MM-DD"
+ clearable
+ style="width: 100%"
+ />
</el-form-item>
</el-col>
</el-row>
@@ -116,45 +135,87 @@
<script setup>
import {ref} from "vue";
+import {getStaffJoinInfo, staffJoinAdd, staffJoinUpdate} from "@/api/personnelManagement/onboarding.js";
+const { proxy } = getCurrentInstance()
+const emit = defineEmits(['confirm'])
const dialogFormVisible = ref(false);
const operationType = ref('')
const data = reactive({
- searchForm: {
- purchaseContractNumber: "",
- },
form: {
- purchaseContractNumber: "",
- salesLedgerId: "",
- projectName: "",
- recorderId: "",
- entryDate: "",
- productData: [],
- supplierName: "",
- supplierId: "",
+ staffNo: "",
+ staffName: "",
+ sex: "",
+ nativePlace: "",
+ postJob: "",
+ adress: "",
+ firstStudy: "",
+ profession: "",
+ identityCard: "",
+ age: 0,
+ phone: "",
+ emergencyContact: "",
+ emergencyContactPhone: "",
+ contractTerm: 0,
+ contractStartTime: "",
+ contractEndTime: "",
+ staffState: "",
},
rules: {
- purchaseContractNumber: [
- { required: true, message: "璇疯緭鍏�", trigger: "blur" },
- ],
- projectName: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
- supplierId: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
+ 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" }],
+ adress: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
+ firstStudy: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
+ profession: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
+ identityCard: [{ 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" }],
+ contractTerm: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
+ contractStartTime: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
+ contractEndTime: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
},
});
const { form, rules } = toRefs(data);
// 鎵撳紑寮规
const openDialog = (type, row) => {
+ operationType.value = type;
dialogFormVisible.value = true;
+ if (operationType.value === 'edit') {
+ getStaffJoinInfo(row.id).then(res => {
+ form.value = {...res.data}
+ })
+ }
}
// 鎻愪氦浜у搧琛ㄥ崟
const submitForm = () => {
-
+ proxy.$refs.formRef.validate(valid => {
+ if (valid) {
+ form.value.staffState = 1
+ if (operationType.value === "add") {
+ staffJoinAdd(form.value).then(res => {
+ proxy.$modal.msgSuccess("鎻愪氦鎴愬姛");
+ closeDia();
+ })
+ } else {
+ staffJoinUpdate(form.value).then(res => {
+ proxy.$modal.msgSuccess("鎻愪氦鎴愬姛");
+ closeDia();
+ })
+ }
+ }
+ })
}
// 鍏抽棴寮规
const closeDia = () => {
- // proxy.resetForm("formRef");
+ proxy.resetForm("formRef");
dialogFormVisible.value = false;
+ emit('close')
};
defineExpose({
openDialog,
diff --git a/src/views/personnelManagement/onboarding/index.vue b/src/views/personnelManagement/onboarding/index.vue
index 2ad1e89..a2f33b8 100644
--- a/src/views/personnelManagement/onboarding/index.vue
+++ b/src/views/personnelManagement/onboarding/index.vue
@@ -4,9 +4,9 @@
<div>
<span class="search_title">濮撳悕锛�</span>
<el-input
- v-model="searchForm.customerName"
+ v-model="searchForm.staffName"
style="width: 240px"
- placeholder="璇疯緭鍏ュ悕绉版悳绱�"
+ placeholder="璇疯緭鍏ュ鍚嶆悳绱�"
@change="handleQuery"
clearable
:prefix-icon="Search"
@@ -17,6 +17,8 @@
</div>
<div>
<el-button type="primary" @click="openForm('add')">鏂板鍏ヨ亴</el-button>
+ <el-button @click="handleOut">瀵煎嚭</el-button>
+ <el-button type="danger" plain @click="handleDelete">鍒犻櫎</el-button>
</div>
</div>
<div class="table_list">
@@ -32,50 +34,42 @@
:total="total"
></PIMTable>
</div>
- <form-dia ref="formDia"></form-dia>
+ <form-dia ref="formDia" @close="handleQuery"></form-dia>
</div>
</template>
<script setup>
import { Search } from "@element-plus/icons-vue";
-import { ref } from "vue";
+import {onMounted, ref} from "vue";
import FormDia from "@/views/personnelManagement/onboarding/components/formDia.vue";
+import {staffJoinDel, staffJoinListPage} from "@/api/personnelManagement/onboarding.js";
+import {ElMessageBox} from "element-plus";
const data = reactive({
searchForm: {
- customerName: "",
- },
- form: {
- salesLedgerId: "",
- customerName: "",
- salesman: "",
- projectName: "",
- productData: [],
- },
- rules: {
- salesLedgerId: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
+ staffName: "",
},
});
-const { searchForm, form, rules } = toRefs(data);
+const { searchForm } = toRefs(data);
const tableColumn = ref([
{
label: "鐘舵��",
- prop: "paymentDate",
+ prop: "staffState",
dataType: "tag",
formatData: (params) => {
if (params == 0) {
- return "鍦ㄨ亴";
- } else if (params == 1) {
return "绂昏亴";
+ } else if (params == 1) {
+ return "鍦ㄨ亴";
} else {
return null;
}
},
formatType: (params) => {
if (params == 0) {
- return "primary";
- } else if (params == 1) {
return "danger";
+ } else if (params == 1) {
+ return "primary";
} else {
return null;
}
@@ -83,67 +77,82 @@
},
{
label: "鍛樺伐缂栧彿",
- prop: "supplierName",
+ prop: "staffNo",
},
{
label: "濮撳悕",
- prop: "currentPaymentAmount",
+ prop: "staffName",
},
{
label: "鎬у埆",
- prop: "paymentMethod",
+ prop: "sex",
},
{
label: "绫嶈疮",
- prop: "registrant",
+ prop: "nativePlace",
},
{
label: "宀椾綅",
- prop: "registrationtDate",
+ prop: "postJob",
},
{
label: "瀹跺涵浣忓潃",
- prop: "registrationtDate",
+ prop: "adress",
},
{
label: "绗竴瀛﹀巻",
- prop: "registrationtDate",
+ prop: "firstStudy",
},
{
label: "涓撲笟",
- prop: "registrationtDate",
+ prop: "profession",
},
{
label: "韬唤璇佸彿",
- prop: "registrationtDate",
+ prop: "identityCard",
},
{
label: "骞撮緞",
- prop: "registrationtDate",
+ prop: "age",
},
{
label: "鑱旂郴鐢佃瘽",
- prop: "registrationtDate",
+ prop: "phone",
},
{
label: "绱ф�ヨ仈绯讳汉",
- prop: "registrationtDate",
+ prop: "emergencyContact",
},
{
label: "鑱旂郴鐢佃瘽",
- prop: "registrationtDate",
+ prop: "emergencyContactPhone",
},
{
label: "鍚堝悓骞撮檺",
- prop: "registrationtDate",
+ prop: "contractTerm",
},
{
label: "鍚堝悓寮�濮嬫棩鏈�",
- prop: "registrationtDate",
+ prop: "contractStartTime",
},
{
label: "鍚堝悓缁撴潫鏃ユ湡",
- prop: "registrationtDate",
+ prop: "contractEndTime",
+ },
+ {
+ dataType: "action",
+ label: "鎿嶄綔",
+ align: "center",
+ fixed: 'right',
+ operation: [
+ {
+ name: "缂栬緫",
+ type: "text",
+ clickFun: (row) => {
+ openForm("edit", row);
+ },
+ },
+ ],
},
]);
const tableData = ref([]);
@@ -170,14 +179,17 @@
};
const getList = () => {
tableLoading.value = true;
-
+ staffJoinListPage({...page, ...searchForm.value, staffState: 1}).then(res => {
+ tableLoading.value = false;
+ tableData.value = res.data.records
+ total.value = res.data.total;
+ }).catch(err => {
+ tableLoading.value = false;
+ })
};
// 琛ㄦ牸閫夋嫨鏁版嵁
const handleSelectionChange = (selection) => {
- console.log("selection", selection);
- selectedRows.value = selection.filter(
- (item) => item.salesContractNo !== undefined
- );
+ selectedRows.value = selection;
};
// 鎵撳紑寮规
@@ -186,6 +198,48 @@
formDia.value?.openDialog(type, row)
})
};
+
+// 鍒犻櫎
+const handleDelete = () => {
+ let ids = [];
+ if (selectedRows.value.length > 0) {
+ ids = selectedRows.value.map((item) => item.id);
+ } else {
+ proxy.$modal.msgWarning("璇烽�夋嫨鏁版嵁");
+ return;
+ }
+ ElMessageBox.confirm("閫変腑鐨勫唴瀹瑰皢琚垹闄わ紝鏄惁纭鍒犻櫎锛�", "瀵煎嚭", {
+ confirmButtonText: "纭",
+ cancelButtonText: "鍙栨秷",
+ type: "warning",
+ })
+ .then(() => {
+ staffJoinDel(ids).then((res) => {
+ proxy.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+ getList();
+ });
+ })
+ .catch(() => {
+ proxy.$modal.msg("宸插彇娑�");
+ });
+};
+// 瀵煎嚭
+const handleOut = () => {
+ ElMessageBox.confirm("閫変腑鐨勫唴瀹瑰皢琚鍑猴紝鏄惁纭瀵煎嚭锛�", "瀵煎嚭", {
+ confirmButtonText: "纭",
+ cancelButtonText: "鍙栨秷",
+ type: "warning",
+ })
+ .then(() => {
+ proxy.download("/staff/staffJoinLeaveRecord/export", {staffState: 1}, "浜哄憳鍏ヨ亴.xlsx");
+ })
+ .catch(() => {
+ proxy.$modal.msg("宸插彇娑�");
+ });
+};
+onMounted(() => {
+ getList();
+});
</script>
<style scoped></style>
--
Gitblit v1.9.3