From e7864a4dcecba72ccbb06dfb6a3d4a77c65f2a3c Mon Sep 17 00:00:00 2001
From: Demo <Demo@DESKTOP-CPA90BF>
Date: 星期四, 07 三月 2024 11:25:38 +0800
Subject: [PATCH] 合并代码
---
HTML/views/ASNSetting/PalletBind.html | 102 ++++++++++++++++++++++++++++++--------------------
1 files changed, 61 insertions(+), 41 deletions(-)
diff --git a/HTML/views/ASNSetting/PalletBind.html b/HTML/views/ASNSetting/PalletBind.html
index 0a07864..ea693af 100644
--- a/HTML/views/ASNSetting/PalletBind.html
+++ b/HTML/views/ASNSetting/PalletBind.html
@@ -34,11 +34,11 @@
</script>
</head>
-<body>
+<body id="body">
<div class="layui-fluid" style="padding-bottom: 0;">
<div class="layui-card">
- <div class="layui-form layui-card-header layuiadmin-card-header-auto">
+ <div class="layui-form layui-card-header layuiadmin-card-header-auto" id="top">
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label" style="width: 60px;">鍏ュ簱鍗曞彿</label>
@@ -64,45 +64,23 @@
<div class="layui-inline">
<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="WareHouseNo" id="WareHouseNo" lay-filter="getWareHouseNo" lay-search>
<option value=""></option>
- <option value="W01">鍔涜绔嬩綋搴�</option>
- <option value="W02">鍔涜骞冲簱</option>
</select>
</div>
</div>
<div class="layui-inline">
<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="RoadwayNo" id="RoadwayNo" lay-search>
<option value=""></option>
- <option value="R01">01宸烽亾</option>
- <option value="R02">02宸烽亾</option>
- <option value="R03">03宸烽亾</option>
- <option value="R04">04宸烽亾</option>
- <option value="R05">05宸烽亾</option>
- <option value="R06">06宸烽亾</option>
- <option value="R07">07宸烽亾</option>
- <option value="R08">08宸烽亾</option>
- <option value="R09">09宸烽亾</option>
- <option value="R10">10宸烽亾</option>
- <option value="R11">11宸烽亾</option>
- <option value="R12">12宸烽亾</option>
- <option value="R13">13宸烽亾</option>
- <option value="R14">14宸烽亾</option>
- <option value="R15">15宸烽亾</option>
- <option value="R16">16宸烽亾</option>
- <option value="R17">17宸烽亾</option>
- <option value="R18">18宸烽亾</option>
- <option value="R19">19宸烽亾</option>
- <option value="R20">20宸烽亾</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>
@@ -168,10 +146,13 @@
<div class="layui-card-body">
<div style="position: relative;">
<div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
- <ul class="layui-tab-title">
+ <ul class="layui-tab-title" id="tab">
<li class="layui-this">鎵樼洏淇℃伅</li>
<li >绠辩爜淇℃伅</li>
</ul>
+
+ <div id="center"></div>
+
<div class="layui-tab-content">
<div class="layui-tab-item layui-show">
<div class="position-relative"><!-- class="position-relative" --><!-- 鑷畾涔夎〃澶村姞涓� -->
@@ -366,16 +347,6 @@
case "R08": return '08宸烽亾';
case "R09": return '09宸烽亾';
case "R10": return '10宸烽亾';
- case "R11": return '11宸烽亾';
- case "R12": return '12宸烽亾';
- case "R13": return '13宸烽亾';
- case "R14": return '14宸烽亾';
- case "R15": return '15宸烽亾';
- case "R16": return '16宸烽亾';
- case "R17": return '17宸烽亾';
- case "R18": return '18宸烽亾';
- case "R19": return '19宸烽亾';
- case "R20": return '20宸烽亾';
default: return "";
}
@@ -406,6 +377,7 @@
laypage = layui.laypage,
layer = layui.layer;
laydate = layui.laydate;
+ var h1 = GetTableTabHeight();
laydate.render({
elem: '#StartTime'
, format: 'yyyy-MM-dd' //鍙换鎰忕粍鍚�
@@ -427,7 +399,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 鑷畾涔夎〃澶�
@@ -668,7 +688,7 @@
table.render({
id: 'PalletBind',
elem: '#PalletBind',
- height: 'full-210',
+ height: h1,
url: IP + "/BllAsn/GetPalletBindList",
method: 'post',
contentType: 'application/json',
@@ -914,7 +934,7 @@
table.render({
id: 'BoxInfo',
elem: '#BoxInfo',
- height: 'full-210',
+ height: h1,
url: IP + "/BllAsn/GetBoxInfoList",
method: 'post',
contentType: 'application/json',
--
Gitblit v1.8.0