From 0aed9c9ee65bd8a17837d83ec05e756d11fab297 Mon Sep 17 00:00:00 2001
From: xiazhengtongxue <133085197+xiazhengtongxue@users.noreply.github.com>
Date: 星期二, 21 四月 2026 15:29:48 +0800
Subject: [PATCH] Merge branch 'dev' of http://115.159.85.185:8098/r/SuZhouGuanHong/ShanMeiXinNengYuan into dev
---
Code/WMS/WIDESEA_WMSClient/src/extension/stock/stockInfo.jsx | 44 +++++++++++++++++++++++++++++---------------
1 files changed, 29 insertions(+), 15 deletions(-)
diff --git a/Code/WMS/WIDESEA_WMSClient/src/extension/stock/stockInfo.jsx b/Code/WMS/WIDESEA_WMSClient/src/extension/stock/stockInfo.jsx
index 6a0c613..0204d4e 100644
--- a/Code/WMS/WIDESEA_WMSClient/src/extension/stock/stockInfo.jsx
+++ b/Code/WMS/WIDESEA_WMSClient/src/extension/stock/stockInfo.jsx
@@ -1,11 +1,12 @@
//姝s鏂囦欢鏄敤鏉ヨ嚜瀹氫箟鎵╁睍涓氬姟浠ｇ爜锛屽彲浠ユ墿灞曚竴浜涜嚜瀹氫箟椤甸潰鎴栬�呴噸鏂伴厤缃敓鎴愮殑浠ｇ爜
+import RobotSelect from './extend/RobotSelect.vue';
let extension = {
components: {
//鏌ヨ鐣岄潰鎵╁睍缁勪欢
- gridHeader: "",
- gridBody: "",
- gridFooter: "",
+ gridHeader: '',
+ gridBody: RobotSelect,
+ gridFooter: '',
//鏂板缓銆佺紪杈戝脊鍑烘鎵╁睍缁勪欢
modelHeader: "",
modelBody: "",
@@ -28,26 +29,34 @@
<el-button
type="primary"
size="small"
- onClick={($e) => {
- this.handleInbound(row);
- }}
- >
- 杩涚珯
- </el-button>
+ onClick={($e) => { this.handleBind(row); }}
+ >缁戝畾</el-button>
+ <el-button
+ type="primary"
+ size="small"
+ onClick={($e) => { this.handleInbound(row); }}
+ >杩涚珯</el-button>
<el-button
type="success"
size="small"
style="margin-left: 8px"
- onClick={($e) => {
- this.handleOutbound(row);
- }}
- >
- 鍑虹珯
- </el-button>
+ onClick={($e) => { this.handleOutbound(row); }}
+ >鍑虹珯</el-button>
+ <el-button
+ type="success"
+ size="small"
+ style="margin-left: 8px"
+ onClick={($e) => { this.handleUnbind(row); }}
+ >瑙ｇ粦</el-button>
</div>
);
},
});
+ },
+
+ // 鎵樼洏缁勭洏鎿嶄綔
+ handleBind(row) {
+ this.$refs.gridBody.open('bind', row);
},
// 鎵樼洏杩涚珯鎿嶄綔
@@ -120,6 +129,11 @@
}
},
+ // 鎵樼洏鎷嗙洏鎿嶄綔
+ handleUnbind(row) {
+ this.$refs.gridBody.open('unbind', row);
+ },
+
onInited() {
// 妗嗘灦鍒濆鍖栭厤缃悗
},
--
Gitblit v1.9.3