From f512b0475560ed449f936e0b7a27ba197e6bafe5 Mon Sep 17 00:00:00 2001
From: IPC-610 <IPC-610@DESKTOP-6LEOOS3>
Date: 星期四, 26 九月 2024 15:16:08 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/liudongl/jc24-wms
---
HTML/views/WareHouseSetting/LocateFrom.html | 27 +++++++++++++++++++--------
1 files changed, 19 insertions(+), 8 deletions(-)
diff --git a/HTML/views/WareHouseSetting/LocateFrom.html b/HTML/views/WareHouseSetting/LocateFrom.html
index e067a84..ec552d9 100644
--- a/HTML/views/WareHouseSetting/LocateFrom.html
+++ b/HTML/views/WareHouseSetting/LocateFrom.html
@@ -65,7 +65,7 @@
<div class="layui-form-item">
<label class="layui-form-label">鎵�灞炲尯鍩�</label>
<div class="layui-input-inline">
- <select name="AreaNo" id="AreaNo" lay-filter="getAreaNo" lay-search disabled="">
+ <select name="AreaNo" id="AreaNo" lay-filter="getAreaNo" lay-search>
<option value=""></option>
</select>
</div>
@@ -143,8 +143,14 @@
layer = layui.layer;
var id = getQueryString('id');
+ var no = getQueryString('WareHouseNo');
var param = {
Id: parseInt(id)
+ }
+ console.log(no)
+ if(no != null)
+ {
+ GetArea('',no)
}
if(getQueryString('id') != null)
{
@@ -152,7 +158,7 @@
if (res.code == 0) {
// $("input[name=Id]").val(res.data.Id);
GetHouse(res.data.WareHouseNo)
- GetArea(res.data.AreaNo)
+ GetArea(res.data.AreaNo,res.data.WareHouseNo)
GetRoadway(res.data.RoadwayNo)
GetTemp(res.data.Temperature);
$("input[name=Row]").val(res.data.Row);
@@ -182,7 +188,7 @@
if (res.code == 0) { //鎴愬姛
$("#RoadwayNo").empty();
for (var i = 0; i < res.data.length; i++) {
- $("#WareHouseNo").append('<option value =' + res.data[i].WareHouseNo + '>' +
+ $("#WareHouseNo").append('<option value =' + res.data[i].WareHouseNo + '>' + res.data[i].WareHouseNo + '-' +
res.data[i].WareHouseName + '</option>');
}
$("select[name='WareHouseNo']").val(val);
@@ -196,13 +202,18 @@
});
}
//鑾峰彇鍖哄煙
- function GetArea(val){
- sendData(IP + "/Sys/GetStorageAreaByHouseNo?wareHouseNo=", {}, 'get', function(res) {
-
+ function GetArea(val,wareHouse){
+ var a = $("#WareHouseNo").val();
+ if (wareHouse != null)
+ {
+ a = wareHouse;
+ }
+ sendData(IP + "/Sys/GetStorageAreaByHouseNo?wareHouseNo="+a, {}, 'get', function(res) {
+ console.log(res)
if (res.code == 0) { //鎴愬姛
$("#AreaNo").empty();
for (var i = 0; i < res.data.length; i++) {
- $("#AreaNo").append('<option value =' + res.data[i].AreaNo + '>' +
+ $("#AreaNo").append('<option value =' + res.data[i].AreaNo + '>' + res.data[i].AreaNo + '-' +
res.data[i].AreaName + '</option>');
}
$("select[name='AreaNo']").val(val);
@@ -225,7 +236,7 @@
if (res.code == 0) { //鎴愬姛
$("#RoadwayNo").empty();
for (var i = 0; i < res.data.length; i++) {
- $("#RoadwayNo").append('<option value =' + res.data[i].RoadwayNo + '>' +
+ $("#RoadwayNo").append('<option value =' + res.data[i].RoadwayNo + '>' + res.data[i].RoadwayNo + '-' +
res.data[i].RoadwayName + '</option>');
}
$("select[name='RoadwayNo']").val(val);
--
Gitblit v1.8.0