From 8a18b5274a7fbd6f0ff1354cca8aab5d3286142b Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期五, 30 八月 2024 15:10:40 +0800
Subject: [PATCH] 1.各工序质量趋势图 增加一个 事业部 选择框 2.设备工艺参数趋势图 在放大镜选择流转卡页面 质量要再搜索条件增加 一个 批次号 文本框筛选 3.设备工艺参数趋势分析图 日期改为 开始结束日期
---
WebTM/views/PublicPage/PowerInformation.html | 10 +
WebTM/views/质量管理/质量报表/QC_ProcessPerformanceFirstPass.html | 28 ++--
WebTM/views/质量管理/质量报表/QC_ProcessPerformancePass.html | 4
WebTM/views/质量管理/质量报表/Sc_StationOutBil_HProc.html | 276 ++++++++++-----------------------------------
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBillList.html | 11 +
WebTM/layuiadmin/Scripts/webConfig.js | 4
WebTM/views/质量管理/质量报表/QC_EquipMentCollectionTechParam.html | 17 ++
7 files changed, 119 insertions(+), 231 deletions(-)
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index 89218a7..f94e237 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -1,12 +1,12 @@
锘�
function GetWEBURL() {
//var WEBURL = "http://47.96.97.237/API/"; //鏅轰簯鏈嶅姟鍣�
- var WEBURL = "http://localhost/API/"; //棰滄檽鍐涙湰鍦伴厤缃�
+ /* var WEBURL = "http://localhost/API/"; //棰滄檽鍐涙湰鍦伴厤缃�*/
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄤ箰鏈湴閰嶇疆
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //浣欐�濇澃鏈湴閰嶇疆
//var WEBURL = "http://localhost:8088/ARAPI/"; //浣欐�濇澃鏈湴閰嶇疆(瀹夌憺)
//var WEBURL = "http://localhost:8082/API/"; //鏉滆春鏈湴閰嶇疆
- //var WEBURL = "http://localhost:8082/API/"; //寮犵憺骞挎湰鍦伴厤缃�
+ var WEBURL = "http://localhost:8082/API/"; //寮犵憺骞挎湰鍦伴厤缃�
//var WEBURL = "http://localhost:81/API/" //缈佹稕娑涙湰鍦伴厤缃�
//var WEBURL = "http://localhost:81/API/"; //鐜嬪浆鏈湴閰嶇疆
//var WEBURL = "http://localhost/API/"; //娼樻禉娓告湰鍦伴厤缃�
diff --git a/WebTM/views/PublicPage/PowerInformation.html b/WebTM/views/PublicPage/PowerInformation.html
index d262e8e..182ea2f 100644
--- a/WebTM/views/PublicPage/PowerInformation.html
+++ b/WebTM/views/PublicPage/PowerInformation.html
@@ -347,6 +347,16 @@
treeData.push(it)
}
})
+ // 閫掑綊杩囨护鎺夋病鏈夊瓙鑺傜偣鐨勯」
+ function filterTree(node) {
+ if (!node.children || node.children.length === 0) {
+ return null; // 杩囨护鎺夋病鏈夊瓙鑺傜偣鐨勯」
+ }
+ node.children = node.children.map(filterTree).filter(n => n !== null);
+ return node;
+ }
+ // 瀵规瘡涓牴鑺傜偣搴旂敤杩囨护
+ treeData = treeData.map(filterTree).filter(n => n !== null);
return treeData;
}
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_EquipMentCollectionTechParam.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_EquipMentCollectionTechParam.html"
index 8634b46..2130244 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_EquipMentCollectionTechParam.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_EquipMentCollectionTechParam.html"
@@ -67,9 +67,15 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">鏃ユ湡</label>
+ <label class="layui-form-label">寮�濮嬫棩鏈�</label>
<div class="layui-input-block">
<input type="date" class="layui-input ForFilteringSchemes" id="HDate" style="width:190px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">缁撴潫鏃ユ湡</label>
+ <div class="layui-input-block">
+ <input type="date" class="layui-input ForFilteringSchemes" id="HDate1" style="width:190px;">
</div>
</div>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch" style="padding: 0 10px;margin-left: 20px;">
@@ -273,6 +279,7 @@
// 鍒濆鍖栫晫闈�
function set_ClearBill() {
$("#HDate").val(Format(new Date, "yyyy-MM-dd"));
+ $("#HDate1").val(Format(new Date, "yyyy-MM-dd"));
set_InitGrid(); //鍒濆鍖栬〃鏍�
get_FastQuery();
////鍔犺浇鎶樼嚎鍥�
@@ -380,7 +387,8 @@
var HEquipName = $("#HEquipName").val();
var HProcName = $("#HProcName").val();
var HTechParamName = $("#HTechParamName").val();
- var HDate = $("#HDate").val();
+ var HDate = $("#HDate").val(); //寮�濮嬫棩鏈�
+ var HDate1 = $("#HDate1").val();//缁撴潫鏃ユ湡
var ColName = $("#ColName").val();//澶嶉�夋
var Comparator = $("#Comparator").val()
@@ -465,7 +473,10 @@
sWhere += " and 宸ヨ壓浜ф暟 = '" + HTechParamName + "'";
}
if (HDate) {
- sWhere += " and CONVERT(date, 閲囬泦鏃ユ湡) = '" + HDate + "'";
+ sWhere += " and CONVERT(date, 閲囬泦鏃ユ湡) >= '" + HDate + "'";
+ }
+ if (HDate1) {
+ sWhere += " and CONVERT(date, 閲囬泦鏃ユ湡) <= '" + HDate1 + "'";
}
if (HEquipNumber != "" || HTechParamName!="") {
get_Display(sWhere);
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 34e51e6..bcef798 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"
@@ -476,15 +476,15 @@
},
itemStyle: {
normal: {
+ color: '#808080', // 淇浣嶇疆锛屽皢棰滆壊璁剧疆鍦ㄨ繖閲�
label: {
- show: true, //寮�鍚樉绀�
- textStyle: { //鏁板�兼牱寮�
+ show: true,
+ textStyle: {
color: 'black',
fontSize: 16
}
}
- },
- color: '#1E90FF' // 璁剧疆鏌辩姸鍥捐摑鑹�
+ }
},
data: HBackWorkQty
},
@@ -498,25 +498,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'
@@ -528,15 +528,15 @@
},
itemStyle: {
normal: {
+ color: '#FFFF00', // 淇浣嶇疆锛屽皢棰滆壊璁剧疆鍦ㄨ繖閲�
label: {
- show: true, //寮�鍚樉绀�
- textStyle: { //鏁板�兼牱寮�
+ show: true,
+ textStyle: {
color: 'black',
fontSize: 16
}
}
- },
- color: '#FF8C00' // 璁剧疆鏌辩姸鍥炬鑹�
+ }
},
data: HWasterQty_Mater
},
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_ProcessPerformancePass.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_ProcessPerformancePass.html"
index 84ead04..9fc4509 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_ProcessPerformancePass.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_ProcessPerformancePass.html"
@@ -478,6 +478,7 @@
{
name: '鍚堟牸鐜�',
type: 'line',
+ yAxisIndex: 1, // 浣跨敤绗簩涓� y 杞�
label: {
show: true,
formatter: '{c}%'
@@ -496,10 +497,11 @@
}
},
data: Pass
- },
+ },
{
name: '鐩爣鍊�',
type: 'line',
+ yAxisIndex: 1, // 浣跨敤绗簩涓� y 杞�
label: {
show: true,
formatter: '{c}%'
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/Sc_StationOutBil_HProc.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/Sc_StationOutBil_HProc.html"
index c4dcda9..f08b48a 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/Sc_StationOutBil_HProc.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/Sc_StationOutBil_HProc.html"
@@ -61,13 +61,21 @@
</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>
+ <div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">鐗╂枡鍚嶇О</label>
<div class="layui-input-block" style="margin-left: 120px;">
<input type="text" class="layui-input" name="HMaterName" id="HMaterName">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">宸ュ簭鍚嶇О</label>
+ <label class="layui-form-label" style="width: 85px;">宸ュ簭鍚嶇О</label>
<div class="layui-input-block">
<input type="text" class="layui-input" lay-verify="HProcName" name="HProcName" id="HProcName" value="" style="background-color: #efefef4d; width: 65%; display: inline-block;" readonly>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHProc" id="btnHProc" style="padding: 0 10px;float: right;margin-right: 3px;">
@@ -78,90 +86,7 @@
<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>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
- <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>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
</div>
</div>
<div>
@@ -207,7 +132,7 @@
var option = [];
var HModName = "Sc_StationOutBil_HProc";
//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
- var titleData = ["骞�", "鏈�", "宸ュ簭鍚嶇О"];
+ var titleData = ["骞�", "鏈�", "宸ュ簭鍚嶇О","娉ㄥ浜嬩笟閮�","鐗╂枡鍚嶇О"];
var ins; //鐢ㄤ簬瀵煎嚭excel
@@ -278,6 +203,7 @@
// 鍒濆鍖栫晫闈�
function set_ClearBill() {
Year(); //鍒濆鍖栧勾
+ GetGy_Division();//鑾峰彇浜嬩笟閮�
set_InitGrid(); //鍒濆鍖栬〃鏍�
get_FastQuery();
//鍔犺浇鏌辩姸鍥�
@@ -297,6 +223,7 @@
};
}
+
//骞�
function Year() {
var yyyy = new Date().getFullYear();
@@ -309,6 +236,32 @@
$("#HMonth").val(new Date().getMonth() + 1);
form.render('select');
}
+
+ //#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_Display(sWhere) {
var index = layer.load(0, { shade: false });
@@ -346,35 +299,19 @@
}
}
}
- if ($("#HMaterName").val() != "" && $("#HProcName").val() != "") {
- //鍔ㄦ�佹樉绀哄垪鍚�
- option = {
- elem: '#mainTable'
- , toolbar: '#toolbarDemo'
- , cols: [col]
- , data: data1.data
- , height: 'full-80'
- , page: true
- , limits: [50, 500, 5000, 50000]
- , limit: 50
- , cellMinWidth: 90
- }
- ins = table.render(option);
- } else {
- //鍔ㄦ�佹樉绀哄垪鍚�
- option = {
- elem: '#mainTable'
- , toolbar: '#toolbarDemo'
- , cols: [col]
- , data: []
- , height: 'full-80'
- , page: true
- , limits: [50, 500, 5000, 50000]
- , limit: 50
- , cellMinWidth: 90
- }
- ins = table.render(option);
+ //鍔ㄦ�佹樉绀哄垪鍚�
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , cols: [col]
+ , data: data1.data
+ , height: 'full-80'
+ , page: true
+ , limits: [50, 500, 5000, 50000]
+ , limit: 50
+ , cellMinWidth: 90
}
+ ins = table.render(option);
//鍒锋柊鎸夐挳鏄剧ず
var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
@@ -400,120 +337,37 @@
});
layer.close(index);
}
+
//蹇�熸煡璇�
function get_FastQuery() {
var HYear = $("#HYear").val();
var HMonth = $("#HMonth").val();
+ var HDivisionName = $("#HDivisionName").val();//浜嬩笟閮�
var HProcName = $("#HProcName").val();
- var HMaterName = $("#HMaterName").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;
+ var HMaterName = $("#HMaterName").val();
+
+ sWhere = {
+ HYear: HYear
+ , HMonth: HMonth
+ , HDivisionName: HDivisionName
+ , HProcName: HProcName
+ , HMaterName: HMaterName
}
- 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;
- }
- if (HYear) {
- sWhere += " and 骞� = '" + HYear + "'";
- }
- if (HMonth) {
- sWhere += " and 鏈� = '" + HMonth + "'";
- }
- if (HProcName) {
- sWhere += " and 宸ュ簭鍚嶇О like '%" + HProcName + "%'";
- }
- if (HMaterName) {
- sWhere += " and 鐗╂枡鍚嶇О like '%" + HMaterName + "%'";
- }
- get_Display(sWhere);
+ get_Display(JSON.stringify(sWhere));
//鍔犺浇鏌辩姸鍥�
set_Graphics();
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
}
+
//閲嶇疆蹇�熸煡璇�
function set_ClearQuery() {
$("#HYear").val(new Date().getFullYear());
$("#HMonth").val(new Date().getMonth() + 1);
$("#HProcName").val("");
$("#HMaterName").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");
+ $("#HDivisionName").val("");
+ $("#btnSearch").click();
form.render('select');
sWhere = "";
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_ProcessExchangeBillList.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_ProcessExchangeBillList.html"
index 9e8965b..b65e773 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_ProcessExchangeBillList.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_ProcessExchangeBillList.html"
@@ -124,6 +124,12 @@
</select>
</div>
</div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鎵规鍙�</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HBatchNo" id="HBatchNo">
+ </div>
+ </div>
</div>
<div class="layui-row" style="margin-top: 10px; margin-bottom: 10px ">
@@ -656,6 +662,7 @@
$("#HDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd")); //寮�濮嬫棩鏈�
$("#HDate1").val(Format(new Date(), "yyyy-MM-dd")); //缁撴潫鏃ユ湡
$("#HProject").val("");//椤圭洰鍙�
+ $("#HBatchNo").val("");//鎵规鍙�
$("#HOrderProcNO").val("");//璁㈠崟璺熻釜鍙�
$("#SHname").val("");//鐗╂枡|瀛愪欢鍚嶇О|瀛愪欢瑙勬牸
$("#HBillNo").val("");//鍗曟嵁鍙�
@@ -699,6 +706,7 @@
var Comparator2 = $("#Comparator2").val()
var ColContent2 = $("#ColContent2").val();
var HDeptName = $("#HDeptName").val();//杞﹂棿
+ var HBatchNo = $("#HBatchNo").val();//鎵规鍙�
if (ColName != 0 && Comparator != 0) {
var com = "";
@@ -805,6 +813,9 @@
if (HErpID) {
sWhere += " and 鍞竴ID like '%" + HErpID + "%'";
}
+ if (HBatchNo) {
+ sWhere += " and 鎵规鍙� like '%" + HBatchNo + "%'";
+ }
if (number==2) {
if (HProject) {
sWhere += " and 椤圭洰鍙� like '%" + HProject + "%'";
--
Gitblit v1.9.1