From 22870b2ceda5ea1dc4e83c8b8d6a11973b834be3 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期四, 24 八月 2023 15:37:56 +0800
Subject: [PATCH] 指引卡开工单列表 指引卡完工单列表
---
WebTM/views/车间管理/报表分析/Kf_ProdProcessEntryReport_DyeColor.html | 153 +++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 118 insertions(+), 35 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 eed2766..57f32c7 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"
@@ -43,7 +43,7 @@
</select>
</div>
</div>-->
- <div class="layui-form layui-inline">
+ <div class="layui-form layui-inline" style="position:relative;top:10px;">
<label class="layui-form-label">鏃ユ湡</label>
<div class="layui-form-item layui-inline">
<div class="layui-inline">
@@ -62,25 +62,37 @@
</div>
</div>
<!--<div class="layui-inline">
- <label class="layui-form-label">鏃ユ湡</label>
- <div class="layui-input-block">
- <input type="date" class="layui-input" id="HBeginDate" style="width:190px;">
- </div>
- </div>-->
- <div class="layui-inline">
- <label class="layui-form-label">-</label>
- <div class="layui-input-block">
- <input type="date" class="layui-input" id="HEndDate" style="width:190px;">
- </div>
- </div>
+ <label class="layui-form-label">鏃ユ湡</label>
+ <div class="layui-input-block">
+ <input type="date" class="layui-input" id="HBeginDate" style="width:190px;">
+ </div>
+ </div>-->
+ <!--<div class="layui-inline">
+ <label class="layui-form-label">-</label>
+ <div class="layui-input-block">
+ <input type="date" class="layui-input" id="HEndDate" style="width:190px;">
+ </div>
+ </div>-->
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
<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">
- <label class="layui-form-label">鍚堣鍏枻鏁�</label>
+ <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" 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" 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">
</div>
</div>
<!--<div class="layui-inline">
@@ -219,6 +231,24 @@
get_FastQuery();
});
+ //琛岀洃鍚簨浠�-鍗曞嚮
+ table.on('row(mainTable)', function (obj) {
+ var flag = !obj.tr.find(':checkbox:first').prop('checked');
+ obj.tr.find(':checkbox').prop('checked', flag);
+ if (flag) {
+ obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked'); //璁剧疆澶嶉�夋閫変腑鏍峰紡
+ $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+ } else {
+ obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//鍙栨秷澶嶉�夋閫変腑鏍峰紡
+ $(obj.tr.selector).attr({ "style": "background:" });//鍙栨秷褰撳墠tr棰滆壊
+ }
+ //mainTable 涓鸿〃鏍糏D 娉ㄦ剰姝ゅ濡傛灉ID涓嶆纭皢瀵艰嚧浣犲湪鐩戝惉澶嶉�夋鏃惰幏鍙栦笉鍒颁綘閫夋嫨鐨勬暟鎹紝鍓嶉潰鐨勫彧鏄坊鍔犳垨鍒犻櫎閫変腑鏈�変腑鏍峰紡浠ュ強璁剧疆鑳屾櫙鑹诧紝瀛椾綋棰滆壊
+ layui.each(table.cache.mainTable, function (i, l) {
+ if (obj.tr.index() == l.LAY_TABLE_INDEX) {
+ l.LAY_CHECKED = flag;
+ }
+ });
+ });
//#endregion
//#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
@@ -226,20 +256,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
});
@@ -256,8 +286,8 @@
//鍒濆鍖栬〃鏍�
function set_InitGrid() {
- var HBeginDate = $("#HBeginDate").val() + ":00:00";//涓嬭揪鏃ユ湡 寮�濮嬫棩鏈�
- var HEndDate = $("#HEndDate").val() + ":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();//浜у搧鍚嶇О
@@ -322,7 +352,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鍒�
@@ -393,7 +424,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>';
}
@@ -423,6 +454,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;
@@ -447,6 +481,17 @@
}
$("#SumHMaterOutQty").val(sumHMaterOutQty);
+ //璁＄畻鏌撳巶鍑虹珯鍚堣鍏枻鏁�
+ var sumDyeColorOut = 0;
+ for (var i = 0; i < data1.data.length; i++) {
+ sumDyeColorOut += data1.data[i]["鏌撳巶鍑虹珯"];
+ }
+ $("#SumDyeColorOut").val(sumDyeColorOut);
+
+ //璁＄畻宸
+ var sumCompare = sumHMaterOutQty - sumDyeColorOut;
+ $("#SumCompare").val(sumCompare);
+
layer.close(wait);
} else {
$("#SumHMaterOutQty").val("");
@@ -463,8 +508,20 @@
//蹇�熻繃婊�
function get_FastQuery() {
- var HBeginDate = $("#HBeginDate").val() + ":00:00";//涓嬭揪鏃ユ湡 寮�濮嬫棩鏈�
- var HEndDate = $("#HEndDate").val() + ":00:00";//缁撴潫鏃ユ湡
+ var HBeginDate = $("#HBeginDate").val();//涓嬭揪鏃ユ湡 寮�濮嬫棩鏈�
+ 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") + " 00:00:00";//涓嬭揪鏃ユ湡 寮�濮嬫棩鏈�
+ } else {
+ HBeginDate = $("#HBeginDate").val() + " 00:00:00";//涓嬭揪鏃ユ湡 寮�濮嬫棩鏈�
+ }
+ if (HEndDate == '') {
+ HEndDate = Format(new Date(new Date()).setHours(8, 0, 0, 0), "yyyy-MM-dd") + " 00:00:00";//缁撴潫鏃ユ湡
+ } else {
+ HEndDate = $("#HEndDate").val() + " 00:00:00";//缁撴潫鏃ユ湡
+ }
+
var HMaterNumber = $("#HMaterNumber").val();//鐗╂枡浠ｇ爜
var HBillNo = $("#HBillNo").val(); //鍗曟嵁鍙�
var HProductName = $("#HProductName").val();//浜у搧鍚嶇О
@@ -501,8 +558,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(); //鍗曟嵁鍙�
@@ -526,22 +592,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"));//缁撴潫鏃ユ湡
@@ -561,7 +644,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"] + ",";
}
@@ -600,7 +683,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