fix(wms): 修复异常表单和报表导出功能

修正异常表单中的产线字段名从line改为productionLine
优化报表导出功能,使用actionIds替代coilIds
为异常管理添加程度字典显示和产线字段
移除冗余代码并统一报表模板中的导出逻辑
This commit is contained in:
砂糖
2026-03-30 14:34:51 +08:00
parent ca176de4ef
commit 070b0aea8d
9 changed files with 39 additions and 105 deletions

View File

@@ -35,8 +35,8 @@
dict.label }}</el-radio-button>
</el-radio-group>
</el-form-item>
<el-form-item label="产线" prop="line">
<el-select v-model="formData.line" placeholder="请选择产线">
<el-form-item label="产线" prop="productionLine">
<el-select v-model="formData.productionLine" placeholder="请选择产线">
<el-option v-for="dict in dict.type.sys_lines" :key="dict.value" :label="dict.label"
:value="dict.value"></el-option>
</el-select>

View File

@@ -9,10 +9,15 @@
<el-table-column label="缺陷位置" prop="position"></el-table-column>
<el-table-column label="缺陷代码" prop="defectCode">
<template slot-scope="scope">
<dict-tag :dict-type="dict.type.defectCode" :dict-value="scope.row.defectCode" />
<dict-tag :options="dict.type.coil_abnormal_code" :value="scope.row.defectCode" />
</template>
</el-table-column>
<el-table-column label="程度" prop="degree"></el-table-column>
<el-table-column label="程度" prop="degree">
<template slot-scope="scope">
<dict-tag :options="dict.type.coil_abnormal_degree" :value="scope.row.degree" />
</template>
</el-table-column>
<el-table-column label="产线" prop="productionLine"></el-table-column>
<el-table-column label="备注" prop="remark"></el-table-column>
<el-table-column label="操作" width="120">
<template slot-scope="scope">
@@ -43,7 +48,7 @@ export default {
components: {
AbnormalForm
},
dicts: ['coil_abnormal_code'],
dicts: ['coil_abnormal_code', 'coil_abnormal_degree'],
props: {
coilId: {
type: String,
@@ -60,7 +65,8 @@ export default {
endPosition: 0,
defectCode: null,
degree: null,
remark: null
remark: null,
productionLine: null
},
abnormalList: [],
abnormalLoading: false,

View File

@@ -104,7 +104,7 @@
<el-table-column label="实际库区" align="center" prop="actualWarehouseName"
v-if="!hideWarehouseQuery && !showExportTime" />
<!-- <el-table-column label="物料类型" align="center" prop="materialType" /> -->
<el-table-column label="产品类型" align="center" width="250">
<el-table-column label="产品类型" align="center" width="180">
<template slot-scope="scope">
<ProductInfo v-if="scope.row.itemType == 'product'" :product="scope.row" />
<RawMaterialInfo v-else-if="scope.row.itemType === 'raw_material'" :material="scope.row" />