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

- 在多个表单的包装要求选项中新增"精包"选项
- 将axios请求超时时间从20000毫秒调整为30000毫秒
- 在CRM订单详情中将包装要求输入框改为下拉选择框
This commit is contained in:
2026-04-30 13:58:09 +08:00
parent 12b3f0556d
commit 945c3560eb
15 changed files with 40 additions and 4 deletions

View File

@@ -19,7 +19,7 @@ const service = axios.create({
// axios中请求配置有baseURL选项表示请求URL公共部分
baseURL: process.env.VUE_APP_BASE_API,
// 超时
timeout: 20000
timeout: 30000
})
// request拦截器

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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