refactor(产品信息展示): 统一产品及原料信息展示格式并清理冗余代码

- 将产品信息和原料信息的默认展示格式统一为"名称[规格] - (材质:材质)"
- 移除DrillDownTable中重复的模板代码,直接使用组件默认插槽
- 删除base.vue中注释掉的冗余表单代码
- 增强删除确认提示信息,明确告知会清理相关记录
This commit is contained in:
砂糖
2025-11-18 10:30:25 +08:00
parent 02cb0f654f
commit a13b7058b0
4 changed files with 5 additions and 36 deletions

View File

@@ -2,7 +2,7 @@
<div>
<span class="product-name" @click.stop="clickHandle">
<slot name="default" :product="productFull">
{{ productFull.productName || '--' }}
{{ productFull.productName || '未知' }}[{{ productFull.specification || '无规格' }}] - (材质{{ productFull.material || '无材质' }})
</slot>
</span>
<el-dialog

View File

@@ -3,7 +3,7 @@
<!-- 作用域插槽 -->
<span class="material-name" @click.stop="showDetail = true">
<slot name="default" :material="materialFull">
{{ materialFull.rawMaterialName || '-' }}
{{ materialFull.rawMaterialName || '未知' }}[{{ materialFull.specification || '无规格' }}] - (材质{{ materialFull.material || '无材质' }})
</slot>
</span>
<el-dialog :visible="showDetail" @close="showDetail = false" :title="materialFull.rawMaterialName || '--'" width="600px"

View File

@@ -47,16 +47,8 @@
</el-table-column>
<el-table-column label="产品类型" align="center" min-width="250">
<template slot-scope="scope">
<ProductInfo v-if="scope.row.itemType === 'product'" :product="scope.row.product">
<template #default="{ product }">
{{ product.productName || '未知' }}[{{ product.specification || '无规格' }}] - (材质{{ product.material || '无材质' }})
</template>
</ProductInfo>
<RawMaterialInfo v-else-if="scope.row.itemType === 'raw_material'" :material="scope.row.rawMaterial">
<template #default="{ material }">
{{ material.rawMaterialName || '未知' }}[{{ material.specification || '无规格' }}] - (材质{{ material.material || '无材质' }})
</template>
</RawMaterialInfo>
<ProductInfo v-if="scope.row.itemType === 'product'" :product="scope.row.product"></ProductInfo>
<RawMaterialInfo v-else-if="scope.row.itemType === 'raw_material'" :material="scope.row.rawMaterial"></RawMaterialInfo>
</template>
</el-table-column>
<el-table-column label="更新时间" align="center" prop="updateTime" />

View File

@@ -124,29 +124,6 @@
<el-table-column v-if="querys.materialType === '成品'" label="切边要求" align="center" prop="trimmingRequirement" />
<el-table-column v-if="querys.materialType === '成品'" label="打包状态" align="center" prop="packingStatus" />
<el-table-column v-if="querys.materialType === '成品'" label="包装要求" align="center" prop="packagingRequirement" />
<!-- <el-form-item v-if="form.materialType === '成品'" label="质量状态" prop="qualityStatus">
<el-input v-model="form.qualityStatus" placeholder="请输入质量状态"
:disabled="readonly">
</el-input>
</el-form-item>
<el-form-item v-if="form.materialType === '成品'" label="切边要求" prop="trimmingRequirement">
<el-input v-model="form.trimmingRequirement" placeholder="请输入切边要求"
:disabled="readonly">
</el-input>
</el-form-item>
<el-form-item v-if="form.materialType === '成品'" label="打包状态" prop="packingStatus">
<el-input v-model="form.packingStatus" placeholder="请输入打包状态"
:disabled="readonly">
</el-input>
</el-form-item>
<el-form-item v-if="form.materialType === '成品'" label="包装要求" prop="packagingRequirement">
<el-input v-model="form.packagingRequirement" placeholder="请输入包装要求"
:disabled="readonly">
</el-input>
</el-form-item> -->
<el-table-column label="关联信息" align="center" prop="parentCoilNos" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span v-if="scope.row.parentCoilNos && scope.row.hasMergeSplit === 1 && scope.row.dataType === 1">
@@ -673,7 +650,7 @@ export default {
/** 删除按钮操作 */
handleDelete(row) {
const coilIds = row.coilId || this.ids;
this.$modal.confirm('是否确认删除钢卷物料编号为"' + coilIds + '"的数据项?').then(() => {
this.$modal.confirm('是否确认删除钢卷物料编号为"' + coilIds + '"的数据项,会同时清理刚钢卷相关的待操作记录且无法恢复!!!是否继续删除').then(() => {
this.loading = true;
return delMaterialCoil(coilIds);
}).then(() => {