From 668af2140a5662cd028b389bec7d32fc55cff1c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= <2178503051@qq.com>
Date: Sat, 25 Apr 2026 09:40:12 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=A7=84=E6=A0=BC?=
 =?UTF-8?q?=E5=88=86=E5=89=B2=E5=8F=AF=E8=83=BD=E5=AF=BC=E8=87=B4=E7=9A=84?=
 =?UTF-8?q?undefined=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

处理多处规格(specification)分割时的空值情况，添加可选链操作符和默认值
修改wms报表合并查询参数，清空时间条件
调整acid页面容器样式
---
 klp-ui/src/views/crm/coil/index.vue            | 8 ++++----
 klp-ui/src/views/mes/qc/task/pages/raw.vue     | 2 +-
 klp-ui/src/views/micro/pages/acid/index.vue    | 4 ++++
 klp-ui/src/views/wms/anneal/plan/index.vue     | 2 +-
 klp-ui/src/views/wms/report/merge/index.vue    | 6 +++---
 klp-ui/src/views/wms/report/template/merge.vue | 6 +++---
 6 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/klp-ui/src/views/crm/coil/index.vue b/klp-ui/src/views/crm/coil/index.vue
index 012b5c60..870b0bbc 100644
--- a/klp-ui/src/views/crm/coil/index.vue
+++ b/klp-ui/src/views/crm/coil/index.vue
@@ -221,7 +221,7 @@ export default {
           let list = res.rows
           // 处理数据，添加宽度、厚度和数量字段
           list = list.map(item => {
-            const parts = item.specification ? item.specification.split('*') : [];
+            const parts = item.specification ? item.specification?.split('*') : [];
             return {
               ...item,
               thickness: parts[0] || '',
@@ -240,7 +240,7 @@ export default {
           let list = res.rows
           // 处理数据，添加宽度、厚度和数量字段
           list = list.map(item => {
-            const parts = item.specification ? item.specification.split('*') : [];
+            const parts = item.specification ? item.specification?.split('*') : [];
             return {
               ...item,
               thickness: parts[0] || '',
@@ -302,13 +302,13 @@ export default {
     /** 格式化厚度 */
     formatterThickness(row) {
       if (!row.specification) return '';
-      const parts = row.specification.split('*');
+      const parts = row.specification?.split('*') || [];
       return parts[0] || '';
     },
     /** 格式化宽度 */
     formatterWidth(row) {
       if (!row.specification) return '';
-      const parts = row.specification.split('*');
+      const parts = row.specification?.split('*') || [];
       return parts[1] || '';
     },
     /** 计算总数量和总重量 */
diff --git a/klp-ui/src/views/mes/qc/task/pages/raw.vue b/klp-ui/src/views/mes/qc/task/pages/raw.vue
index 7f0bc99b..e9c4d036 100644
--- a/klp-ui/src/views/mes/qc/task/pages/raw.vue
+++ b/klp-ui/src/views/mes/qc/task/pages/raw.vue
@@ -267,7 +267,7 @@ export default {
       });
     },
     handleCoilChange(coil) {
-      const [thickness, width] = coil.specification.split('*')
+      const [thickness, width] = coil.specification?.split('*') || []
       console.log(thickness, width, coil.netWeight)
       this.form.verifyTarget = {
         coilId: coil.coilId,
diff --git a/klp-ui/src/views/micro/pages/acid/index.vue b/klp-ui/src/views/micro/pages/acid/index.vue
index 245d9407..dd71e3eb 100644
--- a/klp-ui/src/views/micro/pages/acid/index.vue
+++ b/klp-ui/src/views/micro/pages/acid/index.vue
@@ -76,6 +76,10 @@ export default {
 </script>
 
 <style scoped lang="scss">
+.app-container {
+  padding: 0 !important;
+}
+
 .acid-container {
   display: flex;
   width: 100%;
diff --git a/klp-ui/src/views/wms/anneal/plan/index.vue b/klp-ui/src/views/wms/anneal/plan/index.vue
index 8d9e7cb8..ef6b60df 100644
--- a/klp-ui/src/views/wms/anneal/plan/index.vue
+++ b/klp-ui/src/views/wms/anneal/plan/index.vue
@@ -55,7 +55,7 @@
       </el-table-column>
       <el-table-column label="开始时间" align="center" prop="actualStartTime" width="160">
         <template slot-scope="scope">
-          {{ parseTime(scope.row.actualStartTime || scope.row.planStartTime, '{y}-{m}-{d} {h}:{i}') }}
+          {{ parseTime(scope.row.actualStartTime, '{y}-{m}-{d} {h}:{i}') }}
         </template>
       </el-table-column>
       <el-table-column label="结束时间" align="center" prop="endTime" width="160">
diff --git a/klp-ui/src/views/wms/report/merge/index.vue b/klp-ui/src/views/wms/report/merge/index.vue
index 4a90aac7..eba29507 100644
--- a/klp-ui/src/views/wms/report/merge/index.vue
+++ b/klp-ui/src/views/wms/report/merge/index.vue
@@ -251,8 +251,8 @@ export default {
       }
 
       const [lossRes, outRes] = await Promise.all([
-        listCoilWithIds({ ...this.queryParams, coilIds: lossIds.join(',') || '' }),
-        listCoilWithIds({ ...this.queryParams, coilIds: outIds.join(',') || '' }),
+        listCoilWithIds({ ...this.queryParams, coilIds: lossIds.join(',') || '', startTime: '', endTime: '' }),
+        listCoilWithIds({ ...this.queryParams, coilIds: outIds.join(',') || '', startTime: '', endTime: '' }),
       ]);
       this.lossList = lossRes.rows.map(item => {
         // 计算宽度和厚度，将规格按照*分割，*前的是厚度，*后的是宽度
@@ -265,7 +265,7 @@ export default {
       });
       this.outList = outRes.rows.map(item => {
         // 计算宽度和厚度，将规格按照*分割，*前的是厚度，*后的是宽度
-        const [thickness, width] = item.specification.split('*')
+        const [thickness, width] = item.specification?.split('*') || []
         return {
           ...item,
           computedThickness: parseFloat(thickness),
diff --git a/klp-ui/src/views/wms/report/template/merge.vue b/klp-ui/src/views/wms/report/template/merge.vue
index 88294be8..077e540f 100644
--- a/klp-ui/src/views/wms/report/template/merge.vue
+++ b/klp-ui/src/views/wms/report/template/merge.vue
@@ -253,12 +253,12 @@ export default {
       }
 
       const [lossRes, outRes] = await Promise.all([
-        listCoilWithIds({ ...this.queryParams, coilIds: lossIds.join(',') || '' }),
-        listCoilWithIds({ ...this.queryParams, coilIds: outIds.join(',') || '' }),
+        listCoilWithIds({ ...this.queryParams, coilIds: lossIds.join(',') || '', startTime: '', endTime: '' }),
+        listCoilWithIds({ ...this.queryParams, coilIds: outIds.join(',') || '', startTime: '', endTime: '' }),
       ]);
       this.lossList = lossRes.rows.map(item => {
         // 计算宽度和厚度，将规格按照*分割，*前的是厚度，*后的是宽度
-        const [thickness, width] = item.specification.split('*')
+        const [thickness, width] = item.specification?.split('*') || []
         return {
           ...item,
           computedThickness: parseFloat(thickness),