From 551a72b444c66bf6afc369d86fda8fd2de820675 Mon Sep 17 00:00:00 2001
From: ljlong_2630 <ljlong_2630@yeah.net>
Date: Tue, 12 Nov 2024 11:45:58 +0800
Subject: [PATCH] =?UTF-8?q?YT-868=EF=BC=9A=E7=BA=B3=E5=85=A5=E5=8F=97?=
 =?UTF-8?q?=E9=A2=86=E4=B9=A6=E6=88=90=E5=8A=9F=E5=90=8E=E6=B2=A1=E6=9C=89?=
 =?UTF-8?q?=E5=85=A5=E5=BA=93=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/deliverRecordMain/index.ts        |  8 ++
 .../ImportForm/src/ImportFormStep.vue         | 89 +++++++++++++++----
 .../deliverRecordMain/index.vue               | 12 +++
 3 files changed, 92 insertions(+), 17 deletions(-)

diff --git a/src/api/wms/deliverRecordMain/index.ts b/src/api/wms/deliverRecordMain/index.ts
index 155d1f193..0a59935f4 100644
--- a/src/api/wms/deliverRecordMain/index.ts
+++ b/src/api/wms/deliverRecordMain/index.ts
@@ -92,4 +92,12 @@ export const importDirectSupplyTemplate = () => {
   return request.download({ url: '/wms/deliver-record-main/get-direct-supply-import-template' })
 }
 
+//纳入受领书导入成功，入库
+export const inducedProductBatchUpdate = (data) => {
+  return request.post({ url: '/wms/leadership-incorporation-doc-request/induced-product-batch-update',data })
+}
+
+
+
+
 
diff --git a/src/components/ImportForm/src/ImportFormStep.vue b/src/components/ImportForm/src/ImportFormStep.vue
index 956748d1d..44fe0bd04 100644
--- a/src/components/ImportForm/src/ImportFormStep.vue
+++ b/src/components/ImportForm/src/ImportFormStep.vue
@@ -47,23 +47,24 @@
           </template>
         </el-upload>
       </div>
-      <div v-if="active == 1">
-        <div class="red">
+      <div v-if="active == 1" class="step-two-container">
+        <div class="warning-message">
           <el-icon color="#E44033" size="18" style="margin-right: 6px;"><WarningFilled /></el-icon>
           纳入受领书数量与顺引发货记录数量不一致，无法导入。以下是差异数据。
         </div>
-        
-        <Table v-clientTable
-          :columns="Array.isArray(currentColumns) ? currentColumns : []"
-          :data="tableObject.tableList"
-          :loading="tableObject.loading"
-          :pagination="{
-            total: tableObject.total
-          }"
-          v-model:pageSize="tableObject.pageSize"
-          v-model:currentPage="tableObject.currentPage"
-          v-model:sort="tableObject.sort"
-        />
+        <div class="table-container">
+          <Table v-clientTable
+            :columns="Array.isArray(currentColumns) ? currentColumns : []"
+            :data="tableObject.tableList"
+            :loading="tableObject.loading"
+            :pagination="{
+              total: tableObject.total
+            }"
+            v-model:pageSize="tableObject.pageSize"
+            v-model:currentPage="tableObject.currentPage"
+            v-model:sort="tableObject.sort"
+          />
+        </div>
       </div>
       <div v-else-if="active == 2" class="success">
         <el-icon color="#409eff" size="60"><CircleCheckFilled /></el-icon>
@@ -175,6 +176,11 @@ const props = defineProps({
     required: false,
     default: true
   },
+  // 成功入库接口
+  confirmFormSuccess: {
+    type: Function,
+    required: false,
+  },
 })
 
 // 确保 tableObject 是响应式的
@@ -206,10 +212,26 @@ const formRef = ref()
 
 /** 提交表单 */
 const submitForm = async () => {
-  // 如果当前在确认数据步骤，直接进入下一步
+  // 如果当前在确认数据步骤，调用确认函数
   if (active.value === 1) {
-    active.value = 2
-    return
+    if (props.confirmFormSuccess) {
+      const result = await props.confirmFormSuccess(props.tableObject.tableList,
+        (msg)=>{
+          if(msg){
+            message.error(msg)
+            return
+          }else{
+            message.success(msg)
+            active.value = 2  // 设置为第三步
+            return
+          }
+        }
+      )
+    }
+  }
+  if(active.value === 2){
+    dialogVisible.value = false
+    return;
   }
   
   const elForm = unref(formRef)?.getElFormRef()
@@ -441,4 +463,37 @@ const importTemplate = () => {
   align-items: center;
   margin-top: 8px;
 }
+.step-two-container {
+  display: flex;
+  flex-direction: column;
+  height: 400px; // 根据实际需求调整
+
+  .warning-message {
+    margin-bottom: 10px;
+    color: #E44033;
+    display: flex;
+    align-items: center;
+  }
+
+  .table-container {
+    flex: 1;
+    overflow: hidden;
+    display: flex;
+    flex-direction: column;
+
+    :deep(.el-table) {
+      flex: 1;
+      overflow: hidden;
+      
+      .el-table__body-wrapper {
+        overflow-y: auto;
+      }
+    }
+
+    :deep(.el-pagination) {
+      margin-top: 10px;
+      padding: 5px 0;
+    }
+  }
+}
 </style>
\ No newline at end of file
diff --git a/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/index.vue b/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/index.vue
index 2021a83d9..434685ead 100644
--- a/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/index.vue
+++ b/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/index.vue
@@ -71,6 +71,7 @@
       @success="importSuccess"
       accept=".txt"
       :isShowDownloadBtn="false" 
+      :confirmFormSuccess="confirmFormSuccess"
   />
 </template>
 <script setup lang="ts">
@@ -242,6 +243,17 @@ const searchFormClick = (searchData) => {
   getList() // 刷新当前列表
 }
 
+
+const confirmFormSuccess = (dataList,callback) => {
+  DeliverRecordMainApi.inducedProductBatchUpdate(dataList).then(res=>{
+    if (res && res.code == 200) {
+      getList()
+    } 
+    callback(res.msg);
+  })
+}
+
+
 /** 导入 */
 const importFormRef = ref()
 const receiptOfInclusion = async () => {