From 709bfab7ace20c7cfe41cbad7219a98db6338ac1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E5=90=8C=E6=B5=B7?=
 <14166000+zhangtonghai@user.noreply.gitee.com>
Date: Mon, 4 Nov 2024 09:24:14 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E8=B4=B9=E7=94=A8?=
 =?UTF-8?q?=E6=A8=A1=E6=9D=BF=20=20=E6=8C=89=E8=B4=B9=E7=94=A8=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=20id=20=E4=B8=8D=E5=90=8C=E9=97=AE=E9=A2=98=20?=
 =?UTF-8?q?=E5=AF=BC=E8=87=B4=E6=97=A0=E6=B3=95=E6=89=B9=E9=87=8F=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/baseinfo/infoclient/FeeCustTemplate/index.vue | 2 +-
 src/views/fee/FeeCustTemplate/index.vue                 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/baseinfo/infoclient/FeeCustTemplate/index.vue b/src/views/baseinfo/infoclient/FeeCustTemplate/index.vue
index b0b7dd85..f6d102f7 100644
--- a/src/views/baseinfo/infoclient/FeeCustTemplate/index.vue
+++ b/src/views/baseinfo/infoclient/FeeCustTemplate/index.vue
@@ -134,7 +134,7 @@
       return false
     } else {
       select.forEach((e) => {
-        ids.push(e.id)
+        ids.push(ShowView.value ? e.templateId : e.id)
       })
       openModal(true, {
         ids,
diff --git a/src/views/fee/FeeCustTemplate/index.vue b/src/views/fee/FeeCustTemplate/index.vue
index 2f68648e..5ef0b540 100644
--- a/src/views/fee/FeeCustTemplate/index.vue
+++ b/src/views/fee/FeeCustTemplate/index.vue
@@ -153,7 +153,7 @@
       return false
     } else {
       select.forEach((e) => {
-        ids.push(e.id)
+        ids.push(ShowView.value ? e.templateId : e.id)
       })
       openModal(true, {
         ids,

From 2617b8c2015775ba0233f228855cd9a97edaf546 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E5=90=8C=E6=B5=B7?=
 <14166000+zhangtonghai@user.noreply.gitee.com>
Date: Mon, 4 Nov 2024 09:52:14 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=8F=90=E5=8D=95=E7=A1=AE=E8=AE=A4=20?=
 =?UTF-8?q?=E4=B8=BB=E5=8D=95=20=E6=89=8B=E5=8A=A8=E7=A1=AE=E8=AE=A4=20=20?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../taskmanage/taskList/BLConfirmation/index.vue      | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/views/taskmanage/taskList/BLConfirmation/index.vue b/src/views/taskmanage/taskList/BLConfirmation/index.vue
index a056c701..0e052ae4 100644
--- a/src/views/taskmanage/taskList/BLConfirmation/index.vue
+++ b/src/views/taskmanage/taskList/BLConfirmation/index.vue
@@ -40,9 +40,6 @@
           </template>
         </a-step>
       </a-steps>
-      <a-button v-if="isMainBL && !activeStepsArr.length" type="primary" @click="FnSetSteps">
-        主单确认
-      </a-button>
     </div>
   </div>
 </template>
@@ -142,15 +139,14 @@
   }
   async function FnSetSteps() {
     let ApiData: any = {}
-    console.log(ApiData)
     tasksList.value.forEach((item: any) => {
       if (item.id == activeId.value) {
         ApiData = { ...item }
       }
     })
-    if (!isMainBL.value) {
-      ApiData.steps[activeSteps.value].isCompleted = true
-    }
+    // if (!isMainBL.value) {
+    ApiData.steps[activeSteps.value].isCompleted = true
+    // }
     // 是否自动同步更新主任务状态   (嵇工 说 最好是手动设置一下确保万无一失)
     ApiData.autoSync = true
     let res: any = null
@@ -268,6 +264,7 @@
       box-shadow: 0px -3px 6px rgba(214, 214, 214, 1);
       .steps {
         width: 800px;
+        justify-content: right;
       }
     }
   }