From e2b84068ec10273253a54ddd030183cd7fa09505 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期三, 30 十月 2024 09:51:07 +0800
Subject: [PATCH] 首巡末检,根据用户带出相关信息减少用户录入,以及选着检验方案根据物料过滤,只显示当前物料
---
WebTM/views/质量管理/巡检记录单/QC_Add_Edit_PatrolProcCheckOtherill.html | 6
WebTM/WebTM.csproj.user | 26 +++++
WebTM/views/质量管理/工序检验单/QC_ProcessCheckBill.html | 8 +
WebTM/views/质量管理/检验方案单/QC_CheckProjectList.html | 13 ++
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBillList.html | 170 +++++++++++++++++++--------------
WebTM/views/IpadIndex.html | 4
WebTM/views/质量管理/车间自检单/QC_Add_Edit_WorkSelfCheckBill.html | 6
WebTM/views/质量管理/首件检验单/QC_Add_Edit_FirstPieceCheckBill.html | 16 +-
8 files changed, 159 insertions(+), 90 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/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/\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\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\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