From df3e719955cc93b4e762ac75fbb61737fbf3b7a8 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期一, 16 六月 2025 08:38:12 +0800
Subject: [PATCH] 1
---
WebTM/views/质量管理/质量报表/QC_SkillExamMonthSumReport.html | 120 +++++++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 102 insertions(+), 18 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_SkillExamMonthSumReport.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_SkillExamMonthSumReport.html"
index ad3ba45..156c1de 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_SkillExamMonthSumReport.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_SkillExamMonthSumReport.html"
@@ -41,7 +41,7 @@
<input name="HDate" id="HDate" autocomplete="off" class="layui-input ForFilteringSchemes">
</div>
</div>
- <div class="layui-inline">
+ <div class="layui-inline" style="display:none">
<label class="layui-form-label">閮ㄩ棬</label>
<div class="layui-input-block">
<input type="text" class="layui-input" name="HDeptName" id="HDeptName" lay-verify="HDeptName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
@@ -51,14 +51,32 @@
</button>
</div>
</div>
- <!--<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">缁勭粐</label>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鏄惁閲忎骇</label>
<div class="layui-input-block" style="margin-left: 120px; width: 185px;">
- <select name="HStockOrgID" id="HStockOrgID" class="ForFilteringSchemes" lay-verify="HStockOrgID">
- 鍔ㄦ�佹覆鏌撶粍缁�
+ <select name="HBatchWork" id="HBatchWork" lay-verify="HBatchWork">
+ <option value="">璇烽�夋嫨</option>
+ <option value="1">閲忎骇</option>
+ <option value="0">闈為噺浜�</option>
</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;">
+ <select name="HProject" id="HProject" class=" ForFilteringSchemes" lay-verify="HProject">
+ <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+ </select>
+ </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;">
+ <select name="HDivisionName" id="HDivisionName" class=" ForFilteringSchemes" lay-verify="HDivisionName">
+ <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+ </select>
+ </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>
@@ -131,6 +149,8 @@
//set_StockOrg();
//鍒濆鍖栬〃鍗曟椂闂�
set_InitDate();
+ Get_HProject(); //鑾峰彇椤圭洰鍙�
+ GetGy_Division();//鑾峰彇浜嬩笟閮�
//鍒濆鍖栬〃鏍�
set_InitGrid();
@@ -456,8 +476,23 @@
//蹇�熸煡璇�
function get_FastQuery() {
- sDate = $("#HDate").val(); //鏃ユ湡
- get_Display(sWhere);
+ //鏂囨湰妗嗕负绌烘椂锛屾竻绌哄搴擨D
+ if ($("#HDeptName").val() == '') {
+ $("#HDeptID").val("0");
+ }
+ var HDeptID = $("#HDeptID").val()
+ var HYear = $("#HDate").val(); //鏃ユ湡
+ var HProject = $("#HProject").val();//椤圭洰鍙�
+ var HBatchWork = $("#HBatchWork").val();//鏄惁閲忎骇
+ var HDivisionName = $("#HDivisionName").val();//浜嬩笟閮�
+ sWhere = {
+ HYear: HYear
+ ,HDeptID: HDeptID
+ , HProject: HProject
+ , HBatchWork: HBatchWork
+ , HDivisionName: HDivisionName
+ }
+ get_Display(JSON.stringify(sWhere));
//鍔犺浇鏌辩姸鍥�
set_Graphics();
}
@@ -466,19 +501,12 @@
//#region 鍒楄〃鍒锋柊
function get_Display(sWhere) {
- var HDate = sDate; //鏃ユ湡
- //鏂囨湰妗嗕负绌烘椂锛屾竻绌哄搴擨D
- if ($("#HDeptName").val() == '') {
- $("#HDeptID").val("0");
- }
- var HDeptID = $("#HDeptID").val()
-
var ajaxLoad = layer.load();
$.ajax({
type: "GET",
url: GetWEBURL() + '/QC_QualityReportsController/GetQC_SkillExamMonthSumReport_Json',
async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
- data: { "HYear": HDate, "HDeptID": HDeptID },
+ data: { "sWhere": sWhere},
success: function (data1) {
if (data1.count == 1) {
var data = [];
@@ -766,7 +794,10 @@
type: 'bar',
barWidth: 30,
barGap: 0,
- label: labelOption,
+ label: {
+ ...labelOption,
+ color: '#0066CC' // 璁剧疆鏍囩棰滆壊涓鸿摑鑹�
+ },
emphasis: {
focus: 'series'
},
@@ -785,7 +816,10 @@
type: 'line',
barWidth: 10,
barGap: 0,
- label: labelOption1,
+ label: {
+ ...labelOption,
+ color: '#FF0000' // 璁剧疆鏍囩棰滆壊涓鸿摑鑹�
+ },
emphasis: {
focus: 'series'
},
@@ -807,6 +841,56 @@
////#endregion
//#endregion
+ //#region 鑾峰彇椤圭洰鍙�
+ function Get_HProject() {
+ //鑾峰彇椤圭洰鍙�
+ var HProjectList = '<option value="" style="color:red;" selected></option>';
+ $.ajax({
+ type: "get",
+ url: GetWEBURL() + "/Gy_Material/Get_HProject",
+ async: false,
+ data: { "HOrgID": sessionStorage["OrganizationID"] },
+ success: function (result) {
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data;
+ for (var i = 0; i < data.length; i++) {
+ HProjectList += '<option style="color:blue;" value="' + data[i].HName + '" >' + data[i].HName + '</option>';
+ }
+ $("#HProject").append(HProjectList);
+ form.render('select');
+
+ }
+ layer.closeAll("loading");
+ }
+ })
+ }
+ //#endregion
+
+ //#region 鑾峰彇浜嬩笟閮�
+ function GetGy_Division() {
+ //鑾峰彇浜嬩笟閮�
+ var HDivisionList = '<option value="" style="color:red;" selected></option>';
+ $.ajax({
+ type: "get",
+ url: GetWEBURL() + "/Gy_Material/Get_Gy_Division",
+ async: false,
+ data: { "HOrgID": sessionStorage["OrganizationID"] },
+ success: function (result) {
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data;
+ for (var i = 0; i < data.length; i++) {
+ HDivisionList += '<option style="color:blue;" value="' + data[i].HName + '" >' + data[i].HName + '</option>';
+ }
+ $("#HDivisionName").append(HDivisionList);
+ form.render('select');
+
+ }
+ layer.closeAll("loading");
+ }
+ })
+ }
+ //#endregion
+
});
//#endregion
--
Gitblit v1.9.1