From 6029d9cca9e132c4ba7a64cefe3db5eeaaecdf74 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期五, 07 十一月 2025 09:24:53 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/质量管理/质量报表/QC_ProcessPerformanceFirstPass.html | 268 ++++++++++++----------------------------------------
1 files changed, 64 insertions(+), 204 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_ProcessPerformanceFirstPass.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_ProcessPerformanceFirstPass.html"
index 8a8580a..9ef3642 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_ProcessPerformanceFirstPass.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_ProcessPerformanceFirstPass.html"
@@ -38,15 +38,7 @@
<!--鍔ㄦ�佹覆鏌撳勾浠�-->
</select>
</div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">杞﹂棿</label>
- <div class="layui-input-block" style="width: 190px;">
- <select name="HDeptName" id="HDeptName" lay-verify="HDeptName">
- <!--鍔ㄦ�佹覆鏌撻儴闂�-->
- </select>
- </div>
- </div>
+ </div>
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">鏄惁閲忎骇</label>
<div class="layui-input-block" style="margin-left: 120px; width: 185px;">
@@ -71,9 +63,12 @@
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
<div class="layui-row" style="margin-top:5px;margin-left:82px;margin-bottom:5px;">
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">鐗╂枡缂栫爜</label>
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鐗╂枡缂栫爜</label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input ForFilteringSchemes" name="HMaterNumber" id="HMaterNumber">
+ <input type="text" class="layui-input" name="HMaterNumber" id="HMaterNumber" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHMaterID" id="btnHMaterID" style="padding: 0 10px; margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
</div>
</div>
<div class="layui-inline">
@@ -90,90 +85,7 @@
</select>
</div>
</div>
- </div>
- <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
- <div class="layui-row" style="margin-top:5px">
- <div class="layui-inline">
- <label class="layui-form-label">杩囨护</label>
- <div class="layui-input-block">
- <select name="ColName" id="ColName" class="ForFilteringSchemes" lay-filter="ColName" style="width:190px;">
- </select>
- </div>
- </div>
- <div class="layui-inline">
- <select name="Comparator" id="Comparator" class="ForFilteringSchemes" lay-filter="Comparator" style="width:190px;">
- <option value="0" selected="selected"></option>
- <option value="=">=</option>
- <option value=">=">>=</option>
- <option value=">">></option>
- <option value="<="><=</option>
- <option value="<"><</option>
- <option value="<>"><></option>
- <option value="7">鍖呭惈</option>
- <option value="8">宸﹀寘鍚�</option>
- <option value="9">鍙冲寘鍚�</option>
- <option value="10">涓嶅寘鍚�</option>
- </select>
- </div>
- <div class="layui-inline">
- <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
- </div>
- </div>
- <div class="layui-row" style="margin-top:5px">
- <div class="layui-inline">
- <label class="layui-form-label">杩囨护</label>
- <div class="layui-input-block">
- <select name="ColName1" id="ColName1" lay-filter="ColName1" style="width:190px;">
- </select>
- </div>
- </div>
- <div class="layui-inline">
- <select name="Comparator1" id="Comparator1" lay-filter="Comparator1" style="width:190px;">
- <option value="0" selected="selected"></option>
- <option value="=">=</option>
- <option value=">=">>=</option>
- <option value=">">></option>
- <option value="<="><=</option>
- <option value="<"><</option>
- <option value="<>"><></option>
- <option value="7">鍖呭惈</option>
- <option value="8">宸﹀寘鍚�</option>
- <option value="9">鍙冲寘鍚�</option>
- <option value="10">涓嶅寘鍚�</option>
- </select>
- </div>
- <div class="layui-inline">
- <input type="text" class="layui-input" value="" name="ColContent1" id="ColContent1">
- </div>
- </div>
- <div class="layui-row" style="margin-top:5px">
- <div class="layui-inline">
- <label class="layui-form-label">杩囨护</label>
- <div class="layui-input-block">
- <select name="ColName2" id="ColName2" lay-filter="ColName2" style="width:190px;">
- </select>
- </div>
- </div>
- <div class="layui-inline">
- <select name="Comparator2" id="Comparator2" lay-filter="Comparator2" style="width:190px;">
- <option value="0" selected="selected"></option>
- <option value="=">=</option>
- <option value=">=">>=</option>
- <option value=">">></option>
- <option value="<="><=</option>
- <option value="<"><</option>
- <option value="<>"><></option>
- <option value="7">鍖呭惈</option>
- <option value="8">宸﹀寘鍚�</option>
- <option value="9">鍙冲寘鍚�</option>
- <option value="10">涓嶅寘鍚�</option>
- </select>
- </div>
- <div class="layui-inline">
- <input type="text" class="layui-input" value="" name="ColContent2" id="ColContent2">
- </div>
- </div>
- </div>
+ </div>
</div>
</div>
<div>
@@ -265,6 +177,12 @@
form.on('submit(btnReSearch)', function (data) {
set_ClearQuery();
});
+
+ //#region 浜у搧缂栫爜
+ form.on('submit(btnHMaterID)', function (data) {
+ btnHMaterID();
+ });
+ //#endregion
//#endregion
//#region 鐐瑰嚮琛岄�変腑楂樹寒
@@ -291,8 +209,7 @@
//#region 姝ら〉闈㈡墍鏈夋柟娉�
// 鍒濆鍖栫晫闈�
function set_ClearBill() {
- Year(); //鍒濆鍖栧勾
- DeptName();//鍒濆鍖栬溅闂�
+ Year(); //鍒濆鍖栧勾
Get_HProject(); //鑾峰彇椤圭洰鍙�
GetGy_Division();//鑾峰彇浜嬩笟閮�
set_InitGrid(); //鍒濆鍖栬〃鏍�
@@ -404,91 +321,14 @@
//蹇�熸煡璇�
function get_FastQuery() {
var HYear = $("#HYear").val();
- var HDeptName = $("#HDeptName").val();//杞﹂棿
var HProject = $("#HProject").val();//椤圭洰鍙�
var HMaterNumber = $("#HMaterNumber").val();//鐗╂枡浠ｇ爜
var HMaterName = $("#HMaterName").val();//鐗╂枡鍚嶇О
var HBatchWork = $("#HBatchWork").val();//鏄惁閲忎骇
var HDivisionName = $("#HDivisionName").val();//浜嬩笟閮�
-
- var ColName = $("#ColName").val();//澶嶉�夋
- var Comparator = $("#Comparator").val()
- var ColContent = $("#ColContent").val();
-
- var ColName1 = $("#ColName1").val();//澶嶉�夋
- var Comparator1 = $("#Comparator1").val()
- var ColContent1 = $("#ColContent1").val();
- var ColName2 = $("#ColName2").val();//澶嶉�夋
- var Comparator2 = $("#Comparator2").val()
- var ColContent2 = $("#ColContent2").val();
-
- if (ColName != 0 && Comparator != 0) {
- var com = "";
- switch (Comparator) {
- case "7":
- com = "like'%" + ColContent + "%'";
- break;
- case "8":
- com = "like'%" + ColContent + "'";
- break;
- case "9":
- com = "like'" + ColContent + "%'";
- break;
- case "10":
- com = "not like'%" + ColContent + "%'";
- break;
- default:
- com = "" + Comparator + "'" + ColContent + "'";
- break;
- }
- sWhere += " and " + ColName + " " + com;
- }
- if (ColName1 != 0 && Comparator1 != 0) {
- var com1 = "";
- switch (Comparator1) {
- case "7":
- com1 = "like'%" + ColContent1 + "%'";
- break;
- case "8":
- com1 = "like'%" + ColContent1 + "'";
- break;
- case "9":
- com1 = "like'" + ColContent1 + "%'";
- break;
- case "10":
- com1 = "not like'%" + ColContent1 + "%'";
- break;
- default:
- com1 = "" + Comparator1 + "'" + ColContent1 + "'";
- break;
- }
- sWhere += " and " + ColName1 + " " + com1;
- }
- if (ColName2 != 0 && Comparator2 != 0) {
- var com2 = "";
- switch (Comparator2) {
- case "7":
- com2 = "like'%" + ColContent2 + "%'";
- break;
- case "8":
- com2 = "like'%" + ColContent2 + "'";
- break;
- case "9":
- com2 = "like'" + ColContent2 + "%'";
- break;
- case "10":
- com2 = "not like'%" + ColContent2 + "%'";
- break;
- default:
- com2 = "" + Comparator + "'" + ColContent + "'";
- break;
- }
- sWhere += " and " + ColName2 + " " + com2;
- }
sWhere = {
- HYear: HYear
- , HDeptName: HDeptName
+ HYear: HYear
, HProject: HProject
, HMaterNumber: HMaterNumber
, HMaterName: HMaterName
@@ -503,24 +343,14 @@
}
//閲嶇疆蹇�熸煡璇�
function set_ClearQuery() {
- $("#HYear").val(new Date().getFullYear());
- $("#HDeptName").val("0");
+ $("#HYear").val(new Date().getFullYear());
$("#HProject").val("");
$("#HMaterNumber").val("");
$("#HMaterName").val("");
$("#HBatchWork").val("");
$("#HDivisionName").val("");
- $("#btnSearch").click();
- $("#ColContent").val("");
- $("#ColName").val("0");
- $("#Comparator").val("0");
- $("#ColContent2").val("");
- $("#ColName2").val("0");
- $("#Comparator2").val("0");
- $("#ColContent1").val("");
- $("#ColName1").val("0");
- $("#Comparator1").val("0");
+ $("#btnSearch").click();
form.render('select');
sWhere = "";
@@ -643,15 +473,15 @@
},
itemStyle: {
normal: {
+ color: '#808080', // 淇浣嶇疆锛屽皢棰滆壊璁剧疆鍦ㄨ繖閲�
label: {
- show: true, //寮�鍚樉绀�
- textStyle: { //鏁板�兼牱寮�
+ show: true,
+ textStyle: {
color: 'black',
fontSize: 16
}
}
- },
- color: '#1E90FF' // 璁剧疆鏌辩姸鍥捐摑鑹�
+ }
},
data: HBackWorkQty
},
@@ -665,25 +495,25 @@
tooltip: {
valueFormatter: function (value) {
return value;
- }
+ }
},
itemStyle: {
normal: {
+ color: '#FF0000', // 淇浣嶇疆锛屽皢棰滆壊璁剧疆鍦ㄨ繖閲�
label: {
- show: true, //寮�鍚樉绀�
- textStyle: { //鏁板�兼牱寮�
+ show: true,
+ textStyle: {
color: 'black',
fontSize: 16
}
}
- },
- color: '#FFFF00' // 璁剧疆鏌辩姸鍥鹃粍鑹�
+ }
},
data: HWasterQty_Work
},
{
name: '鏂欏簾',
- type: 'bar',
+ type: 'bar',
stack: 'Ad',
emphasis: {
focus: 'series'
@@ -695,21 +525,22 @@
},
itemStyle: {
normal: {
+ color: '#FFFF00', // 淇浣嶇疆锛屽皢棰滆壊璁剧疆鍦ㄨ繖閲�
label: {
- show: true, //寮�鍚樉绀�
- textStyle: { //鏁板�兼牱寮�
+ show: true,
+ textStyle: {
color: 'black',
fontSize: 16
}
}
- },
- color: '#FF8C00' // 璁剧疆鏌辩姸鍥炬鑹�
+ }
},
data: HWasterQty_Mater
},
{
name: '涓�娆″悎鏍肩巼',
type: 'line',
+ yAxisIndex: 1, // 浣跨敤绗簩涓� yAxis 鏄剧ず鐧惧垎姣�
label: {
show: true,
formatter: '{c}%'
@@ -732,6 +563,7 @@
{
name: '鐩爣鍊�',
type: 'line',
+ yAxisIndex: 1, // 浣跨敤绗簩涓� yAxis 鏄剧ず鐧惧垎姣�
label: {
show: true,
formatter: '{c}%'
@@ -834,9 +666,10 @@
series: [
{
name: '宸ユ枡鐜�',
- type: 'line',
+ type: 'line',
label: {
- show: true
+ show: true,
+ formatter: '{c}%'
},
itemStyle: {
normal: {
@@ -852,7 +685,8 @@
name: '鏂欏簾鐜�',
type: 'line',
label: {
- show: true
+ show: true,
+ formatter: '{c}%'
},
itemStyle: {
normal: {
@@ -1108,6 +942,32 @@
}
//#endregion
+ //鐗╂枡鍒楄〃
+ function btnHMaterID() {
+ layer.open({
+ type: 2 //绫诲瀷
+ , skin: 'layui-layer-rim'//鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '鐗╂枡鍒楄〃'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html', 'yes']
+ , btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ //鑾峰彇鏁版嵁
+ $("#HMaterNumber").val(checkStatus.data[0].鐗╂枡浠ｇ爜);
+ $("#HMaterName").val(checkStatus.data[0].鐗╂枡鍚嶇О);
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
+ }
+
+
//浠ヤ笂鏄痩ayui妯″潡
});
</script>
--
Gitblit v1.9.1