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-04-25 16:07:22 +08:00
parent bf44909686 0cfffc3adb
commit a1be1bf5ad
4 changed files with 28 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
klp-ui/src/views/wms/coil/components/CoilInfo.vue
View File

@@ -26,12 +26,12 @@
<el-descriptions-item label="原料材质">{{ coilInfo.packingStatus || '-' }}</el-descriptions-item>
<el-descriptions-item label="包装要求">{{ coilInfo.packagingRequirement || '-' }}</el-descriptions-item>
<el-descriptions-item label="实测厚度">{{ coilInfo.actualThickness ? `${coilInfo.actualThickness} m` : '-' }}</el-descriptions-item>
<el-descriptions-item label="实测宽度">{{ coilInfo.actualWidth ? `${coilInfo.actualWidth} m` : '-' }}</el-descriptions-item>
<el-descriptions-item label="长度">{{ coilInfo.length ? `${coilInfo.length} m` : '-' }}</el-descriptions-item>
<el-descriptions-item label="实测厚度[mm]">{{ coilInfo.actualThickness || '-' }}</el-descriptions-item>
<el-descriptions-item label="实测宽度[mm]">{{ coilInfo.actualWidth || '-' }}</el-descriptions-item>
<el-descriptions-item label="长度[mm]">{{ coilInfo.length || '-' }}</el-descriptions-item>
<el-descriptions-item label="毛重">{{ coilInfo.grossWeight ? `${coilInfo.grossWeight} t` : '-' }}</el-descriptions-item>
<el-descriptions-item label="净重">{{ coilInfo.netWeight ? `${coilInfo.netWeight} t` : '-' }}</el-descriptions-item>
<el-descriptions-item label="毛重[t]">{{ coilInfo.grossWeight || '-' }}</el-descriptions-item>
<el-descriptions-item label="净重[t]">{{ coilInfo.netWeight || '-' }}</el-descriptions-item>
<el-descriptions-item label="生产开始">{{ coilInfo.productionStartTime || '-' }}</el-descriptions-item>
<el-descriptions-item label="生产结束">{{ coilInfo.productionEndTime || '-' }}</el-descriptions-item>
<el-descriptions-item label="调制度">{{ coilInfo.temperGrade || '-' }}</el-descriptions-item>
@@ -53,6 +53,11 @@ export default {
column: {
type: Number,
default: 5
},
// 只显示有值的字段
showOnlyValue: {
type: Boolean,
default: false
}
},
methods: {

24
klp-ui/src/views/wms/coil/info.vue
View File

@@ -671,8 +671,8 @@
<div class="table-title">移库记录</div>
<div class="table-container">
<el-table :data="warehouseTranferList" size="small" border stripe style="width: 100%">
<el-table-column prop="createTime" label="操作时间" width="170"></el-table-column>
<el-table-column prop="operationType" label="操作类型" width="90">
<el-table-column prop="createTime" label="操作时间"></el-table-column>
<el-table-column prop="operationType" label="操作类型">
<template slot-scope="scope">
<span v-if="scope.row.operationType === 1">收货</span>
<span v-else-if="scope.row.operationType === 2">加工</span>
@@ -680,17 +680,17 @@
<span v-else-if="scope.row.operationType === 4">发货</span>
</template>
</el-table-column>
<el-table-column prop="inOutType" label="出入库" width="80">
<el-table-column prop="inOutType" label="出入库">
<template slot-scope="scope">
{{ scope.row.inOutType === 1 ? '入库' : '出库' }}
</template>
</el-table-column>
<el-table-column prop="warehouse.actualWarehouseName" label="库位" width="140">
<el-table-column prop="warehouse.actualWarehouseName" label="库位">
<template slot-scope="scope">
{{ scope.row.warehouse.actualWarehouseName || '-' }}
</template>
</el-table-column>
<el-table-column prop="remark" label="备注" min-width="120"></el-table-column>
<el-table-column prop="remark" label="备注" show-overflow-tooltip></el-table-column>
</el-table>
</div>
</div>
@@ -701,17 +701,17 @@
<div class="table-container">
<el-table :data="tranferList" size="small" border stripe style="width: 100%">
<el-table-column prop="type" label="类型" min-width="100"></el-table-column>
<el-table-column label="变更前" min-width="150">
<el-table-column label="变更前">
<template slot-scope="scope">
{{ scope.row.before }}
</template>
</el-table-column>
<el-table-column label="变更后" min-width="150">
<el-table-column label="变更后">
<template slot-scope="scope">
{{ scope.row.after }}
</template>
</el-table-column>
<el-table-column prop="createTime" label="时间" min-width="160"></el-table-column>
<el-table-column prop="createTime" label="时间"></el-table-column>
</el-table>
</div>
</div>
@@ -845,8 +845,8 @@ export default {
this.transferOrderItemList.forEach(item => {
list.push({
type: '批量调拨',
before: item.warehouseNameBefore || '-',
after: item.warehouseNameAfter || '-',
before: '逻辑库：' + (item.warehouseNameBefore || '-'),
after: '逻辑库：' + (item.warehouseNameAfter || '-'),
createTime: item.createTime || '-',
...item
});
@@ -855,8 +855,8 @@ export default {
this.coilQualityRejudgeList.forEach(item => {
list.push({
type: '技术部改判',
before: item.qualityBefore || '-',
after: item.qualityAfter || '-',
before: '质量状态：' + (item.beforeQuality || '-'),
after: '质量状态：' + (item.afterQuality || '-'),
createTime: item.createTime || '-',
...item
});

5
klp-ui/src/views/wms/coil/panels/base.vue
View File

@@ -1222,6 +1222,8 @@ export default {
if (this.useWarehouseIds) {
query.warehouseIds = this.warehouseIds;
}
const { orderBy, ...statisticQuery } = query;
if (this.showWaybill) {
const { shipmentTime, ...query } = {
...this.queryParams,
@@ -1243,6 +1245,7 @@ export default {
listBoundCoil({ ...query, status: 1 }).then(res => {
this.shippedCount = res.total;
})
getCoilStatisticsList(query).then(res => {
this.statistics = res.data || [];
})
@@ -1253,7 +1256,7 @@ export default {
this.total = response.total;
this.loading = false;
});
getCoilStatisticsList(query).then(res => {
getCoilStatisticsList(statisticQuery).then(res => {
this.statistics = res.data || [];
})
},

2
klp-ui/src/views/wms/delivery/canuse/index.vue
View File

@@ -6,6 +6,7 @@
:hideType="hideType"
:showLength="showLength"
:canExportAll="canExportAll"
:leftWarehouseQuery="leftWarehouseQuery"
/>
</template>
@@ -32,6 +33,7 @@ export default {
showLength: true,
canExportAll: true,
showOrderBy: false,
leftWarehouseQuery: true
}
}
}