From 094889f27d4bda5116747a2dcc57724a9d5e90d7 Mon Sep 17 00:00:00 2001
From: heshaofeng <heshaofeng@hnkhzn.com>
Date: 星期二, 09 十二月 2025 13:51:12 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/ZhongRui/ALDbanyunxiangmu
---
项目代码/WIDESEA_WMSClient/src/extension/inbound/extend/allocateOrderDetail.vue | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/inbound/extend/allocateOrderDetail.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/inbound/extend/allocateOrderDetail.vue"
index 148e7f4..0537356 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/inbound/extend/allocateOrderDetail.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/inbound/extend/allocateOrderDetail.vue"
@@ -1,9 +1,10 @@
<template>
- <div>
+ <div>
<vol-box
v-model="showDetialBox"
:lazy="true"
width="75%"
+ height="80%"
title="鍗曟嵁鏄庣粏淇℃伅"
>
<div class="box-head">
@@ -27,13 +28,13 @@
@click="handleOpenPicking"
>鎷ｉ��</el-link>
- <el-link
+ <!-- <el-link
type="primary"
size="small"
style="float: right; height: 20px; margin-right: 10px"
@click="outbound"
>鐩存帴鍑哄簱</el-link
- >
+ > -->
<el-link
type="primary"
size="small"
@@ -107,7 +108,7 @@
<script>
import VolBox from "@/components/basic/VolBox.vue";
import VolForm from "@/components/basic/VolForm.vue";
-import StockSelect from "./StockSelect.vue";
+import StockSelect from "./AllocateStockSelect.vue";
import SelectedStock from "./SelectedStock.vue";
import { h,createVNode, render,reactive } from 'vue';
import { ElDialog , ElForm, ElFormItem, ElSelect,ElOption, ElButton, ElMessage } from 'element-plus';
@@ -286,7 +287,7 @@
this.getData();
},
getData() {
- var wheres = [{ name: "orderId", value: this.row.id }];
+ var wheres = [{ name: "orderId", value: this.row.id }];
var param = {
page: this.paginations.page,
rows: this.paginations.rows,
@@ -295,7 +296,7 @@
wheres: JSON.stringify(wheres), // 鏌ヨ鏉′欢锛屾牸寮忎负[{ name: "瀛楁", value: "xx" }]
};
this.http
- .post("api/AllocateOrderDetail/GetPageData", param, "鏌ヨ涓�")
+ .post("api/AllocateOrderDetail/GetDetailPage", param, "鏌ヨ涓�")
.then((x) => {
this.tableData = x.rows;
});
@@ -304,7 +305,7 @@
if (column.prop == "assignStock") {
this.$refs.child.open(row);
} else {
- //鐐瑰嚮鎵撳紑鍑哄簱璇︽儏
+ //鐐瑰嚮鎵撳紑
this.$refs.selectedStock.open(row);
}
},
@@ -362,7 +363,7 @@
}
}, {
default: () => h(ElForm, {
- model: formData,
+ model: formData00,
rules: {
selectedPlatform: [
{ required: true, message: '璇烽�夋嫨鍑哄簱绔欏彴', trigger: 'change' }
--
Gitblit v1.9.3