fix(wms/move): 修复调拨单搜索和批量执行的参数问题
1. 将调拨单号搜索的绑定值从transferNo改为transferId,匹配后端接口参数 2. 给批量执行按钮添加加载状态防止重复提交 3. 新增批量执行完成后的回调刷新列表并关闭加载状态
This commit is contained in:
@@ -17,11 +17,11 @@
|
|||||||
</WarehouseSelect>
|
</WarehouseSelect>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="调拨单号">
|
<el-form-item label="调拨单号">
|
||||||
<el-select v-model="queryParams.transferNo" filterable remote clearable
|
<el-select v-model="queryParams.transferId" filterable remote clearable
|
||||||
remote-method="remoteSearchTransferOrder" :remote-loading="transferOrderLoading" placeholder="请输入调拨单号搜索"
|
remote-method="remoteSearchTransferOrder" :remote-loading="transferOrderLoading" placeholder="请输入调拨单号搜索"
|
||||||
@change="handleRegularSearch" style="width:220px">
|
@change="handleRegularSearch" style="width:220px">
|
||||||
<el-option v-for="item in transferOrderOptions" :key="item.orderId" :label="item.transferNo"
|
<el-option v-for="item in transferOrderOptions" :key="item.orderId" :label="item.transferNo"
|
||||||
:value="item.transferNo" />
|
:value="item.orderId" />
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="生效状态">
|
<el-form-item label="生效状态">
|
||||||
@@ -32,7 +32,7 @@
|
|||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item>
|
<el-form-item>
|
||||||
<el-button type="primary" icon="el-icon-search" plain @click="handleRegularSearch">查询</el-button>
|
<el-button type="primary" icon="el-icon-search" plain @click="handleRegularSearch">查询</el-button>
|
||||||
<el-button type="success" icon="el-icon-check" plain @click="handleConfirmBatch">批量执行</el-button>
|
<el-button type="success" icon="el-icon-check" plain :loading="batchConfirmLoading" @click="handleConfirmBatch">批量执行</el-button>
|
||||||
<el-button @click="handleReset">清空</el-button>
|
<el-button @click="handleReset">清空</el-button>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-form>
|
</el-form>
|
||||||
@@ -46,7 +46,7 @@
|
|||||||
<!-- 调拨表格, 显示调拨记录, 常规筛选作用下生效 -->
|
<!-- 调拨表格, 显示调拨记录, 常规筛选作用下生效 -->
|
||||||
<TransferItemTable :data="transferList" :canEdit="false" :canConfirm="true" v-loading="loading"
|
<TransferItemTable :data="transferList" :canEdit="false" :canConfirm="true" v-loading="loading"
|
||||||
ref="transferItemTable" :refreshLabel="refreshLabel" :transferRemark="transferRemark"
|
ref="transferItemTable" :refreshLabel="refreshLabel" :transferRemark="transferRemark"
|
||||||
@refreshData="handleRegularSearch"></TransferItemTable>
|
@refreshData="handleBatchConfirmDone"></TransferItemTable>
|
||||||
|
|
||||||
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
|
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
|
||||||
@pagination="handleRegularSearch" />
|
@pagination="handleRegularSearch" />
|
||||||
@@ -103,7 +103,7 @@ export default {
|
|||||||
currentCoilNo: '',
|
currentCoilNo: '',
|
||||||
warehouseIdBefore: '',
|
warehouseIdBefore: '',
|
||||||
warehouseIdAfter: '',
|
warehouseIdAfter: '',
|
||||||
transferNo: '',
|
transferId: '',
|
||||||
isTransferred: '0',
|
isTransferred: '0',
|
||||||
pageSize: 20,
|
pageSize: 20,
|
||||||
pageNum: 1,
|
pageNum: 1,
|
||||||
@@ -114,6 +114,7 @@ export default {
|
|||||||
transferOrderOptions: [],
|
transferOrderOptions: [],
|
||||||
transferOrderLoading: false,
|
transferOrderLoading: false,
|
||||||
loading: false,
|
loading: false,
|
||||||
|
batchConfirmLoading: false,
|
||||||
total: 0,
|
total: 0,
|
||||||
dialogVisible: false,
|
dialogVisible: false,
|
||||||
};
|
};
|
||||||
@@ -171,7 +172,7 @@ export default {
|
|||||||
currentCoilNo: '',
|
currentCoilNo: '',
|
||||||
warehouseIdBefore: '',
|
warehouseIdBefore: '',
|
||||||
warehouseIdAfter: '',
|
warehouseIdAfter: '',
|
||||||
transferNo: '',
|
transferId: '',
|
||||||
isTransferred: '0',
|
isTransferred: '0',
|
||||||
pageSize: 20,
|
pageSize: 20,
|
||||||
pageNum: 1,
|
pageNum: 1,
|
||||||
@@ -192,7 +193,18 @@ export default {
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
handleConfirmBatch() {
|
handleConfirmBatch() {
|
||||||
|
this.$confirm('确定要批量执行调拨吗?', '确认操作', {
|
||||||
|
confirmButtonText: '确定',
|
||||||
|
cancelButtonText: '取消',
|
||||||
|
type: 'warning'
|
||||||
|
}).then(() => {
|
||||||
|
this.batchConfirmLoading = true;
|
||||||
this.$refs.transferItemTable.handleBatchConfirm();
|
this.$refs.transferItemTable.handleBatchConfirm();
|
||||||
|
}).catch(() => {});
|
||||||
|
},
|
||||||
|
handleBatchConfirmDone() {
|
||||||
|
this.batchConfirmLoading = false;
|
||||||
|
this.handleRegularSearch();
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
mounted() {
|
mounted() {
|
||||||
|
|||||||
@@ -30,11 +30,11 @@
|
|||||||
</WarehouseSelect>
|
</WarehouseSelect>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="调拨单号">
|
<el-form-item label="调拨单号">
|
||||||
<el-select v-model="queryParams.transferNo" filterable remote clearable
|
<el-select v-model="queryParams.transferId" filterable remote clearable
|
||||||
remote-method="remoteSearchTransferOrder" :remote-loading="transferOrderLoading"
|
remote-method="remoteSearchTransferOrder" :remote-loading="transferOrderLoading"
|
||||||
placeholder="请输入调拨单号搜索" @change="handleRegularSearch" style="width:220px">
|
placeholder="请输入调拨单号搜索" @change="handleRegularSearch" style="width:220px">
|
||||||
<el-option v-for="item in transferOrderOptions" :key="item.orderId"
|
<el-option v-for="item in transferOrderOptions" :key="item.orderId"
|
||||||
:label="item.transferNo" :value="item.transferNo" />
|
:label="item.transferNo" :value="item.orderId" />
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="生效状态">
|
<el-form-item label="生效状态">
|
||||||
@@ -105,7 +105,7 @@ export default {
|
|||||||
currentCoilNo: '',
|
currentCoilNo: '',
|
||||||
warehouseIdBefore: '',
|
warehouseIdBefore: '',
|
||||||
warehouseIdAfter: '',
|
warehouseIdAfter: '',
|
||||||
transferNo: '',
|
transferId: '',
|
||||||
isTransferred: '',
|
isTransferred: '',
|
||||||
pageSize: 20,
|
pageSize: 20,
|
||||||
pageNum: 1,
|
pageNum: 1,
|
||||||
@@ -173,7 +173,7 @@ export default {
|
|||||||
currentCoilNo: '',
|
currentCoilNo: '',
|
||||||
warehouseIdBefore: '',
|
warehouseIdBefore: '',
|
||||||
warehouseIdAfter: '',
|
warehouseIdAfter: '',
|
||||||
transferNo: '',
|
transferId: '',
|
||||||
isTransferred: '',
|
isTransferred: '',
|
||||||
pageSize: 20,
|
pageSize: 20,
|
||||||
pageNum: 1,
|
pageNum: 1,
|
||||||
|
|||||||
Reference in New Issue
Block a user