From de7931bdf73d57ca79eeb0cd48ea3a0ea5453e0e Mon Sep 17 00:00:00 2001
From: yxj <yxj@hz-kingdee.com>
Date: 星期一, 26 八月 2024 09:45:21 +0800
Subject: [PATCH] 新增制程陷阱测试趋势图、PPM绩效趋势图报表模块
---
WebTM/views/Baseset/基础资料/OtherOutRequestBillList.html | 52 ++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 40 insertions(+), 12 deletions(-)
diff --git "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/OtherOutRequestBillList.html" "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/OtherOutRequestBillList.html"
index 2be179c..1ea5b47 100644
--- "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/OtherOutRequestBillList.html"
+++ "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/OtherOutRequestBillList.html"
@@ -47,7 +47,7 @@
</div>-->
<div class="layui-col-xs12 layui-inline">
<div class="layui-row">
- <div class="layui-form-item" style="padding:0px;margin:0px">
+ <!--<div class="layui-form-item" style="padding:0px;margin:0px">
<div class="layui-row">
<div class="layui-col-xs3">
<label class="layui-form-label" style="width:30px;padding-left:0px;">鐢宠浜�</label>
@@ -60,7 +60,7 @@
<button type="button" lay-submit="" class="layui-btn" lay-filter="HRequestManID-BT">...</button>
</div>
</div>
- </div>
+ </div>-->
<div class="layui-inline">
<label class="layui-form-label">寮�濮嬫棩鏈�</label>
<div class="layui-input-block">
@@ -104,17 +104,19 @@
//, toolbar: '#toolbarDemo'
, height: 'full-120'
, page: true
+ , limits: [50, 500, 5000, 50000]
+ ,limit: 50
, cellMinWidth: 90
, cols: [[
{ type: 'radio', fixed: 'left' }
- , { field: 'HBillNo', title: '鍗曟嵁鍙�', sort: true }
- , { field: 'HDate', title: '鏃ユ湡', sort: true }
+ , { field: 'FBILLNO', title: '鍗曟嵁鍙�', sort: true, width: 300 }
+ , { field: 'FDATE', title: '鏃ユ湡', sort: true }
, { field: 'HMaker', title: '鍒跺崟浜�' }
, { field: 'HMakeDate', title: '鍒跺崟鏃ユ湡' }
]]
};
- var index = layer.load(0, { shade: false });
+ //var index = layer.load(0, { shade: false });
//杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
//$.ajax({
// url: GetWEBURL() + '/PublicPageMethod/EqpList',
@@ -136,20 +138,46 @@
//});
+ function Format(datetime, fmt) {
+ if (parseInt(datetime) == datetime) {
+ if (datetime.length == 10) {
+ datetime = parseInt(datetime) * 1000;
+ } else if (datetime.length == 13) {
+ datetime = parseInt(datetime);
+ }
+ }
+ datetime = new Date(datetime);
+ var o = {
+ "M+": datetime.getMonth() + 1, //鏈堜唤
+ "d+": datetime.getDate(), //鏃�
+ "h+": datetime.getHours(), //灏忔椂
+ "m+": datetime.getMinutes(), //鍒�
+ "s+": datetime.getSeconds(), //绉�
+ "q+": Math.floor((datetime.getMonth() + 3) / 3), //瀛ｅ害
+ "S": datetime.getMilliseconds() //姣
+ };
+ if (/(y+)/.test(fmt))
+ fmt = fmt.replace(RegExp.$1, (datetime.getFullYear() + "").substr(4 - RegExp.$1.length));
+ for (var k in o)
+ if (new RegExp("(" + k + ")").test(fmt))
+ fmt = fmt.replace(RegExp.$1, (RegExp.$1.length == 1) ? (o[k]) : (("00" + o[k]).substr(("" + o[k]).length)));
+ return fmt;
+ }
+
//鏌ヨ鎸夐挳
form.on('submit(btnSearch)', function (data) {
- var HEmPID = $("#HRequestManID").val();
+ $("#HDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+ $("#HDate1").val(Format(new Date(), "yyyy-MM-dd"));
var HDate = $("#HDate").val();//寮�濮嬫棩鏈�
var HDate1 = $("#HDate1").val();//缁撴潫鏃ユ湡
- if (HEmPID) {
- sWhere += " and HEmpID = " + HEmPID +"";
- }
+ var OrganizationID = sessionStorage["OrganizationID"];
+
if (HDate) {
- sWhere += " and 鏃ユ湡 >= '" + HDate + "'";
+ sWhere += " and Fdate >= '" + HDate + "' and FSTOCKORGID = " + OrganizationID + "";
}
if (HDate1) {
- sWhere += " and 鏃ユ湡 <= '" + HDate1 + "'";
+ sWhere += " and Fdate <= '" + HDate1 + "'and FSTOCKORGID = " + OrganizationID + "";
}
$.ajax({
url: GetWEBURL() + '/OtherOutRequestBillList/CX',
@@ -159,7 +187,7 @@
if (data1.count == 1) {
option.data = data1.data;
table.render(option);
- layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+ //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
} else {
layer.alert(data1.code + data1.Message, { icon: 5 });
}
--
Gitblit v1.9.1