From 96b49e71f42fa6267b50a97d95c904ef3f9d4acb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= <2178503051@qq.com>
Date: Thu, 21 May 2026 13:38:35 +0800
Subject: [PATCH] =?UTF-8?q?feat(KLPService=E9=80=89=E6=8B=A9=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6):=20=E6=96=B0=E5=A2=9E=E9=BB=98=E8=AE=A4=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E5=8F=82=E6=95=B0=E6=94=AF=E6=8C=81=E5=B9=B6=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E9=92=A2=E5=8D=B7=E5=BD=95=E5=85=A5=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1. 为ProductSelect和RawMaterialSelect组件新增defaultQueryParams属性，支持传入默认查询参数合并到请求参数中
2. 优化钢卷录入页面：默认选中成品类型，根据解析的钢卷数据自动设置物料选择器的查询参数
3. 移除页面冗余空行和注释代码
---
 .../KLPService/ProductSelect/index.vue        |  7 +++
 .../KLPService/RawMaterialSelect/index.vue    |  7 +++
 .../views/wms/anneal/performance/report.vue   | 55 ++++++++++++-------
 klp-ui/src/views/wms/coil/typing.vue          | 33 +++++------
 4 files changed, 64 insertions(+), 38 deletions(-)

diff --git a/klp-ui/src/components/KLPService/ProductSelect/index.vue b/klp-ui/src/components/KLPService/ProductSelect/index.vue
index 69890d26..389537a4 100644
--- a/klp-ui/src/components/KLPService/ProductSelect/index.vue
+++ b/klp-ui/src/components/KLPService/ProductSelect/index.vue
@@ -163,6 +163,10 @@ export default {
     filters: {
       type: Object,
       default: () => ({})
+    },
+    defaultQueryParams: {
+      type: Object,
+      default: () => ({})
     }
   },
   data() {
@@ -235,6 +239,9 @@ export default {
         this.getList();
         this.listRecentlySelected();
       }
+    },
+    defaultQueryParams(val) {
+      this.queryParams = { ...this.queryParams, ...val };
     }
   },
   methods: {
diff --git a/klp-ui/src/components/KLPService/RawMaterialSelect/index.vue b/klp-ui/src/components/KLPService/RawMaterialSelect/index.vue
index 89d9a7aa..4e4a9de2 100644
--- a/klp-ui/src/components/KLPService/RawMaterialSelect/index.vue
+++ b/klp-ui/src/components/KLPService/RawMaterialSelect/index.vue
@@ -151,6 +151,10 @@ export default {
     filters: {
       type: Object,
       default: () => ({})
+    },
+    defaultQueryParams: {
+      type: Object,
+      default: () => ({})
     }
   },
   data() {
@@ -234,6 +238,9 @@ export default {
         this.listRecentlySelected();
         this.getList();
       }
+    },
+    defaultQueryParams(val) {
+      this.queryParams = { ...this.queryParams, ...val };
     }
   },
   methods: {
diff --git a/klp-ui/src/views/wms/anneal/performance/report.vue b/klp-ui/src/views/wms/anneal/performance/report.vue
index d3a39318..1e1499b5 100644
--- a/klp-ui/src/views/wms/anneal/performance/report.vue
+++ b/klp-ui/src/views/wms/anneal/performance/report.vue
@@ -1,13 +1,10 @@
 <template>
   <div class="app-container" v-loading="loading">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="90px">
-      <el-form-item label="开始时间" prop="startTime">
-        <el-date-picker v-model="queryParams.startTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
-          placeholder="选择开始时间" />
-      </el-form-item>
-      <el-form-item label="结束时间" prop="endTime">
-        <el-date-picker v-model="queryParams.endTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
-          placeholder="选择结束时间" />
+      <el-form-item label="时间">
+        <time-range-picker v-model="timeRangeParams" start-key="startTime" end-key="endTime"
+          :default-start-time="queryParams.startTime" :default-end-time="queryParams.endTime"
+          @quick-select="handleQuery" />
       </el-form-item>
       <el-form-item label="目标炉" prop="targetFurnaceId">
         <el-select v-model="queryParams.targetFurnaceId" placeholder="请选择" clearable filterable>
@@ -74,21 +71,35 @@ import ProductInfo from "@/components/KLPService/Renderer/ProductInfo";
 import RawMaterialInfo from "@/components/KLPService/Renderer/RawMaterialInfo";
 import CoilNo from "@/components/KLPService/Renderer/CoilNo.vue";
 import WarehouseSelect from "@/components/KLPService/WarehouseSelect/index.vue";
+import TimeRangePicker from "@/views/wms/report/components/timeRangePicker.vue";
 
 export default {
   name: "AnnealPerformance",
+  components: {
+    ProductInfo,
+    RawMaterialInfo,
+    CoilNo,
+    WarehouseSelect,
+    TimeRangePicker,
+  },
   data() {
+    const startTime = (() => {
+      const d = new Date(); d.setDate(d.getDate() - 1);
+      return `${d.getFullYear()}-${String(d.getMonth()+1).padStart(2,'0')}-${String(d.getDate()).padStart(2,'0')} 00:00:00`;
+    })()
+    const endTime = (() => {
+      const d = new Date();
+      return `${d.getFullYear()}-${String(d.getMonth()+1).padStart(2,'0')}-${String(d.getDate()).padStart(2,'0')} 00:00:00`;
+    })()
     return {
       loading: false,
+      timeRangeParams: {
+        startTime,
+        endTime,
+      },
       queryParams: {
-        startTime: (() => {
-          const d = new Date(); d.setDate(d.getDate() - 1);
-          return `${d.getFullYear()}-${String(d.getMonth()+1).padStart(2,'0')}-${String(d.getDate()).padStart(2,'0')} 00:00:00`;
-        })(),
-        endTime: (() => {
-          const d = new Date();
-          return `${d.getFullYear()}-${String(d.getMonth()+1).padStart(2,'0')}-${String(d.getDate()).padStart(2,'0')} 00:00:00`;
-        })(),
+        startTime,
+        endTime,
         targetFurnaceId: undefined,
         planNo: undefined,
         enterCoilNo: undefined,
@@ -98,11 +109,15 @@ export default {
       furnaceOptions: [],
     };
   },
-  components: {
-    ProductInfo,
-    RawMaterialInfo,
-    CoilNo,
-    WarehouseSelect,
+  watch: {
+    timeRangeParams: {
+      handler(newVal) {
+        this.queryParams.startTime = newVal.startTime
+        this.queryParams.endTime = newVal.endTime
+      },
+      deep: true,
+      immediate: true
+    }
   },
   created() {
     this.loadFurnaces();
diff --git a/klp-ui/src/views/wms/coil/typing.vue b/klp-ui/src/views/wms/coil/typing.vue
index 2eff8fe2..b755781b 100644
--- a/klp-ui/src/views/wms/coil/typing.vue
+++ b/klp-ui/src/views/wms/coil/typing.vue
@@ -1,16 +1,5 @@
 <template>
   <div class="typing-coil-container">
-    <!-- 顶部操作栏 -->
-    <!-- <div class="header-bar">
-      <div class="header-title">
-        <i class="el-icon-edit"></i>
-        <span>钢卷信息更新</span>
-      </div>
-      <div class="header-actions">
-
-      </div>
-    </div> -->
-
     <div>
       <CoilInfoRender title="原料信息" :coilInfo="currentInfo" border>
         <template slot="extra">
@@ -65,8 +54,6 @@
               </el-col>
             </el-row>
 
-
-
             <el-row>
               <el-col :span="8">
                 <el-form-item label="材料类型" prop="materialType">
@@ -80,9 +67,11 @@
               <el-col :span="8">
                 <el-form-item :label="getItemLabel" prop="itemId" :rules="rules.itemId">
                   <RawMaterialSelect v-if="updateForm.materialType === '原料'" v-model="updateForm.itemId"
-                    placeholder="请选择原料" style="width: 100%" clearable :disabled="!updateForm.materialType" />
+                    placeholder="请选择原料" style="width: 100%" clearable :disabled="!updateForm.materialType"
+                    :default-query-params="itemSelectorQueryParams" />
                   <ProductSelect v-else-if="updateForm.materialType === '成品'" v-model="updateForm.itemId"
-                    placeholder="请选择成品" style="width: 100%" clearable :disabled="!updateForm.materialType" />
+                    placeholder="请选择成品" style="width: 100%" clearable :disabled="!updateForm.materialType"
+                    :default-query-params="itemSelectorQueryParams" />
                   <div v-else>请先选择物料类型</div>
                 </el-form-item>
               </el-col>
@@ -371,8 +360,8 @@ export default {
       updateForm: {
         currentCoilNo: '',
         team: '',
-        materialType: null,
-        itemType: null,
+        materialType: '成品',
+        itemType: 'product',
         itemId: null,
         grossWeight: undefined,
         netWeight: undefined,
@@ -460,6 +449,7 @@ export default {
       cacheDialogVisible: false,
       currentCache: null,
       parsedCacheData: null,
+      itemSelectorQueryParams: {},
     };
   },
   computed: {
@@ -567,6 +557,14 @@ export default {
       }
       if (data.exit_thick != null) this.$set(this.updateForm, 'actualThickness', parseFloat(data.exit_thick))
       if (data.exit_width != null) this.$set(this.updateForm, 'actualWidth', parseFloat(data.exit_width))
+
+      const query = {
+        specification: data.exit_thick ? `${data.exit_thick}*${data.exit_width}` : '',
+        material: data.grade,
+      }
+      
+      this.itemSelectorQueryParams = query
+
       // 包装要求
       if (data.park_type != null && data.park_type !== '') {
         this.$set(this.updateForm, 'packagingRequirement', data.park_type)
@@ -633,7 +631,6 @@ export default {
       }
     },
 
-
     // 复制当前信息到更新表单
     copyFromCurrent() {
       // 复制除了指定字段之外的其他字段