Merge branch 'zth' into dev

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,

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,

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) {
+    // if (!isMainBL.value) {
-      ApiData.steps[activeSteps.value].isCompleted = true
+    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;
       }
     }
   }