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

Merge remote-tracking branch 'origin/0.8.X' into 0.8.X

Browse Source
This commit is contained in:
Joshi
2026-01-10 16:20:40 +08:00
parent ec3d3b7157 28cf54f3fe
commit e1a73783e9
3 changed files with 71 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
klp-ui/src/views/wms/coil/do/search.vue
View File

@@ -267,15 +267,15 @@
</div>
<div class="card-footer">
<el-button type="primary" icon="el-icon-check" size="mini" @click="handlePickMaterial(item)"
<el-button v-if="item.dataType == 1" type="primary" icon="el-icon-check" size="mini" @click="handlePickMaterial(item)"
:loading="item.picking" class="action-btn">领料</el-button>
</div>
</div>
</div>
<!-- 分页 -->
<pagination v-show="materialTotal > 0" :total="materialTotal" :page.sync="materialQueryParams.pageNum"
:limit.sync="materialQueryParams.pageSize" @pagination="getMaterialCoil" />
<pagination v-show="materialTotal > 0" :total="materialTotal" :page.sync="form.pageNum"
:limit.sync="form.pageSize" @pagination="getMaterialCoil" />
</div>
</el-col>
</el-row>
@@ -320,6 +320,8 @@ export default {
},
// 表单参数
form: {
dataType: 1,
// materialType: '原料',
materialType: null,
enterCoilNo: null,
currentCoilNo: null,
@@ -441,14 +443,14 @@ export default {
},
/** 物料搜索 */
handleMaterialQuery() {
this.materialQueryParams.pageNum = 1
this.form.pageNum = 1
this.getMaterialCoil()
},
/** 重置物料搜索 */
resetMaterialQuery() {
this.resetForm('materialQueryForm')
this.materialQueryParams.enterCoilNo = null
this.materialQueryParams.currentCoilNo = null
this.form.enterCoilNo = null
this.form.currentCoilNo = null
this.handleMaterialQuery()
},
/** 领料操作 */

83
klp-ui/src/views/wms/coil/panels/LabelRender/ProductionTagPreview.vue
View File

@@ -4,8 +4,7 @@
<!-- 调整第一行结构，左侧内容扩大，右侧二维码减小边距 -->
<tr>
<td colspan="2" style="padding: 0; width: 50%;">
<div
style="
<div style="
display: flex;
height: 100%;
align-items: space-evenly;
@@ -15,52 +14,85 @@
font-size: 13px;
">
<div style="display: flex; flex: 1; align-items: center;">
<div style="flex: 1; height: 100%; display: flex; align-items: center; justify-content: center; border: 1px solid #333; box-sizing: border-box; padding: 3px; word-break: break-all; overflow-wrap: break-word;" class="label-cell">
<div
style="flex: 1; height: 100%; display: flex; align-items: center; justify-content: center; border: 1px solid #333; box-sizing: border-box; padding: 3px; word-break: break-all; overflow-wrap: break-word;"
class="label-cell">
料卷号
</div>
<div style="flex: 1; height: 100%; display: flex; align-items: center; justify-content: center; border: 1px solid #333; box-sizing: border-box; padding: 3px; word-break: break-all; overflow-wrap: break-word;" class="value-cell">
<div
style="flex: 1; height: 100%; display: flex; align-items: center; justify-content: center; border: 1px solid #333; box-sizing: border-box; padding: 3px; word-break: break-all; overflow-wrap: break-word;"
class="value-cell">
{{ content.enterCoilNo || '' }}
</div>
</div>
<div style="display: flex; flex: 1; align-items: center;">
<div style="flex: 1; height: 100%; display: flex; align-items: center; justify-content: center; border: 1px solid #333; box-sizing: border-box; padding: 3px; word-break: break-all; overflow-wrap: break-word;" class="label-cell">
<div
style="flex: 1; height: 100%; display: flex; align-items: center; justify-content: center; border: 1px solid #333; box-sizing: border-box; padding: 3px; word-break: break-all; overflow-wrap: break-word;"
class="label-cell">
厂家卷号
</div>
<div
style="flex: 1; height: 100%; display: flex; align-items: center; justify-content: center; border: 1px solid #333; box-sizing: border-box; padding: 3px; word-break: break-all; overflow-wrap: break-word;"
class="value-cell">
{{ content.supplierCoilNo || '' }}
</div>
</div>
<div style="display: flex; flex: 1; align-items: center;">
<div
style="flex: 1; height: 100%; display: flex; align-items: center; justify-content: center; border: 1px solid #333; box-sizing: border-box; padding: 3px; word-break: break-all; overflow-wrap: break-word;"
class="label-cell">
逻辑库区
</div>
<div style="flex: 1; height: 100%; display: flex; align-items: center; justify-content: center; border: 1px solid #333; box-sizing: border-box; padding: 3px; word-break: break-all; overflow-wrap: break-word;" class="value-cell">
<div
style="flex: 1; height: 100%; display: flex; align-items: center; justify-content: center; border: 1px solid #333; box-sizing: border-box; padding: 3px; word-break: break-all; overflow-wrap: break-word;"
class="value-cell">
<input type="text" class="nob" :value="content.warehouseName || ''" />
</div>
</div>
<div style="display: flex; flex: 1; align-items: center;">
<div style="flex: 1; height: 100%; display: flex; align-items: center; justify-content: center; border: 1px solid #333; box-sizing: border-box; padding: 3px; word-break: break-all; overflow-wrap: break-word;" class="label-cell">
<div
style="flex: 1; height: 100%; display: flex; align-items: center; justify-content: center; border: 1px solid #333; box-sizing: border-box; padding: 3px; word-break: break-all; overflow-wrap: break-word;"
class="label-cell">
实际库区
</div>
<div style="flex: 1; height: 100%; display: flex; align-items: center; justify-content: center; border: 1px solid #333; box-sizing: border-box; padding: 3px; word-break: break-all; overflow-wrap: break-word;" class="value-cell">
<div
style="flex: 1; height: 100%; display: flex; align-items: center; justify-content: center; border: 1px solid #333; box-sizing: border-box; padding: 3px; word-break: break-all; overflow-wrap: break-word;"
class="value-cell">
<input type="text" class="nob" :value="content.actualWarehouseName || ''" />
</div>
</div>
<div style="display: flex; flex: 1; align-items: center;">
<div style="flex: 1; height: 100%; display: flex; align-items: center; justify-content: center; border: 1px solid #333; box-sizing: border-box; padding: 3px; word-break: break-all; overflow-wrap: break-word;" class="label-cell">
<div
style="flex: 1; height: 100%; display: flex; align-items: center; justify-content: center; border: 1px solid #333; box-sizing: border-box; padding: 3px; word-break: break-all; overflow-wrap: break-word;"
class="label-cell">
规格(mm)
</div>
<div style="flex: 1; height: 100%; display: flex; align-items: center; justify-content: center; border: 1px solid #333; box-sizing: border-box; padding: 3px; word-break: break-all; overflow-wrap: break-word;" class="value-cell">
<div
style="flex: 1; height: 100%; display: flex; align-items: center; justify-content: center; border: 1px solid #333; box-sizing: border-box; padding: 3px; word-break: break-all; overflow-wrap: break-word;"
class="value-cell">
<input type="text" class="nob" :value="content.specification || ''" />
</div>
</div>
<div style="display: flex; flex: 1; align-items: center;">
<div style="flex: 1; height: 100%; display: flex; align-items: center; justify-content: center; border: 1px solid #333; box-sizing: border-box; padding: 3px; word-break: break-all; overflow-wrap: break-word;" class="label-cell">
<div
style="flex: 1; height: 100%; display: flex; align-items: center; justify-content: center; border: 1px solid #333; box-sizing: border-box; padding: 3px; word-break: break-all; overflow-wrap: break-word;"
class="label-cell">
生产班组
</div>
<div style="flex: 1; height: 100%; display: flex; align-items: center; justify-content: center; border: 1px solid #333; box-sizing: border-box; padding: 3px; word-break: break-all; overflow-wrap: break-word;" class="value-cell">
<div
style="flex: 1; height: 100%; display: flex; align-items: center; justify-content: center; border: 1px solid #333; box-sizing: border-box; padding: 3px; word-break: break-all; overflow-wrap: break-word;"
class="value-cell">
<input type="text" class="nob" :value="content.team || ''" />
</div>
</div>
</div>
</td>
<td class="value-cell" colspan="4" style="width: 50%; padding: 2px; text-align: center; vertical-align: middle;">
<td class="value-cell" colspan="4"
style="width: 50%; padding: 2px; text-align: center; vertical-align: middle;">
<QRCode :content="content.qrcodeRecordId || ' '" :size="130" />
</td>
</tr>
<!-- <tr>
<!-- <tr>
<td class="label-cell" colspan="2">逻辑库区</td>
<td class="value-cell" colspan="2">
<input type="text" class="nob" :value="content.warehouseName || ''" />
@@ -235,19 +267,25 @@ export default {
width: 25em;
height: 20em;
padding: 0px;
display: flex; /* 启用Flex布局 */
flex-direction: column; /* 子元素垂直排列 */
display: flex;
/* 启用Flex布局 */
flex-direction: column;
/* 子元素垂直排列 */
font-family: "SimSun", serif;
box-sizing: border-box; /* 确保内边距/边框不影响总尺寸 */
box-sizing: border-box;
/* 确保内边距/边框不影响总尺寸 */
}
.material-label-table {
border-collapse: collapse;
width: 100%;
table-layout: fixed;
flex-grow: 1; /* 让表格拉伸，占满剩余垂直空间 */
height: 0; /* 配合flex-grow，自动计算高度 */
border: 1px solid #333; /* 确保表格有最外层边框 */
flex-grow: 1;
/* 让表格拉伸，占满剩余垂直空间 */
height: 0;
/* 配合flex-grow，自动计算高度 */
border: 1px solid #333;
/* 确保表格有最外层边框 */
}
/* 四列均分宽度，每列占25% */
@@ -299,14 +337,15 @@ export default {
print-color-adjust: exact !important;
}
html, body {
html,
body {
margin: 0 !important;
padding: 0 !important;
overflow: hidden !important;
}
/* 隐藏所有其他内容，只显示标签容器 */
body > *:not(.material-label-container) {
body>*:not(.material-label-container) {
display: none !important;
}

2
klp-ui/src/views/wms/report/zha.vue
View File

@@ -169,6 +169,7 @@ export default {
pageNum: 1,
dataType: 1,
createBy: 'suanzhakuguan',
// updateBy: 'suanzhakuguan',
warehouseId: '1988150099140866050'
}),
// 镀锌原料库
@@ -180,6 +181,7 @@ export default {
pageNum: 1,
dataType: 1,
createBy: 'suanzhakuguan',
// updateBy: 'suanzhakuguan',
warehouseId: '1988150263284953089'
}),
// 脱脂原料库