feat: 增加"精包"选项并调整请求超时时间

- 在多个表单的包装要求选项中新增"精包"选项
- 将axios请求超时时间从20000毫秒调整为30000毫秒
- 在CRM订单详情中将包装要求输入框改为下拉选择框

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拦截器

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>

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="请输入切边要求" />

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">

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">

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>

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>

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-select v-model="form.packagingRequirement" placeholder="请选择包装要求">
-                  </el-input>
+                    <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>

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">

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>

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">

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">

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>
 

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>
 

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>