From 5a15fa73d5f6a39917013871a65eb11a8c013391 Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com>
Date: 星期三, 05 十一月 2025 17:30:56 +0800
Subject: [PATCH] 1
---
项目代码/WMS/WIDESEA_WMSClient/src/extension/widesea_wms/Order/Allocate/AllocateoutOrderDetail.vue | 52 +++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 39 insertions(+), 13 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/extension/widesea_wms/Order/Allocate/AllocateoutOrderDetail.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/extension/widesea_wms/Order/Allocate/AllocateoutOrderDetail.vue"
index c30b851..dae42ce 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/extension/widesea_wms/Order/Allocate/AllocateoutOrderDetail.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/extension/widesea_wms/Order/Allocate/AllocateoutOrderDetail.vue"
@@ -23,11 +23,39 @@
</div>
<div style="margin-top:10px;width:400px">
<el-form ref="form" :model="form" label-width="90px">
- <el-form-item label="鍑哄簱鍖哄煙" prop="areaId">
+ <!-- <el-form-item label="鍑哄簱鍖哄煙" prop="areaId">
<el-select v-model="areaId" placeholder="璇烽�夋嫨鍑哄簱鍖哄煙">
<el-option label="涓�妤糀GV鍑哄簱缂撳瓨鍖�" value="2" />
<el-option label="涓�妤糀GV绔嬪簱缂撳瓨鍖�" value="3" />
<el-option label="涓�妤糀GV鍏ュ簱缂撳瓨鍖�" value="4" />
+ </el-select>
+ </el-form-item> -->
+ <el-form-item label="璋冩嫧鍑哄簱" prop="Warehouse">
+ <!-- <el-input style="width: 310px" v-model="Warehouse" placeholder="璇疯緭鍏ヨ皟鎷ㄤ粨搴�"></el-input> -->
+ <el-select v-model="Warehouse" placeholder="璇烽�夋嫨璋冩嫧浠撳簱">
+ <el-option label="灏忎欢鎴愬搧浠�" value="102" />
+ <el-option label="缁勪欢浠�" value="103" />
+ <el-option label="椤圭洰鎴愬搧浠�" value="104" />
+ <el-option label="涓嶈壇鍝佷粨" value="105" />
+ <el-option label="闆舵垚鏈粨" value="106" />
+ <el-option label="杞﹂棿鍦ㄥ埗浠�" value="199" />
+ <el-option label="鏅鸿兘绔嬪簱" value="107" />
+ <el-option label="鐢垫皵瑁呴厤浠撳簱" value="108" />
+ <el-option label="鏈哄姞浠�" value="109" />
+ <el-option label="鍘熸潗鏂欎粨" value="201" />
+ <el-option label="鍖栧伐浠�" value="110" />
+ <el-option label="澶栧崗渚涘簲鍟嗕粨" value="111" />
+ <el-option label="杈呭姪鏂欎粨" value="202" />
+ <el-option label="閰嶄欢浠�" value="203" />
+ <el-option label="鐢靛櫒浠�" value="204" />
+ <el-option label="WMS鍑哄簱缂撳瓨鍖�" value="205" />
+ <el-option label="鎴愬搧浠�" value="206" />
+ <el-option label="寰呭鐞嗕粨" value="211" />
+ <el-option label="宸ュ簾浠�" value="212" />
+ <el-option label="澶栧崗寰呭彂浠�" value="221" />
+ <el-option label="渚涘簲鍟嗘垚鍝佷粨" value="222" />
+ <el-option label="宸ョ▼閫�鏂欎粨" value="231" />
+ <el-option label="鏆傛椂浠�" value="232" />
</el-select>
</el-form-item>
</el-form>
@@ -63,16 +91,17 @@
<script>
import VolBox from "@/components/basic/VolBox.vue";
import VolForm from "@/components/basic/VolForm.vue";
-import StockSelect from "./OtherStockSelect.vue";
+import StockSelect from "./AllocateStockSelect.vue";
export default {
components: { VolBox, VolForm, StockSelect },
data() {
return {
row: null,
areaId: "2",
+ Warehouse: "",
showDetialBox: false,
flag: false,
- MaterialCode:"",
+ MaterialCode: "",
currentRow: null,
selection: [],
tableData: [],
@@ -116,11 +145,10 @@
width: 90,
},
{
- prop: "lockQuantity",
- title: "閿佸畾鏁伴噺",
+ prop: "notOutQuantity",
+ title: "鏈嚭搴撴暟閲�",
type: "int",
- width: 90,
- hidden: true,
+ width: 100,
},
{
prop: "overOutQuantity",
@@ -230,7 +258,7 @@
this.getData();
},
getData() {
- var wheres = [{ name: "orderId", value: this.row.id},{name: "materielCode",value:this.MaterialCode,DisplayType:"text"}];
+ var wheres = [{ name: "orderId", value: this.row.id }, { name: "materielCode", value: this.MaterialCode, DisplayType: "text" }];
console.log(JSON.stringify(wheres));
var param = {
page: this.paginations.page,
@@ -260,8 +288,9 @@
}
var keys = this.selection.map((item) => item.id); // 鑾峰彇閫変腑琛岀殑id
var param = {
- "orderIds":keys,
+ "orderIds": keys,
"AreaId": this.areaId,
+ "Warehouse": this.Warehouse,
}
this.http
.post("api/AllocateOutboundOrder/GenerateAllocateOutboundTask", param, "鏁版嵁澶勭悊涓�")
@@ -282,10 +311,7 @@
},
getButtonEnable(propName, row) {
if (propName == "assignStock") {
- if (
- row.orderDetailStatus !== 0 &&
- row.orderDetailStatus !== 60 &&
- row.orderDetailStatus !== 70
+ if (row.orderDetailStatus !== 0 && row.orderDetailStatus !== 60 && row.orderDetailStatus !== 70
) {
return true;
} else {
--
Gitblit v1.9.3