From 57abd1f3d312ca35ae9b8cc625afc23f233b85d6 Mon Sep 17 00:00:00 2001
From: cl <1442464845@qq.com>
Date: 星期四, 16 四月 2026 17:13:05 +0800
Subject: [PATCH] pda无单据组托优化
---
pages/listing/matnrPalletising.vue | 18 ++++++++++++------
pages/login/index.vue | 17 +++++++++++++++++
2 files changed, 29 insertions(+), 6 deletions(-)
diff --git a/pages/listing/matnrPalletising.vue b/pages/listing/matnrPalletising.vue
index 7a402d2..0f2c777 100644
--- a/pages/listing/matnrPalletising.vue
+++ b/pages/listing/matnrPalletising.vue
@@ -161,6 +161,10 @@
// 鍗曡鍙粍鐩樹笂闄愶細璁″垝 - 宸茬粍鎵� - 宸蹭笂鏋讹紝涓嶈兘瓒呰繃璇ュ�硷紙涓庡悗绔竴鑷达級
getItemAvailableMax(item) {
if (!item) return this.max;
+ // 鏃燱MS鍗曞彿鏃跺厑璁歌嚜鐢辫緭鍏ワ紝涓嶆寜鍗曟嵁鍙粍鐩樻暟閲忛檺鍒�
+ if (!item.asnCode || String(item.asnCode).trim() === '') {
+ return this.max;
+ }
const avail = item.availablePalletQty != null && item.availablePalletQty !== undefined
? item.availablePalletQty
: (Number(item.anfme || 0) - Number(item.workQty || 0) - Number(item.qty || 0));
@@ -277,18 +281,20 @@
return;
}
for (var i = 0; i < data.length; i++) {
- // 浼樺厛浣跨敤鎺ュ彛杩斿洖鐨勫彲缁勭洏鏁伴噺锛坥rder/add 鏀规暟閲忓悗 = 璁″垝 - 宸茬粍鎵� - 宸蹭笂鏋讹級锛屽惁鍒欐湰鍦拌绠�
- if (data[i].availablePalletQty != null && data[i].availablePalletQty !== undefined) {
+ // 鏃燱MS鍗曞彿鏃堕粯璁ょ粍鐩樻暟閲忎负0锛岀敱鐢ㄦ埛杈撳叆
+ if (!data[i].asnCode || String(data[i].asnCode).trim() === '') {
+ data[i].receiptQty = 0;
+ } else if (data[i].availablePalletQty != null && data[i].availablePalletQty !== undefined) {
+ // 鏈夊崟鎹椂浼樺厛浣跨敤鎺ュ彛杩斿洖鐨勫彲缁勭洏鏁伴噺
data[i].receiptQty = data[i].availablePalletQty;
} else {
let anfme = data[i].anfme || 0;
let workQty = data[i].workQty || 0;
let qty = data[i].qty || 0;
data[i].receiptQty = anfme - workQty - qty;
- }
- // 纭繚鍙粍鐩樻暟閲忎笉涓鸿礋鏁�
- if (data[i].receiptQty < 0) {
- data[i].receiptQty = 0;
+ if (data[i].receiptQty < 0) {
+ data[i].receiptQty = 0;
+ }
}
data[i].selected = true;
}
diff --git a/pages/login/index.vue b/pages/login/index.vue
index 95fe23c..5ddb357 100644
--- a/pages/login/index.vue
+++ b/pages/login/index.vue
@@ -172,8 +172,24 @@
project: ''
}
}
+ // 浠呭紑鍙�/妯℃嫙鏋勫缓涓旀湭閰嶇疆杩囧湴鍧�鏃跺～鍏呮湰鏈鸿仈璋冮粯璁わ紱鍙戣鍖呬负 production锛屼笉娉ㄥ叆锛堜繚鎸佺┖锛�
+ this.applyDevUrlDefaultsIfNeeded()
},
methods:{
+ applyDevUrlDefaultsIfNeeded() {
+ if (process.env.NODE_ENV === 'production') {
+ return
+ }
+ const u = this.url
+ if (u && (u.ip || u.port || u.project)) {
+ return
+ }
+ this.url = {
+ ip: '127.0.0.1',
+ port: '8082',
+ project: 'rsf-server'
+ }
+ },
async onLogin() {
const {
code,
@@ -283,6 +299,7 @@
},
// 璁剧疆绐楀彛寮�鍚寜閽�
settings() {
+ this.applyDevUrlDefaultsIfNeeded()
this.$refs.inputDialog.open('')
},
// 璁剧疆绐楀彛鍏抽棴鎸夐挳
--
Gitblit v1.9.1