From 4fefc68bbcf40fb6539410d73446b9ec1c60b964 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= <2178503051@qq.com>
Date: Mon, 20 Apr 2026 11:04:14 +0800
Subject: [PATCH] =?UTF-8?q?fix(wms):=20=E4=BF=AE=E5=A4=8D=E5=90=88?=
 =?UTF-8?q?=E5=90=8CID=E4=B8=BA=E7=A9=BA=E6=97=B6=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=90=88=E5=90=8C=E5=85=B3=E7=B3=BB=E7=9A=84=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

在合并、分条和批量分条操作中，当合同ID为空时不再尝试添加合同关系
同时优化批量分条时的合同关系添加逻辑，先过滤掉空合同ID
---
 klp-ui/src/views/wms/coil/merge.vue                 | 10 ++++++----
 klp-ui/src/views/wms/coil/panels/stepSplit.vue      | 10 ++++++----
 klp-ui/src/views/wms/coil/split.vue                 | 13 ++++++++-----
 .../src/views/wms/report/template/comprehensive.vue |  4 ++--
 4 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/klp-ui/src/views/wms/coil/merge.vue b/klp-ui/src/views/wms/coil/merge.vue
index 41503338..1f6df764 100644
--- a/klp-ui/src/views/wms/coil/merge.vue
+++ b/klp-ui/src/views/wms/coil/merge.vue
@@ -766,10 +766,12 @@ export default {
 
         const coilId = response.data;
 
-        addCoilContractRel({
-          coilId: coilId,
-          contractId: this.targetCoil.contractId,
-        })
+        if (this.targetCoil.contractId) {
+          addCoilContractRel({
+            coilId: coilId,
+            contractId: this.targetCoil.contractId,
+          })
+        }
         this.$message.success('合卷保存成功');
 
         // 延迟返回，让用户看到成功提示
diff --git a/klp-ui/src/views/wms/coil/panels/stepSplit.vue b/klp-ui/src/views/wms/coil/panels/stepSplit.vue
index cb9fdc68..c2c1a0ef 100644
--- a/klp-ui/src/views/wms/coil/panels/stepSplit.vue
+++ b/klp-ui/src/views/wms/coil/panels/stepSplit.vue
@@ -675,10 +675,12 @@ export default {
           // 新增分条：调用创建接口
           res = await createSpecialChild(this.coilId, this.actionId, splitData)
           // 新增分条后，需要添加分条的合同关系
-          addCoilContractRel({
-            coilId: res.data.coilId,
-            contractId: this.splitForm.contractId,
-          })
+          if (this.splitForm.contractId) {
+            addCoilContractRel({
+              coilId: res.data.coilId,
+              contractId: this.splitForm.contractId,
+            })
+          }
         }
 
         this.$message.success(this.splitForm.coilId ? '编辑分条成功' : '新增分条成功')
diff --git a/klp-ui/src/views/wms/coil/split.vue b/klp-ui/src/views/wms/coil/split.vue
index ae430500..17871357 100644
--- a/klp-ui/src/views/wms/coil/split.vue
+++ b/klp-ui/src/views/wms/coil/split.vue
@@ -684,12 +684,15 @@ export default {
 
           // 拿到多个子卷的coilId
           const newCoilIds = response.msg.split(',');
+          // 先构建所有的请求体，并移除合同为空为空的项
+          const requests = newCoilIds.map((coilId, index) => ({
+            coilId,
+            contractId: this.splitList[index].contractId
+          }))
+          .filter(req => req.contractId);
           // 为每个子卷添加合同关联
-          Promise.all(newCoilIds.map(async (coilId, index) => {
-            addCoilContractRel({
-              coilId,
-              contractId: this.splitList[index].contractId
-            });
+          Promise.all(requests.map(async (req, index) => {
+            addCoilContractRel(req);
           }));
 
           // 如果是从待操作列表进来的，标记操作为完成
diff --git a/klp-ui/src/views/wms/report/template/comprehensive.vue b/klp-ui/src/views/wms/report/template/comprehensive.vue
index 04e7748b..d2b61d38 100644
--- a/klp-ui/src/views/wms/report/template/comprehensive.vue
+++ b/klp-ui/src/views/wms/report/template/comprehensive.vue
@@ -26,10 +26,10 @@
       <!-- 自定义日期选择器 -->
       <span v-if="viewType === 'custom'" style="margin-left: 10px;">
         <el-date-picker  style="width: 200px;" v-model="queryParams.byCreateTimeStart"
-          type="date" value-format="yyyy-MM-dd" placeholder="选择开始日期"></el-date-picker>
+          type="datetime" value-format="yyyy-MM-dd HH:mm:ss" placeholder="选择开始日期"></el-date-picker>
         至
         <el-date-picker style="width: 200px;" v-model="queryParams.byCreateTimeEnd"
-          type="date" value-format="yyyy-MM-dd" placeholder="选择结束日期"></el-date-picker>
+          type="datetime" value-format="yyyy-MM-dd HH:mm:ss" placeholder="选择结束日期"></el-date-picker>
       </span>
     </div>
     <el-row>