From d592ece7760d73c3adc51cbd63aae21f6e308dcd Mon Sep 17 00:00:00 2001
From: zhang_li <li.zhang@ccwin-in.com>
Date: Mon, 14 Jul 2025 17:36:57 +0800
Subject: [PATCH] =?UTF-8?q?YT-2797=E9=A1=BA=E5=BC=95=E5=8F=91=E8=B4=A7?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95=E5=A2=9E=E5=8A=A0=E3=80=90=E7=BB=B4=E6=8A=A4?=
 =?UTF-8?q?=E5=AF=B9=E8=B4=A6=E6=97=A5=E6=9C=9F=E3=80=91=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=EF=BC=8C=E5=AF=BC=E5=85=A5=E7=BA=B3=E5=85=A5=E5=8F=97=E9=A2=86?=
 =?UTF-8?q?=E4=B9=A6=E6=97=B6=EF=BC=8C=E5=A2=9E=E5=8A=A0=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E5=B7=AE=E5=BC=82=E6=95=B0=E6=8D=AE=E7=9A=84=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ImportForm/src/ImportFormStep.vue         | 22 +++++++++++++++++--
 .../deliverRecordMain/index.vue               |  3 ++-
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/src/components/ImportForm/src/ImportFormStep.vue b/src/components/ImportForm/src/ImportFormStep.vue
index 85b325071..6b187c0f0 100644
--- a/src/components/ImportForm/src/ImportFormStep.vue
+++ b/src/components/ImportForm/src/ImportFormStep.vue
@@ -89,7 +89,7 @@
           </el-button>
         </div>
         <el-button :disabled="formLoading || isShowLoading" type="primary" @click="submitForm" v-if="active == 0 || (active == 1 && !error)">{{ t('ts.下一步') }}</el-button>
-        <el-button :disabled="formLoading || isShowLoading" type="primary" @click="submitForm" v-if="active == 2 || (active == 1 && error)">{{ t('ts.好的') }}</el-button>
+        <!-- <el-button :disabled="formLoading || isShowLoading" type="primary" @click="submitForm" v-if="active == 2 || (active == 1 && error)">{{ t('ts.好的') }}</el-button> -->
         <el-button @click="dialogVisible = false">{{ t('ts.取 消') }}</el-button>
       </div>
     </template>
@@ -312,6 +312,7 @@ const isShowLoading = ref(false)
 
 /** 提交表单 */
 const submitForm = async () => {
+  debugger
   // 如果当前在确认数据步骤，调用确认函数
   if (active.value === 1) {
     isShowLoading.value = true
@@ -321,7 +322,24 @@ const submitForm = async () => {
       isShowLoading.value = false
     }else{
       if (props.confirmFormSuccess) {
-        await props.confirmFormSuccess(props.tableObject.tableList,
+        const pars= props.tableObject.tableList.map(obj => { 
+          return {
+            id: obj.id || null  ,
+            type: formRef.value.formModel.productionLineCode,
+            orderNumber: formRef.value.formModel.customerOrderNumber,
+            materialCode: obj.materialCode,
+            backNumber: obj.backNumber,
+            quantity: obj.incorporationQuantity,
+            materialDesc: obj.materialDesc,
+            startDate: formRef.value.formModelstartDate,
+            startNo: formRef.value.formModel.startNo,
+            endDate: formRef.value.formModel.endDate,
+            endNo: formRef.value.formModel.endNo,
+            customerCode: formRef.value.formModel.customerCode,
+            notIncludedList: [],
+          }
+        })
+        await props.confirmFormSuccess(pars,
           (msg)=>{
             if(msg){
               message.error(msg)
diff --git a/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/index.vue b/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/index.vue
index 67810e69c..de979f060 100644
--- a/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/index.vue
+++ b/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/index.vue
@@ -490,7 +490,8 @@ const searchFormClick = (searchData) => {
 
 
 const confirmFormSuccess = (dataList,callback) => {
-  DeliverRecordMainApi.inducedProductBatchUpdate(dataList).then(res=>{
+  MaintenanceBillDateApi.inducedProductBatchUpdate(dataList).then(res => {
+    console.log(res)
     if (res && res.code == 200) {
       getList()
     }