From 75c6787ba7268c94a86b32e8f5c2f1c5dd3826cb Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期五, 12 七月 2024 09:08:18 +0800
Subject: [PATCH] spc报表优化 流转卡增加模穴号 出站单列表行高增大
---
WebTM/views/质量管理/质量报表/QC_InspectionFormReport.html | 73 +++++++++++++-----------------------
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBill.html | 7 +++
WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBillList.html | 6 +-
3 files changed, 37 insertions(+), 49 deletions(-)
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_InspectionFormReport.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_InspectionFormReport.html"
index ce876cc..535ba50 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_InspectionFormReport.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_InspectionFormReport.html"
@@ -379,9 +379,21 @@
if (limit > data1.data.length - 3) {
layer.msg("鍙栨牱鏁伴噺瓒呰繃瀹為檯鏁伴噺!", { icon: 5 });
} else {
+ var data = [];//鍒楀瓧娈垫暟鎹�
+ var col = [];
+ var totalArray = [];
+ //缁欑┖鐨勬暟缁勮祴鍊�
+ for (var key in data1.list) {//寰簭閬嶅巻鏁扮粍
+ data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });//浠庢瘡涓璞′腑鎻愬彇鏁版嵁
+ }
+ for (var i = 0; i < data.length; i++) {//閬嶅巻data鏁扮粍閲嶇殑鏁版嵁
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120 });
+ }
+
+ option.cols = [col];
option.data = data1.data;
- optionAVG = data1.data[limit + 1];
- optionS = data1.data[limit + 2];
+ optionAVG[0] = data1.data[limit + 1];
+ optionS[0] = data1.data[limit + 2];
table.render(option);
set_Line();
}
@@ -409,49 +421,18 @@
let HAvg = [];//骞冲潎鍊�
let HDifference = [];//宸��
- //鑾峰彇涓や釜鏈堟湡涔嬮棿鐨勭浉宸�
- var time1 = Date.parse(new Date($("#HBeginDate").val()));//寮�濮嬫椂闂�
- var time2 = Date.parse(new Date($("#HEndDate").val()));//缁撴潫鏃堕棿
- var Days = Math.abs(parseInt((time2 - time1) / 1000 / 3600 / 24));
- //鑾峰彇骞�
- var yyyy = new Date($("#HBeginDate").val()).getFullYear();
- //鑾峰彇鏈堜唤
- var MM = new Date($("#HBeginDate").val()).getMonth() + 1;
- //鑾峰彇寮�濮嬫湀浠界殑鏈�澶уぉ鏁�
- var SumMonth = new Date(yyyy, MM, 0).getDate(); //鍔ㄦ�佷袱鏈堜箣宸�
- //鑾峰彇寮�濮嬫棩鏈熺殑澶╂暟
- var HBEGINDATE = new Date(new Date($("#HBeginDate").val())).getDate(); //鑾峰彇寮�濮嬫棩鏈熷ぉ鏁�
-
- var k = 0;//鏀堕泦寰幆娆℃暟
- for (var j = 0; j <= (Days - k); j++) {
- /* columns.push({ field: Format(yyyy + '/' + MM + '/' + (HBEGINDATE + j), 'yyyy-MM-dd'), title: Format(yyyy + '/' + MM + '/' + (HBEGINDATE + j), 'MM.dd'), width: 120 })*/
- if (optionAVG != [] || optionS != []) {
- HAvg.push(optionAVG[Format(yyyy + '/' + MM + '/' + (HBEGINDATE + j), 'yyyy-MM-dd')]);
- HDifference.push(optionS[Format(yyyy + '/' + MM + '/' + (HBEGINDATE + j), 'yyyy-MM-dd')]);
+ for (var j = 1; j < option.cols[0].length; j++) {
+ if (optionAVG.length != 0 || optionS.length != 0) {
+ HAvg.push(optionAVG[0][option.cols[0][j].field]);
+ HDifference.push(optionS[0][option.cols[0][j].field]);
} else {
HAvg.push(0);
HDifference.push(0);
}
-
- //璺ㄥ勾鐨勮瘽 浼氫粠涓�鏈堜竴鍙峰紑濮�
- if (MM == 12 && (HBEGINDATE + j) == 31) {
- yyyy += 1;
- MM = 1;
- SumMonth = new Date(yyyy, MM, 0).getDate();
- HBEGINDATE = 0;
- k += j;
- j = 0;
- } else if ((HBEGINDATE + j) == SumMonth) { //璺ㄦ湀 鏈堟暟鍔犱竴 澶╂暟浠庝竴寮�濮�
- HBEGINDATE = 0;
- MM += 1;
- SumMonth = new Date(yyyy, MM, 0).getDate();
- k += j;
- j = 0;
- }
}
- for (let i = 0; i <= Days; i++) {
- H_X.push(i + 1);
+ for (let i = 1; i < option.cols[0].length; i++) {
+ H_X.push(option.cols[0][i].field);
}
option_ZXT_Avg = {
@@ -471,9 +452,9 @@
},
yAxis: {
type: 'value',
- min: parseInt($("#HTargetVal").val()) + parseInt($("#HDownLimit").val()) - 1, // 璁剧疆鏈�灏忓��
- max: parseInt($("#HTargetVal").val()) + parseInt($("#HUpLimit").val()) + 1, // 璁剧疆鏈�澶у��
- interval: 0.1, // 璁剧疆闂磋窛
+ min: parseFloat($("#HDownLimit").val()) != 0 ? (parseFloat($("#HTargetVal").val()) + parseFloat($("#HDownLimit").val()) * 1.3) : 0, // 璁剧疆鏈�灏忓��
+ max: parseFloat($("#HTargetVal").val()) + parseFloat($("#HUpLimit").val()) * 1.3, // 璁剧疆鏈�澶у��
+ interval: (parseFloat($("#HUpLimit").val()) - parseFloat($("#HDownLimit").val()))/10, // 璁剧疆闂磋窛
},
series: [
{
@@ -498,15 +479,15 @@
markLine: {
symbol: 'none',//鍘绘帀绠ご
data: [
- { yAxis: $("#HUpLimit").val(), lineStyle: { color: '#FF1D00' }, label: { color: '#FF1D00', fontSize: 10 } },
+ { yAxis: parseFloat($("#HTargetVal").val()) + parseFloat($("#HUpLimit").val()), lineStyle: { color: '#FF1D00' }, label: { color: '#FF1D00', fontSize: 10 } },
{
- yAxis: $("#HDownLimit").val(), lineStyle: { color: '#FF1D00' }, label: { color: '#FF1D00', fontSize: 10 }
+ yAxis: parseFloat($("#HTargetVal").val()) + parseFloat($("#HDownLimit").val()), lineStyle: { color: '#FF1D00' }, label: { color: '#FF1D00', fontSize: 10 }
},
{
- yAxis: $("#HControlUpperLimit").val(), lineStyle: { color: '#2cb615' }, label: { color: '#2cb615', fontSize: 10 }
+ yAxis: parseFloat($("#HTargetVal").val()) + parseFloat($("#HControlUpperLimit").val()), lineStyle: { color: '#2cb615' }, label: { color: '#2cb615', fontSize: 10 }
},
{
- yAxis: $("#HControlLowerLimit").val(), lineStyle: { color: '#2cb615' }, label: { color: '#2cb615', fontSize: 10 }
+ yAxis: parseFloat($("#HTargetVal").val()) + parseFloat($("#HControlLowerLimit").val()), lineStyle: { color: '#2cb615' }, label: { color: '#2cb615', fontSize: 10 }
}
]
},
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html"
index 9b76b20..9612c77 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html"
@@ -587,7 +587,7 @@
option = {
elem: '#mainTable'
, toolbar: '#toolbarDemo'
- , height: 'full-50'
+ , height: 700
, page: true
, totalRow: true
, cellMinWidth: 90
@@ -1694,7 +1694,7 @@
col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 200 });
break;
default:
- if (data[i].name == '鏁伴噺' || data[i].name == '鍑虹珯鏁伴噺' || data[i].name == '鎶ュ簾鏁伴噺') {
+ if (data[i].name == '鏁伴噺' || data[i].name == '鍑虹珯鏁伴噺' || data[i].name == '鎶ュ簾鏁伴噺' || data[i].name == '鍙栨牱鏁伴噺') {
col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, totalRow: true });
} else {
col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
@@ -1709,7 +1709,7 @@
, toolbar: '#toolbarDemo'
, cols: [col]
, data: data1.data
- , height: 300
+ , height: 700
, page: true
, totalRow: true
, cellMinWidth: 90
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill.html"
index f8bee57..2325e5c 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill.html"
@@ -2032,6 +2032,13 @@
}
}
+ var HMouldNum = $('#HMouldNum').val();
+
+ if (HMouldNum == "") {
+ layer.msg("妯＄┐鍙蜂笉鑳戒负绌猴紒");
+ return;
+ }
+
//鍒犻櫎瀛愯〃鏁版嵁鏃� 浼氬崰鐢ㄦ暟缁勭殑浣嶇疆,闇�瑕侀噸鏂版帓涓�涓嬮『搴�
--
Gitblit v1.9.1