feat(订单详情): 在钢卷选择器中添加订单详情显示功能
添加订单ID参数传递至钢卷选择器组件 在钢卷选择器中新增显示订单详情的复选框和面板 移除OrderDetail组件中未使用的API导入
This commit is contained in:
@@ -8,7 +8,7 @@
|
||||
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd">新增</el-button>
|
||||
</el-col>
|
||||
<el-col :span="1.5">
|
||||
<coil-selector dialogWidth="1200px" :use-trigger="true" multiple @confirm="handleBatchAdd"
|
||||
<coil-selector dialogWidth="1200px" :use-trigger="true" multiple @confirm="handleBatchAdd" :orderId="orderId"
|
||||
:filters="{ selectType: 'product', status: 0, excludeBound: true, orderBy: true }" :orderBy="true" :disableO="true">
|
||||
<el-button type="primary" plain icon="el-icon-plus" size="mini">批量新增</el-button>
|
||||
</coil-selector>
|
||||
@@ -154,6 +154,10 @@ export default {
|
||||
coilList: {
|
||||
type: Array,
|
||||
default: () => []
|
||||
},
|
||||
orderId: {
|
||||
type: String,
|
||||
default: ''
|
||||
}
|
||||
},
|
||||
dicts: ['coil_itemname'],
|
||||
|
||||
@@ -131,7 +131,7 @@
|
||||
</template>
|
||||
<template slot="panelB">
|
||||
<div style="height: 100%; overflow: auto;">
|
||||
<DeliveryWaybillDetail v-if="canEdit" ref="detailTable" :waybillId="waybillId" :coilList="coilList" />
|
||||
<DeliveryWaybillDetail v-if="canEdit" ref="detailTable" :waybillId="waybillId" :coilList="coilList" :orderId="orderId" />
|
||||
<el-empty v-else description="已发货,不可修改,点击打印查看详情" />
|
||||
</div>
|
||||
</template>
|
||||
@@ -327,6 +327,7 @@ export default {
|
||||
orderDialogVisible: false,
|
||||
// 订单搜索关键词
|
||||
orderQuery: '',
|
||||
orderId: '',
|
||||
};
|
||||
},
|
||||
created() {
|
||||
@@ -354,7 +355,7 @@ export default {
|
||||
/** 加载订单列表 */
|
||||
loadOrderList() {
|
||||
this.orderLoading = true;
|
||||
listOrder({ pageNum: 1, pageSize: 100, orderType: 1, keyword: this.orderQuery }).then(response => {
|
||||
listOrder({ pageNum: 1, pageSize: 100, keyword: this.orderQuery }).then(response => {
|
||||
this.orderList = response.rows || [];
|
||||
this.orderLoading = false;
|
||||
}).catch(error => {
|
||||
@@ -495,6 +496,7 @@ export default {
|
||||
// this.$modal.msgWarning("已发货的发货单不能操作");
|
||||
return;
|
||||
}
|
||||
this.orderId = row.orderId;
|
||||
this.canEdit = true;
|
||||
this.waybillId = row.waybillId;
|
||||
},
|
||||
|
||||
Reference in New Issue
Block a user