From d3e287b7a9796bea00381fe7170f562083bd24c5 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期三, 30 十月 2024 09:52:19 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/质量管理/巡检记录单/QC_Add_Edit_PatrolProcCheckOtherill.html | 6
WebTM/views/质量管理/质量报表/QC_InspectionFormReport.html | 12
WebTM/views/质量管理/质量报表/QC_PerformanceScrapLedger.html | 18
WebTM/views/质量管理/质量报表/QC_MoistureContentDataLedger.html | 12
WebTM/views/计划管理/工艺路线/Gy_RoutingBillCheckQuery.html | 11
WebTM/views/工资管理/工资结算单(个人)/Pay_SingleBalBillList.html | 25 -
WebTM/views/质量管理/检验方案单/QC_CheckProjectList.html | 13
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBillList.html | 170 +++++++-----
WebTM/views/IpadIndex.html | 4
WebTM/views/生产管理/异常反馈单/Sc_Add_MESExecptFeedBackBillList.html | 101 ++++++
WebTM/views/质量管理/质量报表/QC_ErrManagerLedgerReport_Issue.html | 12
WebTM/views/质量管理/质量报表/QC_ErrManagerLedgerReport_Source.html | 15 +
WebTM/views/质量管理/质量报表/QC_QualityStatisticsDailyReport.html | 13
WebTM/views/质量管理/工序检验单/QC_ProcessCheckBill.html | 8
WebTM/views/质量管理/首件检验单/QC_Add_Edit_FirstPieceCheckBill.html | 16
WebTM/views/工资管理/岗位技能清单/HR_PostSkillBillList.html | 25 +
WebTM/WebTM.csproj.user | 26 +
WebTM/views/工资管理/工资结算单(集体)/Pay_GroupBalBillList.html | 25 -
WebTM/views/质量管理/质量报表/QC_BadProductsReport.html | 14
WebTM/views/车间管理/启动点检单/Gy_WorkBeginDotCheckListBillList.html | 28 +
WebTM/views/工资管理/岗位技能清单/HR_PostSkillBill.html | 29 +
WebTM/views/质量管理/车间自检单/QC_Add_Edit_WorkSelfCheckBill.html | 6
WebTM/views/质量管理/质量报表/QC_ErrManagerLedgerReport_SourceOfTheProblem.html | 13
WebTM/views/质量管理/质量报表/QC_ErrManagerLedgerReport_EquipTop3Issue.html | 12
WebTM/views/计划管理/工艺路线/Gy_RoutingBillToInvalidatedList.html | 124 ++------
WebTM/views/质量管理/质量报表/QC_RegistrationForTestingReport.html | 18
WebTM/layuiadmin/Scripts/webConfig.js | 4
WebTM/views/质量管理/质量报表/QC_ErrManagerLedgerReport.html | 12
WebTM/views/车间管理/启动点检单/Gy_WorkBeginDotCheckListBill.html | 15 +
29 files changed, 516 insertions(+), 271 deletions(-)
diff --git a/WebTM/WebTM.csproj.user b/WebTM/WebTM.csproj.user
index 502622a..005e8c8 100644
--- a/WebTM/WebTM.csproj.user
+++ b/WebTM/WebTM.csproj.user
@@ -12,5 +12,29 @@
<IISExpressUseClassicPipelineMode />
<UseGlobalApplicationHostFile />
</PropertyGroup>
- <ProjectExtensions />
+ <ProjectExtensions>
+ <VisualStudio>
+ <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
+ <WebProjectProperties>
+ <StartPageUrl>
+ </StartPageUrl>
+ <StartAction>CurrentPage</StartAction>
+ <AspNetDebugging>True</AspNetDebugging>
+ <SilverlightDebugging>False</SilverlightDebugging>
+ <NativeDebugging>False</NativeDebugging>
+ <SQLDebugging>False</SQLDebugging>
+ <ExternalProgram>
+ </ExternalProgram>
+ <StartExternalURL>
+ </StartExternalURL>
+ <StartCmdLineArguments>
+ </StartCmdLineArguments>
+ <StartWorkingDirectory>
+ </StartWorkingDirectory>
+ <EnableENC>True</EnableENC>
+ <AlwaysStartWebServerOnDebug>False</AlwaysStartWebServerOnDebug>
+ </WebProjectProperties>
+ </FlavorProperties>
+ </VisualStudio>
+ </ProjectExtensions>
</Project>
\ No newline at end of file
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index 70c2106..21527c9 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -7,8 +7,8 @@
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄤ箰鏈湴閰嶇疆
/*var WEBURL = "http://localhost:8082/API/";*/ //鏉滆春鏈湴閰嶇疆
/*var WEBURL = "http://localhost/API/";*/ //娼樻禉娓告湰鍦伴厤缃�
- //var WEBURL = "http://localhost:8082/API/"; //寮犵憺骞挎湰鍦伴厤缃�
- var WEBURL = "http://localhost:81/API/" //缈佹稕娑涙湰鍦伴厤缃�
+ var WEBURL = "http://localhost:8082/API/"; //寮犵憺骞挎湰鍦伴厤缃�
+ /* var WEBURL = "http://localhost:81/API/" //缈佹稕娑涙湰鍦伴厤缃�*/
//var WEBURL = "http://47.96.97.237/API/"; //鏅轰簯鏈嶅姟鍣�
/*var WEBURL = "http://localhost:8082/LuBaoAPI/"; */ //浣欐�濇澃鏈湴閰嶇疆
//var WEBURL = "http://localhost:8088/ARAPI/"; //浣欐�濇澃鏈湴閰嶇疆(瀹夌憺)
diff --git a/WebTM/views/IpadIndex.html b/WebTM/views/IpadIndex.html
index 753ae37..a996612 100644
--- a/WebTM/views/IpadIndex.html
+++ b/WebTM/views/IpadIndex.html
@@ -958,7 +958,7 @@
, shade: 0.6
, maxmin: false
, anim: 0
- , content: ['璐ㄩ噺绠＄悊/棣栦欢妫�楠屽崟/QC_Add_Edit_FirstPieceCheckBill.html?OperationType=2&linterid=' + HProcExchInterID + '&HSouceBillType=' + HBillType + '&HICMOEntryID=' + HICMOEntryID, 'yes']
+ , content: ['璐ㄩ噺绠＄悊/棣栦欢妫�楠屽崟/QC_Add_Edit_FirstPieceCheckBill.html?OperationType=2&linterid=' + HProcExchInterID + '&HSouceBillType=' + HBillType + '&HICMOEntryID=' + HICMOEntryID + '&HSourceEntryID=' + HSourceEntryID+'', 'yes']
, resize: false
, cancel: function () {
}
@@ -981,7 +981,7 @@
, shade: 0.6
, maxmin: false
, anim: 0
- , content: ['璐ㄩ噺绠＄悊/宸℃璁板綍鍗�/QC_Add_Edit_PatrolProcCheckOtherill.html?OperationType=2&linterid=' + HProcExchInterID + '&HSouceBillType=' + HBillType + '&HICMOEntryID=' + HICMOEntryID, 'yes']
+ , content: ['璐ㄩ噺绠＄悊/宸℃璁板綍鍗�/QC_Add_Edit_PatrolProcCheckOtherill.html?OperationType=2&linterid=' + HProcExchInterID + '&HSouceBillType=' + HBillType + '&HICMOEntryID=' + HICMOEntryID+ '&HSourceEntryID=' + HSourceEntryID+'', 'yes']
, resize: false
, cancel: function () {
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\262\227\344\275\215\346\212\200\350\203\275\346\270\205\345\215\225/HR_PostSkillBill.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\262\227\344\275\215\346\212\200\350\203\275\346\270\205\345\215\225/HR_PostSkillBill.html"
index bf99c8c..34748c4 100644
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\262\227\344\275\215\346\212\200\350\203\275\346\270\205\345\215\225/HR_PostSkillBill.html"
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\262\227\344\275\215\346\212\200\350\203\275\346\270\205\345\215\225/HR_PostSkillBill.html"
@@ -315,25 +315,32 @@
//#region 鍒ゆ柇骞惰缃搷浣滅被鍨嬨�侀〉闈㈠垵濮嬪寲
if (OperationType == null || OperationType == 1) { //鏂板
- ////绂佺敤缁勭粐閫夐」
- //$("#HOrgID").attr("disabled", true);
- OperationType = 1;
+ OperationType = 1;
//鍒濆鍖栭」鐩樁娈佃〃
get_InitGrid();
-
//鐢熸垚骞惰缃富琛ㄧ殑鍐呯爜鍜屽崟鎹彿
createBillNo();
-
//鍒濆鍖栧埗鍗曚汉鍜屽埗鍗曟椂闂�
$("#HMaker").val(sessionStorage["HUserName"]);
$("#HMakerDate").val(Format(new Date(), "yyyy-MM-dd"));
-
//鍒濆鍖栨棩鏈�
$("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
-
-
+ }
+ else if (OperationType == 2) {//濡傛灉淇敼鍒欒蛋涓嬮潰 new //缂栬緫
+
+ //鍒濆鍖栭」鐩樁娈佃〃
+ get_InitGrid();
+ RoadBillMain(linterid);
+ //鐢熸垚骞惰缃富琛ㄧ殑鍐呯爜鍜屽崟鎹彿
+ createBillNo();
+ //鍒濆鍖栧埗鍗曚汉鍜屽埗鍗曟椂闂�
+ $("#HMaker").val(sessionStorage["HUserName"]);
+ $("#HMakerDate").val(Format(new Date(), "yyyy-MM-dd"));
+ //鍒濆鍖栨棩鏈�
+ $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
+ OperationType = 1;
}
else if (OperationType == 3) {//濡傛灉淇敼鍒欒蛋涓嬮潰 new //缂栬緫
////绂佺敤缁勭粐閫夐」
@@ -824,9 +831,9 @@
//涓昏〃 璧嬪��
form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
- "HInterID": data[0]["hmainid"]
- , "HBillNo": data[0]["鍗曟嵁鍙�"]
- , "HDate": formatDate(data[0]["鏃ユ湡"])
+ "HInterID": OperationType == 2 ? "" :data[0]["hmainid"]
+ , "HBillNo": OperationType == 2 ? "" :data[0]["鍗曟嵁鍙�"]
+ , "HDate": OperationType == 2 ? "" :formatDate(data[0]["鏃ユ湡"])
, "HDeptID": data[0]["HDeptID"]
, "HDeptName": data[0]["閮ㄩ棬鍚嶇О"]
, "HPostID": data[0]["HPostID"]
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\262\227\344\275\215\346\212\200\350\203\275\346\270\205\345\215\225/HR_PostSkillBillList.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\262\227\344\275\215\346\212\200\350\203\275\346\270\205\345\215\225/HR_PostSkillBillList.html"
index 3d9607e..795282d 100644
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\262\227\344\275\215\346\212\200\350\203\275\346\270\205\345\215\225/HR_PostSkillBillList.html"
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\262\227\344\275\215\346\212\200\350\203\275\346\270\205\345\215\225/HR_PostSkillBillList.html"
@@ -146,6 +146,7 @@
<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_Copy" id="set_Copy"><i class="layui-icon layui-icon-form"></i>澶嶅埗</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
@@ -225,6 +226,9 @@
break;
//缂栬緫
case 'set_ShowBill': set_ShowBill();
+ break;
+ //澶嶅埗
+ case 'set_Copy': set_Copy();
break;
//鍒犻櫎
case 'set_DeleteBill': set_DeleteBill();
@@ -574,6 +578,27 @@
}
//#endregion
+ //澶嶅埗
+ function set_Copy() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var linterid = data[0].hmainid.toString();
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '鏂板' + HPageTitle
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../../宸ヨ祫绠＄悊/宀椾綅鎶�鑳芥竻鍗�/HR_PostSkillBill.html?OperationType=2&linterid=' + linterid + '&HSouceBillType='
+ , end: function () {
+ //鍒锋柊椤甸潰,
+ location.reload();
+ }
+ })
+ } else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+ }
+ }
//#region 鍒犻櫎
function set_DeleteBill() {
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\344\270\252\344\272\272\051/Pay_SingleBalBillList.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\344\270\252\344\272\272\051/Pay_SingleBalBillList.html"
index f0a8832..8628113 100644
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\344\270\252\344\272\272\051/Pay_SingleBalBillList.html"
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\344\270\252\344\272\272\051/Pay_SingleBalBillList.html"
@@ -1135,29 +1135,8 @@
columns = col;
option.cols = [col];
- //option.data = data1.data;
- //璁剧疆鍒楄〃鍚屼竴涓崟鎹彧鏈夌涓�鏉℃暟鎹樉绀轰富琛ㄤ俊鎭紝鍏跺畠璁板綍鍙樉绀哄瓙琛ㄤ俊鎭�
- //鑾峰彇瀛愯〃鍒楁暟鎹�
- var colList = [];
- for (var i = 0; i < option.cols[0].length; i++) {
- colList.push(option.cols[0][i].field);
- }
- //璁剧疆鏁版嵁
- var result = data1.data;
- var temp = "";
- for (var i = 0; i < result.length; i++) {
- if (temp != result[i]["鍗曟嵁鍙�"]) {
- temp = result[i]["鍗曟嵁鍙�"];
- } else {
- var initIndex = $.inArray("鍗曟嵁鍙�", colList);
- var lastIndex = $.inArray("hsubid", colList);
- for (var j = initIndex; j < lastIndex; j++) {
- var fieldName = colList[j];
- result[i][fieldName] = "";
- }
- }
- }
- option.data = result;
+ option.data = data1.data;
+
option.totalRow = true;
laypage.render(optionPage);
//鍒锋柊琛ㄦ牸鏁版嵁
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\351\233\206\344\275\223\051/Pay_GroupBalBillList.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\351\233\206\344\275\223\051/Pay_GroupBalBillList.html"
index bd8b0e9..7ac8c49 100644
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\351\233\206\344\275\223\051/Pay_GroupBalBillList.html"
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\351\233\206\344\275\223\051/Pay_GroupBalBillList.html"
@@ -1150,29 +1150,8 @@
columns = col;
option.cols = [col];
- //option.data = data1.data;
- //璁剧疆鍒楄〃鍚屼竴涓崟鎹彧鏈夌涓�鏉℃暟鎹樉绀轰富琛ㄤ俊鎭紝鍏跺畠璁板綍鍙樉绀哄瓙琛ㄤ俊鎭�
- //鑾峰彇瀛愯〃鍒楁暟鎹�
- var colList = [];
- for (var i = 0; i < option.cols[0].length; i++) {
- colList.push(option.cols[0][i].field);
- }
- //璁剧疆鏁版嵁
- var result = data1.data;
- var temp = "";
- for (var i = 0; i < result.length; i++) {
- if (temp != result[i]["鍗曟嵁鍙�"]) {
- temp = result[i]["鍗曟嵁鍙�"];
- } else {
- var initIndex = $.inArray("鍗曟嵁鍙�", colList);
- var lastIndex = $.inArray("hsubid", colList);
- for (var j = initIndex; j < lastIndex; j++) {
- var fieldName = colList[j];
- result[i][fieldName] = "";
- }
- }
- }
- option.data = result;
+ option.data = data1.data;
+
option.totalRow = true;
laypage.render(optionPage);
//鍒锋柊琛ㄦ牸鏁版嵁
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 2d5c516..909e5f6 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"
@@ -312,8 +312,11 @@
<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;">
+ <input type="text" name="HHandleEmpName" id="HHandleEmpName" class="layui-input" value="" style="float:left;width:150px;" disabled>
+ <input type="hidden" name="HHandleEmpID" id="HHandleEmpID" class="layui-input" value="0" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HHandleEmpList" id="HHandleEmpList" 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">
@@ -728,8 +731,56 @@
$("#HHandleEmpName").val("瀛欐枃闈�"); //鎸囨淳澶勭悊浜�
$("#HHandleEmpID").val(162622); //鎸囨淳澶勭悊浜�
} else if ($("#HErrMsgBackTypeName").val() == "鐜鍘熷洜") {
- $("#HHandleEmpName").val("瀛欐枃闈�"); //鎸囨淳澶勭悊浜�
- $("#HHandleEmpID").val(162622); //鎸囨淳澶勭悊浜�
+ //$("#HHandleEmpName").val("瀛欐枃闈�"); //鎸囨淳澶勭悊浜�
+ //$("#HHandleEmpID").val(162622); //鎸囨淳澶勭悊浜�
+ }
+ }
+ else if (sessionStorage["HDept"] == "鐢熶骇閮�1-閾佽姱") {
+ if ($("#HErrMsgBackTypeName").val() == "浜哄憳鍘熷洜") {
+ $("#HHandleEmpName").val("绋嬪竼"); //鎸囨淳澶勭悊浜�
+ $("#HHandleEmpID").val(161720); //鎸囨淳澶勭悊浜�
+ } else if ($("#HErrMsgBackTypeName").val() == "璁惧鍘熷洜") {
+ $("#HHandleEmpName").val("寰愬缓娲�"); //鎸囨淳澶勭悊浜�
+ $("#HHandleEmpID").val(162576); //鎸囨淳澶勭悊浜�
+ } else if ($("#HErrMsgBackTypeName").val() == "鏉愭枡鍘熷洜") {
+ $("#HHandleEmpName").val("绋嬪竼"); //鎸囨淳澶勭悊浜�
+ $("#HHandleEmpID").val(161720); //鎸囨淳澶勭悊浜�
+ } else if ($("#HErrMsgBackTypeName").val() == "宸ヨ壓鍘熷洜") {
+ $("#HHandleEmpName").val("鐜嬪己"); //鎸囨淳澶勭悊浜�
+ $("#HHandleEmpID").val(163378); //鎸囨淳澶勭悊浜�
+ } else if ($("#HErrMsgBackTypeName").val() == "妯″叿鍘熷洜") {
+ //$("#HHandleEmpName").val("鍚存枌"); //鎸囨淳澶勭悊浜�
+ //$("#HHandleEmpID").val(162686); //鎸囨淳澶勭悊浜�
+ } else if ($("#HErrMsgBackTypeName").val() == "娴嬭瘯鍘熷洜") {
+ $("#HHandleEmpName").val("寮犲缓楣�"); //鎸囨淳澶勭悊浜�
+ $("#HHandleEmpID").val(162525); //鎸囨淳澶勭悊浜�
+ } else if ($("#HErrMsgBackTypeName").val() == "鐜鍘熷洜") {
+ $("#HHandleEmpName").val("鍚曞弻妫�"); //鎸囨淳澶勭悊浜�
+ $("#HHandleEmpID").val(162526); //鎸囨淳澶勭悊浜�
+ }
+ }
+ else if (sessionStorage["HDept"] == "鐢熶骇閮�1-缁勮") {
+ if ($("#HErrMsgBackTypeName").val() == "浜哄憳鍘熷洜") {
+ $("#HHandleEmpName").val("绋嬪竼"); //鎸囨淳澶勭悊浜�
+ $("#HHandleEmpID").val(161720); //鎸囨淳澶勭悊浜�
+ } else if ($("#HErrMsgBackTypeName").val() == "璁惧鍘熷洜") {
+ $("#HHandleEmpName").val("鏇句笢閼�"); //鎸囨淳澶勭悊浜�
+ $("#HHandleEmpID").val(162573); //鎸囨淳澶勭悊浜�
+ } else if ($("#HErrMsgBackTypeName").val() == "鏉愭枡鍘熷洜") {
+ $("#HHandleEmpName").val("绋嬪竼"); //鎸囨淳澶勭悊浜�
+ $("#HHandleEmpID").val(161720); //鎸囨淳澶勭悊浜�
+ } else if ($("#HErrMsgBackTypeName").val() == "宸ヨ壓鍘熷洜") {
+ $("#HHandleEmpName").val("鏌瘲鏂�"); //鎸囨淳澶勭悊浜�
+ $("#HHandleEmpID").val(162661); //鎸囨淳澶勭悊浜�
+ } else if ($("#HErrMsgBackTypeName").val() == "妯″叿鍘熷洜") {
+ //$("#HHandleEmpName").val("鍚存枌"); //鎸囨淳澶勭悊浜�
+ //$("#HHandleEmpID").val(162686); //鎸囨淳澶勭悊浜�
+ } else if ($("#HErrMsgBackTypeName").val() == "娴嬭瘯鍘熷洜") {
+ $("#HHandleEmpName").val("鍒橀緳椋�"); //鎸囨淳澶勭悊浜�
+ $("#HHandleEmpID").val(163180); //鎸囨淳澶勭悊浜�
+ } else if ($("#HErrMsgBackTypeName").val() == "鐜鍘熷洜") {
+ $("#HHandleEmpName").val("鍚曞弻妫�"); //鎸囨淳澶勭悊浜�
+ $("#HHandleEmpID").val(162526); //鎸囨淳澶勭悊浜�
}
}
}
@@ -751,6 +802,7 @@
EquipNumber = LoadData[0].璁惧缂栫爜; //浜у搧鍚嶇О
}
else {
+ EquipNumber = "";
layer.alert(data.Message, { icon: 5 });
}
@@ -1085,6 +1137,44 @@
});
});
+ //鎸囨淳澶勭悊浜哄脊绐�
+ form.on('submit(HHandleEmpList)', function () {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '鍙戦�佷汉鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ 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('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HHandleEmpID").val(checkStatus.data[0].HItemID);
+ $("#HHandleEmpName").val(checkStatus.data[0].鑱屽憳鍚嶇О);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ $("#HDescription").val(generateString(Datetime, Person, HSourceName, HICMOBillNo, HType, EquipNumber));
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ });
//鎺ユ敹閮ㄩ棬
form.on('submit(HRecDeptList)', function () {
@@ -1245,6 +1335,9 @@
if (DeptName == "鐢熶骇閮�3") {
$("#HQEMan").val(162622);
$("#HQEManName").val("瀛欐枃闈�");
+ } else{
+ $("#HQEMan").val(162525);
+ $("#HQEManName").val("寮犲缓楣�");
}
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
diff --git "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillCheckQuery.html" "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillCheckQuery.html"
index b5ba12c..6743298 100644
--- "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillCheckQuery.html"
+++ "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillCheckQuery.html"
@@ -883,13 +883,14 @@
function set_CheckBill_Flow(num, tableName) {
var checkStatus = table.checkStatus(tableName)
, data = checkStatus.data;
- if (checkStatus.data.length === 1) {
- var InterID = data[0].hmainid.toString();
+ if (checkStatus.data.length != 0) {
+ var uniqueIds = [...new Set(data.map(obj => obj.hmainid))];//灏嗗璞℃暟缁刬d鎻愬彇鍘婚噸
+ var queryString = uniqueIds.join(",");//灏唅ds鍙樻垚鏁扮粍
//閫昏緫瀹℃牳鏂规硶
$.ajax({
type: "GET",
- url: GetWEBURL() + "/Gy_Routing/AuditFlow", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- data: { "HInterID": InterID, "IsAudit": num, "CurUserName": sessionStorage["HUserName"], "CurUserID": sessionStorage["Czybm"] },
+ url: GetWEBURL() + "/Gy_Routing/CheckAllFlow", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterIDS": queryString, "IsAudit": num, "CurUserName": sessionStorage["HUserName"], "CurUserID": sessionStorage["Czybm"] },
success: function (result) {
if (result.count == 1) {
layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
@@ -916,7 +917,7 @@
});
}
else {
- layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+ layer.msg('璇烽�夋嫨鑷冲皯涓�琛屾暟鎹鏍革紒');
}
}
//#endregion
diff --git "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillToInvalidatedList.html" "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillToInvalidatedList.html"
index b11de16..842e2b1 100644
--- "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillToInvalidatedList.html"
+++ "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillToInvalidatedList.html"
@@ -46,21 +46,20 @@
</button>
</div>
</div>
- <div class="layui-row" style="margin-top:10px;margin-left:5%;">
- <!--鍏朵粬鏉′欢-->
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 76px;">鐗╂枡鍚嶇О</label>
- <div class="layui-input-block" style="margin-left: 107px;">
- <input type="text" class="layui-input" name="HMaterName" id="HMaterName">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">瑙勬牸鍨嬪彿</label>
- <div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HModel" id="HModel">
- </div>
+ <!--鍏朵粬鏉′欢-->
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 76px;">鐗╂枡鍚嶇О</label>
+ <div class="layui-input-block" style="margin-left: 107px;">
+ <input type="text" class="layui-input" name="HMaterName" id="HMaterName">
</div>
</div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">瑙勬牸鍨嬪彿</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HModel" id="HModel">
+ </div>
+ </div>
+
<div class="layui-row" style="margin-top:5px;margin-left:82px;margin-bottom:5px;">
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">鐢熶骇璁㈠崟缁勭粐</label>
@@ -168,13 +167,13 @@
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container">
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew" id="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNewSub" id="set_AddNewSub"><i class="layui-icon layui-icon-file-b"></i>鏂板瀛愯矾绾�</button>
+ <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNewSub" id="set_AddNewSub"><i class="layui-icon layui-icon-file-b"></i>鏂板瀛愯矾绾�</button>-->
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill" id="set_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="set_Copy" id="set_Copy"><i class="layui-icon layui-icon-form"></i>澶嶅埗</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill" id="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+ <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="set_Copy" id="set_Copy"><i class="layui-icon layui-icon-form"></i>澶嶅埗</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill" id="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>-->
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh" id="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" id="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="set_CheckBill" id="CheckBill"><i class="layui-icon layui-icon-form"></i>瀹℃牳</button>
+ <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="set_CheckBill" id="CheckBill"><i class="layui-icon layui-icon-form"></i>瀹℃牳</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_AbandonCheck" id="AbandonCheck"><i class="layui-icon layui-icon-form"></i>鍙嶅鏍�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_defaultRoute" id="set_defaultRoute"><i class="layui-icon layui-icon-form"></i>鍚敤榛樿</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_closeOtherRoute" id="set_closeOtherRoute"><i class="layui-icon layui-icon-form"></i>绂佺敤鍏跺畠</button>
@@ -185,14 +184,14 @@
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_RejectCheck_Flow" id="RejectCheck_Flow"><i class="layui-icon layui-icon-form"></i>椹冲洖</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_CloseBill" id="set_CloseBill"><i class="layui-icon layui-icon-form"></i>鍏抽棴</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_CancelCloseBill" id="set_CancelCloseBill"><i class="layui-icon layui-icon-form"></i>鍙嶅叧闂�</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-ProcPriceRequestBills" id="btn-ProcPriceRequestBills"><i class="layui-icon layui-icon-delete"></i>澶氳涓嬫帹(瀹氶鐢宠鍗�)</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-ProcPriceRequestBills" id="btn-ProcPriceRequestBills"><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="btn-audit"><i class="layui-icon layui-icon-repeat"></i>瀹℃牳</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Faudit"><i class="layui-icon layui-icon-refresh"></i>鍙嶅鏍�</button>-->
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn" id="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_export" id="get_export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideButton" id="set_HideButton"><i class="layui-icon layui-icon-form"></i>鎸夐挳璁剧疆</button>
+ <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideButton" id="set_HideButton"><i class="layui-icon layui-icon-form"></i>鎸夐挳璁剧疆</button>-->
</div>
</script>
</form>
@@ -223,7 +222,7 @@
var option = [];
var HBillType = 3301;
var ins; //鐢ㄤ簬瀵煎嚭excel
- var HModName = "Gy_RoutingBillList";
+ var HModName = "Gy_RoutingBillToInvalidatedList";
var titleData = [];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
//鑾峰彇鍙傛暟
function getUrlVars() {
@@ -395,66 +394,18 @@
option = {
elem: '#mainTable'
, toolbar: '#toolbarDemo'
- , height: 'full-150'
- , page: false
+ , cols: [[]]
+ , data: [[]]
+ , height: 800
+ , page: true
+ , totalRow: true
+ , cellMinWidth: 90
, limit: 50
+ , limits: [50, 500, 5000, 20000]
, done: function (res, curr, count) {
soulTable.render(this);
}
- , cols: [[
- { type: 'checkbox', fixed: 'left' }
- /* { field: 'hmainid', title: 'hmainid', width: 110 }*/
- , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', sort: true, width: 165 }
- , { field: '宸ヨ壓鍚嶇О', title: '宸ヨ壓鍚嶇О', width: 170, sort: true }
- , { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 160, sort: true }
- , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 160, sort: true }
- , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 160, sort: true }
- , { field: '璁￠噺鍗曚綅浠ｇ爜', title: '璁￠噺鍗曚綅浠ｇ爜', width: 115, sort: true }
- , { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅', sort: true }
- , { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞', sort: true }
- , { field: '宸ュ簭鍙�', title: '宸ュ簭鍙�', sort: true }
- , { field: '宸ュ簭浠ｇ爜', title: '宸ュ簭浠ｇ爜', sort: true }
- , { field: '宸ュ簭', title: '宸ュ簭', sort: true }
- , { field: '宸ヤ綔涓績浠ｇ爜', title: '宸ヤ綔涓績浠ｇ爜', width: 115, sort: true }
- , { field: '宸ヤ綔涓績鍚嶇О', title: '宸ヤ綔涓績鍚嶇О', width: 115, sort: true }
- , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', sort: true }
- , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 195, sort: true }
- , { field: '瀹℃牳浜�', title: '瀹℃牳浜�', sort: true }
- , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', width: 180, sort: true }
- , { field: '淇敼浜�', title: '淇敼浜�', sort: true }
- , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', width: 180, sort: true }
- , { field: '榛樿宸ヨ壓', title: '榛樿宸ヨ壓', sort: true }
- //, { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷' }
- ////, { field: 'hmaterid', title: 'hmaterid', width: 165 }
- //, { field: '缁勭粐', title: '缁勭粐' }
- ////, { field: 'hsubid', title: 'hsubid', width: 80 }
- //, { field: '濮斿鏍囪', title: '濮斿鏍囪' }
- ////, { field: 'hprocid', title: 'hprocid', width: 105 }
- ////, { field: 'HSupID', title: 'HSupID', width: 105 }
- //, { field: '渚涘簲鍟嗕唬鐮�', title: '渚涘簲鍟嗕唬鐮�' }
- //, { field: '渚涘簲鍟�', title: '渚涘簲鍟�' }
- ////, { field: 'HCenterID', title: 'HCenterID', width: 105 }
- //, { field: '鏃堕棿鍗曚綅', title: '鏃堕棿鍗曚綅' }
- //, { field: '杩愯鏃堕棿', title: '杩愯鏃堕棿' }
- //, { field: '鍔犲伐鏁伴噺', title: '鍔犲伐鏁伴噺' }
- //, { field: '鍑嗗鏃堕棿', title: '鍑嗗鏃堕棿' }
- //, { field: '鎺掗槦鏃堕棿', title: '鎺掗槦鏃堕棿' }
- //, { field: '杞Щ鏃堕棿', title: '杞Щ鏃堕棿' }
- //, { field: '鑹巼', title: '鑹巼' }
- //, { field: '绱鑹巼', title: '绱鑹巼' }
- //, { field: '琛ㄤ綋澶囨敞', title: '琛ㄤ綋澶囨敞' }
- //, { field: '浣滃簾浜�', title: '浣滃簾浜�' }
- //, { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡' }
- ////, { field: 'HDayWorkQty', title: 'HDayWorkQty', width: 105 }
- ////, { field: 'HGroupID', title: 'HGroupID', width: 105 }
- ////, { field: 'HWorkerID', title: 'HWorkerID', width: 105 }
- ////, { field: 'HSourceID', title: 'HSourceID', width: 105 }
- //, { field: '鍔犲伐鍗曚环', title: '鍔犲伐鍗曚环' }
- ////, { field: 'HNextProcFlag', title: 'HNextProcFlag', width: 105 }
- //, { field: '涓嬮亾娴佽浆宸ュ簭', title: '涓嬮亾娴佽浆宸ュ簭', width: 150 }
- //, { field: '娴佽浆宸ュ簭', title: '娴佽浆宸ュ簭' }
- ]]
- };
+ }
}
//#region 鎺掑簭鍚庨�夋嫨
@@ -611,23 +562,8 @@
}
}
}
- //鍔ㄦ�佹樉绀哄垪鍚�
- option = {
- elem: '#mainTable'
- , toolbar: '#toolbarDemo'
- , cols: [col]
- , data: data1.data
- , height: 800
- , page: true
- , totalRow: true
- , cellMinWidth: 90
- , limit: 50
- , limits: [50, 500, 5000, 20000]
- , done: function (res, curr, count) {
- soulTable.render(this);
- }
- }
-
+ option.cols=[col];
+ option.data = data1.data;
//璁剧疆鍒楄〃鍚屼竴涓崟鎹彧鏈夌涓�鏉℃暟鎹樉绀轰富琛ㄤ俊鎭紝鍏跺畠璁板綍鍙樉绀哄瓙琛ㄤ俊鎭�
//鑾峰彇瀛愯〃鍒楁暟鎹�
var colList = [];
@@ -970,7 +906,7 @@
//#region 鍒锋柊
function get_Refresh() {
set_ClearQuery();
- get_DisplayPage(sWhere);
+ get_FastQuery();
}
//鍚敤榛樿
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_Add_Edit_PatrolProcCheckOtherill.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_Add_Edit_PatrolProcCheckOtherill.html"
index 25358d6..b099a34 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_Add_Edit_PatrolProcCheckOtherill.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_Add_Edit_PatrolProcCheckOtherill.html"
@@ -717,6 +717,7 @@
var linterid = params[params[1]];//婧愬崟id
var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
var HICMOEntryID = params[params[3]];//婧愬崟瀛恑d
+ var HEntryID = params[params[4]];//婧愬崟瀛恑d
}
/*鍥哄畾浠ｇ爜锛屾瘡寮犲崟鎹兘瑕乥egin*/
//////娴嬭瘯鐢ㄦ暟鎹�
@@ -857,7 +858,7 @@
$.ajax({
url: GetWEBURL() + '/QC_PatrolProcCheckOtherBill/get_ProcessExchangeBill',
type: "GET",
- data: { "HInterID": linterid, "user": sessionStorage["HUserName"] },
+ data: { "HInterID": linterid, "HEntryID": HEntryID, "user": sessionStorage["HUserName"] },
success: function (result) {
var data = result.data[0];
if (result.count == 1) {
@@ -2193,6 +2194,7 @@
//琛ㄥご淇℃伅妫�楠屾柟妗堝脊绐�
form.on('submit(btnSearchQCScheme)', function () {
+ var HName = $("#HMaterName").val();
//椤甸潰灞�-鑷畾涔�
layer.open({
type: 2,
@@ -2202,7 +2204,7 @@
shift: 2,
area: ['90%', '90%'],
maxmin: true,
- content: ['../../璐ㄩ噺绠＄悊/妫�楠屾柟妗堝崟/QC_CheckProjectList.html', 'yes'],
+ content: ['../../璐ㄩ噺绠＄悊/妫�楠屾柟妗堝崟/QC_CheckProjectList.html?OperationType=1&HName=' + HName + '', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBill.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBill.html"
index d2e2ec7..d742110 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBill.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBill.html"
@@ -761,6 +761,7 @@
var linterid = params[params[1]];//婧愬崟id
var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
var HICMOEntryID = params[params[3]];//婧愬崟瀛恑d
+ var HEntryID = params[params[4]];//婧愬崟瀛恑d
}
/*鍥哄畾浠ｇ爜锛屾瘡寮犲崟鎹兘瑕乥egin*/
@@ -829,7 +830,7 @@
//鏍规嵁婧愬崟id鑾峰彇婧愬崟淇℃伅
LoadingInformation_StationOutBill();
}
- //宸ュ簭娴佽浆鍗″垪琛ㄩ妫�
+ //宸ュ簭娴佽浆鍗″垪琛ㄥ伐搴忔
else if (HSouceBillType == 3772) {
//鏍规嵁婧愬崟id鑾峰彇婧愬崟淇℃伅
LoadingInformation_ProcExchange();
@@ -940,7 +941,7 @@
$.ajax({
url: GetWEBURL() + '/CheckBill/get_ProcessExchangeBill',
type: "GET",
- data: { "HInterID": linterid, "user": sessionStorage["HUserName"] },
+ data: { "HInterID": linterid, "HEntryID": HEntryID, "user": sessionStorage["HUserName"] },
success: function (result) {
var data = result.data[0];
if (result.count == 1) {
@@ -1557,6 +1558,7 @@
//琛ㄥご淇℃伅妫�楠屾柟妗堝脊绐�
form.on('submit(btnSearchQCScheme)', function () {
+ var HName = $("#HMaterName").val();
//椤甸潰灞�-鑷畾涔�
layer.open({
type: 2,
@@ -1566,7 +1568,7 @@
shift: 2,
area: ['90%', '90%'],
maxmin: true,
- content: ['../../璐ㄩ噺绠＄悊/妫�楠屾柟妗堝崟/QC_CheckProjectList.html', 'yes'],
+ content: ['../../璐ㄩ噺绠＄悊/妫�楠屾柟妗堝崟/QC_CheckProjectList.html?OperationType=1&HName=' + HName +'', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
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_CheckProjectList.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_CheckProjectList.html"
index 26c98c4..bdb6793 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_CheckProjectList.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_CheckProjectList.html"
@@ -90,7 +90,10 @@
//鑾峰彇椤甸潰璺宠浆鍙傛暟 //鍗曟嵁缂栬緫鐘舵�侊細 1.鏃犳簮鍗曟柊澧灺� 聽2.鏈夋簮鍗曟柊澧灺� 聽3.缂栬緫聽 4.娴忚聽 5.鍙樻洿
var params = get_UrlVars();
if (typeof (params[params[0]]) == "undefined") {
- var OperationType = 1;//鎿嶄綔绫诲瀷
+ var OperationType = 1;//鎿嶄綔绫诲瀷
+ } else {
+ var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
+ var HName = decodeURI(params[params[1]]);//鐗╂枡鍚嶇О
}
layui.config({
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
@@ -214,7 +217,13 @@
//鍒濆鍖栬〃鏍�
set_InitGrid();
//鏌ヨ
- get_Display(sWhere);
+ if (HName=="") {
+ get_Display(sWhere);
+ } else {
+ sWhere += " and 鐗╂枡鍚嶇О = '" + HName + "'";
+ get_Display(sWhere);
+ }
+
}
//鍒濆鍖栫綉鏍�
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_BadProductsReport.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_BadProductsReport.html"
index ee40cdf..2237d40 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_BadProductsReport.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_BadProductsReport.html"
@@ -131,6 +131,7 @@
</div>
<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="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
</div>
</script>
@@ -160,6 +161,7 @@
, soulTable = layui.soulTable
var sWhere = "";
var option = [];
+ var ins; //鐢ㄤ簬瀵煎嚭excel
var HModName = "QC_BadProductsReport";
var titleData = ["HInterID", "HEntryID", "HBadReasonID", "HSourceInterID", "HSourceEntryID"];//瀛愯〃涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
@@ -181,6 +183,9 @@
switch (obj.event) {
//鍒楄缃�
case 'set_HideColumn': get_HideColumn();
+ break;
+ //瀵煎嚭鎸夐挳
+ case 'btn_Export': btn_Export();
break;
};
});
@@ -321,7 +326,7 @@
}
}
table.render(option);
-
+ ins = table.render(option);
//鍒锋柊琛ㄦ牸鏁版嵁
DisPlay_HideColumn();
@@ -503,6 +508,13 @@
});
+ //#region 瀵煎嚭Execel
+ function btn_Export() {
+ table.exportFile(ins.config.id, option.data, "xls");
+ }
+ //#endregion
+
+
//闅愯棌鍒楄缃�
function get_HideColumn() {
var colName = "";
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_ErrManagerLedgerReport.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_ErrManagerLedgerReport.html"
index dbf9ad8..4c63cd7 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_ErrManagerLedgerReport.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_ErrManagerLedgerReport.html"
@@ -102,6 +102,7 @@
</div>
<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="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
</div>
</script>
@@ -131,6 +132,7 @@
, soulTable = layui.soulTable
var sWhere = "";
var option = [];
+ var ins; //鐢ㄤ簬瀵煎嚭excel
var HModName = "QC_ErrManagerLedgerReport";
var titleData = ["HInterID", "HEntryID", "HBadReasonID", "HSourceInterID", "HSourceEntryID"];//瀛愯〃涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
@@ -152,6 +154,9 @@
switch (obj.event) {
//鍒楄缃�
case 'set_HideColumn': get_HideColumn();
+ break;
+ //瀵煎嚭鎸夐挳
+ case 'btn_Export': btn_Export();
break;
};
});
@@ -317,6 +322,7 @@
}
}
table.render(option);
+ ins = table.render(option);
//鍒锋柊琛ㄦ牸鏁版嵁
DisPlay_HideColumn();
@@ -426,6 +432,12 @@
}
//#endregion
+ //#region 瀵煎嚭Execel
+ function btn_Export() {
+ table.exportFile(ins.config.id, option.data, "xls");
+ }
+ //#endregion
+
//闅愯棌鍒楄缃�
function get_HideColumn() {
var colName = "";
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_ErrManagerLedgerReport_EquipTop3Issue.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_ErrManagerLedgerReport_EquipTop3Issue.html"
index a3861be..e474020 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_ErrManagerLedgerReport_EquipTop3Issue.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_ErrManagerLedgerReport_EquipTop3Issue.html"
@@ -102,6 +102,7 @@
</div>
<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-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="HideColumn"><i class="layui-icon layui-icon-form"></i>闅愯棌鍒楄缃�</button>
</div>
@@ -133,6 +134,7 @@
//鏌ヨ鏉′欢
var sWhere = "";
var option = [];
+ var ins; //鐢ㄤ簬瀵煎嚭excel
var HModName = "QC_ErrManagerLedgerReport_EquipTop3Issue";
var HEquipIssue = []; //璁惧闂
//#endregion
@@ -386,6 +388,9 @@
case 'HideColumn':
get_HideColumn();
break;
+ //瀵煎嚭鎸夐挳
+ case 'btn_Export': btn_Export();
+ break;
};
});
//閲嶇疆鎸夐挳
@@ -504,6 +509,7 @@
option.data = data1.data;
table.render(option);
+ ins = table.render(option);
layer.close(wait);
} else {
layer.close(wait);
@@ -598,6 +604,12 @@
}
//#endregion
+ //#region 瀵煎嚭Execel
+ function btn_Export() {
+ table.exportFile(ins.config.id, option.data, "xls");
+ }
+ //#endregion
+
//闅愯棌鍒楄缃�
function get_HideColumn() {
var colName = "";
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_ErrManagerLedgerReport_Issue.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_ErrManagerLedgerReport_Issue.html"
index 8c4e893..edb1487 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_ErrManagerLedgerReport_Issue.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_ErrManagerLedgerReport_Issue.html"
@@ -102,6 +102,7 @@
</div>
<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-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="HideColumn"><i class="layui-icon layui-icon-form"></i>闅愯棌鍒楄缃�</button>
</div>
@@ -133,6 +134,7 @@
//鏌ヨ鏉′欢
var sWhere = "";
var option = [];
+ var ins; //鐢ㄤ簬瀵煎嚭excel
var HModName = "QC_ErrManagerLedgerReport_Issue";
var HIssueType = []; //闂绫诲瀷
//#endregion
@@ -386,6 +388,9 @@
case 'HideColumn':
get_HideColumn();
break;
+ //瀵煎嚭鎸夐挳
+ case 'btn_Export': btn_Export();
+ break;
};
});
//閲嶇疆鎸夐挳
@@ -504,6 +509,7 @@
option.data = data1.data;
table.render(option);
+ ins = table.render(option);
layer.close(wait);
} else {
layer.close(wait);
@@ -601,6 +607,12 @@
}
//#endregion
+ //#region 瀵煎嚭Execel
+ function btn_Export() {
+ table.exportFile(ins.config.id, option.data, "xls");
+ }
+ //#endregion
+
//闅愯棌鍒楄缃�
function get_HideColumn() {
var colName = "";
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_ErrManagerLedgerReport_Source.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_ErrManagerLedgerReport_Source.html"
index 2874e8f..cc2a1c2 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_ErrManagerLedgerReport_Source.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_ErrManagerLedgerReport_Source.html"
@@ -102,6 +102,7 @@
</div>
<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-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="HideColumn"><i class="layui-icon layui-icon-form"></i>闅愯棌鍒楄缃�</button>
</div>
@@ -133,6 +134,7 @@
//鏌ヨ鏉′欢
var sWhere = "";
var option = [];
+ var ins; //鐢ㄤ簬瀵煎嚭excel
var HModName = "QC_ErrManagerLedgerReport_Source";
var HSourceName = []; //鐢熶骇璧勬簮鍚嶇О
//#endregion
@@ -386,6 +388,9 @@
case 'HideColumn':
get_HideColumn();
break;
+ //瀵煎嚭鎸夐挳
+ case 'btn_Export': btn_Export();
+ break;
};
});
//閲嶇疆鎸夐挳
@@ -504,6 +509,7 @@
option.data = data1.data;
table.render(option);
+ ins = table.render(option);
layer.close(wait);
} else {
layer.close(wait);
@@ -599,7 +605,14 @@
}
})
}
- //#endregion
+ //#endregion
+
+ //#region 瀵煎嚭Execel
+ function btn_Export() {
+ table.exportFile(ins.config.id, option.data, "xls");
+ }
+ //#endregion
+
//闅愯棌鍒楄缃�
function get_HideColumn() {
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_ErrManagerLedgerReport_SourceOfTheProblem.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_ErrManagerLedgerReport_SourceOfTheProblem.html"
index 2cf8e39..33ada74 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_ErrManagerLedgerReport_SourceOfTheProblem.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_ErrManagerLedgerReport_SourceOfTheProblem.html"
@@ -102,6 +102,7 @@
</div>
<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-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="HideColumn"><i class="layui-icon layui-icon-form"></i>闅愯棌鍒楄缃�</button>
</div>
@@ -133,6 +134,7 @@
//鏌ヨ鏉′欢
var sWhere = "";
var option = [];
+ var ins; //鐢ㄤ簬瀵煎嚭excel
var HModName = "QC_ErrManagerLedgerReport_SourceOfTheProblem";
var HSourceOfTheProblem = []; //寮傚父闂鏉ユ簮
//#endregion
@@ -386,6 +388,9 @@
case 'HideColumn':
get_HideColumn();
break;
+ //瀵煎嚭鎸夐挳
+ case 'btn_Export': btn_Export();
+ break;
};
});
//閲嶇疆鎸夐挳
@@ -504,6 +509,7 @@
option.data = data1.data;
table.render(option);
+ ins = table.render(option);
layer.close(wait);
} else {
layer.close(wait);
@@ -601,6 +607,13 @@
}
//#endregion
+ //#region 瀵煎嚭Execel
+ function btn_Export() {
+ table.exportFile(ins.config.id, option.data, "xls");
+ }
+ //#endregion
+
+
//闅愯棌鍒楄缃�
function get_HideColumn() {
var colName = "";
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_InspectionFormReport.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_InspectionFormReport.html"
index 4953cdb..a2676c7 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_InspectionFormReport.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_InspectionFormReport.html"
@@ -215,6 +215,7 @@
</div>
<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-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="HideColumn"><i class="layui-icon layui-icon-form"></i>闅愯棌鍒楄缃�</button>
</div>
@@ -246,6 +247,7 @@
//鏌ヨ鏉′欢
var sWhere = "";
var option = [];
+ var ins; //鐢ㄤ簬瀵煎嚭excel
var HModName = "QC_InspectionFormReport";
var optionAVG = [];
var optionS = [];
@@ -272,6 +274,9 @@
//闅愯棌鍒楄缃�
case 'HideColumn':
get_HideColumn();
+ break;
+ //瀵煎嚭鎸夐挳
+ case 'btn_Export': btn_Export();
break;
};
});
@@ -441,6 +446,7 @@
optionAVG[0] = data1.data[limit + 1];
optionS[0] = data1.data[limit + 2];
table.render(option);
+ ins = table.render(option);
set_PPK();
set_CPK();
set_Line();
@@ -702,6 +708,12 @@
return sum;
}
+ //#region 瀵煎嚭Execel
+ function btn_Export() {
+ table.exportFile(ins.config.id, option.data, "xls");
+ }
+ //#endregion
+
//鎶樼嚎鍥�
function set_Line() {
//#region銆愭姌绾垮浘銆�
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_MoistureContentDataLedger.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_MoistureContentDataLedger.html"
index 6ec70e8..aeeacf4 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_MoistureContentDataLedger.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_MoistureContentDataLedger.html"
@@ -106,6 +106,7 @@
</div>
<script type="text/html" id="toolbarDemo1">
<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="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
</div>
</script>
@@ -135,6 +136,7 @@
, soulTable = layui.soulTable
var sWhere = "";
var option = [];
+ var ins; //鐢ㄤ簬瀵煎嚭excel
var HModName = "QC_MoistureContentDataLedger";
var titleData = ["HInterID", "HEntryID", "HBadReasonID", "HSourceInterID", "HSourceEntryID"];//瀛愯〃涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
@@ -156,6 +158,9 @@
switch (obj.event) {
//鍒楄缃�
case 'set_HideColumn': get_HideColumn();
+ break;
+ //瀵煎嚭鎸夐挳
+ case 'btn_Export': btn_Export();
break;
};
});
@@ -302,7 +307,7 @@
}
table.render(option);
-
+ ins = table.render(option);
//鍒锋柊琛ㄦ牸鏁版嵁
DisPlay_HideColumn();
layer.close(ajaxLoad);
@@ -404,6 +409,11 @@
}
//#endregion
+ //#region 瀵煎嚭Execel
+ function btn_Export() {
+ table.exportFile(ins.config.id, option.data, "xls");
+ }
+ //#endregion
//闅愯棌鍒楄缃�
function get_HideColumn() {
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_PerformanceScrapLedger.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_PerformanceScrapLedger.html"
index 3577d42..d6e5d1c 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_PerformanceScrapLedger.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_PerformanceScrapLedger.html"
@@ -97,6 +97,7 @@
</div>
<script type="text/html" id="toolbarDemo1">
<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="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
</div>
</script>
@@ -126,6 +127,7 @@
, soulTable = layui.soulTable
var sWhere = "";
var option = [];
+ var ins; //鐢ㄤ簬瀵煎嚭excel
var HModName = "QC_PerformanceScrapLedger";
var titleData = ["HInterID", "HEntryID", "HBadReasonID", "HSourceInterID", "HSourceEntryID"];//瀛愯〃涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
@@ -147,6 +149,9 @@
switch (obj.event) {
//鍒楄缃�
case 'set_HideColumn': get_HideColumn();
+ break;
+ //瀵煎嚭鎸夐挳
+ case 'btn_Export': btn_Export();
break;
};
});
@@ -301,13 +306,9 @@
}
table.render(option);
-
+ ins = table.render(option);
//鍒锋柊琛ㄦ牸鏁版嵁
- DisPlay_HideColumn();
-
- //if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
- // ColFilter();
- //}
+ DisPlay_HideColumn();
layer.close(ajaxLoad);
} else {
@@ -407,6 +408,11 @@
}
//#endregion
+ //#region 瀵煎嚭Execel
+ function btn_Export() {
+ table.exportFile(ins.config.id, option.data, "xls");
+ }
+ //#endregion
//闅愯棌鍒楄缃�
function get_HideColumn() {
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_QualityStatisticsDailyReport.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_QualityStatisticsDailyReport.html"
index fb5e90e..c77855f 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_QualityStatisticsDailyReport.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_QualityStatisticsDailyReport.html"
@@ -138,6 +138,7 @@
</div>
<script type="text/html" id="toolbarDemo1">
<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="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
</div>
</script>
@@ -167,6 +168,7 @@
, soulTable = layui.soulTable
var sWhere = "";
var option = [];
+ var ins; //鐢ㄤ簬瀵煎嚭excel
var HModName = "QC_QualityStatisticsDailyReport";
var titleData = ["HInterID", "HEntryID", "HBadReasonID", "HSourceInterID", "HSourceEntryID"];//瀛愯〃涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
@@ -188,6 +190,9 @@
switch (obj.event) {
//鍒楄缃�
case 'set_HideColumn': get_HideColumn();
+ break;
+ //瀵煎嚭鎸夐挳
+ case 'btn_Export': btn_Export();
break;
};
});
@@ -229,6 +234,12 @@
$("#HMonth").val(new Date().getMonth()+1);
form.render('select');
}
+
+ //#region 瀵煎嚭Execel
+ function btn_Export() {
+ table.exportFile(ins.config.id, option.data, "xls");
+ }
+ //#endregion
//鐢熶骇杞﹂棿
function DeptName() {
@@ -370,7 +381,7 @@
option.data=data1.data
table.render(option);
-
+ ins = table.render(option);
//鍒锋柊琛ㄦ牸鏁版嵁
DisPlay_HideColumn();
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_RegistrationForTestingReport.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_RegistrationForTestingReport.html"
index 318c4f1..19480c5 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_RegistrationForTestingReport.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_RegistrationForTestingReport.html"
@@ -102,6 +102,7 @@
</div>
<script type="text/html" id="toolbarDemo1">
<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="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
</div>
</script>
@@ -131,6 +132,7 @@
, soulTable = layui.soulTable
var sWhere = "";
var option = [];
+ var ins; //鐢ㄤ簬瀵煎嚭excel
var HModName = "QC_RegistrationForTestingReport";
var titleData = ["HInterID", "HEntryID", "HBadReasonID", "HSourceInterID", "HSourceEntryID"];//瀛愯〃涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
@@ -152,6 +154,9 @@
switch (obj.event) {
//鍒楄缃�
case 'set_HideColumn': get_HideColumn();
+ break;
+ //瀵煎嚭鎸夐挳
+ case 'btn_Export': btn_Export();
break;
};
});
@@ -318,15 +323,10 @@
option.data = data1.data
}
-
table.render(option);
-
+ ins = table.render(option);
//鍒锋柊琛ㄦ牸鏁版嵁
DisPlay_HideColumn();
-
- //if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
- // ColFilter();
- //}
layer.close(ajaxLoad);
} else {
@@ -488,7 +488,11 @@
}
});
-
+ //#region 瀵煎嚭Execel
+ function btn_Export() {
+ table.exportFile(ins.config.id, option.data, "xls");
+ }
+ //#endregion
//闅愯棌鍒楄缃�
function get_HideColumn() {
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\275\246\351\227\264\350\207\252\346\243\200\345\215\225/QC_Add_Edit_WorkSelfCheckBill.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\275\246\351\227\264\350\207\252\346\243\200\345\215\225/QC_Add_Edit_WorkSelfCheckBill.html"
index bc2a5d3..d01a52e 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\275\246\351\227\264\350\207\252\346\243\200\345\215\225/QC_Add_Edit_WorkSelfCheckBill.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\275\246\351\227\264\350\207\252\346\243\200\345\215\225/QC_Add_Edit_WorkSelfCheckBill.html"
@@ -704,6 +704,7 @@
var linterid = params[params[1]];//婧愬崟id
var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
var HICMOEntryID = params[params[3]];//婧愬崟瀛恑d
+ var HEntryID = params[params[4]];//婧愬崟瀛恑d
}
/*鍥哄畾浠ｇ爜锛屾瘡寮犲崟鎹兘瑕乥egin*/
//////娴嬭瘯鐢ㄦ暟鎹�
@@ -843,7 +844,7 @@
$.ajax({
url: GetWEBURL() + '/QC_WorkSelfCheckBill/get_ProcessExchangeBill',
type: "GET",
- data: { "HInterID": linterid, "user": sessionStorage["HUserName"] },
+ data: { "HInterID": linterid, "HEntryID": HEntryID, "user": sessionStorage["HUserName"] },
success: function (result) {
var data = result.data[0];
if (result.count == 1) {
@@ -2172,6 +2173,7 @@
//琛ㄥご淇℃伅妫�楠屾柟妗堝脊绐�
form.on('submit(btnSearchQCScheme)', function () {
+ var HName = $("#HMaterName").val();
//椤甸潰灞�-鑷畾涔�
layer.open({
type: 2,
@@ -2181,7 +2183,7 @@
shift: 2,
area: ['90%', '90%'],
maxmin: true,
- content: ['../../璐ㄩ噺绠＄悊/妫�楠屾柟妗堝崟/QC_CheckProjectList.html', 'yes'],
+ content: ['../../璐ㄩ噺绠＄悊/妫�楠屾柟妗堝崟/QC_CheckProjectList.html?OperationType=1&HName=' + HName + '', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html"
index 357a768..828ef98 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html"
@@ -741,6 +741,7 @@
var linterid = params[params[1]];//婧愬崟id
var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
var HICMOEntryID = params[params[3]];//婧愬崟瀛恑d
+ var HEntryID = params[params[4]];//婧愬崟瀛恑d
}
/*鍥哄畾浠ｇ爜锛屾瘡寮犲崟鎹兘瑕乥egin*/
//////娴嬭瘯鐢ㄦ暟鎹�
@@ -884,7 +885,7 @@
$.ajax({
url: GetWEBURL() + '/CheckBill/get_ProcessExchangeBill',
type: "GET",
- data: { "HInterID": linterid, "user": sessionStorage["HUserName"] },
+ data: { "HInterID": linterid, "HEntryID": HEntryID, "user": sessionStorage["HUserName"] },
success: function (result) {
var data = result.data[0];
if (result.count == 1) {
@@ -1651,6 +1652,7 @@
//琛ㄥご淇℃伅妫�楠屾柟妗堝脊绐�
form.on('submit(btnSearchQCScheme)', function () {
+ var HName = $("#HMaterName").val();
//椤甸潰灞�-鑷畾涔�
layer.open({
type: 2,
@@ -1660,7 +1662,7 @@
shift: 2,
area: ['90%', '90%'],
maxmin: true,
- content: ['../../璐ㄩ噺绠＄悊/妫�楠屾柟妗堝崟/QC_CheckProjectList.html', 'yes'],
+ content: ['../../璐ㄩ噺绠＄悊/妫�楠屾柟妗堝崟/QC_CheckProjectList.html?OperationType=1&HName=' + HName+'', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
@@ -3893,24 +3895,24 @@
}
//#endregion
- //#region 銆愬簾寮冧唬鐮併��
+ //#region 銆愬簾寮冧唬鐮�(鏂帿灏斿凡鍚敤)銆�
table.on('edit(mainTable)', function (obj) {
// 鍗曞厓鏍肩紪杈戜箣鍓嶇殑鍊�
var oldText = $(this).prev().text();
var value = obj.value //寰楀埌淇敼鍚庣殑鍊�
, data = obj.data //寰楀埌鎵�鍦ㄨ鎵�鏈夐敭鍊�
- , field = obj.field; //寰楀埌瀛楁
- //layer.msg('[ID: ' + data.id + '] ' + field + ' 瀛楁鏇存敼涓猴細' + value);
-
+ , field = obj.field; //寰楀埌瀛楁
var HInspectVal = $("#HInspectVal").val(); //妫�楠屽��
var HTargetVal = $("#HTargetVal").val(); //鐩爣鍊�
var HComparator = $("#HComparator").val(); //姣旇緝绗�
var HEntryID = $("#HEntryID").val() - 1;
var HAnalysisMethod = table.cache["mainTable"][HEntryID].HAnalysisMethod; //鍒嗘瀽鏂规硶
+ var HUpLimit = table.cache["mainTable"][HEntryID].HUpLimit; //涓婇檺鍊�
+ var HDownLimit = table.cache["mainTable"][HEntryID].HDownLimit; //涓嬮檺鍊�
switch (field) {
case "HInspectVal": //妫�楠屽��
value = isNaN(value) ? 0 : value;
- if (HInspectVal) {
+ if (HInspectVal < HUpLimit && HInspectVal > HDownLimit) {
}
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/Gy_WorkBeginDotCheckListBill.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/Gy_WorkBeginDotCheckListBill.html"
index 9f0827e..d363eb5 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/Gy_WorkBeginDotCheckListBill.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/Gy_WorkBeginDotCheckListBill.html"
@@ -325,7 +325,20 @@
$('#HOrgID').attr("disabled", true);
}
-
+ else if (OperationType == 2) {//濡傛灉淇敼鍒欒蛋涓嬮潰 new //缂栬緫
+
+ //鍒濆鍖栭」鐩樁娈佃〃
+ get_InitGrid();
+ RoadBillMain(linterid);
+ //鐢熸垚骞惰缃富琛ㄧ殑鍐呯爜鍜屽崟鎹彿
+ createBillNo();
+ //鍒濆鍖栧埗鍗曚汉鍜屽埗鍗曟椂闂�
+ $("#HMaker").val(sessionStorage["HUserName"]);
+ $("#HMakerDate").val(Format(new Date(), "yyyy-MM-dd"));
+ //鍒濆鍖栨棩鏈�
+ $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
+ OperationType = 1;
+ }
else if (OperationType == 3) {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
//鍒濆鍖栧瓙琛�
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/Gy_WorkBeginDotCheckListBillList.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/Gy_WorkBeginDotCheckListBillList.html"
index d0e2520..ba6c780 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/Gy_WorkBeginDotCheckListBillList.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/Gy_WorkBeginDotCheckListBillList.html"
@@ -168,6 +168,7 @@
<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_Copy" id="set_Copy"><i class="layui-icon layui-icon-form"></i>澶嶅埗</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
@@ -179,7 +180,7 @@
<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_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
<button type="button" class="layui-btn layui-btn-sm" 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" 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_ReadScheme" id="set_ReadScheme"><i class="layui-icon layui-icon-set"></i>璇诲彇鏂规</button>
</div>
</script>
</form>
@@ -245,6 +246,9 @@
break;
//缂栬緫
case 'set_ShowBill': set_ShowBill();
+ break;
+ //澶嶅埗
+ case 'set_Copy': set_Copy();
break;
//鍒犻櫎
case 'set_DeleteBill': set_DeleteBill();
@@ -687,6 +691,28 @@
}
//#endregion
+ //澶嶅埗
+ function set_Copy() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var linterid = data[0].HInterID.toString();
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '璁惧鍚姩鐐规娓呭崟鍒楄〃-鏂板'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../../杞﹂棿绠＄悊/鍚姩鐐规鍗�/Gy_WorkBeginDotCheckListBill.html?OperationType=2&linterid=' + linterid + '&HSouceBillType='
+ , end: function () {
+ //鍒锋柊椤甸潰,
+ location.reload();
+ }
+ })
+ } else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+ }
+ }
+
//#region 鍒犻櫎
function set_DeleteBill() {
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 dab7ec9..892e1a0 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"
@@ -3105,25 +3105,32 @@
function set_FirstPieceCheck() {
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
+ var checkStatus2 = table.checkStatus('mainTable2')
+ , data2 = checkStatus2.data;
if (checkStatus.data.length === 1) {
var linterid = data[0].hmainid.toString();
- var OperationType = 2;
- layer.open({
- type: 2
- , area: ['100%', '100%']
- , title: '棣栦欢妫�楠屽崟-缂栬緫'
- , shade: 0.6
- , maxmin: false
- , anim: 0
- , content: ['../../璐ㄩ噺绠＄悊/棣栦欢妫�楠屽崟/QC_Add_Edit_FirstPieceCheckBill.html?OperationType=' + OperationType + '&linterid=' + linterid + '&HSouceBillType=3772&HICMOEntryID=0', 'yes']
- , resize: false
- , cancel: function () {
- btnIs();
- }
- , end: function () {
- get_FastQuery();
- }
- })
+ if (data2.length > 0) {
+ var HEntryID = data2[0].HEntryID.toString();
+ var OperationType = 2;
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '棣栦欢妫�楠屽崟-缂栬緫'
+ , shade: 0.6
+ , maxmin: false
+ , anim: 0
+ , content: ['../../璐ㄩ噺绠＄悊/棣栦欢妫�楠屽崟/QC_Add_Edit_FirstPieceCheckBill.html?OperationType=' + OperationType + '&linterid=' + linterid + '&HSouceBillType=3772&HICMOEntryID=0&HEntryID=' + HEntryID + '', 'yes']
+ , resize: false
+ , cancel: function () {
+ btnIs();
+ }
+ , end: function () {
+ get_FastQuery();
+ }
+ })
+ } else {
+ layer.msg('璇峰湪涓嬫柟琛ㄦ牸閫夋嫨瀵瑰簲鐨勫伐搴忥紒');
+ }
} else {
layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
}
@@ -3133,84 +3140,105 @@
function set_ProcessCheck() {
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
+ var checkStatus2 = table.checkStatus('mainTable2')
+ , data2 = checkStatus2.data;
if (checkStatus.data.length === 1) {
var linterid = data[0].hmainid.toString();
- var OperationType = 2;
- layer.open({
- type: 2
- , area: ['100%', '100%']
- , title: '宸ュ簭杞Щ妫�楠屽崟-缂栬緫'
- , shade: 0.6
- , maxmin: false
- , anim: 0
- , content: ['../../璐ㄩ噺绠＄悊/宸ュ簭妫�楠屽崟/QC_ProcessCheckBill.html?OperationType=' + OperationType + '&linterid=' + linterid + '&HSouceBillType=3772&HICMOEntryID=0', 'yes']
- , resize: false
- , cancel: function () {
- btnIs();
- }
- , end: function () {
- get_FastQuery();
- }
- })
+ if (data2.length > 0) {
+ var HEntryID = data2[0].HEntryID.toString();
+ var OperationType = 2;
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '宸ュ簭杞Щ妫�楠屽崟-缂栬緫'
+ , shade: 0.6
+ , maxmin: false
+ , anim: 0
+ , content: ['../../璐ㄩ噺绠＄悊/宸ュ簭妫�楠屽崟/QC_ProcessCheckBill.html?OperationType=' + OperationType + '&linterid=' + linterid + '&HSouceBillType=3772&HICMOEntryID=0&HEntryID=' + HEntryID +'', 'yes']
+ , resize: false
+ , cancel: function () {
+ btnIs();
+ }
+ , end: function () {
+ get_FastQuery();
+ }
+ })
+ } else {
+ layer.msg('璇峰湪涓嬫柟琛ㄦ牸閫夋嫨瀵瑰簲鐨勫伐搴忥紒');
+ }
} else {
layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
- }
+ }
}
//宸℃
function set_PatrolCheck() {
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
+ var checkStatus2 = table.checkStatus('mainTable2')
+ , data2 = checkStatus2.data;
if (checkStatus.data.length === 1) {
var linterid = data[0].hmainid.toString();
- var OperationType = 2;
- layer.open({
- type: 2
- , area: ['100%', '100%']
- , title: '宸℃璁板綍鍗�-缂栬緫'
- , shade: 0.6
- , maxmin: false
- , anim: 0
- , content: ['../../璐ㄩ噺绠＄悊/宸℃璁板綍鍗�/QC_Add_Edit_PatrolProcCheckOtherill.html?OperationType=' + OperationType + '&linterid=' + linterid + '&HSouceBillType=3772&HICMOEntryID=0', 'yes']
- , resize: false
- , cancel: function () {
- btnIs();
- }
- , end: function () {
- get_FastQuery();
- }
- })
+ if (data2.length > 0) {
+ var HEntryID = data2[0].HEntryID.toString();
+ var OperationType = 2;
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '宸℃璁板綍鍗�-缂栬緫'
+ , shade: 0.6
+ , maxmin: false
+ , anim: 0
+ , content: ['../../璐ㄩ噺绠＄悊/宸℃璁板綍鍗�/QC_Add_Edit_PatrolProcCheckOtherill.html?OperationType=' + OperationType + '&linterid=' + linterid + '&HSouceBillType=3772&HICMOEntryID=0&HEntryID=' + HEntryID +'', 'yes']
+ , resize: false
+ , cancel: function () {
+ btnIs();
+ }
+ , end: function () {
+ get_FastQuery();
+ }
+ })
+ } else {
+ layer.msg('璇峰湪涓嬫柟琛ㄦ牸閫夋嫨瀵瑰簲鐨勫伐搴忥紒');
+ }
} else {
layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
- }
+ }
}
//杞﹂棿鑷
function set_WorkCheck() {
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
+ var checkStatus2 = table.checkStatus('mainTable2')
+ , data2 = checkStatus2.data;
if (checkStatus.data.length === 1) {
var linterid = data[0].hmainid.toString();
- var OperationType = 2;
- layer.open({
- type: 2
- , area: ['100%', '100%']
- , title: '杞﹂棿鑷鍗�-缂栬緫'
- , shade: 0.6
- , maxmin: false
- , anim: 0
- , content: ['../../璐ㄩ噺绠＄悊/杞﹂棿鑷鍗�/QC_Add_Edit_WorkSelfCheckBill.html?OperationType=' + OperationType + '&linterid=' + linterid + '&HSouceBillType=3772&HICMOEntryID=0', 'yes']
- , resize: false
- , cancel: function () {
- btnIs();
- }
- , end: function () {
- get_FastQuery();
- }
- })
+ if (data2.length > 0) {
+ var HEntryID = data2[0].HEntryID.toString();
+ var OperationType = 2;
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '杞﹂棿鑷鍗�-缂栬緫'
+ , shade: 0.6
+ , maxmin: false
+ , anim: 0
+ , content: ['../../璐ㄩ噺绠＄悊/杞﹂棿鑷鍗�/QC_Add_Edit_WorkSelfCheckBill.html?OperationType=' + OperationType + '&linterid=' + linterid + '&HSouceBillType=3772&HICMOEntryID=0&HEntryID=' + HEntryID +'', 'yes']
+ , resize: false
+ , cancel: function () {
+ btnIs();
+ }
+ , end: function () {
+ get_FastQuery();
+ }
+ })
+ } else {
+ layer.msg('璇峰湪涓嬫柟琛ㄦ牸閫夋嫨瀵瑰簲鐨勫伐搴忥紒');
+ }
} else {
layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
- }
+ }
}
//鐢熶骇璐ㄩ噺姹囨姤鍗�
--
Gitblit v1.9.1