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