From 945c3560ebbbbd1a74707e87c868bb525b81960d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= <2178503051@qq.com>
Date: Thu, 30 Apr 2026 13:58:09 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0"=E7=B2=BE=E5=8C=85"?=
 =?UTF-8?q?=E9=80=89=E9=A1=B9=E5=B9=B6=E8=B0=83=E6=95=B4=E8=AF=B7=E6=B1=82?=
 =?UTF-8?q?=E8=B6=85=E6=97=B6=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在多个表单的包装要求选项中新增"精包"选项
- 将axios请求超时时间从20000毫秒调整为30000毫秒
- 在CRM订单详情中将包装要求输入框改为下拉选择框
---
 klp-ui/src/utils/request.js                       |  2 +-
 klp-ui/src/views/aps/planSheet/PlanDetailForm.vue |  1 +
 klp-ui/src/views/crm/components/OrderDetail.vue   |  7 ++++++-
 klp-ui/src/views/wms/coil/do/correct.vue          |  1 +
 klp-ui/src/views/wms/coil/do/correntAll.vue       |  1 +
 klp-ui/src/views/wms/coil/do/packing.vue          |  2 ++
 klp-ui/src/views/wms/coil/do/search.vue           |  1 +
 klp-ui/src/views/wms/coil/do/ship.vue             |  8 ++++++--
 klp-ui/src/views/wms/coil/do/warehousing.vue      |  2 ++
 klp-ui/src/views/wms/coil/merge.vue               |  1 +
 klp-ui/src/views/wms/coil/panels/base.vue         |  1 +
 klp-ui/src/views/wms/coil/panels/stepSplit.vue    |  1 +
 klp-ui/src/views/wms/coil/split.vue               |  1 +
 klp-ui/src/views/wms/coil/typing.vue              |  1 +
 klp-ui/src/views/wms/report/repair/zinc.vue       | 14 ++++++++++++++
 15 files changed, 40 insertions(+), 4 deletions(-)
 create mode 100644 klp-ui/src/views/wms/report/repair/zinc.vue

diff --git a/klp-ui/src/utils/request.js b/klp-ui/src/utils/request.js
index bc3ea96c..fa9692c1 100644
--- a/klp-ui/src/utils/request.js
+++ b/klp-ui/src/utils/request.js
@@ -19,7 +19,7 @@ const service = axios.create({
   // axios中请求配置有baseURL选项，表示请求URL公共部分
   baseURL: process.env.VUE_APP_BASE_API,
   // 超时
-  timeout: 20000
+  timeout: 30000
 })
 
 // request拦截器
diff --git a/klp-ui/src/views/aps/planSheet/PlanDetailForm.vue b/klp-ui/src/views/aps/planSheet/PlanDetailForm.vue
index bac33b9c..d8763436 100644
--- a/klp-ui/src/views/aps/planSheet/PlanDetailForm.vue
+++ b/klp-ui/src/views/aps/planSheet/PlanDetailForm.vue
@@ -148,6 +148,7 @@
                   <el-option label="裸包" value="裸包" />
                   <el-option label="普包" value="普包" />
                   <el-option label="简包" value="简包" />
+                  <el-option label="精包" value="精包" />
                 </el-select>
               </el-form-item>
             </el-col>
diff --git a/klp-ui/src/views/crm/components/OrderDetail.vue b/klp-ui/src/views/crm/components/OrderDetail.vue
index 28e1be17..1168600a 100644
--- a/klp-ui/src/views/crm/components/OrderDetail.vue
+++ b/klp-ui/src/views/crm/components/OrderDetail.vue
@@ -95,7 +95,12 @@
           <el-input v-model="form.surfaceTreatment" placeholder="请输入表面处理" />
         </el-form-item>
         <el-form-item label="包装要求" prop="packagingReq">
-          <el-input v-model="form.packagingReq" placeholder="请输入包装要求" />
+          <el-select v-model="form.packagingReq" placeholder="请选择包装要求" style="width: 100%">
+            <el-option label="裸包" value="裸包" />
+            <el-option label="普包" value="普包" />
+            <el-option label="简包" value="简包" />
+            <el-option label="精包" value="精包" />
+          </el-select>
         </el-form-item>
         <el-form-item label="切边要求" prop="edgeCuttingReq">
           <el-input v-model="form.edgeCuttingReq" placeholder="请输入切边要求" />
diff --git a/klp-ui/src/views/wms/coil/do/correct.vue b/klp-ui/src/views/wms/coil/do/correct.vue
index b07bb639..7810a7fb 100644
--- a/klp-ui/src/views/wms/coil/do/correct.vue
+++ b/klp-ui/src/views/wms/coil/do/correct.vue
@@ -252,6 +252,7 @@
             <el-option label="裸包" value="裸包" />
             <el-option label="普包" value="普包" />
             <el-option label="简包" value="简包" />
+            <el-option label="精包" value="精包" />
           </el-select>
         </el-form-item>
         <el-form-item label="毛重" prop="grossWeight">
diff --git a/klp-ui/src/views/wms/coil/do/correntAll.vue b/klp-ui/src/views/wms/coil/do/correntAll.vue
index 519ad86e..403ea490 100644
--- a/klp-ui/src/views/wms/coil/do/correntAll.vue
+++ b/klp-ui/src/views/wms/coil/do/correntAll.vue
@@ -333,6 +333,7 @@
             <el-option label="裸包" value="裸包" />
             <el-option label="普包" value="普包" />
             <el-option label="简包" value="简包" />
+            <el-option label="精包" value="精包" />
           </el-select>
         </el-form-item>
         <el-form-item label="毛重" prop="grossWeight">
diff --git a/klp-ui/src/views/wms/coil/do/packing.vue b/klp-ui/src/views/wms/coil/do/packing.vue
index 7299f423..64661ad9 100644
--- a/klp-ui/src/views/wms/coil/do/packing.vue
+++ b/klp-ui/src/views/wms/coil/do/packing.vue
@@ -107,6 +107,7 @@
                     <el-option label="裸包" value="裸包" />
                     <el-option label="普包" value="普包" />
                     <el-option label="简包" value="简包" />
+                    <el-option label="精包" value="精包" />
                   </el-select>
                 </el-form-item>
               </el-col>
@@ -176,6 +177,7 @@
                     <el-option label="裸包" value="裸包" />
                     <el-option label="普包" value="普包" />
                     <el-option label="简包" value="简包" />
+                    <el-option label="精包" value="精包" />
                   </el-select>
                 </el-form-item>
               </el-col>
diff --git a/klp-ui/src/views/wms/coil/do/search.vue b/klp-ui/src/views/wms/coil/do/search.vue
index 0ce5ea1f..afa62d78 100644
--- a/klp-ui/src/views/wms/coil/do/search.vue
+++ b/klp-ui/src/views/wms/coil/do/search.vue
@@ -104,6 +104,7 @@
                     <el-option label="裸包" value="裸包" />
                     <el-option label="普包" value="普包" />
                     <el-option label="简包" value="简包" />
+                    <el-option label="精包" value="精包" />
                   </el-select>
                 </el-form-item>
               </el-col>
diff --git a/klp-ui/src/views/wms/coil/do/ship.vue b/klp-ui/src/views/wms/coil/do/ship.vue
index f7dda135..3b4d2d5a 100644
--- a/klp-ui/src/views/wms/coil/do/ship.vue
+++ b/klp-ui/src/views/wms/coil/do/ship.vue
@@ -95,8 +95,12 @@
               </el-col>
               <el-col :span="12">
                 <el-form-item label="包装要求" prop="packagingRequirement">
-                  <el-input v-model="form.packagingRequirement" placeholder="请输入包装要求">
-                  </el-input>
+                  <el-select v-model="form.packagingRequirement" placeholder="请选择包装要求">
+                    <el-option label="裸包" value="裸包" />
+                    <el-option label="普包" value="普包" />
+                    <el-option label="简包" value="简包" />
+                    <el-option label="精包" value="精包" />
+                  </el-select>
                 </el-form-item>
               </el-col>
             </el-row>
diff --git a/klp-ui/src/views/wms/coil/do/warehousing.vue b/klp-ui/src/views/wms/coil/do/warehousing.vue
index af20ff3d..4cddca14 100644
--- a/klp-ui/src/views/wms/coil/do/warehousing.vue
+++ b/klp-ui/src/views/wms/coil/do/warehousing.vue
@@ -87,6 +87,7 @@
                     <el-option label="裸包" value="裸包" />
                     <el-option label="普包" value="普包" />
                     <el-option label="简包" value="简包" />
+                    <el-option label="精包" value="精包" />
                   </el-select>
                 </el-form-item>
               </el-col>
@@ -322,6 +323,7 @@
             <el-option label="裸包" value="裸包" />
             <el-option label="普包" value="普包" />
             <el-option label="简包" value="简包" />
+            <el-option label="精包" value="精包" />
           </el-select>
         </el-form-item>
         <el-form-item label="毛重" prop="grossWeight">
diff --git a/klp-ui/src/views/wms/coil/merge.vue b/klp-ui/src/views/wms/coil/merge.vue
index b6425cbf..6e0b0421 100644
--- a/klp-ui/src/views/wms/coil/merge.vue
+++ b/klp-ui/src/views/wms/coil/merge.vue
@@ -161,6 +161,7 @@
                     <el-option label="裸包" value="裸包" />
                     <el-option label="普包" value="普包" />
                     <el-option label="简包" value="简包" />
+                    <el-option label="精包" value="精包" />
                   </el-select>
                 </el-form-item>
               </div>
diff --git a/klp-ui/src/views/wms/coil/panels/base.vue b/klp-ui/src/views/wms/coil/panels/base.vue
index 7ab1f58b..2fe66135 100644
--- a/klp-ui/src/views/wms/coil/panels/base.vue
+++ b/klp-ui/src/views/wms/coil/panels/base.vue
@@ -436,6 +436,7 @@
             <el-option label="裸包" value="裸包" />
             <el-option label="普包" value="普包" />
             <el-option label="简包" value="简包" />
+            <el-option label="精包" value="精包" />
           </el-select>
         </el-form-item>
         <el-form-item label="毛重" prop="grossWeight">
diff --git a/klp-ui/src/views/wms/coil/panels/stepSplit.vue b/klp-ui/src/views/wms/coil/panels/stepSplit.vue
index 78504451..1ae31d35 100644
--- a/klp-ui/src/views/wms/coil/panels/stepSplit.vue
+++ b/klp-ui/src/views/wms/coil/panels/stepSplit.vue
@@ -155,6 +155,7 @@
                   <el-option label="裸包" value="裸包" />
                   <el-option label="普包" value="普包" />
                   <el-option label="简包" value="简包" />
+                  <el-option label="精包" value="精包" />
                 </el-select>
               </el-form-item>
               <el-form-item label="毛重" prop="grossWeight">
diff --git a/klp-ui/src/views/wms/coil/split.vue b/klp-ui/src/views/wms/coil/split.vue
index b66eecf4..329d0d2c 100644
--- a/klp-ui/src/views/wms/coil/split.vue
+++ b/klp-ui/src/views/wms/coil/split.vue
@@ -176,6 +176,7 @@
                     <el-option label="裸包" value="裸包" />
                     <el-option label="普包" value="普包" />
                     <el-option label="简包" value="简包" />
+                    <el-option label="精包" value="精包" />
                   </el-select>
                 </el-form-item>
 
diff --git a/klp-ui/src/views/wms/coil/typing.vue b/klp-ui/src/views/wms/coil/typing.vue
index bcacd616..c52d02e1 100644
--- a/klp-ui/src/views/wms/coil/typing.vue
+++ b/klp-ui/src/views/wms/coil/typing.vue
@@ -171,6 +171,7 @@
                 <el-option label="裸包" value="裸包" />
                 <el-option label="普包" value="普包" />
                 <el-option label="简包" value="简包" />
+                <el-option label="精包" value="精包" />
               </el-select>
             </el-form-item>
 
diff --git a/klp-ui/src/views/wms/report/repair/zinc.vue b/klp-ui/src/views/wms/report/repair/zinc.vue
new file mode 100644
index 00000000..f11f138f
--- /dev/null
+++ b/klp-ui/src/views/wms/report/repair/zinc.vue
@@ -0,0 +1,14 @@
+<template>
+  <div>
+    <merge-template :actionType="521"></merge-template>
+  </div>
+</template>
+
+<script>
+import mergeTemplate from "@/views/wms/report/template/merge.vue";
+export default {
+  components: {
+    mergeTemplate,
+  },
+}
+</script>
\ No newline at end of file