diff --git a/klp-ui/src/views/wms/coil/do/correct.vue b/klp-ui/src/views/wms/coil/do/correct.vue index c1f61220..56904af3 100644 --- a/klp-ui/src/views/wms/coil/do/correct.vue +++ b/klp-ui/src/views/wms/coil/do/correct.vue @@ -7,7 +7,7 @@

查找钢卷并修正 - 绿色边框表示当前钢卷,灰色边框表示历史钢卷 + 绿色边框表示当前钢卷,灰色边框表示历史钢卷, 蓝色边框表示已发货钢卷

刷新 @@ -35,12 +35,12 @@

暂无待领物料

-
+ :style="getBorderStyle(item)">
{{ item.currentCoilNo }} + {{ getTypeLabel(item) }} {{ item.materialType || '原料' }} @@ -383,7 +383,7 @@ export default { pageNum: 1, pageSize: 20, // dataType: 1, - status: 0, + // status: 0, enterCoilNo: null, currentCoilNo: null }, @@ -568,6 +568,41 @@ export default { }, methods: { parseTime, + getBorderStyle(row) { + console.log(row); + // 已发货 + if (row.status == 1) { + return {border: '1.5px solid #007bff'} + } + // 历史钢卷 + if (row.dataType == 0) { + return {border: '1.5px solid #6c757d'} + } + // 当前钢卷 + if (row.dataType == 1) { + return {border: '1.5px solid #28a745'} + } + // 还未入库的钢卷 + if (row.dataType == 10) { + return {border: '1.5px solid #ffc107'} + } + return {border: '1.5px solid #e4e7ed'} + }, + getTypeLabel(row) { + if (row.status == 1) { + return '已发货' + } + if (row.dataType == 0) { + return '历史钢卷' + } + if (row.dataType == 1) { + return '当前钢卷' + } + if (row.dataType == 10) { + return '还未入库的钢卷' + } + return '未知' + }, /** 查询用户列表 */ getUsers() { listUser({ pageNum: 1, pageSize: 1000 }).then(response => { diff --git a/klp-ui/src/views/wms/coil/do/warehousing.vue b/klp-ui/src/views/wms/coil/do/warehousing.vue index 471c3e78..014fc406 100644 --- a/klp-ui/src/views/wms/coil/do/warehousing.vue +++ b/klp-ui/src/views/wms/coil/do/warehousing.vue @@ -607,9 +607,11 @@ export default { handleCoil(COIL_ACTIONS.RECEIVE, this.form, this.form.planId) .then(res => { this.$modal.msgSuccess("入库成功"); + this.form = { itemId: null, itemType: 'raw_material', + materialType: '原料', warehouseId: '1988150044862377986', // 酸连轧原料库 netWeight: null, grossWeight: null, @@ -618,8 +620,9 @@ export default { trimmingRequirement: null, packingStatus: null, packagingRequirement: null, - planId: this.todayPlanId, + planId: this.form.planId, } + this.getMaxCoilNoByPrefix() this.getList() }).finally(() => { this.buttonLoading = false; @@ -731,7 +734,7 @@ export default { getMaxCoilNo(prefix).then(res => { console.log(res) // 扣掉最后一位 - this.form.enterCoilNo = res.data.maxEnterCoilNo.slice(0, -1); + this.$set(this.form, 'enterCoilNo', res.data.maxEnterCoilNo.slice(0, -1)); }) }, // 检查钢卷号是否合法(后端检查)