|
|
@ -78,6 +78,21 @@ |
|
|
<span v-else-if="!item.columnHidden">{{ scope.row[item.columnProp] }}</span> |
|
|
<span v-else-if="!item.columnHidden">{{ scope.row[item.columnProp] }}</span> |
|
|
</template> |
|
|
</template> |
|
|
</el-table-column> |
|
|
</el-table-column> |
|
|
|
|
|
|
|
|
|
|
|
<!-- 操作列 - rqrq --> |
|
|
|
|
|
<el-table-column header-align="center" align="center" width="120" label="操作" fixed="right"> |
|
|
|
|
|
<template slot-scope="scope"> |
|
|
|
|
|
<!-- 只有推送WCS=是且立库取出=否的数据才显示关闭按钮 - rqrq --> |
|
|
|
|
|
<a |
|
|
|
|
|
v-if="scope.row.pushWmsFlag === 'Y' && scope.row.transportFlag === 'N'" |
|
|
|
|
|
type="text" |
|
|
|
|
|
@click="closeTask(scope.row)" |
|
|
|
|
|
style="color: #F56C6C;"> |
|
|
|
|
|
强制完成 |
|
|
|
|
|
</a> |
|
|
|
|
|
<span v-else style="color: #C0C4CC;">-</span> |
|
|
|
|
|
</template> |
|
|
|
|
|
</el-table-column> |
|
|
</el-table> |
|
|
</el-table> |
|
|
|
|
|
|
|
|
<!-- 分页 - rqrq --> |
|
|
<!-- 分页 - rqrq --> |
|
|
@ -137,7 +152,8 @@ |
|
|
<script> |
|
|
<script> |
|
|
import { |
|
|
import { |
|
|
searchNotifyOrderList, |
|
|
searchNotifyOrderList, |
|
|
searchMaterialListDetail |
|
|
|
|
|
|
|
|
searchMaterialListDetail, |
|
|
|
|
|
closeNotifyTask |
|
|
} from '@/api/automatedWarehouse/notifyDetailQuery.js' |
|
|
} from '@/api/automatedWarehouse/notifyDetailQuery.js' |
|
|
|
|
|
|
|
|
export default { |
|
|
export default { |
|
|
@ -149,6 +165,7 @@ export default { |
|
|
activeName: 'labelDetail', |
|
|
activeName: 'labelDetail', |
|
|
dataListLoading: false, |
|
|
dataListLoading: false, |
|
|
detailLoading: false, |
|
|
detailLoading: false, |
|
|
|
|
|
closeTaskLoading: false, // 关闭任务loading - rqrq |
|
|
dataList: [], |
|
|
dataList: [], |
|
|
detailList: [], |
|
|
detailList: [], |
|
|
currentRow: null, |
|
|
currentRow: null, |
|
|
@ -612,8 +629,10 @@ export default { |
|
|
}, |
|
|
}, |
|
|
mounted() { |
|
|
mounted() { |
|
|
// 计算表格高度 - rqrq |
|
|
// 计算表格高度 - rqrq |
|
|
this.height = (window.innerHeight - 280) / 2 |
|
|
|
|
|
this.detailHeight = (window.innerHeight - 280) / 2 |
|
|
|
|
|
|
|
|
this.$nextTick(() => { |
|
|
|
|
|
this.height = (window.innerHeight - 280) / 2 |
|
|
|
|
|
this.detailHeight = (window.innerHeight - 280) / 2 |
|
|
|
|
|
}) |
|
|
}, |
|
|
}, |
|
|
methods: { |
|
|
methods: { |
|
|
// 获取订单类型颜色 - rqrq |
|
|
// 获取订单类型颜色 - rqrq |
|
|
@ -700,6 +719,44 @@ export default { |
|
|
currentChangeHandle(val) { |
|
|
currentChangeHandle(val) { |
|
|
this.pageIndex = val |
|
|
this.pageIndex = val |
|
|
this.searchTable() |
|
|
this.searchTable() |
|
|
|
|
|
}, |
|
|
|
|
|
// 关闭任务 - rqrq |
|
|
|
|
|
closeTask(row) { |
|
|
|
|
|
// 再次确认 |
|
|
|
|
|
this.$confirm('确认强制完成此任务?完成后将更新立库取出为"是",并解除相关栈板的调用状态。', '提示', { |
|
|
|
|
|
confirmButtonText: '确定', |
|
|
|
|
|
cancelButtonText: '取消', |
|
|
|
|
|
type: 'warning' |
|
|
|
|
|
}).then(() => { |
|
|
|
|
|
this.closeTaskLoading = true |
|
|
|
|
|
const params = { |
|
|
|
|
|
site: row.site, |
|
|
|
|
|
notifyNo: row.notifyNo, |
|
|
|
|
|
itemNo: row.itemNo, // 主键:行号 - rqrq |
|
|
|
|
|
soorderNo: row.soorderNo // 用于匹配栈板remark - rqrq |
|
|
|
|
|
} |
|
|
|
|
|
closeNotifyTask(params).then(({ data }) => { |
|
|
|
|
|
if (data && data.code === 0) { |
|
|
|
|
|
// 显示成功消息(包含解除的栈板列表)- rqrq |
|
|
|
|
|
this.$message({ |
|
|
|
|
|
message: data.msg || '强制完成成功', |
|
|
|
|
|
type: 'success', |
|
|
|
|
|
duration: 5000, |
|
|
|
|
|
showClose: true |
|
|
|
|
|
}) |
|
|
|
|
|
// 刷新列表 |
|
|
|
|
|
this.searchTable() |
|
|
|
|
|
} else { |
|
|
|
|
|
this.$alert(data.msg || '强制完成失败', '错误', { confirmButtonText: '确定' }) |
|
|
|
|
|
} |
|
|
|
|
|
}).catch((error) => { |
|
|
|
|
|
this.$message.error('强制完成失败') |
|
|
|
|
|
}).finally(() => { |
|
|
|
|
|
this.closeTaskLoading = false |
|
|
|
|
|
}) |
|
|
|
|
|
}).catch(() => { |
|
|
|
|
|
// 用户取消 |
|
|
|
|
|
}) |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|