diff --git a/src/pages/person-exit/data-upload/index.vue b/src/pages/person-exit/data-upload/index.vue index 6c44861..ef47ce4 100644 --- a/src/pages/person-exit/data-upload/index.vue +++ b/src/pages/person-exit/data-upload/index.vue @@ -141,8 +141,11 @@ const afterRead = (e) => { // 打开确认出场提示弹框 const openConfirmExitModal = () => { - if (fileList.value.length === 0) { - exitContent.value = `当前没有上传离场工资结算确认单,是否确认将人员 <${exitParams.value.name}> 出场?` + console.log('fileList', fileList.value) + if (fileList.value.length === 0 && exitParams.value.isShanghai == 0) { + uni.$u.toast('请上传离场工资结算确认单') + return + // exitContent.value = `当前没有上传离场工资结算确认单,是否确认将人员 <${exitParams.value.name}> 出场?` } else { exitContent.value = `是否确认将人员 ${exitParams.value.name} 出场?` } @@ -155,6 +158,8 @@ const onConfirmExit = async () => { id: exitParams.value.id, proId: exitParams.value.proId, workerId: exitParams.value.workerId, + subId: exitParams.value.subId, + teamId: exitParams.value.teamId, exitWay: 'APP', } diff --git a/src/pages/person-exit/index.vue b/src/pages/person-exit/index.vue index da752a2..f21e9d3 100644 --- a/src/pages/person-exit/index.vue +++ b/src/pages/person-exit/index.vue @@ -196,7 +196,19 @@ const onPersonExitItem = (item) => { uni.$u.toast('人员已出场') return } - const { name, id, proId, proName, subName, idNumber, workerId, teamName } = item + const { + name, + id, + proId, + proName, + subName, + idNumber, + workerId, + teamName, + subId, + teamId, + isShanghai, + } = item const params = { name, id, @@ -206,6 +218,9 @@ const onPersonExitItem = (item) => { idNumber, workerId, teamName, + subId, + teamId, + isShanghai, } uni.navigateTo({ url: `/pages/person-exit/data-upload/index?params=${JSON.stringify(params)}`,