refactor(wms): 移除表单字段并优化领料确认逻辑
移除交付计划中的绑定订单字段和接收导入中的类型、逻辑库区列 为导入数据添加默认类型和逻辑库区值 在领料操作前添加确认弹窗提示
This commit is contained in:
@@ -506,16 +506,12 @@ export default {
|
|||||||
remark: `PC端领料创建-${this.label}`
|
remark: `PC端领料创建-${this.label}`
|
||||||
}
|
}
|
||||||
|
|
||||||
addPendingAction(pendingData).then(response => {
|
this.$modal.confirm(`是否确认从${row.warehouseName || '仓库'}领料${row.currentCoilNo || '物料'}?`).then(() => {
|
||||||
if (response.code === 200) {
|
// 用户点击确认后执行的操作
|
||||||
this.$message.success('领料成功,已创建待操作任务')
|
return addPendingAction(pendingData)
|
||||||
this.getPendingAction() // 刷新待操作列表
|
}).then(response => {
|
||||||
} else {
|
this.$message.success('领料成功,已创建待操作任务')
|
||||||
this.$message.error(response.msg || '领料失败')
|
this.getPendingAction() // 刷新待操作列表
|
||||||
}
|
|
||||||
}).catch(error => {
|
|
||||||
console.error('领料失败:', error)
|
|
||||||
this.$message.error('领料失败,请重试')
|
|
||||||
}).finally(() => {
|
}).finally(() => {
|
||||||
this.$set(row, 'picking', false)
|
this.$set(row, 'picking', false)
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -126,9 +126,9 @@
|
|||||||
placeholder="请选择计划日期">
|
placeholder="请选择计划日期">
|
||||||
</el-date-picker>
|
</el-date-picker>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="绑定订单" prop="orderId">
|
<!-- <el-form-item label="绑定订单" prop="orderId">
|
||||||
<el-input v-model="form.orderId" placeholder="请输入订单号" />
|
<el-input v-model="form.orderId" placeholder="请输入订单号" />
|
||||||
</el-form-item>
|
</el-form-item> -->
|
||||||
<el-form-item label="备注" prop="remark">
|
<el-form-item label="备注" prop="remark">
|
||||||
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
|
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
|
|||||||
@@ -166,8 +166,8 @@ const ErrorType = Object.freeze({
|
|||||||
* 表格列配置枚举
|
* 表格列配置枚举
|
||||||
*/
|
*/
|
||||||
const TableColumnEnum = Object.freeze([
|
const TableColumnEnum = Object.freeze([
|
||||||
{ prop: 'type', label: '类型', width: 80 },
|
// { prop: 'type', label: '类型', width: 80 },
|
||||||
{ prop: 'logicWarehouse', label: '逻辑库区', width: 120 },
|
// { prop: 'logicWarehouse', label: '逻辑库区', width: 120 },
|
||||||
{ prop: 'inboundCoilNo', label: '入场卷号', width: 150 },
|
{ prop: 'inboundCoilNo', label: '入场卷号', width: 150 },
|
||||||
{ prop: 'factoryCoilNo', label: '厂家卷号', width: 150 },
|
{ prop: 'factoryCoilNo', label: '厂家卷号', width: 150 },
|
||||||
{ prop: 'weight', label: '重量(吨)', width: 120 },
|
{ prop: 'weight', label: '重量(吨)', width: 120 },
|
||||||
@@ -440,6 +440,10 @@ export default {
|
|||||||
// 增加行号
|
// 增加行号
|
||||||
rowObj.rowNum = rowNum;
|
rowObj.rowNum = rowNum;
|
||||||
|
|
||||||
|
// 模版中移除原料列和逻辑库区列,默认值为原料和酸连轧原料库
|
||||||
|
rowObj.type = '原料'
|
||||||
|
rowObj.logicWarehouse = '酸连轧原料库'
|
||||||
|
|
||||||
return rowObj;
|
return rowObj;
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user