From e6175707729b7ca137d3f528d96521de9a7fa3f1 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期一, 29 五月 2023 14:14:03 +0800
Subject: [PATCH] 白坯发布明细、染厂明细、染厂产量报表添加复选框
---
WebTM/views/车间管理/报表分析/Kf_ProdProcessEntryReport_DyeColor.html | 84 ++++++++++++++++++++++++++++-------------
1 files changed, 57 insertions(+), 27 deletions(-)
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_ProdProcessEntryReport_DyeColor.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_ProdProcessEntryReport_DyeColor.html"
index 2471f24..a14804a 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_ProdProcessEntryReport_DyeColor.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_ProdProcessEntryReport_DyeColor.html"
@@ -77,19 +77,19 @@
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
- <div class="layui-inline">
+ <div class="layui-inline" style="display:none;">
<label class="layui-form-label">鐧藉澂鍙戝竷鍚堣鍏枻鏁�</label>
<div class="layui-input-block" style="margin-left: 120px;">
<input type="text" class="layui-input" name="SumHMaterOutQty" id="SumHMaterOutQty" disabled="disabled">
</div>
</div>
- <div class="layui-inline">
+ <div class="layui-inline" style="display:none;">
<label class="layui-form-label">鏌撳巶鍑虹珯鍚堣鍏枻鏁�</label>
<div class="layui-input-block" style="margin-left: 120px;">
<input type="text" class="layui-input" name="SumDyeColorOut" id="SumDyeColorOut" disabled="disabled">
</div>
</div>
- <div class="layui-inline">
+ <div class="layui-inline" style="display:none;">
<label class="layui-form-label">宸</label>
<div class="layui-input-block" style="margin-left: 120px;">
<input type="text" class="layui-input" name="SumCompare" id="SumCompare" disabled="disabled">
@@ -238,20 +238,20 @@
//鍒濆鍖栫晫闈�
function set_ClearBill() {
//鍒濆鍖栨椂闂�
- var HBeginDate = Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 1).setHours(8, 0, 0, 0), "yyyy-MM-dd hh");
- var HEndDate = Format(new Date(new Date()).setHours(8, 0, 0, 0), "yyyy-MM-dd hh");
+ var HBeginDate = Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 1).setHours(8, 0, 0, 0), "yyyy-MM-dd");
+ var HEndDate = Format(new Date(new Date()).setHours(8, 0, 0, 0), "yyyy-MM-dd");
laydate.render({
elem: '#HBeginDate',
- type: 'datetime',
+ type: 'date',
fullPanel: true
- , format: 'yyyy-MM-dd HH'
+ , format: 'yyyy-MM-dd'
, value: HBeginDate
});
laydate.render({
elem: '#HEndDate',
- type: 'datetime',
+ type: 'date',
fullPanel: true
- , format: 'yyyy-MM-dd HH'
+ , format: 'yyyy-MM-dd'
, value: HEndDate
});
@@ -268,8 +268,8 @@
//鍒濆鍖栬〃鏍�
function set_InitGrid() {
- var HBeginDate = Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 1).setHours(8, 0, 0, 0), "yyyy-MM-dd hh") + ":00:00";//涓嬭揪鏃ユ湡 寮�濮嬫棩鏈�
- var HEndDate = Format(new Date(new Date()).setHours(8, 0, 0, 0), "yyyy-MM-dd hh") + ":00:00";//缁撴潫鏃ユ湡
+ var HBeginDate = Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 1).setHours(8, 0, 0, 0), "yyyy-MM-dd") + " 00:00:00";//涓嬭揪鏃ユ湡 寮�濮嬫棩鏈�
+ var HEndDate = Format(new Date(new Date()).setHours(8, 0, 0, 0), "yyyy-MM-dd") + " 00:00:00";//缁撴潫鏃ユ湡
var HMaterNumber = $("#HMaterNumber").val();//鐗╂枡浠ｇ爜
var HBillNo = $("#HBillNo").val(); //鍗曟嵁鍙�
var HProductName = $("#HProductName").val();//浜у搧鍚嶇О
@@ -334,7 +334,8 @@
data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType});
}
-
+ //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+ col.push({ type: 'checkbox', fixed: 'left' });
for (var i = 0; i < data.length; i++) {
if ($.inArray(data[i].name, "") > -1) {
col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
@@ -405,7 +406,7 @@
//鍒楁槑鏄剧ず涓嬫媺妗�
function ColFilter() {
var Organization = '<option value="0" selected="selected" ></option>';
- for (var i = 0; i < option.cols[0].length; i++) {
+ for (var i = 1; i < option.cols[0].length; i++) {
if (option.cols[0][i].hide != true) {
Organization += '<option style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>';
}
@@ -435,6 +436,9 @@
data1.data[i].鐧藉澂鍙戝竷鏃ユ湡 = data1.data[i]["鐧藉澂鍙戝竷鏃ユ湡"].split(":")[0] + ':' + data1.data[i]["鐧藉澂鍙戝竷鏃ユ湡"].split(":")[1];
data1.data[i].鐧藉澂鍙戝竷鏃ユ湡 = data1.data[i]["鐧藉澂鍙戝竷鏃ユ湡"].replace("T", " ");
}
+ if (data1.data[i].鐢熶骇璁㈠崟鏃ユ湡 != null) {
+ data1.data[i].鐢熶骇璁㈠崟鏃ユ湡 = data1.data[i]["鐢熶骇璁㈠崟鏃ユ湡"].split("T")[0];
+ }
}
option.data = data1.data;
@@ -462,7 +466,7 @@
//璁＄畻鏌撳巶鍑虹珯鍚堣鍏枻鏁�
var sumDyeColorOut = 0;
for (var i = 0; i < data1.data.length; i++) {
- sumDyeColorOut += data1.data[i]["鏌撳巶"];
+ sumDyeColorOut += data1.data[i]["鏌撳巶鍑虹珯"];
}
$("#SumDyeColorOut").val(sumDyeColorOut);
@@ -490,14 +494,14 @@
var HEndDate = $("#HEndDate").val();//缁撴潫鏃ユ湡
if (HBeginDate == '') {
- HBeginDate = Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 1).setHours(8, 0, 0, 0), "yyyy-MM-dd hh") + ":00:00";//涓嬭揪鏃ユ湡 寮�濮嬫棩鏈�
+ HBeginDate = Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 1).setHours(8, 0, 0, 0), "yyyy-MM-dd") + " 00:00:00";//涓嬭揪鏃ユ湡 寮�濮嬫棩鏈�
} else {
- HBeginDate = $("#HBeginDate").val() + ":00:00";//涓嬭揪鏃ユ湡 寮�濮嬫棩鏈�
+ HBeginDate = $("#HBeginDate").val() + " 00:00:00";//涓嬭揪鏃ユ湡 寮�濮嬫棩鏈�
}
if (HEndDate == '') {
- HEndDate = Format(new Date(new Date()).setHours(8, 0, 0, 0), "yyyy-MM-dd hh") + ":00:00";//缁撴潫鏃ユ湡
+ HEndDate = Format(new Date(new Date()).setHours(8, 0, 0, 0), "yyyy-MM-dd") + " 00:00:00";//缁撴潫鏃ユ湡
} else {
- HEndDate = $("#HEndDate").val() + ":00:00";//缁撴潫鏃ユ湡
+ HEndDate = $("#HEndDate").val() + " 00:00:00";//缁撴潫鏃ユ湡
}
var HMaterNumber = $("#HMaterNumber").val();//鐗╂枡浠ｇ爜
@@ -536,8 +540,17 @@
}
var params = get_UrlVars();
- if (params[params[0]] != null && detailBar==0) {
+ if (params[params[0]] != null && detailBar == 0) {
+ //姹囨�绘姤琛ㄧ殑鐢熶骇璁㈠崟鍙�
HBillNo = params[params[0]];
+ //璁剧疆鐢熶骇璁㈠崟鍙锋爣绛�
+ $("#HBillNo").val(HBillNo);
+
+ //璁剧疆鏃堕棿涓轰竴涓緢澶х殑鍊硷紝榛樿鎼滅储鎵�鏈夋椂闂寸殑鏄庣粏
+ HBeginDate = "1900-01-01 00:00:00";
+ HEndDate = "2200-01-01 00:00:00";
+
+
detailBar = 1;
} else {
HBillNo = $("#HBillNo").val(); //鍗曟嵁鍙�
@@ -561,22 +574,39 @@
//閲嶇疆杩囨护鏉′欢
function set_ClearQuery() {
//鍒濆鍖栨椂闂�
- var HBeginDate = Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 1).setHours(8, 0, 0, 0), "yyyy-MM-dd hh");
- var HEndDate = Format(new Date(new Date()).setHours(8, 0, 0, 0), "yyyy-MM-dd hh");
+ var HBeginDate = Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 1).setHours(8, 0, 0, 0), "yyyy-MM-dd");
+ var HEndDate = Format(new Date(new Date()).setHours(8, 0, 0, 0), "yyyy-MM-dd");
laydate.render({
elem: '#HBeginDate',
- type: 'datetime',
+ type: 'date',
fullPanel: true
- , format: 'yyyy-MM-dd HH'
+ , format: 'yyyy-MM-dd'
, value: HBeginDate
});
laydate.render({
elem: '#HEndDate',
- type: 'datetime',
+ type: 'date',
fullPanel: true
- , format: 'yyyy-MM-dd HH'
+ , format: 'yyyy-MM-dd'
, value: HEndDate
});
+ ////鍒濆鍖栨椂闂�
+ //var HBeginDate = Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 1).setHours(8, 0, 0, 0), "yyyy-MM-dd hh");
+ //var HEndDate = Format(new Date(new Date()).setHours(8, 0, 0, 0), "yyyy-MM-dd hh");
+ //laydate.render({
+ // elem: '#HBeginDate',
+ // type: 'datetime',
+ // fullPanel: true
+ // , format: 'yyyy-MM-dd HH'
+ // , value: HBeginDate
+ //});
+ //laydate.render({
+ // elem: '#HEndDate',
+ // type: 'datetime',
+ // fullPanel: true
+ // , format: 'yyyy-MM-dd HH'
+ // , value: HEndDate
+ //});
//$("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));//寮�濮嬫棩鏈�
//$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));//缁撴潫鏃ユ湡
@@ -596,7 +626,7 @@
//闅愯棌鍒楄缃�
function get_HideColumn() {
var colName = "";
- for (var i = 0; i < option.cols[0].length; i++) {
+ for (var i = 1; i < option.cols[0].length; i++) {
colName += option.cols[0][i]["title"] + ",";
}
@@ -635,7 +665,7 @@
dataCol = data1.data[0].HGridString.split(',');
- for (var i = 0; i < option.cols[0].length - 2; i++) {
+ for (var i = 0; i < option.cols[0].length - 1; i++) {
if (dataCol[i]) {
var dataCols = dataCol[i].split('|');
}
--
Gitblit v1.9.1