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/BaseSetting/Materials.html | 22 ++++++++++++++++------
1 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/HTML/views/BaseSetting/Materials.html b/HTML/views/BaseSetting/Materials.html
index 83582b5..737e044 100644
--- a/HTML/views/BaseSetting/Materials.html
+++ b/HTML/views/BaseSetting/Materials.html
@@ -17,10 +17,10 @@
});
</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">
@@ -59,7 +59,7 @@
<option value="1">鍖呮潗</option>
<option value="2">鎴愬搧</option>
<option value="3">鑰楁潗</option>
- <option value="4">鍗婃垚鍝�</option>
+ <option value="4">涓棿鍝�</option>
</select>
</div>
</div>
@@ -93,7 +93,7 @@
<option value=""></option>
<option value="0">甯告俯</option>
<option value="1">浣庢俯</option>
- <option value="3">骞茬嚗閫氶</option>
+ <!-- <option value="3">骞茬嚗閫氶</option> -->
</select>
</div>
</div>
@@ -120,6 +120,9 @@
</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>
@@ -144,7 +147,7 @@
{{# } else if(d.Type=='3') { }}
<p>鑰楁潗</p>
{{# } else if(d.Type=='4') { }}
- <p>鍗婃垚鍝�</p>
+ <p>涓棿鍝�</p>
{{# } }}
</script>
@@ -203,6 +206,7 @@
laypage = layui.laypage,
layer = layui.layer;
+ var h1 = GetTableHeight();
refreshTable("","","","","","","","");
var tableIns;
//鑾峰彇绫诲埆淇℃伅
@@ -303,7 +307,7 @@
var infoOptions = {
elem: "#LAY-app-content-list",
- height: "full-140",
+ height: h1,
id: "LAY-app-content-list",
page: true,
limit: pageCnt,
@@ -463,6 +467,12 @@
doing = true;
});
}
+ else if (res.code == 2) {
+ layer.msg("鐗╂枡缂栫爜鎴栧悕绉伴噸澶嶏紝娣诲姞澶辫触锛�", {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function() {doing = true;});
+ }
else //涓嶆垚鍔�
{
layer.msg(res.msg, {
--
Gitblit v1.8.0