From 4f23874713f35bf4263cc646c8e5784061fba038 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期五, 28 六月 2024 18:09:57 +0800
Subject: [PATCH] 增加异常反馈列表查询,下推验收单,处理单,方法,增加生产日汇报单,生产月汇报单,修复安灯逐级页面bug
---
WebTM/WebTM.csproj.user | 7
WebTM/views/生产管理/异常反馈单/Sc_MESExecptFeedBackBillType.html | 23
WebTM/views/生产管理/异常反馈单/OA_ErrMsgBackReceiveBillMain.html | 2
WebTM/views/系统管理/用户管理/Xt_UserGroupListEdit.html | 7
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBillList.html | 57 +
WebTM/views/生产管理/生产报表/Sc_QualityReportBillMonth.html | 23
WebTM/views/生产管理/异常反馈单/Sc_Add_MESExecptFeedBackBillList.html | 15
WebTM/views/生产管理/质量汇报单/Sc_QualityReportBill.html | 54 +
WebTM/views/生产管理/质量汇报单/Sc_QualityReportBillSumSave.html | 830 ++++++++++++++++++++++++++++++
WebTM/views/质量管理/异常反馈/OA_ErrMsgBackSelfQuery.html | 446 ++++++++++++++++
WebTM/views/生产管理/异常反馈单/OA_ErrMsgBackSignBillMain.html | 2
WebTM/views/生产管理/异常反馈单/OA_ErrMsgBackHandleBillMain.html | 2
WebTM/views/质量管理/安灯逐级呼叫规则/OA_AndengFlowRuleBillMain.html | 4
WebTM/views/生产管理/报工台工序/不良采集/Sc_QualityReportStepBill_New.html | 106 +++
WebTM/WebTM.csproj | 2
15 files changed, 1,536 insertions(+), 44 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 71ceefc..afcd600 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -383,6 +383,7 @@
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇鎶ヨ〃\Sc_QualityReportBillMonth.html" />
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇鎶ヨ〃\Sc_QualityReportBillDay.html" />
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇璁″垝骞冲彴\JIT_DayPlanPlatForm_BCP.html" />
+ <Content Include="views\鐢熶骇绠＄悊\璐ㄩ噺姹囨姤鍗昞Sc_QualityReportBillSumSave.html" />
<Content Include="views\绯荤粺绠＄悊\浼氳鏈熼棿\Xt_AccountPeriodAdd.html" />
<Content Include="views\绯荤粺绠＄悊\鐢ㄦ埛绠＄悊\Xt_UserRightQuery.html" />
<Content Include="views\璁惧绠＄悊\璁惧鍋滄満鍗昞Sb_EquipStopBillList_PDA.html" />
@@ -400,6 +401,7 @@
<Content Include="views\璐ㄩ噺绠＄悊\宸℃璁板綍鍗昞QC_PatrolProcCheckOtherBillList.html" />
<Content Include="views\璐ㄩ噺绠＄悊\搴撳瓨妫�楠屽崟\QC_Add_Edit_StockCheckBill.html" />
<Content Include="views\璐ㄩ噺绠＄悊\搴撳瓨妫�楠屽崟\QC_StockCheckBillList.html" />
+ <Content Include="views\璐ㄩ噺绠＄悊\寮傚父鍙嶉\OA_ErrMsgBackSelfQuery.html" />
<Content Include="views\璐ㄩ噺绠＄悊\璐ㄩ噺鎶ヨ〃\QC_InspectionFormReport.html" />
<Content Include="views\璐ㄩ噺绠＄悊\杞﹂棿鑷鍗昞QC_Add_Edit_WorkSelfCheckBill.html" />
<Content Include="views\璐ㄩ噺绠＄悊\杞﹂棿鑷鍗昞QC_WorkSelfCheckBillList.html" />
diff --git a/WebTM/WebTM.csproj.user b/WebTM/WebTM.csproj.user
index da71966..005e8c8 100644
--- a/WebTM/WebTM.csproj.user
+++ b/WebTM/WebTM.csproj.user
@@ -3,7 +3,7 @@
<PropertyGroup>
<NameOfLastUsedPublishProfile>D:\鏅轰簯杩堟�漒MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
<ProjectView>ProjectFiles</ProjectView>
- <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
+ <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress />
<IISExpressSSLPort />
@@ -16,8 +16,9 @@
<VisualStudio>
<FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
<WebProjectProperties>
- <StartPageUrl>views/绯荤粺绠＄悊/鐢ㄦ埛绠＄悊/Xt_UserRightQuery.html</StartPageUrl>
- <StartAction>SpecificPage</StartAction>
+ <StartPageUrl>
+ </StartPageUrl>
+ <StartAction>CurrentPage</StartAction>
<AspNetDebugging>True</AspNetDebugging>
<SilverlightDebugging>False</SilverlightDebugging>
<NativeDebugging>False</NativeDebugging>
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/OA_ErrMsgBackHandleBillMain.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/OA_ErrMsgBackHandleBillMain.html"
index ed2bc31..3326e5f 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/OA_ErrMsgBackHandleBillMain.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/OA_ErrMsgBackHandleBillMain.html"
@@ -552,6 +552,8 @@
var LoadData = data.data;
$("#HDeptID").val(LoadData[0].HDeptID); //閮ㄩ棬ID
$("#HDeptName").val(LoadData[0].鍙戦�侀儴闂�); //鍙戦�侀儴闂�
+ $("#HErrMsgBackTypeID").val(LoadData[0].HErrMsgBackTypeID); //寮傚父绫诲瀷鍚嶇ОID
+ $("#HErrMsgBackTypeName").val(LoadData[0].寮傚父绫诲瀷鍚嶇О); //寮傚父绫诲瀷鍚嶇О
$("#HSendMan").val(LoadData[0].鍙戦�佷汉); //鍙戦�佷汉
$("#HReceiveMan").val(LoadData[0].鎺ユ敹浜�); //鎺ユ敹浜�
$("#HCopyMan").val(LoadData[0].鎶勯��); //鎶勯��
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/OA_ErrMsgBackReceiveBillMain.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/OA_ErrMsgBackReceiveBillMain.html"
index 877e2b1..1977202 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/OA_ErrMsgBackReceiveBillMain.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/OA_ErrMsgBackReceiveBillMain.html"
@@ -542,6 +542,8 @@
var LoadData = data.data;
$("#HDeptID").val(LoadData[0].HDeptID); //閮ㄩ棬ID
$("#HDeptName").val(LoadData[0].鍙戦�侀儴闂�); //鍙戦�侀儴闂�
+ $("#HErrMsgBackTypeID").val(LoadData[0].HErrMsgBackTypeID); //寮傚父绫诲瀷鍚嶇ОID
+ $("#HErrMsgBackTypeName").val(LoadData[0].寮傚父绫诲瀷鍚嶇О); //寮傚父绫诲瀷鍚嶇О
$("#HSendMan").val(LoadData[0].鍙戦�佷汉); //鍙戦�佷汉
$("#HReceiveMan").val(LoadData[0].鎺ユ敹浜�); //鎺ユ敹浜�
$("#HCopyMan").val(LoadData[0].鎶勯��); //鎶勯��
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/OA_ErrMsgBackSignBillMain.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/OA_ErrMsgBackSignBillMain.html"
index ca9cecd..000178c 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/OA_ErrMsgBackSignBillMain.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/OA_ErrMsgBackSignBillMain.html"
@@ -536,6 +536,8 @@
var LoadData = data.data;
$("#HDeptID").val(LoadData[0].HDeptID); //閮ㄩ棬ID
$("#HDeptName").val(LoadData[0].鍙戦�侀儴闂�); //鍙戦�侀儴闂�
+ $("#HErrMsgBackTypeID").val(LoadData[0].HErrMsgBackTypeID); //寮傚父绫诲瀷鍚嶇ОID
+ $("#HErrMsgBackTypeName").val(LoadData[0].寮傚父绫诲瀷鍚嶇О); //寮傚父绫诲瀷鍚嶇О
$("#HSendMan").val(LoadData[0].鍙戦�佷汉); //鍙戦�佷汉
$("#HReceiveMan").val(LoadData[0].鎺ユ敹浜�); //鎺ユ敹浜�
$("#HCopyMan").val(LoadData[0].鎶勯��); //鎶勯��
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 f19db1b..f1587a7 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"
@@ -121,7 +121,7 @@
<div class="layui-inline">
<label class="layui-form-label">涓婚:<label style="color:red"> * </label></label>
<div class="layui-input-inline">
- <input class="layui-input" name="HContext" lay-verify="HContext" id="HContext" autocomplete="off" style="width:485px">
+ <input class="layui-input" name="HContext" lay-verify="HContext" id="HContext" autocomplete="off" style="width:485px" readonly>
</div>
</div>
</div>
@@ -168,7 +168,7 @@
<div class="layui-form-item">
<div class="layui-inline">
- <label class="layui-form-label">鎶勯��:<label style="color:red"> * </label></label>
+ <label class="layui-form-label">鎶勯��:</label>
<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;">
@@ -446,14 +446,20 @@
set_AddNew();
}
else if (OperationType == 3) {//缂栬緫
-
set_EditFromGrid();
- } else if (OperationType == 4) {
+ }
+ else if (OperationType == 4) {
set_AddFNew();
var Datetime = Format(new Date(), "yyyy-MM-dd hh:mm:ss");
var Person = sessionStorage["HUserName"];
//鎶ュ伐鍙拌烦杞〉闈㈣嚜鍔ㄧ敓鎴愬唴瀹�
$("#HDescription").val(generateString(Datetime, Person, HSourceName, HICMOBillNo, HType));
+ $("#HContext").val(HType);
+ }
+ else if (OperationType == 5) { //鏌ョ湅
+ set_EditFromGrid();
+ $('#Saver').addClass("layui-btn-disabled").attr("disabled", true);
+ $('#VerIfySaver').addClass("layui-btn-disabled").attr("disabled", true);
}
else {
layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
@@ -587,6 +593,7 @@
, "HMainSourceBillNo": data.HSourceBillNo //婧愬崟鍗曞彿
, "HMainSourceBillType": data.HSourceBillType //婧愬崟绫诲瀷
, "HHasten": data.HHasten
+ , "HMaterNumber": data.HMaterNumber
, "HMaterName": data.HMaterName
, "HHandleEmpID": data.HHandleEmpID
, "HHandleEmpName": data.HHandleEmpName
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_MESExecptFeedBackBillType.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_MESExecptFeedBackBillType.html"
index 9677a3c..b959ffd 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_MESExecptFeedBackBillType.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_MESExecptFeedBackBillType.html"
@@ -81,6 +81,7 @@
display: inline-block;
margin-right: 20px; /* 鏍规嵁闇�瑕佽皟鏁撮棿璺� */
}
+
</style>
</head>
<body>
@@ -109,14 +110,14 @@
<div class="layui-inline">
<div class="layui-input-inline" style="margin-left:200px">
<label class="radio-label">
- <input type="radio" name="faultType" value="鐜鏁呴殰">鐜鏁呴殰
+ <input type="radio" name="faultType" value="浜哄憳鍘熷洜">浜哄憳鍘熷洜
</label>
</div>
</div>
<div class="layui-inline">
<div class="layui-input-inline" style="margin-left:400px">
<label class="radio-label">
- <input type="radio" name="faultType" value="澹伴煶寮傚父">澹伴煶寮傚父
+ <input type="radio" name="faultType" value="璁惧寮傚父">璁惧寮傚父
</label>
</div>
</div>
@@ -126,14 +127,14 @@
<div class="layui-inline">
<div class="layui-input-inline" style="margin-left:200px">
<label class="radio-label">
- <input type="radio" name="faultType" value="鎬ц兘寮傚父">鎬ц兘寮傚父
+ <input type="radio" name="faultType" value="鐗╂枡寮傚父">鐗╂枡寮傚父
</label>
</div>
</div>
<div class="layui-inline">
<div class="layui-input-inline" style="margin-left:400px">
<label class="radio-label">
- <input type="radio" name="faultType" value="娑插帇鏁呴殰">娑插帇鏁呴殰
+ <input type="radio" name="faultType" value="宸ヨ壓鍘熷洜">宸ヨ壓鍘熷洜
</label>
</div>
</div>
@@ -143,14 +144,14 @@
<div class="layui-inline">
<div class="layui-input-inline" style="margin-left:200px">
<label class="radio-label">
- <input type="radio" name="faultType" value="浜轰负鏁呴殰">浜轰负鏁呴殰
+ <input type="radio" name="faultType" value="妫�娴嬪師鍥�">妫�娴嬪師鍥�
</label>
</div>
</div>
<div class="layui-inline">
<div class="layui-input-inline" style="margin-left:400px">
<label class="radio-label">
- <input type="radio" name="faultType" value="纭欢鏁呴殰">纭欢鏁呴殰
+ <input type="radio" name="faultType" value="涓嶅悎鏍煎師鍥�">涓嶅悎鏍煎師鍥�
</label>
</div>
</div>
@@ -172,11 +173,18 @@
//鑾峰彇鍙傛暟
var HICMOBillNo = ""; //宸ュ崟鍙�
var HSourceName = ""; //璁惧
-
+ var HNumber = "";
+ var HName = "";
+ var HModel = "";
+ var HQty = "";
var edit = function (data) {
HICMOBillNo = data[0].HICMOBillNo;
HSourceName = data[0].HSourceName;
+ //HNumber = data[0].HNumber;
+ //HName = data[0].HName;
+ //HModel = data[0].HModel;
+ //HQty = data[0].HQty;
}
layui.config({
@@ -195,7 +203,6 @@
//#endregion
-
//閫�鍑�
form.on('submit(Exit)', function (data) {
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/\344\270\215\350\211\257\351\207\207\351\233\206/Sc_QualityReportStepBill_New.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/\344\270\215\350\211\257\351\207\207\351\233\206/Sc_QualityReportStepBill_New.html"
index 4c4ff17..deed7b0 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/\344\270\215\350\211\257\351\207\207\351\233\206/Sc_QualityReportStepBill_New.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/\344\270\215\350\211\257\351\207\207\351\233\206/Sc_QualityReportStepBill_New.html"
@@ -323,6 +323,11 @@
set_InitGrid();
setInit_PushByICMOBill(linterid);
}
+ else if (OperationType == 5) { //娴佽浆鍗′笅鎺�
+ //瀛愯〃鍒濆鍖�
+ set_InitGrid();
+ set_ProcessBill(linterid, HEntryID);
+ }
//#endregion
//#region 鍒濆鍖栫粍缁�
@@ -412,6 +417,8 @@
"鐗╂枡浠ｇ爜": "",
"鐗╂枡鍚嶇О": "",
"瑙勬牸鍨嬪彿": "",
+ "HPRocID": "0",
+ "宸ュ簭": "",
"HUnitID": "0",
"璁￠噺鍗曚綅": "",
"HQty": "0",
@@ -626,6 +633,8 @@
, { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 150, event: "HMaterID", edit: 'text' }//f7
, { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 150, style: "background-color:#efefef4d;" }
, { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 100, style: "background-color:#efefef4d;" }
+ , { field: 'HProcID', title: 'HProcID', width: 100, style: "background-color:#efefef4d;", hide: true }
+ , { field: '宸ュ簭', title: '宸ュ簭', width: 150 }
, { field: 'HUnitID', title: 'HUnitID', width: 100, style: "background-color:#efefef4d;", hide: true }
, { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅', width: 100, style: "background-color:#efefef4d;" }//f7
, { field: 'HQty', title: '鏁伴噺', width: 100, totalRow: true, edit: 'text' }
@@ -640,10 +649,10 @@
, { field: 'HICMOInterID', title: '鐢熶骇璁㈠崟涓诲唴鐮�', hide: true, style: 'background-color: #f9f9f9;' } //f7
, { field: 'HICMOEntryID', title: '鐢熶骇璁㈠崟瀛愬唴鐮�', hide: true, style: 'background-color: #f9f9f9;' } //f7
- , { field: 'HICMOBillNo', title: '鐢熶骇璁㈠崟鍙�', hide: true, style: 'background-color: #f9f9f9;' } //f7
+ , { field: 'HICMOBillNo', title: '鐢熶骇璁㈠崟鍙�', style: 'background-color: #f9f9f9;' } //f7
, { field: 'HProcExchInterID', title: '宸ュ簭娴佽浆鍗″唴鐮�', hide: true, style: 'background-color: #f9f9f9;' } //f7
, { field: 'HProcExchEntryID', title: '宸ュ簭娴佽浆鍗″瓙鍐呯爜', hide: true, style: 'background-color: #f9f9f9;' } //f7
- , { field: 'HProcExchBillNo', title: '宸ュ簭娴佽浆鍗″彿', hide: true, style: 'background-color: #f9f9f9;' } //f7
+ , { field: 'HProcExchBillNo', title: '宸ュ簭娴佽浆鍗″彿', style: 'background-color: #f9f9f9;' } //f7
, { field: 'HSourceInterID', title: '婧愬崟鍐呯爜', hide: true, style: 'background-color: #f9f9f9;' } //f7
, { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', hide: true, style: 'background-color: #f9f9f9;' } //f7
, { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', hide: true, style: 'background-color: #f9f9f9;' } //f7
@@ -681,6 +690,8 @@
"鐗╂枡浠ｇ爜": "",
"鐗╂枡鍚嶇О": "",
"瑙勬牸鍨嬪彿": "",
+ "HPRocID": "0",
+ "宸ュ簭": "",
"HUnitID": "0",
"璁￠噺鍗曚綅": "",
"HQty": "0",
@@ -933,6 +944,95 @@
}
//#endregion
+ //#region (宸ュ簭娴佽浆鍗�)涓嬫帹椤甸潰鍒濆鍖�
+ function set_ProcessBill(linterid, HEntryID) {
+ //鐢熸垚骞惰缃富琛ㄧ殑鍐呯爜鍜屽崟鎹彿
+ createBillNo();
+
+ //鐩稿叧鏂囨湰妗嗕俊鎭垵濮嬪寲
+ $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HMaker").val(sessionStorage["HUserName"]);
+ $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd"));
+
+ var ajaxLoad = layer.load();
+
+ $.ajax({
+ url: GetWEBURL() + "/LEMS/MES_IF_ProcessBillList_Json",
+ type: "GET",
+ async: false,
+ data: { "hinterid": linterid, "HEntryID": HEntryID, "user": sessionStorage["HUserName"] },
+ success: function (d) {
+ var result = d;
+
+ if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data[0];
+
+ //缁勭粐鐨勫�糎OrgID鍙樺寲锛岄噸鏂版覆鏌�
+ HOrgIDBar = data.HPRDORGID;
+ //瀛愯〃 璧嬪��
+ var rowdata = [];
+ for (var i = 0; i < result.data.length; i++) {
+ rowdata.push(
+ {
+ "HMaterID": result.data[i]["HMaterID"],
+ "鐗╂枡浠ｇ爜": result.data[i]["浜у搧浠ｇ爜"],
+ "鐗╂枡鍚嶇О": result.data[i]["浜у搧鍚嶇О"],
+ "瑙勬牸鍨嬪彿": result.data[i]["瑙勬牸鍨嬪彿"],
+ "HProcID": result.data[i]["HProcID"],
+ "宸ュ簭": result.data[i]["宸ュ簭鍚嶇О"],
+ "HUnitID": result.data[i]["HUnitID"],
+ "璁￠噺鍗曚綅": result.data[i]["璁￠噺鍗曚綅"],
+ "HQty": result.data[i]["鐢熶骇浠诲姟鍗曟暟閲�"],
+ "HSourceID": "0",
+ "鐢熶骇璧勬簮": "",
+
+ "HRemark": "",
+ "HProcExchInterID": "0",
+ "HProcExchEntryID": "0",
+ "HProcExchBillNo": "",
+ "HICMOInterID": result.data[i]["hicmointerid"],
+ "HICMOEntryID": result.data[i]["HICMOEntryID"],
+ "HICMOBillNo": result.data[i]["浠诲姟鍗曞彿"],
+
+ "HProcExchInterID": result.data[i]["hmainid"],
+ "HProcExchEntryID": result.data[i]["HEntryID"],
+ "HProcExchBillNo": result.data[i]["鍗曟嵁鍙�"],
+
+
+ "HSourceInterID": result.data[i]["hmainid"],
+ "HSourceEntryID": result.data[i]["HEntryID"],
+ "HSourceBillNo": result.data[i]["鍗曟嵁鍙�"],
+ "HSourceBillType": result.data[i]["鍗曟嵁绫诲瀷"],
+
+ "HResult": "鎶ュ簾",
+ "HEmpID": "0",
+ "妫�楠屽憳": "",
+ "HBadReasonID": "0",
+ "涓嶈壇鍘熷洜": "",
+ "HBarCode": "",
+ "HReportType": "3",
+ "HAddr": "",
+ "HMaker": "",
+ "HMakeDate": Format(new Date(), 'yyyy-MM-dd')
+ }
+ );
+ }
+ option.data = rowdata;
+
+ table.render(option);
+ layer.close(ajaxLoad);
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鍙戠敓閿欒!", { icon: 5 });
+ }
+ })
+ }
+ //#endregion
+
//#region 寮圭獥閫夋嫨鏂规硶
//#region 鐢熶骇杞﹂棿閫夋嫨椤甸潰
function get_checkDept() {
@@ -1017,7 +1117,7 @@
function set_SaveBill(data) {
//璁板綍鎿嶄綔绫诲瀷
var refSav = "";
- if (OperationType == 1 || OperationType == 2 || OperationType == 4) {
+ if (OperationType == 1 || OperationType == 2 || OperationType == 4 || OperationType == 5) {
refSav = "Add";
data.field.HChangeDate = new Date();
data.field.HSTOCKORGID = data.field.HOrgID;
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\212\245\350\241\250/Sc_QualityReportBillMonth.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\212\245\350\241\250/Sc_QualityReportBillMonth.html"
index 054a764..97d2433 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\212\245\350\241\250/Sc_QualityReportBillMonth.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\212\245\350\241\250/Sc_QualityReportBillMonth.html"
@@ -131,17 +131,26 @@
var HTitle = "";//鍥惧舰鏍囬
if (option.data.length > 0) {
var HMaterName = option.data[0].鐗╂枡鍚嶇О
+ for (let i = 0; i < H_X.length; i++) {
+ HProcSumNum.push(0);
+ HQualifiedNum.push(0);
+ HFirstPassRate.push(0);
+ }
+ // 濉厖鏁版嵁
for (let i = 0; i < option.data.length; i++) {
if (option.data[i].鐗╂枡鍚嶇О === HMaterName) {
- HProcSumNum.push(option.data[i].娉ㄥ鏁伴噺);
- var qualifiedRateString = option.data[i].娉ㄥ鑹巼; // "5.00%"
- var qualifiedRate = parseFloat(qualifiedRateString.replace('%', '')); // 绉婚櫎鐧惧垎鍙峰苟杞崲涓烘暟瀛�
- HQualifiedNum.push(qualifiedRate);
+ let monthIndex = option.data[i].鏈� - 1; // 鏈堜唤鍦ㄦ暟缁勪腑鐨勭储寮曪紙娉ㄦ剰杞崲涓轰粠0寮�濮嬶級
+ HProcSumNum[monthIndex] += option.data[i].娉ㄥ鏁伴噺;
+
+ // 澶勭悊娉ㄥ鑹巼
+ let qualifiedRateString = option.data[i].娉ㄥ鑹巼; // "5.00%"
+ let qualifiedRate = parseFloat(qualifiedRateString.replace('%', '')); // 绉婚櫎鐧惧垎鍙峰苟杞崲涓烘暟瀛�
+ HQualifiedNum[monthIndex] = qualifiedRate;
// 澶勭悊鍏ㄦ鑹巼
- var firstPassRateString = option.data[i].鍏ㄦ鑹巼; // "5.00%"
- var firstPassRate = parseFloat(firstPassRateString.replace('%', '')); // 绉婚櫎鐧惧垎鍙峰苟杞崲涓烘暟瀛�
- HFirstPassRate.push(firstPassRate);
+ let firstPassRateString = option.data[i].鍏ㄦ鑹巼; // "5.00%"
+ let firstPassRate = parseFloat(firstPassRateString.replace('%', '')); // 绉婚櫎鐧惧垎鍙峰苟杞崲涓烘暟瀛�
+ HFirstPassRate[monthIndex] = firstPassRate;
}
}
//for (let i = 1; i <= 12; i++) {
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 8162b1a..e743364 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"
@@ -55,6 +55,7 @@
<div class="layui-card-header">
<div class="layui-btn-group">
<button type="button" id="set_SaveBill" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="btnSave">淇濆瓨</button>
+ <button type="button" id="set_SaveBill" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="btnSumSave">鎵归噺淇濆瓨</button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Cancel">閫�鍑�</button>
<button type="button" id="set_SaveBarCode" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_SaveBarCode" style="display:none;">鎵爜淇濆瓨</button>
</div>
@@ -467,6 +468,13 @@
});
//#endregion
+
+ //#region 鎵归噺淇濆瓨鎸夐挳
+ form.on('submit(btnSumSave)', function () {
+ get_SumSave();
+ });
+ //#endregion
+
//#region 鎵笉鑹潯鐮�
$('#HBarCode').on('keydown', function (event) {
if (event.keyCode == 13) {
@@ -593,7 +601,7 @@
$.ajax({
url: GetWEBURL() + '/Sc_QualityReportBill/set_SaveBill',
type: "GET",
- data: { "HInterID": $("#HInterID").val(), "HBillNo": $("#HBillNo").val(), "HChecker": sessionStorage["HUserName"], "HBadReasonHQty": $("HBadReasonHQty").val() },
+ data: { "HInterID": $("#HInterID").val(), "HBillNo": $("#HBillNo").val(), "HChecker": sessionStorage["HUserName"],"HBadReasonHQty": $("#HBadReasonHQty").val() },
success: function (result) {
if (result.count == 1) {
$('#set_SaveBill').addClass("layui-btn-disabled").attr("disabled", true);
@@ -778,6 +786,50 @@
}
//#endregion
+ //#region 鎵归噺淇濆瓨鎸夐挳
+ function get_SumSave() {
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '鏂板鎵归噺淇濆瓨',
+ closeBtn: 1,
+ shift: 2,
+ area: ['100%', '100%'],
+ maxmin: true,
+ content: './Sc_QualityReportBillSumSave.html?OperationType=1&linterid=&HSouceBillType=',
+ end: function () {
+
+ },
+ success: function (dom, index) {
+ var data = [];
+ data.push({
+ "HInterID":$("#HInterID").val(),
+ "HBillNo":$("#HBillNo").val(),
+ "HMaterID": $("#HMaterID").val(),
+ "HMaterName": $("#HMaterName").val(),
+ "HProcID": $("#HProcID").val(),
+ "HProcNo": $("#HProcNo").val(),
+ "HGroupID": $("#HGroupID").val(),
+ "HGroupName": $("#HGroupName").val(),
+ "HSourceID": $("#HSourceID").val(),
+ "HSourceName": $("#HSourceName").val(),
+ "HICMOInterID": $("#HICMOInterID").val(),
+ "HICMOEntryID": $("#HICMOEntryID").val(),
+ "HICMOBillNo": $("#HICMOBillNo").val(),
+ "HProcExchInterID": $("#HProcExchInterID").val(),
+ "HProcExchEntryID": $("#HProcExchEntryID").val(),
+ "HProcExchBillNo": $("#HProcExchBillNo").val()
+ });
+
+ //閫氳繃绱㈠紩鑾峰彇鍒板綋鍓峣frame寮瑰嚭灞�
+ var iframe = window['layui-layer-iframe' + index];
+ //璋冪敤iframe寮瑰嚭灞傚唴鐨勬柟娉�
+ iframe.edit(data);
+ },
+ });
+ }
+ //#endregion
+
//#region 鎵笉鑹潯鐮佸悗璋冪敤鐨勬樉绀烘壂鎻忚褰曟柟娉�
function get_BarCodeDetail() {
var ajaxLoad = layer.load();
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_QualityReportBillSumSave.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_QualityReportBillSumSave.html"
new file mode 100644
index 0000000..7514c1e
--- /dev/null
+++ "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_QualityReportBillSumSave.html"
@@ -0,0 +1,830 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+ <meta charset="utf-8" />
+ <title>涓嶈壇閲囬泦鎵归噺淇濆瓨</title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <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>
+ /* 闃叉涓嬫媺妗嗙殑涓嬫媺鍒楄〃琚殣钘�---蹇呴』璁剧疆--- */
+ .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: 2px;background-color: #efefef;">
+ <div class="layui-card-body" style="padding: 1px;">
+ <form class="layui-form" action="" lay-filter="formData" style="background-color:white;">
+ <div style="padding: 2px; ">
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSave" id="btnSave">淇濆瓨</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnEdit" id="btnEdit">閫�鍑�</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_CheckBill" id="set_CheckBill">瀹℃牳</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_AbandonCheck" id="set_AbandonCheck">鍙嶅鏍�</button>
+ </div>
+ <div class="layui-tab" lay-filter="tab-POStockInBill">
+ <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-col-xs4 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" lay-verify="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly>
+ <input type="hidden" name="HInterID" id="HInterID" lay-verify="HInterID">
+ </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="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 class="layui-col-xs4 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-col-xs4 layui-inline">
+ <label class="layui-form-label">褰撳墠宸ュ簭</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HProcNo" id="HProcNo" style="background-color:#efefef4d;" readonly>
+ <input type="hidden" name="HProcID" id="HProcID" value="0">
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <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="HMaterNumber" id="HMaterNumber" 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="HMaterName" id="HMaterName" style="background-color:#efefef4d;" readonly>
+ <input type="hidden" name="HMaterID" id="HMaterID" value="0">
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label"><span style="color:red;">*</span>鐢熶骇璧勬簮</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HSourceName" id="HSourceName" onmouseover="this.title=this.value" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
+ <input type="hidden" name="HSourceID" id="HSourceID" value="0">
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label"><span style="color:red;">*</span>鐢熶骇鐝粍</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HGroupName" id="HGroupName" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
+ <input type="hidden" name="HGroupID" id="HGroupID" value="0">
+ </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="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="HChecker" id="HChecker" 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="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="HCheckDate" id="HCheckDate" 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="HCloseMan" id="HCloseMan" 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="HCloseDate" id="HCloseDate" 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>
+ <div class="layui-tab" lay-filter="tab-POStockInBill">
+ <ul class="layui-tab-title" lay-filter="tab-all">
+ <li lay-id="1" style="padding:1px;" class="layui-this">娴佺▼</li>
+ </ul>
+ <div class="layui-tab-content">
+ <!--瀛愯〃-->
+ <div class="layui-tab-item layui-show">
+ <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"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button>
+ </div>
+ </script>
+ </div>
+ </div>
+ </div>
+ </form>
+ </div>
+ </div>
+ </div>
+ <!--瀛愯〃琛細鍒犻櫎-->
+ <script type="text/html" id="barDemo">
+ <!--<a class="layui-btn layui-btn-xs" lay-event="edit">缂栬緫</a>-->
+ <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
+ </script>
+ <script>
+ var HMaterID = ""; // 鐗╂枡ID
+ var HMaterName = ""; // 鐗╂枡鍚嶇О
+ var HGroupID = ""; // 鐝粍ID
+ var HGroupName = ""; // 鐝粍鍚嶇О
+ var HSourceID = ""; // 鐢熶骇璧勬簮ID
+ var HSourceName = ""; // 鐢熸垚璧勬簮鍚嶇О
+ var HICMOInterID = ""; // 鐢熶骇璁㈠崟涓诲唴鐮�
+ var HICMOEntryID = ""; // 鐢熶骇璁㈠崟瀛愬唴鐮�
+ var HICMOBillNo = ""; // 鐢熶骇璁㈠崟鍙�
+ var HProcExchInterID = ""; // 宸ュ簭娴佽浆鍗′富鍐呯爜
+ var HProcExchEntryID = ""; // 宸ュ簭娴佽浆鍗″瓙鍐呯爜
+ var HProcExchBillNo = ""; // 宸ュ簭娴佽浆鍗″彿
+ var HProcID = ""; //宸ュ簭
+ var HProcNo = ""; //宸ュ簭鍚嶇О
+ var HInterID = "";
+ var HBillNo = "";
+
+
+ var edit = function (data) {
+ HInterID = data[0].HInterID;
+ HBillNo = data[0].HBillNo;
+ HMaterID = data[0].HMaterID;
+ HMaterName = data[0].HMaterName;
+ HProcID = data[0].HProcID;
+ HProcNo = data[0].HProcNo;
+ HGroupID = data[0].HGroupID;
+ HGroupName = data[0].HGroupName;
+ HSourceID = data[0].HSourceID;
+ HSourceName = data[0].HSourceName;
+ HICMOInterID = data[0].HICMOInterID
+ HICMOEntryID = data[0].HICMOEntryID;
+ HICMOBillNo = data[0].HICMOBillNo
+ HProcExchInterID = data[0].HProcExchInterID;
+ HProcExchEntryID = data[0].HProcExchEntryID
+ HProcExchBillNo = data[0].HProcExchBillNo;
+ }
+ 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 = "Sc_QualityReportBillSumSave";
+ //鍏ㄥ眬鍙橀噺
+ window.HDeptType = 0;
+
+ //琛ㄦ牸娓叉煋鍙傛暟
+ var option = {}; //瀛愯〃娓叉煋鍙傛暟
+ //璁板綍缁勭粐鐨勫��
+ var HOrgIDBar = 0;
+ //鑾峰彇鍙傛暟
+ var params = getUrlVars();
+ var OperationType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鏁版嵁绫诲瀷 1娣诲姞 淇濆瓨 2澶嶅埗 3 缂栬緫
+ var linterid = params[params[1]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
+ var HEntryID = params[params[3]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
+ //var HProjectStageID = params[params[3]]; //闃舵鍐呯爜
+
+ //鍏ㄥ眬鍙橀噺
+
+
+ //#endregion
+
+ //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+
+ //#region 鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
+ if (sessionStorage.login != "login") {
+ layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
+ icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
+ }, function () { window.location.href = "../../user/login.html"; });
+ }
+ //#endregion
+
+ //#region 鍒濆鍖栬〃鏍�
+
+ //#endregion
+
+ //#region 鍒ゆ柇骞惰缃搷浣滅被鍨嬨�侀〉闈㈠垵濮嬪寲
+ if (OperationType == null || OperationType == 1) { //鏂板
+
+ OperationType = 1;
+ $("#HInterID").val(HInterID),
+ $("#HBillNo").val(HBillNo),
+ $("#HMaterID").val(HMaterID);
+ $("#HMaterName").val(HMaterName);
+ $("#HProcID").val(HProcID);
+ $("#HProcNo").val(HProcNo);
+ $("#HGroupID").val(HGroupID);
+ $("#HGroupName").val(HGroupName);
+ $("#HSourceID").val(HSourceID);
+ $("#HSourceName").val(HSourceName);
+ $("#HICMOInterID").val(HICMOInterID);
+ $("#HICMOEntryID").val(HICMOEntryID);
+ $("#HICMOBillNo").val(HICMOBillNo);
+ $("#HProcExchInterID").val(HProcExchInterID);
+ $("#HProcExchEntryID").val(HProcExchEntryID);
+ $("#HProcExchBillNo").val(HProcExchBillNo);
+ $("#HMaker").val(sessionStorage["HUserName"]);
+ $("#HMakerDate").val(Format(new Date(), "yyyy-MM-dd"));
+ //鍒濆鍖栭」鐩樁娈佃〃
+ get_InitGrid();
+
+
+ //鍒濆鍖栧埗鍗曚汉鍜屽埗鍗曟椂闂�
+
+ //$("#HGroupID").val(sessionStorage["HGroupID"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鐝粍ID
+ //$("#HGroupName").val(sessionStorage["HGroup"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鐝粍
+ //$("#HSourceID").val(sessionStorage["HSourceID"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鐝粍ID
+ //$("#HSourceName").val(sessionStorage["HSource"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鐝粍
+
+ }
+
+ //#endregion
+
+ //#region 鍒濆鍖栫粍缁�
+ Organ();
+ //#endregion
+
+
+
+ //#endregion
+
+ //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+ //#region 寮圭獥閫夋嫨瑙﹀彂浜嬩欢
+
+ //#endregion
+
+ //#region 鎿嶄綔鎸夐挳瑙﹀彂浜嬩欢
+ //#region 淇濆瓨鎻愪氦
+ form.on('submit(btnSave)', function (data) {//鎻愪氦
+ if (AllowLoadData(data)) {
+ set_AddNew(data);
+ }
+ });
+ //#endregion
+
+ //#region 閫�鍑�
+ form.on('submit(btnEdit)', function (data) {
+ if (params[1] != null) {
+ Pub_Close(1);
+ } else if (params[1] == null) {
+ Pub_Close(2);
+ }
+ });
+ //#endregion
+
+ //#endregion
+
+ //#endregion
+
+ //#region 瀛愯〃锛氬ご宸ュ叿鏍忎簨浠�
+ table.on('toolbar(mainTable)', function (obj) {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+
+ //鏂板琛岃〃鏍兼暟鎹�
+ var NewRow =
+ {
+ "HInterID": $("#HInterID").val(),
+ "HBillNo_bak": $("#HBillNo").val(),
+ "HMaterID": $("#HMaterID").val(),
+ "HMaterName": $("#HMaterName").val(),
+ "HBadReasonID": "",
+ "HBadReasonNumber": "",
+ "HBadReasonHName": "",
+ "HEmpID": $("#HMaker").val(sessionStorage["HEmpID"]),
+ "HCheckMan": $("#HMaker").val(),
+ "HGroupID": $("#HGroupID").val(),
+ "HGroupName": $("#HGroupName").val(),
+ "HSourceID": $("#HSourceID").val(),
+ "HSourceName": $("#HSourceName").val(),
+ "HQty": "",
+ "HSourceInterID": $("#HICMOInterID").val(),
+ "HSourceEntryID": $("#HICMOEntryID").val(),
+ "HSourceBillNo": $("#HICMOBillNo").val(),
+ "HSourceBillType": "3722",
+ "HICMOInterID": $("#HICMOInterID").val(),
+ "HICMOEntryID": $("#HICMOEntryID").val(),
+ "HICMOBillNo": $("#HICMOBillNo").val(),
+ "HProcExchInterID": $("#HProcExchInterID").val(),
+ "HProcExchEntryID": $("#HProcExchEntryID").val(),
+ "HProcExchBillNo": $("#HProcExchBillNo").val()
+ };
+ switch (obj.event) {
+ case 'btn-AddLine':
+ table.cache["mainTable"].push(NewRow);
+ option.data = table.cache["mainTable"];
+ table.render(option);
+
+ form.render('select');
+ break;
+ case 'btn-CopyLine':
+ 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);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
+
+ form.render('select');
+ }
+ break;
+ //涓婁竴琛�
+ case 'btn_up':
+ btn_up(data);
+ break;
+ //涓嬩竴琛�
+ case 'btn_under':
+ btn_under(data);
+ break;
+ }
+ });
+ //#endregion
+
+ //#region 瀛愯〃锛氳鍐呬簨浠�
+ table.on('tool(mainTable)', function (obj) {
+ set_GridDelete(obj); //琛屽唴鍒犻櫎
+ set_GridCellCheck(obj); //琛屽唴蹇嵎閿瓫閫�
+
+ });
+ //#endregion
+
+ form.on('submit(Cancel)', function () {
+ //sessionStorage["SourceFlag"] = false;
+ parent.location.href = "../../../views/index.html"
+ //window.close();//鍏抽棴褰撳墠椤�
+ })
+
+ //#region 鐩戝惉鎻愪氦
+ form.verify({
+ numberOrEmpty: function (value, item) {
+
+ // if (value != '') {
+ if (!/^\d+$/.test(value)) {
+ return '涓嶈兘涓虹┖鎴栨暟瀛楁垨鑰�0';
+ }
+ //}
+ }
+ });
+ //#endregion
+
+ //#endregion
+
+ //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
+
+ //#region 鑾峰彇缁勭粐
+ function Organ() {
+ //鑾峰彇鐧诲綍椤电粍缁囧垪
+ var Organization = '';
+ $.ajax({
+ type: "get",
+ url: GetWEBURL() + "/Web/GetOrganizations",
+ success: function (result) {
+ 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>';
+ }
+ $("#HOrgID").append(Organization);
+ if (OperationType == 1 || OperationType == 4 || OperationType == 2) {
+ HOrgIDBar = sessionStorage["OrganizationID"];
+ }
+ $("#HOrgID").val(HOrgIDBar);
+ form.render('select');
+ }
+ layer.closeAll("loading");
+ }
+ })
+ }
+ //#endregion
+
+ //#region 鑾峰彇鍙傛暟
+ 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;
+ }
+ //#endregion
+
+
+ //#region 涓嶈壇閲囬泦琛ㄥ垵濮嬪寲
+ function get_InitGrid() {
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , limit: 100
+ , totalRow: true
+ , cellMinWidth: 120
+ , height: 400
+ , cols: [[
+ { type: 'checkbox', totalRowText: '鍚堣琛�' }
+ , { type: 'numbers', title: '搴忓彿', totalRow: true }
+ , { field: 'HInterID', title: '涓籭d', hide: true }
+ , { field: 'HBillNo_bak', title: '鍗曟嵁鍙�', hide: true }
+ , { field: 'HMaterID', title: '鐗╂枡id', hide: true }
+ , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', style: 'background-color: #f9f9f9;' }
+ , { field: 'HBadReasonID', title: '涓嶈壇鍘熷洜id', hide: true }
+ , { field: 'HBadReasonNumber', title: '涓嶈壇鍘熷洜浠ｇ爜', event: "HBadReasonNumber"}
+ , { field: 'HBadReasonHName', title: '涓嶈壇鍘熷洜', style: 'background-color: #f9f9f9;' }
+ , { field: 'HEmpID', title: '妫�楠屽憳id', hide: true }
+ , { field: 'HCheckMan', title: '妫�楠屽憳', event: "HCheckMan" }
+ , { field: 'HGroupID', title: '鐝粍id', hide: true }
+ , { field: 'HGroupName', title: '鐢熶骇鐝粍', event: "HGroupName" }
+ , { field: 'HSourceID', title: '鐢熶骇璧勬簮id', hide: true }
+ , { field: 'HSourceName', title: '鐢熶骇璧勬簮', event: "HSourceName" }
+ , { field: 'HQty', title: '涓嶈壇鏁伴噺', edit: 'text' }
+ , { field: 'HSourceInterID', title: '婧愬崟鍐呯爜', hide: true, style: 'background-color: #f9f9f9;' }
+ , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', hide: true, style: 'background-color: #f9f9f9;' }
+ , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', hide: true, style: 'background-color: #f9f9f9;' }
+ , { field: 'HSourceBillType', title: '婧愬崟绫诲瀷', hide: true, style: 'background-color: #f9f9f9;' }
+
+ , { field: 'HICMOInterID', title: '鐢熶骇璁㈠崟涓诲唴鐮�', hide: true, style: 'background-color: #f9f9f9;' }
+ , { field: 'HICMOEntryID', title: '鐢熶骇璁㈠崟瀛愬唴鐮�', hide: true, style: 'background-color: #f9f9f9;' }
+ , { field: 'HICMOBillNo', title: '鐢熶骇璁㈠崟鍙�', hide: true, style: 'background-color: #f9f9f9;' }
+
+ , { field: 'HProcExchInterID', title: '宸ュ簭娴佽浆涓诲唴鐮�', hide: true, style: 'background-color: #f9f9f9;' }
+ , { field: 'HProcExchEntryID', title: '宸ュ簭娴佽浆瀛愬唴鐮�', hide: true, style: 'background-color: #f9f9f9;' }
+ , { field: 'HProcExchBillNo', title: '宸ュ簭娴佽浆鍗″彿', hide: true, style: 'background-color: #f9f9f9;' }
+ , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
+ ]]
+ }
+
+ var rowdata = [
+ {
+ "HInterID": $("#HInterID").val(),
+ "HBillNo_bak": $("#HBillNo").val(),
+ "HMaterID": $("#HMaterID").val(),
+ "HMaterName": $("#HMaterName").val(),
+ "HBadReasonID": "",
+ "HBadReasonNumber": "",
+ "HBadReasonHName": "",
+ "HEmpID": $("#HMaker").val(sessionStorage["HEmpID"]),
+ "HCheckMan": $("#HMaker").val(),
+ "HGroupID": $("#HGroupID").val(),
+ "HGroupName": $("#HGroupName").val(),
+ "HSourceID": $("#HSourceID").val(),
+ "HSourceName": $("#HSourceName").val(),
+ "HQty": "",
+ "HSourceInterID": $("#HICMOInterID").val(),
+ "HSourceEntryID": $("#HICMOEntryID").val(),
+ "HSourceBillNo": $("#HICMOBillNo").val(),
+ "HSourceBillType": "3722",
+ "HICMOInterID": $("#HICMOInterID").val(),
+ "HICMOEntryID": $("#HICMOEntryID").val(),
+ "HICMOBillNo": $("#HICMOBillNo").val(),
+ "HProcExchInterID": $("#HProcExchInterID").val(),
+ "HProcExchEntryID": $("#HProcExchEntryID").val(),
+ "HProcExchBillNo": $("#HProcExchBillNo").val()
+ }
+ ];
+ option.data = rowdata;
+ table.render(option);
+ form.render('select');
+ }
+ //#endregion
+
+
+
+ //#region 淇濆瓨HMaker
+ function set_AddNew(data) {
+ //鑾峰彇瀛愯〃鏁版嵁
+ 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 refSav = "";
+ if (OperationType == 1 || OperationType == 2 || OperationType == 4) {
+ refSav = "Add";
+ }
+ //鑻ヤ负缂栬緫-淇濆瓨锛屽垯鏇存柊淇敼浜哄拰淇敼鏃堕棿
+ if (OperationType == 3) {
+ refSav = "Update";
+ data.field.HUpdater = sessionStorage["HUserName"];
+ data.field.HUpdaterDate = Format(new Date(), "yyyy-MM-dd");
+ $("#HUpdater").val(sessionStorage["HUserName"]);
+ $("#HUpdaterDate").val(Format(new Date(), "yyyy-MM-dd"));
+ }
+
+ //鑾峰彇琛ㄥご鏁版嵁骞跺簭鍒楀寲
+ var sMainStr = JSON.stringify(data.field); //涓昏〃鏁版嵁
+ //瀛愯〃鏁版嵁搴忓垪鍖�
+ var sSubStr = JSON.stringify(num);
+
+ //鎷兼帴搴忓垪鍖栫殑鏁版嵁
+ var sMainSub = sMainStr + ';' + sSubStr + ';' + refSav + ";" + sessionStorage["HUserName"];
+
+ var index = layer.load();
+ $.ajax({
+ type: "POST",
+ url: GetWEBURL() + "Sc_MESTransFerWorkBill/SaveOA_AndengFlowRuleBill",
+ async: true,
+ data: { "msg": sMainSub },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) {
+ $('#btnSave').addClass("layui-btn-disabled").attr("disabled", true);
+ layer.close(index);
+ layer.msg("鎻愪氦鎴愬姛");
+
+ }
+ else {
+ layer.close(index);
+ layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ },
+ error: function (err) {
+ layer.close(index);
+ layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ });
+ }
+ //#endregion
+
+
+
+
+ //#region 闈炵┖楠岃瘉
+ function AllowLoadData(data) {
+ //#region 琛ㄥご鏁版嵁妫�楠�
+ if ($("#HBillNo").val() == "") {
+ layer.msg("鍗曟嵁鍙蜂笉鑳戒负绌�!");
+ return false;
+ }
+
+
+
+ //#endregion
+
+
+ return true;
+ }
+ //#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 {
+ var oldData = table.cache["mainTable"];
+ oldData.splice(obj.tr.data('index'), 1)
+ option.data = oldData;//灏嗘暟鎹粦瀹氬埌data涓�
+ table.render(option);
+ for (var i = 0; i < oldData.length; i++) {
+ $('#HReceiveType' + (i + 1)).find("option[value='" + oldData[i].HReceiveType + "']").attr("selected", true);
+ }
+ form.render('select');
+ layer.close(index);
+ }
+ });
+ }
+ }
+ //#endregion
+
+ //#region 瀛愯〃锛氬揩鎹烽敭(F7)鎵撳紑寮圭獥
+ function set_GridCellCheck(obj) {
+ $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
+ if (event.key == "F7") {
+ if (obj.event == "HBadReasonNumber") {
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "涓嶈壇鍘熷洜" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["90%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_BadReason.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("璇烽�夋嫨涓�鏉℃暟鎹�");
+ }
+ obj.update({
+ "HBadReasonID": checkStatus.data[0].HItemID
+ , "HBadReasonNumber": checkStatus.data[0].涓嶈壇鍘熷洜浠ｇ爜
+ , "HBadReasonHName": checkStatus.data[0].涓嶈壇鍘熷洜鍚嶇О
+ })
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ , btn2: function (index, layero) { }
+ })
+ }
+ if (obj.event == "HCheckMan") {
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '妫�楠屽憳鍒楄〃'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?type=HEmp', '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
+ , "HCheckMan": checkStatus.data[0].鑱屽憳鍚嶇О
+ })
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
+ }
+ if (obj.event == "HGroupName") {
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '鐝粍鍒楄〃'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../鍩虹璧勬枡/宸ヨ祫鍩虹璧勬枡/Gy_Group.html?type=HGroup', '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
+ , "HGroupName": checkStatus.data[0].鐝粍鍚嶇О
+ })
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
+ }
+ if (obj.event == "HSourceName") {
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '鐢熶骇璧勬簮鍒楄〃'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Source.html', 'yes']
+ , btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ obj.update({
+ "HSourceID": checkStatus.data[0].HItemID
+ , "HSourceName": checkStatus.data[0].鐢熶骇璧勬簮鍚嶇О
+ })
+
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ });
+ }
+ obj.event = "";
+ return false;
+ }
+ })
+ }
+ //#endregion
+
+
+
+ //#endregion
+
+
+
+
+ });
+
+ </script>
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Xt_UserGroupListEdit.html" "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Xt_UserGroupListEdit.html"
index e93fad5..f3a6409 100644
--- "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Xt_UserGroupListEdit.html"
+++ "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Xt_UserGroupListEdit.html"
@@ -76,11 +76,12 @@
<label class="layui-form-label" style="width: 85px;">绾у埆</label>
<div class="layui-input-block" style="margin-left: 120px; width: 185px;">
<select name="HLev" id="HLev" lay-verify="HLev">
- <option value="1鎬荤粡鐞嗙骇">1鎬荤粡鐞嗙骇</option>
- <option value="2鍓�荤骇">2鍓�荤骇</option>
+ <option value="1鎬荤粡鐞嗙骇">1鎬荤粡鐞�</option>
+ <option value="2鍓�荤骇">2鍓�荤粡鐞�</option>
+ <option value="2璐ㄩ噺鎬荤洃">2璐ㄩ噺鎬荤洃</option>
<option value="3閮ㄩ暱绾�">3閮ㄩ暱绾�</option>
<option value="4涓荤绾�">4涓荤绾�</option>
- <option value="5鍛樼骇">5鍛樼骇</option>
+ <option value="5鐝粍闀跨骇">5鐝粍闀跨骇</option>
</select>
</div>
</div>
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\256\211\347\201\257\351\200\220\347\272\247\345\221\274\345\217\253\350\247\204\345\210\231/OA_AndengFlowRuleBillMain.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\256\211\347\201\257\351\200\220\347\272\247\345\221\274\345\217\253\350\247\204\345\210\231/OA_AndengFlowRuleBillMain.html"
index ee41153..32bf96b 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\256\211\347\201\257\351\200\220\347\272\247\345\221\274\345\217\253\350\247\204\345\210\231/OA_AndengFlowRuleBillMain.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\256\211\347\201\257\351\200\220\347\272\247\345\221\274\345\217\253\350\247\204\345\210\231/OA_AndengFlowRuleBillMain.html"
@@ -568,7 +568,7 @@
, "HDutyName": ""
, "HTimes": ""
, "HRemark": ""
- , "HReceiveType": ""
+ , "HReceiveType": "鐭俊"
, "HSourceInterID": "0"
, "HSourceEntryID": "0"
, "HSourceBillNo": ""
@@ -613,7 +613,7 @@
}
//鑾峰彇鏁版嵁
$("#HErrMsgBackTypeID").val(checkStatus.data[0].HItemID);//宀椾綅id
- $("#HErrMsgBackTypeName").val(checkStatus.data[0].宀椾綅鍚嶇О);//宀椾綅鍚嶇О
+ $("#HErrMsgBackTypeName").val(checkStatus.data[0].寮傚父鍙嶉绫诲瀷鍚嶇О);//宀椾綅鍚嶇О
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210/OA_ErrMsgBackSelfQuery.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210/OA_ErrMsgBackSelfQuery.html"
new file mode 100644
index 0000000..9d77cb9
--- /dev/null
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210/OA_ErrMsgBackSelfQuery.html"
@@ -0,0 +1,446 @@
+锘�<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <title>寮傚父鍙嶉鏌ヨ鍒楄〃</title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
+ <script src="../../../layuiadmin/grwebapp.js"></script>
+ <script src="../../../layuiadmin/HideButton.js"></script>
+ <script src="../../../layuiadmin/soulTable.slim.js"></script>
+
+</head>
+<body>
+ <div class="layui-fluid">
+ <div class="layui-col-md12">
+ <div class="layui-card" style="padding: 1px">
+ <div class="layui-card-body" style="padding: 1px;">
+ <form class="layui-form" action="" lay-filter="component-form-group">
+ <div class="layui-tab layui-tab-card" style="margin-top:20px;">
+ <ul class="layui-tab-title">
+ <li class="layui-this">鎴戞帴鏀剁殑</li>
+ <li>鎴戝彂閫佺殑</li>
+ <li>鎶勯�佹垜鐨�</li>
+ </ul>
+ <div class="layui-tab-content">
+ <div class="layui-tab-item layui-show">
+ <!--鎴戞帴鏀剁殑-->
+ <table class="layui-hide" id="mainTable_receive" lay-filter="mainTable_receive"></table>
+ </div>
+ <div class="layui-tab-item">
+ <!--鎴戝彂閫佺殑-->
+ <table class="layui-hide" id="mainTable_send" lay-filter="mainTable_send"></table>
+ </div>
+ <div class="layui-tab-item">
+ <!--鎶勯�佹垜鐨�-->
+ <table class="layui-hide" id="mainTable_copy" lay-filter="mainTable_copy"></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="btn-XTSign-in" id="btn-XTSign-in"><i class="layui-icon layui-icon-radio"></i>涓嬫帹寮傚父鍙嶉绛惧埌鍗�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-XTReceive" id="btn-XTReceive"><i class="layui-icon layui-icon-radio"></i>涓嬫帹寮傚父鍙嶉澶勭悊鍗�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-View" id="btn-View"><i class="layui-icon layui-icon-radio"></i>鏌ョ湅</button>
+ </div>
+ </script>
+ <script type="text/html" id="toolbarDemo1">
+ <div class="layui-btn-container">
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-XTCheck" id="btn-XTCheck"><i class="layui-icon layui-icon-radio"></i>涓嬫帹寮傚父鍙嶉楠屾敹鍗�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-View1" id="btn-View1"><i class="layui-icon layui-icon-radio"></i>鏌ョ湅</button>
+ </div>
+ </script>
+ <script type="text/html" id="toolbarDemo2">
+ <div class="layui-btn-container">
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-View2" id="btn-View2"><i class="layui-icon layui-icon-radio"></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
+ , util = layui.util
+ , soulTable = layui.soulTable
+ var sWhere = "";
+ var option_receive = ""; //鏈畬鎴�
+ var option_copy = ""; //宸插畬鎴�
+ var option_send = ""; //姝ｅ湪杩涜
+ var ins;
+ //var TableTab = "mainTable_receive"; //鍒濆鍖栭〉闈㈡椂榛樿涓� 鈥滄湭瀹屾垚鈥� 椤电
+ //var cur_title = "鏈畬鎴�"; //褰撳墠閫変腑椤电
+ //#endregion
+
+ //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+ //
+ var HModName = "OA_ErrMsgBackSelfQuery";
+ //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞� 锛堟垜鎺ユ敹鐨勶級
+ var titleData = ["HInterID", "HEntryID", "HDeptID", "HRecDeptID", "HHandleEmpID","HErrMsgBackTypeID"];
+ //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞� 锛堟垜鍙戦�佺殑锛�
+ var titleData = ["HInterID", "HEntryID", "HDeptID", "HRecDeptID", "HHandleEmpID","HErrMsgBackTypeID"];
+ //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞� 锛堟妱閫佹垜鐨勶級
+ var titleData = ["HInterID", "HEntryID", "HDeptID", "HRecDeptID", "HHandleEmpID","HErrMsgBackTypeID"];
+ //鍒濆鍖栫晫闈�
+ set_ClearBill();
+ //#endregion
+
+ //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
+ function set_ClearBill() {
+ //鍒濆鍖栨帴鏀跺垪琛�
+ set_InitGrid_notStart();
+ //鍒濆鍖栧彂閫�
+ set_InitGrid_send();
+ //鍒濆鍖栨妱閫佸垪琛�
+ set_InitGrid_copy();
+ //鏌ヨ
+ get_Display();
+ }
+
+ table.on('toolbar(mainTable_receive)', function (obj) {
+ switch (obj.event) {
+ //涓嬫帹寮傚父鍙嶉绛惧埌鍗�
+ case 'btn-XTSign-in': XTSign();
+ break;
+ //涓嬫帹寮傚父鍙嶉澶勭悊鍗�
+ case 'btn-XTReceive': XTReceive();
+ break;
+ //鏌ョ湅
+ case 'btn-View': View();
+ break;
+
+ };
+ });
+ table.on('toolbar(mainTable_send)', function (obj) {
+ switch (obj.event) {
+ //涓嬫帹寮傚父鍙嶉楠屾敹鍗�
+ case 'btn-XTCheck': XTCheck();
+ break;
+ //鏌ョ湅
+ case 'btn-View1': View();
+ break;
+ };
+ });
+ table.on('toolbar(mainTable_copy)', function (obj) {
+ switch (obj.event) {
+ //鏌ョ湅
+ case 'btn-View2': View();
+ break;
+ };
+ });
+
+
+ //鍒濆鍖栨帴鏀跺垪琛�
+ function set_InitGrid_notStart() {
+ option_receive = {
+ elem: '#mainTable_receive'
+ , toolbar: '#toolbarDemo'
+ , page: true
+ , totalRow: true
+ , height: 300
+ , cellMinWidth: 90
+ , limit: 50
+ , limits: [50, 500, 5000, 20000]
+ , cols: []
+ };
+ //table.render(option);
+ }
+
+ //鍒濆鍖栧彂閫佸垪琛�
+ function set_InitGrid_send() {
+ option_send = {
+ elem: '#mainTable_send'
+ , toolbar: '#toolbarDemo1'
+ , page: false
+ , height: 500
+ , totalRow: true
+ , cellMinWidth: 90
+ , limit: Number.MAX_VALUE//榛樿鏄剧ず鍏ㄩ儴
+ , cols: []
+ };
+ }
+
+ //鍒濆鍖栨妱閫佸垪琛�
+ function set_InitGrid_copy() {
+ option_copy = {
+ elem: '#mainTable_copy'
+ , page: false
+ , height: 500
+ , totalRow: true
+ , cellMinWidth: 90
+ , limit: Number.MAX_VALUE//榛樿鏄剧ず鍏ㄩ儴
+ , cols: []
+ };
+ }
+
+ //#region 鏌ヨ
+ function get_Display(sWhere) {
+ var ajaxLoad = layer.load();
+
+ $.ajax({
+ url: GetWEBURL() + '/Sc_MESTransFerWorkBill/GetSc_MESTransFerWorkBillQuery',
+ type: "GET",
+ async: false,
+ data: { "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.count == 1) {
+
+ var data = [];
+ var col = [];
+ //缁欑┖鐨勬暟缁勮祴鍊�
+ for (var key in data1.list) {
+ data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+ }
+ //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+ col.push({ type: 'checkbox', fixed: 'left' });
+ for (var i = 0; i < data.length; i++) {
+ if ($.inArray(data[i].name, titleData) > -1) {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+ }
+ else {
+ switch (data[i].Type) {
+ //int
+ case 'DateTime':
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
+ break;
+ default:
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+ }
+ }
+ }
+
+ //鎴戞帴鏀剁殑
+ option_receive = {
+ elem: '#mainTable_receive'
+ , toolbar: '#toolbarDemo'
+ , cols: [col]
+ , data: data1.data.h_p_OA_ErrMsgBackSelfQuery
+ , height: 'full-80'
+ , page: true
+ , totalRow: true
+ , limits: [50, 500, 5000, 50000]
+ , limit: 50
+ , cellMinWidth: 90
+ }
+ table.render(option_receive);
+ ins = table.render(option_receive);
+
+ //鎴戝彂閫佺殑
+ option_send = {
+ elem: '#mainTable_send'
+ , toolbar: '#toolbarDemo1'
+ , cols: [col]
+ , data: data1.data.h_p_OA_ErrMsgBackSelfQuery1
+ , height: 'full-80'
+ , page: true
+ , totalRow: true
+ , limits: [50, 500, 5000, 50000]
+ , limit: 50
+ , cellMinWidth: 90
+ }
+ table.render(option_send);
+
+ //鎶勯�佹垜鐨�
+ option_copy = {
+ elem: '#mainTable_copy'
+ , toolbar: '#toolbarDemo2'
+ , cols: [col]
+ , data: data1.data.h_p_OA_ErrMsgBackSelfQuery2
+ , height: 'full-80'
+ , page: true
+ , totalRow: true
+ , limits: [50, 500, 5000, 50000]
+ , limit: 50
+ , cellMinWidth: 90
+ }
+ table.render(option_copy);
+
+
+
+ //鍒锋柊鎸夐挳鏄剧ず
+ var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+ var HBillType = "寮傚父鍙嶉鏌ヨ";
+ Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ // DisPlay_HideColumn();
+
+ layer.close(ajaxLoad);
+ if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+ ColFilter();
+ }
+
+ //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+
+ }
+ //#endregion
+
+ //#region 瀵煎嚭Execel
+ function get_Export() {
+ var data = option_receive.data
+ data.forEach((item) => {
+ // 濡傛灉鏌愪釜瀛楁鐨勫�煎お闀匡紝闇�瑕佸幓闄ゆ崲琛岀
+ if (item.浠诲姟鎻忚堪.length > 0) { // 鍋囪瀛楁鍚嶄负field
+ item.浠诲姟鎻忚堪 = item.浠诲姟鎻忚堪.replace(/[\r\n]+/g, ''); // 灏嗘崲琛岀鏇挎崲涓虹┖瀛楃涓�
+ }
+ });
+ table.exportFile(ins.config.id, data, "xls");
+ }
+ //#endregion
+
+ //涓嬫帹寮傚父鍙嶉澶勭悊鍗�
+ function XTReceive() {
+ var checkStatus = table.checkStatus('mainTable_receive')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var HInterID = data[0].HInterID.toString();
+ layer.open({
+ type: 2
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['100%', '100%']
+ , title: '鏂板寮傚父鍙嶉鎺ユ敹鍗�'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../../鐢熶骇绠＄悊/寮傚父鍙嶉鍗�/OA_ErrMsgBackHandleBillMain.html?OperationType=2&linterid=' + HInterID + '&HEntryID=1&HSouceBillType=' + 4502 + ''
+ , btn: [],
+ end: function (index, layero, that) {
+ //鍒锋柊椤甸潰
+ $("#btnSearch").trigger('click');
+ }
+ })
+ }
+ }
+
+ //涓嬫帹寮傚父鍙嶉绛惧埌鍗�
+ function XTSign() {
+ var checkStatus = table.checkStatus('mainTable_receive')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var HInterID = data[0].HInterID.toString();
+ layer.open({
+ type: 2
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['100%', '100%']
+ , title: '鏂板寮傚父鍙嶉绛惧埌鍗�'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../../鐢熶骇绠＄悊/寮傚父鍙嶉鍗�/OA_ErrMsgBackSignBillMain.html?OperationType=2&linterid=' + HInterID + '&HEntryID=1&HSouceBillType=' + 4502 + ''
+ , btn: [],
+ end: function (index, layero, that) {
+ //鍒锋柊椤甸潰
+ $("#btnSearch").trigger('click');
+ }
+ })
+ }
+ }
+
+ //涓嬫帹寮傚父鍙嶉楠屾敹鍗�
+ function XTCheck() {
+ var checkStatus = table.checkStatus('mainTable_send')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var HInterID = data[0].HInterID.toString();
+ layer.open({
+ type: 2
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['100%', '100%']
+ , title: '鏂板寮傚父鍙嶉楠屾敹鍗�'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../../鐢熶骇绠＄悊/寮傚父鍙嶉鍗�/OA_ErrMsgBackCheckBillMain.html?OperationType=2&linterid=' + HInterID + '&HEntryID=1&HSouceBillType=' + 4502 + ''
+ , btn: [],
+ end: function (index, layero, that) {
+ //鍒锋柊椤甸潰
+ $("#btnSearch").trigger('click');
+ }
+ })
+ }
+ }
+
+
+ //#region 姹囨姤
+ function View() {
+ var activeTab = getActiveTab();
+
+ if (activeTab == "鎴戞帴鏀剁殑") {
+ var checkStatus = table.checkStatus('mainTable_receive')
+ , data = checkStatus.data;
+ } else if (activeTab == "鎴戝彂閫佺殑") {
+ var checkStatus = table.checkStatus('mainTable_send')
+ , data = checkStatus.data;
+ } else if (activeTab == "鎶勯�佹垜鐨�") {
+ var checkStatus = table.checkStatus('mainTable_copy')
+ , data = checkStatus.data;
+ }
+
+ var HInterID = data[0].HInterID;
+ if (data.length == 1) {
+ layer.open({
+ type: 2
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['100%', '100%']
+ , title: '宸ヤ綔浠诲姟-涓嬫帹'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../../鐢熶骇绠＄悊/寮傚父鍙嶉鍗�/Sc_Add_MESExecptFeedBackBillList.html?OperationType=5&linterid=' + HInterID + '&HEntryID=1&HSouceBillType=' + 4502 + ''
+ , btn: ['纭畾'],
+ // 鎸夐挳1 鐨勫洖璋�
+ btn1: function (index, layero, that) {
+ //鍒锋柊椤甸潰
+ $("#btnSearch").trigger('click');
+ }
+ })
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹笅鎺紒');
+ }
+ }
+ //#endregion
+
+
+ // 鑾峰彇鏍囩
+ function getActiveTab() {
+ var tabs = document.getElementsByClassName("layui-tab-title")[0].getElementsByTagName("li");
+ var activeTab;
+ for (var i = 0; i < tabs.length; i++) {
+ if (tabs[i].classList.contains("layui-this")) {
+ activeTab = tabs[i].innerText;
+ break;
+ }
+ }
+ return activeTab;
+
+ }
+ //浠ヤ笂鏄痩ayui妯″潡
+ });
+ </script>
+</body>
+</html>
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html"
index d95fdb1..6c1215a 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html"
@@ -263,26 +263,27 @@
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_SaveScheme" id="set_SaveScheme"><i class="layui-icon layui-icon-template"></i>淇濆瓨鏂规</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_ReadScheme" id="set_ReadScheme"><i class="layui-icon layui-icon-set"></i>璇诲彇鏂规</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_FirstPieceCheck" id="set_FirstPieceCheck"><i class="layui-icon layui-icon-form"></i>棣栨</button>
- <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_ProcessCheck" id="set_ProcessCheck"><i class="layui-icon layui-icon-form"></i>宸ュ簭妫�</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_ProcessCheck" id="set_ProcessCheck"><i class="layui-icon layui-icon-form"></i>宸ュ簭妫�</button>
</div>
</script>
<script type="text/html" id="toolbarDemo2">
<div class="layui-btn-container">
<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_view"><i class="layui-icon layui-icon-tips"></i>棰勮</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_print"><i class="layui-icon layui-icon-print"></i>鎵撳嵃</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="set_StationOut"><i class="layui-icon layui-icon-form"></i>宸ュ簭鍑虹珯姹囨姤鍗�</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="get_StationIn"><i class="layui-icon layui-icon-form"></i>宸ュ簭杩涚珯鎺ユ敹鍗�</button>-->
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_view"><i class="layui-icon layui-icon-tips"></i>棰勮</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_print"><i class="layui-icon layui-icon-print"></i>鎵撳嵃</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_StationOut"><i class="layui-icon layui-icon-form"></i>宸ュ簭鍑虹珯姹囨姤鍗�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="get_StationIn"><i class="layui-icon layui-icon-form"></i>宸ュ簭杩涚珯鎺ユ敹鍗�</button>-->
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="get_HideColumn2" lay-event="get_HideColumn2"><i class="layui-icon layui-icon-file-b"></i>鏄庣粏鍒楄缃�</button>
<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Fg"><i class="layui-icon layui-icon-file-b"></i>宸ュ簭杩斿伐</button>-->
<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Pg"><i class="layui-icon layui-icon-file-b"></i>宸ュ簭娲惧伐</button>-->
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="get_Fg" lay-event="get_Fg"><i class="layui-icon layui-icon-file-b"></i>杩斿伐鐢宠</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="get_Jl" lay-event="get_Jl"><i class="layui-icon layui-icon-file-b"></i>杩斿伐璁板綍</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="get_zlzk" lay-event="get_zlzk"><i class="layui-icon layui-icon-file-b"></i>瀛愭祦杞崱</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_ProcessExchange" id="set_ProcessExchange"><i class="layui-icon layui-icon-form"></i>涓嬫帹鐢熶骇璐ㄩ噺姹囨姤鍗�</button>
</div>
</script>
<script type="text/html" id="toolbarDemo3">
@@ -476,7 +477,7 @@
break;
//宸ュ簭妫�
case 'set_ProcessCheck': set_ProcessCheck();
- break;
+ break;
};
});
@@ -532,9 +533,9 @@
//瀛愭祦杞崱
case 'get_zlzk': get_zlzk();
break
- //宸ュ簭娲惧伐鍗�
- //case 'get_Pg': get_Pg();
- // break
+ //涓嬫帹鐢熶骇璐ㄩ噺姹囨姤鍗�
+ case 'set_ProcessExchange': set_ProcessExchange();
+ break;
};
});
table.on('toolbar(mainTable3)', function (obj) {
@@ -2738,6 +2739,36 @@
}
}
+ //鐢熶骇璐ㄩ噺姹囨姤鍗�
+ function set_ProcessExchange() {
+ var checkStatus = table.checkStatus('mainTable2')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var linterid = data[0].hmainid;
+ var HEntryID = data[0].HEntryID;
+ var HProcID = data[0].HProcID;
+ var OperationType = 5;
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '鐢熶骇璐ㄩ噺姹囨姤鍗�-缂栬緫'
+ , shade: 0.6
+ , maxmin: false
+ , anim: 0
+ , content: ['../../鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/涓嶈壇閲囬泦/Sc_QualityReportStepBill_New.html?OperationType=' + OperationType + '&linterid=' + linterid + '&HEntry=0&HProcNo=' + HProcID +'&HEntryID=' + HEntryID + '', 'yes']
+ , resize: false
+ , cancel: function () {
+ btnIs();
+ }
+ , end: function () {
+ get_FastQuery();
+ }
+ })
+ } else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+ }
+ }
+
//鍒楁槑鏄剧ず涓嬫媺妗�
function ColFilter() {
var Organization = '<option value="0" selected="selected" ></option>';
--
Gitblit v1.9.1