fix(wms): 修复调拨单二次调整按钮显示及仓库选择保存问题
修复调拨单列表中二次调整按钮的显示条件,从原审批状态为2或3改为仅状态为3时显示 移除执行全部按钮的注释状态 为仓库选择添加change事件自动保存功能 调整重新提交审批的提示信息和成功消息
This commit is contained in:
@@ -149,14 +149,14 @@
|
||||
v-if="scope.row.approveStatus == '1'"
|
||||
icon="el-icon-refresh"
|
||||
>撤回</el-button>
|
||||
<!-- <el-button
|
||||
<el-button
|
||||
size="mini"
|
||||
type="text"
|
||||
plain
|
||||
@click="handleReSubmit(scope.row)"
|
||||
v-if="scope.row.approveStatus == '3' || scope.row.approveStatus == '2'"
|
||||
v-if="scope.row.approveStatus == '3'"
|
||||
icon="el-icon-refresh"
|
||||
>二次调整</el-button> -->
|
||||
>二次调整</el-button>
|
||||
<el-button
|
||||
size="mini"
|
||||
type="text"
|
||||
@@ -220,7 +220,7 @@
|
||||
<div style="margin-bottom: 10px; display: flex; align-items: center;">
|
||||
<el-button icon="el-icon-download" type="warning" plain @click="handleExportDetail">导出</el-button>
|
||||
<el-button style="margin-right: 10px;" icon="el-icon-refresh" type="success" plain @click="handleRefreshDetailList">刷新</el-button>
|
||||
<el-button :loading="buttonLoading" style="margin-right: 10px;" icon="el-icon-check" type="primary" plain @click="handleConfirmAll" v-if="currentOrderStatus == '2'">执行全部</el-button>
|
||||
<!-- <el-button :loading="buttonLoading" style="margin-right: 10px;" icon="el-icon-check" type="primary" plain @click="handleConfirmAll" v-if="currentOrderStatus == '2'">执行全部</el-button> -->
|
||||
<coil-selector v-loading="buttonLoading" ref="coilSelector" multiple @confirm="handleCoilChange" v-if="canAddCoils"></coil-selector>
|
||||
</div>
|
||||
<transfer-item-table ref="transferItemTable" :data="transferOrderItems" @refreshData="getDetailList" :orderStatus="currentOrderStatus" :canEdit="canAddCoils" />
|
||||
@@ -410,7 +410,7 @@ export default {
|
||||
},
|
||||
/** 重新提交 */
|
||||
handleReSubmit(row) {
|
||||
this.$confirm('确定要重新提交审批吗?', '提示', {
|
||||
this.$confirm('确定要调整后重新提交审批吗?', '提示', {
|
||||
confirmButtonText: '确定',
|
||||
cancelButtonText: '取消',
|
||||
type: 'info'
|
||||
@@ -422,7 +422,7 @@ export default {
|
||||
...row,
|
||||
approveStatus: '0',
|
||||
}).then(response => {
|
||||
this.$modal.msgSuccess('重新提交成功');
|
||||
this.$modal.msgSuccess('请调整后重新提交审批');
|
||||
this.getList();
|
||||
}).finally(() => {
|
||||
this.loading = false;
|
||||
|
||||
@@ -49,7 +49,7 @@
|
||||
</el-table-column>
|
||||
<el-table-column prop="warehouseIdAfter" label="调拨后库区" width="200">
|
||||
<template slot-scope="scope">
|
||||
<el-select v-if="!scope.row.isConfirmed && canEdit" v-model="scope.row.warehouseIdAfter" placeholder="请选择">
|
||||
<el-select v-if="!scope.row.isConfirmed && canEdit" v-model="scope.row.warehouseIdAfter" @change="handleWarehouseChange(scope.row)" placeholder="请选择">
|
||||
<el-option v-for="item in warehouseList" :disabled="!item.isEnabled" :key="item.warehouseId"
|
||||
:label="item.warehouseName" :value="item.warehouseId" />
|
||||
</el-select>
|
||||
@@ -62,14 +62,14 @@
|
||||
<el-table-column type="action" label="操作" width="180">
|
||||
<template slot-scope="scope">
|
||||
<div v-if="orderStatus == 0">
|
||||
<el-button icon="el-icon-check" size="mini" v-if="!scope.row.isConfirmed" @click="handleUpdate(scope.row)"
|
||||
:loading="buttonLoading">保存</el-button>
|
||||
<!-- <el-button icon="el-icon-check" size="mini" v-if="!scope.row.isConfirmed" @click="handleUpdate(scope.row)"
|
||||
:loading="buttonLoading">保存</el-button> -->
|
||||
<el-button icon="el-icon-close" size="mini" @click="handleCancel(scope.row)"
|
||||
:loading="buttonLoading">删除</el-button>
|
||||
</div>
|
||||
<div v-else>
|
||||
<el-button icon="el-icon-check" size="mini" v-if="!scope.row.isConfirmed" @click="handleConfirm(scope.row)"
|
||||
:loading="buttonLoading" :disabled="orderStatus != '2'">执行</el-button>
|
||||
<!-- <el-button icon="el-icon-check" size="mini" v-if="!scope.row.isConfirmed" @click="handleConfirm(scope.row)"
|
||||
:loading="buttonLoading" :disabled="orderStatus != '2'">执行</el-button> -->
|
||||
<!-- <el-button icon="el-icon-close" size="mini" @click="handleCancel(scope.row)"
|
||||
:loading="buttonLoading" :disabled="orderStatus !== '2'">取消</el-button> -->
|
||||
</div>
|
||||
@@ -278,10 +278,14 @@ export default {
|
||||
itemId: row.itemIdAfter
|
||||
}).then(res => {
|
||||
row.itemIdAfter = res.data
|
||||
updateTransferOrderItem(row)
|
||||
this.materialLoading = false
|
||||
}).catch(() => {
|
||||
this.materialLoading = false
|
||||
})
|
||||
},
|
||||
handleWarehouseChange(row) {
|
||||
updateTransferOrderItem(row)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user