From db76563873cd96af1e4cf4111d979500e50d413e Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期五, 12 一月 2024 13:12:35 +0800
Subject: [PATCH] 1
---
WebTM/views/车间管理/单品过站/Cj_ProcessItemBGA.html | 205 ++++
WebTM/views/质量管理/巡检记录单/QC_PatrolProcCheckBillList.html | 98 +-
WebTM/views/基础资料/公用基础资料/Gy_DepartmentList.html | 31
WebTM/views/grf/生产订单领料状态报表.grf | 236 +++++
WebTM/views/系统管理/用户管理/Gy_UserByUserList.html | 665 ++++++++++++++
WebTM/views/系统管理/过滤方案设置/Xt_FastICScheme.html | 203 ++++
WebTM/views/系统管理/过滤方案设置/Xt_FastICSchemeList.html | 513 ++++++++++
WebTM/views/质量管理/首件检验单/QC_FirstPieceCheckBillList.html | 91 -
WebTM/views/质量管理/巡检记录单/QC_Add_Edit_PatrolProcCheckBill.html | 7
WebTM/views/系统管理/用户管理/Gy_UserByUser.html | 66 +
WebTM/views/生产管理/生产汇报单/Sc_Add_ICMOReportBillList.html | 2
WebTM/views/生产管理/生产停工单/Sc_Add_MESStopWorkBillList.html | 34
WebTM/views/生产管理/生产报表/Sc_ProdOrderPickingStatusReport.html | 68 +
WebTM/views/车间管理/单品过站/BadQueryReport.html | 25
WebTM/views/验收入库/委外入库/Kf_EntrustInBill_Fast.html | 3
WebTM/views/质量管理/工序检验单/QC_ProcessCheckBill.html | 4
WebTM/views/质量管理/工序检验单/QC_ProcessCheckBillList.html | 88
WebTM/views/车间管理/单品过站/RetrospectiveQueryReport.html | 19
WebTM/views/质量管理/首件检验单/QC_Add_Edit_FirstPieceCheckBill.html | 6
WebTM/views/生产管理/生产任务单/Sc_ICMOBillList.html | 399 ++++++-
WebTM/WebTM.csproj | 4
21 files changed, 2,496 insertions(+), 271 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 286e85d..592b2b5 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -380,6 +380,7 @@
<Content Include="views\绯荤粺绠＄悊\蹇嵎鏂瑰紡鑷畾涔塡Xt_UserFastMenu.html" />
<Content Include="views\绯荤粺绠＄悊\蹇嵎鏂瑰紡鑷畾涔塡Xt_UserFastMenu_IconSet.html" />
<Content Include="views\绯荤粺绠＄悊\鎸夐挳璁剧疆\Xt_ModuleButtonSet.html" />
+ <Content Include="views\绯荤粺绠＄悊\鐢ㄦ埛绠＄悊\Gy_UserByUserList.html" />
<Content Include="views\绯荤粺绠＄悊\鐢ㄦ埛绠＄悊\Gy_UserCustomerList.html" />
<Content Include="views\绯荤粺绠＄悊\鐢ㄦ埛绠＄悊\Gy_UserCustomerList_Edit.html" />
<Content Include="views\绯荤粺绠＄悊\鐢ㄦ埛绠＄悊\Gy_UserMaterList.html" />
@@ -390,6 +391,8 @@
<Content Include="views\绯荤粺绠＄悊\鐢ㄦ埛绠＄悊\Gy_UserProcess_Excel.html" />
<Content Include="views\绯荤粺绠＄悊\鐢ㄦ埛绠＄悊\Xt_UserSuplies_Excel.html" />
<Content Include="views\绯荤粺绠＄悊\鑿滃崟鑷畾涔塡Xt_DefineMenuDisplay.html" />
+ <Content Include="views\绯荤粺绠＄悊\杩囨护鏂规璁剧疆\Xt_FastICScheme.html" />
+ <Content Include="views\绯荤粺绠＄悊\杩囨护鏂规璁剧疆\Xt_FastICSchemeList.html" />
<Content Include="views\璁″垝绠＄悊\浜х嚎璐ㄦ骞冲彴\Sc_ICMOBillQualityStatus_Tmp.html" />
<Content Include="views\璁″垝绠＄悊\浜х嚎杩斾慨骞冲彴\Sc_SourceLineRepairBill.html" />
<Content Include="views\璁″垝绠＄悊\浜х嚎杩斾慨骞冲彴\Sc_SourceLineRepairBill_ChangeMater.html" />
@@ -641,6 +644,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/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DepartmentList.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DepartmentList.html"
index 01df218..52ce424 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DepartmentList.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DepartmentList.html"
@@ -13,6 +13,7 @@
<script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
<script src="../../../layuiadmin/PubCustom.js"></script>
+ <script src="../../../layuiadmin/HideButton.js"></script>
</head>
<body>
@@ -87,15 +88,16 @@
<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="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Stop"><i class="layui-icon layui-icon-radio"></i>绂佺敤</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeStop"><i class="layui-icon layui-icon-radio"></i>鍙嶇鐢�</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew" id="set_add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill" id="set_show"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill" id="set_delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh" id="get_ref"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit" id="btn_audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit" id="btn_deaudit"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Stop" id="btn_stop"><i class="layui-icon layui-icon-radio"></i>绂佺敤</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeStop" id="btn_destop"><i class="layui-icon layui-icon-radio"></i>鍙嶇鐢�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn" id="set_hidecolumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideButton" id="HideButton"><i class="layui-icon layui-icon-form"></i>鎸夐挳璁剧疆</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
</div>
</script>
@@ -180,6 +182,11 @@
break;
//鍒楄缃�
case 'set_HideColumn': get_HideColumn();
+ break;
+ case 'set_HideButton':
+ var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+ var HBillType = "Gy_DepartmentList";
+ get_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
break;
};
});
@@ -310,6 +317,12 @@
}
table.render(option);
+ //鍒锋柊鎸夐挳鏄剧ず
+ var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+ var HBillType = "Gy_DepartmentList";
+ Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
+
+
//鍒锋柊琛ㄦ牸鏁版嵁
DisPlay_HideColumn();
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
index 4de5ebe..b67449f 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
@@ -33,13 +33,13 @@
<div class="layui-inline">
<label class="layui-form-label">瑙勬牸鍨嬪彿</label>
<div class="layui-input-block">
- <input type="text" class="layui-input" name="HModel" id="HModel">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HModel" id="HModel">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">涓氬姟鐘舵��</label>
<div class="layui-input-block">
- <select name="HStatus" id="HStatus" lay-verify="required" lay-search class="layui-input">
+ <select name="HStatus" id="HStatus" lay-verify="required" lay-search class="layui-input ForFilteringSchemes">
<!-- <option value="鍏ㄩ儴">鍏ㄩ儴</option>-->
<option value="寮�宸�">寮�宸�</option>
<option value="璁″垝">璁″垝</option>
@@ -56,7 +56,7 @@
<div class="layui-inline">
<label class="layui-form-label">鏄惁涓嬫帹鐢熸垚娴佽浆鍗�</label>
<div class="layui-input-block" style="margin-top:10px">
- <select name="HSF" id="HSF" lay-verify="required" lay-search class="layui-input">
+ <select name="HSF" id="HSF" lay-verify="required" lay-search class="layui-input ForFilteringSchemes">
<!-- <option value="鍏ㄩ儴">鍏ㄩ儴</option>-->
<option value="鍏ㄩ儴" selected="selected">鍏ㄩ儴</option>
<option value="宸蹭笅鎺�">宸蹭笅鎺�</option>
@@ -69,13 +69,13 @@
<div class="layui-inline">
<label class="layui-form-label">鐗╂枡缂栫爜</label>
<div class="layui-input-block">
- <input type="text" class="layui-input" name="HMaterName" id="HMaterName">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HMaterName" id="HMaterName">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">鐢熶骇杞﹂棿</label>
<div class="layui-input-block">
- <select name="HDeptName" id="HDeptName" lay-verify="required" lay-search class="layui-input">
+ <select name="HDeptName" id="HDeptName" lay-verify="required" lay-search class="layui-input ForFilteringSchemes">
<!--鍔ㄦ�佹覆鏌撹溅闂�-->
</select>
@@ -84,7 +84,7 @@
<div class="layui-inline">
<label class="layui-form-label">鍗曟嵁鍙�</label>
<div class="layui-input-block">
- <input type="text" class="layui-input" name="WorkCenter" id="WorkCenter">
+ <input type="text" class="layui-input ForFilteringSchemes" name="WorkCenter" id="WorkCenter">
</div>
</div>
<button class="layui-btn layuiadmin-btn-order" style="display:none;" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
@@ -97,14 +97,14 @@
<div class="layui-inline">
<label class="layui-form-label">鍗曟嵁绫诲瀷</label>
<div class="layui-input-block">
- <input type="text" class="layui-input" name="HBillType" id="HBillType">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HBillType" id="HBillType">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">鍞竴ID</label>
<div class="layui-input-block">
- <input type="text" class="layui-input" name="HERPID" id="HERPID">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HERPID" id="HERPID">
</div>
</div>
</div>
@@ -112,12 +112,12 @@
<div class="layui-inline">
<label class="layui-form-label">杩囨护</label>
<div class="layui-input-block">
- <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
+ <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" lay-filter="Comparator" style="width:190px;">
+ <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>
@@ -132,14 +132,14 @@
</select>
</div>
<div class="layui-inline">
- <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
+ <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">
- <input type="text" class="layui-input" name="HBillno2" id="HBillno2" style="width:190px;">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HBillno2" id="HBillno2" style="width:190px;">
</div>
</div>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnResCnz" id="btnReSearch" style="padding:0 5px">閲嶆柊鍚屾</button>
@@ -147,19 +147,21 @@
<div class="layui-inline">
<label class="layui-form-label">寮�濮嬫棩鏈�</label>
<div class="layui-input-block">
- <input type="date" class="layui-input" id="HDate">
+ <input type="date" class="layui-input ForFilteringSchemes" id="HDate">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">缁撴潫鏃ユ湡</label>
<div class="layui-input-block">
- <input type="date" class="layui-input" id="HDate1">
+ <input type="date" class="layui-input ForFilteringSchemes" id="HDate1">
</div>
</div>
</div>
</div>
</div>
</div>
+ <!--鏄剧ず褰撳墠杩囨护鏂规-->
+ <div style="text-align:center;font-size:15px;font-weight:bold;color:#fc9393" id="HFilterScheme_Now" ></div>
<table class="" id="mainTable" lay-filter="mainTable"></table>
<script type="text/html" id="toolbarDemo">
<!--<div class="layui-btn-container">
@@ -210,6 +212,8 @@
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_HideButton" id="HideButton"><i class="layui-icon layui-icon-form"></i>鎸夐挳璁剧疆</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-FirstPieceCheck" id="btn-FirstPieceCheck">棣栨</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_Remark" id="set_Remark"><i class="layui-icon layui-icon-form"></i>鍖呰澶囨敞</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_SaveScheme" id="set_SaveScheme"><i class="layui-icon layui-icon-template"></i>淇濆瓨鏂规</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_ReadScheme" id="set_ReadScheme"><i class="layui-icon layui-icon-set"></i>璇诲彇鏂规</button>
</div>
</script>
</form>
@@ -227,7 +231,7 @@
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
index: 'lib/index', //涓诲叆鍙ｆā鍧�
- }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate','soulTable'], function () {
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate', 'soulTable'], function () {
var $ = layui.$
, admin = layui.admin
, layer = layui.layer
@@ -248,8 +252,11 @@
var option = [];
var ins; //鐢ㄤ簬瀵煎嚭excel
+ //鏄惁宸茬粡閫夋嫨浜嗚繃婊ゆ柟妗�
+ window.HDefaultFilter = "";
+ //閫夋嫨鐨勮繃婊ゆ柟妗堝唴鐮�
+ window.HInterID_Choose = 0;
//鍒ゆ柇鏄惁鏈夊弬鏁颁紶閫�
-
//鍒濆鍖栬〃鏍�
DisPlay_HideColumn();
@@ -388,7 +395,13 @@
//鍖呰澶囨敞
case 'set_Remark': set_Remark();
break;
- };
+ //淇濆瓨鏂规
+ case 'set_SaveScheme': set_SaveScheme();
+ break;
+ //璇诲彇鏂规
+ case 'set_ReadScheme': set_ReadScheme();
+ break;
+ };
});
//閲嶆柊鍚屾鎸夐挳
@@ -428,12 +441,13 @@
});
//#region 鍒濆鍖栫晫闈�
- function set_ClearBill() {
+ function set_ClearBill() {
//鍒濆鍖栬〃鏍�
set_InitGrid();
//鏌ヨ
get_FastQuery();
-
+ //鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
+ get_DefaultModule();
}
//#endregion
@@ -446,7 +460,7 @@
, cellMinWidth: 90
, limit: 50
, limits: [50, 500, 5000, 20000]
-
+
, cols: [[
{ type: 'checkbox', fixed: 'left' }
, { field: 'hmainid', title: 'hmainid', sort: true, width: 165, hide: true }
@@ -517,7 +531,7 @@
, { field: '鍏抽棴绫诲瀷', title: '鍏抽棴绫诲瀷', hide: true }
, { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', hide: true }
, { field: '璁″垝璺熻釜鍙�', title: '璁″垝璺熻釜鍙�', hide: true }
- , { field: '璁㈠崟鍖呰澶囨敞', title: '璁㈠崟鍖呰澶囨敞', hide: true}
+ , { field: '璁㈠崟鍖呰澶囨敞', title: '璁㈠崟鍖呰澶囨敞', hide: true }
]]
};
@@ -540,44 +554,44 @@
{ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' }
, { field: 'hmainid', title: 'hmainid', sort: true, hide: true }
, { field: 'HEntryID', title: 'HEntryID', sort: true, hide: true }
- , { field: '鏃ユ湡', title: '鏃ユ湡', sort: true}
+ , { field: '鏃ユ湡', title: '鏃ユ湡', sort: true }
, { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', sort: true }
- , { field: '浜у搧浠ｇ爜', title: '浜у搧浠ｇ爜', sort: true}
- , { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О', sort: true}
- , { field: '瀹㈡埛', title: '瀹㈡埛', sort: true}
- , { field: '涓氬姟鍛�', title: '涓氬姟鍛�', sort: true}
- , { field: 'HWidth', title: '闂ㄥ箙', sort: true}
- , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', sort: true}
- , { field: '鐢熶骇浠诲姟鍗曟暟閲�', title: '鐢熶骇璁㈠崟鏁伴噺', totalRow: true, sort: true}
- , { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅', sort: true}
+ , { field: '浜у搧浠ｇ爜', title: '浜у搧浠ｇ爜', sort: true }
+ , { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О', sort: true }
+ , { field: '瀹㈡埛', title: '瀹㈡埛', sort: true }
+ , { field: '涓氬姟鍛�', title: '涓氬姟鍛�', sort: true }
+ , { field: 'HWidth', title: '闂ㄥ箙', sort: true }
+ , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', sort: true }
+ , { field: '鐢熶骇浠诲姟鍗曟暟閲�', title: '鐢熶骇璁㈠崟鏁伴噺', totalRow: true, sort: true }
+ , { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅', sort: true }
, { field: '鏄惁涓嬫帹鐢熸垚娴佽浆鍗�', title: '鏄惁涓嬫帹鐢熸垚娴佽浆鍗�', sort: true }
, { field: '鏄惁鍙栧簱瀛�', title: '鏄惁鍙栧簱瀛�', sort: true }
- , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', sort: true}
- , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', sort: true}
+ , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', sort: true }
+ , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', sort: true }
, { field: '鐘舵��', title: '鐘舵��', sort: true }
//, { field: '璁￠噺鍗曚綅浠ｇ爜', title: '璁￠噺鍗曚綅浠ｇ爜', width: 115 }
- , { field: 'HAuxQty', title: '杈呮暟閲�', sort: true}
- , { field: 'HAuxUnitName', title: '杈呭姪鍗曚綅', sort: true}
- , { field: '璁″垝寮�宸ユ棩鏈�', title: '璁″垝寮�宸ユ棩鏈�', sort: true}
- , { field: '璁″垝瀹屽伐鏃ユ湡', title: '璁″垝瀹屽伐鏃ユ湡', sort: true}
- , { field: '鏈�杩熷紑宸ユ棩鏈�', title: '鏈�杩熷紑宸ユ棩鏈�', sort: true}
- , { field: '鏈�杩熷畬宸ユ棩鏈�', title: '鏈�杩熷畬宸ユ棩鏈�', sort: true}
- , { field: '瀹℃牳浜�', title: '瀹℃牳浜�', sort: true}
- , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', sort: true}
- , { field: '淇敼浜�', title: '淇敼浜�', sort: true}
- , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', sort: true}
- , { field: '鍏抽棴浜�', title: '鍏抽棴浜�', sort: true}
- , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡', sort: true}
+ , { field: 'HAuxQty', title: '杈呮暟閲�', sort: true }
+ , { field: 'HAuxUnitName', title: '杈呭姪鍗曚綅', sort: true }
+ , { field: '璁″垝寮�宸ユ棩鏈�', title: '璁″垝寮�宸ユ棩鏈�', sort: true }
+ , { field: '璁″垝瀹屽伐鏃ユ湡', title: '璁″垝瀹屽伐鏃ユ湡', sort: true }
+ , { field: '鏈�杩熷紑宸ユ棩鏈�', title: '鏈�杩熷紑宸ユ棩鏈�', sort: true }
+ , { field: '鏈�杩熷畬宸ユ棩鏈�', title: '鏈�杩熷畬宸ユ棩鏈�', sort: true }
+ , { field: '瀹℃牳浜�', title: '瀹℃牳浜�', sort: true }
+ , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', sort: true }
+ , { field: '淇敼浜�', title: '淇敼浜�', sort: true }
+ , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', sort: true }
+ , { field: '鍏抽棴浜�', title: '鍏抽棴浜�', sort: true }
+ , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡', sort: true }
, { field: '鍞竴ID', title: '鍞竴ID', sort: true, }
- , { field: '鐢熶骇杞﹂棿浠ｇ爜', title: '鐢熶骇杞﹂棿浠ｇ爜', sort: true}
- , { field: '鐢熶骇杞﹂棿', title: '鐢熶骇杞﹂棿', sort: true}
- , { field: '鍖呰鏍囪瘑浠ｇ爜', title: '鍖呰鏍囪瘑浠ｇ爜', sort: true}
- , { field: '鍖呰鏍囪瘑', title: '鍖呰鏍囪瘑', sort: true}
- , { field: '榻愬鏁伴噺', title: '榻愬鏁伴噺', sort: true}
- , { field: '璁″垝鐢熶骇鏁伴噺', title: '璁″垝鐢熶骇鏁伴噺', sort: true}
- , { field: '鍏宠仈鏁伴噺', title: '鍏宠仈鏁伴噺', sort: true}
- , { field: '鏈叧鑱旀暟閲�', title: '鏈叧鑱旀暟閲�', sort: true}
- , { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞', sort: true}
+ , { field: '鐢熶骇杞﹂棿浠ｇ爜', title: '鐢熶骇杞﹂棿浠ｇ爜', sort: true }
+ , { field: '鐢熶骇杞﹂棿', title: '鐢熶骇杞﹂棿', sort: true }
+ , { field: '鍖呰鏍囪瘑浠ｇ爜', title: '鍖呰鏍囪瘑浠ｇ爜', sort: true }
+ , { field: '鍖呰鏍囪瘑', title: '鍖呰鏍囪瘑', sort: true }
+ , { field: '榻愬鏁伴噺', title: '榻愬鏁伴噺', sort: true }
+ , { field: '璁″垝鐢熶骇鏁伴噺', title: '璁″垝鐢熶骇鏁伴噺', sort: true }
+ , { field: '鍏宠仈鏁伴噺', title: '鍏宠仈鏁伴噺', sort: true }
+ , { field: '鏈叧鑱旀暟閲�', title: '鏈叧鑱旀暟閲�', sort: true }
+ , { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞', sort: true }
//, { field: '浣滃簾浜�', title: '浣滃簾浜�', hide: true }
//, { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡', hide: true }
//, { field: '閿�鍞鍗曟棩鏈�', title: '閿�鍞鍗曟棩鏈�', sort: true, width: 120, hide: true }
@@ -604,9 +618,9 @@
//, { field: 'hbomid', title: 'hbomid' , hide: true}
//, { field: 'BOM鍗曠紪鐮�', title: 'BOM鍗曠紪鐮�', hide: true }
//, { field: 'HRoutingInterID', title: 'HRoutingInterID' , hide: true}
- , { field: '宸ヨ壓璺嚎浠ｇ爜', title: '宸ヨ壓璺嚎浠ｇ爜', sort: true}
+ , { field: '宸ヨ壓璺嚎浠ｇ爜', title: '宸ヨ壓璺嚎浠ｇ爜', sort: true }
, { field: '宸ヨ壓璺嚎', title: '宸ヨ壓璺嚎', sort: true }
- , { field: '璁㈠崟鍖呰澶囨敞', title: '璁㈠崟鍖呰澶囨敞', sort: true, width: 150}
+ , { field: '璁㈠崟鍖呰澶囨敞', title: '璁㈠崟鍖呰澶囨敞', sort: true, width: 150 }
//, { field: 'hsubid', title: 'hsubid' , hide: true}
//, { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', hide: true}
//, { field: '婧愬崟涓诲唴鐮�', title: '婧愬崟涓诲唴鐮�', hide: true}
@@ -626,6 +640,7 @@
$.ajax({
url: GetWEBURL() + '/LEMS/MES_IF_ICMOBillList_Json',
type: "GET",
+ async: false,
data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
success: function (data1) {
if (data1.count == 1) {
@@ -980,34 +995,34 @@
if (checkStatus.data.length === 1) {
var linterid = data[0].hmainid;
var HEntryID = data[0].hsubid.toString();
- layer.prompt({ formType: 2, title: "璇疯緭鍏ヨ鍗曞寘瑁呭娉�", value: '' },
- function (value, index) {
- layer.close(index);
- var HOrderPickRemark = value;
- var index = layer.load();
- $.ajax({
- url: GetWEBURL() + "Sc_ICMOBill/ICMOBillSaveRemark",
- type: "GET",
- data: {
- "HInterID": linterid
- , "HEntryID": HEntryID
- , "HOrderPickRemark": HOrderPickRemark
- },
- success: function (data1) {
- //鍒锋柊椤甸潰,
- $("#btnSearch").trigger('click');
- layer.close(index);
- layer.msg("鎻愪氦鎴愬姛");
- }, error: function () {
- layer.close(index);
- layer.msg("閿欒");
- }
- });
- });
+ layer.prompt({ formType: 2, title: "璇疯緭鍏ヨ鍗曞寘瑁呭娉�", value: '' },
+ function (value, index) {
+ layer.close(index);
+ var HOrderPickRemark = value;
+ var index = layer.load();
+ $.ajax({
+ url: GetWEBURL() + "Sc_ICMOBill/ICMOBillSaveRemark",
+ type: "GET",
+ data: {
+ "HInterID": linterid
+ , "HEntryID": HEntryID
+ , "HOrderPickRemark": HOrderPickRemark
+ },
+ success: function (data1) {
+ //鍒锋柊椤甸潰,
+ $("#btnSearch").trigger('click');
+ layer.close(index);
+ layer.msg("鎻愪氦鎴愬姛");
+ }, error: function () {
+ layer.close(index);
+ layer.msg("閿欒");
+ }
+ });
+ });
} else {
layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
}
- }
+ }
// 澶嶅埗
function set_copy() {
@@ -1356,7 +1371,7 @@
var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
- var titleData = ["hmainid", "HEntryID", "浣滃簾浜�", "浣滃簾鏃ユ湡", "閿�鍞鍗曟棩鏈�", "璁㈠崟璺熻釜鍙�", "HDeptID", "HMaterID", "hunitid", "hempid", "涓氬姟鍛樹唬鐮�", "涓氬姟鍛�", "hcusid", "瀹㈡埛浠ｇ爜", "瀹㈡埛", "HCenterID", "宸ヤ綔涓績浠ｇ爜", "宸ヤ綔涓績", "hbomid", "BOM鍗曠紪鐮�", "HRoutingInterID", "宸ヨ壓璺嚎浠ｇ爜", "宸ヨ壓璺嚎","璁㈠崟鍖呰澶囨敞", "hsubid", "婧愬崟鍗曞彿", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�", "琛屽叧闂汉", "鍏抽棴绫诲瀷", "鍗曟嵁绫诲瀷", "璁″垝璺熻釜鍙�"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ var titleData = ["hmainid", "HEntryID", "浣滃簾浜�", "浣滃簾鏃ユ湡", "閿�鍞鍗曟棩鏈�", "璁㈠崟璺熻釜鍙�", "HDeptID", "HMaterID", "hunitid", "hempid", "涓氬姟鍛樹唬鐮�", "涓氬姟鍛�", "hcusid", "瀹㈡埛浠ｇ爜", "瀹㈡埛", "HCenterID", "宸ヤ綔涓績浠ｇ爜", "宸ヤ綔涓績", "hbomid", "BOM鍗曠紪鐮�", "HRoutingInterID", "宸ヨ壓璺嚎浠ｇ爜", "宸ヨ壓璺嚎", "璁㈠崟鍖呰澶囨敞", "hsubid", "婧愬崟鍗曞彿", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�", "琛屽叧闂汉", "鍏抽棴绫诲瀷", "鍗曟嵁绫诲瀷", "璁″垝璺熻釜鍙�"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
dataCol = data1.data[0].HGridString.split(',');
@@ -1619,13 +1634,235 @@
return res;
}
+
+ //鑾峰彇褰撳墠鐢ㄦ埛鐨勯粯璁よ繃婊ゆ柟妗�
+ function get_DefaultModule() {
+ $.ajax({
+ url: GetWEBURL() + '/Xt_FastICScheme/Chooselist',
+ type: "GET",
+ data: { "user": sessionStorage["Czybm"], "HModuleName": "閲囪喘璁㈠崟", "HInterID": 0, "Type": "Default" },
+ success: function (data1) {
+ if (data1.count == 1) {
+ var data = data1.data;
+ HInterID_Choose = data[0].hmainid;
+ HInterID = data[0].hmainid
+ HDefaultFilter = data[0].鏂规鍚嶇О
+ var HRemark = data[0].澶囨敞
+
+ document.getElementById("HFilterScheme_Now").style.display = "block";
+ document.getElementById('HFilterScheme_Now').innerHTML = "褰撳墠杩囨护鏂规锛�" + HDefaultFilter + '<span style="font-size: 15px; font-weight: bold; color:#7b90fb"> ' + "(" + HRemark + ")" + '</span>';
+ for (let i = 0; i < data.length; i++) {
+ $("#" + data[i].杩囨护瀛楁ID).val(data[i].杩囨护鍊�);
+ if (data[i].杩囨护鏍囩绫诲瀷 == 'SELECT') {
+ $("#" + data[i].杩囨护瀛楁ID).find("option[value='" + data[i].杩囨护鍊� + "']").attr("selected", true);
+ }
+ }
+ get_FastQuery()
+ form.render("select");
+ } else {
+ document.getElementById("HFilterScheme_Now").style.display = "none";
+ get_FastQuery()
+ form.render("select");
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+
+ //淇濆瓨鏂规
+ function set_SaveScheme() {
+ var index = layer.open()
+ var HIsClose_Manual = false;
+ var Filter = document.getElementsByClassName("ForFilteringSchemes"); //鑾峰彇鏈〉鎵�鏈夎繃婊ゆ潯浠跺璞�(class涓寘鍚�"ForFilteringSchemes"鐨勫厓绱�)
+
+ var HFilterIdList = "";
+ var HFilterIdLists = "";
+ var HValue = "";
+ var HElement_type = "";
+ for (var i = 0; i < Filter.length; i++) {
+ HFilterIdList = Filter[i].id; //杩囨护鏉′欢ID
+ HFilterIdLists += Filter[i].id + ","; //杩囨护鏉′欢ID(鎷兼帴)
+ HValue += $("#" + HFilterIdList).val() + ","; //杩囨护鏉′欢涓緭鍏ョ殑鍊�
+ HElement_type += document.getElementById(HFilterIdList).tagName + ",";//閫氳繃鏍囩id鑾峰彇鏍囩绫诲瀷
+ }
+ //瀵规暟缁勮繘琛岀紪鐮�
+ HFilterIdLists = encodeURI(HFilterIdLists.substring(0, HFilterIdLists.length - 1));//瀵� URI 杩涜缂栫爜
+ HValue = encodeURI(HValue.substring(0, HValue.length - 1));//瀵� URI 杩涜缂栫爜
+ HElement_type = encodeURI(HElement_type.substring(0, HElement_type.length - 1));//瀵� URI 杩涜缂栫爜
+
+ if (HDefaultFilter == "") {
+ layer.open({
+ type: 2
+ , area: ['40%', '80%']
+ , title: '杩囨护鏂规'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../../绯荤粺绠＄悊/杩囨护鏂规璁剧疆/Xt_FastICScheme.html?OperationType=1&HModuleName=閲囪喘璁㈠崟&HFilterIdLists=' + HFilterIdLists + '&HValue=' + HValue + '&HElement_type=' + HElement_type
+ , cancel: function () {
+ // 鍙充笂瑙掑叧闂簨浠剁殑閫昏緫
+ HIsClose_Manual = true;
+ }
+ , end: function () {
+ if (HIsClose_Manual != true) {
+ get_FastQuery();
+ //鏄剧ず褰撳墠鐨勮繃婊ゆ柟妗�
+ document.getElementById("HFilterScheme_Now").style.display = "block";
+ document.getElementById('HFilterScheme_Now').innerHTML = "褰撳墠杩囨护鏂规锛�" + sessionStorage["HFilterSchemeName_" + sessionStorage["Czybm"]] + '<span style="font-size: 15px; font-weight: bold; color:#7b90fb"> ' + "(" + sessionStorage["HFilterSchemeRemark_" + sessionStorage["Czybm"]] + ")" + '</span>';
+ }
+ }
+ })
+ layer.close(index)
+ } else {
+ layer.confirm('褰撳墠宸查�夋嫨杩囨护鏂规锛屾槸鍚︿慨鏀癸紵璇烽�夋嫨瀵瑰簲鎿嶄綔', {
+ title: "鎿嶄綔鎻愮ず",
+ icon: 0,
+ btn: ['鏂板鏂规', '淇濆瓨淇敼褰撳墠鏂规', '鍙栨秷']
+ }, function (index, layero) {
+ //鏂板
+ layer.open({
+ type: 2
+ , area: ['40%', '80%']
+ , title: '杩囨护鏂规'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../../绯荤粺绠＄悊/杩囨护鏂规璁剧疆/Xt_FastICScheme.html?OperationType=1&HModuleName=閲囪喘璁㈠崟&HFilterIdLists=' + HFilterIdLists + '&HValue=' + HValue + '&HElement_type=' + HElement_type
+ , end: function () {
+ get_FastQuery()
+ //鏄剧ず褰撳墠鐨勮繃婊ゆ柟妗�
+ document.getElementById("HFilterScheme_Now").style.display = "block";
+ document.getElementById('HFilterScheme_Now').innerHTML = "褰撳墠杩囨护鏂规锛�" + sessionStorage["HFilterSchemeName_" + sessionStorage["Czybm"]] + '<span style="font-size: 15px; font-weight: bold; color:#7b90fb"> ' + "(" + sessionStorage["HFilterSchemeRemark_" + sessionStorage["Czybm"]] + ")" + '</span>';
+ }
+ })
+ layer.close(index)
+ }, function (index) {
+ var Filter_Edit = document.getElementsByClassName("ForFilteringSchemes"); //鑾峰彇鏈〉鎵�鏈夎繃婊ゆ潯浠跺璞�(class涓寘鍚�"ForFilteringSchemes"鐨勫厓绱�)
+ for (var i = 0; i < Filter_Edit.length; i++) {
+ HFilterIdList = Filter_Edit[i].id; //杩囨护鏉′欢ID
+ HFilterIdLists += Filter_Edit[i].id + ","; //杩囨护鏉′欢ID(鎷兼帴)
+ HValue += $("#" + HFilterIdList).val() + ","; //杩囨护鏉′欢涓緭鍏ョ殑鍊�
+ HElement_type += document.getElementById(HFilterIdList).tagName + ",";//閫氳繃鏍囩id鑾峰彇鏍囩绫诲瀷
+ }
+ //瀵规暟缁勮繘琛岀紪鐮�
+ HFilterIdLists = encodeURI(HFilterIdLists.substring(0, HFilterIdLists.length - 1));//瀵� URI 杩涜缂栫爜
+ HValue = encodeURI(HValue.substring(0, HValue.length - 1));//瀵� URI 杩涜缂栫爜
+ HElement_type = encodeURI(HElement_type.substring(0, HElement_type.length - 1));//瀵� URI 杩涜缂栫爜
+ var sMainSub = HInterID_Choose + ';' + HFilterIdLists + ';' + HValue + ';' + HElement_type + ';' + sessionStorage["HUserName"] + ';' + 3;
+
+ //淇敼
+ $.ajax({
+ type: "POST",
+ url: GetWEBURL() + "/Xt_FastICScheme/save", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: true,
+ data: { "oMain": sMainSub },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
+ $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
+ var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
+ parent.layer.close(index); //鍐嶆墽琛屽叧闂�
+ });
+ }
+ else {
+
+ }
+ layer.closeAll("loading");
+ },
+ error: function (err) {
+
+
+ }
+ });
+ layer.close(index)
+ }, function (index) {
+ //鍙栨秷
+ layer.alert('鍙栨秷')
+ layer.close(index)
+ });
+ }
+
+ }
+
+ //璇诲彇鏂规
+ function set_ReadScheme() {
+ var HIsClose_Manual = false;
+ var Filter = document.getElementsByClassName("ForFilteringSchemes"); //鑾峰彇鏈〉鎵�鏈夎繃婊ゆ潯浠跺璞�(class涓寘鍚�"ForFilteringSchemes"鐨勫厓绱�)
+
+ var HFilterIdList = "";
+ var HFilterIdLists = "";
+ var HValue = "";
+ var HElement_type = "";
+ for (var i = 0; i < Filter.length; i++) {
+ HFilterIdList = Filter[i].id; //杩囨护鏉′欢ID
+ HFilterIdLists += Filter[i].id + ","; //杩囨护鏉′欢ID(鎷兼帴)
+ HValue += $("#" + HFilterIdList).val() + ","; //杩囨护鏉′欢涓緭鍏ョ殑鍊�
+ HElement_type += document.getElementById(HFilterIdList).tagName + ",";//閫氳繃鏍囩id鑾峰彇鏍囩绫诲瀷
+ }
+ //瀵规暟缁勮繘琛岀紪鐮�
+ HFilterIdLists = encodeURI(HFilterIdLists.substring(0, HFilterIdLists.length - 1));//瀵� URI 杩涜缂栫爜
+ HValue = encodeURI(HValue.substring(0, HValue.length - 1));//瀵� URI 杩涜缂栫爜
+ HElement_type = encodeURI(HElement_type.substring(0, HElement_type.length - 1));//瀵� URI 杩涜缂栫爜
+
+ layer.open({
+ type: 2
+ , area: ['80%', '80%']
+ , title: '杩囨护鏂规鍒楄〃'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../../绯荤粺绠＄悊/杩囨护鏂规璁剧疆/Xt_FastICSchemeList.html?HType=Select&HFilterIdLists=' + HFilterIdLists + '&HValue=' + HValue + '&HElement_type=' + HElement_type
+ , cancel: function () {
+ // 鍙充笂瑙掑叧闂簨浠剁殑閫昏緫
+ HIsClose_Manual = true;
+ }
+ , end: function () {
+ if (HIsClose_Manual != true) {
+ get_FastQuery()
+ form.render("select");
+ }
+ }
+ })
+ }
//#endregion
//浠ヤ笂鏄痩ayui妯″潡
});
+ // 杩囨护鏂规杩斿洖鏁版嵁
+ function HFilterScheme(obj) //杩斿洖杩囨护鏂规
+ {
+ var HInterID = obj[0].hmainid;
+ HInterID_Choose = obj[0].hmainid;
+ $.ajax({
+ url: GetWEBURL() + '/Xt_FastICScheme/Chooselist',
+ type: "GET",
+ data: { "user": sessionStorage["Czybm"], "HModuleName": "閲囪喘璁㈠崟", "HInterID": HInterID, "Type": "Select" },
+ success: function (data1) {
+ if (data1.count == 1) {
+ var data = data1.data;
+ //璧嬪�艰繃婊ゆ柟妗堝悕绉�
+ HDefaultFilter = data[0].鏂规鍚嶇О
+ var HRemark = data[0].澶囨敞
+ //鏄剧ず褰撳墠鐨勮繃婊ゆ柟妗�
+ document.getElementById("HFilterScheme_Now").style.display = "block";
+ document.getElementById('HFilterScheme_Now').innerHTML = "褰撳墠杩囨护鏂规锛�" + HDefaultFilter + '<span style="font-size: 15px; font-weight: bold; color:#7b90fb"> ' + "(" + HRemark + ")" + '</span>';
+ HInterID = data[0].hmainid
+ //鏍规嵁閫夋嫨鐨勮繃婊ゆ柟妗堝洖濉暟鎹埌鍒楄〃杩囨护鏉′欢
+ for (let i = 0; i < data.length; i++) {
+ $("#" + data[i].杩囨护瀛楁ID).val(data[i].杩囨护鍊�);
+ if (data[i].杩囨护鏍囩绫诲瀷 == 'SELECT') {
+ $("#" + data[i].杩囨护瀛楁ID).find("option[value='" + data[i].杩囨护鍊� + "']").attr("selected", true);
+ }
+ }
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
</script>
</body>
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\201\234\345\267\245\345\215\225/Sc_Add_MESStopWorkBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\201\234\345\267\245\345\215\225/Sc_Add_MESStopWorkBillList.html"
index 18b9cbc..bd830a4 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\201\234\345\267\245\345\215\225/Sc_Add_MESStopWorkBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\201\234\345\267\245\345\215\225/Sc_Add_MESStopWorkBillList.html"
@@ -633,18 +633,30 @@
success: function (data) {
if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
$("#HInterID").val(data.HInterID);//鑾峰彇鎻愪氦鎴愬姛杩斿洖鐨勫崟鎹富ID
- layer.confirm(data.Message, {
- btn: ['纭']
- }, function (index) {
- if (data.Verify == "Y") //鑷姩瀹℃牳
- {
- layer.close(index);
- SaveVerify(); //瀹℃牳
- }
- else {
- layer.close(index);
- }
+ layer.msg(data.Message, { time: 1 * 2000, icon: 1 }, function (index) {
+ //layer.close(layer.index);
+ //window.parent.location.reload();
});
+ if (data.Verify == "Y") //鑷姩瀹℃牳
+ {
+ layer.close(index);
+ SaveVerify(); //瀹℃牳
+ }
+ else {
+ layer.close(index);
+ }
+ //layer.confirm(data.Message, {
+ // btn: ['纭']
+ //}, function (index) {
+ // if (data.Verify == "Y") //鑷姩瀹℃牳
+ // {
+ // layer.close(index);
+ // SaveVerify(); //瀹℃牳
+ // }
+ // else {
+ // layer.close(index);
+ // }
+ //});
}
else {
layer.alert(data.Message, { icon: 5 })
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/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\261\207\346\212\245\345\215\225/Sc_Add_ICMOReportBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\261\207\346\212\245\345\215\225/Sc_Add_ICMOReportBillList.html"
index a8ee9af..f5422e8 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\261\207\346\212\245\345\215\225/Sc_Add_ICMOReportBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\261\207\346\212\245\345\215\225/Sc_Add_ICMOReportBillList.html"
@@ -1016,7 +1016,7 @@
for (let i = 0; i < data.length; i++) {
arr.push({
"HMaterID": data[i].鐗╂枡ID, "HMaterCode": data[i].鐗╂枡浠ｇ爜, "HMaterName": data[i].鐗╂枡鍚嶇О, "HMaterSpec": data[i].瑙勬牸鍨嬪彿,
- "HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HSourceID": data[i].鐢熶骇璧勬簮ID, "HSourceCode": data[i].鐢熶骇璧勬簮浠ｇ爜,
+ "HUnitID": data[i].鍗曚綅ID, "HUnitCode": data[i].璁￠噺鍗曚綅浠ｇ爜, "HUnitName": data[i].璁￠噺鍗曚綅, "HSourceID": data[i].鐢熶骇璧勬簮ID, "HSourceCode": data[i].鐢熶骇璧勬簮浠ｇ爜,
"HSourceName": data[i].鐢熶骇璧勬簮鍚嶇О, "HWorkerid": data[i].鎿嶄綔鍛業D, "HWorkerCode": data[i].鎿嶄綔鍛樹唬鐮�,
"HWorkerName": data[i].鎿嶄綔鍛樺悕绉�, "HQty": data[i].浜ч噺, "HBadQty": data[i].涓嶈壇鏁伴噺 == '' ? 0 : data[i].涓嶈壇鏁伴噺, "HICMOBillNo": data[i].鐢熶骇璁㈠崟鍙�,
"HICMOInterID": data[i].HICMOInterID, "HICMOEntryID": data[i].HICMOEntryID, "HRemark": "", "HSourceInterID": data[i].HICMOInterID, "HSourceEntryID": data[i].HICMOEntryID, "HSourceBillNo": data[i].鐢熶骇璁㈠崟鍙�,
diff --git "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Gy_UserByUser.html" "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Gy_UserByUser.html"
index 766f02a..4f69208 100644
--- "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Gy_UserByUser.html"
+++ "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Gy_UserByUser.html"
@@ -56,7 +56,7 @@
<div class="layui-input-inline">
<input type="text" name="UserName" id="UserName" readonly class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="UserID" id="UserID" class="layui-input" value="" style="float:left;width:150px;">
- <button type="button" lay-submit="" class="layui-btn" lay-filter="UserList" style="width:40px;">
+ <button type="button" lay-submit="" class="layui-btn" id="UserList" lay-filter="UserList" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
</div>
@@ -131,6 +131,7 @@
}
else if (OperationType == 3) {//缂栬緫
set_EditFromGrid(linterid);
+ $('#UserList').addClass("layui-btn-disabled").attr("disabled", true);
}
else {
layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
@@ -183,12 +184,24 @@
$("#UserID").val(checkStatus.data[0].HNumber);
$.ajax({
- url: GetWEBURL() + "/Xt_User/UserPlaylist",
+ url: GetWEBURL() + "Gy_UserByUserEdit",
type: "GET",
- data: { "HUserID": checkStatus.data[0].HNumber },
+ async: false,
+ data: { "HID": checkStatus.data[0].HNumber },
success: function (data) {
if (data.data != null && data.data != "") {
- option.data = data.data;
+ //option.data = data.data;
+ //table.render(option);
+ var arr = [];
+ for (var i = 0; i < data.data.h_v_Gy_UserByUserRelationList.length; i++) {
+ arr.push({
+ "HUserID2": data.data.h_v_Gy_UserByUserRelationList[i].HUserID2,
+ "HUserNumber2": data.data.h_v_Gy_UserByUserRelationList[i].鍏宠仈鐢ㄦ埛缂栫爜,
+ "HUserName2": data.data.h_v_Gy_UserByUserRelationList[i].鍏宠仈鐢ㄦ埛鍚嶇О,
+ });
+
+ }
+ option.data = arr;
table.render(option);
}
else {
@@ -243,7 +256,7 @@
//鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
console.log(checkStatus.data[0])
obj.update({
- HUserID2: checkStatus.data[0].HEmpID,
+ HUserID2: checkStatus.data[0].鐢ㄦ埛缂栫爜,
HUserNumber2: checkStatus.data[0].鐢ㄦ埛缂栫爜,
HUserName2: checkStatus.data[0].鐢ㄦ埛鍚嶇О
});
@@ -364,6 +377,49 @@
table.render(option);
}
+ //缂栬緫
+ function set_EditFromGrid(linterid) {
+
+ set_EditForm(linterid); //缂栬緫鑾峰彇琛ㄥご
+ }
+
+ //缂栬緫鍔犺浇琛ㄥご
+ function set_EditForm(linterid) {
+ //鏌ヨ妫�楠屾柟妗堝崟鏄惁瀛樺湪
+ $.ajax({
+ url: GetWEBURL() + "Gy_UserByUserEdit",
+ type: "GET",
+ data: {
+ "HID": linterid
+ },
+ success: function (result) {
+
+ if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data.h_v_Gy_UserByUserRelationList[0];
+ $("#UserID").val(data.鐢ㄦ埛浠ｇ爜);//鐢ㄦ埛浠ｇ爜
+ $("#UserName ").val(data.鐢ㄦ埛);//鐢ㄦ埛鍚嶇О
+
+ layui.form.render();//瀹炴椂娓叉煋閫変腑鍜屼笉閫変腑鐨勬牱寮�,鏈�濂芥坊鍔犺繖鍙ヨ瘽
+ } else {
+ layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ }
+ var arr = [];
+ for (var i = 0; i < result.data.h_v_Gy_UserByUserRelationList.length; i++) {
+ arr.push({
+ "HUserID2": result.data.h_v_Gy_UserByUserRelationList[i].HUserID2,
+ "HUserNumber2": result.data.h_v_Gy_UserByUserRelationList[i].鍏宠仈鐢ㄦ埛缂栫爜,
+ "HUserName2": result.data.h_v_Gy_UserByUserRelationList[i].鍏宠仈鐢ㄦ埛鍚嶇О,
+ });
+
+ }
+ option.data = arr;
+ table.render(option);
+ }, error: function () {
+ layer.alert("鍙戠敓閿欒!", { icon: 5 });
+ }
+ });
+ }
+
//澧炲姞涓�琛�
function btnAddLine(NewRow) {
var tableBak = table.cache["mainTable"]; //鑾峰彇涔嬪墠缂栬緫杩囩殑琛ㄦ牸鏁版嵁
diff --git "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Gy_UserByUserList.html" "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Gy_UserByUserList.html"
new file mode 100644
index 0000000..608e29b
--- /dev/null
+++ "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Gy_UserByUserList.html"
@@ -0,0 +1,665 @@
+锘�<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <title>鐢ㄦ埛鍏宠仈鐢ㄦ埛鍒楄〃</title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/HideButton.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
+
+
+</head>
+<body>
+ <div class="layui-fluid">
+ <div class="layui-col-md12">
+ <div class="layui-card" style="padding: 1px">
+ <div class="layui-card-body" style="padding: 1px;">
+
+ <form class="layui-form" action="" lay-filter="component-form-group">
+
+ <div class="layui-collapse">
+ <div class="layui-colla-item">
+ <div class="layui-colla-title layui-inline">
+ <div class="layui-inline">
+ <span>鏇村</span>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 60px;">鐢ㄦ埛浠ｇ爜</label>
+ <div class="layui-input-block" style="margin-left: 100px;">
+ <input type="text" class="layui-input" name="HUserID" id="HUserID">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 60px;">鐢ㄦ埛鍚嶇О</label>
+ <div class="layui-input-block" style="margin-left: 100px;">
+ <input type="text" class="layui-input" name="Czymc" id="Czymc">
+ </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="HUserID2" id="HUserID2">
+ </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="Czymc2" id="Czymc2">
+ </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>
+ <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" style="width:120px">
+ <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline" style="width:120px">
+ <select name="Comparator" id="Comparator" 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" style="width:120px">
+ <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <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-Add" id="AddButton"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit" id="EditButton"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete" id="DeleteButton"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn" id="HideButton"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideButton" id="HideButton"><i class="layui-icon layui-icon-form"></i>鎸夐挳璁剧疆</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit" id="ExitButton"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
+ </div>
+ </script>
+
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script>
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index', //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
+ //#region 鍏叡鍙橀噺
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , element = layui.element
+ , laypage = layui.laypage
+ , laydate = layui.laydate
+ //鏌ヨ鏉′欢
+ var sWhere = "";
+ var option = [];
+ var HModName = "Gy_UserByUserList";
+ //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ var titleData = ["HItemID", "HUserID", "HUserID2"];
+
+ //#endregion
+
+ //琛岀偣鍑�
+ table.on('row(mainTable)', function (obj) {
+ //閫変腑琛屾敼鍙橀鑹�
+ var flag = !obj.tr.find(':checkbox:first').prop('checked');
+ obj.tr.find(':checkbox').prop('checked', flag);
+ if (flag) {
+ obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked'); //璁剧疆澶嶉�夋閫変腑鏍峰紡
+ //$(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+ } else {
+ obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//鍙栨秷澶嶉�夋閫変腑鏍峰紡
+ //$(obj.tr.selector).attr({ "style": "background:" });//鍙栨秷褰撳墠tr棰滆壊
+ }
+ //mainTable 涓鸿〃鏍糏D 娉ㄦ剰姝ゅ濡傛灉ID涓嶆纭皢瀵艰嚧浣犲湪鐩戝惉澶嶉�夋鏃惰幏鍙栦笉鍒颁綘閫夋嫨鐨勬暟鎹紝鍓嶉潰鐨勫彧鏄坊鍔犳垨鍒犻櫎閫変腑鏈�変腑鏍峰紡浠ュ強璁剧疆鑳屾櫙鑹诧紝瀛椾綋棰滆壊
+ layui.each(table.cache.mainTable, function (i, l) {
+ if (obj.tr.index() == l.LAY_TABLE_INDEX) {
+ l.LAY_CHECKED = flag;
+ }
+ });
+ })
+
+
+ //#region 杩涘叆椤甸潰鏃㈠姞杞�
+ //鍒濆鍖栫晫闈�
+ set_ClearBill();
+ //#endregion
+
+ //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+ //澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(mainTable)', function (obj) {
+ var checkStatus = table.checkStatus(obj.config.id);
+ switch (obj.event) {
+ //鏂板
+ case 'btn-Add': set_AddNew();
+ break;
+ //缂栬緫
+ case 'btn-Edit': set_ShowBill();
+ break;
+ //鍒犻櫎
+ case 'btn-Delete': set_DeleteBill();
+ break;
+ ////鍒锋柊
+ //case 'get_Refresh': get_Refresh();
+ // break;
+ //閫�鍑烘寜閽�
+ case 'get_Exit': Pub_Close(2);
+ break;
+ //鍒楄缃�
+ case 'set_HideColumn': get_HideColumn();
+ break;
+ case 'set_HideButton':
+ var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+ var HBillType = "Gy_UserByUserList";
+ get_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
+ break;
+ };
+ });
+ //鏌ヨ鎸夐挳
+ form.on('submit(btnSearch)', function (data) {
+ get_FastQuery();
+ });
+ // 閲嶇疆鎸夐挳
+ form.on('submit(btnReSearch)', function (data) {
+ set_ClearQuery();
+ });
+ //#endregion
+
+
+ //#region 姝ら〉闈㈡墍鏈夋柟娉�
+ // 鍒濆鍖栫晫闈�
+ function set_ClearBill() {
+ //鍒濆鍖栬〃鏍�
+ set_InitGrid();
+ //鏌ヨ
+ get_Display(sWhere);
+ }
+ //鍒濆鍖栬〃鏍�
+ function set_InitGrid() {
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , height: 'full-50'
+ , page: true
+ , limits: [50, 500, 5000, 50000]
+ , limit: 50
+ , cellMinWidth: 90
+
+ };
+ }
+ //鏌ヨ
+ function get_Display(sWhere) {
+ var index = layer.load(0, { shade: false });
+ var ajaxLoad = layer.load();
+ //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+ $.ajax({
+ url: GetWEBURL() + '/Xt_User/Gy_UserByUserList',
+ type: "GET",
+ async:false,
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.count == 1) {
+ var data = [];
+ var col = [];
+ //缁欑┖鐨勬暟缁勮祴鍊�
+ for (var key in data1.list) {
+ data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+ }
+ //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+ col.push({ type: 'checkbox', fixed: 'left' });
+ for (var i = 0; i < data.length; i++) {
+ // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
+ if ($.inArray(data[i].name, titleData) > -1) {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+ }
+ else {
+ switch (data[i].Type) {
+ //int
+ case 'DateTime':
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
+ break;
+ default:
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+ }
+ }
+ }
+
+ //鍔ㄦ�佹樉绀哄垪鍚�
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , cols: [col]
+ , data: data1.data
+ , height: 'full-80'
+ , page: true
+ , limits: [50, 500, 5000, 50000]
+ , limit: 50
+ , cellMinWidth: 90
+ }
+ table.render(option);
+ //鍒锋柊鎸夐挳鏄剧ず
+ var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+ var HBillType = "Gy_UserByUserList";
+ Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
+
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
+
+ layer.close(ajaxLoad);
+ if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+ ColFilter();
+ }
+
+ //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ layer.close(index);
+ }
+ //蹇�熸煡璇�
+ function get_FastQuery() {
+ var HUserID = $("#HUserID").val();
+ var Czymc = $("#Czymc").val();
+ var HUserID2 = $("#HUserID2").val();
+ var Czymc2 = $("#Czymc2").val();
+ var ColName = $("#ColName").val();//澶嶉�夋
+ var Comparator = $("#Comparator").val()
+ var ColContent = $("#ColContent").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 (HUserID) {
+ sWhere += " and 鐢ㄦ埛浠ｇ爜 like '%" + HUserID + "%'";
+ }
+ if (Czymc) {
+ sWhere += " and 鐢ㄦ埛 like '%" + Czymc + "%'";
+ }
+ if (HUserID2) {
+ sWhere += " and 鍏宠仈鐢ㄦ埛缂栫爜 like '%" + HUserID2 + "%'";
+ }
+ if (Czymc2) {
+ sWhere += " and 鍏宠仈鐢ㄦ埛鍚嶇О like '%" + Czymc2 + "%'";
+ }
+ get_Display(sWhere);
+ sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ }
+ //閲嶇疆蹇�熸煡璇�
+ function set_ClearQuery() {
+ $("#HUserID").val("");
+ $("#Czymc").val("");
+ $("#HNumber").val("");
+ $("#HName").val("");
+ $("#btnSearch").click();
+ $("#ColContent").val("");
+ $("#ColName").val("0");
+ $("#Comparator").val("0");
+ form.render('select');
+
+ sWhere = "";
+ }
+ //鍒锋柊
+ //function get_Refresh() {
+ // $("#btnSearch").trigger('click');
+ //}
+ //鏂板
+ function set_AddNew() {
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '鏂板鐢ㄦ埛鍏宠仈鐢ㄦ埛',
+ closeBtn: 1,
+ shift: 2,
+ area: ['100%', '100%'],
+ maxmin: true,
+ content: '../鐢ㄦ埛绠＄悊/Gy_UserByUser.html?OperationType=1&linterid=&HSouceBillType=',
+ end: function () {
+ //鍒锋柊椤甸潰,
+ location.reload();
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ }
+ //缂栬緫
+ function set_ShowBill() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var hID = data[0].鐢ㄦ埛浠ｇ爜.toString();
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '缂栬緫鐢ㄦ埛鍏宠仈鐢ㄦ埛'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../鐢ㄦ埛绠＄悊/Gy_UserByUser.html?OperationType=3&linterid=' + hID + '&HSouceBillType='
+ , resize: false,
+ end: function () {
+ //鍒锋柊椤甸潰,
+ location.reload();
+ }
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+
+ } else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+ }
+ }
+ //鍒犻櫎
+ function set_DeleteBill() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var HItemID = data[0].HItemID.toString();
+ //閫昏緫鍒犻櫎鏂规硶
+ layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "Xt_User/Gy_UserByUserListDrop", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HItemID": HItemID, "user": sessionStorage["HUserName"]},
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ window.location.reload();
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ })
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+ }
+ }
+ //#endregion
+
+
+
+ ////#region 鍙嶅鏍�/瀹℃牳鏁版嵁
+ //function set_CheckBill(num) {
+ // var checkStatus = table.checkStatus('mainTable')
+ // , data = checkStatus.data;
+ // if (checkStatus.data.length === 1) {
+ // var InterID = data[0].HItemID.toString();
+ // //閫昏緫瀹℃牳鏂规硶
+ // $.ajax({
+ // type: "GET",
+ // url: GetWEBURL() + "/Gy_BadReason/AuditGy_InspectValue", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ // data: { "HInterID": InterID, "IsAudit": num, "CurUserName": sessionStorage["HUserName"] },
+ // success: function (result) {
+ // if (result.count == 1) {
+ // layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // // 寰楀埌frame绱㈠紩
+ // var index = layer.getFrameIndex(window.name);
+ // //鍏抽棴褰撳墠frame
+ // layer.close(index);
+ // //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ // $("#btnSearch").trigger('click');
+ // });
+
+ // } else {
+ // layer.alert(result.code + result.Message, { icon: 5 });
+ // }
+ // }, error: function () {
+ // layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ // }
+ // });
+ // }
+ // else {
+ // layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+ // }
+ //}
+ ////#endregion
+
+ ////#region 鍙嶇鐢�/绂佺敤鏁版嵁
+ //function set_De_Stop(num) {
+ // var checkStatus = table.checkStatus('mainTable')
+ // , data = checkStatus.data;
+ // if (checkStatus.data.length === 1) {
+ // var InterID = data[0].HItemID.toString();
+ // //閫昏緫瀹℃牳鏂规硶
+ // $.ajax({
+ // type: "GET",
+ // url: GetWEBURL() + "/Gy_BadReason/StopGy_InspectValue", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ // data: { "HInterID": InterID, "IsStop": num, "CurUserName": sessionStorage["HUserName"] },
+ // success: function (result) {
+ // if (result.count == 1) {
+ // layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // // 寰楀埌frame绱㈠紩
+ // var index = layer.getFrameIndex(window.name);
+ // //鍏抽棴褰撳墠frame
+ // layer.close(index);
+ // //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ // $("#btnSearch").trigger('click');
+ // });
+
+ // } else {
+ // layer.alert(result.code + result.Message, { icon: 5 });
+ // }
+ // }, error: function () {
+ // layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ // }
+ // });
+ // }
+ // else {
+ // layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+ // }
+ //}
+ ////#endregion
+
+
+
+ //#region 闅愯棌鍒楄缃�
+ function get_HideColumn() {
+ var colName = "";
+ var contentUrl = "";
+ for (var i = 1; i < option.cols[0].length; i++) {
+ colName += option.cols[0][i]["title"] + ",";
+ }
+ var urlStr = window.document.location.pathname;//鑾峰彇鏂囦欢璺緞
+ var urlLen = urlStr.split('/');
+ for (var i = 0; i < urlLen.length - 4; i++) {
+ contentUrl += "../";
+ }
+ colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+
+ contentUrl += '鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName;
+
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "闅愯棌鍒楄缃�" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["50%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: [contentUrl, "yes"]
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ })
+ }
+ //#endregion
+ //#region 鏄剧ず鍒楁暟鎹�
+ function DisPlay_HideColumn() {
+ $.ajax({
+ url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+ type: "GET",
+ async: false,
+ data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.data.length != 0) {
+
+ var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+ //var titleData = ["鍗曟嵁ID", "HMouldID", "hsubid", "HManagerID", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+
+ dataCol = data1.data[0].HGridString.split(',');
+
+ for (var i = 0; i < option.cols[0].length - 1; i++) {
+ var dataCols = dataCol[i].split('|');
+ //闅愯棌鍒�
+ if (dataCols[1] == 1) {
+ option.cols[0][i + 1]["hide"] = true;
+ }
+ //璁剧疆鍒楀
+ if (dataCols[3] > 0) {
+ option.cols[0][i + 1]["width"] = dataCols[3];
+ }
+ //璁剧疆鍐呭瀛椾綋澶у皬
+ if (data1.data[0].HFontSize != 0) {
+ option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+ } else {
+ option.cols[0][i + 1]["style"] = "font-size:100%";
+ }
+ //璁剧疆鍒楀
+ //if (data1.data[0].HColumnWidth != 0) {
+ // option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
+ //} else {
+ // option.cols[0][i + 1]["width"] = "";
+ //}
+ //鏄剧ず鍒�
+ if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
+ option.cols[0][i + 1]["hide"] = false;
+ }
+ //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+ switch (dataCols[2]) {
+ case "L":
+ option.cols[0][i + 1]["align"] = "left";
+ break;
+ case "M":
+ option.cols[0][i + 1]["align"] = "center";
+ break;
+ case "R":
+ option.cols[0][i + 1]["align"] = "right";
+ break;
+ }
+ }
+
+ //鍙栨秷鍐荤粨鍒�
+ for (var i = 1; i < option.cols[0].length - 1; i++) {
+ if (option.cols[0][i]["fixed"] != null) {
+ option.cols[0][i]["fixed"] = null;
+ }
+ else {
+ break;
+ }
+ }
+ //鍐荤粨鍒�
+ if (data1.data[0].HFixCols != 0) {
+ for (var i = 0; i < data1.data[0].HFixCols; i++) {
+ if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
+ data1.data[0].HFixCols += 1;
+ }
+ option.cols[0][i + 1]["fixed"] = "left";
+ }
+ }
+ table.render(option);
+ } else {
+ table.render(option);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ })
+ }
+ //#endregion
+
+ //#region 鍒楁槑鏄剧ず涓嬫媺妗�
+ function ColFilter() {
+ var Organization = '<option value="0" selected="selected" ></option>';
+ for (var i = 1; i < option.cols[0].length; i++) {
+ if (option.cols[0][i].hide != true) {
+ Organization += '<option style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>';
+ }
+ }
+ $("#ColName").empty();
+ $("#ColName").append(Organization);
+ form.render('select');
+ }
+ //#endregion
+
+ //浠ヤ笂鏄痩ayui妯″潡
+ });
+ </script>
+
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\350\277\207\346\273\244\346\226\271\346\241\210\350\256\276\347\275\256/Xt_FastICScheme.html" "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\350\277\207\346\273\244\346\226\271\346\241\210\350\256\276\347\275\256/Xt_FastICScheme.html"
new file mode 100644
index 0000000..f8c95fd
--- /dev/null
+++ "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\350\277\207\346\273\244\346\226\271\346\241\210\350\256\276\347\275\256/Xt_FastICScheme.html"
@@ -0,0 +1,203 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+ <meta charset="utf-8" />
+ <title>杩囨护鏂规</title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <style type="text/css">
+ .layui-form-label {
+ width: 85px;
+ }
+ </style>
+</head>
+<body>
+ <div id="layout1" class="layui-fluid">
+ <div class="layui-row layui-col-space15">
+ <div class="layui-col-md12">
+ <div class="layui-card">
+ <form id="form0" class="layui-form" lay-filter="component-form-group" action="">
+ <div class="layui-card-header">
+ <div class="layui-btn-group">
+ <button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
+ <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit" style="margin-left:5px !important;">閫�鍑�</button>
+ </div>
+ </div>
+ <div class="layui-card-body">
+ <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
+ <div class="layui-tab-content">
+ <div class="layui-tab-item layui-show">
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label">鏂规鍚嶇О锛�</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HName" lay-verify="HName" id="HName">
+ <input id="HInterID" name="HInterID" type="hidden" />
+ <input id="HUserCode" name="HUserCode" type="hidden" />
+ <input id="HCreateDate" name="HCreateDate" type="hidden" />
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">妯″潡鍚嶇О锛�</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HBillName" lay-verify="HBillName" id="HBillName" style="background-color:#eeebeb" readonly>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">澶囨敞锛�</label>
+ <div class="layui-input-inline">
+ <textarea placeholder="璇疯緭鍏ュ娉�" class="layui-textarea" name="HRemark" id="HRemark"></textarea>
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">榛樿鏍囪</label>
+ <div class="layui-input-block">
+ <input type="checkbox" name="HUseingFlag" id="HUseingFlag" lay-skin="primary" title="">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">绂佺敤鏍囧織</label>
+ <div class="layui-input-block">
+ <input type="checkbox" name="HStopflag" id="HStopflag" lay-skin="primary" title="">
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <script>
+ //鑾峰彇鍙傛暟
+ function getUrlVars() {
+ var vars = [], hash;
+ var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
+ for (var i = 0; i < hashes.length; i++) {
+ hash = hashes[i].split('=');
+ vars.push(hash[0]);
+ vars[hash[0]] = hash[1];
+ }
+ return vars;
+ }
+
+ var params = getUrlVars();
+ var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
+ var HModuleName = params[params[1]];//妯″潡鍚嶇О
+ var HFilterIdLists = params[params[2]];//杩囨护鏉′欢ID
+ var HValue = params[params[3]];//杩囨护鏉′欢涓緭鍏ョ殑鍊�
+ var HElement_type = params[params[4]];//閫氳繃鏍囩id鑾峰彇鏍囩绫诲瀷
+
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index' //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , laydate = layui.laydate
+ , element = layui.element;
+
+ //甯歌鐢ㄦ硶
+ HModuleName = getParams("HModuleName");
+ HFilterIdLists = getParams("HFilterIdLists");
+ HValue = getParams("HValue");
+ HElement_type = getParams("HElement_type");
+ $("#HBillName").val(HModuleName);
+
+ //灏唘rl鍙傛暟涓殑涓枃涔辩爜閲嶆柊杞崲鎴愪腑鏂�
+ function getParams(key) {
+ var reg = new RegExp("(^|&)" + key + "=([^&]*)(&|$)");
+ //濡傛灉鍦板潃鏍忎腑鍑虹幇涓枃鍒欒繘琛岀紪鐮�
+ var r = encodeURI(window.location.search).substr(1).match(reg);
+ if (r != null) {
+ //灏嗕腑鏂囩紪鐮佺殑瀛楃閲嶆柊鍙樻垚涓枃
+ return decodeURI(unescape(r[2]));
+ }
+ return null;
+ };
+
+ if (OperationType == 1) {
+ $("#HInterID").val("");
+
+ //鑾峰彇鏈�澶у崟鎹彿
+ $.ajax({
+ url: GetWEBURL() + "/Web/GetMAXNum",
+ type: "GET",
+ data: { "HBillType": '3332' },
+ success: function (d) {
+ //console.log(d.data);
+ $("#HInterID").val(d.data[0].HInterID);
+ $("#HCreateDate").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HUserCode").val(sessionStorage["Czybm"]);
+ }
+ });
+ }
+ //#region 澶撮儴宸ュ叿鏍忎簨浠�
+
+ //淇濆瓨
+ form.on('submit(Saver)', function (data) {//淇濆瓨
+ var isUseCheck = document.getElementById("HUseingFlag").checked;
+ var isStopCheck = document.getElementById("HStopflag").checked;
+ data.field.HUseingFlag = isUseCheck;//灏嗘暟缁勫悎骞舵垚瀛楃涓�
+ data.field.HStopflag = isStopCheck;//灏嗘暟缁勫悎骞舵垚瀛楃涓�
+ var oMain = JSON.stringify(data.field)
+
+ var sMainSub = oMain + ';' + HFilterIdLists + ';' + HValue + ';' + HElement_type + ';' + sessionStorage["Czybm"] + ';' + OperationType;
+ $.ajax(
+ {
+ type: "POST",
+ url: GetWEBURL() + "/Xt_FastICScheme/save", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: true,
+ data: { "oMain": sMainSub },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ sessionStorage["HFilterSchemeName_" + sessionStorage["Czybm"]] = $("#HName").val();
+ sessionStorage["HFilterSchemeRemark_" + sessionStorage["Czybm"]] = $("#HRemark").val();
+ layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
+ $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
+ var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
+ parent.layer.close(index); //鍐嶆墽琛屽叧闂�
+ });
+ }
+ else {
+ f_alert(data.Message);
+ }
+ layer.closeAll("loading");
+ },
+ error: function (err) {
+
+ f_alert("閿欒:" + err);
+ }
+ });
+ });
+ //閫�鍑烘寜閽�
+ form.on('submit(Exit)', function () {
+ Pub_Close(1);
+ })
+ //#endregion
+
+ function f_alert(sMsg) {
+ layer.alert(sMsg, { icon: 5 });
+
+ }
+ });
+ </script>
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\350\277\207\346\273\244\346\226\271\346\241\210\350\256\276\347\275\256/Xt_FastICSchemeList.html" "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\350\277\207\346\273\244\346\226\271\346\241\210\350\256\276\347\275\256/Xt_FastICSchemeList.html"
new file mode 100644
index 0000000..b3c8020
--- /dev/null
+++ "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\350\277\207\346\273\244\346\226\271\346\241\210\350\256\276\347\275\256/Xt_FastICSchemeList.html"
@@ -0,0 +1,513 @@
+锘�<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <title>杩囨护鏂规鍒楄〃</title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/HideButton.js"></script>
+
+</head>
+<body>
+ <div class="layui-fluid">
+ <div class="layui-col-md12">
+ <div class="layui-card" style="padding: 1px">
+ <div class="layui-card-body" style="padding: 1px;">
+
+ <form class="layui-form" action="" lay-filter="component-form-group">
+
+ <div class="layui-collapse">
+ <div class="layui-colla-item">
+
+ </div>
+ </div>
+ <table class="" id="mainTable" lay-filter="mainTable"> </table>
+ <script type="text/html" id="toolbarDemo">
+ <div class="layui-btn-container">
+ <button type="button" lay-submit="" class="layui-btn layui-btn-sm" lay-event="btnAdd" id="btn-Add"><i class="layui-icon layui-icon-form"></i>鏂板</button>
+ <button type="button" lay-submit="" class="layui-btn layui-btn-sm" lay-event="btndelete" id="btn-Delete"><i class="layui-icon layui-icon-form"></i>鍒犻櫎</button>
+ <button type="button" lay-submit="" class="layui-btn layui-btn-sm" lay-event="btnExit" id="btn-Exit"><i class="layui-icon layui-icon-form"></i>閫�鍑�</button>
+ </div>
+ </script>
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
+
+ <script>
+ function getUrlVars() {
+ var vars = [], hash;
+ var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
+ for (var i = 0; i < hashes.length; i++) {
+ hash = hashes[i].split('=');
+ vars.push(hash[0]);
+ vars[hash[0]] = hash[1];
+ }
+ return vars;
+ }
+ var params = getUrlVars();
+ var Type = params[params[0]];
+
+ HFilterIdLists + '&HValue=' + HValue + '&HElement_type=' + HElement_type
+
+
+ var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
+ var HFilterIdLists = params[params[1]];//杩囨护鏉′欢ID
+ var HValue = params[params[2]];//杩囨护鏉′欢涓緭鍏ョ殑鍊�
+ var HElement_type = params[params[3]];//閫氳繃鏍囩id鑾峰彇鏍囩绫诲瀷
+
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index', //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
+ //#region 鍏叡鍙橀噺
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , element = layui.element
+ , laypage = layui.laypage
+ , laydate = layui.laydate
+ //鏌ヨ鏉′欢
+ var sWhere = "";
+ var option = [];
+ var Organization = sessionStorage["Organization"]
+ var HModName = "Xt_FastICSchemeList";
+ //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ var titleData = ["hmainid", "杩囨护瀛楁ID", "杩囨护鏍囩绫诲瀷","杩囨护鍊�"];
+ //#endregion
+
+ //#region 杩涘叆椤甸潰鏃㈠姞杞�
+ //鍒濆鍖栫晫闈�
+ set_ClearBill();
+ //#endregion
+
+ //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢
+ //澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(mainTable)', function (obj) {
+ var checkStatus = table.checkStatus(obj.config.id);
+ switch (obj.event) {
+ //鏂板
+ case 'btnAdd': set_AddNew();
+ break;
+ //鍒犻櫎
+ case 'btndelete': set_DeleteBill();
+ break;
+ //閫�鍑�
+ case 'btnExit': set_Exit();
+ break;
+ };
+ });
+
+ //琛岀洃鍚簨浠�
+ table.on('row(mainTable)', function (obj) {
+ var flag = !obj.tr.find(':checkbox:first').prop('checked');
+ obj.tr.find(':checkbox').prop('checked', flag);
+ if (flag) {
+ obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked'); //璁剧疆澶嶉�夋閫変腑鏍峰紡
+ $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+ } else {
+ obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//鍙栨秷澶嶉�夋閫変腑鏍峰紡
+ $(obj.tr.selector).attr({ "style": "background:" });//鍙栨秷褰撳墠tr棰滆壊
+ }
+ //mainTable 涓鸿〃鏍糏D 娉ㄦ剰姝ゅ濡傛灉ID涓嶆纭皢瀵艰嚧浣犲湪鐩戝惉澶嶉�夋鏃惰幏鍙栦笉鍒颁綘閫夋嫨鐨勬暟鎹紝鍓嶉潰鐨勫彧鏄坊鍔犳垨鍒犻櫎閫変腑鏈�変腑鏍峰紡浠ュ強璁剧疆鑳屾櫙鑹诧紝瀛椾綋棰滆壊
+ layui.each(table.cache.mainTable, function (i, l) {
+ if (obj.tr.index() == l.LAY_TABLE_INDEX) {
+ l.LAY_CHECKED = flag;
+ }
+ });
+ });
+
+ //#region 鍙屽嚮杩斿洖鏁版嵁
+ table.on('rowDouble(mainTable)', function (obj) {
+ var data = [];
+ data.push(obj.data);
+ switch (Type) {
+ case "HFilterScheme": //杩斿洖杩囨护鏂规
+ parent.HFilterScheme(data);
+ break;
+ default:
+ parent.HFilterScheme(data); //杩斿洖 瀹㈡埛
+ }
+ var index = parent.layer.getFrameIndex(window.name);
+ parent.layer.close(index);
+ });
+ //#endregion
+
+ //閲嶇疆鎸夐挳
+ form.on('submit(btnReSearch)', function (data) {
+ set_ClearQuery();
+ });
+ //鏌ヨ鎸夐挳
+ form.on('submit(btnSearch)', function (data) {
+ get_FastQuery();
+ });
+ //#region 閲嶆柊鍚屾鎸夐挳
+ form.on('submit(btnResCnz)', function (data) {
+ set_ResCnz();
+ });
+ //#endregion
+ //#endregion
+
+
+ //#region 姝ら〉闈㈡墍鏈夋柟娉�
+ //鍒濆鍖栭〉闈�
+ function set_ClearBill() {
+ //鍒濆鍖栬〃鏍�
+ set_InitGrid();
+ //鏌ヨ
+ get_Display(sWhere);
+ }
+ //鍒濆鍖栬〃鏍�
+ function set_InitGrid() {
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , height: 'full-50'
+ , page: true
+ , limits: [50, 500, 5000, 50000]
+ , limit: 50
+ , cellMinWidth: 90
+ };
+ }
+ //鏌ヨ
+ function get_Display(sWhere) {
+ var index = layer.load(0, { shade: false });
+ var ajaxLoad = layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/Xt_FastICScheme/list',
+ type: "GET",
+ data: { "user": sessionStorage["Czybm"], "HModuleName": "閲囪喘璁㈠崟" },
+ success: function (data1) {
+ if (data1.count == 1) {
+ var data = [];
+ var col = [];
+ //缁欑┖鐨勬暟缁勮祴鍊�
+ for (var key in data1.list) {
+ data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+ }
+ //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+ col.push({ type: 'checkbox', fixed: 'left' });
+ for (var i = 0; i < data.length; i++) {
+ // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
+ if ($.inArray(data[i].name, titleData) > -1) {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+ }
+ else {
+ switch (data[i].Type) {
+ //int
+ case 'DateTime':
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
+ break;
+ default:
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+ }
+ }
+ }
+
+ //鍔ㄦ�佹樉绀哄垪鍚�
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , cols: [col]
+ , data: data1.data
+ , height: 'full-80'
+ , page: true
+ , limits: [50, 500, 5000, 50000]
+ , limit: 50
+ , cellMinWidth: 90
+ }
+ table.render(option);
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
+
+ layer.close(ajaxLoad);
+ if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+ ColFilter();
+ }
+ //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ layer.close(index);
+ }
+ //蹇�熺瓫閫�
+ function get_FastQuery() {
+ var HNumber = $("#HNumber").val();
+ var HName = $("#HName").val();
+ var ColName = $("#ColName").val();//澶嶉�夋
+ var Comparator = $("#Comparator").val()
+ var ColContent = $("#ColContent").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 (HNumber) {
+ sWhere += " and 渚涘簲鍟嗕唬鐮� like '%" + HNumber + "%'";
+ }
+ if (HName) {
+ sWhere += " and 渚涘簲鍟嗗悕绉� like '%" + HName + "%'";
+ }
+ get_Display(sWhere);
+ sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ }
+ // 閲嶇疆鎸夐挳
+ function set_ClearQuery() {
+ $("#HNumber").val("");
+ $("#HName").val("");
+ $("#btnSearch").click();
+ $("#ColContent").val("");
+ $("#ColName").val("0");
+ $("#Comparator").val("0");
+ form.render('select');
+
+ sWhere = "";
+ }
+
+ // 鍒犻櫎鎸夐挳
+ function set_DeleteBill() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length > 0) {
+
+ var hmainid = "";
+ for (let i = 0; i < data.length; i++) {
+ hmainid += data[i].hmainid + ",";
+ }
+ //瀵规暟缁勮繘琛岀紪鐮�
+ hmainid = encodeURI(hmainid.substring(0, hmainid.length - 1));//瀵� URI 杩涜缂栫爜
+
+ layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+ var wait = layer.load();
+ //閫昏緫鍒犻櫎鏂规硶
+ $.ajax({
+ url: GetWEBURL() + '/Xt_FastICScheme/DeltetXt_FastICScheme',
+ type: "GET",
+ data: { "HInterID": hmainid, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(wait);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ window.location.reload();
+ });
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ layer.close(wait);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ layer.close(wait);
+ }
+ });
+ })
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+ }
+ }
+
+ //鏂板鎸夐挳
+ function set_AddNew() {
+ layer.open({
+ type: 2
+ , area: ['40%', '80%']
+ , title: '杩囨护鏂规'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../../绯荤粺绠＄悊/杩囨护鏂规璁剧疆/Xt_FastICScheme.html?OperationType=1&HModuleName=閲囪喘璁㈠崟&HFilterIdLists=' + HFilterIdLists + '&HValue=' + HValue + '&HElement_type=' + HElement_type
+ , cancel: function () {
+ // 鍙充笂瑙掑叧闂簨浠剁殑閫昏緫
+ HIsClose_Manual = true;
+ }
+ , end: function () {
+ if (HIsClose_Manual != true) {
+ get_FastQuery();
+ }
+ }
+ })
+ }
+ //閫�鍑烘寜閽�
+ function set_Exit() {
+ Pub_Close(1);
+ }
+
+
+ //#endregion
+
+ //#region 闅愯棌鍒楄缃�
+ function get_HideColumn() {
+ var colName = "";
+ var contentUrl = "";
+ for (var i = 1; i < option.cols[0].length - 1; i++) {
+ colName += option.cols[0][i]["title"] + ",";
+ }
+ var urlStr = window.document.location.pathname;//鑾峰彇鏂囦欢璺緞
+ var urlLen = urlStr.split('/');
+ for (var i = 0; i < urlLen.length - 4; i++) {
+ contentUrl += "../";
+ }
+ colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+
+ contentUrl += '鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName;
+
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "闅愯棌鍒楄缃�" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["50%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: [contentUrl, "yes"]
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ })
+ }
+ //#endregion
+ //#region 鏄剧ず鍒楁暟鎹�
+ function DisPlay_HideColumn() {
+ $.ajax({
+ url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+ type: "GET",
+ data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.data.length != 0) {
+
+ var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+ //var titleData = ["鍗曟嵁ID", "HMouldID", "hsubid", "HManagerID", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+
+ dataCol = data1.data[0].HGridString.split(',');
+
+ for (var i = 0; i < option.cols[0].length - 2; i++) {
+ var dataCols = dataCol[i].split('|');
+ //闅愯棌鍒�
+ if (dataCols[1] == 1) {
+ option.cols[0][i + 1]["hide"] = true;
+ }
+ //璁剧疆鍒楀
+ if (dataCols[3] > 0) {
+ option.cols[0][i + 1]["width"] = dataCols[3];
+ }
+ //璁剧疆鍐呭瀛椾綋澶у皬
+ if (data1.data[0].HFontSize != 0) {
+ option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+ } else {
+ option.cols[0][i + 1]["style"] = "font-size:100%";
+ }
+ //璁剧疆鍒楀
+ //if (data1.data[0].HColumnWidth != 0) {
+ // option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
+ //} else {
+ // option.cols[0][i + 1]["width"] = "";
+ //}
+ //鏄剧ず鍒�
+ if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
+ option.cols[0][i + 1]["hide"] = false;
+ }
+ //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+ switch (dataCols[2]) {
+ case "L":
+ option.cols[0][i + 1]["align"] = "left";
+ break;
+ case "M":
+ option.cols[0][i + 1]["align"] = "center";
+ break;
+ case "R":
+ option.cols[0][i + 1]["align"] = "right";
+ break;
+ }
+ }
+
+ //鍙栨秷鍐荤粨鍒�
+ for (var i = 1; i < option.cols[0].length - 1; i++) {
+ if (option.cols[0][i]["fixed"] != null) {
+ option.cols[0][i]["fixed"] = null;
+ }
+ else {
+ break;
+ }
+ }
+ //鍐荤粨鍒�
+ if (data1.data[0].HFixCols != 0) {
+ for (var i = 0; i < data1.data[0].HFixCols; i++) {
+ if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
+ data1.data[0].HFixCols += 1;
+ }
+ option.cols[0][i + 1]["fixed"] = "left";
+ }
+ }
+ table.render(option);
+ } else {
+ table.render(option);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ })
+ }
+ //#endregion
+
+ //#region 鍒楁槑鏄剧ず涓嬫媺妗�
+ function ColFilter() {
+ var Organization = '<option value="0" selected="selected" ></option>';
+ for (var i = 1; i < option.cols[0].length; i++) {
+ if (option.cols[0][i].hide != true) {
+ Organization += '<option style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>';
+ }
+ }
+ $("#ColName").empty();
+ $("#ColName").append(Organization);
+ form.render('select');
+ }
+ //#endregion
+ //浠ヤ笂鏄痩ayui妯″潡
+ });
+
+ </script>
+
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_Add_Edit_PatrolProcCheckBill.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_Add_Edit_PatrolProcCheckBill.html"
index aa65243..5eb0d36 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_Add_Edit_PatrolProcCheckBill.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_Add_Edit_PatrolProcCheckBill.html"
@@ -93,6 +93,13 @@
<input type="text" name="HMainProcName" id="HMainProcName" onkeyup="this.value=this.value.replace(/\D/g,'')" lay-verify="" autocomplete="off" class="layui-input" value="">
</div>
</div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鍒ゆ柇缁撹</label>
+ <div class="layui-input-block">
+ <input type="radio" name="HLastResult" id="HLastResult" value="1" title="鍚堟牸" checked>
+ <input type="radio" name="HLastResult" id="HLastResult" value="0" title="涓嶅悎鏍�">
+ </div>
+ </div>
<div class="layui-colorpicker-xs" style="margin-top:15px">
<label class="layui-form-label"> 澶囨敞</label>
<div class="layui-input-block">
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_PatrolProcCheckBillList.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_PatrolProcCheckBillList.html"
index 2d224e5..0e6b1b6 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_PatrolProcCheckBillList.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_PatrolProcCheckBillList.html"
@@ -37,101 +37,97 @@
</div>
<!--绗竴灞傝繃婊�-->
<div class="layui-inline">
- <label class="layui-form-label">鍗曟嵁鍙�</label>
- <div class="layui-input-block" style="width:120px">
+ <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="HBillNo" id="HBillNo">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">寮�濮嬫棩鏈�</label>
- <div class="layui-input-block" style="width:120px">
+ <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="HDate1" id="HDate1">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">缁撴潫鏃ユ湡</label>
- <div class="layui-input-block" style="width:120px">
+ <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="HDate2" id="HDate2">
</div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">鍒ゅ畾缁撹</label>
- <div class="layui-input-block" style="width:120px">
- <select name="HLastResult" id="HLastResult" lay-verify="HLastResult">
- <option value=""></option>
- <option value="鍚堟牸">鍚堟牸</option>
- <option value="涓嶅悎鏍�">涓嶅悎鏍�</option>
- </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>
<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-colla-content">
+ <!--绗簩鎺掕繃婊�-->
+ <div class="layui-row" >
<div class="layui-inline">
- <label class="layui-form-label">鐗╂枡缂栫爜</label>
- <div class="layui-input-block" style="width:120px">
+ <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="HNumber" id="HNumber">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">鐗╂枡鍚嶇О</label>
- <div class="layui-input-block" style="width:120px">
+ <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="HName" id="HName">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">瑙勬牸鍨嬪彿</label>
- <div class="layui-input-block" style="width:120px">
+ <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="HModel" id="HModel">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">璐ㄦ鍛�</label>
- <div class="layui-input-block" style="width:120px">
+ <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="HName1" id="HName1">
</div>
</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" style="width:120px">
+ <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="HName2" id="HName2">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">鐢熶骇鍚嶇О</label>
- <div class="layui-input-block" style="width:120px">
+ <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="HName3" id="HName3">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">宸ュ簭娴佽浆鍗�</label>
- <div class="layui-input-block" style="width:120px">
+ <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="HProcExchBillNo" id="HProcExchBillNo">
</div>
</div>
+ <div class="layui-inline" style="width: 85px;">
+ <label class="layui-form-label">鍒ゅ畾缁撹</label>
+ <div class="layui-input-block" style="width:190px;">
+ <select name="HLastResult" id="HLastResult" lay-verify="HLastResult" >
+ <option value=""></option>
+ <option value="鍚堟牸">鍚堟牸</option>
+ <option value="涓嶅悎鏍�">涓嶅悎鏍�</option>
+ </select>
+ </div>
+ </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" style="width:120px">
+ <div class="layui-input-block" style="margin-left: 120px;">
<select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
</select>
</div>
</div>
- <div class="layui-inline" style="width:120px">
+ <div class="layui-inline">
<select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
<option value="0" selected="selected"></option>
<option value="=">=</option>
@@ -146,7 +142,7 @@
<option value="10">涓嶅寘鍚�</option>
</select>
</div>
- <div class="layui-inline" style="width:120px">
+ <div class="layui-inline">
<input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
</div>
</div>
@@ -281,8 +277,12 @@
, { field: '琛ㄥご澶囨敞 ', title: '琛ㄥご澶囨敞', width: 105, sort: true }
, { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 160, sort: true }
, { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 160, sort: true }
+ , { field: '鍒ゅ畾缁撹', title: '鍒ゅ畾缁撹', sort: true }
, { field: '鐢熶骇璧勬簮鍚嶇О', title: '鐢熶骇璧勬簮鍚嶇О', sort: true }
, { field: '鐢熶骇璧勬簮浠ｇ爜', title: '鐢熶骇璧勬簮浠ｇ爜', sort: true }
+ , { field: '妫�楠岄」鐩唬鐮�', title: '妫�楠岄」鐩唬鐮�', sort: true }
+ , { field: '妫�楠岄」鐩悕绉�', title: '妫�楠岄」鐩悕绉�', sort: true }
+ , { field: '宸ュ簭娴佽浆鍗″彿', title: '宸ュ簭娴佽浆鍗″彿', sort: true }
, { field: '浜у搧鍐呯爜', title: '浜у搧鍐呯爜', sort: true }
, { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О', sort: true }
, { field: '浜у搧鍨嬪彿', title: '浜у搧鍨嬪彿', width: 115, sort: true }
@@ -514,21 +514,21 @@
if (HBillNo)
sqlWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
if (HNumber)
- sqlWhere += " and 鐗╂枡缂栫爜 like '%" + HNumber + "%'";
+ sqlWhere += " and 浜у搧鍐呯爜 like '%" + HNumber + "%'";
if (HName)
- sqlWhere += " and 鐗╂枡鍚嶇О like '%" + HName + "%'";
+ sqlWhere += " and 浜у搧鍚嶇О like '%" + HName + "%'";
if (HModel)
- sqlWhere += " and 瑙勬牸鍨嬪彿 like '%" + HModel + "%'";
+ sqlWhere += " and 浜у搧鍨嬪彿 like '%" + HModel + "%'";
if (HLastResult)
sqlWhere += " and 鍒ゅ畾缁撹 like '" + HLastResult + "%'";
if (HName1)
- sqlWhere += " and 璐ㄦ鍛樺悕绉� like '%" + HName1 + "%'";
+ sqlWhere += " and 妫�楠屽憳鍚嶇О like '%" + HName1 + "%'";
if (HName2)
- sqlWhere += " and 妫�楠岄」鐩� like '%" + HName2 + "%'";
+ sqlWhere += " and 妫�楠岄」鐩悕绉� like '%" + HName2 + "%'";
if (HName3)
sqlWhere += " and 鐢熶骇璧勬簮鍚嶇О like '%" + HName3 + "%'";
if (HProcExchBillNo)
- sqlWhere += " and 宸ュ簭娴佽浆鍗� like '%" + HProcExchBillNo + "%'";
+ sqlWhere += " and 宸ュ簭娴佽浆鍗″彿 like '%" + HProcExchBillNo + "%'";
if (HDate1) {
sqlWhere += " and 鏃ユ湡 >= '" + HDate1 + "'";
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBill.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBill.html"
index b4b062b..02af6ba 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBill.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBill.html"
@@ -1379,7 +1379,7 @@
rowdata.push(
{
"HQCCheckItemID": data[i].HQCCheckItemID, "妫�楠岄」鐩�": data[i].妫�楠岄」鐩悕绉�, "HInspectInstruMentID": data[i].HInspectInstruMentID, "妫�楠屼华鍣�": data[i].妫�楠屼华鍣�, "HQCStd": data[i].妫�楠屾爣鍑�,
- "HUnit": data[i].鍗曚綅鍚嶇О, "HQCNote": data[i].妫�楠岃褰�, "HResult": data[i].缁撹,
+ "HUnit": data[i].鍗曚綅鍚嶇О, "HQCNote": data[i].妫�楠岃褰�, "HResult": data[i].缁撹 == "鍚堟牸" ? 1 : 2,
"HMax": data[i].鏈�澶у��, "HMin": data[i].鏈�灏忓��, "HAvg": data[i].骞冲潎鍊�, "HRemark": data[i].琛ㄤ綋澶囨敞,
"HAnalysisMethod": data[i].鍒嗘瀽鏂规硶 == "瀹氭�у垎鏋�" ? 1 : (data[i].鍒嗘瀽鏂规硶 == "瀹氶噺鍒嗘瀽" ? 2 : 3), "HKeyInspect": data[i].閲嶇偣妫�鏌� == "鍚�" ? false : true,
"HSampleSchemeID": data[i].HSampleSchemeID, "HUnitID": data[i].HUnitID,
@@ -1395,7 +1395,7 @@
option.data = rowdata;
table.render(option);
for (let j = 0; j < data.length; j++) {
- $("#HResult" + (j + 1)).val(data[j].缁撹)
+ $("#HResult" + (j + 1)).val(data[j].缁撹 == "鍚堟牸" ? 1 : 2)
}
for (let j = 0; j < data.length; j++) {
$("#HAnalysisMethod" + (j + 1)).val(data[j].鍒嗘瀽鏂规硶 == "瀹氭�у垎鏋�" ? 1 : (data[j].鍒嗘瀽鏂规硶 == "瀹氶噺鍒嗘瀽" ? 2 : 3))
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBillList.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBillList.html"
index c28bac9..8326565 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBillList.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBillList.html"
@@ -39,101 +39,97 @@
</div>
<!--绗竴灞傝繃婊�-->
<div class="layui-inline">
- <label class="layui-form-label" >鍗曟嵁鍙�</label>
- <div class="layui-input-block" style="width:120px">
+ <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="HBillNo" id="HBillNo">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">寮�濮嬫棩鏈�</label>
- <div class="layui-input-block" style="width:120px">
+ <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="HDate1" id="HDate1">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">缁撴潫鏃ユ湡</label>
- <div class="layui-input-block" style="width:120px">
+ <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="HDate2" id="HDate2">
</div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">鍒ゅ畾缁撹</label>
- <div class="layui-input-block" style="width:120px">
- <select name="HLastResult" id="HLastResult" lay-verify="HLastResult">
- <option value=""></option>
- <option value="鍚堟牸">鍚堟牸</option>
- <option value="涓嶅悎鏍�">涓嶅悎鏍�</option>
- </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>
<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-colla-content">
+ <!--绗簩鎺掕繃婊�-->
+ <div class="layui-row">
<div class="layui-inline">
- <label class="layui-form-label">鐗╂枡缂栫爜</label>
- <div class="layui-input-block" style="width:120px">
+ <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="HNumber" id="HNumber">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">鐗╂枡鍚嶇О</label>
- <div class="layui-input-block" style="width:120px">
+ <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="HName" id="HName">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">瑙勬牸鍨嬪彿</label>
- <div class="layui-input-block" style="width:120px">
+ <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="HModel" id="HModel">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">璐ㄦ鍛�</label>
- <div class="layui-input-block" style="width:120px">
+ <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="HName1" id="HName1">
</div>
</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" style="width:120px">
+ <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="HName2" id="HName2">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">鐢熶骇鍚嶇О</label>
- <div class="layui-input-block" style="width:120px">
+ <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="HName3" id="HName3">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">宸ュ簭娴佽浆鍗�</label>
- <div class="layui-input-block" style="width:120px">
+ <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="HProcExchBillNo" id="HProcExchBillNo">
</div>
</div>
+ <div class="layui-inline" style="width: 85px;">
+ <label class="layui-form-label">鍒ゅ畾缁撹</label>
+ <div class="layui-input-block" style="width:190px;">
+ <select name="HLastResult" id="HLastResult" lay-verify="HLastResult">
+ <option value=""></option>
+ <option value="鍚堟牸">鍚堟牸</option>
+ <option value="涓嶅悎鏍�">涓嶅悎鏍�</option>
+ </select>
+ </div>
+ </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" style="width:120px">
+ <div class="layui-input-block" style="margin-left: 120px;">
<select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
</select>
</div>
</div>
- <div class="layui-inline" style="width:120px">
+ <div class="layui-inline">
<select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
<option value="0" selected="selected"></option>
<option value="=">=</option>
@@ -148,7 +144,7 @@
<option value="10">涓嶅寘鍚�</option>
</select>
</div>
- <div class="layui-inline" style="width:120px">
+ <div class="layui-inline">
<input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
</div>
</div>
@@ -333,7 +329,7 @@
if (HBillNo)
sqlWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
if (HNumber)
- sqlWhere += " and 鐗╂枡缂栫爜 like '%" + HNumber + "%'";
+ sqlWhere += " and 鐗╂枡浠ｇ爜 like '%" + HNumber + "%'";
if (HName)
sqlWhere += " and 鐗╂枡鍚嶇О like '%" + HName + "%'";
if (HModel)
@@ -343,11 +339,11 @@
if (HName1)
sqlWhere += " and 璐ㄦ鍛樺悕绉� like '%" + HName1 + "%'";
if (HName2)
- sqlWhere += " and 妫�楠岄」鐩� like '%" + HName2 + "%'";
+ sqlWhere += " and 妫�楠岄」鐩悕绉� like '%" + HName2 + "%'";
if (HName3)
sqlWhere += " and 鐢熶骇璧勬簮鍚嶇О like '%" + HName3 + "%'";
if (HProcExchBillNo)
- sqlWhere += " and 宸ュ簭娴佽浆鍗� like '%" + HProcExchBillNo + "%'";
+ sqlWhere += " and 宸ュ簭娴佽浆鍗″彿 like '%" + HProcExchBillNo + "%'";
if (HDate1) {
sqlWhere += " and 鏃ユ湡 >= '" + HDate1 + "'";
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html"
index 24f68a7..a1bdc1c 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html"
@@ -1493,7 +1493,7 @@
rowdata.push(
{
"HQCCheckItemID": data[i].HQCCheckItemID, "妫�楠岄」鐩�": data[i].妫�楠岄」鐩悕绉�, "HInspectInstruMentID": data[i].HInspectInstruMentID, "妫�楠屼华鍣�": data[i].妫�楠屼华鍣�, "HQCStd": data[i].妫�楠屾爣鍑�,
- "HUnit": data[i].鍗曚綅鍚嶇О, "HQCNote": data[i].妫�楠岃褰�, "HResult": data[i].缁撹,
+ "HUnit": data[i].鍗曚綅鍚嶇О, "HQCNote": data[i].妫�楠岃褰�, "HResult": data[i].缁撹 == "鍚堟牸" ? 1 : 2,
"HMax": data[i].鏈�澶у��, "HMin": data[i].鏈�灏忓��, "HAvg": data[i].骞冲潎鍊�, "HRemark": data[i].琛ㄤ綋澶囨敞,
"HAnalysisMethod": data[i].鍒嗘瀽鏂规硶 == "瀹氭�у垎鏋�" ? 1 : (data[i].鍒嗘瀽鏂规硶 == "瀹氶噺鍒嗘瀽" ? 2 : 3), "HKeyInspect": data[i].閲嶇偣妫�鏌� == "鍚�" ? false : true,
"HSampleSchemeID": data[i].HSampleSchemeID, "HUnitID": data[i].HUnitID,
@@ -1509,7 +1509,7 @@
option.data = rowdata;
table.render(option);
for (let j = 0; j < data.length; j++) {
- $("#HResult" + (j + 1)).val(data[j].缁撹)
+ $("#HResult" + (j + 1)).val(data[j].缁撹 == "鍚堟牸" ? 1 : 2)
}
for (let j = 0; j < data.length; j++) {
$("#HAnalysisMethod" + (j + 1)).val(data[j].鍒嗘瀽鏂规硶 == "瀹氭�у垎鏋�" ? 1 : (data[j].鍒嗘瀽鏂规硶 == "瀹氶噺鍒嗘瀽" ? 2 : 3))
@@ -2076,7 +2076,9 @@
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
+
$("#HMaterNumber").val(checkStatus.data[0].HNumber);
+ $("#HMaterName").val(checkStatus.data[0].HName);
$("#HMaterID").val(checkStatus.data[0].HItemID);
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_FirstPieceCheckBillList.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_FirstPieceCheckBillList.html"
index f7b81b6..7c255a6 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_FirstPieceCheckBillList.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_FirstPieceCheckBillList.html"
@@ -39,102 +39,99 @@
</div>
<!--绗竴灞傝繃婊�-->
<div class="layui-inline">
- <label class="layui-form-label">鍗曟嵁鍙�</label>
- <div class="layui-input-block" style="width:120px">
+ <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="HBillNo" id="HBillNo">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">寮�濮嬫棩鏈�</label>
- <div class="layui-input-block" style="width:120px">
+ <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="HDate1" id="HDate1">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">缁撴潫鏃ユ湡</label>
- <div class="layui-input-block" style="width:120px">
+ <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="HDate2" id="HDate2">
</div>
</div>
- <div class="layui-inline" >
- <label class="layui-form-label">鍒ゅ畾缁撹</label>
- <div class="layui-input-block" style="width:120px">
- <select name="HLastResult" id="HLastResult" lay-verify="HLastResult">
- <option value=""></option>
- <option value="鍚堟牸">鍚堟牸</option>
- <option value="涓嶅悎鏍�">涓嶅悎鏍�</option>
- </select>
- </div>
-
- </div>
+
<div class="layui-inline">
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="f_Query" id="f_Query">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
</div>
- <!--绗簩鎺掕繃婊�-->
- <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
- <div class="layui-row" style="margin-top:5px">
+
+ <div class="layui-colla-content">
+ <!--绗簩鎺掕繃婊�-->
+ <div class="layui-row">
<div class="layui-inline">
- <label class="layui-form-label">鐗╂枡缂栫爜</label>
- <div class="layui-input-block" style="width:120px">
+ <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="HNumber" id="HNumber">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">鐗╂枡鍚嶇О</label>
- <div class="layui-input-block" style="width:120px" >
+ <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="HName" id="HName">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">瑙勬牸鍨嬪彿</label>
- <div class="layui-input-block" style="width:120px">
+ <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="HModel" id="HModel">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">璐ㄦ鍛�</label>
- <div class="layui-input-block" style="width:120px">
+ <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="HName1" id="HName1">
</div>
</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" style="width:120px">
+ <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="HName2" id="HName2">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">鐢熶骇鍚嶇О</label>
- <div class="layui-input-block" style="width:120px">
+ <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="HName3" id="HName3">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">宸ュ簭娴佽浆鍗�</label>
- <div class="layui-input-block" style="width:120px">
+ <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="HProcExchBillNo" id="HProcExchBillNo">
</div>
</div>
+ <div class="layui-inline" style="width: 85px;">
+ <label class="layui-form-label">鍒ゅ畾缁撹</label>
+ <div class="layui-input-block" style="width:190px;">
+ <select name="HLastResult" id="HLastResult" lay-verify="HLastResult">
+ <option value=""></option>
+ <option value="鍚堟牸">鍚堟牸</option>
+ <option value="涓嶅悎鏍�">涓嶅悎鏍�</option>
+ </select>
+ </div>
+ </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" style="width:120px">
+ <div class="layui-input-block">
<select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
</select>
</div>
</div>
- <div class="layui-inline" style="width:120px">
+ <div class="layui-inline">
<select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
<option value="0" selected="selected"></option>
<option value="=">=</option>
@@ -148,8 +145,8 @@
<option value="9">鍙冲寘鍚�</option>
<option value="10">涓嶅寘鍚�</option>
</select>
- </div>
- <div class="layui-inline" style="width:120px">
+ </div>
+ <div class="layui-inline" style="margin-left: 120px;">
<input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
</div>
</div>
@@ -792,7 +789,7 @@
if (HBillNo)
sqlWhere += " and 鍗曟嵁鍙� like '%" + HBillNo+ "%'";
if (HNumber)
- sqlWhere += " and 鐗╂枡缂栫爜 like '%" + HNumber + "%'";
+ sqlWhere += " and 鐗╂枡浠ｇ爜 like '%" + HNumber + "%'";
if (HName)
sqlWhere += " and 鐗╂枡鍚嶇О like '%" + HName + "%'";
if (HModel)
@@ -802,11 +799,11 @@
if (HName1)
sqlWhere += " and 璐ㄦ鍛樺悕绉� like '%" + HName1 + "%'";
if (HName2)
- sqlWhere += " and 妫�楠岄」鐩� like '%" + HName2 + "%'";
+ sqlWhere += " and 妫�楠岄」鐩悕绉� like '%" + HName2 + "%'";
if (HName3)
sqlWhere += " and 鐢熶骇璧勬簮鍚嶇О like '%" + HName3 + "%'";
if (HProcExchBillNo)
- sqlWhere += " and 宸ュ簭娴佽浆鍗� like '%" + HProcExchBillNo + "%'";
+ sqlWhere += " and 宸ュ簭娴佽浆鍗″彿 like '%" + HProcExchBillNo + "%'";
if (HDate1) {
sqlWhere += " and 鏃ユ湡 >= '" + HDate1 + "'";
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 = "";
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\247\224\345\244\226\345\205\245\345\272\223/Kf_EntrustInBill_Fast.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\247\224\345\244\226\345\205\245\345\272\223/Kf_EntrustInBill_Fast.html"
index e024ee0..aa68c9b 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\247\224\345\244\226\345\205\245\345\272\223/Kf_EntrustInBill_Fast.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\247\224\345\244\226\345\205\245\345\272\223/Kf_EntrustInBill_Fast.html"
@@ -102,7 +102,7 @@
<label class="layui-form-label" style="width:30px;padding-left:0px;">浠撳簱</label>
</div>
<div class="layui-col-xs6">
- <input type="text" name="HWHNAME" id="HWHNAME" lay-verify="HWHNAME" autocomplete="off" class="layui-input" readonly>
+ <input type="text" name="HWHNAME" id="HWHNAME" lay-verify="HWHNAME" autocomplete="off" class="layui-input" >
<input type="hidden" name="HWHID" id="HWHID" lay-verify="HWHID" autocomplete="off" class="layui-input">
</div>
<div class="layui-col-xs2">
@@ -1015,6 +1015,7 @@
data: { "HBarCode": HBarCode },
success: function (result) {
if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ $("#HStockPlaceID").val(result.data[0].HItemID);
$("#HStockPlaceName").val(result.data[0].HName);
$("#HWHID").val(result.data[0].HWHID);
$("#HWHNAME").val(result.data[0].HWhName);
--
Gitblit v1.9.1