fix(wms): 更新镀锌原料标签判断逻辑并调整标签尺寸

修改多个文件中的镀锌原料仓库判断条件,增加新的仓库ID支持
调整DuGeTag.vue中标签的高度为100mm
更新base.vue中的标签类型判断逻辑,增加更多产品类型处理
修正DuGeTag.vue中的联系电话信息
This commit is contained in:
砂糖
2026-03-09 16:33:52 +08:00
parent fef2f132d0
commit 3f4ee0fce3
4 changed files with 26 additions and 7 deletions

View File

@@ -114,7 +114,7 @@
Jiaxiang County,Jining City,Shandong Province</span> Jiaxiang County,Jining City,Shandong Province</span>
<br /> <br />
<span> <span>
TEL0537-6625068 0537-6625067 TEL1905-3728822 1905-3728835
</span> </span>
</div> </div>
<div class="contact-timestamp"> <div class="contact-timestamp">

View File

@@ -36,7 +36,7 @@
v-if="tagType === 'ge'" v-if="tagType === 'ge'"
:content="content" :content="content"
:paperWidthMm="180" :paperWidthMm="180"
:paperHeightMm="80" :paperHeightMm="100"
/> />
<!-- <SampleTagPreview v-if="labelType === '4'" :content="content" /> <!-- <SampleTagPreview v-if="labelType === '4'" :content="content" />
<ForgeTagPreview v-if="labelType === '5'" :content="content" /> <ForgeTagPreview v-if="labelType === '5'" :content="content" />
@@ -141,7 +141,7 @@ export default {
handler(newVal) { handler(newVal) {
const { itemName, itemType, warehouseId } = newVal; const { itemName, itemType, warehouseId } = newVal;
// 在镀锌颜料库的卷使用镀锌原料标签 // 在镀锌颜料库的卷使用镀锌原料标签
if (itemType == 'raw_material' && warehouseId == '1988150263284953089') { if (itemType == 'raw_material' && (warehouseId == '1988150263284953089' || warehouseId == '1988150487185289217')) {
this.labelType = '5'; this.labelType = '5';
} else if (itemType == 'raw_material') { } else if (itemType == 'raw_material') {
this.labelType = '2'; this.labelType = '2';

View File

@@ -177,7 +177,8 @@
<el-table-column label="关联订单" align="center" prop="relatedToOrder" v-if="showRelatedToOrder" width="150"> <el-table-column label="关联订单" align="center" prop="relatedToOrder" v-if="showRelatedToOrder" width="150">
<template slot-scope="scope"> <template slot-scope="scope">
<el-switch @change="handleRelatedToOrderChange(scope.row)" v-model="scope.row.isRelatedToOrder" :active-value="1" :inactive-value="0" /> <el-switch @change="handleRelatedToOrderChange(scope.row)" v-model="scope.row.isRelatedToOrder"
:active-value="1" :inactive-value="0" />
</template> </template>
</el-table-column> </el-table-column>
@@ -787,8 +788,26 @@ export default {
handlePrintLabel(row) { handlePrintLabel(row) {
const item = row.itemType === 'product' ? row.product : row.rawMaterial; const item = row.itemType === 'product' ? row.product : row.rawMaterial;
const itemName = row.itemType === 'product' ? item?.productName || '' : item?.rawMaterialName || ''; const itemName = row.itemType === 'product' ? item?.productName || '' : item?.rawMaterialName || '';
const itemType = row.itemType || '';
this.labelRender.type = row.itemType === 'product' ? '3' : '2'; const warehouseId = row.warehouseId || '';
// 在镀锌颜料库的卷使用镀锌原料标签
if (itemType == 'raw_material' && (warehouseId == '1988150263284953089' || warehouseId == '1988150487185289217')) {
this.labelRender.type = '5';
} else if (itemType == 'raw_material') {
this.labelRender.type = '2';
} else if (itemType == 'product' && itemName == '冷硬卷') {
this.labelRender.type = '3';
} else if (itemType == 'product' && itemName == '热轧卷板') {
this.labelRender.type = '3';
} else if (itemType == 'product' && itemName == '镀锌卷') {
this.labelRender.type = '4';
} else if (itemType == 'product' && itemName == '冷轧卷') {
this.labelRender.type = '3';
} else if (itemType == 'product' && itemName == '镀铬卷') {
this.labelRender.type = 'ge';
} else {
this.labelRender.type = '3';
}
this.labelRender.data = { this.labelRender.data = {
...row, ...row,
itemName: itemName, itemName: itemName,

View File

@@ -661,7 +661,7 @@ export default {
const itemType = row.itemType || ''; const itemType = row.itemType || '';
const warehouseId = row.warehouseId || ''; const warehouseId = row.warehouseId || '';
// 在镀锌颜料库的卷使用镀锌原料标签 // 在镀锌颜料库的卷使用镀锌原料标签
if (itemType == 'raw_material' && warehouseId == '1988150263284953089') { if (itemType == 'raw_material' && (warehouseId == '1988150263284953089' || warehouseId == '1988150487185289217')) {
this.labelRender.type = '5'; this.labelRender.type = '5';
} else if (itemType == 'raw_material') { } else if (itemType == 'raw_material') {
this.labelRender.type = '2'; this.labelRender.type = '2';