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/WareHouseSetting/Roadway.html | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/HTML/views/WareHouseSetting/Roadway.html b/HTML/views/WareHouseSetting/Roadway.html
index c7ac06c..8b3986a 100644
--- a/HTML/views/WareHouseSetting/Roadway.html
+++ b/HTML/views/WareHouseSetting/Roadway.html
@@ -17,11 +17,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" style="border-bottom:1px solid #CCC">
+ <div class="layui-form layui-card-header layuiadmin-card-header-auto" style="border-bottom:1px solid #CCC" id="top">
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label" style="width: 70px;">鎵�灞炰粨搴�</label>
@@ -68,6 +68,7 @@
</div>
</div>
</div>
+ <div id="center"></div>
<div class="layui-card-body">
<table id="LAY-app-content-list" lay-filter="LAY-app-content-list"></table>
<script type="text/html" id="buttonTpl">
@@ -105,6 +106,7 @@
laypage = layui.laypage,
layer = layui.layer;
// var $ = layui.$;
+ var h1 = GetTableHeight();
refreshTable("","","","");
var tableIns;
@@ -115,7 +117,7 @@
for (var i = 0; i < res.data.length; i++) {
if (res.data[i].WareHouseNo == 'W01')
{
- $("#WarehouseName").append('<option value =' + res.data[i].WareHouseNo + ' selected>' +
+ $("#WarehouseName").append('<option value =' + res.data[i].WareHouseNo + ' selected>' + res.data[i].WareHouseNo + '-' +
res.data[i].WareHouseName + '</option>');
}
@@ -143,7 +145,7 @@
elem: '#LAY-app-content-list',
url: IP +"/Sys/GetStorageRoadwayList",
method: 'POST',
- height: 'full-95',
+ height: h1,
id: 'LAY-app-content-list',
where: param,
contentType:'application/json',
@@ -190,7 +192,11 @@
field: 'WareHouseName',
title: '鎵�灞炰粨搴�',
width: 120,
- align: 'center'
+ align: 'center',
+ templet: function(d) {
+
+ return d.WareHouseNo + '-' + d.WareHouseName;
+ }
}, {
field: 'RoadwayNo',
--
Gitblit v1.8.0