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 | 139 ++++++++++++++++++++-------------------------
1 files changed, 62 insertions(+), 77 deletions(-)
diff --git a/Code/WMS/WIDESEA_WMSClient/src/extension/stock/stockInfo.jsx b/Code/WMS/WIDESEA_WMSClient/src/extension/stock/stockInfo.jsx
index 8cb0983..0204d4e 100644
--- a/Code/WMS/WIDESEA_WMSClient/src/extension/stock/stockInfo.jsx
+++ b/Code/WMS/WIDESEA_WMSClient/src/extension/stock/stockInfo.jsx
@@ -1,27 +1,28 @@
//姝s鏂囦欢鏄敤鏉ヨ嚜瀹氫箟鎵╁睍涓氬姟浠ｇ爜锛屽彲浠ユ墿灞曚竴浜涜嚜瀹氫箟椤甸潰鎴栬�呴噸鏂伴厤缃敓鎴愮殑浠ｇ爜
+import RobotSelect from './extend/RobotSelect.vue';
let extension = {
components: {
//鏌ヨ鐣岄潰鎵╁睍缁勪欢
gridHeader: '',
- gridBody: '',
+ gridBody: RobotSelect,
gridFooter: '',
//鏂板缓銆佺紪杈戝脊鍑烘鎵╁睍缁勪欢
- modelHeader: '',
- modelBody: '',
- modelFooter: ''
+ modelHeader: "",
+ modelBody: "",
+ modelFooter: "",
},
- tableAction: '',
+ tableAction: "",
buttons: { view: [], box: [], detail: [] },
methods: {
onInit() {
// 娣诲姞MES鎿嶄綔鍒�
this.columns.push({
- title: '鎿嶄綔',
- field: '鎿嶄綔',
- align: 'center',
+ title: "鎿嶄綔",
+ field: "鎿嶄綔",
+ align: "center",
width: 200,
- fixed: 'right',
+ fixed: "right",
render: (h, { row, column, index }) => {
return (
<div>
@@ -49,49 +50,36 @@
>瑙ｇ粦</el-button>
</div>
);
- }
+ },
});
},
// 鎵樼洏缁勭洏鎿嶄綔
- async handleBind(row) {
- try {
- await this.$confirm(`纭鎵ц鎵樼洏缁勭洏鎿嶄綔锛焅n鎵樼洏缂栧彿锛�${row.palletCode}`, "缁勭洏纭", {
- confirmButtonText: "纭",
- cancelButtonText: "鍙栨秷",
- type: "warning"
- });
-
- const result = await this.http.post("/api/StockInfoDetail/BindContainer", {
- palletCode: row.palletCode
- }, "姝ｅ湪璋冪敤MES鎺ュ彛...");
-
- if (result.status) {
- this.$Message.success(result.message || "鎵樼洏缁勭洏鎴愬姛");
- this.$refs.table.load();
- } else {
- this.$error(result.message || "鎵樼洏缁勭洏澶辫触");
- }
- } catch (error) {
- if (error !== "cancel") {
- this.$error(error.message || "缃戠粶閿欒锛岃绋嶅悗閲嶈瘯");
- }
- }
+ handleBind(row) {
+ this.$refs.gridBody.open('bind', row);
},
// 鎵樼洏杩涚珯鎿嶄綔
async handleInbound(row) {
try {
- await this.$confirm(`纭鎵ц鎵樼洏杩涚珯鎿嶄綔锛焅n鎵樼洏缂栧彿锛�${row.palletCode}`, "杩涚珯纭", {
- confirmButtonText: "纭",
- cancelButtonText: "鍙栨秷",
- type: "warning"
- });
+ await this.$confirm(
+ `纭鎵ц鎵樼洏杩涚珯鎿嶄綔锛焅n鎵樼洏缂栧彿锛�${row.palletCode}`,
+ "杩涚珯纭",
+ {
+ confirmButtonText: "纭",
+ cancelButtonText: "鍙栨秷",
+ type: "warning",
+ },
+ );
- const result = await this.http.post("/api/StockInfo/inboundInContainer", {
- palletCode: row.palletCode,
- stockId: row.id
- }, "姝ｅ湪璋冪敤MES鎺ュ彛...");
+ const result = await this.http.post(
+ "/api/StockInfo/inboundInContainer",
+ {
+ palletCode: row.palletCode,
+ stockId: row.id,
+ },
+ "姝ｅ湪璋冪敤MES鎺ュ彛...",
+ );
if (result.status) {
this.$Message.success(result.message || "鎵樼洏杩涚珯鎴愬姛");
@@ -109,16 +97,24 @@
// 鎵樼洏鍑虹珯鎿嶄綔
async handleOutbound(row) {
try {
- await this.$confirm(`纭鎵ц鎵樼洏鍑虹珯鎿嶄綔锛焅n鎵樼洏缂栧彿锛�${row.palletCode}`, "鍑虹珯纭", {
- confirmButtonText: "纭",
- cancelButtonText: "鍙栨秷",
- type: "warning"
- });
+ await this.$confirm(
+ `纭鎵ц鎵樼洏鍑虹珯鎿嶄綔锛焅n鎵樼洏缂栧彿锛�${row.palletCode}`,
+ "鍑虹珯纭",
+ {
+ confirmButtonText: "纭",
+ cancelButtonText: "鍙栨秷",
+ type: "warning",
+ },
+ );
- const result = await this.http.post("/api/StockInfo/outboundInContainer", {
- palletCode: row.palletCode,
- stockId: row.id
- }, "姝ｅ湪璋冪敤MES鎺ュ彛...");
+ const result = await this.http.post(
+ "/api/StockInfo/outboundInContainer",
+ {
+ palletCode: row.palletCode,
+ stockId: row.id,
+ },
+ "姝ｅ湪璋冪敤MES鎺ュ彛...",
+ );
if (result.status) {
this.$Message.success(result.message || "鎵樼洏鍑虹珯鎴愬姛");
@@ -134,39 +130,28 @@
},
// 鎵樼洏鎷嗙洏鎿嶄綔
- async handleUnbind(row) {
- try {
- await this.$confirm(`纭鎵ц鎵樼洏鎷嗙洏鎿嶄綔锛焅n鎵樼洏缂栧彿锛�${row.palletCode}`, "鎷嗙洏纭", {
- confirmButtonText: "纭",
- cancelButtonText: "鍙栨秷",
- type: "warning"
- });
-
- const result = await this.http.post("/api/StockInfoDetail/UnbindContainer", {
- palletCode: row.palletCode,
- }, "姝ｅ湪璋冪敤MES鎺ュ彛...");
-
- if (result.status) {
- this.$Message.success(result.message || "鎵樼洏鎷嗙洏鎴愬姛");
- this.$refs.table.load();
- } else {
- this.$error(result.message || "鎵樼洏鎷嗙洏澶辫触");
- }
- } catch (error) {
- if (error !== "cancel") {
- this.$error(error.message || "缃戠粶閿欒锛岃绋嶅悗閲嶈瘯");
- }
- }
+ handleUnbind(row) {
+ this.$refs.gridBody.open('unbind', row);
},
onInited() {
// 妗嗘灦鍒濆鍖栭厤缃悗
},
searchBefore(param) {
+ const stockStatusFilter = {
+ name: "stockStatus",
+ value: "1",
+ displayType: "notequal",
+ };
+ if (!param.wheres) {
+ param.wheres = [];
+ }
+ // 灏嗚繃婊ゆ潯浠舵坊鍔犲埌鏌ヨ鍙傛暟涓�
+ param.wheres.push(stockStatusFilter);
return true;
},
searchAfter(result) {
- return true;
+ return result;
},
addBefore(formData) {
return true;
@@ -179,8 +164,8 @@
},
modelOpenAfter(row) {
// 鐐瑰嚮缂栬緫銆佹柊寤烘寜閽脊鍑烘鍚�
- }
- }
+ },
+ },
};
export default extension;
--
Gitblit v1.9.3