diff --git a/klp-ui/src/views/wms/coil/panels/do.vue b/klp-ui/src/views/wms/coil/panels/do.vue index 85e47487..09ff9b21 100644 --- a/klp-ui/src/views/wms/coil/panels/do.vue +++ b/klp-ui/src/views/wms/coil/panels/do.vue @@ -506,16 +506,12 @@ export default { remark: `PC端领料创建-${this.label}` } - addPendingAction(pendingData).then(response => { - if (response.code === 200) { - this.$message.success('领料成功,已创建待操作任务') - this.getPendingAction() // 刷新待操作列表 - } else { - this.$message.error(response.msg || '领料失败') - } - }).catch(error => { - console.error('领料失败:', error) - this.$message.error('领料失败,请重试') + this.$modal.confirm(`是否确认从${row.warehouseName || '仓库'}领料${row.currentCoilNo || '物料'}?`).then(() => { + // 用户点击确认后执行的操作 + return addPendingAction(pendingData) + }).then(response => { + this.$message.success('领料成功,已创建待操作任务') + this.getPendingAction() // 刷新待操作列表 }).finally(() => { this.$set(row, 'picking', false) }) diff --git a/klp-ui/src/views/wms/delivery/plan/index.vue b/klp-ui/src/views/wms/delivery/plan/index.vue index 5894247a..8dab44f0 100644 --- a/klp-ui/src/views/wms/delivery/plan/index.vue +++ b/klp-ui/src/views/wms/delivery/plan/index.vue @@ -126,9 +126,9 @@ placeholder="请选择计划日期"> - + diff --git a/klp-ui/src/views/wms/receive/components/ImportGuide.vue b/klp-ui/src/views/wms/receive/components/ImportGuide.vue index a9751c48..3031697f 100644 --- a/klp-ui/src/views/wms/receive/components/ImportGuide.vue +++ b/klp-ui/src/views/wms/receive/components/ImportGuide.vue @@ -166,8 +166,8 @@ const ErrorType = Object.freeze({ * 表格列配置枚举 */ const TableColumnEnum = Object.freeze([ - { prop: 'type', label: '类型', width: 80 }, - { prop: 'logicWarehouse', label: '逻辑库区', width: 120 }, + // { prop: 'type', label: '类型', width: 80 }, + // { prop: 'logicWarehouse', label: '逻辑库区', width: 120 }, { prop: 'inboundCoilNo', label: '入场卷号', width: 150 }, { prop: 'factoryCoilNo', label: '厂家卷号', width: 150 }, { prop: 'weight', label: '重量(吨)', width: 120 }, @@ -440,6 +440,10 @@ export default { // 增加行号 rowObj.rowNum = rowNum; + // 模版中移除原料列和逻辑库区列,默认值为原料和酸连轧原料库 + rowObj.type = '原料' + rowObj.logicWarehouse = '酸连轧原料库' + return rowObj; },