From 0b0899370f271793f7156144b4b912438aebdf73 Mon Sep 17 00:00:00 2001
From: heshaofeng <heshaofeng@hnkhzn.com>
Date: 星期一, 24 十一月 2025 08:41:56 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/ZhongRui/ALDbanyunxiangmu
---
项目代码/WIDESEA_WMSClient/src/extension/outbound/extend/outOrderDetail.vue | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/outbound/extend/outOrderDetail.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/outbound/extend/outOrderDetail.vue"
index 890b066..b1630d8 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/outbound/extend/outOrderDetail.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/outbound/extend/outOrderDetail.vue"
@@ -103,6 +103,7 @@
ref="selectedStock"
@parentCall="parentCall"
></selected-stock>
+ <NoStockOut ref="NoStockOut" @parentCall="parentCall"></NoStockOut>
</div>
</template>
<script>
@@ -110,10 +111,12 @@
import VolForm from "@/components/basic/VolForm.vue";
import StockSelect from "./StockSelect.vue";
import SelectedStock from "./SelectedStock.vue";
+import NoStockOut from "./NoStockOut.vue";
import { h,createVNode, render,reactive } from 'vue';
import { ElDialog , ElForm, ElFormItem, ElSelect,ElOption, ElButton, ElMessage } from 'element-plus';
+import { th } from 'element-plus/es/locale';
export default {
- components: { VolBox, VolForm, StockSelect, SelectedStock },
+ components: { VolBox, VolForm, StockSelect, SelectedStock,NoStockOut},
data() {
return {
row: null,
@@ -189,7 +192,7 @@
prop: "orderDetailStatus",
title: "璁㈠崟鏄庣粏鐘舵��",
type: "tag",
- width: 180,
+ width: 90,
bindKey: "orderDetailStatusEnum",
},
{
@@ -198,6 +201,13 @@
type: "icon",
width: 90,
icon: "el-icon-s-grid",
+ },
+ {
+ prop: "NoStockOut",
+ title: "鏃犲簱瀛樺嚭搴�",
+ type: "icon",
+ width: 100,
+ icon: "el-icon-setting",
},
{
prop: "viewDetail",
@@ -304,8 +314,10 @@
tableButtonClick(row, column) {
if (column.prop == "assignStock") {
this.$refs.child.open(row);
- } else {
- //鐐瑰嚮鎵撳紑鍑哄簱璇︽儏
+ } else if (column.prop == "NoStockOut") {
+ this.$refs.NoStockOut.open(row);
+ }else{
+ //鐐瑰嚮鎵撳紑鍑哄簱璇︽儏
this.$refs.selectedStock.open(row);
}
},
--
Gitblit v1.9.3