From 344488f08ef5782a4f07a2b6b44ae1d65c1e0ab3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= <qq2178503051@163.com>
Date: Thu, 16 Apr 2026 15:50:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=B4=E6=97=B6=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 klp-ui/src/components/MutiSelect/index.vue    |  4 +-
 .../src/views/crm/components/OrderDetail.vue  | 20 ++++----
 .../crm/contract/components/ContractList.vue  |  4 +-
 .../views/micro/{ => pages}/zinc/index.vue    |  0
 .../views/wms/anneal/performance/index.vue    |  5 +-
 klp-ui/src/views/wms/anneal/plan/ctrl.vue     | 48 +++++++++++++------
 klp-ui/src/views/wms/anneal/plan/index.vue    |  5 +-
 .../src/views/wms/coil/panels/stepSplit.vue   |  1 +
 klp-ui/src/views/wms/move/record.vue          |  4 +-
 9 files changed, 57 insertions(+), 34 deletions(-)
 rename klp-ui/src/views/micro/{ => pages}/zinc/index.vue (100%)

diff --git a/klp-ui/src/components/MutiSelect/index.vue b/klp-ui/src/components/MutiSelect/index.vue
index 4daac80b..af805587 100644
--- a/klp-ui/src/components/MutiSelect/index.vue
+++ b/klp-ui/src/components/MutiSelect/index.vue
@@ -14,13 +14,13 @@
         @change="handleChange"
       >
         <!-- 全选选项 -->
-        <el-option
+        <!-- <el-option
           v-if="showSelectAll && options.length > 0"
           key="selectAll"
           label="全选"
           value="selectAll"
           @click="toggleSelectAll"
-        />
+        /> -->
         <el-option
           v-for="item in options"
           :key="item.value"
diff --git a/klp-ui/src/views/crm/components/OrderDetail.vue b/klp-ui/src/views/crm/components/OrderDetail.vue
index 5a89ca85..0e8eed61 100644
--- a/klp-ui/src/views/crm/components/OrderDetail.vue
+++ b/klp-ui/src/views/crm/components/OrderDetail.vue
@@ -14,25 +14,23 @@
 
       <el-table v-loading="loading" :data="orderItemList">
         <el-table-column label="产品类型" align="center" prop="productType" />
+        <el-table-column label="成品规格" align="center" prop="finishedProductSpec" />
         <el-table-column label="原料规格" align="center" prop="rawMaterialSpec" />
         <el-table-column label="宽度公差" align="center" prop="widthTolerance" />
         <el-table-column label="厚度公差" align="center" prop="thicknessTolerance" />
-        <el-table-column label="成品规格" align="center" prop="finishedProductSpec" />
+        
         <el-table-column label="材质" align="center" prop="material" />
-        <el-table-column label="等级" align="center" prop="grade" />
         <el-table-column label="重量" align="center" prop="weight" />
-        <el-table-column label="合同定价" align="center" prop="contractPrice" />
-        <el-table-column label="金额（元）" align="center">
-          <template slot-scope="scope">
+        <el-table-column label="含税单价（元/吨）" align="center" prop="contractPrice" />
+        <el-table-column label="含税总额" align="center">
+          <template slot-scope="scope">             
             {{ scope.row.weight * scope.row.contractPrice }}
           </template>
         </el-table-column>
-        <el-table-column label="定制人" align="center" prop="customizer" />
-        <el-table-column label="发货人" align="center" prop="shipper" />
-        <el-table-column label="排产批次" align="center" prop="productionBatch" />
-        <!-- <el-table-column label="产品数量" align="center" prop="productNum" /> -->
-        <!-- <el-table-column label="特殊要求" align="center" prop="specialRequire" /> -->
-        <!-- <el-table-column label="明细金额" align="center" prop="itemAmount" /> -->
+        <el-table-column label="无税单价（元/吨）" align="center" prop="itemAmount" />
+        <el-table-column label="卷数" align="center" prop="productNum" />
+        <el-table-column label="特殊要求" align="center" prop="specialRequire" />
+        
         <el-table-column label="备注" align="center" prop="remark" />
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width" v-if="editable">
           <template slot-scope="scope">
diff --git a/klp-ui/src/views/crm/contract/components/ContractList.vue b/klp-ui/src/views/crm/contract/components/ContractList.vue
index 1e2c8680..f5d4e202 100644
--- a/klp-ui/src/views/crm/contract/components/ContractList.vue
+++ b/klp-ui/src/views/crm/contract/components/ContractList.vue
@@ -51,8 +51,8 @@
             <el-input v-model="queryParams.signLocation" placeholder="请输入签订地点" clearable
               @keyup.enter.native="handleQuery" />
           </el-form-item>
-          <el-form-item label="合同状态" prop="contractStatus">
-            <el-select v-model="queryParams.contractStatus" placeholder="请选择合同状态">
+          <el-form-item label="合同状态" prop="status">
+            <el-select v-model="queryParams.status" placeholder="请选择合同状态">
               <el-option label="草稿" value="0" />
               <el-option label="已生效" value="1" />
               <el-option label="已作废" value="2" />
diff --git a/klp-ui/src/views/micro/zinc/index.vue b/klp-ui/src/views/micro/pages/zinc/index.vue
similarity index 100%
rename from klp-ui/src/views/micro/zinc/index.vue
rename to klp-ui/src/views/micro/pages/zinc/index.vue
diff --git a/klp-ui/src/views/wms/anneal/performance/index.vue b/klp-ui/src/views/wms/anneal/performance/index.vue
index c72e6fa4..6b3647f4 100644
--- a/klp-ui/src/views/wms/anneal/performance/index.vue
+++ b/klp-ui/src/views/wms/anneal/performance/index.vue
@@ -105,13 +105,14 @@ export default {
         const data = response.data || {};
         this.summary = data.summary || {};
         this.detailList = data.details.map(item => {
-          return item.coils.map(coil => {
+          return item.coils?.map(coil => {
             return {
               ...item,
               ...coil,
             }
-          })
+          }) || []
         }).flat();
+        console.log(this.detailList);
         this.loading = false;
       }).catch(() => {
         this.loading = false;
diff --git a/klp-ui/src/views/wms/anneal/plan/ctrl.vue b/klp-ui/src/views/wms/anneal/plan/ctrl.vue
index 3d70ef4c..697fc9ba 100644
--- a/klp-ui/src/views/wms/anneal/plan/ctrl.vue
+++ b/klp-ui/src/views/wms/anneal/plan/ctrl.vue
@@ -153,30 +153,36 @@
               </div>
             </div>
             <el-table :data="coilList" v-loading="coilLoading" class="light-table">
+              <el-table-column label="钢卷层级" align="center" width="80">
+                <template slot-scope="scope">
+                  <el-input v-model="scope.row.furnaceLevel" placeholder="请输入钢卷层级"
+                    @change="handlePLanCoilChange(scope.row)" />
+                </template>
+              </el-table-column>
               <el-table-column label="入场钢卷号" align="center" prop="enterCoilNo" />
+              <!-- <el-table-column label="当前钢卷号" align="center" prop="currentCoilNo" /> -->
               <el-table-column label="创建时间" align="center" prop="createTime" width="200">
                 <template slot-scope="scope">
-                  <el-date-picker style="width: 185px" v-model="scope.row.createTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
-                    placeholder="选择创建时间" @change="handlePLanCoilChange(scope.row)"/>
+                  <el-date-picker style="width: 185px" v-model="scope.row.createTime" type="datetime"
+                    value-format="yyyy-MM-dd HH:mm:ss" placeholder="选择创建时间" @change="handlePLanCoilChange(scope.row)" />
                 </template>
               </el-table-column>
               <el-table-column label="钢卷去向" align="center" width="220">
                 <template slot-scope="scope">
-                  <WarehouseSelect v-model="scope.row.logicWarehouseId" @change="handlePLanCoilChange(scope.row)"/>
+                  <el-select v-model="scope.row.logicWarehouseId" @change="handlePLanCoilChange(scope.row)">
+                    <el-option v-for="item in warehouseList" :key="item.warehouseId" :label="item.warehouseName"
+                      :value="item.warehouseId" />
+                  </el-select>
                 </template>
               </el-table-column>
-               <el-table-column label="钢卷层级" align="center" width="80">
-                <template slot-scope="scope">
-                  <el-input v-model="scope.row.furnaceLevel" placeholder="请输入钢卷层级" @change="handlePLanCoilChange(scope.row)"/>
-                </template>
-              </el-table-column>
-              <el-table-column label="操作" align="center" width="100">
+
+              <!-- <el-table-column label="操作" align="center" width="100">
                 <template slot-scope="scope">
                   <el-button size="mini" type="text" icon="el-icon-delete" @click="handleUnbind(scope.row)">
                     {{ unbindLabel(currentPlan.status) }}
                   </el-button>
                 </template>
-              </el-table-column>
+              </el-table-column> -->
             </el-table>
           </div>
         </el-card>
@@ -184,12 +190,15 @@
     </el-row>
 
     <el-dialog title="完成退火" :visible.sync="completeOpen" width="720px" append-to-body>
-      <div class="complete-tip">请为每条钢卷分配实际库位，未分配将无法完成。</div>
+      <div class="complete-tip">请为每条钢卷分配逻辑库区去向，未分配将无法完成。</div>
       <el-table :data="completeCoils" v-loading="completeLoading" height="360px">
         <el-table-column label="入场钢卷号" prop="enterCoilNo" align="center" />
         <el-table-column label="钢卷去向" align="center" width="240">
           <template slot-scope="scope">
-            <WarehouseSelect v-model="scope.row.warehouseId" />
+            <el-select v-model="scope.row.warehouseId" @change="handlePLanCoilChange(scope.row)">
+              <el-option v-for="item in warehouseList" :key="item.warehouseId" :label="item.warehouseName"
+                :value="item.warehouseId" />
+            </el-select>
           </template>
         </el-table-column>
       </el-table>
@@ -253,6 +262,7 @@
 import { listAnnealPlan, updateAnnealPlanCoil, getAnnealPlan, addAnnealPlan, updateAnnealPlan, delAnnealPlan, changeAnnealPlanStatus, inFurnace, completeAnnealPlan, listAnnealPlanCoils, bindAnnealPlanCoils, unbindAnnealPlanCoil } from "@/api/wms/annealPlan";
 import { listAnnealFurnace } from "@/api/wms/annealFurnace";
 import { listMaterialCoil } from "@/api/wms/coil";
+import { listWarehouse } from '@/api/wms/warehouse'
 import WarehouseSelect from "@/components/KLPService/WarehouseSelect";
 
 export default {
@@ -308,14 +318,15 @@ export default {
       completeLoading: false,
       completePlanId: null,
       completeCoils: [],
+      warehouseList: [],
     };
   },
   created() {
     this.getList();
     this.loadFurnaces();
     this.getMaterialCoils();
-    this.loadActualWarehouses();
-  },
+    this.loadWarehouses();
+  }, 
   methods: {
     getList() {
       this.loading = true;
@@ -325,6 +336,11 @@ export default {
         this.loading = false;
       });
     },
+    loadWarehouses() {
+      listWarehouse().then(response => {
+        this.warehouseList = response.data || [];
+      });
+    },
     loadFurnaces() {
       listAnnealFurnace({ pageNum: 1, pageSize: 999, status: 1 }).then(response => {
         this.furnaceOptions = response.rows || [];
@@ -395,6 +411,7 @@ export default {
         planId: this.currentPlan.planId,
         coilId: item.coilId
       }).then(() => {
+        // anneal-todo: 新增操作事件
         this.$message.success('已加入计划');
         this.loadPlanCoils();
       }).finally(() => {
@@ -526,6 +543,7 @@ export default {
       });
       this.loading = true;
       await inFurnace({ planId: row.planId });
+      // anneal-todo: 新增操作事件
       this.loading = false;
       row.status = 2;
       row.actualStartTime = new Date();
@@ -552,6 +570,7 @@ export default {
         planId: this.completePlanId,
         locations: locations
       }).then(() => {
+        // anneal-todo: 新增操作事件
         this.$message.success('已完成');
         this.completeOpen = false;
         this.getList();
@@ -571,6 +590,7 @@ export default {
           coilId: row.coilId
         });
       }).then(() => {
+        // anneal-todo: 新增操作事件
         this.$message.success('解绑成功');
         this.loadPlanCoils();
       });
diff --git a/klp-ui/src/views/wms/anneal/plan/index.vue b/klp-ui/src/views/wms/anneal/plan/index.vue
index 5603074c..ec65e6a1 100644
--- a/klp-ui/src/views/wms/anneal/plan/index.vue
+++ b/klp-ui/src/views/wms/anneal/plan/index.vue
@@ -308,7 +308,6 @@ export default {
     this.getList();
     this.loadFurnaces();
     this.getMaterialCoils();
-    this.loadActualWarehouses();
   },
   methods: {
     getList() {
@@ -383,6 +382,7 @@ export default {
         coilId: item.coilId
       }).then(() => {
         this.$message.success('已加入计划');
+        // anneal-todo: 新增操作事件
         this.loadPlanCoils();
       }).finally(() => {
         this.coilLoading = false;
@@ -512,6 +512,7 @@ export default {
       });
       this.loading = true;
       await inFurnace({ planId: row.planId });
+      // anneal-todo: 新增操作事件
       this.loading = false;
       row.status = 2;
       row.actualStartTime = new Date();
@@ -540,6 +541,7 @@ export default {
       }).then(() => {
         this.$message.success('已完成');
         this.completeOpen = false;
+        // anneal-todo: 新增操作事件
         this.getList();
         this.loadPlanCoils();
       }).finally(() => {
@@ -558,6 +560,7 @@ export default {
         });
       }).then(() => {
         this.$message.success('解绑成功');
+        // anneal-todo: 新增操作事件
         this.loadPlanCoils();
       });
     },
diff --git a/klp-ui/src/views/wms/coil/panels/stepSplit.vue b/klp-ui/src/views/wms/coil/panels/stepSplit.vue
index 52c06b6a..c53c83d3 100644
--- a/klp-ui/src/views/wms/coil/panels/stepSplit.vue
+++ b/klp-ui/src/views/wms/coil/panels/stepSplit.vue
@@ -33,6 +33,7 @@
             <el-descriptions-item label="物料名称">{{ coilInfo.itemName || '-' }}</el-descriptions-item>
             <el-descriptions-item label="规格">{{ coilInfo.specification || '-' }}</el-descriptions-item>
             <el-descriptions-item label="材质">{{ coilInfo.material || '-' }}</el-descriptions-item>
+            <el-descriptions-item label="厂家">{{ coilInfo.manufacturer || '-' }}</el-descriptions-item>
             <el-descriptions-item label="原料材质">{{ coilInfo.packingStatus || '-' }}</el-descriptions-item>
             <el-descriptions-item label="实测长度(m)">{{ coilInfo.actualLength || '-' }}</el-descriptions-item>
             <el-descriptions-item label="实测宽度(m)">{{ coilInfo.actualWidth || '-' }}</el-descriptions-item>
diff --git a/klp-ui/src/views/wms/move/record.vue b/klp-ui/src/views/wms/move/record.vue
index 8a0c69f8..bdff37d7 100644
--- a/klp-ui/src/views/wms/move/record.vue
+++ b/klp-ui/src/views/wms/move/record.vue
@@ -25,8 +25,8 @@
       </el-form-item>
       <el-form-item label="生效状态">
         <el-select v-model="queryParams.isTransferred" @change="handleRegularSearch">
-          <el-option :label="1">已生效</el-option>
-          <el-option :label="0">未生效</el-option>
+          <el-option value="1" label="已生效"></el-option>
+          <el-option value="0" label="未生效"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item>