From 06199ebfdf5d58c90c44848cf2fd490256e01c51 Mon Sep 17 00:00:00 2001
From: yuyou_x <2336760928@qq.com>
Date: 星期五, 23 二月 2024 08:18:09 +0800
Subject: [PATCH] Merge branch 'yyk'
---
HTML/views/ASNSetting/PalletBind.html | 76 ++++++++++++++++++++++++++++++++------
1 files changed, 64 insertions(+), 12 deletions(-)
diff --git a/HTML/views/ASNSetting/PalletBind.html b/HTML/views/ASNSetting/PalletBind.html
index 40eed28..1fa9dcd 100644
--- a/HTML/views/ASNSetting/PalletBind.html
+++ b/HTML/views/ASNSetting/PalletBind.html
@@ -62,29 +62,25 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 60px;">鎵�灞炲贩閬�</label>
+ <label class="layui-form-label" style="width: 60px;">鎵�灞炰粨搴�</label>
<div class="layui-input-inline">
- <select name="RoadwayNo" id="RoadwayNo" lay-filter="ImportExecuteFlag" lay-search>
+ <select name="WareHouseNo" id="WareHouseNo" lay-filter="getWareHouseNo" lay-search>
<option value=""></option>
- <option value="R01">01宸烽亾</option>
- <option value="R02">02宸烽亾</option>
</select>
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 60px;">鎵�灞炰粨搴�</label>
+ <label class="layui-form-label" style="width: 60px;">鎵�灞炲贩閬�</label>
<div class="layui-input-inline">
- <select name="WareHouseNo" id="WareHouseNo" lay-filter="ImportExecuteFlag" lay-search>
+ <select name="RoadwayNo" id="RoadwayNo" lay-search>
<option value=""></option>
- <option value="W01">09浠撳簱</option>
- <option value="W02">09闆剁搴�</option>
</select>
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label" style="width: 60px;">鎵ц鐘舵��</label>
<div class="layui-input-inline">
- <select name="Status" id="Status" lay-filter="ImportExecuteFlag" lay-search>
+ <select name="Status" id="Status" lay-search>
<option value=""></option>
<option value="0">绛夊緟鎵ц</option>
<option value="1">鍏ュ簱涓�</option>
@@ -327,8 +323,8 @@
<script type="text/html" id="WareHouseButton">
{{#
switch (d.WareHouseNo) {
- case "W01": return '09浠撳簱';
- case "W02": return '09闆剁搴�';
+ case "W01": return '鍔涜绔嬩綋搴�';
+ case "W02": return '鍔涜骞冲簱';
default: return "";
}
@@ -340,6 +336,14 @@
switch (d.RoadwayNo) {
case "R01": return '01宸烽亾';
case "R02": return '02宸烽亾';
+ case "R03": return '03宸烽亾';
+ case "R04": return '04宸烽亾';
+ case "R05": return '05宸烽亾';
+ case "R06": return '06宸烽亾';
+ case "R07": return '07宸烽亾';
+ case "R08": return '08宸烽亾';
+ case "R09": return '09宸烽亾';
+ case "R10": return '10宸烽亾';
default: return "";
}
@@ -391,7 +395,55 @@
bindPalletBind();
bindBoxInfo("0");
-
+
+ //鑾峰彇浠撳簱涓嬫媺妗嗕俊鎭�
+ synData(IP + "/Sys/GetWarehouseDic", {}, 'get', function (res) {
+ if (res.code == 0) { //鎴愬姛
+ for (var i = 0; i < res.data.length; i++) {
+
+ $("#WareHouseNo").append('<option value =' + res.data[i].WareHouseNo + '>' + res.data[i].WareHouseNo + '-' +
+ res.data[i].WareHouseName + '</option>');
+ }
+ // $("#WareHouseNo option[value='" + res.data[0].WareHouseNo + "']").attr("selected", "selected")
+ form.render('select');
+ } else { //涓嶆垚鍔�
+ layer.msg(res.msg, {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function () { });
+ }
+ });
+
+ // 鏌ヨ浜嬩欢
+ form.on('select(getWareHouseNo)', function (data) {
+ if($("#WareHouseNo").val() == "W01")
+ {
+ //鑾峰彇宸烽亾涓嬫媺妗嗕俊鎭�
+ synData(IP + "/Sys/GetRoadwayList", {}, 'get', function (res) {
+ if (res.code == 0) { //鎴愬姛
+ for (var i = 0; i < res.data.length; i++) {
+
+ $("#RoadwayNo").append('<option value =' + res.data[i].RoadwayNo + '>' + res.data[i].RoadwayNo + '-' +
+ res.data[i].RoadwayName + '</option>');
+ }
+ // $("#RoadwayNo option[value='" + res.data[0].RoadwayNo + "']").attr("selected", "selected")
+ form.render('select');
+ } else { //涓嶆垚鍔�
+ layer.msg(res.msg, {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function () { });
+ }
+ });
+ }
+ else
+ {
+ $("#RoadwayNo").html('');
+ $("#RoadwayNo").append('<option value=""></option>');
+ form.render('select');
+ }
+
+ });
// 娓叉煋鎬昏〃
//#region 鑷畾涔夎〃澶�
--
Gitblit v1.8.0