From 158efa85c58bbefeff3e1419c23d22a88f2dac26 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期四, 11 一月 2024 17:12:41 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/车间管理/单品过站/Cj_ProcessItemBGA.html | 205 +++++++++++++++++++-
WebTM/views/生产管理/生产报表/Sc_ProdOrderPickingStatusReport.html | 68 ++++++
WebTM/views/车间管理/单品过站/BadQueryReport.html | 25 ++
WebTM/views/grf/生产订单领料状态报表.grf | 236 +++++++++++++++++++++++
WebTM/views/车间管理/单品过站/RetrospectiveQueryReport.html | 19 +
WebTM/WebTM.csproj | 1
6 files changed, 537 insertions(+), 17 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index b08c3bb..ff8f1b7 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -643,6 +643,7 @@
<Content Include="views\grf\閿�鍞鍗曞彉鏇村崟2.grf" />
<Content Include="views\grf\涓嶈壇绫诲瀷.grf" />
<Content Include="views\grf\寮傚父绫诲瀷.grf" />
+ <Content Include="views\grf\鐢熶骇璁㈠崟棰嗘枡鐘舵�佹姤琛�.grf" />
<None Include="Web.Debug.config">
<DependentUpon>Web.config</DependentUpon>
</None>
diff --git "a/WebTM/views/grf/\347\224\237\344\272\247\350\256\242\345\215\225\351\242\206\346\226\231\347\212\266\346\200\201\346\212\245\350\241\250.grf" "b/WebTM/views/grf/\347\224\237\344\272\247\350\256\242\345\215\225\351\242\206\346\226\231\347\212\266\346\200\201\346\212\245\350\241\250.grf"
new file mode 100644
index 0000000..e83d6c8
--- /dev/null
+++ "b/WebTM/views/grf/\347\224\237\344\272\247\350\256\242\345\215\225\351\242\206\346\226\231\347\212\266\346\200\201\346\212\245\350\241\250.grf"
@@ -0,0 +1,236 @@
+锘縶
+ "Version":"6.5.0.0",
+ "Title":"1a.绠�鍗曡〃鏍�",
+ "Author":"閿愭氮鎶ヨ〃杞欢",
+ "Description":"婕旂ず涓�涓渶鍩烘湰鐨勫垪琛ㄦ姤琛ㄣ��",
+ "Font":{
+ "Name":"瀹嬩綋",
+ "Size":90000,
+ "Weight":400,
+ "Charset":134
+ },
+ "Printer":{
+ "LeftMargin":1,
+ "TopMargin":1,
+ "RightMargin":1,
+ "BottomMargin":1
+ },
+ "DetailGrid":{
+ "FixCols":20,
+ "AppendBlankRow":true,
+ "AppendBlankRowAtLast":true,
+ "AppendBlankCol":true,
+ "AppendBlankColWidth":40,
+ "GrowToBottom":true,
+ "Recordset":{
+ "Field":[
+ {
+ "Name":"鐢熶骇璁㈠崟"
+ },
+ {
+ "Name":"鏃ユ湡"
+ },
+ {
+ "Name":"杞﹂棿"
+ },
+ {
+ "Name":"鐗╂枡缂栫爜"
+ },
+ {
+ "Name":"鐗╂枡鍚嶇О"
+ },
+ {
+ "Name":"瑙勬牸鍨嬪彿"
+ },
+ {
+ "Name":"璁￠噺鍗曚綅"
+ },
+ {
+ "Name":"鏁伴噺"
+ },
+ {
+ "Name":"璁㈠崟鐘舵��"
+ },
+ {
+ "Name":"棰嗘枡鐘舵��"
+ }
+ ]
+ },
+ "Column":[
+ {
+ "Name":"Column1",
+ "Width":3.175
+ },
+ {
+ "Name":"Column2",
+ "Width":3.59833
+ },
+ {
+ "Name":"Column3",
+ "Width":2.98979
+ },
+ {
+ "Name":"Column4",
+ "Width":3.38667
+ },
+ {
+ "Name":"Column5",
+ "Width":3.01625
+ },
+ {
+ "Name":"Column6"
+ },
+ {
+ "Name":"Column7"
+ },
+ {
+ "Name":"Column8"
+ },
+ {
+ "Name":"Column9"
+ },
+ {
+ "Name":"Column10"
+ }
+ ],
+ "ColumnContent":{
+ "Height":0.608542,
+ "ColumnContentCell":[
+ {
+ "Column":"Column1",
+ "DataField":"鐢熶骇璁㈠崟"
+ },
+ {
+ "Column":"Column2",
+ "DataField":"鏃ユ湡"
+ },
+ {
+ "Column":"Column3",
+ "DataField":"杞﹂棿"
+ },
+ {
+ "Column":"Column4",
+ "DataField":"鐗╂枡缂栫爜"
+ },
+ {
+ "Column":"Column5",
+ "DataField":"鐗╂枡鍚嶇О"
+ },
+ {
+ "Column":"Column6",
+ "DataField":"瑙勬牸鍨嬪彿"
+ },
+ {
+ "Column":"Column7",
+ "DataField":"璁￠噺鍗曚綅"
+ },
+ {
+ "Column":"Column8",
+ "DataField":"鏁伴噺"
+ },
+ {
+ "Column":"Column9",
+ "DataField":"璁㈠崟鐘舵��"
+ },
+ {
+ "Column":"Column10",
+ "DataField":"棰嗘枡鐘舵��"
+ }
+ ]
+ },
+ "ColumnTitle":{
+ "Height":0.608542,
+ "ColumnTitleCell":[
+ {
+ "GroupTitle":false,
+ "Column":"Column1",
+ "TextAlign":"TopCenter",
+ "Text":"鐢熶骇璁㈠崟"
+ },
+ {
+ "GroupTitle":false,
+ "Column":"Column2",
+ "TextAlign":"TopCenter",
+ "Text":"鏃ユ湡\r\n"
+ },
+ {
+ "GroupTitle":false,
+ "Column":"Column3",
+ "TextAlign":"TopCenter",
+ "Text":"杞﹂棿"
+ },
+ {
+ "GroupTitle":false,
+ "Column":"Column4",
+ "TextAlign":"TopCenter",
+ "Text":"鐗╂枡缂栫爜"
+ },
+ {
+ "GroupTitle":false,
+ "Column":"Column5",
+ "TextAlign":"TopCenter",
+ "Text":"鐗╂枡鍚嶇О"
+ },
+ {
+ "GroupTitle":false,
+ "Column":"Column6",
+ "TextAlign":"MiddleCenter",
+ "Text":"瑙勬牸鍨嬪彿"
+ },
+ {
+ "GroupTitle":false,
+ "Column":"Column7",
+ "TextAlign":"MiddleCenter",
+ "Text":"璁￠噺鍗曚綅"
+ },
+ {
+ "GroupTitle":false,
+ "Column":"Column8",
+ "TextAlign":"MiddleCenter",
+ "Text":"鏁伴噺"
+ },
+ {
+ "GroupTitle":false,
+ "Column":"Column9",
+ "TextAlign":"MiddleCenter",
+ "Text":"璁㈠崟鐘舵��"
+ },
+ {
+ "GroupTitle":false,
+ "Column":"Column10",
+ "TextAlign":"MiddleCenter",
+ "Text":"棰嗘枡鐘舵��"
+ }
+ ]
+ }
+ },
+ "ReportHeader":[
+ {
+ "Name":"ReportHeader2",
+ "Height":2.01083,
+ "Control":[
+ {
+ "Type":"MemoBox",
+ "Name":"MemoBox1",
+ "Left":7.19667,
+ "Top":0.608542,
+ "Width":6.61458,
+ "Height":0.582083,
+ "Font":{
+ "Name":"瀹嬩綋",
+ "Size":157500,
+ "Weight":400,
+ "Charset":134
+ },
+ "Text":"鐢熶骇璁㈠崟棰嗘枡鐘舵�佹姤琛�"
+ }
+ ]
+ }
+ ],
+ "ReportFooter":[
+ {
+ "Name":"ReportFooter1",
+ "Height":1.5875
+ }
+ ]
+}
\ No newline at end of file
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\212\245\350\241\250/Sc_ProdOrderPickingStatusReport.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\212\245\350\241\250/Sc_ProdOrderPickingStatusReport.html"
index a3e0e26..18bab4f 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\212\245\350\241\250/Sc_ProdOrderPickingStatusReport.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\212\245\350\241\250/Sc_ProdOrderPickingStatusReport.html"
@@ -14,6 +14,7 @@
<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
<script src="../../../layuiadmin/PubCustom.js"></script>
<script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <script src="../../../layuiadmin/grwebapp.js"></script>
<style type="text/css">
input.layui-input.layui-unselect {
padding-right: 0;
@@ -98,6 +99,8 @@
<table class="" id="mainTable" lay-filter="mainTable"></table>
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container">
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Export" id="btn_Export"><i class="layui-icon layui-icon-radio"></i>瀵煎嚭</button>
+ <button type="button" class="layui-btn layui-btn-sm" id="btn-print" lay-event="btn-print"><i class="layui-icon layui-icon-form"></i>鎵撳嵃</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>
<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="HideColumn"><i class="layui-icon layui-icon-form"></i>闅愯棌鍒楄缃�</button>-->
</div>
@@ -109,6 +112,7 @@
</div>
<script>
+ var OptionData = [];
layui.config({
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
@@ -128,6 +132,7 @@
//鏌ヨ鏉′欢
var sWhere = "";
var option = [];
+ var ins;//瀛樺偍鏁版嵁 瀵煎嚭鍔熻兘闇�瑕佺敤鍒扮殑鍙傛暟
var HModName = "Sc_ProdOrderPickingStatusReport";
//#endregion
@@ -148,6 +153,12 @@
//闅愯棌鍒楄缃�
case 'HideColumn':
get_HideColumn();
+ break;
+ //瀵煎嚭鎸夐挳
+ case 'btn_Export': get_Export();
+ break;
+ //鎵撳嵃
+ case 'btn-print': get_PrintReport();
break;
};
});
@@ -234,6 +245,8 @@
option.cols = [col];
option.data = data1.data;
table.render(option);
+ ins = table.render(option);
+
layer.close(wait);
} else {
layer.close(wait);
@@ -274,6 +287,57 @@
$("#HMaterModel").val("");
sWhere = " ";
get_FastQuery();
+ }
+
+ //瀵煎嚭Execel
+ function get_Export() {
+ table.exportFile(ins.config.id, option.data, "xls");
+ }
+
+ //鎵撳嵃
+ function get_PrintReport() {
+
+ var data = table.cache['mainTable']
+ if (data.length > 0) {
+ layer.open({
+ type: 2
+ , area: ['80%', '80%']
+ , title: '鎵撳嵃妯＄増閫夋嫨'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=0&MyMsg=0&Type=Sc_ProdOrderPickingStatusReport', 'yes']
+ , resize: false
+ , end: function () {
+ if (OptionData.length > 0) {
+ var GrfName = OptionData[0].HName;
+
+ var dataPrint = [];
+ for (var i = 0; i < data.length; i++) {
+ dataPrint.push(data[i])
+ }
+
+ var Customer = {
+ "Table": dataPrint
+ }
+
+ var args = {
+ type: "preview",
+ //showOptionDlg: false, //濡傛灉涓嶆樉绀烘墦鍗板璇濇鑰岀洿鎺ユ墦鍗帮紝灏嗘琛屾敞閲婂幓鎺夊嵆鍙�
+ report: urlAddRandomNo("../../grf/" + GrfName + ".grf"),
+ data: Customer
+ };
+
+ webapp_ws_ajax_run(args);
+ OptionData = [];
+ }
+
+ }
+ })
+ } else {
+ layer.msg("鏃犳暟鎹�,鏃犳硶鎵撳嵃!");
+ }
+
}
//鐗╂枡
@@ -410,6 +474,10 @@
//#endregion
});
+ //鍙屽嚮杩斿洖鐢熶骇璧勬簮
+ function ReportPrint(data) {
+ OptionData = data
+ }
</script>
</body>
</html>
\ No newline at end of file
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/BadQueryReport.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/BadQueryReport.html"
index f01ef59..eaebfec 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/BadQueryReport.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/BadQueryReport.html"
@@ -186,6 +186,11 @@
get_FastQuery();
});
+ //閲嶇疆
+ form.on('submit(btnReSearch)', function (data) {
+ set_ClearQuery();
+ });
+
//#endregion
//#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
@@ -248,9 +253,9 @@
}
}
table.render(option1);
- if ($("#HBardCode").val() != "" && data1.data.length != 0) {
- $("#HICMOBillNo").val(data1.data[0]["鐢熶骇璁㈠崟鍙�"]);
- $("#HProcExchBillNo").val(data1.data[0]["娴佽浆鍗�"]);
+ if ($("#HMaterNumber").val() != "" && data1.data.length != 0) {
+ $("#HMaterName").val(data1.data[0]["鐗╂枡鍚嶇О"]);
+ $("#HMaterModel").val(data1.data[0]["鐗╂枡瑙勬牸"]);
}
@@ -506,6 +511,20 @@
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
}
+
+ function set_ClearQuery() {
+ $("#HMaterNumber").val("");
+ $("#HMaterName").val("");
+ $("#HMaterModel").val("");
+ $("#HBatchNo").val("");
+ $("#ColContent").val("");
+ $("#ColName").val("0");
+ $("#Comparator").val("0");
+ form.render('select');
+
+ sWhere = "";
+ }
+
//闅愯棌鍒楄缃�
function get_HideColumn() {
var colName = "";
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/Cj_ProcessItemBGA.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/Cj_ProcessItemBGA.html"
index a39144b..8560655 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/Cj_ProcessItemBGA.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/Cj_ProcessItemBGA.html"
@@ -37,7 +37,7 @@
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnAdd" id="btnAdd">鏂板</button>
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnCancel" id="btnCancel">閫�鍑�</button>
</div>
- <div class="layui-tab" lay-filter="tab-POStockInBill" style="width: 49.5%; float: left; background-color: white;height:430px;">
+ <div class="layui-tab" lay-filter="tab-POStockInBill" style="width: 49.5%; float: left; background-color: white;height:450px;">
<ul class="layui-tab-title" lay-filter="tab-all">
<li lay-id="1" style="padding:1px;" class="layui-this">褰撳墠宸ュ崟</li>
</ul>
@@ -96,10 +96,13 @@
</div>
<div class="layui-row">
<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" lay-verify="HSourceName" name="HSourceName" id="HSourceName" style="background-color:#efefef4d;" readonly>
- <input type="hidden" name="HSourceID" id="HSourceID" lay-verify="HSourceID" value="0">
+ <label class="layui-form-label" style="width: 85px; padding: 9px 18px;">鐢熶骇璧勬簮</label>
+ <div class="layui-input-block" style="margin-left: 77px;">
+ <input type="text" class="layui-input" name="HSourceName" id="HSourceName" lay-verify="HSourceName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="hidden" class="layui-input" name="HSourceID" lay-verify="HSourceID" id="HSourceID" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHSource" id="btnHSource" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
</div>
</div>
<div class="layui-inline">
@@ -118,10 +121,25 @@
</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" lay-verify="HProName" name="HProName" id="HProName" style="background-color:#efefef4d;" readonly>
- <input type="hidden" name="HProcess" id="HProcess" lay-verify="HProcess" value="0">
+ <label class="layui-form-label" style="width: 85px; padding: 9px 18px;">缁翠慨宸ュ簭</label>
+ <div class="layui-input-block" style="margin-left: 77px;">
+ <input type="text" class="layui-input" name="HProName" id="HProName" lay-verify="HProName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="hidden" class="layui-input" name="HProcess" lay-verify="HProcess" id="HProcess" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHProcess" id="btnHProcess" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px; padding: 9px 18px;">涓嶈壇宸ュ簭</label>
+ <div class="layui-input-block" style="margin-left: 77px;">
+ <input type="text" class="layui-input" name="HBadProcName" id="HBadProcName" lay-verify="HBadProcName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="hidden" class="layui-input" name="HBadProcID" lay-verify="HBadProcID" id="HBadProcID" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHBadProc" id="btnHBadProc" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
</div>
</div>
</div>
@@ -156,7 +174,7 @@
</div>
</div>
</div>
- <div class="layui-tab" style="width: 50%; float: left; background-color: white; margin-left: 0.5%; height: 430px;">
+ <div class="layui-tab" style="width: 50%; float: left; background-color: white; margin-left: 0.5%; height: 450px;">
<ul class="layui-tab-title" lay-filter="tab-all">
<li lay-id="1" style="padding:1px;" class="layui-this">閲囬泦淇℃伅</li>
</ul>
@@ -205,10 +223,13 @@
</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="HBadTypeName" lay-verify="HBadTypeName" id="HBadTypeName" style="background-color:#efefef4d;" readonly>
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">涓嶈壇绫诲瀷</label>
+ <div class="layui-input-block" style="margin-left: 77px;">
+ <input type="text" class="layui-input" lay-verify="HBadTypeName" name="HBadTypeName" id="HBadTypeName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
<input type="hidden" name="HBadTypeID" id="HBadTypeID" lay-verify="HBadTypeID" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHBadTypeID" id="btnHBadTypeID" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
</div>
</div>
</div>
@@ -218,7 +239,7 @@
<div class="layui-input-block" style="margin-left: 77px;">
<input type="text" class="layui-input" lay-verify="HBadResultName" name="HBadResultName" id="HBadResultName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
<input type="hidden" name="HBadResultID" id="HBadResultID" lay-verify="HBadResultID" value="0">
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHBadResult" id="btnSearchHBadResult" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHBadResult" id="btnHBadResult" style="padding: 0 10px;float: right;margin-right: 3px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
</div>
@@ -349,6 +370,19 @@
$('#HBarCodeSN').on('keydown', function (event) {
var HBarCode = $('#HBarCodeSN').val();
if (event.keyCode == 13) {
+ if ($("#HSourceID").val() == "0") {
+ layer.msg("鐢熶骇璧勬簮涓嶈兘涓虹┖锛�")
+ return;
+ }
+ if ($("#HProcess").val() == "0"){
+ layer.msg("缁翠慨宸ュ簭涓嶈兘涓虹┖锛�")
+ return;
+ }
+ if ($("#HBadProcID").val() == "0"){
+ layer.msg("涓嶈壇宸ュ簭涓嶈兘涓虹┖锛�")
+ return;
+ }
+
if (!HBarCode) {
layer.msg("鏉″舰鐮佷笉鑳戒负绌猴紒")
return;
@@ -373,9 +407,36 @@
get_checkSearchHBadReason();
});
+ //閫夋嫨涓嶈壇绫诲瀷鎸夐挳
+ form.on('submit(btnHBadTypeID)', function () {
+ get_btnHBadTypeID();
+ });
+
+ //閫夋嫨涓嶈壇鍚庢灉鎸夐挳
+ form.on('submit(btnHBadResult)', function () {
+ btnHBadResult();
+ });
+
+
// 鎹㈤厤浠�
form.on('submit(ChangeMater)', function (data) {
get_checkSearchChangeMater();
+ });
+
+
+ //閫夋嫨鐢熶骇璧勬簮
+ form.on('submit(btnHSource)', function () {
+ btnHSource();
+ });
+
+ //閫夋嫨缁翠慨宸ュ簭鎸夐挳
+ form.on('submit(btnHProcess)', function () {
+ btnHProc(0);
+ });
+
+ //閫夋嫨涓嶈壇宸ュ簭鎸夐挳
+ form.on('submit(btnHBadProc)', function () {
+ btnHProc(1);
});
//瀛愯〃琛屽唴浜嬩欢
@@ -738,6 +799,64 @@
}
}
+ //鐢熶骇璧勬簮閫夋嫨椤甸潰
+ function btnHSource() {
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '鐢熶骇璧勬簮鍒楄〃'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Source.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('璇烽�夋嫨鏁版嵁');
+ }
+ //鑾峰彇鏁版嵁
+ $("#HSourceID").val(checkStatus.data[0].HItemID);
+ $("#HSourceName").val(checkStatus.data[0].鐢熶骇璧勬簮鍚嶇О);
+
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
+ }
+
+ //宸ュ簭閫夋嫨椤甸潰
+ function btnHProc(num) {
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '宸ュ簭鍒楄〃'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Process.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 != 1) {
+ return layer.msg('璇烽�夋嫨涓�鏉℃暟鎹�');
+ }
+ if (num == 0) {
+ //鑾峰彇鏁版嵁
+ $("#HProcess").val(checkStatus.data[0].HItemID);//
+ $("#HProName").val(checkStatus.data[0].宸ュ簭鍚嶇О);//
+ } else if (num == 1) {
+ $("#HBadProcID").val(checkStatus.data[0].HItemID);//
+ $("#HBadProcName").val(checkStatus.data[0].宸ュ簭鍚嶇О);//
+ }
+
+
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
+ }
+
//涓嶈壇鍘熷洜閫夋嫨椤甸潰
function get_checkSearchHBadReason() {
layer.open({
@@ -767,6 +886,64 @@
})
}
+ //涓嶈壇绫诲瀷閫夋嫨
+ function get_btnHBadTypeID() {
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "涓嶈壇绫诲瀷鍒楄〃" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["90%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ["../../../views/鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_BadType.html", "yes"]
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鎸夐挳涓� 鐨勫洖璋�
+ var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+ if (checkStatus.data.length != 1) {
+ return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+ }
+
+ $("#HBadTypeID").val(checkStatus.data[0].HItemID);//鍐呯爜
+ $("#HBadTypeName").val(checkStatus.data[0].涓嶈壇绫诲瀷鍚嶇О);//鍚嶇О
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ , btn2: function (index, layero) { }
+ })
+ }
+
+ //涓嶈壇鍚庢灉閫夋嫨
+ function btnHBadResult() {
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "涓嶈壇鍚庢灉鍒楄〃" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["90%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ["../../../views/鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_BadResult.html", "yes"]
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鎸夐挳涓� 鐨勫洖璋�
+ var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+ if (checkStatus.data.length != 1) {
+ return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+ }
+
+ $("#HBadResultID").val(checkStatus.data[0].HItemID);//鍐呯爜
+ $("#HBadResultName").val(checkStatus.data[0].涓嶈壇鍚庢灉鍚嶇О);//鍚嶇О
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ , btn2: function (index, layero) { }
+ })
+ }
+
//鎹㈤厤浠堕〉闈�
function get_checkSearchChangeMater() {
var HBarCode = $("#HBarCode").val();
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/RetrospectiveQueryReport.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/RetrospectiveQueryReport.html"
index 7bd11c9..6f0ac69 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/RetrospectiveQueryReport.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/RetrospectiveQueryReport.html"
@@ -223,6 +223,11 @@
get_FastQuery();
});
+ //閲嶇疆
+ form.on('submit(btnReSearch)', function (data) {
+ set_ClearQuery();
+ });
+
//#endregion
//#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
@@ -666,6 +671,8 @@
com = " and (" + ColName + " " + com + ")";
}
+ sWhere += com;
+
get_Display2(sWhere);
get_Display5(sWhere);
if (HBardCode != "") {
@@ -678,6 +685,18 @@
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
}
+ function set_ClearQuery() {
+ $("#HICMOBillNo").val("");
+ $("#HBardCode").val("");
+ $("#HProcExchBillNo").val("");
+ $("#ColContent").val("");
+ $("#ColName").val("0");
+ $("#Comparator").val("0");
+ form.render('select');
+
+ sWhere = "";
+ }
+
//闅愯棌鍒楄缃�
function get_HideColumn() {
var colName = "";
--
Gitblit v1.9.1