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 | 38 ++++++++++++++++++++++++--------------
1 files changed, 24 insertions(+), 14 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 483c07f..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"
@@ -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>';
}
@@ -539,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(); //鍗曟嵁鍙�
@@ -616,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"] + ",";
}
@@ -655,38 +665,38 @@
dataCol = data1.data[0].HGridString.split(',');
- for (var i = 0; i < option.cols[0].length; i++) {
+ for (var i = 0; i < option.cols[0].length - 1; i++) {
if (dataCol[i]) {
var dataCols = dataCol[i].split('|');
}
//闅愯棌鍒�
if (dataCols[1] == 1) {
- option.cols[0][i]["hide"] = true;
+ option.cols[0][i + 1]["hide"] = true;
}
//璁剧疆鍐呭瀛椾綋澶у皬
if (data1.data[0].HFontSize != 0) {
- option.cols[0][i]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+ option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
} else {
- option.cols[0][i]["style"] = "font-size:100%";
+ option.cols[0][i + 1]["style"] = "font-size:100%";
}
//璁剧疆鍒楀
if (dataCols[3] > 0) {
- option.cols[0][i]["width"] = dataCols[3];
+ option.cols[0][i + 1]["width"] = dataCols[3];
}
//鏄剧ず鍒�
- if (dataCols[1] == 0 && $.inArray(option.cols[0][i]["title"], titleData) == -1) {
- option.cols[0][i]["hide"] = false;
+ if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
+ option.cols[0][i + 1]["hide"] = false;
}
//瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
switch (dataCols[2]) {
case "L":
- option.cols[0][i]["align"] = "left";
+ option.cols[0][i + 1]["align"] = "left";
break;
case "M":
- option.cols[0][i]["align"] = "center";
+ option.cols[0][i + 1]["align"] = "center";
break;
case "R":
- option.cols[0][i]["align"] = "right";
+ option.cols[0][i + 1]["align"] = "right";
break;
}
}
--
Gitblit v1.9.1