From fa14d9f2810375b9a40cfe68b1daa75d48e6fd6d Mon Sep 17 00:00:00 2001 From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com> Date: Mon, 17 Nov 2025 10:35:04 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 4 +- src/components/ContractForm/index.vue | 14 +++++ .../child-pages/addAndEditPerson.vue | 8 +++ src/pages/person-exit/data-upload/index.vue | 15 ++++- src/pages/person-exit/index.vue | 11 +++- .../child-pages/addProject.vue | 58 ++++++++----------- src/pages/shProjectDetails/index.vue | 4 ++ 7 files changed, 73 insertions(+), 41 deletions(-) diff --git a/.env.development b/.env.development index 61332c1..5c9d8d5 100644 --- a/.env.development +++ b/.env.development @@ -1,5 +1,5 @@ # VITE_API_BASE_URL = http://112.29.103.165:1616 -# VITE_API_BASE_URL = /api -VITE_API_BASE_URL = http://192.168.0.14:1999/hd-real-name +VITE_API_BASE_URL = /api +# VITE_API_BASE_URL = http://192.168.0.14:1999/hd-real-name # VITE_API_BASE_URL = http://192.168.0.234:38080/hd-real-name # VITE_API_BASE_URL = http://192.168.0.234:38080 diff --git a/src/components/ContractForm/index.vue b/src/components/ContractForm/index.vue index 6728e55..3ab6beb 100644 --- a/src/components/ContractForm/index.vue +++ b/src/components/ContractForm/index.vue @@ -409,6 +409,19 @@ const updateContractInfo = () => { Object.assign(contractInfoForm.value, props.contractInfo) } +const resetForm = () => { + contractInfoForm.value = { + contractCode: '', // 合同编号 + contractTermType: '以完成一定工作为期限的合同', // 合同期限类型 + contractStartDate: null, // 合同签订日期 + contractStopDate: null, // 合同终止日期 + wageApprovedWay: '天', // 工资核定方式 + wageCriterion: '', // 工资核定标准 + } + contractImageList.value[0].fileList = [] + contractImageIdList.value = [] +} + // 初始化工资核定标准正则表达式 const initSalaryRegexp = (num) => { // 确保num是1-999999之间的整数 @@ -499,6 +512,7 @@ const initSalaryMessage = (num) => { // 向父组件暴露方法 defineExpose({ validateContractForm, + resetForm, updateContractInfo, }) diff --git a/src/pages/person-entry/child-pages/addAndEditPerson.vue b/src/pages/person-entry/child-pages/addAndEditPerson.vue index 86a4e34..4de6124 100644 --- a/src/pages/person-entry/child-pages/addAndEditPerson.vue +++ b/src/pages/person-entry/child-pages/addAndEditPerson.vue @@ -119,6 +119,14 @@ const props = defineProps({ type: [Number, String], default: '', }, + proId: { + type: [Number, String], + default: '', + }, + einStatus: { + type: [Number, String], + default: '', + }, }) // 步骤条 diff --git a/src/pages/person-exit/data-upload/index.vue b/src/pages/person-exit/data-upload/index.vue index 29097c9..05bcf46 100644 --- a/src/pages/person-exit/data-upload/index.vue +++ b/src/pages/person-exit/data-upload/index.vue @@ -47,7 +47,10 @@ 离场工资结算确认单 - 离场工资结算确认单 + + * + + 离场工资结算确认单 { fileList.value = fileList.value.filter((item) => item.id !== e.file.id) @@ -305,7 +314,7 @@ onLoad((options) => { display: flex; align-items: center; - & text:first-child { + & text:nth-child(2) { display: inline-block; width: 200rpx; color: #909399; diff --git a/src/pages/person-exit/index.vue b/src/pages/person-exit/index.vue index 2178959..38d9fd5 100644 --- a/src/pages/person-exit/index.vue +++ b/src/pages/person-exit/index.vue @@ -123,6 +123,7 @@ const queryParams = ref({ name: '', subName: '', proName: '', + proId: '', }) const statusList = ref([ @@ -147,17 +148,20 @@ const onSearchName = () => { switch (searchType.value) { case 1: queryParams.value.name = searchValue.value - queryParams.value.proName = commonStore?.activeProjectName + queryParams.value.proName = '' + queryParams.value.proId = commonStore?.activeProjectId queryParams.value.subName = '' break case 2: queryParams.value.subName = searchValue.value - queryParams.value.proName = commonStore?.activeProjectName + queryParams.value.proName = '' + queryParams.value.proId = commonStore?.activeProjectId queryParams.value.name = '' break case 3: queryParams.value.proName = searchValue.value + queryParams.value.proId = '' queryParams.value.name = '' queryParams.value.subName = '' break @@ -252,7 +256,8 @@ const hasMore = computed(() => { }) onMounted(() => { - queryParams.value.proName = commonStore?.activeProjectName + // queryParams.value.proName = commonStore?.activeProjectName + queryParams.value.proId = commonStore?.activeProjectId onInputLoaded() getPersonExitListFun() uni.$on('refreshPersonExitList', onSearchName) diff --git a/src/pages/shProjectDetails/child-pages/addProject.vue b/src/pages/shProjectDetails/child-pages/addProject.vue index 4d107e6..58f3da7 100644 --- a/src/pages/shProjectDetails/child-pages/addProject.vue +++ b/src/pages/shProjectDetails/child-pages/addProject.vue @@ -215,6 +215,30 @@ const formRef = ref(null) // 表单ref const showLoading = ref(false) // 是否显示加载中 const workerId = ref('') // 人员ID const personContractFormRef = ref(null) // 合同见证表单ref +const contractInfo = ref({}) // 合同信息 +const contractImageList = ref([ + { + type: 1, + fileList: [], + name: 'contract', + title: '人员手持合同照', + }, +]) // 合同图片 + +const props = defineProps({ + workerId: { + type: [Number, String], + default: '', + }, + name: { + type: [String], + default: '', + }, + idCard: { + type: [String], + default: '', + }, +}) // 表单数据 const formData = ref({ @@ -230,39 +254,6 @@ const formData = ref({ postId: '', id: '', }) -const contractInfo = ref({}) // 合同信息 -const contractImageList = ref([ - { - type: 1, - fileList: [], - name: 'contract', - title: '人员手持合同照', - }, - // { - // type: 2, - // fileList: [], - // name: 'contract', - // title: '工作内容页', - // }, - // { - // type: 3, - // fileList: [], - // name: 'contract', - // title: '薪酬约定页', - // }, - // { - // type: 4, - // fileList: [], - // name: 'contract', - // title: '本人签名页', - // }, - // { - // type: 5, - // fileList: [], - // name: 'contract', - // title: '其他照片', - // }, -]) // 合同图片 // 表单验证规则 const formRules = ref({ @@ -455,6 +446,7 @@ const submitData = async (isContinue) => { teamName: '', id: workerId.value, } + personContractFormRef.value.resetForm() } else { setTimeout(() => { uni.navigateBack() diff --git a/src/pages/shProjectDetails/index.vue b/src/pages/shProjectDetails/index.vue index ea0ab3e..b917827 100644 --- a/src/pages/shProjectDetails/index.vue +++ b/src/pages/shProjectDetails/index.vue @@ -68,6 +68,10 @@ const workerId = ref('') // 人员ID const name = ref('') // 姓名 const idCardNumber = ref('') // 身份证号码 +defineOptions({ + inheritAttrs: false, +}) + // 获取上海多工程明细 const getShProjectDetailsListFun = async () => { const res = await getShProjectListByWorkerIdAPI({