From 07cf94734c36d4eae6ddbc4dd338bf5af81a2193 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期一, 28 十月 2024 16:11:39 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/质量管理/质量报表/QC_ErrManagerLedgerReport_SourceOfTheProblem.html | 107 +++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 99 insertions(+), 8 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_ErrManagerLedgerReport_SourceOfTheProblem.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_ErrManagerLedgerReport_SourceOfTheProblem.html"
index f7dfbe8..2cf8e39 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_ErrManagerLedgerReport_SourceOfTheProblem.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_ErrManagerLedgerReport_SourceOfTheProblem.html"
@@ -41,12 +41,38 @@
<!--鍔ㄦ�佹覆鏌撳勾浠�-->
</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: 85px;">
<select name="HMonth" id="HMonth" lay-verify="HMonth">
<!--鍔ㄦ�佹覆鏌撴湀浠�-->
+ </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="HBatchWork" id="HBatchWork" lay-verify="HBatchWork">
+ <option value="">璇烽�夋嫨</option>
+ <option value="1">閲忎骇</option>
+ <option value="0">闈為噺浜�</option>
+ </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="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>
@@ -378,7 +404,9 @@
//鍒濆鍖栫晫闈�
function set_ClearBill() {
Year();
- Month();
+ Month();
+ Get_HProject(); //鑾峰彇椤圭洰鍙�
+ GetGy_Division();//鑾峰彇浜嬩笟閮�
//鍒濆鍖栬〃鏍�
set_InitGrid();
//鍔犺浇鏁版嵁鍒扮綉鏍�
@@ -428,15 +456,13 @@
}
//鍔犺浇缃戞牸
- function get_Display(DateYear) {
- var HYear = $("#HYear").val();
- var HMonth = $("#HMonth").val();
+ function get_Display(sWhere) {
var wait = layer.load();//閬僵
$.ajax({
url: GetWEBURL() + '/QC_CustomerAppealReport/QC_ErrManagerLedgerReport_SourceOfTheProblem',
type: "GET",
async: false,
- data: { "HYear": HYear, "HMonth": HMonth, "user": sessionStorage["HUserName"] },
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
success: function (data1) {
var col = [];
if (data1.count == 1) {
@@ -492,7 +518,19 @@
//蹇�熻繃婊�
function get_FastQuery() {
- get_Display(sWhere);
+ var HYear = $("#HYear").val();
+ var HMonth = $("#HMonth").val();
+ var HProject = $("#HProject").val();//椤圭洰鍙�
+ var HBatchWork = $("#HBatchWork").val();//鏄惁閲忎骇
+ var HDivisionName = $("#HDivisionName").val();//浜嬩笟閮�
+ sWhere = {
+ HYear: HYear
+ , HMonth: HMonth
+ , HProject: HProject
+ , HBatchWork: HBatchWork
+ , HDivisionName: HDivisionName
+ }
+ get_Display(JSON.stringify(sWhere));
//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
sWhere = "";
set_Graphics();
@@ -503,13 +541,66 @@
var yyyy = new Date().getFullYear();
$("#HYear").val(yyyy);
var mm = new Date().getMonth() + 1;
- $("#HMonth").val(mm)
+ $("#HMonth").val(mm);
+ $("#HProject").val("");
+ $("#HBatchWork").val("");
+ $("#HDivisionName").val("");
form.render('select');
sWhere = "";
get_FastQuery();
}
+ //#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
+
//闅愯棌鍒楄缃�
function get_HideColumn() {
var colName = "";
--
Gitblit v1.9.1