From 81c0abde4b25c5d604d761a4fab41b50f8d1c549 Mon Sep 17 00:00:00 2001
From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com>
Date: Tue, 30 Dec 2025 17:40:51 +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

---
 .../basic-manage/project-setting/index.vue    |  4 +-
 .../sub-base-info/add-or-edit-form.vue        |  2 +-
 .../team-base-info/add-or-edit-form.vue       |  1 +
 .../person-entry/add-or-edit-form.vue         | 81 ++++++++++++-------
 4 files changed, 56 insertions(+), 32 deletions(-)

diff --git a/src/views/basic-manage/project-setting/index.vue b/src/views/basic-manage/project-setting/index.vue
index 12c3101..0bd4c27 100644
--- a/src/views/basic-manage/project-setting/index.vue
+++ b/src/views/basic-manage/project-setting/index.vue
@@ -271,8 +271,8 @@ export default {
                 this.formData = {
                     id,
                     proAreaList: proArea.split(','),
-                    isNeed,
-                    type,
+                    isNeed: isNeed * 1,
+                    type: type * 1,
                     subId: subId + '',
                     proTypeList: proType ? proType.split(',') : [],
                 }
diff --git a/src/views/basic-manage/sub-manage/sub-base-info/add-or-edit-form.vue b/src/views/basic-manage/sub-manage/sub-base-info/add-or-edit-form.vue
index a46460c..02071fc 100644
--- a/src/views/basic-manage/sub-manage/sub-base-info/add-or-edit-form.vue
+++ b/src/views/basic-manage/sub-manage/sub-base-info/add-or-edit-form.vue
@@ -39,7 +39,7 @@
                             clearable
                             filterable
                             style="width: 100%"
-                            :disabled="subIsDisabled"
+                            :disabled="subIsDisabled || formType === 2"
                             placeholder="请选择所属分公司"
                             v-model="addOrEditForm.subComId"
                         >
diff --git a/src/views/basic-manage/team-manage/team-base-info/add-or-edit-form.vue b/src/views/basic-manage/team-manage/team-base-info/add-or-edit-form.vue
index 8c5ec0e..93fd55d 100644
--- a/src/views/basic-manage/team-manage/team-base-info/add-or-edit-form.vue
+++ b/src/views/basic-manage/team-manage/team-base-info/add-or-edit-form.vue
@@ -30,6 +30,7 @@
                             style="width: 100%"
                             placeholder="请选择分包名称"
                             v-model="addOrEditForm.subId"
+                            :disabled="editFormData.id"
                         >
                             <el-option
                                 :key="item.value"
diff --git a/src/views/construction-person/entry-and-exit-manage/person-entry/add-or-edit-form.vue b/src/views/construction-person/entry-and-exit-manage/person-entry/add-or-edit-form.vue
index 4f942ec..a76c42e 100644
--- a/src/views/construction-person/entry-and-exit-manage/person-entry/add-or-edit-form.vue
+++ b/src/views/construction-person/entry-and-exit-manage/person-entry/add-or-edit-form.vue
@@ -1345,41 +1345,64 @@ export default {
                                                         ? editEntryPersonAPI
                                                         : addEntryPersonAPI
 
-                                                    const res = await API(
-                                                        formData,
-                                                    )
-                                                    if (res.code === 200) {
-                                                        resolve()
-                                                        this.$modal.msgSuccess(
-                                                            res.msg,
+                                                    try {
+                                                        const res = await API(
+                                                            formData,
                                                         )
 
-                                                        // 更新一下红绿灯状态
-                                                        const result =
-                                                            await updatePersonLightStatusAPI(
-                                                                {
-                                                                    workerId:
-                                                                        this
-                                                                            .queryDetailsId
-                                                                            ? this
-                                                                                  .queryDetailsId
-                                                                            : res.data,
-
-                                                                    proId: this
-                                                                        .keyInfoForm
-                                                                        .proId,
-                                                                },
-                                                            )
                                                         console.log(
-                                                            result,
-                                                            'result红绿灯状态更新结果',
+                                                            res,
+                                                            'res请求结果',
                                                         )
-                                                    } else {
-                                                        this.$modal.msgError(
-                                                            res.msg,
+                                                        if (res.code === 200) {
+                                                            resolve()
+                                                            this.$modal.msgSuccess(
+                                                                res.msg,
+                                                            )
+
+                                                            const result =
+                                                                await updatePersonLightStatusAPI(
+                                                                    {
+                                                                        workerId:
+                                                                            this
+                                                                                .queryDetailsId
+                                                                                ? this
+                                                                                      .queryDetailsId
+                                                                                : res.data,
+
+                                                                        proId: this
+                                                                            .keyInfoForm
+                                                                            .proId,
+                                                                    },
+                                                                )
+                                                            console.log(
+                                                                result,
+                                                                'result红绿灯状态更新结果',
+                                                            )
+                                                        } else {
+                                                            console.log(
+                                                                res.msg,
+                                                                '请求失败--',
+                                                            )
+                                                            this.$modal.msgError(
+                                                                res.msg,
+                                                            )
+                                                            reject(
+                                                                new Error(
+                                                                    res.msg,
+                                                                ),
+                                                            )
+                                                        }
+                                                    } catch (error) {
+                                                        const errorMsg =
+                                                            error.message ||
+                                                            '操作失败，请稍后重试'
+                                                        console.error(
+                                                            errorMsg,
+                                                            '请求异常--',
                                                         )
                                                         reject(
-                                                            new Error(res.msg),
+                                                            new Error(errorMsg),
                                                         )
                                                     }
                                                 } else {