From c08aa7939c7829561d3cc4b6b25546ed3eefcac9 Mon Sep 17 00:00:00 2001
From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com>
Date: Mon, 29 Dec 2025 18:18:37 +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

---
 src/api/common.js                                |  9 ++++++++-
 .../entry-and-exit-manage/person-exit.js         |  9 +++++++++
 .../person-entry/shanghai-pro-setting.vue        | 10 ++++++++--
 .../person-exit/person-exit-form.vue             | 16 +++++++++++++---
 4 files changed, 38 insertions(+), 6 deletions(-)

diff --git a/src/api/common.js b/src/api/common.js
index 830dccb..dc236cd 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -67,9 +67,16 @@ export const getPostTypeSelectListAPI = () => {
 }
 
 // 获取标段工程下拉列表 ----- 携带查询条件的
+// export function getLotProjectSelectListByConditionAPI(data) {
+//     return request({
+//         url: '/bmw/select/selectPro',
+//         method: 'POST',
+//         data,
+//     })
+// }
 export function getLotProjectSelectListByConditionAPI(data) {
     return request({
-        url: '/bmw/select/selectPro',
+        url: '/bmw/select/selectDgcPro',
         method: 'POST',
         data,
     })
diff --git a/src/api/construction-person/entry-and-exit-manage/person-exit.js b/src/api/construction-person/entry-and-exit-manage/person-exit.js
index 84f3255..a4c2e5f 100644
--- a/src/api/construction-person/entry-and-exit-manage/person-exit.js
+++ b/src/api/construction-person/entry-and-exit-manage/person-exit.js
@@ -46,6 +46,15 @@ export const uploadExitFileAPI = (data) => {
     })
 }
 
+// 判断当前人员是否需要上传离场结算确认单
+export const checkExitFileAPI = (data) => {
+    return request({
+        url: '/bmw/proConfig/getConfigByProId',
+        method: 'POST',
+        data,
+    })
+}
+
 // 人员出场 删除人员接口
 export const deleteEntryPersonAPI = (data) => {
     return request({
diff --git a/src/views/construction-person/entry-and-exit-manage/person-entry/shanghai-pro-setting.vue b/src/views/construction-person/entry-and-exit-manage/person-entry/shanghai-pro-setting.vue
index 12ee972..79d8edc 100644
--- a/src/views/construction-person/entry-and-exit-manage/person-entry/shanghai-pro-setting.vue
+++ b/src/views/construction-person/entry-and-exit-manage/person-entry/shanghai-pro-setting.vue
@@ -20,7 +20,10 @@
 
             <div class="content">
                 <span> 人员同时入场多个工程设置 </span>
-                <span> 1. 请确保该人员已经入场一个上海工程 </span>
+                <span>
+                    1.
+                    请确保该人员已经入场一个工程，并且该人员所在公司允许同时入场多个工程
+                </span>
                 <span>
                     2.
                     每个工程，人员只能存在一条在场数据，即一个工程只能入场一次
@@ -57,7 +60,10 @@
 
                 <div class="content-detail">
                     <span> 人员同时入场多个工程设置 </span>
-                    <span> 1. 请确保该人员已经入场一个上海工程 </span>
+                    <span>
+                        1.
+                        请确保该人员已经入场一个工程，并且该人员所在公司允许同时入场多个工程
+                    </span>
                     <span>
                         2.
                         每个工程，人员只能存在一条在场数据，即一个工程只能入场一次
diff --git a/src/views/construction-person/entry-and-exit-manage/person-exit/person-exit-form.vue b/src/views/construction-person/entry-and-exit-manage/person-exit/person-exit-form.vue
index 4509676..3789423 100644
--- a/src/views/construction-person/entry-and-exit-manage/person-exit/person-exit-form.vue
+++ b/src/views/construction-person/entry-and-exit-manage/person-exit/person-exit-form.vue
@@ -85,6 +85,7 @@ import UploadFileFormData from '@/components/UploadFileFormData'
 import {
     addEntryPersonAPI,
     uploadExitFileAPI,
+    checkExitFileAPI,
 } from '@/api/construction-person/entry-and-exit-manage/person-exit'
 export default {
     name: 'personExitForm',
@@ -122,9 +123,7 @@ export default {
                 fileList: [
                     {
                         trigger: 'change,blur',
-                        required:
-                            this.isExitUpload === 2 ||
-                            (this.isExitUpload !== 2 && this.isShanghai == 0),
+                        required: this.checkExitFileFun() == 1,
                         message: '请上传离场工资结算确认单',
                     },
                 ],
@@ -220,6 +219,16 @@ export default {
                 }
             })
         },
+
+        // 判断当前人员是否需要上传离场结算确认单
+        async checkExitFileFun() {
+            const res = await checkExitFileAPI({
+                proId: this.personExitFormData.proId,
+            })
+            if (res.code === 200) {
+                return res.data.tczm
+            }
+        },
     },
 
     watch: {
@@ -227,6 +236,7 @@ export default {
             handler(newVal) {
                 if (Object.keys(newVal).length > 0) {
                     Object.assign(this.personExitFormData, newVal)
+                    this.checkExitFileFun()
                 }
             },
             deep: true,