From aa6fa7784211f4c4234572c55c223d845dc04297 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= <2178503051@qq.com>
Date: Fri, 15 May 2026 09:16:15 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=A4=9A=E9=A1=B5=E9=9D=A2=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=9F=E8=83=BD=E4=B8=8E=E4=BF=AE=E5=A4=8D=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=B1=95=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1. 为PlanSheetList添加loading状态与容器绑定
2. 为拉矫报表系列页面新增仓库选项传递与参数绑定
3. 修复APS计划单表格字段映射路径错误
4. 优化wms报表模板接口调用参数与组件props定义
5. 完善crm订单详情提示信息与注释代码
---
 klp-ui/src/views/aps/planSheet/PlanSheetList.vue    |  3 ++-
 klp-ui/src/views/aps/planSheet/index.vue            |  4 ++--
 klp-ui/src/views/crm/components/OrderDetail.vue     | 10 +++++-----
 .../src/views/wms/report/lajiao/comprehensive.vue   | 13 ++++++++-----
 klp-ui/src/views/wms/report/lajiao/day.vue          |  8 ++++++++
 klp-ui/src/views/wms/report/lajiao/loss.vue         | 13 ++++++++-----
 klp-ui/src/views/wms/report/lajiao/month.vue        | 13 ++++++++-----
 klp-ui/src/views/wms/report/lajiao/out.vue          | 13 ++++++++-----
 klp-ui/src/views/wms/report/lajiao/team.vue         | 13 ++++++++-----
 klp-ui/src/views/wms/report/lajiao/year.vue         | 13 ++++++++-----
 klp-ui/src/views/wms/report/template/action.vue     |  8 ++++++--
 11 files changed, 71 insertions(+), 40 deletions(-)

diff --git a/klp-ui/src/views/aps/planSheet/PlanSheetList.vue b/klp-ui/src/views/aps/planSheet/PlanSheetList.vue
index 24a10763..4d097f58 100644
--- a/klp-ui/src/views/aps/planSheet/PlanSheetList.vue
+++ b/klp-ui/src/views/aps/planSheet/PlanSheetList.vue
@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div v-loading="loading">
     <div class="tab-container">
       <div class="select-button" @click="openPlanSheetDialog">
         <i class="el-icon-setting"></i>
@@ -156,6 +156,7 @@ export default {
       planSheetDialogVisible: false,
       // 当前激活的tab
       activeTab: '',
+      loading: false,
       // 查询参数
       queryParams: {
         pageNum: 1,
diff --git a/klp-ui/src/views/aps/planSheet/index.vue b/klp-ui/src/views/aps/planSheet/index.vue
index 9c824045..f52bd75a 100644
--- a/klp-ui/src/views/aps/planSheet/index.vue
+++ b/klp-ui/src/views/aps/planSheet/index.vue
@@ -460,8 +460,8 @@
               <el-table v-loading="batchItemLoading" :data="batchItemList" style="width: 100%" border
                 @selection-change="handleBatchItemSelectionChange">
                 <el-table-column type="selection" width="55" />
-                <el-table-column label="合同号" align="center" prop="contractCode" width="120" />
-                <el-table-column label="客户" align="center" prop="companyName" width="150" />
+                <el-table-column label="合同号" align="center" prop="orderInfo.contractCode" width="120" />
+                <el-table-column label="客户" align="center" prop="orderInfo.companyName" width="150" />
                 <el-table-column label="产品类型" align="center" prop="productType" />
                 <el-table-column label="成品宽度" align="center" prop="width" />
                 <el-table-column label="成品厚度" align="center" prop="thickness" />
diff --git a/klp-ui/src/views/crm/components/OrderDetail.vue b/klp-ui/src/views/crm/components/OrderDetail.vue
index 8cd1217b..edf73c6d 100644
--- a/klp-ui/src/views/crm/components/OrderDetail.vue
+++ b/klp-ui/src/views/crm/components/OrderDetail.vue
@@ -70,7 +70,7 @@
           <el-input v-model="form.productType" placeholder="请输入产品类型" />
         </el-form-item>
         <el-form-item label="成品规格" prop="finishedProductSpec">
-          <el-select v-model="form.finishedProductSpec" placeholder="请选择或输入成品规格" style="width: 100%" allow-create filterable>
+          <el-select v-model="form.finishedProductSpec" clearable placeholder="请选择或输入成品规格" style="width: 100%" allow-create filterable>
             <el-option label="SPCC" value="SPCC" />
             <el-option label="DCO1" value="DCO1" />
             <el-option label="DX51D+Z" value="DX51D+Z" />
@@ -347,7 +347,7 @@ export default {
           ...this.orderContent,
           productContent: jsonContent
         }).then(response => {
-          this.$modal.msgSuccess(`成功写入 ${this.selectedItems.length} 条产品信息`);
+          this.$modal.msgSuccess(`成功写入 ${this.selectedItems.length} 条产品信息，刷新后生效`);
           // 自动刷新合同内容
           this.refreshContractContent();
           // 清空选中状态
@@ -366,9 +366,9 @@ export default {
       this.$emit('refreshContract');
 
       // 如果没有父组件监听，直接刷新页面
-      setTimeout(() => {
-        window.location.reload();
-      }, 500);
+      // setTimeout(() => {
+      //   window.location.reload();
+      // }, 500);
     },
     printOrder() {
       this.$refs["printer"].print();
diff --git a/klp-ui/src/views/wms/report/lajiao/comprehensive.vue b/klp-ui/src/views/wms/report/lajiao/comprehensive.vue
index c29ebcdf..991bb22d 100644
--- a/klp-ui/src/views/wms/report/lajiao/comprehensive.vue
+++ b/klp-ui/src/views/wms/report/lajiao/comprehensive.vue
@@ -1,9 +1,5 @@
 <template>
-  <ActionTemplate
-    :actionType="actionType"
-    :reportType="reportType"
-    :productionLine="productionLine"
-  />
+  <ActionTemplate :actionType="actionType" :reportType="reportType" :productionLine="productionLine" :warehouseOptions="warehouseOptions" />
 </template>
 
 <script>
@@ -19,6 +15,13 @@ export default {
       actionType: 503,
       reportType: 'all',
       productionLine: '拉矫线',
+      warehouseOptions: [
+        { value: '1988150915591499777', label: '拉矫成品库' },
+        { label: '技术部', value: '2019583656787259393' },
+        { label: '小钢卷库', value: '2019583325311414274' },
+        { label: '废品库', value: '2019583429955104769' },
+        { label: '退货库', value: '2019583137616310273' },
+      ],
     }
   }
 }
diff --git a/klp-ui/src/views/wms/report/lajiao/day.vue b/klp-ui/src/views/wms/report/lajiao/day.vue
index 5c032976..bf9ccf8f 100644
--- a/klp-ui/src/views/wms/report/lajiao/day.vue
+++ b/klp-ui/src/views/wms/report/lajiao/day.vue
@@ -3,6 +3,7 @@
     :actionType="actionType"
     :reportType="reportType"
     :productionLine="productionLine"
+    :warehouseOptions="warehouseOptions"
   />
 </template>
 
@@ -19,6 +20,13 @@ export default {
       actionType: 503,
       reportType: 'day',
       productionLine: '拉矫线',
+      warehouseOptions: [
+        { value: '1988150915591499777', label: '拉矫成品库' },
+        { label: '技术部', value: '2019583656787259393' },
+        { label: '小钢卷库', value: '2019583325311414274' },
+        { label: '废品库', value: '2019583429955104769' },
+        { label: '退货库', value: '2019583137616310273' },
+      ],
     }
   }
 }
diff --git a/klp-ui/src/views/wms/report/lajiao/loss.vue b/klp-ui/src/views/wms/report/lajiao/loss.vue
index 7ff872c3..77953b62 100644
--- a/klp-ui/src/views/wms/report/lajiao/loss.vue
+++ b/klp-ui/src/views/wms/report/lajiao/loss.vue
@@ -1,9 +1,5 @@
 <template>
-  <ActionTemplate
-    :actionType="actionType"
-    :reportType="reportType"
-    :productionLine="productionLine"
-  />
+  <ActionTemplate :actionType="actionType" :reportType="reportType" :productionLine="productionLine" :warehouseOptions="warehouseOptions" />
 </template>
 
 <script>
@@ -19,6 +15,13 @@ export default {
       actionType: 503,
       reportType: 'loss',
       productionLine: '拉矫线',
+      warehouseOptions: [
+        { value: '1988150915591499777', label: '拉矫成品库' },
+        { label: '技术部', value: '2019583656787259393' },
+        { label: '小钢卷库', value: '2019583325311414274' },
+        { label: '废品库', value: '2019583429955104769' },
+        { label: '退货库', value: '2019583137616310273' },
+      ],
     }
   }
 }
diff --git a/klp-ui/src/views/wms/report/lajiao/month.vue b/klp-ui/src/views/wms/report/lajiao/month.vue
index 4c005c88..ff441c08 100644
--- a/klp-ui/src/views/wms/report/lajiao/month.vue
+++ b/klp-ui/src/views/wms/report/lajiao/month.vue
@@ -1,9 +1,5 @@
 <template>
-  <ActionTemplate
-    :actionType="actionType"
-    :reportType="reportType"
-    :productionLine="productionLine"
-  />
+  <ActionTemplate :actionType="actionType" :reportType="reportType" :productionLine="productionLine" :warehouseOptions="warehouseOptions" />
 </template>
 
 <script>
@@ -19,6 +15,13 @@ export default {
       actionType: 503,
       reportType: 'month',
       productionLine: '拉矫线',
+      warehouseOptions: [
+        { value: '1988150915591499777', label: '拉矫成品库' },
+        { label: '技术部', value: '2019583656787259393' },
+        { label: '小钢卷库', value: '2019583325311414274' },
+        { label: '废品库', value: '2019583429955104769' },
+        { label: '退货库', value: '2019583137616310273' },
+      ],
     }
   }
 }
diff --git a/klp-ui/src/views/wms/report/lajiao/out.vue b/klp-ui/src/views/wms/report/lajiao/out.vue
index ad95af93..7b2df8a4 100644
--- a/klp-ui/src/views/wms/report/lajiao/out.vue
+++ b/klp-ui/src/views/wms/report/lajiao/out.vue
@@ -1,9 +1,5 @@
 <template>
-  <ActionTemplate
-    :actionType="actionType"
-    :reportType="reportType"
-    :productionLine="productionLine"
-  />
+  <ActionTemplate :actionType="actionType" :reportType="reportType" :productionLine="productionLine" :warehouseOptions="warehouseOptions" />
 </template>
 
 <script>
@@ -19,6 +15,13 @@ export default {
       actionType: 503,
       reportType: 'out',
       productionLine: '拉矫线',
+      warehouseOptions: [
+        { value: '1988150915591499777', label: '拉矫成品库' },
+        { label: '技术部', value: '2019583656787259393' },
+        { label: '小钢卷库', value: '2019583325311414274' },
+        { label: '废品库', value: '2019583429955104769' },
+        { label: '退货库', value: '2019583137616310273' },
+      ],
     }
   }
 }
diff --git a/klp-ui/src/views/wms/report/lajiao/team.vue b/klp-ui/src/views/wms/report/lajiao/team.vue
index 35fc09a7..68e84c8a 100644
--- a/klp-ui/src/views/wms/report/lajiao/team.vue
+++ b/klp-ui/src/views/wms/report/lajiao/team.vue
@@ -1,9 +1,5 @@
 <template>
-  <ActionTemplate
-    :actionType="actionType"
-    :reportType="reportType"
-    :productionLine="productionLine"
-  />
+  <ActionTemplate :actionType="actionType" :reportType="reportType" :productionLine="productionLine" :warehouseOptions="warehouseOptions" />
 </template>
 
 <script>
@@ -19,6 +15,13 @@ export default {
       actionType: 503,
       reportType: 'team',
       productionLine: '拉矫线',
+      warehouseOptions: [
+        { value: '1988150915591499777', label: '拉矫成品库' },
+        { label: '技术部', value: '2019583656787259393' },
+        { label: '小钢卷库', value: '2019583325311414274' },
+        { label: '废品库', value: '2019583429955104769' },
+        { label: '退货库', value: '2019583137616310273' },
+      ],
     }
   }
 }
diff --git a/klp-ui/src/views/wms/report/lajiao/year.vue b/klp-ui/src/views/wms/report/lajiao/year.vue
index c5713388..ec37740a 100644
--- a/klp-ui/src/views/wms/report/lajiao/year.vue
+++ b/klp-ui/src/views/wms/report/lajiao/year.vue
@@ -1,9 +1,5 @@
 <template>
-  <ActionTemplate
-    :actionType="actionType"
-    :reportType="reportType"
-    :productionLine="productionLine"
-  />
+  <ActionTemplate :actionType="actionType" :reportType="reportType" :productionLine="productionLine" :warehouseOptions="warehouseOptions" />
 </template>
 
 <script>
@@ -19,6 +15,13 @@ export default {
       actionType: 503,
       reportType: 'year',
       productionLine: '拉矫线',
+      warehouseOptions: [
+        { value: '1988150915591499777', label: '拉矫成品库' },
+        { label: '技术部', value: '2019583656787259393' },
+        { label: '小钢卷库', value: '2019583325311414274' },
+        { label: '废品库', value: '2019583429955104769' },
+        { label: '退货库', value: '2019583137616310273' },
+      ],
     }
   }
 }
diff --git a/klp-ui/src/views/wms/report/template/action.vue b/klp-ui/src/views/wms/report/template/action.vue
index 2c39118e..50406eff 100644
--- a/klp-ui/src/views/wms/report/template/action.vue
+++ b/klp-ui/src/views/wms/report/template/action.vue
@@ -230,6 +230,10 @@ export default {
     reportType: {
       type: String,
       default: 'day', // day | month | year | all | team | out | loss
+    },
+    warehouseOptions: {
+      type: Array,
+      default: () => []
     }
   },
   components: {
@@ -480,8 +484,8 @@ export default {
       }
 
       const [lossRes, outRes] = await Promise.all([
-        listCoilWithIds({ ...this.queryParams, actionIds: lossActionIds.join(',') || '', startTime: '', endTime: '' }),
-        listCoilWithIds({ ...this.queryParams, coilIds: outIds.join(',') || '', startTime: '', endTime: '' }),
+        listCoilWithIds({ ...this.queryParams, actionIds: lossActionIds.join(',') || '', startTime: '', endTime: '', selectType: 'raw_material' }),
+        listCoilWithIds({ ...this.queryParams, coilIds: outIds.join(',') || '', startTime: '', endTime: '', selectType: 'product' }),
       ]);
 
       // 根据 reportType 决定填充哪些数据