DeXun/klp-oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(wms/coil): 优化表单组件布局和移除注释代码

Browse Source 
- 移除box2.vue中已注释的仓库选择组件
- 在merge.vue、split.vue和typing.vue中调整物品类型选择框位置
- 统一使用字典数据渲染质量状态下拉选项
- 清理各组件中已注释的冗余代码
This commit is contained in:
砂糖
2026-01-13 14:58:31 +08:00
parent 199b15bb41
commit f3b0fa6788
4 changed files with 36 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
klp-ui/src/views/wms/coil/box2.vue
View File

@@ -5,18 +5,18 @@
<el-form inline>
<MaterialSelect :itemType.sync="queryParams.itemType" :itemId.sync="queryParams.itemId" @change="getList" />
<el-form-item label="逻辑库位">
<!-- <el-form-item label="逻辑库位">
<WarehouseSelect v-model="queryParams.warehouseId" @change="handleWarehouseChange" />
</el-form-item>
</el-form-item> -->
<!-- 真实库区 -->
<el-form-item label="真实库区">
<!-- <el-form-item label="真实库区">
<ActualWarehouseSelect
v-model="queryParams.actualWarehouseId"
@change="handleActualWarehouseChange"
:width="220"
/>
</el-form-item>
</el-form-item> -->
</el-form>
<!-- el-descriptions 汇总数据 -->

29
klp-ui/src/views/wms/coil/merge.vue
View File

@@ -139,12 +139,16 @@
<el-option label="成品" value="成品" />
</el-select>
</el-form-item>
<!-- 物品类型由材料类型自动联动，隐藏此选择框 -->
<el-form-item :label="getItemLabel">
<raw-material-selector v-if="targetCoil.materialType === '原料'"
v-model="targetCoil.itemId" placeholder="请选择原料" style="width: 100%" clearable
:disabled="readonly || !targetCoil.materialType" />
<product-selector v-else-if="targetCoil.materialType === '成品'" v-model="targetCoil.itemId"
placeholder="请选择成品" style="width: 100%" clearable :disabled="readonly || !targetCoil.materialType" />
<div v-else>请先选择物料类型</div>
</el-form-item>
<el-form-item label="质量状态" prop="qualityStatus">
<!-- <el-input v-model="targetCoil.qualityStatus"
placeholder="请输入质量状态" :disabled="readonly">
</el-input> -->
<el-form-item label="质量状态" prop="qualityStatus">
<el-select v-model="targetCoil.qualityStatus" placeholder="请选择质量状态" style="width: 100%"
:disabled="readonly">
<el-option v-for="item in dict.type.coil_quality_status" :key="item.value" :label="item.label" :value="item.value" />
@@ -157,9 +161,6 @@
<el-option label="净边料" value="净边料" />
<el-option label="毛边料" value="毛边料" />
</el-select>
<!-- <el-input v-model="targetCoil.trimmingRequirement"
placeholder="请输入切边要求" :disabled="readonly">
</el-input> -->
</el-form-item>
<el-form-item label="打包状态" prop="packingStatus">
@@ -174,18 +175,6 @@
<el-option label="普包" value="普包" />
<el-option label="简包" value="简包" />
</el-select>
<!-- <el-input v-model="targetCoil.packagingRequirement"
placeholder="请输入包装要求" :disabled="readonly">
</el-input> -->
</el-form-item>
<el-form-item :label="getItemLabel">
<raw-material-selector v-if="targetCoil.materialType === '原料'"
v-model="targetCoil.itemId" placeholder="请选择原料" style="width: 100%" clearable
:disabled="readonly || !targetCoil.materialType" />
<product-selector v-else-if="targetCoil.materialType === '成品'" v-model="targetCoil.itemId"
placeholder="请选择成品" style="width: 100%" clearable :disabled="readonly || !targetCoil.materialType" />
<div v-else>请先选择物料类型</div>
</el-form-item>
<el-form-item label="毛重(t)">
<el-input-number precision="3" :controls="false" v-model="targetCoil.grossWeight" placeholder="请输入毛重"

35
klp-ui/src/views/wms/coil/split.vue
View File

@@ -122,18 +122,19 @@
</el-select>
</el-form-item>
<el-form-item label="质量状态" prop="qualityStatus">
<!-- 物品类型由材料类型自动决定，不显示选择框 -->
<el-form-item :label="getItemLabel(item.materialType)">
<raw-material-select v-if="item.materialType === '原料'"
v-model="item.itemId" placeholder="请选择原料" style="width: 100%" clearable
:disabled="readonly || !item.materialType" />
<product-select v-else-if="item.materialType === '成品'" v-model="item.itemId" placeholder="请选择成品"
style="width: 100%" clearable :disabled="readonly || !item.materialType" />
<div v-else>请先选择物料类型</div>
</el-form-item>
<el-form-item label="质量状态" prop="qualityStatus">
<el-select v-model="item.qualityStatus" placeholder="请选择质量状态" style="width: 100%"
:disabled="readonly">
<!-- <el-option label="A+" value="A+" />
<el-option label="A" value="A" />
<el-option label="A-" value="A-" />
<el-option label="B+" value="B+" />
<el-option label="B" value="B" />
<el-option label="B-" value="B-" />
<el-option label="C+" value="C+" />
<el-option label="C" value="C" />
<el-option label="C-" value="C-" /> -->
<el-option v-for="item in dict.type.coil_quality_status" :key="item.value" :label="item.label" :value="item.value" />
</el-select>
</el-form-item>
@@ -144,8 +145,6 @@
<el-option label="净边料" value="净边料" />
<el-option label="毛边料" value="毛边料" />
</el-select>
<!-- <el-input v-model="item.trimmingRequirement" placeholder="请输入切边要求" :disabled="readonly">
</el-input> -->
</el-form-item>
<el-form-item label="打包状态" prop="packingStatus">
@@ -160,18 +159,6 @@
<el-option label="普包" value="普包" />
<el-option label="简包" value="简包" />
</el-select>
<!-- <el-input v-model="item.packagingRequirement" placeholder="请输入包装要求" :disabled="readonly">
</el-input> -->
</el-form-item>
<!-- 物品类型由材料类型自动决定，不显示选择框 -->
<el-form-item :label="getItemLabel(item.materialType)">
<raw-material-select v-if="item.materialType === '原料'"
v-model="item.itemId" placeholder="请选择原料" style="width: 100%" clearable
:disabled="readonly || !item.materialType" />
<product-select v-else-if="item.materialType === '成品'" v-model="item.itemId" placeholder="请选择成品"
style="width: 100%" clearable :disabled="readonly || !item.materialType" />
<div v-else>请先选择物料类型</div>
</el-form-item>
<el-form-item label="毛重(t)" required>

49
klp-ui/src/views/wms/coil/typing.vue
View File

@@ -91,11 +91,6 @@
<el-option key="甲" label="甲" value="甲" />
<el-option key="乙" label="乙" value="乙" />
</el-select>
<!-- <el-input v-model="updateForm.team" placeholder="请输入班组名称" :disabled="readonly">
<template slot="prepend">
<i class="el-icon-user-solid"></i>
</template>
</el-input> -->
</el-form-item>
<el-form-item label="材料类型" prop="materialType">
@@ -106,21 +101,20 @@
</el-select>
</el-form-item>
<el-form-item label="质量状态" prop="qualityStatus">
<!-- <el-input v-model="updateForm.qualityStatus" placeholder="请输入质量状态"
:disabled="readonly">
</el-input> -->
<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="readonly || !updateForm.materialType" />
<ProductSelect v-else-if="updateForm.materialType === '成品'" v-model="updateForm.itemId"
placeholder="请选择成品" style="width: 100%" clearable
:disabled="readonly || !updateForm.materialType" />
<div v-else>请先选择物料类型</div>
</el-form-item>
<el-form-item label="质量状态" prop="qualityStatus">
<el-select v-model="updateForm.qualityStatus" placeholder="请选择质量状态" style="width: 100%"
:disabled="readonly">
<!-- <el-option label="A+" value="A+" />
<el-option label="A" value="A" />
<el-option label="A-" value="A-" />
<el-option label="B+" value="B+" />
<el-option label="B" value="B" />
<el-option label="B-" value="B-" />
<el-option label="C+" value="C+" />
<el-option label="C" value="C" />
<el-option label="C-" value="C-" /> -->
<el-option v-for="item in dict.type.coil_quality_status" :key="item.value" :label="item.label" :value="item.value" />
</el-select>
</el-form-item>
@@ -131,9 +125,6 @@
<el-option label="净边料" value="净边料" />
<el-option label="毛边料" value="毛边料" />
</el-select>
<!-- <el-input v-model="updateForm.trimmingRequirement" placeholder="请输入切边要求"
:disabled="readonly">
</el-input> -->
</el-form-item>
<el-form-item label="打包状态" prop="packingStatus">
@@ -151,22 +142,6 @@
</el-select>
</el-form-item>
<el-form-item :label="getItemLabel" prop="itemId"
:rules="rules.itemId">
<!-- <el-select v-model="updateForm.itemId" :placeholder="getItemPlaceholder" filterable remote
:remote-method="searchItems" :loading="itemSearchLoading" style="width: 100%"
:disabled="readonly || !updateForm.materialType">
<el-option v-for="item in currentItemList" :key="item.id" :label="item.name" :value="item.id" />
</el-select> -->
<RawMaterialSelect v-if="updateForm.materialType === '原料'" v-model="updateForm.itemId"
placeholder="请选择原料" style="width: 100%" clearable
:disabled="readonly || !updateForm.materialType" />
<ProductSelect v-else-if="updateForm.materialType === '成品'" v-model="updateForm.itemId"
placeholder="请选择成品" style="width: 100%" clearable
:disabled="readonly || !updateForm.materialType" />
<div v-else>请先选择物料类型</div>
</el-form-item>
<el-form-item label="毛重(t)" prop="grossWeight">
<el-input-number precision="3" :controls="false" v-model="updateForm.grossWeight" placeholder="请输入毛重" type="number" step="0.01"
:disabled="readonly">