From 2bf4ff2ba42a6b68de0b298f9b701e6d6338dfdb Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期三, 05 十一月 2025 16:54:22 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/PublicPage/ProductionOrder.html | 42 +++++++++++++++++++++++++-----------------
1 files changed, 25 insertions(+), 17 deletions(-)
diff --git a/WebTM/views/PublicPage/ProductionOrder.html b/WebTM/views/PublicPage/ProductionOrder.html
index 6b8a214..a21892b 100644
--- a/WebTM/views/PublicPage/ProductionOrder.html
+++ b/WebTM/views/PublicPage/ProductionOrder.html
@@ -2,13 +2,18 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <title>妯℃不鍏锋姤搴熷叆搴撳崟鍒楄〃</title>
+ <title>鐢熶骇璁㈠崟</title>
<meta name="renderer" content="webkit">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
- <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
- <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
- <script src="../../../layuiadmin/layui/layui.js"></script>
+ <link rel="stylesheet" href="../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../layuiadmin/style/admin.css" media="all">
+ <script src="../../layuiadmin/layui/layui.js"></script>
+ <script src="../../layuiadmin/layui/layui.js"></script>
+ <script src="../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
<style type="text/css">
input.layui-input.layui-unselect {
padding-right: 0;
@@ -17,8 +22,9 @@
.layui-body {
overflow-y: scroll;
}
+
.layui-input {
- width:150px;
+ width: 150px;
}
</style>
</head>
@@ -99,7 +105,7 @@
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container">
<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-getCheckData"><i class="layui-icon layui-icon-tips"></i>棰勮</button>-->
-
+
</div>
</script>
@@ -108,14 +114,11 @@
</div>
</div>
</div>
- <script src="../../../layuiadmin/layui/layui.js"></script>
- <script src="../../../layuiadmin/Scripts/json2.js"></script>
- <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
- <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+
<script>
var total=31;
layui.config({
- base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ base: '../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
index: 'lib/index', //涓诲叆鍙ｆā鍧�
}).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
@@ -132,11 +135,16 @@
//鏌ヨ鏉′欢
var sWhere = "";
+ $("#HDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+ $("#HDate1").val(Format(new Date(), "yyyy-MM-dd"));
+ sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + $("#HDate").val() + "'";
+ sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + $("#HDate1").val() + "'";
+
var index = layer.load(0);
table.render({
- elem: '#mainTable'
+ elem: '#mainTable'
, url: GetWEBURL() + '/Sc_ProductionOrder/GetProductionOrderBill'
- , where: { sWhere: "" } //鎵╁睍鍙傛暟,鍙互浼犳暟鎹埌鍚庡彴
+ , where: { sWhere: sWhere } //鎵╁睍鍙傛暟,鍙互浼犳暟鎹埌鍚庡彴
, page: true //寮�鍚垎椤�
, limit: 20 //涓�椤佃兘澶熸樉绀虹殑鏈�澶ф暟鐩�
,limits: [20, 40,60,80,100] //鎺у埗澶氬皯琛屼竴椤碉紙榛樿浜旀潯涓�椤碉級
@@ -204,10 +212,10 @@
statusCode: 1 //閲嶆柊瑙勫畾鎴愬姛鐨勭姸鎬佺爜涓� 1锛宼able 缁勪欢榛樿涓� 0
}
, done: function (res) { //杩斿洖鏁版嵁鎵ц鍥炶皟鍑芥暟
- layer.close(index); //杩斿洖鏁版嵁鍏抽棴loading
+ layer.close(index); //杩斿洖鏁版嵁鍏抽棴loading
}
- });
-
+ });
+
//閲嶇疆鎸夐挳
form.on('submit(btnReSearch)', function (data) {
$('#Status').find("option[value='-1']").attr("selected", true);
@@ -293,7 +301,7 @@
sWhere = "";
}
-
+
</script>
</body>
--
Gitblit v1.9.1