Commit 83ea9dca authored by zhoutong's avatar zhoutong

出货管理-预装-关联单

parent b3efc42b
...@@ -536,12 +536,27 @@ export function deleteGoods(id) { ...@@ -536,12 +536,27 @@ export function deleteGoods(id) {
*/ */
export function createGoods(data) { export function createGoods(data) {
return request({ return request({
url: "/ecw/box-preload-goods/create", url: "/ecw/box-preload-goods/v2/create",
method: "post", method: "post",
data, data,
}); });
} }
/**
* 获得订单所有关联列表
*
* @export
* @param {*} params
* @return {*}
*/
export function getAllRelateOrderList(params) {
return request({
url: "/order/guanlian/getAllRelateOrderList",
method: "get",
params,
});
}
/** /**
* 预装关联订单 * 预装关联订单
* *
......
...@@ -319,9 +319,15 @@ ...@@ -319,9 +319,15 @@
</el-row> </el-row>
<!-- 关联订单弹窗 --> <!-- 关联订单弹窗 -->
<el-dialog :title="relationOrderListDialog.title" :visible.sync="relationOrderListDialog.visible" width="30%" append-to-body> <el-dialog :title="relationOrderListDialog.title" :visible.sync="relationOrderListDialog.visible" width="30%" append-to-body>
<el-row v-for="(item,index) in relationOrderListDialog.data" :key="item.id"> <el-tree
{{index+1}}. {{item.orderNo}} :data="relationOrderListDialog.data"
</el-row> node-key="id"
default-expand-all
:expand-on-click-node="false">
<span class="custom-tree-node" slot-scope="{ node, data }">
<span>{{ data.order.orderNo }}</span>
</span>
</el-tree>
<el-row style="margin-top: 10px;text-align: center;"> <el-row style="margin-top: 10px;text-align: center;">
<el-button type="primary" @click="relationOrderListDialog.visible = false">{{$t('关闭窗口')}}</el-button> <el-button type="primary" @click="relationOrderListDialog.visible = false">{{$t('关闭窗口')}}</el-button>
</el-row> </el-row>
...@@ -343,6 +349,7 @@ import { ...@@ -343,6 +349,7 @@ import {
approvalCreate, approvalCreate,
approvalCancel, approvalCancel,
loadRelationOrder, loadRelationOrder,
getAllRelateOrderList
} from "@/api/ecw/boxSea"; } from "@/api/ecw/boxSea";
import userSelect from "./common/userSelect.vue"; import userSelect from "./common/userSelect.vue";
import { import {
...@@ -516,10 +523,12 @@ export default { ...@@ -516,10 +523,12 @@ export default {
}, },
/**查看关联订单 */ /**查看关联订单 */
getRelationOrder(item) { getRelationOrder(item) {
console.log(item) getAllRelateOrderList({orderId:item.orderId,orderNo:item.orderNo}).then(res=>{
this.relationOrderListDialog.title = item.orderNo+'关联订单' this.relationOrderListDialog.title = item.orderNo+'关联订单'
this.relationOrderListDialog.visible = true this.relationOrderListDialog.visible = true
this.relationOrderListDialog.data = item.relateOrderList this.relationOrderListDialog.data = [res.data]
})
}, },
/** 搜索按钮操作 */ /** 搜索按钮操作 */
handleQuery(type) { handleQuery(type) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment