From b79c300768db0aa78723c0b7f5a6a4d6d4c94bc9 Mon Sep 17 00:00:00 2001
From: yuyou_x <2336760928@qq.com>
Date: 星期一, 05 二月 2024 11:13:29 +0800
Subject: [PATCH] Merge branch 'yyk'
---
HTML/views/WareHouseSetting/Locate.html | 35 +++++++++++++++++++++++++++++++++--
1 files changed, 33 insertions(+), 2 deletions(-)
diff --git a/HTML/views/WareHouseSetting/Locate.html b/HTML/views/WareHouseSetting/Locate.html
index efde3f6..63b6472 100644
--- a/HTML/views/WareHouseSetting/Locate.html
+++ b/HTML/views/WareHouseSetting/Locate.html
@@ -157,10 +157,41 @@
if (checkData.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
+ else if(checkData.length > 1)
+ {
+ var li = 0;
+ var ping = 0;
+ var WareNo = "W01";
+ checkData.forEach(item => {
+ if (item.WareHouseName == "鍔涜绔嬩綋搴�")
+ {
+ li += 1;
+ WareNo = "W01";
+ if (ping > 0)
+ {
+ return;
+ }
+ }
+ if (item.WareHouseName == "鍔涜骞冲簱")
+ {
+ ping += 1;
+ WareNo = "W02";
+ if (li > 0)
+ {
+ return;
+ }
+ }
+ });
+ if (li != 0 && ping != 0)
+ {
+ return layer.msg('璇峰嬁閫夋嫨澶氱浠撳簱锛�');
+ }
+ }
+
layer.open({
type: 2,
title: '缂栬緫鍌ㄤ綅鐘舵�侀泦鍚�',
- content: 'LocateFrom.html',
+ content: 'LocateFrom.html?WareHouseNo='+WareNo,
maxmin: true,
area: ['560px', '510px'],
btn: ['纭畾', '鍙栨秷'],
@@ -490,7 +521,7 @@
$("#AreaNo").append('<option value =""></option>');
if (res.code == 0) { //鎴愬姛
for (var i = 0; i < res.data.length; i++) {
- $("#AreaNo").append('<option value =' + res.data[i].AreaNo + '>' + res.data[i].WareHouseNo + '-' +
+ $("#AreaNo").append('<option value =' + res.data[i].AreaNo + '>' + res.data[i].AreaNo + '-' +
res.data[i].AreaName + '</option>');
}
form.render('select');
--
Gitblit v1.8.0