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-03-05 09:36:00 +08:00
parent 5c6a3c4981 8659847e96
commit 0b5fe00d94
11 changed files with 28 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
klp-ui/src/views/wms/coil/typing.vue
View File

@@ -90,7 +90,7 @@
</el-button> -->
</div>
<el-form ref="updateForm" :model="updateForm" :rules="rules" label-width="120px" size="small">
<el-form ref="updateForm" :model="updateForm" :rules="rules" label-width="80px" size="small">
<el-form-item label="当前钢卷号" prop="currentCoilNo">
<el-input v-model="updateForm.currentCoilNo" placeholder="请输入当前钢卷号">
<template slot="prepend">
@@ -199,18 +199,18 @@
</div>
<el-table :data="acidRecentRecords" stripe size="small" @row-click="handleClickRecord">
<el-table-column prop="currentCoilNo" label="加工前卷号" width="150" show-overflow-tooltip></el-table-column>
<el-table-column prop="excoilId" label="出口卷号" width="150" show-overflow-tooltip></el-table-column>
<el-table-column prop="currentCoilNo" label="加工前卷号" width="120" show-overflow-tooltip></el-table-column>
<el-table-column prop="excoilId" label="出口卷号" width="120" show-overflow-tooltip></el-table-column>
<el-table-column prop="exitWeight" label="出口重量(t)" width="100">
<template slot-scope="scope">
{{ scope.row.exitWeight ? scope.row.exitWeight + ' t' : '—' }}
</template>
</el-table-column>
<el-table-column prop="exitLength" label="出口长度(m)" width="120">
<!-- <el-table-column prop="exitLength" label="出口长度(m)" width="120">
<template slot-scope="scope">
{{ scope.row.exitLength ? scope.row.exitLength + ' m' : '—' }}
</template>
</el-table-column>
</el-table-column> -->
<el-table-column prop="team" label="班组" width="80"></el-table-column>
</el-table>
</el-card>
@@ -831,7 +831,7 @@ export default {
/* 主内容区 */
.content-wrapper {
display: grid;
grid-template-columns: 350px 1fr;
grid-template-columns: 300px 1fr;
gap: 10px;
align-items: stretch; // 改为stretch，让子元素高度一致
}
@@ -866,7 +866,7 @@ export default {
// 新增：最近记录卡片样式
.recent-records-card {
flex: none; // 不伸缩，只占据内容所需空间
flex: none // 不伸缩，只占据内容所需空间
}
/* 变更历史区域（占满整行） */
@@ -901,7 +901,7 @@ export default {
.info-label {
color: #909399;
font-size: 14px;
min-width: 110px;
min-width: 80px;
flex-shrink: 0;
}

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

@@ -316,6 +316,7 @@ export default {
async getLossList() {
this.loading = true
const res1 = await listPendingAction({
actionStatus: 2,
actionType: 11, // 酸轧工序
pageSize: 999,
pageNum: 1,
@@ -323,7 +324,7 @@ export default {
endTime: this.queryParams.byCreateTimeEnd,
})
const res2 = await listPendingAction({
// actionStatus: 2,
actionStatus: 2,
warehouseId: this.queryParams.planId,
// actionType: 401,
actionType: 120, // 分条工序

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

@@ -337,6 +337,7 @@ export default {
async getLossList() {
this.loading = true
const res1 = await listPendingAction({
actionStatus: 2,
actionType: 11, // 酸轧工序
pageSize: 999,
pageNum: 1,
@@ -344,7 +345,7 @@ export default {
endTime: this.queryParams.byCreateTimeEnd,
})
const res2 = await listPendingAction({
// actionStatus: 2,
actionStatus: 2,
warehouseId: this.queryParams.planId,
// actionType: 401,
actionType: 120, // 分条工序

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

@@ -392,6 +392,7 @@ export default {
async getLossList() {
this.loading = true
const res1 = await listPendingAction({
actionStatus: 2,
actionType: 11, // 酸轧工序
pageSize: 999,
pageNum: 1,
@@ -399,7 +400,7 @@ export default {
endTime: this.queryParams.byCreateTimeEnd,
})
const res2 = await listPendingAction({
// actionStatus: 2,
actionStatus: 2,
warehouseId: this.queryParams.planId,
// actionType: 401,
actionType: 120, // 分条工序

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

@@ -321,6 +321,7 @@ export default {
async getLossList() {
this.loading = true
const res1 = await listPendingAction({
actionStatus: 2,
actionType: 11, // 酸轧工序
pageSize: 999,
pageNum: 1,
@@ -328,7 +329,7 @@ export default {
endTime: this.queryParams.byCreateTimeEnd,
})
const res2 = await listPendingAction({
// actionStatus: 2,
actionStatus: 2,
warehouseId: this.queryParams.planId,
// actionType: 401,
actionType: 120, // 分条工序

4
klp-ui/src/views/wms/report/zha_.vue
View File

@@ -182,7 +182,7 @@ export default {
async getList() {
this.loading = true
const res1 = await listPendingAction({
// actionStatus: 2,
actionStatus: 2,
warehouseId: this.queryParams.planId,
// actionType: 401,
actionType: 11, // 酸轧工序
@@ -192,7 +192,7 @@ export default {
endTime: this.queryParams.byCreateTimeEnd,
})
const res2 = await listPendingAction({
// actionStatus: 2,
actionStatus: 2,
warehouseId: this.queryParams.planId,
// actionType: 401,
actionType: 120, // 分条工序

3
klp-ui/src/views/wms/report/zinc/day.vue
View File

@@ -302,6 +302,7 @@ export default {
async getLossList() {
this.loading = true
const res1 = await listPendingAction({
actionStatus: 2,
actionType: 501, // 镀锌工序
pageSize: 999,
pageNum: 1,
@@ -309,7 +310,7 @@ export default {
endTime: this.queryParams.byCreateTimeEnd,
})
const res2 = await listPendingAction({
// actionStatus: 2,
actionStatus: 2,
warehouseId: this.queryParams.planId,
// actionType: 401,
actionType: 120, // 分条工序

3
klp-ui/src/views/wms/report/zinc/month.vue
View File

@@ -323,6 +323,7 @@ export default {
async getLossList() {
this.loading = true
const res1 = await listPendingAction({
actionStatus: 2,
actionType: 501, // 镀锌工序
pageSize: 999,
pageNum: 1,
@@ -330,7 +331,7 @@ export default {
endTime: this.queryParams.byCreateTimeEnd,
})
const res2 = await listPendingAction({
// actionStatus: 2,
actionStatus: 2,
warehouseId: this.queryParams.planId,
// actionType: 401,
actionType: 120, // 分条工序

3
klp-ui/src/views/wms/report/zinc/team.vue
View File

@@ -379,6 +379,7 @@ export default {
async getLossList() {
this.loading = true
const res1 = await listPendingAction({
actionStatus: 2,
actionType: 501, // 镀锌工序
pageSize: 999,
pageNum: 1,
@@ -386,7 +387,7 @@ export default {
endTime: this.queryParams.byCreateTimeEnd,
})
const res2 = await listPendingAction({
// actionStatus: 2,
actionStatus: 2,
warehouseId: this.queryParams.planId,
// actionType: 401,
actionType: 120, // 分条工序

3
klp-ui/src/views/wms/report/zinc/year.vue
View File

@@ -305,6 +305,7 @@ export default {
async getLossList() {
this.loading = true
const res1 = await listPendingAction({
actionStatus: 2,
actionType: 501, // 镀锌工序
pageSize: 999,
pageNum: 1,
@@ -312,7 +313,7 @@ export default {
endTime: this.queryParams.byCreateTimeEnd,
})
const res2 = await listPendingAction({
// actionStatus: 2,
actionStatus: 2,
warehouseId: this.queryParams.planId,
// actionType: 401,
actionType: 120, // 分条工序

4
klp-ui/src/views/wms/report/zinc_.vue
View File

@@ -182,7 +182,7 @@ export default {
async getList() {
this.loading = true
const res1 = await listPendingAction({
// actionStatus: 2,
actionStatus: 2,
warehouseId: this.queryParams.planId,
// actionType: 401,
actionType: 501, // 镀锌工序
@@ -192,7 +192,7 @@ export default {
endTime: this.queryParams.byCreateTimeEnd,
})
const res2 = await listPendingAction({
// actionStatus: 2,
actionStatus: 2,
warehouseId: this.queryParams.planId,
// actionType: 401,
actionType: 120, // 分条工序