fix: 修正发货成功提示和库存显示格式
- 将发货操作的成功提示从"入库成功"改为"发货成功" - 在操作流程页面添加入库和发货操作的类型显示 - 修改库存页面产品信息的显示格式,使用方括号显示规格信息 - 完善库存数据映射,确保产品信息完整显示
This commit is contained in:
@@ -77,6 +77,8 @@
|
|||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<span v-if="scope.row.actionType===5">移库操作已在移动端完成</span>
|
<span v-if="scope.row.actionType===5">移库操作已在移动端完成</span>
|
||||||
<span v-else-if="scope.row.actionType===4">发货操作已在移动端完成</span>
|
<span v-else-if="scope.row.actionType===4">发货操作已在移动端完成</span>
|
||||||
|
<span v-else-if="scope.row.actionType===401">入库操作</span>
|
||||||
|
<span v-else-if="scope.row.actionType===402">发货操作</span>
|
||||||
<dict-tag v-else :options='dict.type.action_type' :value="scope.row.actionType "></dict-tag>
|
<dict-tag v-else :options='dict.type.action_type' :value="scope.row.actionType "></dict-tag>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
|
|||||||
@@ -327,7 +327,7 @@ export default {
|
|||||||
remark: this.form.remark,
|
remark: this.form.remark,
|
||||||
actionStatus: 2,
|
actionStatus: 2,
|
||||||
}).then(res => {
|
}).then(res => {
|
||||||
this.$modal.msgSuccess("入库成功");
|
this.$modal.msgSuccess("发货成功");
|
||||||
this.getList()
|
this.getList()
|
||||||
})
|
})
|
||||||
}).finally(() => {
|
}).finally(() => {
|
||||||
|
|||||||
@@ -40,12 +40,12 @@
|
|||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<ProductInfo v-if="scope.row.itemType == 'product' || scope.row.itemType == 'semi'" :product="scope.row.product">
|
<ProductInfo v-if="scope.row.itemType == 'product' || scope.row.itemType == 'semi'" :product="scope.row.product">
|
||||||
<template #default="{ product }">
|
<template #default="{ product }">
|
||||||
{{ product.productName }}({{ product.productCode }})
|
{{ product.productName }}[{{ product.specification }}]
|
||||||
</template>
|
</template>
|
||||||
</ProductInfo>
|
</ProductInfo>
|
||||||
<RawMaterialInfo v-else-if="scope.row.itemType === 'raw_material'" :material="scope.row.rawMaterial">
|
<RawMaterialInfo v-else-if="scope.row.itemType === 'raw_material'" :material="scope.row.rawMaterial">
|
||||||
<template #default="{ material }">
|
<template #default="{ material }">
|
||||||
{{ material.rawMaterialName }}({{ material.rawMaterialCode }})
|
{{ material.rawMaterialName }}[{{ material.specification }}]
|
||||||
</template>
|
</template>
|
||||||
</RawMaterialInfo>
|
</RawMaterialInfo>
|
||||||
</template>
|
</template>
|
||||||
@@ -207,7 +207,33 @@ export default {
|
|||||||
this.loading = true;
|
this.loading = true;
|
||||||
if (this.warehouseType === 'real') {
|
if (this.warehouseType === 'real') {
|
||||||
getStockByActual(this.queryParams).then(response => {
|
getStockByActual(this.queryParams).then(response => {
|
||||||
this.stockList = response.rows;
|
this.stockList = response.rows.map(item => {
|
||||||
|
const itemType = item.itemType
|
||||||
|
if (itemType === 'raw_material') {
|
||||||
|
item.rawMaterial = {
|
||||||
|
rawMaterialId: item.itemId,
|
||||||
|
rawMaterialName: item.itemName,
|
||||||
|
rawMaterialCode: item.itemCode,
|
||||||
|
specification: item.specification,
|
||||||
|
material: item.material,
|
||||||
|
surfaceTreatment: item.surfaceTreatment,
|
||||||
|
zincLayer: item.zincLayer,
|
||||||
|
manufacturer: item.manufacturer,
|
||||||
|
}
|
||||||
|
} else if (itemType === 'product') {
|
||||||
|
item.product = {
|
||||||
|
productId: item.itemId,
|
||||||
|
productName: item.itemName,
|
||||||
|
productCode: item.itemCode,
|
||||||
|
specification: item.specification,
|
||||||
|
material: item.material,
|
||||||
|
surfaceTreatment: item.surfaceTreatment,
|
||||||
|
zincLayer: item.zincLayer,
|
||||||
|
manufacturer: item.manufacturer,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return item
|
||||||
|
});
|
||||||
this.total = response.total;
|
this.total = response.total;
|
||||||
this.loading = false;
|
this.loading = false;
|
||||||
});
|
});
|
||||||
|
|||||||
Reference in New Issue
Block a user