product-inventory-management.git

			@@ -39,6 +39,12 @@
			</div>
			<show-form-dia ref="formDia" @close="handleQuery"></show-form-dia>
			<new-or-edit-form-dia ref="formDiaNewOrEditFormDia" @close="handleQuery"></new-or-edit-form-dia>
			<renew-contract
			v-if="isShowRenewContractModal"
			v-model:visible="isShowRenewContractModal"
			:id="id"
			@completed="handleQuery"
			/>
			</div>
			</template>

			@@ -48,9 +54,9 @@
			import {ElMessageBox} from "element-plus";
			import {batchDeleteStaffOnJobs, staffOnJobListPage} from "@/api/personnelManagement/staffOnJob.js";
			import dayjs from "dayjs";

			const NewOrEditFormDia = defineAsyncComponent(() => import("@/views/personnelManagement/employeeRecord/components/NewOrEditFormDia.vue"));
			const ShowFormDia = defineAsyncComponent(() => import( "@/views/personnelManagement/employeeRecord/components/Show.vue"));
			const RenewContract = defineAsyncComponent(() => import( "@/views/personnelManagement/employeeRecord/components/RenewContract.vue"));

			const data = reactive({
			searchForm: {
			@@ -61,6 +67,8 @@
			},
			});
			const { searchForm } = toRefs(data);
			const isShowRenewContractModal = ref(false);
			const id = ref(0);
			const tableColumn = ref([
			{
			label: "状态",
			@@ -94,67 +102,40 @@
			prop: "staffName",
			},
			{
			label: "别名",
			prop: "alias",
			},
			{
			label: "手机",
			prop: "phone",
			width: 150,
			},
			{
			label: "性别",
			prop: "sex",
			},
			{
			label: "户籍住址",
			prop: "nativePlace",
			},
			{
			label: "部门",
			prop: "deptName",
			},
			{
			label: "岗位",
			prop: "postJob",
			},
			{
			label: "现住址",
			prop: "adress",
			width:200
			},
			{
			label: "第一学历",
			prop: "firstStudy",
			},
			{
			label: "专业",
			prop: "profession",
			width:100
			label: "出生日期",
			prop: "birthDate",
			width: 120,
			},
			{
			label: "年龄",
			prop: "age",
			},
			{
			label: "联系电话",
			prop: "phone",
			width:150
			label: "籍贯",
			prop: "nativePlace",
			},
			{
			label: "紧急联系人",
			prop: "emergencyContact",
			width: 120
			label: "民族",
			prop: "nation",
			width: 100,
			},
			{
			label: "紧急联系人电话",
			prop: "emergencyContactPhone",
			width:150
			},
			// {
			// label: "合同年限",
			// prop: "contractTerm",
			// },
			// {
			// label: "合同开始日期",
			// prop: "contractStartTime",
			// width: 120
			// },
			{
			label: "合同结束日期",
			prop: "contractExpireTime",
			width: 120
			label: "婚姻状况",
			prop: "maritalStatus",
			width: 100,
			},
			{
			dataType: "action",
			@@ -170,6 +151,15 @@
			openFormNewOrEditFormDia("edit", row);
			},
			},
			{
			name: "续签合同",
			type: "text",
			showHide: row => row.staffState === 1,
			clickFun: (row) => {
			isShowRenewContractModal.value = true;
			id.value = row.id;
			},
			},
			// {
			// name: "详情",
			// type: "text",