From b0eabfdbe8204f22fb82ed56129bc43022403f1f Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期四, 20 六月 2024 16:29:33 +0800
Subject: [PATCH] 1
---
WebTM/views/基础资料/公用基础资料/Gy_TechnologyParameterUnitList.html | 15
WebTM/views/车间管理/防错验证/Qc_PreventErrMouldCheckBill.html | 12
WebTM/views/基础资料/公用基础资料/xmlSRM_Web_BarCodeBillList.aspx | 26
WebTM/views/基础资料/生产基础资料/Add_Edit_Gy_Source.html | 2
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBillList_Source.html | 1180 ++++++++++++
WebTM/views/生产管理/报工台工序/停工/Sc_Add_MESStopStepWorkBillList.html | 54
WebTM/views/IpadIndex.html | 7
WebTM/views/基础资料/公用基础资料/xmlSRM_Web_BarCodeBillList.aspx.cs | 17
WebTM/views/生产管理/异常反馈单/Sc_Add_MESExecptFeedBackBillList.html | 53
WebTM/views/WMS扫码模块/上料防错单/Sc_MaterToSourceBill_PDA.html | 1
WebTM/views/设备管理/设备规程单/Sb_EquipDotCheckRuleList_PDA.html | 66
WebTM/views/基础资料/公用基础资料/Gy_TechnologyParameterList.html | 15
WebTM/views/生产管理/生产停工单/Sc_Add_MESStopWorkBillList.html | 378 ++-
WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBill_CurrentWork.html | 43
WebTM/views/基础资料/公用基础资料/HBarPlanPrint.html | 4
WebTM/views/质量管理/检验方案单/QC_Add_CheckProject.html | 3
WebTM/views/生产管理/报工台工序/停工/Sc_MESStopStepWorkBillList.html | 3
WebTM/views/设备管理/设备工艺参数订单点检表/SB_EquipICMOTechParamBillList.html | 1176 ++++++++++++
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBill.html | 20
WebTM/views/仓存管理/条码生成/Gy_BarCodeBill.html | 190 +
WebTM/views/设备管理/Sb_EquipDotCheckBill_PDA.html | 6
WebTM/views/生产管理/质量汇报单/Sc_QualityReportBill.html | 10
WebTM/views/车间管理/防错验证/Gy_MaterPreventErrMouldBill.html | 59
WebTM/views/PublicPage/HSourceReportHtml.html | 409 ++++
WebTM/views/设备管理/Sb_EquipMaintainBill_PDA.html | 4
WebTM/views/车间管理/产线/MES_ProductionLinePackagingList.html | 69
WebTM/views/基础资料/基础资料/Gy_DotCheckList.html | 105 +
WebTM/layuiadmin/Scripts/webConfig.js | 6
WebTM/views/模治具管理/模治具管理/Sc_Add_MouldDotCheckBillList.html | 14
WebTM/views/基础资料/公用基础资料/xmlSRM_Web_BarCodeBillList.aspx.designer.cs | 26
WebTM/views/设备管理/设备工艺参数订单点检表/SB_EquipICMOTechParamBillEdit.html | 1464 +++++++++++++++
WebTM/views/仓存管理/条码报表/KF_ICinventoryQueryReport.html | 24
WebTM/WebTM.csproj | 11
WebTM/views/车间管理/启动点检单/Sc_WorkBeginDotCheckBill.html | 6
34 files changed, 5,066 insertions(+), 412 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 2cb2b5b..3caa155 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -336,6 +336,7 @@
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_MaintainLev.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_PreventErrMould.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Xs_SeOrderBill_StockInCodeNote.aspx" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlSRM_Web_BarCodeBillList.aspx" />
<Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_DotCheckItemMethodEdit.html" />
<Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_DotCheckItemClassEdit.html" />
<Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_DotCheckItemMethodList.html" />
@@ -371,6 +372,8 @@
<Content Include="views\绯荤粺绠＄悊\浼氳鏈熼棿\Xt_AccountPeriodAdd.html" />
<Content Include="views\璁惧绠＄悊\璁惧鍋滄満鍗昞Sb_EquipStopBillList_PDA.html" />
<Content Include="views\璁惧绠＄悊\璁惧鍋滄満鍗昞Sb_EquipStopBill_PDA.html" />
+ <Content Include="views\璁惧绠＄悊\璁惧宸ヨ壓鍙傛暟璁㈠崟鐐规琛╘SB_EquipICMOTechParamBillList.html" />
+ <Content Include="views\璁惧绠＄悊\璁惧宸ヨ壓鍙傛暟璁㈠崟鐐规琛╘SB_EquipICMOTechParamBillEdit.html" />
<Content Include="views\璁惧绠＄悊\璁惧寮�鏈哄崟\Sb_EquipBeginBillList_PDA.html" />
<Content Include="views\璁惧绠＄悊\璁惧寮�鏈哄崟\Sb_EquipBeginBill_PDA.html" />
<Content Include="views\璐ㄩ噺绠＄悊\宸ヤ綔鑱旂郴鍗昞OA_WorkLinkSelfQuery.html" />
@@ -406,6 +409,7 @@
<Content Include="views\璁惧绠＄悊\璁惧鍋滄満鍗昞Sb_EquipStopBillList.html" />
<Content Include="views\璁惧绠＄悊\璁惧寮�鏈哄崟\Sb_EquipBeginBill.html" />
<Content Include="views\璁惧绠＄悊\璁惧寮�鏈哄崟\Sb_EquipBeginBillList.html" />
+ <Content Include="views\杞﹂棿绠＄悊\宸ュ簭娴佽浆鍗Sc_ProcessExchangeBillList_Source.html" />
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭娴佽浆鍗Sc_ProcessExchangeArrangement_PG.html" />
<Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Cj_SPCOscillationCurve.html" />
<Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Kf_PressurizedWaterNoOutReport.html" />
@@ -2140,6 +2144,13 @@
<Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLYS_ReceiveOtherBillMainList.aspx.designer.cs">
<DependentUpon>xmlLYS_ReceiveOtherBillMainList.aspx</DependentUpon>
</Compile>
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlSRM_Web_BarCodeBillList.aspx.cs">
+ <DependentUpon>xmlSRM_Web_BarCodeBillList.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlSRM_Web_BarCodeBillList.aspx.designer.cs">
+ <DependentUpon>xmlSRM_Web_BarCodeBillList.aspx</DependentUpon>
+ </Compile>
<Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlPM_WorkTaskBillMyList.aspx.cs">
<DependentUpon>xmlPM_WorkTaskBillMyList.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index 2fd085d..bc007d7 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -3,13 +3,13 @@
//var WEBURL = "http://192.168.16.80:8011/"; //鍔炲叕瀹ゆ湇鍔″櫒
//var WEBURL = "http://localhost:8081/SWEAPI/"; //ch鏈湴*/
//var WEBURL = "http://61.164.86.218:8099/ABAPI/";
- /*var WEBURL = "http://localhost/API/"; */ //棰滄檽鍐涙湰鍦伴厤缃�
+ //var WEBURL = "http://localhost/API/"; //棰滄檽鍐涙湰鍦伴厤缃�
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄤ箰鏈湴閰嶇疆
var WEBURL = "http://localhost:8082/API/"; //鏉滆春鏈湴閰嶇疆
//var WEBURL = "http://localhost:81/API/"; //鐜嬪浆鏈湴閰嶇疆
/*var WEBURL = "http://localhost:8083/API/"; //闄堥洴闈欐湰鍦伴厤缃�*/
- // var WEBURL = "http://localhost:81/API/" //缈佹稕娑涙湰鍦伴厤缃�
- //var WEBURL = "http://localhost:8082/API/"; //寮犵憺骞挎湰鍦伴厤缃�
+ //var WEBURL = "http://localhost:81/API/" //缈佹稕娑涙湰鍦伴厤缃�
+ //var WEBURL = "http://localhost:8082/API/"; //寮犵憺骞挎湰鍦伴厤缃�
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //浣欐�濇澃鏈湴閰嶇疆
//var WEBURL = "http://localhost:8088/ARAPI/"; //浣欐�濇澃鏈湴閰嶇疆(瀹夌憺)
//var WEBURL = "http://10.1.4.155/API/"; //姹熶赴瀹㈡埛NEW
diff --git a/WebTM/views/IpadIndex.html b/WebTM/views/IpadIndex.html
index dccac29..feed4ed 100644
--- a/WebTM/views/IpadIndex.html
+++ b/WebTM/views/IpadIndex.html
@@ -1127,7 +1127,7 @@
"HMaterID": HMaterID,
"HProcID": HProcID,
"HSourceID": HSourceID1,
- "SCOrder": HICMOBillNo
+ "SCOrder": HSourceBillNo
});
//閫氳繃绱㈠紩鑾峰彇鍒板綋鍓峣frame寮瑰嚭灞�
@@ -1156,7 +1156,8 @@
var data = [];
data.push({
"HMaterID": HMaterID,
- "SCOrder": HICMOBillNo
+ "HProcID": HProcID,
+ "SCOrder": HSourceBillNo
});
//閫氳繃绱㈠紩鑾峰彇鍒板綋鍓峣frame寮瑰嚭灞�
@@ -1352,7 +1353,7 @@
<div class="layui-col-sm12 layui-col-md4" onclick="OpenMaterToSource(event,this)">
<div class="cnt bottomright">
<span class="layui-icon layui-icon-engine imgicon"></span>
- <span class="imgtitle">涓婃枡闃插憜</span>
+ <span class="imgtitle">涓婃枡闃查敊</span>
</div>
</div>
<div class="layui-col-sm12 layui-col-md4" onclick="BadGather(event,this)">
diff --git a/WebTM/views/PublicPage/HSourceReportHtml.html b/WebTM/views/PublicPage/HSourceReportHtml.html
index 76aed02..becd83c 100644
--- a/WebTM/views/PublicPage/HSourceReportHtml.html
+++ b/WebTM/views/PublicPage/HSourceReportHtml.html
@@ -31,62 +31,91 @@
<div class="layui-inline">
<label class="layui-form-label">鍗曟嵁鍙�</label>
<div class="layui-input-block">
- <input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="width:190px;">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HBillNo" id="HBillNo" style="width:190px;">
</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>
</div>
</div>
<!--<div class="layui-inline">
- <label class="layui-form-label">閮ㄩ棬</label>
- <div class="layui-input-block">
- <input type="text" class="layui-input" name="HDeptName" id="HDeptName" style="width:190px;">
- </div>
- </div>-->
+ <label class="layui-form-label">閮ㄩ棬</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HDeptName" id="HDeptName" style="width:190px;">
+ </div>
+ </div>-->
<div class="layui-inline" id="HProcExchBillNoHidden" style="display:none;">
<label class="layui-form-label">娴佽浆鍗″彿</label>
<div class="layui-input-block">
- <input type="text" class="layui-input" name="HProcExchBillNo" id="HProcExchBillNo" style="width:190px;">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HProcExchBillNo" id="HProcExchBillNo" style="width:190px;">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">鐗╂枡鍚嶇О</label>
+ <label class="layui-form-label">鐗╂枡缂栫爜</label>
<div class="layui-input-block">
- <input type="text" class="layui-input" name="PartName" id="PartName" style="width:190px;">
+ <input type="text" class="layui-input ForFilteringSchemes" name="PartNumber" id="PartNumber" style="width:190px;">
</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-inline" style="margin-left:5px;">
+ <div style="text-align:center;font-size:15px;font-weight:bold;color:#fc9393" id="HFilterScheme_Now"></div>
+ </div>
<div class="layui-colla-content">
<div class="layui-row" style="margin-top:5px">
<div class="layui-inline">
<span>鍏朵粬鏉′欢></span>
</div>
-
<div class="layui-inline">
- <label class="layui-form-label">鐗╂枡缂栫爜</label>
+ <label class="layui-form-label">鐗╂枡鍚嶇О</label>
<div class="layui-input-block">
- <input type="text" class="layui-input" name="PartNumber" id="PartNumber" style="width:190px;">
+ <input type="text" class="layui-input ForFilteringSchemes" name="PartName" id="PartName" style="width:190px;">
</div>
</div>
-
<div class="layui-inline">
- <label class="layui-form-label">杩囨护</label>
+ <label class="layui-form-label">鐘舵��</label>
<div class="layui-input-block">
- <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
+ <select name="HBillStatus" id="HBillStatus" lay-verify="" lay-search class="layui-input ForFilteringSchemes">
+ <option value="">璇烽�夋嫨</option>
+ <option value="璁″垝">璁″垝</option>
+ <option value="璁″垝纭">璁″垝纭</option>
+ <option value="涓嬭揪">涓嬭揪</option>
+ <option value="寮�宸�" selected>寮�宸�</option>
+ <option value="瀹屽伐">瀹屽伐</option>
+ <option value="缁撴">缁撴</option>
+ <option value="缁撶畻">缁撶畻</option>
</select>
</div>
</div>
<div class="layui-inline">
- <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
+ <label class="layui-form-label">棰嗘枡鐘舵��</label>
+ <div class="layui-input-block">
+ <select name="HPickMtrlStatus" id="HSPickMtrlStatus" lay-verify="" lay-search class="layui-input ForFilteringSchemes">
+ <option value="" selected>璇烽�夋嫨</option>
+ <option value="鏈鏂�">鏈鏂�</option>
+ <option value="閮ㄥ垎棰嗘枡">閮ㄥ垎棰嗘枡</option>
+ <option value="鍏ㄩ儴棰嗘枡">鍏ㄩ儴棰嗘枡</option>
+ <option value="瓒呴棰嗘枡">瓒呴棰嗘枡</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护</label>
+ <div class="layui-input-block">
+ <select name="ColName" id="ColName" lay-filter="ColName" class="ForFilteringSchemes" style="width:190px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator" id="Comparator" lay-filter="Comparator" class="ForFilteringSchemes" style="width:190px;">
<option value="0" selected="selected"></option>
<option value="=">=</option>
<option value=">=">>=</option>
@@ -101,7 +130,7 @@
</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>
@@ -111,6 +140,8 @@
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container">
<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" style="" 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="" lay-event="set_ReadScheme" id="set_ReadScheme"><i class="layui-icon layui-icon-set"></i>璇诲彇鏂规</button>
<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew"><i class="layui-icon layui-icon-add-1"></i>鏂板</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-edit"></i>缂栬緫</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
@@ -133,6 +164,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/zgqCustom/zgqCustom.js"></script>
<script>
//鑾峰彇鍙傛暟
var params = get_UrlVars();
@@ -169,24 +201,28 @@
//#endregion
+ //#region 銆愯繃婊ゆ柟妗堛��
+
+ //杩囨护鏉′欢鐨刢lass绫�
+ var HClassTag = "ForFilteringSchemes";
+ //妯″潡鍚嶇О锛堜腑鏂囩増锛� 姣忎釜妯″潡椤甸潰閮介渶瑕佷慨鏀�
+ window.HModuleName = "鏉＄爜閫夋簮鍗�";
+ //鏄惁宸茬粡閫夋嫨浜嗚繃婊ゆ柟妗堬紙鍏ㄥ眬鍙橀噺锛�
+ window.HDefaultFilter = "";
+ //閫夋嫨鐨勮繃婊ゆ柟妗堝唴鐮侊紙鍏ㄥ眬鍙橀噺锛�
+ window.HInterID_Choose = 0;
+
+ //#endregion
+
//#region 杩涘叆椤甸潰鍗冲姞杞�
//鍒濆鍖栬〃鍗曟彃浠�
//set_InitFrom();
- //鍒ゆ柇鎿嶄綔绫诲瀷
- if (OperationType == 1) {//鏃犳簮鍗�
-
- }
- else if (OperationType == 3) {//鏈夋簮鍗�
- set_ClearBill(sWhere, HSouceBillType);
- }
- else {
- layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
- }
//鑾峰彇閮ㄩ棬鍒�
var HDeptName = '<option value="0" style="color:red;" selected>鍏ㄩ儴閮ㄩ棬</option>';
$.ajax({
type: "get",
+ async: false,
url: GetWEBURL() + "/Sc_ICMOBill/GetHDeptList",
data: { "HOrgID": HOrgID },
success: function (result) {
@@ -205,6 +241,20 @@
layer.closeAll("loading");
}
})
+ //鍒ゆ柇鎿嶄綔绫诲瀷
+ if (OperationType == 1) {//鏃犳簮鍗�
+
+ }
+ else if (OperationType == 3) {//鏈夋簮鍗�
+ //get_FastQuery(HSouceBillType);
+ //鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
+ get_DefaultModule();
+ set_ClearBill(sWhere, HSouceBillType);
+ }
+ else {
+ layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
+ }
+
//#endregion
//#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
@@ -225,6 +275,12 @@
case 'set_HideColumn':
get_HideColumn();
break;
+ //淇濆瓨鏂规
+ case 'set_SaveScheme': set_SaveScheme();
+ break;
+ //璇诲彇鏂规
+ case 'set_ReadScheme': set_ReadScheme();
+ break;
};
});
//#endregion
@@ -241,6 +297,27 @@
form.on('submit(btnReSearch)', function (data) {
set_ClearQuery();
});
+ //#endregion
+
+ //#region 鐐瑰嚮琛岄�変腑楂樹寒
+ table.on('row(layTable)', 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:#FDFD7E;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.layTable, function (i, l) {
+ if (obj.tr.index() == l.LAY_TABLE_INDEX) {
+ l.LAY_CHECKED = flag;
+ }
+ });
+ })
//#endregion
//#endregion
@@ -412,7 +489,7 @@
}
sWhere += " and " + ColName + " " + com;
}
-
+
switch (HSouceBillType) {
case '鐢熶骇璁㈠崟':
if (HBillNo) {
@@ -426,6 +503,12 @@
}
if (HDeptName && HDeptName != 0) {
sWhere += " and HDeptID = '" + HDeptName + "'";
+ }
+ if ($("#HBillStatus").val() != "") {
+ sWhere += " and 鐘舵�� = '" + $("#HBillStatus").val() + "'";
+ }
+ if ($("#HSPickMtrlStatus").val() != "") {
+ sWhere += " and 棰嗘枡鐘舵�� = '" + $("#HSPickMtrlStatus").val() + "'";
}
return sWhere;
break;
@@ -673,6 +756,8 @@
$("#ColContent").val("");
$("#ColName").val("0");
$("#Comparator").val("0");
+ $("#HBillStatus").val("寮�宸�");//鐘舵��
+ $("#HSPickMtrlStatus").val("");//棰嗘枡鐘舵��
form.render('select');
get_FastQuery(HSouceBillType);
sWhere = "";
@@ -704,12 +789,278 @@
}
return vars;
}
+
+ //#region 銆愯繃婊ゆ柟妗堛��
+
+ //鑾峰彇褰撳墠鐢ㄦ埛鐨勯粯璁よ繃婊ゆ柟妗�
+ function get_DefaultModule() {
+ $.ajax({
+ url: GetWEBURL() + '/Xt_FastICScheme/Chooselist',
+ type: "GET",
+ async: false,
+ data: { "user": sessionStorage["Czybm"], "HModuleName": 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);
+ }
+ }
+
+ var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
+ //鑻ユ棩鏈熼棿闅斾笉涓� 浠绘剰闂撮殧锛屽垯绂佺敤寮�濮嬫棩鏈熶笌缁撴潫鏃ユ湡鐨勯�夋嫨
+ if (HInitTimeCycle != -1) {
+ //$('#HDate').prop('disabled', true);
+ //$('#HDate1').prop('disabled', true);
+
+ $("#HDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
+ $("#HDate1").val(Format(new Date(), "yyyy-MM-dd"));
+
+ //鎵ц鏌ヨ鏂规硶
+ get_FastQuery(HSouceBillType);
+ } else {
+ //$('#HDate').prop('disabled', false);
+ //$('#HDate1').prop('disabled', false);
+ }
+
+
+ //鎵ц鏌ヨ鏂规硶
+ get_FastQuery(HSouceBillType);
+ form.render("select");
+ } else {
+ //褰撳墠鐢ㄦ埛娌℃湁璁剧疆榛樿鐨勮繃婊ゆ柟妗�
+ //闅愯棌鏄剧ず杩囨护鏂规鐨勬爣绛句俊鎭�
+ document.getElementById("HFilterScheme_Now").style.display = "none";
+ //鎵ц鏌ヨ鏂规硶
+ get_FastQuery(HSouceBillType);
+ form.render("select");
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+
+ //淇濆瓨鏂规
+ function set_SaveScheme() {
+ var index = layer.open()
+ //鍒ゆ柇鐢ㄦ埛鏄惁鐐瑰嚮浜嗗彸涓婅鐨勨�滃弶鍙封�濆叧闂脊绐楅〉闈�
+ var HIsClose_Manual = false;
+ //鑾峰彇鏈〉鎵�鏈夎繃婊ゆ潯浠跺璞�(class涓寘鍚�"ForFilteringSchemes"鐨勫厓绱�)
+ var Filter = document.getElementsByClassName(HClassTag);
+
+ 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 = HFilterIdLists.substring(0, HFilterIdLists.length - 1);
+ HValue = HValue.substring(0, HValue.length - 1);
+ HElement_type = HElement_type.substring(0, HElement_type.length - 1);
+
+ //褰撳墠椤甸潰涓婃病鏈夐�夋嫨杩囨护鏂规锛岃繘鍏ユ柊澧炴柟娉�
+ if (HDefaultFilter == "") {
+ layer.open({
+ type: 2
+ , area: ['40%', '80%']
+ , title: '杩囨护鏂规'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../绯荤粺绠＄悊/杩囨护鏂规璁剧疆/Xt_FastICScheme.html?OperationType=1&HModuleName=' + HModuleName + '&HFilterIdLists=' + HFilterIdLists + '&HValue=' + HValue + '&HElement_type=' + HElement_type
+ , cancel: function () {
+ // 鍙充笂瑙掑叧闂簨浠剁殑閫昏緫
+ HIsClose_Manual = true;
+ }
+ , end: function () {
+ if (HIsClose_Manual != true) {
+ get_FastQuery(HSouceBillType);
+ //鏄剧ず褰撳墠鐨勮繃婊ゆ柟妗�
+ 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=' + HModuleName + '&HFilterIdLists=' + HFilterIdLists + '&HValue=' + HValue + '&HElement_type=' + HElement_type
+ , end: function () {
+ get_FastQuery(HSouceBillType);
+ //鏄剧ず褰撳墠鐨勮繃婊ゆ柟妗�
+ 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(HClassTag); //鑾峰彇鏈〉鎵�鏈夎繃婊ゆ潯浠跺璞�(class涓寘鍚�"ForFilteringSchemes"鐨勫厓绱�)
+ HFilterIdList = "";
+ HFilterIdLists = "";
+ HValue = "";
+ HElement_type = "";
+ 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 = HFilterIdLists.substring(0, HFilterIdLists.length - 1);
+ HValue = HValue.substring(0, HValue.length - 1);
+ HElement_type = HElement_type.substring(0, HElement_type.length - 1);
+
+ var sMainSub = HInterID_Choose + ';' + HFilterIdLists + ';' + HValue + ';' + HElement_type + ';' + sessionStorage["Czybm"] + ';' + 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 });
+ }
+ 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(HClassTag); //鑾峰彇鏈〉鎵�鏈夎繃婊ゆ潯浠跺璞�(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 = HFilterIdLists.substring(0, HFilterIdLists.length - 1);
+ HValue = HValue.substring(0, HValue.length - 1);
+ HElement_type = HElement_type.substring(0, HElement_type.length - 1);
+
+ layer.open({
+ type: 2
+ , area: ['80%', '80%']
+ , title: '杩囨护鏂规鍒楄〃'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../绯荤粺绠＄悊/杩囨护鏂规璁剧疆/Xt_FastICSchemeList.html?HType=Select&HFilterIdLists=' + HFilterIdLists + '&HValue=' + HValue + '&HElement_type=' + HElement_type + '&HModuleName=' + HModuleName
+ , cancel: function () {
+ // 鍙充笂瑙掑叧闂簨浠剁殑閫昏緫
+ HIsClose_Manual = true;
+ }
+ , end: function () {
+ if (HIsClose_Manual != true) {
+ get_FastQuery(HSouceBillType);
+ form.render("select");
+ }
+ }
+ })
+ }
+
//#endregion
//#endregion
//浠ヤ笂鏄痩ayui妯″潡
});
+
+ //#region 銆愯繃婊ゆ柟妗堣繑鍥炴暟鎹��
+ 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": 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 });
+ }
+ });
+ }
+ //#endregion
+
</script>
</body>
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\344\270\212\346\226\231\351\230\262\351\224\231\345\215\225/Sc_MaterToSourceBill_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\344\270\212\346\226\231\351\230\262\351\224\231\345\215\225/Sc_MaterToSourceBill_PDA.html"
index 351d830..3272eff 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\344\270\212\346\226\231\351\230\262\351\224\231\345\215\225/Sc_MaterToSourceBill_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\344\270\212\346\226\231\351\230\262\351\224\231\345\215\225/Sc_MaterToSourceBill_PDA.html"
@@ -1066,6 +1066,7 @@
, { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 100 }
, { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 100 }
, { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 100 }
+ , { field: '鏉＄爜鏁伴噺', title: '鏉＄爜鏁伴噺', width: 100 }
, { field: '搴斿彂鏁伴噺', title: '搴斿彂鏁伴噺', width: 100 }
]];
listOption.data = data;
diff --git "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\346\212\245\350\241\250/KF_ICinventoryQueryReport.html" "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\346\212\245\350\241\250/KF_ICinventoryQueryReport.html"
index 5088f60..8e6dc97 100644
--- "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\346\212\245\350\241\250/KF_ICinventoryQueryReport.html"
+++ "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\346\212\245\350\241\250/KF_ICinventoryQueryReport.html"
@@ -447,6 +447,30 @@
}
//#endregion
+ //#region 搴撳瓨鏍″
+ function get_Proofread() {
+
+ var ajaxLoad = layer.load();
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + '/WEBSController/UpdateKf_ICInvBal',
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: {},
+ success: function (data1) {
+ if (data1.count == 1) {
+ layer.msg(data.Message, { time: 1 * 2000, icon: 1 }, function (index) {
+
+ });
+ }
+ },
+ error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ //#endregion
+
//#region 閲嶇疆鎸夐挳
form.on('submit(btnReSearch)', function (data) {
//娓呯┖杩囨护鏉′欢
diff --git "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill.html" "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill.html"
index ad20103..5a0da84 100644
--- "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill.html"
+++ "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill.html"
@@ -213,7 +213,7 @@
var sWhere = "";
var sBillType = "3801";
var HModName = "Gy_BarCodeBill";
- var titleData = ["鐗╂枡ID", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�", "杈呭姪灞炴�D", "璁￠噺鍗曚綅ID", "瀹㈡埛ID", "HItemID", "hmainid", "hsubid", "HinterID", "杞﹂棿ID", "渚涘簲鍟咺D","HSTOCKORGID"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ var titleData = ["鐗╂枡ID", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�", "杈呭姪灞炴�D", "璁￠噺鍗曚綅ID", "瀹㈡埛ID", "HItemID", "hmainid", "hsubid", "HinterID", "杞﹂棿ID", "渚涘簲鍟咺D", "HSTOCKORGID","鎿嶄綔鍛業D","鐝粍ID"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
var HMaterID = "";
var HBatchNo = "";
@@ -223,7 +223,7 @@
var HMaterInfo = ""; //瀛樺偍鐗╂枡淇℃伅
var HBarInfo = ""; //瀛樺偍鏉＄爜淇℃伅
var HFileList = ""; //瀛樺偍妗ｆ鍒楄〃
- //#endregion
+ //#endregion
//鐩戝惉褰撳墠澶勪簬鍝竴涓〉绛撅紝浼� HModName 鍊�
element.on('tab(tab-TabTest)', function (data) {
@@ -236,7 +236,7 @@
table.reload('mainTable', {
data: HMaterInfo // 璋冪敤table.reload 閲嶆柊娓叉煋鏄剧ず鍔犺浇杩藉姞浜嗘暟鎹殑琛ㄦ牸
});
-
+
} else if (cur_title == "鏉＄爜淇℃伅") {
HModName = "Gy_BarCodeBill_1";
//鍒锋柊琛ㄦ牸鏁版嵁
@@ -251,7 +251,7 @@
//鍔犺浇妗ｆ鍒楄〃
table.reload('mainTable2', {
data: HFileList // 璋冪敤table.reload 閲嶆柊娓叉煋鏄剧ず鍔犺浇杩藉姞浜嗘暟鎹殑琛ㄦ牸
- });
+ });
}
})
@@ -263,11 +263,11 @@
//鍔犺浇宸ュ巶浠ｇ爜鏁版嵁
set_HWorksNumber();
//鍔犺浇鏉＄爜绫诲瀷鏁版嵁
- set_HBarCodeType();
+ set_HBarCodeType();
var rowdata = [{
"HMaterID": 0, "HMaterCode": "", "HMaterNumber": "", "HMaterName": "", "HMaterModel": "", "HMaterSpec": "", "HBatchNo": "", "HUnitID": 0, "HUnitNumber": "", "HUnitName": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HBQty": 0, "HMinQty": 0, "HPackQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HStockOrgID": sessionStorage["OrganizationID"], "HRemark": "", "HCoilNO": "", "HFurnaceNO": "", "HFactory": "",
- "HAuxQty": 0, "HheatNO": "", "HProduceDate": Format(new Date(), "yyyy-MM-dd"), "HExpiryDate": Format(new Date(), "yyyy-MM-dd"), "HExpirationDateFlag": 0
+ "HAuxQty": 0, "HheatNO": "", "HProduceDate": Format(new Date(), "yyyy-MM-dd"), "HExpiryDate": Format(new Date(), "yyyy-MM-dd"), "HExpirationDateFlag": 0, "HEmpID": 0, "HEmpNumber": "", "HEmpName": "", "HGroupID": 0, "HGroupNumber": "", "HGroupName": ""
}];
//鍒濆鍖栬〃鏍�
set_InitGrid();
@@ -288,19 +288,19 @@
else {
layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
}
- //#endregion
+ //#endregion
//#region 鐐瑰嚮浜嬩欢锛屽寘鎷琽n鍜宖orm浜嬩欢
//澶村伐鍏锋爮
table.on('toolbar(mainTable)', function (obj) {
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;;
- var AddRow = table.cache['mainTable'];
+ var AddRow = table.cache['mainTable'];
var NewRow = {
"HMaterID": 0, "HMaterCode": "", "HMaterNumber": "", "HMaterName": "", "HMaterModel": "", "HMaterSpec": "", "HBatchNo": "", "HUnitID": 0, "HUnitNumber": "", "HUnitName": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HBQty": 0, "HMinQty": 0, "HPackQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HStockOrgID": sessionStorage["OrganizationID"], "HRemark": "", "HCoilNO": "", "HFurnaceNO": "", "HFactory": "",
- "HAuxQty": 0, "HheatNO": "", "HProduceDate": Format(new Date(), "yyyy-MM-dd"), "HExpiryDate": Format(new Date(), "yyyy-MM-dd"), "HExpirationDateFlag": 0
- };
+ "HAuxQty": 0, "HheatNO": "", "HProduceDate": Format(new Date(), "yyyy-MM-dd"), "HExpiryDate": Format(new Date(), "yyyy-MM-dd"), "HExpirationDateFlag": 0, "HEmpID": 0, "HEmpNumber": "", "HEmpName": "", "HGroupID": 0, "HGroupNumber": "", "HGroupName": ""
+ };
//console.log(NewRow);
switch (obj.event) {
//鏂板涓�琛�
@@ -398,8 +398,7 @@
HBQty: 0, //绠辨暟=鏁伴噺/鏈�灏忓寘瑁呮暟閲�
});
}
- else
- {
+ else {
//鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
obj.update({
HQty: value, //鏁伴噺
@@ -411,7 +410,7 @@
value = isNaN(value) ? 0 : value;
HMinQty2 = value; //缁欐壒娆℃寜閽姛鑳戒腑鐨勬渶灏忓寘瑁呮暟璧嬪��
var HQty = isNaN(data.HQty) ? 0 : data.HQty;
- if (HQty == 0) //闄ゆ暟涓�0
+ if (HQty == 0) //闄ゆ暟涓�0
{
//鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
obj.update({
@@ -426,7 +425,7 @@
HBQty: Math.ceil(HQty / value), //绠辨暟=鏁伴噺/鏈�灏忓寘瑁呮暟閲�
});
}
-
+
break;
default:
}
@@ -490,7 +489,7 @@
title: '' + getSupType() + '鍒楄〃',
closeBtn: 1,
shift: 2,
- area: ['95%', '80%'],
+ area: ['95%', '95%'],
maxmin: true,
content: [url, 'yes'],
btn: ['纭畾', '鍙栨秷']
@@ -533,16 +532,17 @@
HBatchNo = result.list[0].HBatchNo;
if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
for (let i = 0; i < result.list.length; i++) {
- result.list[i].HQty = result.list[i].HQty.toString().match(/^\d+(?:\.\d{0,6})?/)[0] //淇濈暀灏忔暟鐐瑰悗鍏綅灏忔暟
+ result.list[i].HQty = result.list[i].HQty.toString().match(/^\d+(?:\.\d{0,6})?/)[0] //淇濈暀灏忔暟鐐瑰悗鍏綅灏忔暟
if (result.list[i].HMinQty != 0) {
- result.list[i].HBQty = Math.ceil(result.list[i].HQty / result.list[i].HMinQty)
- }
+ result.list[i].HBQty = Math.ceil(result.list[i].HQty / result.list[i].HMinQty)
+ }
}
-
+
BatchNoArray = result.list; //鑾峰彇鎵瑰彿锛岀敤鏉ョ粰鎵规鎸夐挳鍔熻兘涓殑鎵瑰彿璧嬪��
//for (let i = 0; i < result.list.length; i++) {
// result.list[i].HMinQty = '';//鐐瑰嚮鍗曞厓鏍肩殑鏃跺�欓粯璁ゅ��0涓嶄細娓呴櫎锛屽鎴风湅浜嗕細瑙夊緱寰堟�紝鎵�浠ュ厛鐢ㄧ┖瀛楃涓插彇浠�;
//}
+ console.log(result.list[0]);
table.reload('mainTable', {
data: result.list // 璋冪敤table.reload 閲嶆柊娓叉煋鏄剧ず鍔犺浇杩藉姞浜嗘暟鎹殑琛ㄦ牸
});
@@ -600,8 +600,7 @@
var HOrgType = $("#HOrgID").find("option:selected").html();
//鑾峰彇閫夋嫨鐨勫伐鍘備唬鐮�
var CampanyName = $("#HWorksNumber").find("option:selected").html();
- if (CampanyName == "" || CampanyName == null)
- {
+ if (CampanyName == "" || CampanyName == null) {
CampanyName = "xxx";
}
//鑾峰彇閫夋嫨鐨勬簮鍗曠被鍨�
@@ -617,7 +616,7 @@
//閲嶇疆
form.on('submit(ToolReset)', function (data) {
- layer.confirm('纭畾瑕佹竻绌哄綋鍓嶇晫闈俊鎭紝閲嶇疆鐣岄潰锛�',{
+ layer.confirm('纭畾瑕佹竻绌哄綋鍓嶇晫闈俊鎭紝閲嶇疆鐣岄潰锛�', {
btn: ['纭畾', '鍙栨秷'],
title: "鎻愮ず",
icon: 3,
@@ -627,7 +626,7 @@
$("#HDate").val(Format(new Date(), "yyyy-MM-dd")); //鍗曟嵁鏃ユ湡
$("#HSourceBillType").val('1'); //閫夋嫨涓嬫媺妗嗛粯璁ょ涓�涓�夐」
$("#HBarCodeType").val('0');
- var arr = [{ HBillNo: '', HMaterNumber: '', HMaterName: '', HMaterModel: '', HAuxPropNumber: '', HAuxPropName: '', HUnitNumber: '', HUnitName: '', HBatchNo: '', HGiveAwayFlag: '0', HQty: '0', HMinQty: '0', HPackQty: '0', HBQty: '0', HDate: '', HCusNumber: '', HCusName: '', HSeOrderBillNo: '', HRemark: '' }]
+ var arr = [{ HBillNo: '', HMaterNumber: '', HMaterName: '', HMaterModel: '', HAuxPropNumber: '', HAuxPropName: '', HUnitNumber: '', HUnitName: '', HBatchNo: '', HGiveAwayFlag: '0', HQty: '0', HMinQty: '0', HPackQty: '0', HBQty: '0', HDate: '', HCusNumber: '', HCusName: '', HSeOrderBillNo: '', HRemark: '', HEmpID: 0,HEmpNumber:'', HEmpName: '', HGroupID: 0,HGroupNumber:'', HGroupName: ''}]
table.reload('mainTable', {
data: arr // 璋冪敤table.reload 閲嶆柊娓叉煋鏄剧ず鍔犺浇杩藉姞浜嗘暟鎹殑琛ㄦ牸
});
@@ -635,6 +634,7 @@
"HBarCode": "", "HMaterNumber": "", "HMaterName": "", "HMaterModel": "", "HAuxPropNumber": "", "HAuxPropName": ""
, "HGiveAwayFlag": "", "HUnitCode": "", "HUnitName": "", "HQty": 0, "HDate": "", "HCusNumber": "", "HCusName": ""
, "HSourceBillNo": "", "HSeOrderBillNo": "", "HRemark": "", "HMTONo": "", "HShowDate": "", "HInnerBillNo": "", "HMaker": ""
+ , "HEmpID": 0, "HEmpNumber": "", "HEmpName": "", "HGroupID": 0, "HGroupNumber": "", "HGroupName": ""
}]
table.reload('mainTable1', {
data: arr1 // 璋冪敤table.reload 閲嶆柊娓叉煋鏄剧ず鍔犺浇杩藉姞浜嗘暟鎹殑琛ㄦ牸
@@ -646,7 +646,7 @@
table.reload('mainTable2', {
data: [] // 璋冪敤table.reload 閲嶆柊娓叉煋鏄剧ず鍔犺浇杩藉姞浜嗘暟鎹殑琛ㄦ牸
});
- layer.close(index)
+ layer.close(index)
})
})
@@ -670,7 +670,7 @@
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
- var arr = [{ HBillNo: '', HMaterNumber: checkStatus.data[0].鐗╂枡浠ｇ爜, HMaterName: checkStatus.data[0].鐗╂枡鍚嶇О, HMaterModel: '', HAuxPropNumber: '', HAuxPropName: '', HUnitNumber: checkStatus.data[0].璁￠噺鍗曚綅浠ｇ爜, HUnitName: checkStatus.data[0].璁￠噺鍗曚綅, HBatchNo: '', HGiveAwayFlag: '0', HQty: checkStatus.data[0].鏁伴噺.toString("#0.00"), HMinQty: checkStatus.data[0].鏈�灏忓寘瑁呮暟, HPackQty: '0', HBQty: '0', HDate: '', HCusNumber: '', HCusName: '', HSeOrderBillNo: '', HRemark: '' }]
+ var arr = [{ HBillNo: '', HMaterNumber: checkStatus.data[0].鐗╂枡浠ｇ爜, HMaterName: checkStatus.data[0].鐗╂枡鍚嶇О, HMaterModel: '', HAuxPropNumber: '', HAuxPropName: '', HUnitNumber: checkStatus.data[0].璁￠噺鍗曚綅浠ｇ爜, HUnitName: checkStatus.data[0].璁￠噺鍗曚綅, HBatchNo: '', HGiveAwayFlag: '0', HQty: checkStatus.data[0].鏁伴噺.toString("#0.00"), HMinQty: checkStatus.data[0].鏈�灏忓寘瑁呮暟, HPackQty: '0', HBQty: '0', HDate: '', HCusNumber: '', HCusName: '', HSeOrderBillNo: '', HRemark: '', HEmpID: 0,HEmpNumber:'', HEmpName: '', HGroupID: 0,HGroupNumber:'', HGroupName: '' }]
//鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
table.reload('mainTable', {
data: arr // 璋冪敤table.reload 閲嶆柊娓叉煋鏄剧ず鍔犺浇杩藉姞浜嗘暟鎹殑琛ㄦ牸
@@ -696,7 +696,7 @@
success: function (data1) {
if (data1.code == 1) {
layer.alert(data1.Message)
- }
+ }
}, error: function () {
layer.close(index);
layer.alert(data1.Message, { icon: 5 });
@@ -826,22 +826,28 @@
columns = [
{ type: 'checkbox', fixed: 'left' }
, { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe", width: 75 }
- , { field: 'HMainID', title: '婧愬崟涓诲唴鐮�', width: 100, hide: true }
- , { field: 'HSubID', title: '婧愬崟瀛愬唴鐮�', width: 100, hide: true }
+ , { field: 'HMainID', title: '婧愬崟涓诲唴鐮�', width: 100, hide: true }
+ , { field: 'HSubID', title: '婧愬崟瀛愬唴鐮�', width: 100, hide: true }
, { field: 'HBillNo', title: '婧愬崟鍗曞彿', width: 200 }
- , { field: 'HMaterID', title: '鐗╂枡ID', width: 100, hide: true }
+ , { field: 'HMaterID', title: '鐗╂枡ID', width: 100, hide: true }
, { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', edit: 'text', event: 'HMaterNumber', width: 200 }
- , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 200 }
+ , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 200 }
, { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 200 }
+ , { field: 'HEmpID', title: '鎿嶄綔鍛業D', width: 100, hide: true }
+ , { field: 'HEmpNumber', title: '鎿嶄綔鍛樹唬鐮�', edit: 'text', width: 200, event: 'HEmpNumber'}
+ , { field: 'HEmpName', title: '鎿嶄綔鍛�', width: 200 }
+ , { field: 'HGroupID', title: '鐝粍ID', width: 100, hide: true }
+ , { field: 'HGroupNumber', title: '鐝粍浠ｇ爜', edit: 'text', width: 200, event: 'HGroupNumber' }
+ , { field: 'HGroupName', title: '鐝粍鍚嶇О', width: 200 }
, { field: 'HBatchNo', title: '鎵瑰彿', edit: 'text', width: 100 }
- , { field: 'HQty', title: '鏁伴噺', edit: 'text', width: 100, totalRow: true}
+ , { field: 'HQty', title: '鏁伴噺', edit: 'text', width: 100, totalRow: true }
, { field: 'HMinQty', title: '鏈�灏忓寘瑁呮暟', edit: 'text', totalRow: true, width: 100 }
, { field: 'HBQty', title: '绠辨暟', width: 100, totalRow: true }
- , { field: 'HPackQty', title: '澶栫鏁�', edit: 'text', width: 100, totalRow: true}
+ , { field: 'HPackQty', title: '澶栫鏁�', edit: 'text', width: 100, totalRow: true }
, { field: 'HCoilNO', title: '閽㈠嵎鎹嗗寘鍙�', edit: 'text', width: 100 }
, { field: 'HFurnaceNO', title: '鐐夊彿', edit: 'text', width: 100 }
, { field: 'HFactory', title: '鍘傚晢', edit: 'text', width: 100 }
- , { field: 'HCusID', title: '瀹㈡埛ID', width: 100, hide: true }
+ , { field: 'HCusID', title: '瀹㈡埛ID', width: 100, hide: true }
, { field: 'HCusNumber', title: '瀹㈡埛浠ｇ爜', edit: 'text', event: 'HCusNumber', width: 120 }
, { field: 'HCusName', title: '瀹㈡埛鍚嶇О', width: 120 }
, { field: 'HSeOrderBillNo', title: '閿�鍞鍗曞彿', width: 200 }
@@ -849,16 +855,16 @@
, { field: 'HProduceDate', title: '鐢熶骇鏃ユ湡', event: 'HProduceDate', width: 100 }
, { field: 'HExpiryDate', title: '淇濊川鏈熻嚦', event: 'HExpiryDate', width: 100 }
, { field: 'HheatNO', title: '鐑鐞�', edit: 'text', width: 100 }
- , { field: 'HAuxPropID', title: '杈呭姪灞炴�D', width: 100, hide: true }
+ , { field: 'HAuxPropID', title: '杈呭姪灞炴�D', width: 100, hide: true }
, { field: 'HAuxPropNumber', title: '杈呭姪灞炴�т唬鐮�', edit: 'text', event: 'HAuxPropNumber', width: 100 }
- , { field: 'HAuxPropName', title: '杈呭姪灞炴�у悕绉�', width: 100 }
+ , { field: 'HAuxPropName', title: '杈呭姪灞炴�у悕绉�', width: 100 }
, { field: 'HUnitID', title: '璁￠噺鍗曚綅ID', width: 100, hide: true }
, { field: 'HUnitNumber', title: '璁￠噺鍗曚綅浠ｇ爜', edit: 'text', event: 'HUnitNumber', width: 100 }
- , { field: 'HUnitName', title: '璁￠噺鍗曚綅',width: 100 }
+ , { field: 'HUnitName', title: '璁￠噺鍗曚綅', width: 100 }
, { field: 'HAuxQty', title: '杈呭崟浣嶆暟閲�', edit: 'text', width: 100, totalRow: true }
, { field: 'HExpirationDateFlag', title: '鏄惁鍚敤淇濊川鏈�', width: 100, templet: '#switchTp3', unresize: false }
, { field: 'HGiveAwayFlag', title: '鏄惁璧犲搧', width: 100, templet: '#switchTpl', unresize: false }
- , { field: 'HDate', title: '杩涙枡鏃ユ湡', width: 100 }
+ , { field: 'HDate', title: '杩涙枡鏃ユ湡', width: 100 }
, { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
];
option = {
@@ -875,7 +881,7 @@
}
};
option.data = rowdata;
- table.render(option);
+ table.render(option);
}
//鍒濆鏉＄爜淇℃伅琛ㄦ牸
function set_CountGrid() {
@@ -906,7 +912,7 @@
option1 = {
id: 'mainTable1'
, elem: '#mainTable1'
- , toolbar: '#toolbarDemo1'
+ , toolbar: '#toolbarDemo1'
, page: false
, limit: 500
, cellMinWidth: 120
@@ -975,7 +981,7 @@
option2 = {
id: 'mainTable2'
, elem: '#mainTable2'
- , toolbar: '#toolbarDemo2'
+ , toolbar: '#toolbarDemo2'
, page: false
, limit: 500
, cellMinWidth: 120
@@ -992,7 +998,7 @@
, "HAuxPropID": 0, "HAuxPropNumber": "", "HAuxPropName": "", "HUnitID": 0, "HUnitNumber": "", "HUnitName": "", "HBatchNo": "", "HGiveAwayFlag": 0
, "HQty": 0, "HMinQty": '', "HBQty": 0, "HPackQty": 0, "HDate": "", "HCusID": 0, "HCusNumber": "", "HCusName": "", "HSeOrderBillNo": "", "HRemark": ""
, "HCoilNO": "", "HFurnaceNO": "", "HFactory": "",
- "HAuxQty": 0, "HheatNO": "", "HProduceDate": Format(new Date(), "yyyy-MM-dd"), "HExpiryDate": Format(new Date(), "yyyy-MM-dd"), "HExpirationDateFlag": 0
+ "HAuxQty": 0, "HheatNO": "", "HProduceDate": Format(new Date(), "yyyy-MM-dd"), "HExpiryDate": Format(new Date(), "yyyy-MM-dd"), "HExpirationDateFlag": 0, "HEmpID": 0, "HEmpNumber": "", "HEmpName": "", "HGroupID": 0, "HGroupNumber": "", "HGroupName": ""
}];
table.render(option);
//鍒锋柊琛ㄦ牸鏁版嵁
@@ -1006,7 +1012,7 @@
"HBarCode": "", "HMaterNumber": "", "HMaterName": "", "HMaterModel": "", "HAuxPropNumber": "", "HAuxPropName": ""
, "HGiveAwayFlag": "", "HUnitCode": "", "HUnitName": "", "HQty": 0, "HDate": "", "HCusNumber": "", "HCusName": ""
, "HSourceBillNo": "", "HSeOrderBillNo": "", "HRemark": "", "HMTONo": "", "HShowDate": "", "HInnerBillNo": "", "HMaker": ""
- , "HExpirationDateFlag": 0
+ , "HExpirationDateFlag": 0, "HEmpID": 0, "HEmpNumber": "", "HEmpName": "", "HGroupID": 0, "HGroupNumber": "", "HGroupName": ""
}];
table.render(option1);
//鍒锋柊琛ㄦ牸鏁版嵁
@@ -1092,7 +1098,7 @@
colName += option2.cols[0][i]["title"] + ",";
}
}
-
+
var contentUrl = "";
var urlStr = window.document.location.pathname;//鑾峰彇鏂囦欢璺緞
var urlLen = urlStr.split('/');
@@ -1142,12 +1148,14 @@
var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
-
+
dataCol = data1.data[0].HGridString.split(',');
for (var i = 0; i < option.cols[0].length - 2; i++) {
- var dataCols = dataCol[i].split('|');
+ if (dataCol[i]) {
+ var dataCols = dataCol[i].split('|');
+ }
//闅愯棌鍒�
if (dataCols[1] == 1) {
option.cols[0][i + 1]["hide"] = true;
@@ -1408,8 +1416,8 @@
function set_GridCellCheck(obj) {
$(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
if (event.key == "F7") {
- //妯″叿淇℃伅 濡傛灉鍦ㄦā鍏蜂唬鐮佸垪 鎸塅7
- if (obj.event === 'HMaterNumber') //妯″叿淇℃伅 濡傛灉鍦ㄦā鍏蜂唬鐮佸垪 鎸塅7
+ //鐗╂枡淇℃伅 濡傛灉鍦ㄧ墿鏂欎唬鐮佸垪 鎸塅7
+ if (obj.event === 'HMaterNumber') //鐗╂枡淇℃伅 濡傛灉鍦ㄦā鍏蜂唬鐮佸垪 鎸塅7
{
//椤甸潰灞�-鑷畾涔� //F7閫夋嫨妯″叿
layer.open({
@@ -1583,6 +1591,88 @@
}
});
}
+ //鎿嶄綔鍛樹唬鐮�
+ if (obj.event === 'HEmpNumber') //鎿嶄綔鍛樹唬鐮�
+ {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '鎿嶄綔鍛樺垪琛�',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.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('璇烽�夋嫨鏁版嵁');
+ }
+
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ obj.update({
+ HEmpID: checkStatus.data[0].HItemID,
+ HEmpNumber: checkStatus.data[0].鑱屽憳浠ｇ爜,
+ HEmpName: checkStatus.data[0].鑱屽憳鍚嶇О,
+ });
+
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ }
+ });
+ }
+ //鐝粍浠ｇ爜
+ if (obj.event === 'HGroupNumber') //鐝粍浠ｇ爜
+ {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '鐝粍鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../鍩虹璧勬枡/宸ヨ祫鍩虹璧勬枡/Gy_Group.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('璇烽�夋嫨鏁版嵁');
+ }
+
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ obj.update({
+ HGroupID: checkStatus.data[0].HItemID,
+ HGroupNumber: checkStatus.data[0].鐝粍浠ｇ爜,
+ HGroupName: checkStatus.data[0].鐝粍鍚嶇О,
+ });
+
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ }
+ });
+ }
obj.event = "";
return false;
}
@@ -1610,12 +1700,12 @@
});
HBarInfo = result.list;
//鐢熸垚鎴愬姛璺宠浆鍒版潯鐮佷俊鎭爣绛鹃〉
- element.tabChange('tab-TabTest', '3');
+ element.tabChange('tab-TabTest', '3');
//鍔犺浇妗ｆ鍒楄〃
table.reload('mainTable2', {
data: result.data // 璋冪敤table.reload 閲嶆柊娓叉煋鏄剧ず鍔犺浇杩藉姞浜嗘暟鎹殑琛ㄦ牸
});
- HFileList = result.data;
+ HFileList = result.data;
}
else {
$('#ToolCreate').removeClass("layui-btn-disabled").attr("disabled", false);//鐢熸垚鎸夐挳鍚敤
@@ -1635,7 +1725,7 @@
, dataArr = checkStatus.data;
//鐢变簬鏉＄爜淇℃伅鍒楄〃涓病鏈� HItemID 瀛楁锛屾墍浠ラ噰鍙栦簡鐢� 鏉＄爜缂栧彿 鍘昏幏鍙� HItemID 鐨勬柟寮�
- if (checkStatus.data.length>0) {
+ if (checkStatus.data.length > 0) {
var rows = [];
for (var i = 0; i < dataArr.length; i++) {
rows.push(dataArr[i].HItemID.toString());
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_TechnologyParameterList.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_TechnologyParameterList.html"
index c016d96..4e01cab 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_TechnologyParameterList.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_TechnologyParameterList.html"
@@ -11,6 +11,7 @@
<script src="../../../layuiadmin/layui/layui.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>
</head>
<body>
<div class="layui-fluid">
@@ -111,6 +112,9 @@
var HModName = "Gy_TechnologyParameterList";
//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
var titleData = ["HItemID"];
+ var params = get_UrlVars();
+ var Type = params[params[0]] == null ? "HTechParam" : params[params[0]];
+ var OperationType = params[params[1]] == null ? 1 : params[params[1]]; //1涓虹洿鎺ュ垪琛ㄦā鍧楁墦寮� 2涓轰粠鍏朵粬妯″潡鎵撳紑鍩虹璧勬枡鍒楄〃
//#endregion
//#region 杩涘叆椤甸潰鍗冲姞杞�
@@ -180,7 +184,16 @@
table.on('rowDouble(mainTable)', function (obj) {
var data = [];
data.push(obj.data);
- parent.GetParameterValue(data);
+ switch (Type) {
+ case "HTechParam": //琛ㄥご鍙屽嚮杩斿洖
+ parent.GetParameterValue(data);
+ break;
+ case "HTechParamList": //鍒楄〃鍙屽嚮杩斿洖
+ var dataList = obj.data;
+ //杩斿洖鏂规硶
+ parent.GetParameterListValue(dataList);
+ break;
+ }
var index = parent.layer.getFrameIndex(window.name);
parent.layer.close(index);
});
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_TechnologyParameterUnitList.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_TechnologyParameterUnitList.html"
index 8ee7d3f..ae18d7b 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_TechnologyParameterUnitList.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_TechnologyParameterUnitList.html"
@@ -11,6 +11,7 @@
<script src="../../../layuiadmin/layui/layui.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>
</head>
<body>
<div class="layui-fluid">
@@ -111,6 +112,9 @@
var HModName = "Gy_TechnologyParameterUnitList";
//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
var titleData = ["HItemID"];
+ var params = get_UrlVars();
+ var Type = params[params[0]] == null ? "HTechParamUnit" : params[params[0]];
+ var OperationType = params[params[1]] == null ? 1 : params[params[1]]; //1涓虹洿鎺ュ垪琛ㄦā鍧楁墦寮� 2涓轰粠鍏朵粬妯″潡鎵撳紑鍩虹璧勬枡鍒楄〃
//#endregion
//#region 杩涘叆椤甸潰鍗冲姞杞�
@@ -178,7 +182,16 @@
table.on('rowDouble(mainTable)', function (obj) {
var data = [];
data.push(obj.data);
- parent.GetTechnologyParameterUnitValue(data);
+ switch (Type) {
+ case "HTechParamUnit": //琛ㄥご鍙屽嚮杩斿洖
+ parent.GetTechnologyParameterUnitValue(data);
+ break;
+ case "HTechParamUnitList": //鍒楄〃鍙屽嚮杩斿洖
+ var dataList = obj.data;
+ //杩斿洖鏂规硶
+ parent.GetTechnologyParameterUnitListValue(dataList);
+ break;
+ }
var index = parent.layer.getFrameIndex(window.name);
parent.layer.close(index);
});
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/HBarPlanPrint.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/HBarPlanPrint.html"
index 10cd73c..ee9698d 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/HBarPlanPrint.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/HBarPlanPrint.html"
@@ -281,6 +281,10 @@
case "Xs_SeOrderBill_StockInCodeNote": //閿�鍞鍗� 鍏ュ簱鐮佸崟
CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlLBM_Xs_SeOrderBill_StockInCodeNote.aspx?linterid=" + value, true, "");
break;
+ case "HBarCodePrint"://鐗╂枡鏉＄爜鎵撳嵃
+ //CreateDisplayViewerEx("100%", "100%", "../../views/grf/" + OpenTmp + ".grf", "../../views/SRM/xmlSRM_Web_BarCodeBillList.aspx?linterid=" + value, true, "");
+ CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlSRM_Web_BarCodeBillList.aspx?linterid=" + value, true, "");
+ break;
}
</script>
</body>
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/xmlSRM_Web_BarCodeBillList.aspx" "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/xmlSRM_Web_BarCodeBillList.aspx"
new file mode 100644
index 0000000..26d5f47
--- /dev/null
+++ "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/xmlSRM_Web_BarCodeBillList.aspx"
@@ -0,0 +1,26 @@
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="xmlSRM_Web_BarCodeBillList.aspx.cs" Inherits="WebTM.views.鍩虹璧勬枡.鍏敤鍩虹璧勬枡.xmlSRM_Web_BarCodeBillList" %>
+
+<!DOCTYPE html>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+ <title></title>
+ <script runat="server">
+ protected void Page_Load(object sender, EventArgs e)
+ {
+ //鈽呯壒鍒彁绀衡槄锛�
+ //涓嶅悓鐨勬暟鎹簱搴旇閫夌敤涓嶅悓鐨勬姤琛╔ML鏁版嵁鐢熸垚绫伙紝SQL Server鏁版嵁搴撶敤SqlXMLReportData锛孫racle鏁版嵁搴撶敤OracleXMLReportData
+ //OledbXMLReportData閫傚悎浜嶢ccess绛夋湰鍦版暟鎹簱锛屼负浜嗘紨绀烘柟渚匡紝杩欓噷浠嶨rid++Report鐨凙ccess渚嬪瓙鏁版嵁搴撲腑鑾峰彇鎶ヨ〃鏁版嵁
+
+ SqlXMLReportData.GenOneRecordset(this, "select a.HBarCode_White HBarCode_White,temp.HSupPartName HSupPartName,temp.HSupBarCodeNumber MFGPartNumber,temp.HCountryType CountryofOrigin,(select REPLACE(item, 'Q', '') from split(a.HBarCode_White, ':') where id = 6) Quantity, temp.HGrossWeight GrossWeight, temp.HPARTNAME PartName , (select item from split(a.HBarCode_White, ':') where id = 2) ContentLabelID , temp.HSupNumber Supplier, REPLACE(convert(varchar(10), GETDATE(), 20), '-', '') + ' ' + convert(varchar(5), GETDATE(), 24) MFGDate , REPLACE(convert(varchar(10), GETDATE(), 20), '-', '') SupplierLotCode , (select REPLACE(item, 'P', '') from split(a.HBarCode_White, ':') where id = 4) BBM from Sc_PackUnionBillMain a left join Gy_Material m on a.HMaterID = m.HItemID left join Sc_PackUnionBillBarCode_temp temp on m.HNumber = temp.HMaterNumber where a.HInterID in(" + Request.Params["linterid"] + ")");
+ }
+ </script>
+</head>
+<body>
+ <form id="form1" runat="server">
+ <div>
+ </div>
+ </form>
+</body>
+</html>
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/xmlSRM_Web_BarCodeBillList.aspx.cs" "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/xmlSRM_Web_BarCodeBillList.aspx.cs"
new file mode 100644
index 0000000..049244f
--- /dev/null
+++ "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/xmlSRM_Web_BarCodeBillList.aspx.cs"
@@ -0,0 +1,17 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+
+namespace WebTM.views.鍩虹璧勬枡.鍏敤鍩虹璧勬枡
+{
+ public partial class xmlSRM_Web_BarCodeBillList : System.Web.UI.Page
+ {
+ protected void Page_Load(object sender, EventArgs e)
+ {
+
+ }
+ }
+}
\ 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/xmlSRM_Web_BarCodeBillList.aspx.designer.cs" "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/xmlSRM_Web_BarCodeBillList.aspx.designer.cs"
new file mode 100644
index 0000000..8374d22
--- /dev/null
+++ "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/xmlSRM_Web_BarCodeBillList.aspx.designer.cs"
@@ -0,0 +1,26 @@
+锘�//------------------------------------------------------------------------------
+// <鑷姩鐢熸垚>
+// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
+//
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
+// </鑷姩鐢熸垚>
+//------------------------------------------------------------------------------
+
+namespace WebTM.views.鍩虹璧勬枡.鍏敤鍩虹璧勬枡
+{
+
+
+ public partial class xmlSRM_Web_BarCodeBillList
+ {
+
+ /// <summary>
+ /// form1 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+ }
+}
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DotCheckList.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DotCheckList.html"
index 3e54945..3f4733a 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DotCheckList.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DotCheckList.html"
@@ -9,12 +9,19 @@
<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/layui/layui1.js"></script>
<script src="../../../layuiadmin/treeTable.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/layui/lay/modules/util.js"></script>
<script src="../../../layuiadmin/PubCustom.js"></script>
+ <style>
+ /*鏍戠姸鍥剧偣鍑婚珮浜彉鑹�*/
+ .layui-tree-set-active > .layui-tree-entry .layui-tree-main {
+ background: #aef0f7;
+ }
+ </style>
<style media="screen">
.custom-tree-item-clicked {
color: #FC9003
@@ -81,7 +88,16 @@
</div>
</div>
</div>
- <table class="" id="mainTable" lay-filter="mainTable"></table>
+ <div class="layui-row" style="padding:10px 0">
+ <div class="layui-col-xs3 layui-inline" style="border: solid 1.5px #e0d6d64d;">
+ <div id="TreeTable" class="demo-tree demo-tree-box"></div>
+ </div>
+ <div class="layui-col-xs8 layui-inline" style="padding-left: 10px; width: 73%">
+ <div>
+ <table class="" id="mainTable" lay-filter="mainTable"></table>
+ </div>
+ </div>
+ </div>
<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>
@@ -233,6 +249,8 @@
//鏌ヨ
get_Display(sWhere);
+ //鏌ヨ璁惧鍒嗙被
+ get_Display_Tree();
}
//#region鍒濆鍖栬〃鏍�
@@ -580,6 +598,90 @@
}
+ // 鏍戠姸鍥炬煡璇�
+ function get_Display_Tree() {
+ var ajaxLoad = layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/Gy_DotCheckBill/TreeGetList',
+ type: "GET",
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.count == 1) {
+ layer.close(ajaxLoad);
+ var data = JSON.parse(data1.data);
+ MenuMain(data);
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+
+ //閬嶅巻鐢熸垚涓昏彍鍗�
+ function MenuMain(data) {
+ var liStr = '[';
+ //閬嶅巻鐢熸垚涓昏彍鍗�
+ for (var i = 0; i < data.length; i++) {
+ // 鍒ゆ柇鏄惁瀛樺湪瀛愯彍鍗�
+ if (data[i].children != null && data[i].children.length > 0) {
+ liStr += '{"title": "' + data[i].id + "-" + data[i].title + '", "id": "' + data[i].id + '","spread":true, "children":[ ';
+ // 閬嶅巻鑾峰彇瀛愯彍鍗�
+ for (var k = 0; k < data[i].children.length; k++) {
+ liStr += getChildMenu(data[i].children[k], 0);
+ }
+ liStr = liStr.substring(0, liStr.length - 1);
+ liStr += ']},';
+ } else {
+ liStr += '{"title": "' + data[i].id + "-" + data[i].title + '", "id": "' + data[i].id + '"},';
+ }
+ };
+ liStr = liStr.substring(0, liStr.length - 1);
+ liStr += "]";
+ var treeTable = JSON.parse(liStr);
+ tree.render({
+ elem: '#TreeTable' //榛樿鏄偣鍑昏妭鐐瑰彲杩涜鏀剁缉
+ , data: treeTable
+ , click: function (obj) {
+ //楂樹寒鍙樿壊
+ $(".layui-tree-set").removeClass('layui-tree-set-active');
+ obj.elem.addClass('layui-tree-set-active');
+
+ var data = obj.data; //鑾峰彇褰撳墠鐐瑰嚮鐨勮妭鐐规暟鎹�
+ var sql = "";
+ if (data.id == "0") {
+ sql = "";
+ } else {
+ sql = " and HDotCheckItemClassID='" + data.id + "' ";
+ }
+ get_Display(sql);
+ }
+ });
+ }
+
+ // 閫掑綊鐢熸垚瀛愯彍鍗�
+ function getChildMenu(subMenu, num) {
+ num++;
+ var subStr = '';
+ if (subMenu.children != null && subMenu.children.length > 0) {
+ subStr += '{"title": "' + subMenu.id + "-" + subMenu.title + '", "id": "' + subMenu.id + '", "children":[';
+ for (var j = 0; j < subMenu.children.length; j++) {
+ subStr += getChildMenu(subMenu.children[j], num);
+ if (j + 1 == subMenu.children.length) {
+ subStr = subStr.substring(0, subStr.length - 1);
+ }
+ }
+ subStr += ']},';
+ } else {
+ subStr += '{"title": "' + subMenu.id + "-" + subMenu.title + '", "id": "' + subMenu.id + '"},';
+ }
+ return subStr;
+ }
+
+
//#region 闅愯棌鍒楄缃�
function get_HideColumn() {
var colName = "";
@@ -615,6 +717,7 @@
})
}
//#endregion
+
//#region 鏄剧ず鍒楁暟鎹�
function DisPlay_HideColumn() {
$.ajax({
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Source.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Source.html"
index 9f4a49f..9b21987 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Source.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Source.html"
@@ -411,7 +411,7 @@
, "HRemark": data.澶囨敞
, "HUSEORGID": data.HUSEORGID
, "HMacAddr": data.mac鍦板潃
- , "HEmpID": data.HEmpID
+ , "HEmpID": data.HEmpID == undefined ? 0 : data.HEmpID
, "HEmpName": data.璐熻矗浜�
});
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldDotCheckBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldDotCheckBillList.html"
index c686dfa..1c1105d 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldDotCheckBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldDotCheckBillList.html"
@@ -68,7 +68,7 @@
<label class="layui-form-label">浜у搧鍣ㄥ叿<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input type="text" name="HMouldName" id="HMouldName" class="layui-input" value="" style="float:left;width:150px;">
- <input type="hidden" name="HMouldID" id="HMouldID" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HMouldID" id="HMouldID" class="layui-input" value="0" style="float:left;width:150px;">
<button type="button" lay-submit="" class="layui-btn" lay-filter="HMouldList" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
@@ -86,7 +86,7 @@
<label class="layui-form-label">鐐规璁″垝缂栧彿<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input type="text" name="HPlanNo" id="HPlanNo" class="layui-input" value="" style="float:left;width:150px;">
- <input type="hidden" name="HPlanInterID" id="HPlanInterID" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HPlanInterID" id="HPlanInterID" class="layui-input" value="0" style="float:left;width:150px;">
<button type="button" lay-submit="" class="layui-btn" lay-filter="HPlanInterList" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
@@ -108,7 +108,7 @@
<label class="layui-form-label" style="width:95px;">鍣ㄥ叿鐐规瑙勭▼<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input type="text" name="HMouldDotCheckRuleName" id="HMouldDotCheckRuleName" class="layui-input" value="" style="float:left;width:150px;">
- <input type="hidden" name="HMouldDotCheckRuleID" id="HMouldDotCheckRuleID" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HMouldDotCheckRuleID" id="HMouldDotCheckRuleID" class="layui-input" value="0" style="float:left;width:150px;">
<button type="button" lay-submit="" class="layui-btn" lay-filter="btnHMouldDotCheckRule" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
@@ -897,15 +897,15 @@
, "HExplanation": data.鎽樿
, "HRemark": data.澶囨敞
//, "HPlanNo": data.鐐规璁″垝缂栧彿
- , "HPlanInterID": data.HPlanInterID
+ , "HPlanInterID": data.HPlanInterID == undefined ? 0 : data.HPlanInterID
, "HPlanNo": data.鐐规璁″垝鍐呯爜
- , "HMouldID": data.HMouldID
+ , "HMouldID": data.HMouldID == undefined ? 0 : data.HPlanInterID
, "HMouldDotCheckRuleName": data.鍣ㄥ叿鐐规瑙勭▼鍗曟嵁鍙�
- , "HMouldDotCheckRuleID": data.HMouldDotCheckRuleID
+ , "HMouldDotCheckRuleID": data.HMouldDotCheckRuleID == undefined ? 0 : data.HPlanInterID
, "HErrNote": data.寮傚父鎯呭喌璁板綍 //寮傚父鎯呭喌璁板綍
, "HBigSafeNote": data.閲嶅ぇ瀹夊叏闅愭偅璁板綍 //閲嶅ぇ瀹夊叏闅愭偅璁板綍
, "HDotCheckNote": data.鐐规鏁版嵁 //鐐规鏁版嵁
- , "HShiftsID": data.HShiftsID //
+ , "HShiftsID": data.HShiftsID == undefined ? 0 : data.HPlanInterID
, "HShiftsName": data.鐝鍚嶇О //鐝鍚嶇О
});
if (data.鏈�缁堢粨璁� == "涓嶅悎鏍�") {
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/Sc_Add_MESExecptFeedBackBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/Sc_Add_MESExecptFeedBackBillList.html"
index 3a82337..e4113d3 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/Sc_Add_MESExecptFeedBackBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/Sc_Add_MESExecptFeedBackBillList.html"
@@ -169,7 +169,7 @@
<div class="layui-inline">
<label class="layui-form-label">鎶勯��:</label>
- <div >
+ <div>
<input type="text" name="HCopyMan" id="HCopyMan" class="layui-input" value="" style="float:left;width:1035px;" disabled>
<button type="button" lay-submit="" class="layui-btn" lay-filter="HCopyManList" id="HCopyManList" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
@@ -278,6 +278,15 @@
<label class="layui-form-label">鍌績娆℃暟:</label>
<div class="layui-input-inline">
<input class="layui-input" name="HHasten" lay-verify="HHasten" id="HHasten" autocomplete="off" value="0">
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label">鎸囨淳澶勭悊浜�:</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HHandleEmpName" id="HHandleEmpName" class="layui-input" value="" style="float:left;" disabled>
+ <input type="hidden" name="HHandleEmpID" id="HHandleEmpID" class="layui-input" value="0" style="float:left;">
</div>
</div>
</div>
@@ -402,7 +411,7 @@
}).extend({
index: 'lib/index' //涓诲叆鍙ｆā鍧�
}).use(['index', 'form', 'laydate', 'table', 'element'], function () {
- //#region 鍏敤鍙橀噺
+ //#region 鍏敤鍙橀噺
var $ = layui.$
, admin = layui.admin
, layer = layui.layer
@@ -470,8 +479,7 @@
}
//鏃犳簮鍗曟柊澧�
- function set_AddFNew()
- {
+ function set_AddFNew() {
//鍔犳簮鍗曠被鍨嬪尯鍒�(鍙互鍐欎笉鍚岀殑鏂规硶)
refSav = "Add";
//鍒濆鍩烘湰淇℃伅璧嬪��
@@ -531,8 +539,7 @@
}
//缂栬緫
- function set_EditFromGrid()
- {
+ function set_EditFromGrid() {
refSav = "Update";
form.render('select');
$.ajax({
@@ -561,9 +568,11 @@
, "HMainSourceEntryID": data.HSourceEntryID //婧愬崟瀛怚D
, "HMainSourceBillNo": data.HSourceBillNo //婧愬崟鍗曞彿
, "HMainSourceBillType": data.HSourceBillType //婧愬崟绫诲瀷
- , "HHasten": data.HHasten
- , "HMaterName": data.HMaterName
- , "HMaterModel": data.HMaterModel
+ , "HHasten": data.HHasten
+ , "HMaterName": data.HMaterName
+ , "HHandleEmpID": data.HHandleEmpID
+ , "HHandleEmpName": data.HHandleEmpName
+ , "HMaterModel": data.HMaterModel
, "HQty": data.HQty
, "HDescription": data.HDescription
, "HRemark": data.HRemark
@@ -610,7 +619,7 @@
$("#HInterID").val(linterid);//淇敼鏃朵富琛↖D
}
- //鑾峰彇涓嬫媺閫変腑鍊�
+ //鑾峰彇涓嬫媺閫変腑鍊�
form.on('select(SourceType)', function (data) {
Sctag = data.value;
form.render('select');
@@ -652,14 +661,14 @@
layer.confirm(data.Message, {
btn: ['纭']
}, function (index) {
- if (data.Verify == "Y") //鑷姩瀹℃牳
- {
- layer.close(index);
- SaveVerify(); //瀹℃牳
- }
- else {
- layer.close(index);
- }
+ if (data.Verify == "Y") //鑷姩瀹℃牳
+ {
+ layer.close(index);
+ SaveVerify(); //瀹℃牳
+ }
+ else {
+ layer.close(index);
+ }
});
}
else {
@@ -678,8 +687,7 @@
});
//瀹℃牳鎻愪氦
- function SaveVerify()
- {
+ function SaveVerify() {
var InterID = $("#HInterID").val();
if (!AllowLoadData())//鏁版嵁楠岃瘉
{
@@ -799,7 +807,7 @@
});
});
-
+
//鎺ユ敹閮ㄩ棬
form.on('submit(HRecDeptList)', function () {
HDeptType = 2;
@@ -990,6 +998,7 @@
});
});
+
//浠ヤ笂涓簂ayui妯″潡
});
@@ -1019,7 +1028,7 @@
layer.msg("鎺ユ敹浜轰笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
}
-
+
if (OperationType == "2") {
if ($("#HMainSourceInterID").val() == '' || $("#HMainSourceInterID").val() == null) {
layer.msg("婧愬崟鍗曞彿涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\201\234\345\267\245/Sc_Add_MESStopStepWorkBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\201\234\345\267\245/Sc_Add_MESStopStepWorkBillList.html"
index 7b5b38b..ae37770 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\201\234\345\267\245/Sc_Add_MESStopStepWorkBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\201\234\345\267\245/Sc_Add_MESStopStepWorkBillList.html"
@@ -2,7 +2,7 @@
<html>
<head>
<meta charset="utf-8" />
- <title>瀹屽伐鍗�</title>
+ <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">
@@ -238,19 +238,46 @@
</div>
<div class="layui-form-item">
<div class="layui-inline">
- <label class="layui-form-label">鍋滃伐鍘熷洜</label>
+ <label class="layui-form-label">鍋滃伐绫诲瀷</label>
<div class="layui-input-inline">
- <textarea placeholder="璇疯緭鍏ュ師鍥�" class="layui-textarea" name="HStopReason" id="HStopReason"></textarea>
+ <div class="layui-form">
+ <div class="layui-form-item">
+ <select name="HStopType" id="HStopType" lay-verify="HStopType">
+ <option value="">璇烽�夋嫨鍋滃伐鍘熷洜</option>
+ <option value="妯″叿淇濆吇">妯″叿淇濆吇</option>
+ <option value="鏂枡">鏂枡</option>
+ <option value="浜哄憳涓嶈冻">浜哄憳涓嶈冻</option>
+ <option value="鍋滄皵">鍋滄皵</option>
+ <option value="鍋滄按">鍋滄按</option>
+ <option value="鍋滅數">鍋滅數</option>
+ <option value="妯″叿鏁呴殰">妯″叿鏁呴殰</option>
+ <option value="鐩戞帶鎶ヨ">鐩戞帶鎶ヨ</option>
+ <option value="鑷姩鍖栨晠闅�">鑷姩鍖栨晠闅�</option>
+ <option value="娉ㄥ鏈烘晠闅�">娉ㄥ鏈烘晠闅�</option>
+ <option value="灏哄寮傚父">灏哄寮傚父</option>
+ <option value="璁″垝鍋滄満">璁″垝鍋滄満</option>
+ <option value="澶栬涓嶈壇璋冩満">澶栬涓嶈壇璋冩満</option>
+ <option value="妯″叿娓呮磥">妯″叿娓呮磥</option>
+ <option value="妯℃俯鏈烘晠闅�">妯℃俯鏈烘晠闅�</option>
+ <option value="鐑樻枡鏈烘晠闅�">鐑樻枡鏈烘晠闅�</option>
+ </select>
+ </div>
+ </div>
</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 class="layui-inline">
+ <label class="layui-form-label">鍋滃伐鍘熷洜</label>
+ <div class="layui-input-inline">
+ <textarea placeholder="璇疯緭鍏ュ師鍥�" class="layui-textarea" name="HStopReason" id="HStopReason"></textarea>
+ </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>
- </div>
<div class="layui-tab-item">
<div class="layui-form-item">
<div class="layui-inline">
@@ -577,8 +604,9 @@
, "HDeptName": data.閮ㄩ棬鍚嶇О //閮ㄩ棬鍚嶇О
, "HICMOInterID": data.HICMOInterID //鐢熶骇璁㈠崟涓籌D
, "HICMOEntryID": data.HICMOEntryID //鐢熶骇璁㈠崟瀛怚D
- , "HICMOBillNo": data.HICMOBillNo //鐢熶骇璁㈠崟
- , "HStopReason": data.鍋滃伐鍘熷洜 //鍋滃伐鍘熷洜
+ , "HICMOBillNo": data.HICMOBillNo
+ , "HStopType": data.鍋滃伐绫诲瀷 //鐢熶骇璁㈠崟
+ , "HStopReason": data.鍋滃伐鍘熷洜鎻忚堪 //鍋滃伐鍘熷洜
, "HRemark": data.澶囨敞 //澶囨敞
, "HMaker": data.鍒跺崟浜� //鍒跺崟浜�
, "HMakeDate": data.鍒跺崟鏃ユ湡 //鍒跺崟鏃ユ湡
@@ -960,6 +988,10 @@
layer.msg("鐢熶骇璁㈠崟涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
}
+ if ($("#HStopType").val() == '' || $("#HStopType").val() == null) {
+ layer.msg("鍋滃伐绫诲瀷涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
if ($("#HStopReason").val() == '' || $("#HStopReason").val() == null) {
layer.msg("鍋滃伐鍘熷洜涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\201\234\345\267\245/Sc_MESStopStepWorkBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\201\234\345\267\245/Sc_MESStopStepWorkBillList.html"
index 484eda3..f387d10 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\201\234\345\267\245/Sc_MESStopStepWorkBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\201\234\345\267\245/Sc_MESStopStepWorkBillList.html"
@@ -409,7 +409,8 @@
, { field: 'HEmpID', title: 'HEmpID', hide: 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 }
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 4a72256..67e35cf 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"
@@ -2,7 +2,7 @@
<html>
<head>
<meta charset="utf-8" />
- <title>瀹屽伐鍗�</title>
+ <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">
@@ -237,85 +237,113 @@
</div>
<div class="layui-form-item">
<div class="layui-inline">
- <label class="layui-form-label">鍋滃伐鍘熷洜</label>
+ <label class="layui-form-label">鍋滃伐绫诲瀷</label>
<div class="layui-input-inline">
- <textarea placeholder="璇疯緭鍏ュ師鍥�" class="layui-textarea" name="HStopReason" id="HStopReason"></textarea>
+ <div class="layui-form">
+ <div class="layui-form-item">
+ <select name="HStopType" id="HStopType" lay-verify="HStopType">
+ <option value="">璇烽�夋嫨鍋滃伐鍘熷洜</option>
+ <option value="妯″叿淇濆吇">妯″叿淇濆吇</option>
+ <option value="鏂枡">鏂枡</option>
+ <option value="浜哄憳涓嶈冻">浜哄憳涓嶈冻</option>
+ <option value="鍋滄皵">鍋滄皵</option>
+ <option value="鍋滄按">鍋滄按</option>
+ <option value="鍋滅數">鍋滅數</option>
+ <option value="妯″叿鏁呴殰">妯″叿鏁呴殰</option>
+ <option value="鐩戞帶鎶ヨ">鐩戞帶鎶ヨ</option>
+ <option value="鑷姩鍖栨晠闅�">鑷姩鍖栨晠闅�</option>
+ <option value="娉ㄥ鏈烘晠闅�">娉ㄥ鏈烘晠闅�</option>
+ <option value="灏哄寮傚父">灏哄寮傚父</option>
+ <option value="璁″垝鍋滄満">璁″垝鍋滄満</option>
+ <option value="澶栬涓嶈壇璋冩満">澶栬涓嶈壇璋冩満</option>
+ <option value="妯″叿娓呮磥">妯″叿娓呮磥</option>
+ <option value="妯℃俯鏈烘晠闅�">妯℃俯鏈烘晠闅�</option>
+ <option value="鐑樻枡鏈烘晠闅�">鐑樻枡鏈烘晠闅�</option>
+ </select>
+ </div>
+ </div>
</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 class="layui-inline">
+ <label class="layui-form-label">鍋滃伐鎻忚堪</label>
+ <div class="layui-input-inline">
+ <textarea placeholder="璇疯緭鍏ュ師鍥�" class="layui-textarea" name="HStopReason" id="HStopReason"></textarea>
+ </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>
- </div>
- <div class="layui-tab-item">
- <div class="layui-form-item">
- <div class="layui-inline">
- <label class="layui-form-label">鍒跺崟浜�:</label>
- <div class="layui-input-inline">
- <input type="text" class="layui-input" name="HMaker" id="HMaker" style="background-color:#efefef4d;" disabled>
+ <div class="layui-tab-item">
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label">鍒跺崟浜�:</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HMaker" id="HMaker" style="background-color:#efefef4d;" disabled>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">淇敼浜�:</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HUpDater" id="HUpDater" style="background-color:#efefef4d;" disabled>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">瀹℃牳浜�:</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HChecker" id="HChecker" style="background-color:#efefef4d;" disabled>
+ </div>
</div>
</div>
- <div class="layui-inline">
- <label class="layui-form-label">淇敼浜�:</label>
- <div class="layui-input-inline">
- <input type="text" class="layui-input" name="HUpDater" id="HUpDater" style="background-color:#efefef4d;" disabled>
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label">鍒跺崟鏃ユ湡:</label>
+ <div class="layui-input-inline">
+ <input type="datetime" class="layui-input" name="HMakeDate" id="HMakeDate" style="background-color:#efefef4d;" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd" disabled>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">淇敼鏃ユ湡:</label>
+ <div class="layui-input-inline">
+ <input type="datetime" class="layui-input" name="HUpDateDate" id="HUpDateDate" style="background-color:#efefef4d;" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd" disabled>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">瀹℃牳鏃ユ湡:</label>
+ <div class="layui-input-inline">
+ <input type="datetime" class="layui-input" name="HCheckDate" id="HCheckDate" style="background-color:#efefef4d;" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd" disabled>
+ </div>
</div>
</div>
- <div class="layui-inline">
- <label class="layui-form-label">瀹℃牳浜�:</label>
- <div class="layui-input-inline">
- <input type="text" class="layui-input" name="HChecker" id="HChecker" style="background-color:#efefef4d;" disabled>
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label">鍏抽棴浜�:</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HCloseMan" id="HCloseMan" style="background-color:#efefef4d;" disabled>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">浣滃簾浜�:</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HDeleteMan" id="HDeleteMan" style="background-color:#efefef4d;" disabled>
+ </div>
</div>
</div>
- </div>
- <div class="layui-form-item">
- <div class="layui-inline">
- <label class="layui-form-label">鍒跺崟鏃ユ湡:</label>
- <div class="layui-input-inline">
- <input type="datetime" class="layui-input" name="HMakeDate" id="HMakeDate" style="background-color:#efefef4d;" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd" disabled>
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label">鍏抽棴鏃ユ湡:</label>
+ <div class="layui-input-inline">
+ <input type="datetime" class="layui-input" name="HCloseDate" id="HCloseDate" style="background-color:#efefef4d;" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd" disabled>
+ </div>
</div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">淇敼鏃ユ湡:</label>
- <div class="layui-input-inline">
- <input type="datetime" class="layui-input" name="HUpDateDate" id="HUpDateDate" style="background-color:#efefef4d;" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd" disabled>
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">瀹℃牳鏃ユ湡:</label>
- <div class="layui-input-inline">
- <input type="datetime" class="layui-input" name="HCheckDate" id="HCheckDate" style="background-color:#efefef4d;" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd" disabled>
- </div>
- </div>
- </div>
- <div class="layui-form-item">
- <div class="layui-inline">
- <label class="layui-form-label">鍏抽棴浜�:</label>
- <div class="layui-input-inline">
- <input type="text" class="layui-input" name="HCloseMan" id="HCloseMan" style="background-color:#efefef4d;" disabled>
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">浣滃簾浜�:</label>
- <div class="layui-input-inline">
- <input type="text" class="layui-input" name="HDeleteMan" id="HDeleteMan" style="background-color:#efefef4d;" disabled>
- </div>
- </div>
- </div>
- <div class="layui-form-item">
- <div class="layui-inline">
- <label class="layui-form-label">鍏抽棴鏃ユ湡:</label>
- <div class="layui-input-inline">
- <input type="datetime" class="layui-input" name="HCloseDate" id="HCloseDate" style="background-color:#efefef4d;" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd" disabled>
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">浣滃簾鏃ユ湡:</label>
- <div class="layui-input-inline">
- <input type="datetime" class="layui-input" name="HDeleteDate" id="HDeleteDate" style="background-color:#efefef4d;" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd" disabled>
+ <div class="layui-inline">
+ <label class="layui-form-label">浣滃簾鏃ユ湡:</label>
+ <div class="layui-input-inline">
+ <input type="datetime" class="layui-input" name="HDeleteDate" id="HDeleteDate" style="background-color:#efefef4d;" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd" disabled>
+ </div>
</div>
</div>
</div>
@@ -324,7 +352,6 @@
</div>
</div>
</div>
- </div>
</form>
</div>
</div>
@@ -401,7 +428,7 @@
}
//#endregion
- // #region 椤甸潰鍔犺浇鎵�鏈夋柟娉�
+ // #region 椤甸潰鍔犺浇鎵�鏈夋柟娉�
//鍒濆鍖栨彃浠�
function set_InitFrom() {
//鏃ユ湡鏃堕棿閫夋嫨鍣�
@@ -442,7 +469,7 @@
//鏃犳簮鍗曟柊澧�
function set_AddFNew() {
//鍔犳簮鍗曠被鍨嬪尯鍒�(鍙互鍐欎笉鍚岀殑鏂规硶)
-
+
}
//鏈夋簮鍗曟柊澧�
@@ -572,7 +599,8 @@
, "HICMOInterID": data.HICMOInterID //鐢熶骇璁㈠崟涓籌D
, "HICMOEntryID": data.HICMOEntryID //鐢熶骇璁㈠崟瀛怚D
, "HICMOBillNo": data.HICMOBillNo //鐢熶骇璁㈠崟
- , "HStopReason": data.鍋滃伐鍘熷洜 //鍋滃伐鍘熷洜
+ , "HStopType": data.鍋滃伐鍘熷洜 //鍋滃伐鍘熷洜
+ , "HStopReason": data.鍋滃伐鍘熷洜鎻忚堪 //鍋滃伐鍘熷洜
, "HRemark": data.澶囨敞 //澶囨敞
, "HMaker": data.鍒跺崟浜� //鍒跺崟浜�
, "HMakeDate": data.鍒跺崟鏃ユ湡 //鍒跺崟鏃ユ湡
@@ -585,7 +613,7 @@
, "HDeleteMan": data.浣滃簾浜� //浣滃簾浜�
, "HDeleteDate": data.浣滃簾鏃ユ湡 //浣滃簾鏃ユ湡
});
-
+ form.render('select');
} else {
layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
}
@@ -595,7 +623,7 @@
});
}
-
+
//鍒ゆ柇鏄惁鏂板
if (linterid == null || linterid == 0) {
//鑾峰彇鏈�澶у崟鎹彿 new
@@ -618,57 +646,57 @@
//淇濆瓨鎻愪氦
form.on('submit(Saver)', function (data) {
- var index = layer.load();
- var sMainStr = JSON.stringify(data.field);
- var sMainSub = sMainStr + ';' + sessionStorage["HUserName"] + ';' + refSav;
- if (!AllowLoadData())//鏁版嵁楠岃瘉
- {
- return false;
- }
- $.ajax({
- type: "POST",
- url: GetWEBURL() + "/Sc_MESStopWorkBill/SaveGetMESStopFrom", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- async: false,
- data: { "msg": sMainSub },
- dataType: "json",
- success: function (data) {
- if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- $("#HInterID").val(data.HInterID);//鑾峰彇鎻愪氦鎴愬姛杩斿洖鐨勫崟鎹富ID
- 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(); //瀹℃牳
+ if (AllowLoadData(data)) {
+ var index = layer.load();
+ var sMainStr = JSON.stringify(data.field);
+ var sMainSub = sMainStr + ';' + sessionStorage["HUserName"] + ';' + refSav;
+ $.ajax({
+ type: "POST",
+ url: GetWEBURL() + "/Sc_MESStopWorkBill/SaveGetMESStopFrom", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: false,
+ data: { "msg": sMainSub },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ $("#HInterID").val(data.HInterID);//鑾峰彇鎻愪氦鎴愬姛杩斿洖鐨勫崟鎹富ID
+ 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.close(index);
+ layer.alert(data.Message, { icon: 5 })
}
- //layer.confirm(data.Message, {
- // btn: ['纭']
- //}, function (index) {
- // if (data.Verify == "Y") //鑷姩瀹℃牳
- // {
- // layer.close(index);
- // SaveVerify(); //瀹℃牳
- // }
- // else {
- // layer.close(index);
- // }
- //});
- }
- else {
+ },
+ error: function (err) {
layer.close(index);
- layer.alert(data.Message, { icon: 5 })
+ layer.alert(err, { icon: 5 })
}
- },
- error: function (err) {
- layer.close(index);
- layer.alert(err, { icon: 5 })
- }
- })
+ })
+ }
+
+
});
//瀹℃牳鎸夐挳鎻愪氦
@@ -906,6 +934,63 @@
});
});
+ function AllowLoadData() { //闈炵┖楠岃瘉
+ var Result = true;
+ if ($("#HBillNo").val() == '' || $("#HBillNo").val() == null) {
+ layer.msg("鍗曟嵁鍙蜂笉鑳戒负绌�!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+ if ($("#HDate").val() == '' || $("#HDate").val() == null) {
+ layer.msg("鍗曟嵁鏃ユ湡涓嶈兘涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+ if ($("#HMaterID").val() == '' || $("#HMaterID").val() == null) {
+ layer.msg("浜у搧缂栫爜涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+ if ($("#HStopBeginWorkTime").val() == '' || $("#HStopBeginWorkTime").val() == null) {
+ layer.msg("瀹屽伐鏃堕棿涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+ if ($("#HStopEndWorkTime").val() == '' || $("#HStopBeginWorkTime").val() == null) {
+ layer.msg("棰勮缁撴潫鏃堕棿涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+ if ($("#HSourceID").val() == '' || $("#HSourceID").val() == null) {
+ layer.msg("鐢熶骇璧勬簮涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+ if ($("#HMainSourceInterID").val() == '' || $("#HMainSourceInterID").val() == null) {
+ layer.msg("婧愬崟鍗曞彿涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+ if ($("#HEmpID").val() == '' || $("#HEmpID").val() == null) {
+ layer.msg("鎿嶄綔鍛樹笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+ if ($("#HGroupID").val() == '' || $("#HGroupID").val() == null) {
+ layer.msg("鐝粍涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+ if ($("#HDeptID").val() == '' || $("#HDeptID").val() == null) {
+ layer.msg("杞﹂棿涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+ if ($("#HICMOInterID").val() == '' || $("#HICMOInterID").val() == null) {
+ layer.msg("鐢熶骇璁㈠崟涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+ if ($("#HStopType").val() == '' || $("#HStopType").val() == null) {
+ layer.msg("鍋滃伐绫诲瀷涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+ if ($("#HStopReason").val() == '' || $("#HStopReason").val() == null) {
+ layer.msg("鍋滃伐鍘熷洜涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+ return Result;
+ }
+
//#endregion
//浠ヤ笂涓簂ayui妯″潡
@@ -921,60 +1006,7 @@
if (day.length < 2) day = '0' + day;
return [year, month, day].join('-');
- }
-
- function AllowLoadData() { //闈炵┖楠岃瘉
- var Result = true;
- if ($("#HBillNo").val() == '' || $("#HBillNo").val() == null) {
- layer.msg("鍗曟嵁鍙蜂笉鑳戒负绌�!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return Result = false;
- }
- if ($("#HDate").val() == '' || $("#HDate").val() == null) {
- layer.msg("鍗曟嵁鏃ユ湡涓嶈兘涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return Result = false;
- }
- if ($("#HMaterID").val() == '' || $("#HMaterID").val() == null) {
- layer.msg("浜у搧缂栫爜涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return Result = false;
- }
- if ($("#HStopBeginWorkTime").val() == '' || $("#HStopBeginWorkTime").val() == null) {
- layer.msg("瀹屽伐鏃堕棿涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return Result = false;
- }
- if ($("#HStopEndWorkTime").val() == '' || $("#HStopBeginWorkTime").val() == null) {
- layer.msg("棰勮缁撴潫鏃堕棿涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return Result = false;
- }
- if ($("#HSourceID").val() == '' || $("#HSourceID").val() == null) {
- layer.msg("鐢熶骇璧勬簮涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return Result = false;
- }
- if ($("#HMainSourceInterID").val() == '' || $("#HMainSourceInterID").val() == null) {
- layer.msg("婧愬崟鍗曞彿涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return Result = false;
- }
- if ($("#HEmpID").val() == '' || $("#HEmpID").val() == null) {
- layer.msg("鎿嶄綔鍛樹笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return Result = false;
- }
- if ($("#HGroupID").val() == '' || $("#HGroupID").val() == null) {
- layer.msg("鐝粍涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return Result = false;
- }
- if ($("#HDeptID").val() == '' || $("#HDeptID").val() == null) {
- layer.msg("杞﹂棿涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return Result = false;
- }
- if ($("#HICMOInterID").val() == '' || $("#HICMOInterID").val() == null) {
- layer.msg("鐢熶骇璁㈠崟涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return Result = false;
- }
- if ($("#HStopReason").val() == '' || $("#HStopReason").val() == null) {
- layer.msg("鍋滃伐鍘熷洜涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return Result = false;
- }
- return Result;
- }
+ }
//鎿嶄綔鍛�
function GetHEmpValue(obj) {
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\264\250\351\207\217\346\261\207\346\212\245\345\215\225/Sc_QualityReportBill.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\264\250\351\207\217\346\261\207\346\212\245\345\215\225/Sc_QualityReportBill.html"
index 02119f0..5fc4d59 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\264\250\351\207\217\346\261\207\346\212\245\345\215\225/Sc_QualityReportBill.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\264\250\351\207\217\346\261\207\346\212\245\345\215\225/Sc_QualityReportBill.html"
@@ -82,6 +82,12 @@
<input type="text" class="layui-input" name="HDate" id="HDate" style="background-color:#efefef4d;" readonly>
</div>
</div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">涓嶈壇鏁伴噺</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HBadReasonHQty" id="HBadReasonHQty" value="0">
+ </div>
+ </div>
</div>
<div class="layui-row">
<div class="layui-col-xs4 layui-inline">
@@ -392,6 +398,8 @@
$("#HDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
$("#HMakeDate").val(Pub_Format(new Date(), "yyyy-MM-dd hh:mm:ss"));
$("#HMaker").val(sessionStorage["HUserName"]);
+ $("#HGroupID").val(sessionStorage["HGroupID"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鐝粍ID
+ $("#HGroupName").val(sessionStorage["HGroup"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鐝粍
layer.close(ajaxLoad);
}
});
@@ -410,6 +418,8 @@
$("#HDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
$("#HMakeDate").val(Pub_Format(new Date(), "yyyy-MM-dd hh:mm:ss"));
$("#HMaker").val(sessionStorage["HUserName"]);
+ $("#HGroupID").val(sessionStorage["HGroupID"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鐝粍ID
+ $("#HGroupName").val(sessionStorage["HGroup"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鐝粍
layer.close(ajaxLoad);
}
});
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBill_PDA.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBill_PDA.html"
index eb517d5..8b7cf0e 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBill_PDA.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBill_PDA.html"
@@ -623,6 +623,10 @@
//琛ㄥご淇℃伅璁惧淇濆吇瑙勭▼
form.on('submit(HEquipDotCheckRuleInterist)', function () {
+ if ($("#HEquipID").val() == 0 || $("#HEquipID").val() == null || $("#HEquipID").val() == "") {
+ layer.alert("璇峰厛鎵弿璁惧浜岀淮鐮佸甫鍑鸿澶囦俊鎭�");
+ return;
+ }
//椤甸潰灞�-鑷畾涔�
layer.open({
type: 2,
@@ -632,7 +636,7 @@
shift: 2,
area: ['80%', '80%'],
maxmin: true,
- content: ['../璁惧绠＄悊/璁惧瑙勭▼鍗�/Sb_EquipDotCheckRuleList_PDA.html', 'yes'],
+ content: ['../璁惧绠＄悊/璁惧瑙勭▼鍗�/Sb_EquipDotCheckRuleList_PDA.html?HEquipID=' + $("#HEquipID").val(), 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBill_PDA.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBill_PDA.html"
index fd87c35..c5f2eb4 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBill_PDA.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBill_PDA.html"
@@ -540,6 +540,10 @@
//琛ㄥご淇℃伅璁惧淇濆吇瑙勭▼
form.on('submit(HEquipDotCheckRuleInterList)', function () {
+ if ($("#HEquipID").val() == 0 || $("#HEquipID").val() == null || $("#HEquipID").val() == "") {
+ layer.alert("璇峰厛鎵弿璁惧浜岀淮鐮佸甫鍑鸿澶囦俊鎭�");
+ return;
+ }
//椤甸潰灞�-鑷畾涔�
layer.open({
type: 2,
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\267\245\350\211\272\345\217\202\346\225\260\350\256\242\345\215\225\347\202\271\346\243\200\350\241\250/SB_EquipICMOTechParamBillEdit.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\267\245\350\211\272\345\217\202\346\225\260\350\256\242\345\215\225\347\202\271\346\243\200\350\241\250/SB_EquipICMOTechParamBillEdit.html"
new file mode 100644
index 0000000..c7bd378
--- /dev/null
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\267\245\350\211\272\345\217\202\346\225\260\350\256\242\345\215\225\347\202\271\346\243\200\350\241\250/SB_EquipICMOTechParamBillEdit.html"
@@ -0,0 +1,1464 @@
+锘�<!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">
+ <!--寮曠敤layui鏍峰紡鏂囦欢-->
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <!--寮曠敤layui js鏂囦欢-->
+ <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/PageTitle.js"></script>
+ <style type="text/css">
+ .layui-form-item .layui-inline {
+ margin-right: 0;
+ }
+
+ html {
+ background-color: white;
+ color: white;
+ }
+
+ .layui-table-cell {
+ overflow: visible !important;
+ }
+
+ td .layui-form-select {
+ margin-top: -10px;
+ margin-left: -15px;
+ margin-right: -15px;
+ }
+ </style>
+</head>
+<body>
+ <div class="layui-fluid" style="padding: 0;">
+ <div class="layui-card" style="padding: 15px;">
+ <div class="layui-card-body" style="padding: 1px;">
+ <form class="layui-form" lay-filter="component-form-group" action="">
+ <div class="layui-card-header">
+ <div class="layui-btn-group">
+ <button class="layui-btn layui-btn-normal layui-btn-radius" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btn_Save" id="btn_Save">淇濆瓨</button>
+ <button class="layui-btn layui-btn-normal layui-btn-radius" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btn_Cancel" id="btn_Cancel">閫�鍑�</button>
+ </div>
+ </div>
+ <div class="layui-tab" lay-filter="tab-Bill">
+ <h1 style="text-align: center; padding: 10px 0;"><b>璁惧宸ヨ壓鍙傛暟璁㈠崟鐐规琛�</b></h1>
+ <ul class="layui-tab-title" lay-filter="tab-all">
+ <li lay-id="1" style="padding:1px;" class="layui-this">鍩烘湰淇℃伅</li>
+ <li lay-id="2" style="padding:1px;">鍒跺崟淇℃伅</li>
+ </ul>
+ <div class="layui-tab-content">
+ <!--鍩烘湰淇℃伅-->
+ <div class="layui-tab-item layui-show">
+ <div class="layui-form-item" style="padding-top: 10px;">
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label">鍗曟嵁鍙�<label style="color:red"> * </label></label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly>
+ <input type="hidden" name="HInterID" id="HInterID" value="0">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鏃ユ湡<label style="color:red"> * </label></label>
+ <div class="layui-input-block">
+ <input type="date" class="layui-input" lay-verify="HDate" name="HDate" id="HDate" style="width:190px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">缁勭粐<label style="color:red"> * </label></label>
+ <div class="layui-input-block" style="margin-left: 110px; width: 501px;">
+ <select name="HStockOrgID" id="HStockOrgID" lay-verify="HStockOrgID" disabled>
+ <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+ </select>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label">婧愬崟绫诲瀷</label>
+ <div class="layui-input-inline">
+ <select name="HMainSourceBillType" id="HMainSourceBillType" lay-filter="HMainSourceBillType" style="width: 180px; ">
+ <option value="3772">宸ュ簭娴佽浆鍗�</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">婧愬崟鍗曞彿</label>
+ <div class="layui-input-inline">
+ <input type="hidden" name="HMainSourceInterID" id="HMainSourceInterID" class="layui-input" value="0" style="float:left;width:150px;">
+ <input type="hidden" name="HMainSourceEntryID" id="HMainSourceEntryID" class="layui-input" value="0" style="float:left;width:150px;">
+ <input type="text" name="HMainSourceBillNo" id="HMainSourceBillNo" class="layui-input" value="" style="float: left; width: 150px; background-color: #efefef4d;" readonly>
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HMainSource" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">娴佽浆鍗″彿</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HProcExchBillNo" id="HProcExchBillNo" style="background-color:#efefef4d;" readonly>
+ <input type="hidden" name="HProcExchInterID" id="HProcExchInterID" value="0">
+ <input type="hidden" name="HProcExchEntryID" id="HProcExchEntryID" value="0">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鐢熶骇璁㈠崟鍙�</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HICMOBillNo" id="HICMOBillNo" style="background-color:#efefef4d;" readonly>
+ <input type="hidden" name="HICMOInterID" id="HICMOInterID" value="0">
+ <input type="hidden" name="HICMOEntryID" id="HICMOEntryID" value="0">
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label">宸ュ簭鍙�<label style="color:red"> * </label></label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HProcNo" id="HProcNo" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鐗╂枡浠ｇ爜<label style="color:red"> * </label></label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HMaterNumber" id="HMaterNumber" style="background-color:#efefef4d;" readonly>
+ <input type="hidden" name="HMaterID" id="HMaterID" value="0">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鐗╂枡鍚嶇О<label style="color:red"> * </label></label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HMaterName" id="HMaterName" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">瑙勬牸鍨嬪彿</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HMaterModel" id="HMaterModel" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label">宸ュ簭<label style="color:red"> * </label></label>
+ <div class="layui-input-inline">
+ <input type="text" name="HProcName" id="HProcName" readonly class="layui-input" value="" style="background-color: #efefef4d; float: left; width: 150px;">
+ <input type="hidden" name="HProcID" id="HProcID" class="layui-input" value="0" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HProcList" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鐐规浜�</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HEmpName" id="HEmpName" readonly class="layui-input" value="" style="background-color: #efefef4d; float: left; width: 150px;">
+ <input type="hidden" name="HEmpID" id="HEmpID" class="layui-input" value="0" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HEmpList" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鐢熶骇璧勬簮</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HSourceName" id="HSourceName" readonly class="layui-input" value="" style="background-color: #efefef4d; float: left; width: 150px;">
+ <input type="hidden" name="HSourceID" id="HSourceID" class="layui-input" value="0" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HSourceList" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鐢熶骇鐝粍</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HGroupName" id="HGroupName" readonly class="layui-input" value="" style="background-color: #efefef4d; float: left; width: 150px;">
+ <input type="hidden" name="HGroupID" id="HGroupID" class="layui-input" value="0" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HGroupList" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label">鐢熶骇杞﹂棿</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HDeptName" id="HDeptName" readonly class="layui-input" value="" style="background-color: #efefef4d; float: left; width: 150px;">
+ <input type="hidden" name="HDeptID" id="HDeptID" class="layui-input" value="0" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HDeptList" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">璁惧<label style="color:red"> * </label></label>
+ <div class="layui-input-inline">
+ <input type="text" name="HEquipName" id="HEquipName" readonly class="layui-input" value="" style="background-color: #efefef4d; float: left; width: 150px;">
+ <input type="hidden" name="HEquipID" id="HEquipID" class="layui-input" value="0" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HEquipList" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label">澶囨敞</label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="HRemark" id="HRemark" autocomplete="off" style="width: 1135px;">
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <!--鍒跺崟淇℃伅-->
+ <div class="layui-tab-item">
+ <div class="layui-form-item">
+ <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" name="HMaker" id="HMaker" style="background-color:#efefef4d;" readonly>
+ </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="HChecker" id="HChecker" style="background-color:#efefef4d;" readonly>
+ </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="HCloseMan" id="HCloseMan" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ </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" name="HMakeDate" id="HMakeDate" style="background-color:#efefef4d;" readonly>
+ </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="HCheckDate" id="HCheckDate" style="background-color:#efefef4d;" readonly>
+ </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="HCloseDate" id="HCloseDate" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ </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" name="HUpDater" id="HUpDater" style="background-color:#efefef4d;" readonly>
+ </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="HDeleteMan" id="HDeleteMan" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ </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" name="HUpDateDate" id="HUpDateDate" style="background-color:#efefef4d;" readonly>
+ </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="HDeleteDate" id="HDeleteDate" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <table class="layui-hide" 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_AddLine" id="btn_AddLine"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_InsertLine" id="btn_InsertLine"><i class="layui-icon layui-icon-form"></i>鎻掑叆涓�琛�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_CopyLine" id="btn_CopyLine"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Up" id="btn_Up"><i class="layui-icon layui-icon-form"></i>涓婄Щ</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Under" id="btn_Under"><i class="layui-icon layui-icon-form"></i>涓嬬Щ</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_HideColumn" id="btn_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+ </div>
+ </script>
+ <script type="text/html" id="xuhao">
+ {{d.LAY_TABLE_INDEX+1}}
+ </script>
+ </form>
+ </div>
+ </div>
+ </div>
+ <!--瀛愯〃锛氳鍒犻櫎-->
+ <script type="text/html" id="barDemo">
+ <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
+ </script>
+
+ <!--琛屼笅鎷夐�夋嫨(妫�娴嬬粨鏋�)-->
+ <script type="text/html" id="HResult">
+ <select name="HResult" lay-filter="HResult" id="HResult{{d.LAY_TABLE_INDEX+1}}">
+ <option value="OK">OK</option>
+ <option value="NG">NG</option>
+ </select>
+ </script>
+
+ <script>
+ var OptionData = [];
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index' //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+ //#region 鍏叡鍙橀噺
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , element = layui.element;
+ var HModName = "SB_EquipICMOTechParamBill";
+ var HBillType = "3919";
+ var HMaker = sessionStorage["HUserName"]
+ var HStockOrgID = sessionStorage["OrganizationID"] //缁勭粐ID
+ var option = {};
+ var params = get_UrlVars();
+ var OperationType = params[params[0]] == null ? 1 : params[params[0]]; //鎿嶄綔绫诲瀷锛�1鏂板銆�2缂栬緫锛�
+ var HInterID = params[params[0]] == null ? 0 : params[params[1]]; //鍗曟嵁鍐呯爜
+ //#endregion
+
+ //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
+ if (sessionStorage.login != "login") {
+ layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
+ icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
+ }, function () { window.location.href = "../../user/login.html"; });
+ }
+
+ //#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
+ //閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
+ var HPageTitle = get_PageTitle(HBillType) == "" ? $("h1").html() : get_PageTitle(HBillType);
+ $("h1").html('<b>' + HPageTitle + '</b>');
+ //#endregion
+
+ //鍒濆鍖栧瓙琛�
+ set_InitGrid();
+
+ //鑾峰彇缁勭粐
+ Organ();
+
+ //#region 鑾峰彇缁勭粐
+ function Organ() {
+ //鑾峰彇鐧诲綍椤电粍缁囧垪
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Web/GetOrganizations",
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ success: function (result) {
+ var Organization = "";
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data;
+ for (var i = 0; i < data.length; i++) {
+ Organization += '<option style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
+ }
+ $("#HStockOrgID").append(Organization);
+ $("#HStockOrgID").val(HStockOrgID)
+ form.render('select');
+ }
+ layer.closeAll("loading");
+ },
+ complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
+ })
+ }
+ //#endregion
+
+ //鍒ゆ柇鎿嶄綔绫诲瀷
+ if (OperationType == 1) { //鏂板
+ //鑾峰彇鏈�澶у崟鎹彿
+ get_MAXNum();
+ //鍒濆鍖栨棩鏈熴�佸垱寤轰汉銆佸垱寤烘椂闂�
+ $("#HDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
+ $("#HMaker").val(HMaker);
+ $("#HMakeDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
+ }
+ else if (OperationType == 2) { //缂栬緫
+ $("#HInterID").val(HInterID);//淇敼鏃朵富琛↖D
+ //缂栬緫鐘舵�佹椂锛屾牴鎹唴鐮侊紝鑾峰彇淇℃伅骞跺啓鍏ョ晫闈�
+ RoadBillMain(HInterID);
+ }
+ else {
+ layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
+ }
+
+ //#region 鏂板妯″紡 鑾峰彇鏈�澶у崟鎹彿
+ function get_MAXNum() {
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/WEBSController/GetMaxBillNo_Json",
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "HBillType": HBillType },
+ success: function (d) {
+ if (d.count == 1) {
+ $("#HBillNo").val(d.data[0].HBillNo);
+ }
+ else {
+ $("#HBillNo").val("");
+ layer.msg(d.Message, { icon: 0, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ },
+ complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
+ });
+ }
+ //#endregion
+
+ //#region 缂栬緫妯″紡 椤甸潰鍒濆鍖�
+ function RoadBillMain(HInterID) {
+ var ajaxLoad = layer.load();
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/SB_EquipICMOTechParamBillController/GetSB_EquipICMOTechParamBill_Json",
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "HInterID": HInterID, "HMaker": HMaker },
+ success: function (result) {
+ if (result.count == 1) {
+ var data = result.data[0];
+ if (data.瀹℃牳浜� != "") {
+ $('#btn_Save').addClass("layui-btn-disabled").attr("disabled", true);
+ }
+ form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+ "HBillNo": data.鍗曟嵁鍙�
+ , "HDate": formatDate(data.鏃ユ湡)
+ , "HICMOInterID": data.HICMOInterID
+ , "HICMOEntryID": data.HICMOEntryID
+ , "HICMOBillNo": data.鐢熶骇璁㈠崟鍙�
+ , "HProcExchInterID": data.HProcExchInterID
+ , "HProcExchEntryID": data.HProcExchEntryID
+ , "HProcExchBillNo": data.宸ュ簭娴佽浆鍗″彿
+ , "HProcNo": data.宸ュ簭鍙�
+ , "HMaterID": data.HMaterID
+ , "HMaterNumber": data.鐗╂枡浠ｇ爜
+ , "HMaterName": data.鐗╂枡鍚嶇О
+ , "HMaterModel": data.瑙勬牸鍨嬪彿
+ , "HProcID": data.HProcID
+ , "HProcName": data.宸ュ簭
+ , "HEmpID": data.HEmpID
+ , "HEmpName": data.鐐规浜�
+ , "HSourceID": data.HSourceID
+ , "HSourceName": data.鐢熶骇璧勬簮
+ , "HGroupID": data.HGroupID
+ , "HGroupName": data.鐢熶骇鐝粍
+ , "HDeptID": data.HDeptID
+ , "HDeptName": data.鐢熶骇杞﹂棿
+ , "HEquipID": data.HEquipID
+ , "HEquipName": data.璁惧
+ , "HRemark": data.琛ㄥご澶囨敞
+ , "HMainSourceInterID": data.HMainSourceInterID
+ , "HMainSourceEntryID": data.HMainSourceEntryID
+ , "HMainSourceBillType": data.HMainSourceBillType
+ , "HMainSourceBillNo": data.HMainSourceBillNo
+ , "HStockOrgID": data.HStockOrgID
+ , "HMaker": data.鍒跺崟浜�
+ , "HChecker": data.瀹℃牳浜�
+ , "HCloseMan": data.鍏抽棴浜�
+ , "HUpDater": data.淇敼浜�
+ , "HDeleteMan": data.浣滃簾浜�
+ , "HMakeDate": data.鍒跺崟鏃ユ湡 == null ? "" : Pub_Format(data.鍒跺崟鏃ユ湡, "yyyy-MM-dd hh:mm:ss")
+ , "HCheckDate": data.瀹℃牳鏃ユ湡 == null ? "" : Pub_Format(data.瀹℃牳鏃ユ湡, "yyyy-MM-dd hh:mm:ss")
+ , "HCloseDate": data.鍏抽棴鏃ユ湡 == null ? "" : Pub_Format(data.鍏抽棴鏃ユ湡, "yyyy-MM-dd hh:mm:ss")
+ , "HUpDateDate": data.淇敼鏃ユ湡 == null ? "" : Pub_Format(data.淇敼鏃ユ湡, "yyyy-MM-dd hh:mm:ss")
+ , "HDeleteDate": data.浣滃簾鏃ユ湡 == null ? "" : Pub_Format(data.浣滃簾鏃ユ湡, "yyyy-MM-dd hh:mm:ss")
+ });
+ HStockOrgID = data.HStockOrgID == null ? 0 : data.HStockOrgID;
+
+ //瀛愯〃 璧嬪��
+ var rowdata = [];
+ for (let i = 0; i < result.data.length; i++) {
+ rowdata.push(
+ {
+ "HTechParamID": result.data[i].HTechParamID
+ , "HTechParamNumber": result.data[i].HTechParamNumber
+ , "HTechParamName": result.data[i].HTechParamName
+ , 'HTechParamUnitID': result.data[i].HTechParamUnitID
+ , 'HTechParamUnitNumber': result.data[i].HTechParamUnitNumber
+ , 'HTechParamUnitName': result.data[i].HTechParamUnitName
+ , 'HVaule': result.data[i].HVaule
+ , 'HStd': result.data[i].HStd
+ , 'HMax': result.data[i].HMax
+ , 'HMin': result.data[i].HMin
+ , 'HResult': result.data[i].HResult
+ , 'HRemark': result.data[i].HRemark
+ }
+ )
+ }
+ option.data = rowdata;
+ table.render(option);
+ //琛屾暟鎹� 涓嬫媺澶嶉�夋 鏄剧ず
+ checkRefresh();
+ layer.close(ajaxLoad);
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ }
+ },
+ complete: function (XHR, TS) { XHR = null },//鍥炴敹璧勬簮
+ error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鍙戠敓閿欒!", { icon: 5 });
+ }
+ });
+ }
+ //#endregion
+
+ //#region 瀛愯〃鍒濆鍖�
+ function set_InitGrid() {
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ //, totalRow: true
+ , limit: 500
+ , height: 500
+ , loading: false
+ , cols: [[
+ { type: 'checkbox', totalRowText: '鍚堣琛�' }
+ , { type: 'numbers', title: '搴忓彿', width: 100 }
+ , { field: 'HTechParamID', title: 'HTechParamID', width: 100, hide: true, style: 'background-color:#efefef4d;' }
+ , { field: 'HTechParamNumber', title: '宸ヨ壓鍙傛暟浠ｇ爜', width: 110, edit: 'text', event: "HTechParamNumber" } //F7
+ , { field: 'HTechParamName', title: '宸ヨ壓鍙傛暟鍚嶇О', width: 110, style: 'background-color:#efefef4d;' }
+ , { field: 'HTechParamUnitID', title: 'HTechParamUnitID', width: 100, hide: true, style: 'background-color:#efefef4d;' }
+ , { field: 'HTechParamUnitNumber', title: '宸ヨ壓鍙傛暟鍗曚綅浠ｇ爜', width: 130, edit: 'text', event: "HTechParamUnitNumber" } //F7
+ , { field: 'HTechParamUnitName', title: '宸ヨ壓鍙傛暟鍗曚綅鍚嶇О', width: 130, style: 'background-color:#efefef4d;' }
+ , { field: 'HVaule', title: '宸ヨ壓鍙傛暟鍊�', width: 100, edit: 'text' }
+ , { field: 'HStd', title: '鏍囧噯鍊�', width: 100, edit: 'text' }
+ , { field: 'HMax', title: '涓婇檺', width: 100, edit: 'text' }
+ , { field: 'HMin', title: '涓嬮檺', width: 100, edit: 'text' }
+ , { field: 'HResult', title: '妫�娴嬬粨鏋�', width: 100, templet: "#HResult" }
+ , { field: 'HRemark', title: '澶囨敞', width: 100, edit: 'text' }
+ , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 70 }
+ ]]
+ }
+
+ var rowdata = [{
+ "HTechParamID": "0"
+ , "HTechParamNumber": ""
+ , "HTechParamName": ""
+ , "HTechParamUnitID": "0"
+ , "HTechParamUnitNumber": ""
+ , "HTechParamUnitName": ""
+ , "HVaule": ""
+ , "HStd": ""
+ , "HMax": ""
+ , "HMin": ""
+ , "HResult": "OK"
+ , "HRemark": ""
+ }];
+
+ option.data = rowdata;
+ table.render(option);
+ //琛屾暟鎹� 涓嬫媺澶嶉�夋 鏄剧ず
+ checkRefresh();
+ }
+ //#endregion
+
+ //#region 閫夋嫨寮圭獥浜嬩欢
+ //#region 閫夋嫨宸ュ簭鎸夐挳
+ form.on('submit(HProcList)', function () {
+ get_checkProc();
+ });
+ //#endregion
+
+ //#region 閫夋嫨鐐规浜烘寜閽�
+ form.on('submit(HEmpList)', function () {
+ get_checkEmp();
+ });
+ //#endregion
+
+ //#region 閫夋嫨鐢熶骇璧勬簮鎸夐挳
+ form.on('submit(HSourceList)', function () {
+ get_checkSource();
+ });
+ //#endregion
+
+ //#region 閫夋嫨鐢熶骇鐝粍鎸夐挳
+ form.on('submit(HGroupList)', function () {
+ get_checkGroup();
+ });
+ //#endregion
+
+ //#region 閫夋嫨鐢熶骇杞﹂棿鎸夐挳
+ form.on('submit(HDeptList)', function () {
+ get_checkDept();
+ });
+ //#endregion
+
+ //#region 閫夋嫨璁惧鎸夐挳
+ form.on('submit(HEquipList)', function () {
+ get_checkEquip();
+ });
+ //#endregion
+
+ //#region 閫夋嫨婧愬崟鎸夐挳
+ form.on('submit(HMainSource)', function () {
+ get_checkMainSource();
+ });
+ //#endregion
+
+ //#region 寮圭獥閫夋嫨鏂规硶
+ //#region 閫夋嫨宸ュ簭
+ function get_checkProc() {
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "宸ュ簭鍒楄〃" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["90%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Process.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("璇烽�夋嫨涓�鏉℃暟鎹�");
+ }
+ $("#HProcName").val(checkStatus.data[0].宸ュ簭鍚嶇О);
+ $("#HProcID").val(checkStatus.data[0].HItemID);
+ layer.close(index); //鍏抽棴寮圭獥 瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
+ }
+ //#endregion
+
+ //#region 閫夋嫨鐐规浜�
+ function get_checkEmp() {
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "鑱屽憳鍒楄〃" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["90%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HEmp', '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("璇烽�夋嫨涓�鏉℃暟鎹�");
+ }
+ $("#HEmpName").val(checkStatus.data[0].鑱屽憳鍚嶇О);
+ $("#HEmpID").val(checkStatus.data[0].HItemID);
+ layer.close(index); //鍏抽棴寮圭獥 瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
+ }
+ //#endregion
+
+ //#region 閫夋嫨鐢熶骇璧勬簮
+ function get_checkSource() {
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "鐢熶骇璧勬簮鍒楄〃" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["90%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Source.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("璇烽�夋嫨涓�鏉℃暟鎹�");
+ }
+ $("#HSourceName").val(checkStatus.data[0].鐢熶骇璧勬簮鍚嶇О);
+ $("#HSourceID").val(checkStatus.data[0].HItemID);
+ layer.close(index); //鍏抽棴寮圭獥 瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
+ }
+ //#endregion
+
+ //#region 閫夋嫨鐢熶骇鐝粍
+ function get_checkGroup() {
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "鐢熶骇鐝粍鍒楄〃" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["90%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ['../../鍩虹璧勬枡/宸ヨ祫鍩虹璧勬枡/Gy_Group.html?Type=HGroup', '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("璇烽�夋嫨涓�鏉℃暟鎹�");
+ }
+ $("#HGroupName").val(checkStatus.data[0].鐝粍鍚嶇О);
+ $("#HGroupID").val(checkStatus.data[0].HItemID);
+ layer.close(index); //鍏抽棴寮圭獥 瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
+ }
+ //#endregion
+
+ //#region 閫夋嫨鐢熶骇杞﹂棿
+ function get_checkDept() {
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "閮ㄩ棬鍒楄〃" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["90%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.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("璇烽�夋嫨涓�鏉℃暟鎹�");
+ }
+ $("#HDeptName").val(checkStatus.data[0].閮ㄩ棬鍚嶇О);
+ $("#HDeptID").val(checkStatus.data[0].HItemID);
+ layer.close(index); //鍏抽棴寮圭獥 瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
+ }
+ //#endregion
+
+ //#region 閫夋嫨璁惧
+ function get_checkEquip() {
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "璁惧鍒楄〃" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["90%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ['../../璁惧绠＄悊/璁惧妗ｆ/Gy_EquipFileMainList.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("璇烽�夋嫨涓�鏉℃暟鎹�");
+ }
+ $("#HEquipName").val(checkStatus.data[0].璁惧鍚嶇О);
+ $("#HEquipID").val(checkStatus.data[0].hmainid);
+ layer.close(index); //鍏抽棴寮圭獥 瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
+ }
+ //#endregion
+
+ //#region 閫夋嫨婧愬崟
+ function get_checkMainSource() {
+ var url = "";
+ var HSourceTitle = "";
+ if ($("#HMainSourceBillType").val() == "3772") {
+ url = "../../杞﹂棿绠＄悊/宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeBillList_Source.html?OperationType=2&ViewName=h_v_Sc_ProcessExchangeBillList_Source_EquipICMOTechParam";
+ HSourceTitle = "宸ュ簭娴佽浆鍗�";
+ }
+ else {
+ return layer.msg('鏈煡璇㈠埌鎵�閫夋簮鍗曠被鍨嬬浉鍏冲崟鎹俊鎭紒');
+ }
+
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: HSourceTitle + '鍒楄〃'//鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["90%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: [url, 'yes']
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鎸夐挳涓� 鐨勫洖璋�
+ var iframeWindow = window["layui-layer-iframe" + index]; //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus("mainTable"); //鑾峰彇閫変腑鐨勬暟鎹�
+
+ if (checkStatus.data.length === 0) {
+ return layer.msg("璇烽�夋嫨鏁版嵁");
+ }
+ GetSourceBillList(checkStatus);
+ layer.close(index); //鍏抽棴寮圭獥 瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
+ }
+
+ //杩斿洖婧愬崟淇℃伅
+ function GetSourceBillList(result) {
+ //杩斿洖琛ㄥご淇℃伅
+ form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+ "HICMOInterID": result.data[0].HICMOInterID == null ? 0 : result.data[0].HICMOInterID
+ , "HICMOEntryID": result.data[0].HICMOEntryID == null ? 0 : result.data[0].HICMOEntryID
+ , "HICMOBillNo": result.data[0].HICMOBillNo
+ , "HProcExchInterID": result.data[0].HProcExchInterID == null ? 0 : result.data[0].HProcExchInterID
+ , "HProcExchEntryID": result.data[0].HProcExchEntryID == null ? 0 : result.data[0].HProcExchEntryID
+ , "HProcExchBillNo": result.data[0].HProcExchBillNo
+ , "HProcNo": result.data[0].宸ュ簭鍙�
+ , "HMaterID": result.data[0].HMaterID == null ? 0 : result.data[0].HMaterID
+ , "HMaterNumber": result.data[0].浜у搧浠ｇ爜
+ , "HMaterName": result.data[0].浜у搧鍚嶇О
+ , "HMaterModel": result.data[0].瑙勬牸鍨嬪彿
+ , "HProcID": result.data[0].HProcID == null ? 0 : result.data[0].HProcID
+ , "HProcName": result.data[0].宸ュ簭
+ , "HSourceID": result.data[0].HSourceID == null ? 0 : result.data[0].HSourceID
+ , "HSourceName": result.data[0].鐢熶骇璧勬簮
+ , "HGroupID": result.data[0].HGroupID == null ? 0 : result.data[0].HGroupID
+ , "HGroupName": result.data[0].鐝粍
+ , "HDeptID": result.data[0].HDeptID == null ? 0 : result.data[0].HDeptID
+ , "HDeptName": result.data[0].鍔犲伐杞﹂棿
+ , "HMainSourceInterID": result.data[0].hmainid == null ? 0 : result.data[0].hmainid
+ , "HMainSourceEntryID": result.data[0].hsubid == null ? 0 : result.data[0].hsubid
+ , "HMainSourceBillNo": result.data[0].鍗曟嵁鍙�
+ });
+ }
+
+ //#endregion
+
+ //#endregion
+
+ //#endregion
+
+ //#region 瀛愯〃鐩稿叧鐩戝惉
+
+ //#region 澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(mainTable)', function (obj) {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ //鏂板琛岃〃鏍兼暟鎹�
+ var NewRow = {
+ "HTechParamID": "0"
+ , "HTechParamNumber": ""
+ , "HTechParamName": ""
+ , "HTechParamUnitID": "0"
+ , "HTechParamUnitNumber": ""
+ , "HTechParamUnitName": ""
+ , "HVaule": ""
+ , "HStd": ""
+ , "HMax": ""
+ , "HMin": ""
+ , "HResult": "OK"
+ , "HRemark": ""
+ };
+
+ switch (obj.event) {
+ //澧炲姞涓�琛�
+ case 'btn_AddLine': btnAddLine(NewRow);
+ break;
+ //鎸囧畾浣嶇疆涓嬫彃鍏ヤ竴琛�
+ case 'btn_InsertLine': btnInsertLine(NewRow)
+ break;
+ //澶嶅埗涓�琛�
+ case 'btn_CopyLine': btnCopyLine(data);
+ break;
+ //涓婄Щ
+ case 'btn_Up': btn_up();
+ break;
+ //涓嬬Щ
+ case 'btn_Under': btn_under();
+ break;
+ //鍒楄缃�
+ case 'btn_HideColumn': get_HideColumn();
+ break;
+ }
+ });
+ //#endregion
+
+ //#region 鍦ㄦ湯灏惧鍔犱竴琛�
+ function btnAddLine(NewRow) {
+ table.cache["mainTable"].push(NewRow);
+ option.data = table.cache["mainTable"];
+ table.render(option);
+ //琛屾暟鎹� 涓嬫媺澶嶉�夋 鏄剧ず
+ checkRefresh();
+ }
+ //#endregion
+
+ //#region 鍦ㄦ寚瀹氳涓嬫彃鍏ヤ竴琛�
+ function btnInsertLine(NewRow) {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var tables = []; //瀛樺偍鎻掑叆涓�琛屽悗鐨勮〃鏍兼暟鎹�
+ //鑾峰彇琛ㄦ牸鐨勫叏閮ㄨ
+ var rowList = table.cache['mainTable'];
+ for (var i = 0; i < rowList.length; i++) { //閬嶅巻琛ㄦ牸鐨勮
+ tables.push(option.data[i]);
+ if (rowList[i].LAY_CHECKED == true) { //鑾峰彇閫変腑琛岀殑浣嶇疆
+ tables.push(NewRow);
+ }
+ }
+ option.data = tables;
+ table.render(option);
+ //琛屾暟鎹� 涓嬫媺澶嶉�夋 鏄剧ず
+ checkRefresh();
+ } else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+ }
+ }
+ //#endregion
+
+ //#region 澶嶅埗涓�琛�
+ function btnCopyLine(data) {
+ var copydata = JSON.stringify(data);
+ if (data.length <= 0) {
+ layer.msg("璇烽�夋嫨闇�瑕佸鍒剁殑涓�琛岋紒");
+ }
+ else if (data.length > 1) {
+ layer.msg("鍙兘閫夋嫨澶嶅埗涓�琛岋紒");
+ }
+ else {
+ var copydata2 = copydata.substring(1, copydata.length);//鍘婚櫎棣栬瀛楃'['
+ var copyrow = copydata2.substring(0, copydata2.length - 1);//鍘婚櫎鏈熬瀛楃']'
+ table.cache["mainTable"].push(JSON.parse(copyrow));//灏嗗鍒剁殑琛屽己杞垚json杩藉姞鍒拌〃鏍间笂
+ option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
+ table.render(option);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
+ //琛屾暟鎹� 涓嬫媺澶嶉�夋 鏄剧ず
+ checkRefresh();
+ }
+ }
+ //#endregion
+
+ //#region 涓婄Щ
+ function btn_up() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (data.length == 1) {
+ var tables = [];
+ //鑾峰彇琛ㄦ牸鐨勫叏閮ㄨ
+ var rowList = table.cache['mainTable'];
+ for (var i = 0; i < rowList.length; i++) { //閬嶅巻琛ㄦ牸鐨勮
+ if (rowList[i].LAY_CHECKED == true) { //鑾峰彇閫変腑琛岀殑浣嶇疆
+ //濡傛灉鏄涓�琛屼笂绉伙紝鍒欏け璐ュ苟鎻愰啋
+ if (i == 0) {
+ layer.msg("绗竴琛屾暟鎹棤娉曚笂绉伙紒");
+ return;
+ }
+ tables.push(option.data[i - 1]);
+ data[0].LAY_CHECKED = true;
+ option.data[i - 1] = data[0];
+ option.data[i] = tables[0];
+ table.render(option);
+ //琛屾暟鎹� 涓嬫媺澶嶉�夋 鏄剧ず
+ checkRefresh();
+ break;
+ }
+ }
+ } else {
+ layer.msg("璇烽�夋嫨涓�琛屾暟鎹紒");
+ }
+ }
+ //#endregion
+
+ //#region 涓嬬Щ
+ function btn_under() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (data.length == 1) {
+ var tables = [];
+ //鑾峰彇琛ㄦ牸鐨勫叏閮ㄨ
+ var rowList = table.cache['mainTable'];
+ for (var i = 0; i < rowList.length; i++) { //閬嶅巻琛ㄦ牸鐨勮
+ if (rowList[i].LAY_CHECKED == true) { //鑾峰彇閫変腑琛岀殑浣嶇疆
+ //濡傛灉鏄渶鍚庝竴琛屼笅绉伙紝鍒欏け璐ュ苟鎻愰啋
+ if (i == option.data.length - 1) {
+ layer.msg("鏈�鍚庝竴琛屾暟鎹棤娉曚笅绉伙紒");
+ return;
+ }
+ tables.push(option.data[i + 1]);
+ data[0].LAY_CHECKED = true;
+ option.data[i + 1] = data[0];
+ option.data[i] = tables[0];
+ table.render(option);
+ //琛屾暟鎹� 涓嬫媺澶嶉�夋 鏄剧ず
+ checkRefresh();
+ break;
+ }
+ }
+ } 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({
+ type: "GET",
+ url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+ async: false,
+ data: { "HModName": HModName, "user": HMaker },
+ success: function (data1) {
+ if (data1.data.length != 0) {
+ var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+ dataCol = data1.data[0].HGridString.split(',');
+
+ for (var i = 0; i < option.cols[0].length - 2; i++) {
+ if (dataCol[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 (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);
+ //琛屾暟鎹� 涓嬫媺澶嶉�夋 鏄剧ず
+ checkRefresh();
+ } else {
+ table.render(option);
+ //琛屾暟鎹� 涓嬫媺澶嶉�夋 鏄剧ず
+ checkRefresh();
+ }
+
+ //鍒锋柊鎸夐挳鏄剧ず
+ var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+ Display_HideButton(btns, HBillType, HModName, HMaker);
+
+ },
+ complete: function (XHR, TS) { XHR = null },//鍥炴敹璧勬簮
+ error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ })
+ }
+ //#endregion
+
+ //#region 琛屽唴浜嬩欢
+ table.on('tool(mainTable)', function (obj) {
+ set_GridDelete(obj); //琛屽唴鍒犻櫎
+ set_GridCellCheck(obj); //琛屽唴蹇嵎閿瓫閫�
+
+ var data = obj.data;
+ if (obj.event == 'HDate') {
+ var field = $(this).data('field');
+ laydate.render({
+ elem: this.firstChild
+ , show: true //鐩存帴鏄剧ず
+ , closeStop: this
+ , done: function (nowDate) {
+ //鏃堕棿閫夋嫨瀹屾垚锛岃鏁版嵁鏇存柊
+ data[field] = nowDate;
+ obj.update(data);
+ }
+ });
+ }
+ });
+ //#endregion
+
+ //#region 琛屽唴鍒犻櫎
+ function set_GridDelete(obj) {
+ var data = obj.data;
+ var rowIndex = $(obj.tr).attr("data-index");
+ if (obj.event === 'del') {
+ layer.confirm('鐪熺殑鍒犻櫎琛屽悧锛�', function (index) {
+ console.log("绱㈠紩涓�:" + rowIndex);
+ if (rowIndex === '0') {
+ layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
+ } else {
+ obj.del();
+ option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
+ table.reload(option);
+ layer.close(index);
+ }
+ });
+ }
+ }
+ //#endregion
+
+ //#region 琛屽唴蹇嵎閿瓫閫�
+ function set_GridCellCheck(obj) {
+ $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
+ if (event.key == "F7") {
+ //宸ヨ壓鍙傛暟
+ if (obj.event == "HTechParamNumber") {
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "宸ヨ壓鍙傛暟鍒楄〃" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["90%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_TechnologyParameterList.html?Type=HTechParamList&OperationType=2', '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("璇烽�夋嫨涓�鏉℃暟鎹�");
+ }
+ OptionData = checkStatus.data[0];
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ , end: function () {
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ obj.update({
+ "HTechParamID": OptionData.HItemID
+ , "HTechParamNumber": OptionData.宸ヨ壓鍙傛暟浠ｇ爜
+ , "HTechParamName": OptionData.宸ヨ壓鍙傛暟鍚嶇О
+ })
+ }
+ })
+ }
+ //宸ヨ壓鍙傛暟鍗曚綅
+ if (obj.event == "HTechParamUnitNumber") {
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "宸ヨ壓鍙傛暟鍗曚綅鍒楄〃" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["90%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_TechnologyParameterUnitList.html?Type=HTechParamUnitList&OperationType=2', '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("璇烽�夋嫨涓�鏉℃暟鎹�");
+ }
+ OptionData = checkStatus.data[0];
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ , end: function () {
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ obj.update({
+ "HTechParamUnitID": OptionData.HItemID
+ , "HTechParamUnitNumber": OptionData.宸ヨ壓鍙傛暟鍗曚綅浠ｇ爜
+ , "HTechParamUnitName": OptionData.宸ヨ壓鍙傛暟鍗曚綅鍚嶇О
+ })
+ }
+ })
+ }
+ obj.event = "";
+ return false;
+ }
+ })
+ }
+ //#endregion
+
+ //#region 琛屾暟鎹� 涓嬫媺澶嶉�夋 琛岄�夋嫨澶勭悊
+
+ //琛岄�夋嫨澶勭悊锛堟娴嬬粨鏋滐級
+ form.on('select(HResult)', function (data) {
+ //鑾峰彇涓嬫媺妗嗛�変腑鐨勫��
+ var elem = data.othis.parents('tr');
+ var dataindex = elem.attr("data-index");
+ $.each(option.data, function (index, value) {
+ if (value.LAY_TABLE_INDEX == dataindex) {
+ value.HResult = data.value;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+ }
+ });
+ });
+
+ //琛屾暟鎹� 涓嬫媺澶嶉�夋 鍒锋柊琛ㄦ牸
+ function checkRefresh() {
+ for (var i = 1; i <= option.data.length; i++) {
+ //鐘舵��
+ $('#HResult' + i + '').find("option[value='" + option.data[i - 1].HResult + "']").attr("selected", true);
+ }
+ form.render('select');
+ }
+ //#endregion
+
+ //#endregion
+
+ //#region 鍔熻兘鎺т欢
+
+ //#region 鎻愪氦
+ form.on('submit(btn_Save)', function (data) {
+ set_SaveBill(data);
+ });
+
+ //#region 淇濆瓨鏂规硶
+ function set_SaveBill(data) {
+ if ($("#HProcNo").val() == '') {
+ $("#HProcNo").val("0");
+ data.field.HProcNo = $('#HProcNo').val()
+ }
+ //鑾峰彇瀛愯〃鏁版嵁
+ var num = [];
+ for (var i = 0; i < table.cache["mainTable"].length; i++) {
+ if (table.cache["mainTable"][i] != "") {
+ table.cache["mainTable"][i].LAY_TABLE_INDEX = i;
+ num.push(table.cache["mainTable"][i])
+ }
+ }
+ //鑾峰彇琛ㄥご鏁版嵁骞跺簭鍒楀寲
+ var sMainStr = JSON.stringify(data.field); //涓昏〃鏁版嵁
+ //瀛愯〃鏁版嵁搴忓垪鍖�
+ var sSubStr = JSON.stringify(num);
+ //鎷兼帴搴忓垪鍖栫殑鏁版嵁
+ var sMainSub = sMainStr + ';' + sSubStr + ';' + OperationType + ";" + HMaker;
+
+ if (!AllowLoadData(sSubStr))//鏁版嵁楠岃瘉
+ {
+ return false;
+ }
+ var index = layer.load();
+ $.ajax({
+ type: "POST",
+ url: GetWEBURL() + "SB_EquipICMOTechParamBillController/GetSB_EquipICMOTechParamBill_Save_Json",
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "sMainSub": sMainSub },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) {
+ layer.msg(data.Message, { icon: 1 });
+ $('#btn_Save').addClass("layui-btn-disabled").attr("disabled", true);
+ layer.close(index);
+ }
+ else {
+ layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.close(index);
+ }
+ },
+ complete: function (XHR, TS) { XHR = null },//鍥炴敹璧勬簮
+ error: function (err) {
+ layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.close(index);
+ }
+ });
+ }
+ //#endregion
+
+ //#endregion
+
+ //#region 閫�鍑�
+ form.on('submit(btn_Cancel)', function () {
+ layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
+ //鎿嶄綔绫诲瀷锛圤perationType=1鏂板銆丱perationType=2缂栬緫锛�
+ if (OperationType == 2) {
+ Pub_Close(1);
+ }
+ else {
+ Pub_Close(2);
+ }
+ });
+ })
+ //#endregion
+
+ //#endregion
+
+ });
+
+ //浠ヤ笂涓簂ayui妯″潡
+ //姝ゅ鏂规硶娑夊強鍒拌澶栭儴椤甸潰parent.鏂规硶鍚嶈皟鐢ㄧ殑蹇呴』鏀惧湪Layui鏂规硶澶栭儴
+
+ //鍙屽嚮杩斿洖鍩虹璧勬枡鏁版嵁 琛ㄥご
+ function GetProcessValue(obj) //杩斿洖宸ュ簭
+ {
+ $("#HProcName").val(obj[0].宸ュ簭鍚嶇О);
+ $("#HProcID").val(obj[0].HItemID);
+ }
+ function GetHEmpValue(obj) //杩斿洖鐐规浜�
+ {
+ $("#HEmpName").val(obj[0].鑱屽憳鍚嶇О);
+ $("#HEmpID").val(obj[0].HItemID);
+ }
+ function GetGySource(obj) //杩斿洖鐢熶骇璧勬簮
+ {
+ $("#HSourceName").val(obj[0].鐢熶骇璧勬簮鍚嶇О);
+ $("#HSourceID").val(obj[0].HItemID);
+ }
+ function GetHGroupValue(obj) //杩斿洖鐢熶骇鐝粍
+ {
+ $("#HGroupName").val(obj[0].鐝粍鍚嶇О);
+ $("#HGroupID").val(obj[0].HItemID);
+ }
+ function GetHDeptNameValue(obj) //杩斿洖鐢熶骇杞﹂棿
+ {
+ $("#HDeptName").val(obj[0].閮ㄩ棬鍚嶇О);
+ $("#HDeptID").val(obj[0].HItemID);
+ }
+ function GetEquipFileValue(obj) //杩斿洖璁惧
+ {
+ $("#HEquipName").val(obj[0].璁惧鍚嶇О);
+ $("#HEquipID").val(obj[0].hmainid);
+ }
+
+ //鍙屽嚮杩斿洖鍩虹璧勬枡鏁版嵁 鍒楄〃
+ function GetParameterListValue(data) //杩斿洖宸ヨ壓鍙傛暟
+ {
+ OptionData = data
+ }
+ function GetTechnologyParameterUnitListValue(data) //杩斿洖宸ヨ壓鍙傛暟鍗曚綅
+ {
+ OptionData = data
+ }
+
+ //鍗曟嵁涓婁紶鍓嶅垽鏂�
+ function AllowLoadData(sSubStr) { //闈炵┖楠岃瘉
+ var Result = true;
+ if ($("#HMainSourceInterID").val() == '0') {
+ layer.msg("婧愬崟淇℃伅娌℃湁閫夋嫨锛岃鍏堥�夋嫨婧愬崟淇℃伅锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+ if ($("#HProcID").val() == '0') {
+ layer.msg("宸ュ簭娌℃湁閫夋嫨锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+ if ($("#HEquipID").val() == '0') {
+ layer.msg("璁惧娌℃湁閫夋嫨锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+ if (typeof (sSubStr) == "undefined") {
+ layer.msg("娌℃湁鏄庣粏璁板綍锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+ if (typeof (sSubStr) != "undefined" && typeof (sSubStr) != "") {
+ sSubStr = JSON.parse(sSubStr);
+ for (var i = 0; i <= sSubStr.length - 1; i++) {
+ if (sSubStr[i].HTechParamID == "0") {
+ layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,宸ヨ壓鍙傛暟淇℃伅涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+ }
+ }
+ else {
+ return Result;
+ }
+ return Result;
+ }
+ </script>
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\267\245\350\211\272\345\217\202\346\225\260\350\256\242\345\215\225\347\202\271\346\243\200\350\241\250/SB_EquipICMOTechParamBillList.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\267\245\350\211\272\345\217\202\346\225\260\350\256\242\345\215\225\347\202\271\346\243\200\350\241\250/SB_EquipICMOTechParamBillList.html"
new file mode 100644
index 0000000..8ba2760
--- /dev/null
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\267\245\350\211\272\345\217\202\346\225\260\350\256\242\345\215\225\347\202\271\346\243\200\350\241\250/SB_EquipICMOTechParamBillList.html"
@@ -0,0 +1,1176 @@
+锘�<!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">
+ <!--寮曠敤layui鏍峰紡鏂囦欢-->
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <!--寮曠敤layui js鏂囦欢-->
+ <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/HideButton.js"></script>
+ <script src="../../../layuiadmin/soulTable.slim.js"></script>
+ <script src="../../../layuiadmin/PageTitle.js"></script>
+
+ <style type="text/css">
+ input.layui-input.layui-unselect {
+ padding-right: 0;
+ }
+ </style>
+</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">鏃ユ湡闂撮殧</label>
+ <div class="layui-input-block">
+ <select name="HInitTimeCycle" id="HInitTimeCycle" class="ForFilteringSchemes" lay-filter="HInitTimeCycle" style="width:190px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">寮�濮嬫棩鏈�</label>
+ <div class="layui-input-block">
+ <input type="date" class="layui-input ForFilteringSchemes" id="HBeginDate" style="width:190px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">缁撴潫鏃ユ湡</label>
+ <div class="layui-input-block">
+ <input type="date" class="layui-input ForFilteringSchemes" id="HEndDate" style="width:190px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鍗曟嵁鍙�</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HBillNo" id="HBillNo">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">缁勭粐</label>
+ <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
+ <select name="HStockOrgID" id="HStockOrgID" class="ForFilteringSchemes" lay-verify="HStockOrgID">
+ <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+ </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-inline" style="margin-left:5px;">
+ <div style="text-align:center;font-size:15px;font-weight:bold;color:#fc9393" id="HFilterScheme_Now"></div>
+ </div>
+ <div class="layui-colla-content" style="padding: 6px; margin-left: 6%;">
+ <div class="layui-row" style="margin-top:5px">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护</label>
+ <div class="layui-input-block">
+ <select name="ColName" id="ColName" class="ForFilteringSchemes" lay-filter="ColName" style="width:190px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator" id="Comparator" class="ForFilteringSchemes" lay-filter="Comparator" style="width:190px;">
+ <option value="0" selected="selected"></option>
+ <option value="=">=</option>
+ <option value=">=">>=</option>
+ <option value=">">></option>
+ <option value="<="><=</option>
+ <option value="<"><</option>
+ <option value="<>"><></option>
+ <option value="7">鍖呭惈</option>
+ <option value="8">宸﹀寘鍚�</option>
+ <option value="9">鍙冲寘鍚�</option>
+ <option value="10">涓嶅寘鍚�</option>
+ </select>
+ </div>
+ <div class="layui-inline">
+ <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
+ </div>
+ </div>
+ </div>
+ </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_Export" id="btn_Export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Add" id="btn_Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Edit" id="btn_Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Delete" id="btn_Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Refresh" id="btn_Refresh"><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_Close" id="btn_Close"><i class="layui-icon layui-icon-radio"></i>鍏抽棴</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_DeClose" id="btn_DeClose"><i class="layui-icon layui-icon-circle"></i>鍙嶅叧闂�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Drop" id="btn_Drop"><i class="layui-icon layui-icon-radio"></i>浣滃簾</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_DeDrop" id="btn_DeDrop"><i class="layui-icon layui-icon-circle"></i>鍙嶄綔搴�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Exit" id="btn_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_HideColumn" id="btn_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_HideButton" id="btn_HideButton"><i class="layui-icon layui-icon-form"></i>鎸夐挳璁剧疆</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_SaveScheme" id="btn_SaveScheme"><i class="layui-icon layui-icon-template"></i>淇濆瓨鏂规</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_ReadScheme" id="btn_ReadScheme"><i class="layui-icon layui-icon-set"></i>璇诲彇鏂规</button>
+ </div>
+ </script>
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
+ <script>
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index', //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate', 'soulTable'], 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
+ , soulTable = layui.soulTable
+ var HModName = "SB_EquipICMOTechParamBillList";
+ var HBillType = "3919";
+ var HMaker = sessionStorage["HUserName"]
+ var HStockOrgID = sessionStorage["OrganizationID"] //缁勭粐ID
+ var sWhere = "";
+ var ins; //鐢ㄤ簬瀵煎嚭excel
+ var option = [];
+ var columns = "";
+ var titleData = []; //涓嶉渶瑕佹樉绀虹殑瀛楁
+ var params = get_UrlVars();
+ var OperationType = params[params[0]] == null ? 1 : params[params[0]]; //1涓虹洿鎺ュ垪琛ㄦā鍧楁墦寮� 2涓轰粠鍏朵粬妯″潡璺宠浆鎵撳紑鍒楄〃
+ var ViewName = params[params[1]]; //鎵�璋冪敤鐨勮鍥�
+ //#endregion
+
+ //#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
+ //閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
+ var HPageTitle = get_PageTitle(HBillType) == "" ? document.title : get_PageTitle(HBillType);
+ //#endregion
+
+ //#region 銆愯繃婊ゆ柟妗堛��
+
+ //杩囨护鏉′欢鐨刢lass绫�
+ var HClassTag = "ForFilteringSchemes";
+ //妯″潡鍚嶇О锛堜腑鏂囩増锛� 姣忎釜妯″潡椤甸潰閮介渶瑕佷慨鏀�
+ window.HModuleName = "璁惧宸ヨ壓鍙傛暟璁㈠崟鐐规琛ㄥ垪琛�";
+ //鏄惁宸茬粡閫夋嫨浜嗚繃婊ゆ柟妗堬紙鍏ㄥ眬鍙橀噺锛�
+ window.HDefaultFilter = "";
+ //閫夋嫨鐨勮繃婊ゆ柟妗堝唴鐮侊紙鍏ㄥ眬鍙橀噺锛�
+ window.HInterID_Choose = 0;
+
+ //#endregion
+
+ //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+ //#region 鍒濆鍖栫晫闈�
+
+ set_ClearBill();
+
+ function set_ClearBill() {
+ //鍒濆鍖栨棩鏈熼棿闅斻�佸紑濮嬫棩鏈熴�佺粨鏉熸棩鏈�
+ setSelect_HInitTimeCycle();
+ //鑻ユ棩鏈熼棿闅斾笉涓� 浠绘剰闂撮殧锛屽垯绂佺敤寮�濮嬫棩鏈熶笌缁撴潫鏃ユ湡鐨勯�夋嫨
+ var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
+ if (HInitTimeCycle != -1) {
+ $('#HBeginDate').prop('disabled', true);
+ $('#HEndDate').prop('disabled', true);
+ } else {
+ $('#HBeginDate').prop('disabled', false);
+ $('#HEndDate').prop('disabled', false);
+ }
+
+ //鏍规嵁鏃ユ湡闂撮殧璁剧疆寮�濮嬫椂闂翠笌缁撴潫鏃堕棿
+ $("#HBeginDate").val(Pub_Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
+ $("#HEndDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
+ //鑾峰彇缁勭粐
+ set_StockOrg();
+ //鍒濆鍖栬〃鏍�
+ set_InitGrid();
+
+ if (OperationType == 2) {
+ $("#HStockOrgID").val(HStockOrgID) //缁勭粐
+ $("#HStockOrgID").attr("disabled", true);
+ form.render('select');
+ }
+ else {
+ OperationType = 1;
+ ViewName = "h_v_SB_EquipICMOTechParamBillList";
+ }
+
+ //鎵ц鏌ヨ鏂规硶
+ get_FastQuery()
+
+ //鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
+ get_DefaultModule();
+ }
+ //#endregion
+
+ //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
+ if (sessionStorage.login != "login") {
+ layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
+ icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
+ }, function () { window.location.href = "../../user/login.html"; });
+ }
+
+ //#region 鑾峰彇缁勭粐
+ function set_StockOrg() {
+ //鑾峰彇鐧诲綍椤电粍缁囧垪
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Web/GetOrganizations",
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ success: function (result) {
+ var Organization = "";
+ Organization += '<option style="color:blue;" value="-1">鍏ㄩ儴</option>';
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data;
+ for (var i = 0; i < data.length; i++) {
+ Organization += '<option style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
+ }
+ $("#HStockOrgID").append(Organization);
+ $("#HStockOrgID").val(HStockOrgID)
+ form.render('select');
+ }
+ layer.closeAll("loading");
+ },
+ complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
+ })
+ }
+ //#endregion
+
+ //#region 鍒濆鍖栬〃鏍兼柟娉�
+ function set_InitGrid() {
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , page: true
+ , totalRow: true
+ , height: 'full-50'
+ , cellMinWidth: 90
+ , limit: 50
+ , limits: [50, 500, 5000, 20000]
+ , done: function (res, curr, count) {
+ soulTable.render(this);
+ }
+ };
+ }
+ //#endregion
+
+ //#region 鐐瑰嚮琛岄�変腑楂樹寒
+ 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;
+ }
+ });
+ })
+ //#endregion
+
+ //#region 鏄剧ず鍒楁暟鎹�
+ function DisPlay_HideColumn() {
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+ async: false,
+ data: { "HModName": HModName, "user": HMaker },
+ success: function (data1) {
+ if (data1.data.length != 0) {
+ var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+ dataCol = data1.data[0].HGridString.split(',');
+
+ for (var i = 0; i < option.cols[0].length - 2; i++) {
+ if (dataCol[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 (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);
+ }
+
+ //鍒锋柊鎸夐挳鏄剧ず
+ var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+ Display_HideButton(btns, HBillType, HModName, HMaker);
+
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ })
+ }
+ //#endregion
+
+ //#endregion
+
+ //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
+
+ //#region 宸ュ叿鏍忎簨浠�
+ table.on('toolbar(mainTable)', function (obj) {
+ switch (obj.event) {
+ //瀵煎嚭鎸夐挳
+ case 'btn_Export': btn_Export();
+ break;
+ //鏂板鎸夐挳
+ case 'btn_Add': btn_Add();
+ break;
+ //缂栬緫鎸夐挳
+ case 'btn_Edit': btn_Edit();
+ break;
+ //鍒犻櫎鎸夐挳
+ case 'btn_Delete': btn_Delete();
+ break;
+ //鍒锋柊鎸夐挳
+ case 'btn_Refresh': btn_Refresh();
+ break;
+ //瀹℃牳鎸夐挳 锛�1:瀹℃牳銆�2:鍙嶅鏍革級
+ case 'btn_Audit': set_CheckBill(1);
+ break;
+ //鍙嶅鏍告寜閽�
+ case 'btn_DeAudit': set_CheckBill(2);
+ break;
+ //鍏抽棴鎸夐挳 锛�1:鍏抽棴銆�2:鍙嶅叧闂級
+ case 'btn_Close': set_CloseBill(1);
+ break;
+ //鍙嶅叧闂寜閽�
+ case 'btn_DeClose': set_CloseBill(2);
+ break;
+ //浣滃簾鎸夐挳 锛�1:浣滃簾銆�2:鍙嶄綔搴燂級
+ case 'btn_Drop': set_DropBill(1);
+ break;
+ //鍙嶄綔搴熸寜閽�
+ case 'btn_DeDrop': set_DropBill(2);
+ break;
+ //閫�鍑烘寜閽�
+ case 'btn_Exit': Pub_Close(2);
+ break;
+ //鍒楄缃�
+ case 'btn_HideColumn': get_HideColumn();
+ break;
+ //鎸夐挳璁剧疆
+ case 'btn_HideButton':
+ var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+ get_HideButton(btns, HBillType, HModName, HMaker);
+ break;
+ //淇濆瓨鏂规
+ case 'btn_SaveScheme': set_SaveScheme();
+ break;
+ //璇诲彇鏂规
+ case 'btn_ReadScheme': set_ReadScheme();
+ break;
+ };
+ });
+ //#endregion
+
+ //鏃ユ湡闂撮殧涓嬫媺鍒楄〃鐩戝惉
+ form.on('select(HInitTimeCycle)', function (data) {
+ var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
+ //鑻ユ棩鏈熼棿闅斾笉涓� 浠绘剰闂撮殧锛屽垯绂佺敤寮�濮嬫棩鏈熶笌缁撴潫鏃ユ湡鐨勯�夋嫨
+ if (HInitTimeCycle != -1) {
+ $('#HBeginDate').prop('disabled', true);
+ $('#HEndDate').prop('disabled', true);
+
+ $("#HBeginDate").val(Pub_Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
+ $("#HEndDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
+
+ //鎵ц鏌ヨ鏂规硶
+ get_FastQuery();
+ } else {
+ $('#HBeginDate').prop('disabled', false);
+ $('#HEndDate').prop('disabled', false);
+ }
+ });
+
+ //#region 瀵煎嚭Execel
+ function btn_Export() {
+ table.exportFile(ins.config.id, option.data, "xls");
+ }
+ //#endregion
+
+ //#region 鏂板
+ function btn_Add() {
+ layer.open({
+ type: 2
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['100%', '100%']
+ , title: HPageTitle + '- 鏂板'
+ , shift: 0 //寮瑰嚭鍔ㄧ敾
+ , content: '../../璁惧绠＄悊/璁惧宸ヨ壓鍙傛暟璁㈠崟鐐规琛�/SB_EquipICMOTechParamBillEdit.html?OperationType=1&linterid=0'
+ , btn: ['纭畾'],
+ // 鎸夐挳1 鐨勫洖璋�
+ end: function (index, layero, that) {
+ //鍒锋柊椤甸潰
+ $("#btnSearch").trigger('click');
+ }
+ })
+ }
+ //#endregion
+
+ //#region 缂栬緫
+ function btn_Edit() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var HInterID = data[0].hmainid.toString();
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: HPageTitle + '- 缂栬緫'
+ , shift: 0 //寮瑰嚭鍔ㄧ敾
+ , content: '../../璁惧绠＄悊/璁惧宸ヨ壓鍙傛暟璁㈠崟鐐规琛�/SB_EquipICMOTechParamBillEdit.html?OperationType=2&linterid=' + HInterID
+ , btn: ['纭畾'],
+ // 鎸夐挳1 鐨勫洖璋�
+ end: function (index, layero, that) {
+ //鍒锋柊椤甸潰
+ $("#btnSearch").trigger('click');
+ }
+ })
+ } else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+ }
+ }
+ //#endregion
+
+ //#region 鍒犻櫎
+ function btn_Delete() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var HInterID = data[0].hmainid.toString();
+ var HBillNo = data[0].鍗曟嵁鍙�.toString();
+ layer.confirm("纭瑕佸垹闄ら�変腑琛屾暟鎹紵鍒犻櫎鍚庡皢涓嶅彲鎭㈠锛�", { title: "鍒犻櫎纭" }, function (index) {
+ var wait = layer.load();
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "SB_EquipICMOTechParamBillController/GetSB_EquipICMOTechParamBill_Delete_Json",
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "HInterID": HInterID, "HMaker": HMaker },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg("鍗曟嵁鍙凤細" + HBillNo + " 鍒犻櫎鎴愬姛锛�", { time: 1 * 1000, icon: 1 }, function () {
+ //鍒锋柊鐣岄潰
+ $("#btnSearch").trigger('click');
+ layer.close(wait);
+ });
+
+ } else {
+ layer.msg(result.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.close(wait);
+ }
+ }, error: function () {
+ layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.close(wait);
+ }
+ });
+ })
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+ }
+ }
+ //#endregion
+
+ //#region 鍒锋柊
+ function btn_Refresh() {
+ get_FastQuery();
+ }
+ //#endregion
+
+ //#region 瀹℃牳锛坣um=1锛�/鍙嶅鏍革紙num=2锛�
+ function set_CheckBill(num) {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var HInterID = data[0].hmainid.toString();
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/SB_EquipICMOTechParamBillController/GetSB_EquipICMOTechParamBill_Check_Json",
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "HInterID": HInterID, "Type": num, "HMaker": HMaker },
+ 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.msg(result.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ }, error: function () {
+ layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ });
+ }
+ else {
+ if (num == 1) {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹弽瀹℃牳锛�');
+ }
+ }
+ }
+ //#endregion
+
+ //#region 鍏抽棴锛坣um=1锛�/鍙嶅叧闂紙num=2锛�
+ function set_CloseBill(num) {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var HInterID = data[0].hmainid.toString();
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/SB_EquipICMOTechParamBillController/GetSB_EquipICMOTechParamBill_Close_Json",
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "HInterID": HInterID, "Type": num, "HMaker": HMaker },
+ 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.msg(result.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ }, error: function () {
+ layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ });
+ }
+ else {
+ if (num == 1) {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹叧闂紒');
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹弽鍏抽棴锛�');
+ }
+ }
+ }
+ //#endregion
+
+ //#region 浣滃簾锛坣um=1锛�/鍙嶄綔搴燂紙num=2锛�
+ function set_DropBill(num) {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var HInterID = data[0].hmainid.toString();
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/SB_EquipICMOTechParamBillController/GetSB_EquipICMOTechParamBill_Cancelltion_Json",
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "HInterID": HInterID, "Type": num, "HMaker": HMaker },
+ 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.msg(result.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ }, error: function () {
+ layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ });
+ }
+ else {
+ if (num == 1) {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹綔搴燂紒');
+ }
+ 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 閲嶇疆鎸夐挳
+ form.on('submit(btnReSearch)', function (data) {
+ //娓呯┖杩囨护鏉′欢
+ set_ClearQuery();
+ });
+
+ //閲嶇疆杩囨护鏉′欢
+ function set_ClearQuery() {
+ var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
+ $("#HBeginDate").val(Pub_Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd")); //寮�濮嬫棩鏈�
+ $("#HEndDate").val(Pub_Format(new Date(), "yyyy-MM-dd")); //缁撴潫鏃ユ湡
+ $("#HBillNo").val("");//鍗曟嵁鍙�
+ $("#ColName").val("0");
+ $("#Comparator").val("0");
+ $("#ColContent").val("");
+ $("#HStockOrgID").val(HStockOrgID) //缁勭粐
+ form.render('select');
+ sWhere = "";
+ }
+
+ //#endregion
+
+ //#region 鏌ヨ鎸夐挳
+ form.on('submit(btnSearch)', function (data) {
+ get_FastQuery();
+ });
+
+ //蹇�熸煡璇�
+ function get_FastQuery() {
+ var HBeginDate = $("#HBeginDate").val(); //寮�濮嬫棩鏈�
+ var HEndDate = $("#HEndDate").val(); //缁撴潫鏃ユ湡
+ var HBillNo = $("#HBillNo").val(); //鍗曟嵁鍙�
+ var HStockOrgID = $("#HStockOrgID").val(); //缁勭粐
+ var ColName = $("#ColName").val(); //澶嶉�夋
+ var Comparator = $("#Comparator").val()
+ var ColContent = $("#ColContent").val();
+
+ //鐩存帴鍒楄〃鎵撳紑
+ if (OperationType == undefined || OperationType == 1) {
+ if (HStockOrgID != "-1") {
+ sWhere = " and HStockOrgID='" + HStockOrgID + "'";
+ }
+ }
+ //浠庡叾浠栨ā鍧楄烦杞墦寮�鍒楄〃
+ else {
+ sWhere = " and HStockOrgID='" + HStockOrgID + "'";
+ }
+
+ 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 (HBeginDate) {
+ sWhere += " and 鏃ユ湡 >= '" + HBeginDate + "'";
+ }
+ if (HEndDate) {
+ sWhere += " and 鏃ユ湡 <= '" + HEndDate + "'";
+ }
+ if (HBillNo) {
+ sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
+ }
+ get_Display(sWhere);
+ sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ }
+
+ //#endregion
+
+ //#region 鍒楄〃鍒锋柊
+ function get_Display(sWhere) {
+ var ajaxLoad = layer.load();
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + '/SB_EquipICMOTechParamBillController/GetSB_EquipICMOTechParamBillList_Json',
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "sWhere": sWhere, "HMaker": HMaker, "OperationType": OperationType, "ViewName": ViewName },
+ 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 });
+ //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
+ var patrn = new RegExp(/^h/i);
+ if (patrn.test(data1.list[key].ColmCols)) {
+ titleData[key] = data1.list[key].ColmCols;
+ }
+ }
+
+ //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+ col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' });
+ for (var i = 0; i < data.length; i++) {
+ 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 HH:mm:ss')}}</div>", width: 160 });
+ break;
+ case 'Decimal':
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 140, totalRow: true });
+ break;
+ case 'Int32':
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 140, totalRow: true });
+ break;
+ default:
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 140 });
+ }
+ }
+ }
+
+ columns = col;
+
+ option.cols = [columns];
+ option.data = data1.data;
+ option.totalRow = true;
+ table.render(option);
+ ins = table.render(option);
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
+ layer.close(ajaxLoad);
+ //鑷畾涔夎繃婊や笅鎷夋鍔犺浇
+ if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+ ColFilter();
+ }
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.Message, { icon: 5 });
+ }
+ },
+ error: function () {
+ layer.close(ajaxLoad);
+ 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
+
+ //#region 鍒濆鏃ユ湡闂撮殧 涓嬫媺鍒楄〃
+ function setSelect_HInitTimeCycle() {
+ var valueList = [0, 1, 2, 3, 4, 5, 6, 29];
+ var titleList = ["浠婂ぉ", "杩戜袱澶�", "杩戜笁澶�", "杩戝洓澶�", "杩戜簲澶�", "杩戝叚澶�", "杩戜竷澶�", "杩�30澶�"];
+
+ var HInitTimeCycle_ArrayList = '<option value="-1" selected="selected" >浠绘剰闂撮殧</option>';
+ for (var i = 0; i < valueList.length; i++) {
+ HInitTimeCycle_ArrayList += '<option style="color:blue;" value="' + valueList[i] + '">' + titleList[i] + '</option>';
+ }
+
+ $("#HInitTimeCycle").empty();
+ $("#HInitTimeCycle").append(HInitTimeCycle_ArrayList);
+ form.render('select');
+
+ $("#HInitTimeCycle").val("29");
+ }
+ //#endregion
+
+ //#region 銆愯繃婊ゆ柟妗堛��
+
+ //鑾峰彇褰撳墠鐢ㄦ埛鐨勯粯璁よ繃婊ゆ柟妗�
+ function get_DefaultModule() {
+ $.ajax({
+ url: GetWEBURL() + '/Xt_FastICScheme/Chooselist',
+ type: "GET",
+ data: { "user": sessionStorage["Czybm"], "HModuleName": 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);
+ }
+ }
+
+ var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
+ //鑻ユ棩鏈熼棿闅斾笉涓� 浠绘剰闂撮殧锛屽垯绂佺敤寮�濮嬫棩鏈熶笌缁撴潫鏃ユ湡鐨勯�夋嫨
+ if (HInitTimeCycle != -1) {
+ $('#HBeginDate').prop('disabled', true);
+ $('#HEndDate').prop('disabled', true);
+
+ $("#HBeginDate").val(Pub_Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
+ $("#HEndDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
+
+ //鎵ц鏌ヨ鏂规硶
+ get_FastQuery();
+ } else {
+ $('#HBeginDate').prop('disabled', false);
+ $('#HEndDate').prop('disabled', false);
+ }
+
+ ////鎵ц鏌ヨ鏂规硶
+ 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;
+ //鑾峰彇鏈〉鎵�鏈夎繃婊ゆ潯浠跺璞�(class涓寘鍚�"ForFilteringSchemes"鐨勫厓绱�)
+ var Filter = document.getElementsByClassName(HClassTag);
+
+ 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 = HFilterIdLists.substring(0, HFilterIdLists.length - 1);
+ HValue = HValue.substring(0, HValue.length - 1);
+ HElement_type = HElement_type.substring(0, HElement_type.length - 1);
+
+ //褰撳墠椤甸潰涓婃病鏈夐�夋嫨杩囨护鏂规锛岃繘鍏ユ柊澧炴柟娉�
+ if (HDefaultFilter == "") {
+ layer.open({
+ type: 2
+ , area: ['40%', '80%']
+ , title: '杩囨护鏂规'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../../绯荤粺绠＄悊/杩囨护鏂规璁剧疆/Xt_FastICScheme.html?OperationType=1&HModuleName=' + 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=' + 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(HClassTag); //鑾峰彇鏈〉鎵�鏈夎繃婊ゆ潯浠跺璞�(class涓寘鍚�"ForFilteringSchemes"鐨勫厓绱�)
+ HFilterIdList = "";
+ HFilterIdLists = "";
+ HValue = "";
+ HElement_type = "";
+ 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 = HFilterIdLists.substring(0, HFilterIdLists.length - 1);
+ HValue = HValue.substring(0, HValue.length - 1);
+ HElement_type = HElement_type.substring(0, HElement_type.length - 1);
+
+ var sMainSub = HInterID_Choose + ';' + HFilterIdLists + ';' + HValue + ';' + HElement_type + ';' + sessionStorage["Czybm"] + ';' + 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 });
+ }
+ 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(HClassTag); //鑾峰彇鏈〉鎵�鏈夎繃婊ゆ潯浠跺璞�(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 = HFilterIdLists.substring(0, HFilterIdLists.length - 1);
+ HValue = HValue.substring(0, HValue.length - 1);
+ HElement_type = HElement_type.substring(0, HElement_type.length - 1);
+
+ layer.open({
+ type: 2
+ , area: ['80%', '80%']
+ , title: '杩囨护鏂规鍒楄〃'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../../绯荤粺绠＄悊/杩囨护鏂规璁剧疆/Xt_FastICSchemeList.html?HType=Select&HFilterIdLists=' + HFilterIdLists + '&HValue=' + HValue + '&HElement_type=' + HElement_type + '&HModuleName=' + HModuleName
+ , cancel: function () {
+ // 鍙充笂瑙掑叧闂簨浠剁殑閫昏緫
+ HIsClose_Manual = true;
+ }
+ , end: function () {
+ if (HIsClose_Manual != true) {
+ get_FastQuery()
+ form.render("select");
+ }
+ }
+ })
+ }
+
+ //#endregion
+
+ //#endregion
+ //浠ヤ笂鏄痩ayui妯″潡
+ });
+ //#region 銆愯繃婊ゆ柟妗堣繑鍥炴暟鎹��
+ 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": 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 });
+ }
+ });
+ }
+ //#endregion
+ </script>
+
+</body>
+</html>
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\350\247\204\347\250\213\345\215\225/Sb_EquipDotCheckRuleList_PDA.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\350\247\204\347\250\213\345\215\225/Sb_EquipDotCheckRuleList_PDA.html"
index 197dde4..905e056 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\350\247\204\347\250\213\345\215\225/Sb_EquipDotCheckRuleList_PDA.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\350\247\204\347\250\213\345\215\225/Sb_EquipDotCheckRuleList_PDA.html"
@@ -92,6 +92,10 @@
, laypage = layui.laypage
, laydate = layui.laydate
, soulTable = layui.soulTable
+
+ var params = getUrlVars();
+ var HEquipID = params[params[0]]; //璁惧ID
+
var sWhere = "";
var option = [];
var HModName = "Sb_EquipDotCheckRuleList_PDA";
@@ -228,11 +232,12 @@
//鏌ヨ
function get_Display(sWhere) {
+ sWhere += " and HInterID = " + HEquipID;
var index = layer.load();
var ajaxLoad = layer.load();
//杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
$.ajax({
- url: GetWEBURL() + '/Sb_EquipDotCheckRuleBill/GetEquipDotCheckRuleList',
+ url: GetWEBURL() + '/Sb_EquipDotCheckRuleBill/GetEquipDotCheckRuleListPDA',
type: "GET",
data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
success: function (data1) {
@@ -242,6 +247,11 @@
//缁欑┖鐨勬暟缁勮祴鍊�
for (var key in data1.list) {
data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+ //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
+ var patrn = new RegExp(/^h/i);
+ if (patrn.test(data1.list[key].ColmCols)) {
+ titleData[key] = data1.list[key].ColmCols;
+ }
}
//鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
col.push({ type: 'checkbox', fixed: 'left' });
@@ -313,27 +323,27 @@
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 (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 (HBillNo) {
sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
}
@@ -643,6 +653,18 @@
form.render('select');
}
+ //鑾峰彇鍙傛暟
+ 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;
+ }
+
//浠ヤ笂鏄痩ayui妯″潡
});
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\243\200\351\252\214\346\226\271\346\241\210\345\215\225/QC_Add_CheckProject.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\243\200\351\252\214\346\226\271\346\241\210\345\215\225/QC_Add_CheckProject.html"
index ef3014e..fd83cf8 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\243\200\351\252\214\346\226\271\346\241\210\345\215\225/QC_Add_CheckProject.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\243\200\351\252\214\346\226\271\346\241\210\345\215\225/QC_Add_CheckProject.html"
@@ -649,7 +649,8 @@
for (var i = 0; i < checkStatus.data.length; i++) {
buttonArr.push({
"HPrjNo": i + 1, "HQCCheckItemID": checkStatus.data[i].HItemID, "HQCCheckItemNumber": checkStatus.data[i].浠ｇ爜, "HQCCheckItemName": checkStatus.data[i].鍚嶇О, "HQCStd": "", "HQCStdMax": "", "HQCUnit": "", "HRemark": ""
- ,"HTargetVal": 0, "HUpLimit": 0, "HDownLimit": 0, "HUpOffSet": 0, "HDownOffSet": 0, "HTargetValB": 0,"HUpLimitB": 0, "HDownLimitB": 0, "HUpOffSetB": 0,"HDownOffSetB": 0
+ , "HTargetVal": 0, "HUpLimit": 0, "HDownLimit": 0, "HUpOffSet": 0, "HDownOffSet": 0, "HTargetValB": 0, "HUpLimitB": 0, "HDownLimitB": 0, "HUpOffSetB": 0, "HDownOffSetB": 0, "HTargetValQ": 0, "HUpLimitQ": 0, "HDownLimitQ": 0, "HUpOffSetQ": 0
+ , "HDownOffSetQ": 0
});
}
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/MES_ProductionLinePackagingList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/MES_ProductionLinePackagingList.html"
index 86c5e8d..9cff146 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/MES_ProductionLinePackagingList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/MES_ProductionLinePackagingList.html"
@@ -375,7 +375,8 @@
//鏍囨敞閫変腑鏍峰紡
obj.tr.addClass('layui-table-click').siblings().removeClass('layui-table-click');
});
- //鎵撳嵃鎸夐挳
+
+ //鎵撳嵃
//form.on('submit(Print)', function (obj) {//閫�鍑�
// var checkStatus = table.checkStatus("mainTable"); //鑾峰彇閫変腑琛岀姸鎬�
// var linterid = checkStatus.data[0].HInterID;
@@ -388,7 +389,7 @@
// //window.open("../../views/BaseSet/HBarPlanPrint.html?linterid=" + linterid.toString() + "&Type=" + Type.toString() + "&OpenTmp=" + OpenTmp.toString());
- // var sWhere = "select * from h_v_SRM_BarCodeBillList where HItemID in(" + linterid + ") order by 鐗╂枡浠ｇ爜";
+ // var sWhere = "select a.HBarCode_White HBarCode_White,temp.HSupPartName HSupPartName,temp.HSupBarCodeNumber MFGPartNumber,temp.HCountryType CountryofOrigin,(select REPLACE(item, 'Q', '') from split(a.HBarCode_White, ':') where id = 6) Quantity, temp.HGrossWeight GrossWeight, temp.HPARTNAME PartName , (select item from split(a.HBarCode_White, ':') where id = 2) ContentLabelID , temp.HSupNumber Supplier, REPLACE(convert(varchar(10), GETDATE(), 20), '-', '') + ' ' + convert(varchar(5), GETDATE(), 24) MFGDate , REPLACE(convert(varchar(10), GETDATE(), 20), '-', '') SupplierLotCode , (select REPLACE(item, 'P', '') from split(a.HBarCode_White, ':') where id = 4) BBM from Sc_PackUnionBillMain a left join Gy_Material m on a.HMaterID = m.HItemID left join Sc_PackUnionBillBarCode_temp temp on m.HNumber = temp.HMaterNumber where a.HInterID=" + linterid;
// $.ajax({
// type: "GET",
@@ -400,7 +401,8 @@
// if (data.data.length != 0) {
// var dataPrint = [];
- // dataPrint.push({ "浜у搧鍚嶇О": data.data[0]["浜у搧鍚嶇О"], "鏉＄爜缂栧彿": data.data[0]["鏉＄爜缂栧彿"], "鏁伴噺": data.data[0]["鏁伴噺"], "鏃ユ湡": data.data[0]["鏃ユ湡"], "鐢熶骇浠诲姟鍗�": data.data[0]["鐢熶骇浠诲姟鍗�"], "娴佽浆鍗＄紪鍙�": data.data[0]["娴佽浆鍗＄紪鍙�"], "鑷畾涔夊瓧娈�": data.data[0]["鑷畾涔夊瓧娈�"], "椤圭洰缂栧彿": data.data[0]["椤圭洰缂栧彿"] }
+ // dataPrint.push(data.data[0]
+ // //{ "浜у搧鍚嶇О": data.data[0]["浜у搧鍚嶇О"], "鏉＄爜缂栧彿": data.data[0]["鏉＄爜缂栧彿"], "鏁伴噺": data.data[0]["鏁伴噺"], "鏃ユ湡": data.data[0]["鏃ユ湡"], "鐢熶骇浠诲姟鍗�": data.data[0]["鐢熶骇浠诲姟鍗�"], "娴佽浆鍗＄紪鍙�": data.data[0]["娴佽浆鍗＄紪鍙�"], "鑷畾涔夊瓧娈�": data.data[0]["鑷畾涔夊瓧娈�"], "椤圭洰缂栧彿": data.data[0]["椤圭洰缂栧彿"] }
// );
// var Customer = {
@@ -410,7 +412,7 @@
// var args = {
// type: "print",
// showOptionDlg: false, //濡傛灉涓嶆樉绀烘墦鍗板璇濇鑰岀洿鎺ユ墦鍗帮紝灏嗘琛屾敞閲婂幓鎺夊嵆鍙�
- // report: urlAddRandomNo("../../views/grf/鍖呰鍗曠墿鏂欐爣璇嗗崱(缃戦〉鐗�).grf"),
+ // report: urlAddRandomNo("../../grf/鐧芥爣鎵撳嵃.grf"),
// data: Customer
// };
// //var args = {
@@ -432,8 +434,9 @@
// layer.msg("閿欒:" + err, { icon: 5 });
// }
// })
-
+
//});
+
form.on('submit(Print)', function (obj) {//閫�鍑�
var checkStatus = table.checkStatus("mainTable"); //鑾峰彇閫変腑琛岀姸鎬�
@@ -441,58 +444,10 @@
////鎵撳紑鎵撳嵃妯℃澘
////var linterid = $("#HInterID").val();
////var linterid = "28973";
- //var Type = "HBarCodePrint";
- //var OpenTmp = "鍖呰鍗曠墿鏂欐爣璇嗗崱(缃戦〉鐗�)";
- ////var ReportViewer = document.getElementById("ReportViewer");
- //window.open("../../views/BaseSet/HBarPlanPrint.html?linterid=" + linterid.toString() + "&Type=" + Type.toString() + "&OpenTmp=" + OpenTmp.toString());
-
-
- var sWhere = "select a.HBarCode_White HBarCode_White,temp.HSupPartName HSupPartName,temp.HSupBarCodeNumber MFGPartNumber,temp.HCountryType CountryofOrigin,(select REPLACE(item, 'Q', '') from split(a.HBarCode_White, ':') where id = 6) Quantity, temp.HGrossWeight GrossWeight, temp.HPARTNAME PartName , (select item from split(a.HBarCode_White, ':') where id = 2) ContentLabelID , temp.HSupNumber Supplier, REPLACE(convert(varchar(10), GETDATE(), 20), '-', '') + ' ' + convert(varchar(5), GETDATE(), 24) MFGDate , REPLACE(convert(varchar(10), GETDATE(), 20), '-', '') SupplierLotCode , (select REPLACE(item, 'P', '') from split(a.HBarCode_White, ':') where id = 4) BBM from Sc_PackUnionBillMain a left join Gy_Material m on a.HMaterID = m.HItemID left join Sc_PackUnionBillBarCode_temp temp on m.HNumber = temp.HMaterNumber where a.HInterID=" + linterid;
-
- $.ajax({
- type: "GET",
- url: GetWEBURL() + "/Gy_SOPBillList/WindowPrintList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- async: true,
- data: { "sWhere": sWhere },
- success: function (data) {
- if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
-
- if (data.data.length != 0) {
- var dataPrint = [];
- dataPrint.push(data.data[0]
- //{ "浜у搧鍚嶇О": data.data[0]["浜у搧鍚嶇О"], "鏉＄爜缂栧彿": data.data[0]["鏉＄爜缂栧彿"], "鏁伴噺": data.data[0]["鏁伴噺"], "鏃ユ湡": data.data[0]["鏃ユ湡"], "鐢熶骇浠诲姟鍗�": data.data[0]["鐢熶骇浠诲姟鍗�"], "娴佽浆鍗＄紪鍙�": data.data[0]["娴佽浆鍗＄紪鍙�"], "鑷畾涔夊瓧娈�": data.data[0]["鑷畾涔夊瓧娈�"], "椤圭洰缂栧彿": data.data[0]["椤圭洰缂栧彿"] }
- );
-
- var Customer = {
- "Table": dataPrint
- }
-
- var args = {
- type: "print",
- showOptionDlg: false, //濡傛灉涓嶆樉绀烘墦鍗板璇濇鑰岀洿鎺ユ墦鍗帮紝灏嗘琛屾敞閲婂幓鎺夊嵆鍙�
- report: urlAddRandomNo("../../grf/鐧芥爣鎵撳嵃.grf"),
- data: Customer
- };
- //var args = {
- // report: urlAddRandomNo("../../views/grf/鍖呰鍗曠墿鏂欐爣璇嗗崱(缃戦〉鐗�).grf"),
- // data: Customer
- //};
- webapp_ws_ajax_run(args);
- } else {
- layer.msg("鏌ユ棤鏁版嵁!");
- }
-
- }
- else {
- layer.msg(data.Message, { icon: 5 });
- }
- layer.closeAll("loading");
- },
- error: function (err) {
- layer.msg("閿欒:" + err, { icon: 5 });
- }
- })
-
+ var Type = "HBarCodePrint";
+ var OpenTmp = "鐧芥爣鎵撳嵃";
+ //var ReportViewer = document.getElementById("ReportViewer");
+ window.open("../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/HBarPlanPrint.html?linterid=" + linterid.toString() + "&Type=" + Type.toString() + "&OpenTmp=" + OpenTmp.toString());
});
//鎵撳嵃鎸夐挳
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\220\257\345\212\250\347\202\271\346\243\200\345\215\225/Sc_WorkBeginDotCheckBill.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\220\257\345\212\250\347\202\271\346\243\200\345\215\225/Sc_WorkBeginDotCheckBill.html"
index 451f5c1..d14befd 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\220\257\345\212\250\347\202\271\346\243\200\345\215\225/Sc_WorkBeginDotCheckBill.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\220\257\345\212\250\347\202\271\346\243\200\345\215\225/Sc_WorkBeginDotCheckBill.html"
@@ -309,7 +309,7 @@
var HMaterID = ""; //鐗╂枡
var HSourceID = ""; //鐢熶骇璧勬簮
var HProcID = ""; //宸ュ簭
- var SCOrder = "";//鐢熶骇璁㈠崟鍙�
+ var SCOrder = "";//宸ュ簭娴佽浆鍗″彿
var edit = function (data) {
HMaterID = data[0].HMaterID;
@@ -381,6 +381,8 @@
//鍒濆鍖栨棩鏈�
$("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HGroupID").val(sessionStorage["HGroupID"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鐝粍ID
+ $("#HGroupName").val(sessionStorage["HGroup"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鐝粍
//鍒濆鍖栧瓙琛�
get_InitGrid();
@@ -407,6 +409,8 @@
$("#HMakerDate").val(Format(new Date(), "yyyy-MM-dd"));
//鍒濆鍖栨棩鏈�
$("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HGroupID").val(sessionStorage["HGroupID"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鐝粍ID
+ $("#HGroupName").val(sessionStorage["HGroup"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鐝粍
//鍒濆鍖栧瓙琛�
get_InitGrid();
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill_CurrentWork.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill_CurrentWork.html"
index 0cd7ef9..ede9410 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill_CurrentWork.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill_CurrentWork.html"
@@ -124,6 +124,12 @@
</button>
</div>
</div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 65px;">宸ユ椂</label>
+ <div class="layui-input-block" style="margin-left: 95px;">
+ <input type="text" class="layui-input" name="HWorkTimes" id="HWorkTimes" value="0" style="width: 150px;">
+ </div>
+ </div>
</div>
<div class="layui-row" style="margin-bottom: 15px;">
<div class="layui-inline">
@@ -187,6 +193,17 @@
<input type="hidden" name="HUnitID" id="HUnitID">
<input type="hidden" name="eventType" id="eventType" value="Add">
<input type="hidden" name="HPRDOrgID" id="HPRDOrgID" value="0">
+ <input type="hidden" name="HICMOQty" id="HICMOQty" value="0">
+ <input type="hidden" name="HPlanQty" id="HPlanQty" value="0">
+ <input type="hidden" name="HLastSubProc" id="HLastSubProc" value="true">
+ </div>
+ </div>
+ </div>
+ <div class="layui-row" style="margin-bottom: 15px;">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 65px;">绌村彿</label>
+ <div class="layui-input-block" style="margin-left: 95px;">
+ <input type="text" class="layui-input" name="HMouldNum" id="HMouldNum" style="width: 150px;" >
</div>
</div>
</div>
@@ -892,16 +909,16 @@
$("#HDeptID").val(data1.data[0]["HDeptID"]);
$("#HDeptName").val(data1.data[0]["杞﹂棿"]);
- //$("#HProcName").val(data1.data[0]["宸ュ簭"]);
- //$("#HProcID").val(data1.data[0]["HProcID"]);
- //$("#HSourceID").val(data1.data[0]["HSourceID"]);
- //$("#HSourceName").val(data1.data[0]["鐢熶骇璧勬簮"]);
+ $("#HProcName").val(data1.data[0]["宸ュ簭"]);
+ $("#HProcID").val(data1.data[0]["HProcID"]);
+ $("#HSourceID").val(data1.data[0]["HSourceID"]);
+ $("#HSourceName").val(data1.data[0]["鐢熶骇璧勬簮"]);
$("#HEmpID").val(data1.data[0]["HEmpID"]);
$("#HEmpName").val(data1.data[0]["璐ㄦ鍛�"]);
$("#HGroupID").val(data1.data[0]["HGroupID"]);
$("#HGroupName").val(data1.data[0]["鐢熶骇鐝粍"]);
- //$("#HCenterID").val(data1.data[0]["HWorkCenterID"]);
- //$("#HCenterName").val(data1.data[0]["宸ヤ綔涓績"]);
+ $("#HCenterID").val(data1.data[0]["HWorkCenterID"]);
+ $("#HCenterName").val(data1.data[0]["宸ヤ綔涓績"]);
layer.close(ajaxLoad);
//layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
@@ -920,16 +937,16 @@
//#region 鏍规嵁骞虫澘缁戝畾锛岃嚜鍔ㄥ甫鍑哄熀纭�璧勬枡淇℃伅
function get_ConfigFileInfo_EquipFile() {
var objdata = get_ConfigFileInfo();
- $("#HProcID").val(objdata.HProcID); //宸ュ簭ID
- $("#HProcName").val(objdata.HProcName); //宸ュ簭鍚嶇О
+ //$("#HProcID").val(objdata.HProcID); //宸ュ簭ID
+ //$("#HProcName").val(objdata.HProcName); //宸ュ簭鍚嶇О
//$("#HEquipID").val(objdata.HEquipID); //璁惧ID
$("#HEquipCode").text(objdata.HEquipName); //璁惧鍚嶇О
- $("#HSourceID").val(objdata.HSourceID); //鐢熶骇璧勬簮ID
- $("#HSourceName").val(objdata.HSourceName); //鐢熶骇璧勬簮鍚嶇О
+ //$("#HSourceID").val(objdata.HSourceID); //鐢熶骇璧勬簮ID
+ //$("#HSourceName").val(objdata.HSourceName); //鐢熶骇璧勬簮鍚嶇О
//$("#HGroupID").val(objdata.HGroupID); //鐝粍ID
//$("#HGroupName").val(objdata.HGroupName); //鐝粍鍚嶇О
- $("#HCenterID").val(objdata.HWorkCenterID); //宸ヤ綔涓績ID
- $("#HCenterName").val(objdata.HWorkCenterName); //宸ヤ綔涓績鍚嶇О
+ //$("#HCenterID").val(objdata.HWorkCenterID); //宸ヤ綔涓績ID
+ //$("#HCenterName").val(objdata.HWorkCenterName); //宸ヤ綔涓績鍚嶇О
}
//#endregion
@@ -987,6 +1004,8 @@
$("#HUnitName").val(data1.data[0]["鍗曚綅"]);
$("#HUnitID").val(data1.data[0]["HUnitID"]);
$("#HQty").val(data1.data[0]["鏈�灏忓寘瑁呮暟閲�"]);
+ $("#HICMOQty").val(data1.data[0]["鐢熶骇鏁伴噺"]);
+ $("#HPlanQty").val(data1.data[0]["娴佽浆鍗℃暟閲�"]);
$("#HBarCode").val(HBarCode);
}
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill.html"
index d79dbfc..9ca519b 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill.html"
@@ -140,6 +140,12 @@
<input type="text" class="layui-input" name="HMaterModel2" id="HMaterModel2" onmouseover="this.title=this.value" style="background-color:#efefef4d;" readonly>
</div>
</div>
+ <div class="layui-col-xs3 layui-inline">
+ <label class="layui-form-label">椤圭洰缂栧彿</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HProjectNum" id="HProjectNum">
+ </div>
+ </div>
<!--<div class="layui-col-xs3 layui-inline">
<label class="layui-form-label">鎬昏鍥惧彿</label>
<div class="layui-input-inline">
@@ -462,12 +468,12 @@
</button>
</div>
</div>
- <div class="layui-col-xs3 layui-inline">
+ <!--<div class="layui-col-xs3 layui-inline">
<label class="layui-form-label">椤圭洰缂栧彿</label>
<div class="layui-input-inline">
<input type="text" class="layui-input" name="HProjectNum" id="HProjectNum" style="background-color:#efefef4d;" readonly>
</div>
- </div>
+ </div>-->
<div class="layui-col-xs3 layui-inline">
<label class="layui-form-label">濮斿鍔犲伐鍗曚綅</label>
@@ -1479,7 +1485,7 @@
$('#HSNCtrl' + (i + 1)).attr("checked", true);
}
}
-
+
form.render('select');
form.render('checkbox');
@@ -2274,7 +2280,7 @@
, "HName": data.璁㈠崟绛夌骇
- , "HSplitNo": data.鎷嗗垎鍙�
+ , "HSplitNo": data.鎷嗗垎鍙� == undefined ? 0 : data.鎷嗗垎鍙�
, "HRemark2": data.鐧藉澂瑕佹眰
, "HRemark3": data.搴曢儴澶囨敞
, "HEmpID": data.HEmpID
@@ -2282,8 +2288,8 @@
, "HCusID": data.HCusID
, "HCusNames": data.瀹㈡埛
, "HColorRemark": data.鏌撹壊瑕佹眰
- , "HSplitSumQty": data.鎷嗗垎鎬婚噺
- , "HSplitColorQty": data.鍒嗙几鍙�
+ , "HSplitSumQty": data.鎷嗗垎鎬婚噺 == undefined ? 0 : data.鎷嗗垎鍙�
+ , "HSplitColorQty": data.鍒嗙几鍙� == undefined ? 0 : data.鎷嗗垎鍙�
, "HProjectNum": data.椤圭洰缂栧彿
, "HVerNum": data.鐗堟湰
@@ -2300,7 +2306,7 @@
, "HWorkShopID": data.HWorkShopID
, "textBox2": data.浠诲姟鍗曞彿
, "HWorkBillSortNo": data.鏃ヨ鍒掑伐鍗曞彿
- , "HSupName": data.濮斿鍔犲伐鍗曚綅
+ , "HSupName": data.濮斿鍔犲伐鍗曚綅 == undefined ? 0 : data.鎷嗗垎鍙�
, "HSupID": data.HSupID
, "HMaterName": data.瀛愪欢鍚嶇О
, "HMaterID": data.HMaterID
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList_Source.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList_Source.html"
new file mode 100644
index 0000000..68e26e2
--- /dev/null
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList_Source.html"
@@ -0,0 +1,1180 @@
+锘�<!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">
+ <!--寮曠敤layui鏍峰紡鏂囦欢-->
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <!--寮曠敤layui js鏂囦欢-->
+ <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/HideButton.js"></script>
+ <script src="../../../layuiadmin/soulTable.slim.js"></script>
+ <script src="../../../layuiadmin/PageTitle.js"></script>
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+
+ <style type="text/css">
+ input.layui-input.layui-unselect {
+ padding-right: 0;
+ }
+ </style>
+</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">鏃ユ湡闂撮殧</label>
+ <div class="layui-input-block">
+ <select name="HInitTimeCycle" id="HInitTimeCycle" class="ForFilteringSchemes" lay-filter="HInitTimeCycle" style="width:190px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">寮�濮嬫棩鏈�</label>
+ <div class="layui-input-block">
+ <input type="date" class="layui-input ForFilteringSchemes" id="HBeginDate" style="width:190px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">缁撴潫鏃ユ湡</label>
+ <div class="layui-input-block">
+ <input type="date" class="layui-input ForFilteringSchemes" id="HEndDate" style="width:190px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鍗曟嵁鍙�</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HBillNo" id="HBillNo">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">缁勭粐</label>
+ <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
+ <select name="HStockOrgID" id="HStockOrgID" class="ForFilteringSchemes" lay-verify="HStockOrgID">
+ <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+ </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-inline" style="margin-left:5px;">
+ <div style="text-align:center;font-size:15px;font-weight:bold;color:#fc9393" id="HFilterScheme_Now"></div>
+ </div>
+ <div class="layui-colla-content" style="padding: 6px; margin-left: 6%;">
+ <div class="layui-row" style="margin-top:5px">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护</label>
+ <div class="layui-input-block">
+ <select name="ColName" id="ColName" class="ForFilteringSchemes" lay-filter="ColName" style="width:190px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator" id="Comparator" class="ForFilteringSchemes" lay-filter="Comparator" style="width:190px;">
+ <option value="0" selected="selected"></option>
+ <option value="=">=</option>
+ <option value=">=">>=</option>
+ <option value=">">></option>
+ <option value="<="><=</option>
+ <option value="<"><</option>
+ <option value="<>"><></option>
+ <option value="7">鍖呭惈</option>
+ <option value="8">宸﹀寘鍚�</option>
+ <option value="9">鍙冲寘鍚�</option>
+ <option value="10">涓嶅寘鍚�</option>
+ </select>
+ </div>
+ <div class="layui-inline">
+ <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
+ </div>
+ </div>
+ </div>
+ </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_Export" id="btn_Export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Add" id="btn_Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Edit" id="btn_Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Delete" id="btn_Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Refresh" id="btn_Refresh"><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_Close" id="btn_Close"><i class="layui-icon layui-icon-radio"></i>鍏抽棴</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_DeClose" id="btn_DeClose"><i class="layui-icon layui-icon-circle"></i>鍙嶅叧闂�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Drop" id="btn_Drop"><i class="layui-icon layui-icon-radio"></i>浣滃簾</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_DeDrop" id="btn_DeDrop"><i class="layui-icon layui-icon-circle"></i>鍙嶄綔搴�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Exit" id="btn_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_HideColumn" id="btn_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_HideButton" id="btn_HideButton"><i class="layui-icon layui-icon-form"></i>鎸夐挳璁剧疆</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_SaveScheme" id="btn_SaveScheme"><i class="layui-icon layui-icon-template"></i>淇濆瓨鏂规</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_ReadScheme" id="btn_ReadScheme"><i class="layui-icon layui-icon-set"></i>璇诲彇鏂规</button>
+ </div>
+ </script>
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
+ <script>
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index', //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate', 'soulTable'], 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
+ , soulTable = layui.soulTable
+ var HModName = "Sc_ProcessExchangeBillList";
+ var HBillType = "3772";
+ var HMaker = sessionStorage["HUserName"]
+ var HStockOrgID = sessionStorage["OrganizationID"] //缁勭粐ID
+ var sWhere = "";
+ var ins; //鐢ㄤ簬瀵煎嚭excel
+ var option = [];
+ var columns = "";
+ var titleData = []; //涓嶉渶瑕佹樉绀虹殑瀛楁
+ var params = get_UrlVars();
+ var OperationType = params[params[0]] == null ? 1 : params[params[0]]; //1涓虹洿鎺ュ垪琛ㄦā鍧楁墦寮� 2涓轰粠鍏朵粬妯″潡璺宠浆鎵撳紑鍒楄〃
+ var ViewName = params[params[1]]; //鎵�璋冪敤鐨勮鍥�
+ //#endregion
+
+ //#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
+ //閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
+ var HPageTitle = get_PageTitle(HBillType) == "" ? document.title : get_PageTitle(HBillType);
+ //#endregion
+
+ //#region 銆愯繃婊ゆ柟妗堛��
+
+ //杩囨护鏉′欢鐨刢lass绫�
+ var HClassTag = "ForFilteringSchemes";
+ //妯″潡鍚嶇О锛堜腑鏂囩増锛� 姣忎釜妯″潡椤甸潰閮介渶瑕佷慨鏀�
+ window.HModuleName = "宸ュ簭娴佽浆鍗″垪琛╛婧愬崟";
+ //鏄惁宸茬粡閫夋嫨浜嗚繃婊ゆ柟妗堬紙鍏ㄥ眬鍙橀噺锛�
+ window.HDefaultFilter = "";
+ //閫夋嫨鐨勮繃婊ゆ柟妗堝唴鐮侊紙鍏ㄥ眬鍙橀噺锛�
+ window.HInterID_Choose = 0;
+
+ //#endregion
+
+ //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+ //#region 鍒濆鍖栫晫闈�
+
+ set_ClearBill();
+
+ function set_ClearBill() {
+ //鍒濆鍖栨棩鏈熼棿闅斻�佸紑濮嬫棩鏈熴�佺粨鏉熸棩鏈�
+ setSelect_HInitTimeCycle();
+ //鑻ユ棩鏈熼棿闅斾笉涓� 浠绘剰闂撮殧锛屽垯绂佺敤寮�濮嬫棩鏈熶笌缁撴潫鏃ユ湡鐨勯�夋嫨
+ var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
+ if (HInitTimeCycle != -1) {
+ $('#HBeginDate').prop('disabled', true);
+ $('#HEndDate').prop('disabled', true);
+ } else {
+ $('#HBeginDate').prop('disabled', false);
+ $('#HEndDate').prop('disabled', false);
+ }
+
+ //鏍规嵁鏃ユ湡闂撮殧璁剧疆寮�濮嬫椂闂翠笌缁撴潫鏃堕棿
+ $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
+ $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+ //鑾峰彇缁勭粐
+ set_StockOrg();
+ //鍒濆鍖栬〃鏍�
+ set_InitGrid();
+
+ if (OperationType == 2) {
+ $("#HStockOrgID").val(HStockOrgID) //缁勭粐
+ $("#HStockOrgID").attr("disabled", true);
+ form.render('select');
+ }
+ else {
+ OperationType = 1;
+ ViewName = "h_v_Sc_ProcessExchangeBillList";
+ }
+
+ //鎵ц鏌ヨ鏂规硶
+ get_FastQuery()
+
+ //鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
+ get_DefaultModule();
+ }
+ //#endregion
+
+ //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
+ if (sessionStorage.login != "login") {
+ layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
+ icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
+ }, function () { window.location.href = "../../user/login.html"; });
+ }
+
+ //#region 鑾峰彇缁勭粐
+ function set_StockOrg() {
+ //鑾峰彇鐧诲綍椤电粍缁囧垪
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Web/GetOrganizations",
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ success: function (result) {
+ var Organization = "";
+ Organization += '<option style="color:blue;" value="-1">鍏ㄩ儴</option>';
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data;
+ for (var i = 0; i < data.length; i++) {
+ Organization += '<option style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
+ }
+ $("#HStockOrgID").append(Organization);
+ $("#HStockOrgID").val(HStockOrgID)
+ form.render('select');
+ }
+ layer.closeAll("loading");
+ },
+ complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
+ })
+ }
+ //#endregion
+
+ //#region 鍒濆鍖栬〃鏍兼柟娉�
+ function set_InitGrid() {
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , page: true
+ , totalRow: true
+ , height: 'full-50'
+ , cellMinWidth: 90
+ , limit: 50
+ , limits: [50, 500, 5000, 20000]
+ , done: function (res, curr, count) {
+ soulTable.render(this);
+ }
+ };
+ }
+ //#endregion
+
+ //#region 鐐瑰嚮琛岄�変腑楂樹寒
+ 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;
+ }
+ });
+ })
+ //#endregion
+
+ //#region 鏄剧ず鍒楁暟鎹�
+ function DisPlay_HideColumn() {
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+ async: false,
+ data: { "HModName": HModName, "user": HMaker },
+ success: function (data1) {
+ if (data1.data.length != 0) {
+ var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+ dataCol = data1.data[0].HGridString.split(',');
+
+ for (var i = 0; i < option.cols[0].length - 2; i++) {
+ if (dataCol[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 (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);
+ }
+
+ //鍒锋柊鎸夐挳鏄剧ず
+ var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+ Display_HideButton(btns, HBillType, HModName, HMaker);
+
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ })
+ }
+ //#endregion
+
+ //#endregion
+
+ //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
+
+ //#region 宸ュ叿鏍忎簨浠�
+ table.on('toolbar(mainTable)', function (obj) {
+ switch (obj.event) {
+ //瀵煎嚭鎸夐挳
+ case 'btn_Export': btn_Export();
+ break;
+ //鏂板鎸夐挳
+ case 'btn_Add': btn_Add();
+ break;
+ //缂栬緫鎸夐挳
+ case 'btn_Edit': btn_Edit();
+ break;
+ //鍒犻櫎鎸夐挳
+ case 'btn_Delete': btn_Delete();
+ break;
+ //鍒锋柊鎸夐挳
+ case 'btn_Refresh': btn_Refresh();
+ break;
+ //瀹℃牳鎸夐挳 锛�1:瀹℃牳銆�2:鍙嶅鏍革級
+ case 'btn_Audit': set_CheckBill(1);
+ break;
+ //鍙嶅鏍告寜閽�
+ case 'btn_DeAudit': set_CheckBill(2);
+ break;
+ //鍏抽棴鎸夐挳 锛�1:鍏抽棴銆�2:鍙嶅叧闂級
+ case 'btn_Close': set_CloseBill(1);
+ break;
+ //鍙嶅叧闂寜閽�
+ case 'btn_DeClose': set_CloseBill(2);
+ break;
+ //浣滃簾鎸夐挳 锛�1:浣滃簾銆�2:鍙嶄綔搴燂級
+ case 'btn_Drop': set_DropBill(1);
+ break;
+ //鍙嶄綔搴熸寜閽�
+ case 'btn_DeDrop': set_DropBill(2);
+ break;
+ //閫�鍑烘寜閽�
+ case 'btn_Exit': Pub_Close(2);
+ break;
+ //鍒楄缃�
+ case 'btn_HideColumn': get_HideColumn();
+ break;
+ //鎸夐挳璁剧疆
+ case 'btn_HideButton':
+ var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+ get_HideButton(btns, HBillType, HModName, HMaker);
+ break;
+ //淇濆瓨鏂规
+ case 'btn_SaveScheme': set_SaveScheme();
+ break;
+ //璇诲彇鏂规
+ case 'btn_ReadScheme': set_ReadScheme();
+ break;
+ };
+ });
+ //#endregion
+
+ //鏃ユ湡闂撮殧涓嬫媺鍒楄〃鐩戝惉
+ form.on('select(HInitTimeCycle)', function (data) {
+ var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
+ //鑻ユ棩鏈熼棿闅斾笉涓� 浠绘剰闂撮殧锛屽垯绂佺敤寮�濮嬫棩鏈熶笌缁撴潫鏃ユ湡鐨勯�夋嫨
+ if (HInitTimeCycle != -1) {
+ $('#HBeginDate').prop('disabled', true);
+ $('#HEndDate').prop('disabled', true);
+
+ $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
+ $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+
+ //鎵ц鏌ヨ鏂规硶
+ get_FastQuery();
+ } else {
+ $('#HBeginDate').prop('disabled', false);
+ $('#HEndDate').prop('disabled', false);
+ }
+ });
+
+ //#region 瀵煎嚭Execel
+ function btn_Export() {
+ table.exportFile(ins.config.id, option.data, "xls");
+ }
+ //#endregion
+
+ //#region 鏂板
+ function btn_Add() {
+ layer.open({
+ type: 2
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['100%', '100%']
+ , title: HPageTitle + '- 鏂板'
+ , shift: 0 //寮瑰嚭鍔ㄧ敾
+ , content: '../../杞﹂棿绠＄悊/宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeBill.html?OperationType=1&HInterID=&HEntryID=&HSouceBillType='
+ , btn: ['纭畾'],
+ // 鎸夐挳1 鐨勫洖璋�
+ end: function (index, layero, that) {
+ //鍒锋柊椤甸潰
+ $("#btnSearch").trigger('click');
+ }
+ })
+ }
+ //#endregion
+
+ //#region 缂栬緫
+ function btn_Edit() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var HInterID = data[0].hmainid.toString();
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: HPageTitle + '- 缂栬緫'
+ , shift: 0 //寮瑰嚭鍔ㄧ敾
+ , content: '../../杞﹂棿绠＄悊/宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeBill.html?OperationType=3&HInterID=' + HInterID + '&HEntryID=&HSouceBillType=3772'
+ , btn: ['纭畾'],
+ // 鎸夐挳1 鐨勫洖璋�
+ end: function (index, layero, that) {
+ //鍒锋柊椤甸潰
+ $("#btnSearch").trigger('click');
+ }
+ })
+ } else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+ }
+ }
+ //#endregion
+
+ //#region 鍒犻櫎
+ function btn_Delete() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var HInterID = data[0].hmainid.toString();
+ var HBillNo = data[0].鍗曟嵁鍙�.toString();
+ layer.confirm("纭瑕佸垹闄ら�変腑琛屾暟鎹紵鍒犻櫎鍚庡皢涓嶅彲鎭㈠锛�", { title: "鍒犻櫎纭" }, function (index) {
+ var wait = layer.load();
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "Sc_ProcessExchangeBill/DeltetProcessExchangeBillByID",
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "HInterID": HInterID, "HPRDORGID": HStockOrgID, "user": HMaker, "HSouceBillType": "3772" },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg("鍗曟嵁鍙凤細" + HBillNo + " 鍒犻櫎鎴愬姛锛�", { time: 1 * 1000, icon: 1 }, function () {
+ //鍒锋柊鐣岄潰
+ $("#btnSearch").trigger('click');
+ layer.close(wait);
+ });
+
+ } else {
+ layer.msg(result.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.close(wait);
+ }
+ }, error: function () {
+ layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.close(wait);
+ }
+ });
+ })
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+ }
+ }
+ //#endregion
+
+ //#region 鍒锋柊
+ function btn_Refresh() {
+ get_FastQuery();
+ }
+ //#endregion
+
+ //#region 瀹℃牳锛坣um=1锛�/鍙嶅鏍革紙num=2锛�
+ function set_CheckBill(num) {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var HInterID = data[0].hmainid.toString();
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Sc_ProcessExchangeBill/CheckSc_ProcessExchangeBill",
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "HInterID": HInterID, "Type": num, "user": HMaker, "HBillSubType": "3772" },
+ 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.msg(result.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ }, error: function () {
+ layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ });
+ }
+ else {
+ if (num == 1) {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹弽瀹℃牳锛�');
+ }
+ }
+ }
+ //#endregion
+
+ //#region 鍏抽棴锛坣um=1锛�/鍙嶅叧闂紙num=2锛�
+ function set_CloseBill(num) {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var HInterID = data[0].hmainid.toString();
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Sc_ProcessExchangeBill/CloseSc_ProcessExchangeBill",
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "HInterID": HInterID, "Type": num, "user": HMaker, "HBillSubType": "3772" },
+ 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.msg(result.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ }, error: function () {
+ layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ });
+ }
+ else {
+ if (num == 1) {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹叧闂紒');
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹弽鍏抽棴锛�');
+ }
+ }
+ }
+ //#endregion
+
+ //#region 浣滃簾锛坣um=1锛�/鍙嶄綔搴燂紙num=2锛�
+ function set_DropBill(num) {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var HInterID = data[0].hmainid.toString();
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Sc_ProcessExchangeBill/DeleteSc_ProcessExchangeBill",
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "HInterID": HInterID, "IsAudit": num, "CurUserName": HMaker },
+ 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.msg(result.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ }, error: function () {
+ layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ });
+ }
+ else {
+ if (num == 1) {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹綔搴燂紒');
+ }
+ 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 閲嶇疆鎸夐挳
+ form.on('submit(btnReSearch)', function (data) {
+ //娓呯┖杩囨护鏉′欢
+ set_ClearQuery();
+ });
+
+ //閲嶇疆杩囨护鏉′欢
+ function set_ClearQuery() {
+ var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
+ $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd")); //寮�濮嬫棩鏈�
+ $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd")); //缁撴潫鏃ユ湡
+ $("#HBillNo").val("");//鍗曟嵁鍙�
+ $("#ColName").val("0");
+ $("#Comparator").val("0");
+ $("#ColContent").val("");
+ $("#HStockOrgID").val(HStockOrgID) //缁勭粐
+ form.render('select');
+ sWhere = "";
+ }
+
+ //#endregion
+
+ //#region 鏌ヨ鎸夐挳
+ form.on('submit(btnSearch)', function (data) {
+ get_FastQuery();
+ });
+
+ //蹇�熸煡璇�
+ function get_FastQuery() {
+ var HBeginDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
+ var HEndDate = $("#HEndDate").val();//缁撴潫鏃ユ湡
+ var HBillNo = $("#HBillNo").val();//鍗曟嵁鍙�
+ var HStockOrgID = $("#HStockOrgID").val(); //缁勭粐
+ var ColName = $("#ColName").val();//澶嶉�夋
+ var Comparator = $("#Comparator").val()
+ var ColContent = $("#ColContent").val();
+
+ //鐩存帴鍒楄〃鎵撳紑
+ if (OperationType == undefined || OperationType == 1) {
+ if (HStockOrgID != "-1") {
+ sWhere = " and HStockOrgID='" + HStockOrgID + "'";
+ }
+ }
+ //浠庡叾浠栨ā鍧楄烦杞墦寮�鍒楄〃
+ else {
+ sWhere = " and HStockOrgID='" + HStockOrgID + "'";
+ }
+
+ 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 (HBeginDate) {
+ sWhere += " and 鏃ユ湡 >= '" + HBeginDate + "'";
+ }
+ if (HEndDate) {
+ sWhere += " and 鏃ユ湡 <= '" + HEndDate + "'";
+ }
+ if (HBillNo) {
+ sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
+ }
+ get_Display(sWhere);
+ sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ }
+
+ //#endregion
+
+ //#region 鍒楄〃鍒锋柊
+ function get_Display(sWhere) {
+ var ajaxLoad = layer.load();
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + '/Sc_ProcessExchangeBillController/GetSc_ProcessExchangeBillList_Json',
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "sWhere": sWhere, "HMaker": HMaker, "OperationType": OperationType, "ViewName": ViewName },
+ 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 });
+ //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
+ var patrn = new RegExp(/^h/i);
+ if (patrn.test(data1.list[key].ColmCols)) {
+ titleData[key] = data1.list[key].ColmCols;
+ }
+ }
+
+ //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+ col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' });
+ for (var i = 0; i < data.length; i++) {
+ 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 HH:mm:ss')}}</div>", width: 160 });
+ break;
+ case 'Decimal':
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 140, totalRow: true });
+ break;
+ case 'Int32':
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 140, totalRow: true });
+ break;
+ default:
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 140 });
+ }
+ }
+ }
+
+ columns = col;
+
+ option.cols = [columns];
+ option.data = data1.data;
+ option.totalRow = true;
+ table.render(option);
+ ins = table.render(option);
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
+ layer.close(ajaxLoad);
+ //鑷畾涔夎繃婊や笅鎷夋鍔犺浇
+ if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+ ColFilter();
+ }
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.Message, { icon: 5 });
+ }
+ },
+ error: function () {
+ layer.close(ajaxLoad);
+ 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
+
+ //#region 鍒濆鏃ユ湡闂撮殧 涓嬫媺鍒楄〃
+ function setSelect_HInitTimeCycle() {
+ var valueList = [0, 1, 2, 3, 4, 5, 6, 29];
+ var titleList = ["浠婂ぉ", "杩戜袱澶�", "杩戜笁澶�", "杩戝洓澶�", "杩戜簲澶�", "杩戝叚澶�", "杩戜竷澶�", "杩�30澶�"];
+
+ var HInitTimeCycle_ArrayList = '<option value="-1" selected="selected" >浠绘剰闂撮殧</option>';
+ for (var i = 0; i < valueList.length; i++) {
+ HInitTimeCycle_ArrayList += '<option style="color:blue;" value="' + valueList[i] + '">' + titleList[i] + '</option>';
+ }
+
+ $("#HInitTimeCycle").empty();
+ $("#HInitTimeCycle").append(HInitTimeCycle_ArrayList);
+ form.render('select');
+
+ $("#HInitTimeCycle").val("29");
+ }
+ //#endregion
+
+ //#region 銆愯繃婊ゆ柟妗堛��
+
+ //鑾峰彇褰撳墠鐢ㄦ埛鐨勯粯璁よ繃婊ゆ柟妗�
+ function get_DefaultModule() {
+ $.ajax({
+ url: GetWEBURL() + '/Xt_FastICScheme/Chooselist',
+ type: "GET",
+ data: { "user": sessionStorage["Czybm"], "HModuleName": 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);
+ }
+ }
+
+ var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
+ //鑻ユ棩鏈熼棿闅斾笉涓� 浠绘剰闂撮殧锛屽垯绂佺敤寮�濮嬫棩鏈熶笌缁撴潫鏃ユ湡鐨勯�夋嫨
+ if (HInitTimeCycle != -1) {
+ $('#HBeginDate').prop('disabled', true);
+ $('#HEndDate').prop('disabled', true);
+
+ $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
+ $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+
+
+ //鎵ц鏌ヨ鏂规硶
+ get_FastQuery();
+ } else {
+ $('#HBeginDate').prop('disabled', false);
+ $('#HEndDate').prop('disabled', false);
+ }
+
+ ////鎵ц鏌ヨ鏂规硶
+ 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;
+ //鑾峰彇鏈〉鎵�鏈夎繃婊ゆ潯浠跺璞�(class涓寘鍚�"ForFilteringSchemes"鐨勫厓绱�)
+ var Filter = document.getElementsByClassName(HClassTag);
+
+ 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 = HFilterIdLists.substring(0, HFilterIdLists.length - 1);
+ HValue = HValue.substring(0, HValue.length - 1);
+ HElement_type = HElement_type.substring(0, HElement_type.length - 1);
+
+ //褰撳墠椤甸潰涓婃病鏈夐�夋嫨杩囨护鏂规锛岃繘鍏ユ柊澧炴柟娉�
+ if (HDefaultFilter == "") {
+ layer.open({
+ type: 2
+ , area: ['40%', '80%']
+ , title: '杩囨护鏂规'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../../绯荤粺绠＄悊/杩囨护鏂规璁剧疆/Xt_FastICScheme.html?OperationType=1&HModuleName=' + 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=' + 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(HClassTag); //鑾峰彇鏈〉鎵�鏈夎繃婊ゆ潯浠跺璞�(class涓寘鍚�"ForFilteringSchemes"鐨勫厓绱�)
+ HFilterIdList = "";
+ HFilterIdLists = "";
+ HValue = "";
+ HElement_type = "";
+ 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 = HFilterIdLists.substring(0, HFilterIdLists.length - 1);
+ HValue = HValue.substring(0, HValue.length - 1);
+ HElement_type = HElement_type.substring(0, HElement_type.length - 1);
+
+ var sMainSub = HInterID_Choose + ';' + HFilterIdLists + ';' + HValue + ';' + HElement_type + ';' + sessionStorage["Czybm"] + ';' + 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 });
+ }
+ 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(HClassTag); //鑾峰彇鏈〉鎵�鏈夎繃婊ゆ潯浠跺璞�(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 = HFilterIdLists.substring(0, HFilterIdLists.length - 1);
+ HValue = HValue.substring(0, HValue.length - 1);
+ HElement_type = HElement_type.substring(0, HElement_type.length - 1);
+
+ layer.open({
+ type: 2
+ , area: ['80%', '80%']
+ , title: '杩囨护鏂规鍒楄〃'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../../绯荤粺绠＄悊/杩囨护鏂规璁剧疆/Xt_FastICSchemeList.html?HType=Select&HFilterIdLists=' + HFilterIdLists + '&HValue=' + HValue + '&HElement_type=' + HElement_type + '&HModuleName=' + HModuleName
+ , cancel: function () {
+ // 鍙充笂瑙掑叧闂簨浠剁殑閫昏緫
+ HIsClose_Manual = true;
+ }
+ , end: function () {
+ if (HIsClose_Manual != true) {
+ get_FastQuery()
+ form.render("select");
+ }
+ }
+ })
+ }
+
+ //#endregion
+
+ //#endregion
+ //浠ヤ笂鏄痩ayui妯″潡
+ });
+ //#region 銆愯繃婊ゆ柟妗堣繑鍥炴暟鎹��
+ 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": 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 });
+ }
+ });
+ }
+ //#endregion
+ </script>
+
+</body>
+</html>
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\351\230\262\351\224\231\351\252\214\350\257\201/Gy_MaterPreventErrMouldBill.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\351\230\262\351\224\231\351\252\214\350\257\201/Gy_MaterPreventErrMouldBill.html"
index 0bcd0b8..91a52f1 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\351\230\262\351\224\231\351\252\214\350\257\201/Gy_MaterPreventErrMouldBill.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\351\230\262\351\224\231\351\252\214\350\257\201/Gy_MaterPreventErrMouldBill.html"
@@ -40,7 +40,7 @@
<div class="layui-row">
<div class="layui-inline">
<label class="layui-form-label">鍗曟嵁鍙�<label style="color:red"> * </label></label>
- <div class="layui-input-block" style="margin-left: 120px;">
+ <div class="layui-input-block" style="margin-left: 120px;">
<input type="text" class="layui-input" name="HBillNo" lay-verify="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly>
<input type="hidden" name="HInterID" id="HInterID" lay-verify="HInterID">
</div>
@@ -62,7 +62,18 @@
</div>
</div>
</div>
-
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label">宸ュ簭<label style="color:red"> * </label></label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" lay-verify="HProcName" name="HProcName" id="HProcName" style="float: left; width: 150px; background-color: #efefef4d;" readonly>
+ <input type="hidden" name="HProcID" id="HProcID" lay-verify="HProcID" value="0">
+ <button class="layui-btn" type="button" lay-submit="" lay-filter="btnSearchHProc" id="btnSearchHProc" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+ </div>
<div class="layui-row">
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">澶囨敞</label>
@@ -288,6 +299,14 @@
});
//#endregion
+
+ //#region 閫夋嫨宸ュ簭鎸夐挳
+ form.on('submit(btnSearchHProc)', function () {
+ get_checkSearchHProc();
+ });
+ //#endregion
+
+
//#endregion
@@ -494,6 +513,33 @@
}
//#endregion
+ //#region 宸ュ簭閫夋嫨椤甸潰
+ function get_checkSearchHProc() {
+ 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 === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HProcName").val(checkStatus.data[0].宸ュ簭鍚嶇О);
+ $("#HProcID").val(checkStatus.data[0].HItemID);
+
+
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
+ }
+ //#endregion
+
//#region 瀛愯〃锛氬揩鎹烽敭(F7)鎵撳紑寮圭獥
function set_GridCellCheck(obj) {
$(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
@@ -627,7 +673,8 @@
, "HMaterID": tableMain[0]["HMaterID"]
, "HMaterName": tableMain[0]["鐗╂枡鍚嶇О"]
-
+ , "HProcID": tableMain[0]["HProcID"]
+ , "HProcName": tableMain[0]["宸ュ簭鍚嶇О"]
, "HRemark": tableMain[0]["琛ㄥご澶囨敞"]
, "HMaker": tableMain[0]["鍒跺崟浜�"]
@@ -742,7 +789,11 @@
$("#HMaterID").val(obj.HItemID);
$("#HMaterName").val(obj.鐗╂枡鍚嶇О);
}
-
+ //宸ュ簭
+ function GetProcessValue(obj) {
+ $("#HProcName").val(obj[0].宸ュ簭鍚嶇О);
+ $("#HProcID").val(obj[0].HItemID);
+ }
//闃查敊瑁呯疆
function GetPreventErrMouldValue(obj) {
OptionData = obj;
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\351\230\262\351\224\231\351\252\214\350\257\201/Qc_PreventErrMouldCheckBill.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\351\230\262\351\224\231\351\252\214\350\257\201/Qc_PreventErrMouldCheckBill.html"
index 183c639..c27cb7b 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\351\230\262\351\224\231\351\252\214\350\257\201/Qc_PreventErrMouldCheckBill.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\351\230\262\351\224\231\351\252\214\350\257\201/Qc_PreventErrMouldCheckBill.html"
@@ -253,11 +253,15 @@
<script>
var HMaterID = ""; //鐗╂枡
- var SCOrder = "";//鐢熸垚璁㈠崟鍙�
+ var HProcID = ""; //宸ュ簭
+ var SCOrder = "";//宸ュ簭娴佽浆鍗″彿
+
var edit = function (data) {
HMaterID = data[0].HMaterID;
+ HProcID = data[0].HProcID;
SCOrder = data[0].SCOrder;
}
+
layui.config({
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
@@ -351,7 +355,7 @@
//鍒濆鍖栧瓙琛�
get_InitGrid();
//鑾峰彇鎶ュ伐鍙拌烦杞暟鎹�
- RoadBillEdit(HMaterID, SCOrder);
+ RoadBillEdit(HMaterID, HProcID, SCOrder);
//绂佺敤缁勭粐閫夐」
$('#HOrgID').attr("disabled", true);
}
@@ -928,14 +932,14 @@
//#endregion
//#region 鎶ュ伐骞冲彴璺宠浆璧嬪��
- function RoadBillEdit(HMaterID, SCOrder)//鍔犺浇琛ㄥご
+ function RoadBillEdit(HMaterID, HProcID, SCOrder)//鍔犺浇琛ㄥご
{
$.ajax({
url: GetWEBURL() + "/Qc_PreventErrMouldCheckBill/锘縌c_PreventErrMouldCheckBillList",
type: "GET",
async: false,
data: {
- "HMaterID": HMaterID, "SCOrder": SCOrder,"user": sessionStorage["HUserName"] },
+ "HMaterID": HMaterID, "HProcID": HProcID,"SCOrder": SCOrder,"user": sessionStorage["HUserName"] },
success: function (result) {
var tableMain = result.data;
var tableSub = result.data;
--
Gitblit v1.9.1