From 07cf94734c36d4eae6ddbc4dd338bf5af81a2193 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期一, 28 十月 2024 16:11:39 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/基础资料/生产基础资料/Gy_BadReason.html | 2
WebTM/views/质量管理/质量报表/QC_InspectionFormReport.html | 131 +++-
WebTM/views/质量管理/检验取样还样单/QC_Add_BackSampleCheckBill.html | 3
WebTM/views/质量管理/质量报表/QC_BadProductsReport.html | 58 ++
WebTM/views/Baseset/基础资料/Sc_ProcessExchangeBillListView.html | 6
WebTM/views/grf/15白标打印.grf | 766 +++++++++++++++++++++++++++++
WebTM/views/IpadIndex.html | 7
WebTM/views/生产管理/异常反馈单/OA_ErrMsgBackHandleBillMain.html | 51 +
WebTM/views/质量管理/质量报表/QC_QualityStatisticsDailyReport.html | 71 ++
WebTM/views/车间管理/产线/MES_ProductionLinePackagingList.html | 27 +
WebTM/views/车间管理/产线/MES_WhiteLabelGeneration.html | 278 ++++++++++
WebTM/views/质量管理/工序检验单/QC_ProcessCheckBill.html | 4
WebTM/views/质量管理/质量报表/QC_QualityMonthSumReport.html | 55 +
WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBill_CurrentWork.html | 5
WebTM/views/车间管理/工序进站接收单/Cj_StationInBill.html | 2
WebTM/views/设备管理/设备工艺参数订单点检表/SB_EquipICMOTechParamBillEdit.html | 2
WebTM/WebTM.csproj | 2
WebTM/views/车间管理/产线/MES_ProductionLinePackaging.html | 29
WebTM/views/车间管理/启动点检单/Sc_WorkBeginDotCheckBill.html | 33 +
19 files changed, 1,443 insertions(+), 89 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index ee12a95..181a571 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -554,6 +554,7 @@
<Content Include="views\杞﹂棿绠＄悊\浜х嚎\MES_AssemblyTraceabilityList.html" />
<Content Include="views\杞﹂棿绠＄悊\浜х嚎\MES_ProductionLinePackaging.html" />
<Content Include="views\杞﹂棿绠＄悊\浜х嚎\MES_ProductionLinePackagingList.html" />
+ <Content Include="views\杞﹂棿绠＄悊\浜х嚎\MES_WhiteLabelGeneration.html" />
<Content Include="views\杞﹂棿绠＄悊\浜х嚎\ProcessWIPReport.html" />
<Content Include="views\杞﹂棿绠＄悊\浜х嚎\RetrospectionCustomerReport.html" />
<Content Include="views\杞﹂棿绠＄悊\浜х嚎\Sc_GroupOrderBill.html" />
@@ -1142,6 +1143,7 @@
<Content Include="views\grf\閫佽揣鍗�%28鏍囩绾�%29.grf" />
<Content Include="views\grf\閫佽揣鍗�.grf" />
<Content Include="views\grf\鍙栨牱鍗�.grf" />
+ <Content Include="views\grf\15鐧芥爣鎵撳嵃.grf" />
<None Include="Web.Debug.config">
<DependentUpon>Web.config</DependentUpon>
</None>
diff --git "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Sc_ProcessExchangeBillListView.html" "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Sc_ProcessExchangeBillListView.html"
index bf9b04c..32e538e 100644
--- "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Sc_ProcessExchangeBillListView.html"
+++ "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Sc_ProcessExchangeBillListView.html"
@@ -13,12 +13,12 @@
<div class="layui-fluid">
<div class="layui-card">
<div class="layui-card-body" style="padding: 15px;">
- <form class="layui-form" action="" lay-filter="component-form-group">
+ <form class="layui-form" action="" lay-filter="component-form-group" onsubmit="return false;">
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">杩囨护鍒�</label>
<div class="layui-input-inline">
- <input type="text" name="Value" id="Value" lay-verify="Value" autocomplete="off" placeholder="璇疯緭鍏ヨ繃婊ゅ垪" class="layui-input">
+ <input type="text" class="layui-input" name="Value" id="Value" lay-verify="Value" placeholder="璇疯緭鍏ヨ繃婊ゅ垪" autocomplete="off">
</div>
<button type="button" lay-submit="" class="layui-btn" lay-filter="HQuery">蹇�熸煡璇�</button>
<button type="button" lay-submit="" class="layui-btn" lay-filter="FH">杩斿洖</button>
@@ -35,7 +35,7 @@
<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
<script>
//寮曠敤鐨勫崟鎹強妯″潡锛氬伐搴忔祦杞崱銆�
- layui.use(['table', 'form', 'layer'], function () {
+ layui.use(['table', 'form', 'layer'], function () {
var table = layui.table
, form = layui.form
, layer = layui.layer;
diff --git a/WebTM/views/IpadIndex.html b/WebTM/views/IpadIndex.html
index 85e3499..753ae37 100644
--- a/WebTM/views/IpadIndex.html
+++ b/WebTM/views/IpadIndex.html
@@ -30,6 +30,7 @@
var HSourceID1 = ""; //鐢熶骇璧勬簮ID1
var HSourceName1 = ""; //鐢熶骇璧勬簮1
var HSourceInterID = ""; //婧愬崟涓诲唴鐮�
+ var HProcExchInterID = ""; //娴佽浆鍗d
var HSourceEntryID = ""; //婧愬崟瀛愬唴鐮�
var HSourceBillNo = ""; //婧愬崟鍗曞彿
var HSourceBillType = ""; //婧愬崟绫诲瀷
@@ -206,6 +207,7 @@
html1 += '<h1 style="display:none;"><span>鍗曟嵁绫诲瀷锛�</span><span id="ty' + (i + 1) + '">' + LoadData1[i].HBillType + '</span></h1>';
//HSourceInterID瀹為檯鍙栧�硷細Sc_ICMOBillStatus_Tmp HInterID锛堝崟鎹富ID锛�
html1 += '<h1 style="display:none;"><span>婧愬崟涓诲唴鐮侊細</span><span id="sm' + (i + 1) + '">' + LoadData1[i].HSourceInterID + '</span></h1>';
+ html1 += '<h1 style="display:none;"><span>娴佽浆鍗′富ID锛�</span><span id="lzk' + (i + 1) + '">' + LoadData1[i].HProcExchInterID + '</span></h1>';
html1 += '<h1 style="display:none;"><span>婧愬崟瀛愬唴鐮侊細</span><span id="sb' + (i + 1) + '">' + LoadData1[i].HSourceEntryID + '</span></h1>';
html1 += '<h1 style="display:none;"><span>婧愬崟鍗曞彿锛�</span><span id="sw' + (i + 1) + '">' + LoadData1[i].HSourceBillNo + '</span></h1>';
html1 += '<h1 style="display:none;"><span>婧愬崟绫诲瀷锛�</span><span id="st' + (i + 1) + '">' + LoadData1[i].HSourceBillType + '</span></h1>';
@@ -439,6 +441,7 @@
workcode = $("#wk" + i + "").html(); //閫氳繃鏍峰紡ID鑾峰彇html鍐呭(宸ュ崟鍙�)
HBillType = $("#ty" + i + "").html(); //閫氳繃鏍峰紡ID鑾峰彇html鍐呭(鍗曟嵁绫诲瀷)
HSourceInterID = $("#sm" + i + "").html(); //閫氳繃鏍峰紡ID鑾峰彇html鍐呭(婧愬崟涓诲唴鐮�)
+ HProcExchInterID = $("#lzk" + i + "").html(); //娴佽浆鍗D
HSourceEntryID = $("#sb" + i + "").html(); //閫氳繃鏍峰紡ID鑾峰彇html鍐呭(婧愬崟瀛愬唴鍚�)
HSourceBillNo = $("#sw" + i + "").html(); //閫氳繃鏍峰紡ID鑾峰彇html鍐呭(婧愬崟鍗曞彿)
HSourceBillType = $("#st" + i + "").html(); //閫氳繃鏍峰紡ID鑾峰彇html鍐呭(婧愬崟绫诲瀷)
@@ -955,7 +958,7 @@
, shade: 0.6
, maxmin: false
, anim: 0
- , content: ['璐ㄩ噺绠＄悊/棣栦欢妫�楠屽崟/QC_Add_Edit_FirstPieceCheckBill.html?OperationType=2&linterid=' + HSourceInterID + '&HSouceBillType=' + HBillType + '&HICMOEntryID=' + HICMOEntryID, 'yes']
+ , content: ['璐ㄩ噺绠＄悊/棣栦欢妫�楠屽崟/QC_Add_Edit_FirstPieceCheckBill.html?OperationType=2&linterid=' + HProcExchInterID + '&HSouceBillType=' + HBillType + '&HICMOEntryID=' + HICMOEntryID, 'yes']
, resize: false
, cancel: function () {
}
@@ -978,7 +981,7 @@
, shade: 0.6
, maxmin: false
, anim: 0
- , content: ['璐ㄩ噺绠＄悊/宸ュ簭妫�楠屽崟/QC_ProcessCheckBill.html?OperationType=2&linterid=' + HSourceInterID + '&HSouceBillType=' + HBillType + '&HICMOEntryID=' + HICMOEntryID, 'yes']
+ , content: ['璐ㄩ噺绠＄悊/宸℃璁板綍鍗�/QC_Add_Edit_PatrolProcCheckOtherill.html?OperationType=2&linterid=' + HProcExchInterID + '&HSouceBillType=' + HBillType + '&HICMOEntryID=' + HICMOEntryID, 'yes']
, resize: false
, cancel: function () {
diff --git "a/WebTM/views/grf/15\347\231\275\346\240\207\346\211\223\345\215\260.grf" "b/WebTM/views/grf/15\347\231\275\346\240\207\346\211\223\345\215\260.grf"
new file mode 100644
index 0000000..d4c50cf
--- /dev/null
+++ "b/WebTM/views/grf/15\347\231\275\346\240\207\346\211\223\345\215\260.grf"
@@ -0,0 +1,766 @@
+锘縶
+ "Version":"6.8.9.1",
+ "Font":{
+ "Name":"瀹嬩綋",
+ "Size":105000,
+ "Weight":400,
+ "Charset":134
+ },
+ "Printer":{
+ "Size":256,
+ "Width":10,
+ "Height":15,
+ "LeftMargin":0,
+ "TopMargin":0,
+ "RightMargin":0,
+ "BottomMargin":0,
+ "PrintOffsetY":1
+ },
+ "DetailGrid":{
+ "Recordset":{
+ "Field":[
+ {
+ "Name":"PartNo"
+ },
+ {
+ "Name":"Index"
+ },
+ {
+ "Name":"Quatity"
+ },
+ {
+ "Name":"MS-Level"
+ },
+ {
+ "Name":"Addinfo"
+ },
+ {
+ "Name":"ManPartNo"
+ },
+ {
+ "Name":"PartDescription"
+ },
+ {
+ "Name":"ManDate"
+ },
+ {
+ "Name":"ExpiryDate"
+ },
+ {
+ "Name":"ManLoc"
+ },
+ {
+ "Name":"1Batch"
+ },
+ {
+ "Name":"2Batch"
+ },
+ {
+ "Name":"SupplierName"
+ },
+ {
+ "Name":"SupplierID"
+ },
+ {
+ "Name":"Purchase"
+ },
+ {
+ "Name":"SupplierData"
+ },
+ {
+ "Name":"PackageID"
+ },
+ {
+ "Name":"ShippingNote"
+ },
+ {
+ "Name":"HBarCode_White"
+ }
+ ]
+ },
+ "ColumnContent":{
+ },
+ "ColumnTitle":{
+ }
+ },
+ "Parameter":[
+ {
+ "Name":"MFGPartNumber",
+ "Format":"MFGPartNumber"
+ }
+ ],
+ "ReportHeader":[
+ {
+ "Name":"ReportHeader1",
+ "Height":14.7902,
+ "Control":[
+ {
+ "Type":"FreeGrid",
+ "Name":"FreeGrid2",
+ "Left":-0.449792,
+ "Top":-0.3175,
+ "Border":{
+ "Styles":"[DrawLeft|DrawTop|DrawRight|DrawBottom]"
+ },
+ "ColumnCount":7,
+ "RowCount":2,
+ "FreeGridColumn":[
+ {
+ "index":1,
+ "Width":0.873125
+ },
+ {
+ "index":2,
+ "Width":0.608542
+ },
+ {
+ "index":3,
+ "Width":1.00542
+ },
+ {
+ "index":4,
+ "Width":1.19063
+ },
+ {
+ "index":5,
+ "Width":1.48167
+ },
+ {
+ "index":6,
+ "Width":1.50813
+ },
+ {
+ "index":7,
+ "Width":3.75708
+ }
+ ],
+ "FreeGridRow":[
+ {
+ "index":1,
+ "Height":1.85208
+ },
+ {
+ "index":2,
+ "Height":13.4144
+ }
+ ],
+ "FreeGridCell":[
+ {
+ "row":1,
+ "col":1,
+ "FreeCell":true,
+ "Control":[
+ {
+ "Type":"Barcode",
+ "Name":"Barcode3",
+ "Left":5.21229,
+ "Top":0.555625,
+ "Width":5.00063,
+ "Height":4.84188,
+ "BarcodeType":"DataMatrix",
+ "Direction":"TopToBottom",
+ "CaptionPosition":"None",
+ "Text":"[#HBarCode_White#]"
+ },
+ {
+ "Type":"MemoBox",
+ "Name":"MemoBox1",
+ "Left":3.99521,
+ "Top":0.820208,
+ "Width":0.608542,
+ "Height":2.83104,
+ "Font":{
+ "Name":"Arial",
+ "Size":90000,
+ "Weight":400
+ },
+ "TextAlign":"TopLeft",
+ "TextOrientation":"U2DR2L1",
+ "Text":"Supplier-name:"
+ },
+ {
+ "Type":"MemoBox",
+ "Name":"MemoBox2",
+ "Left":3.04271,
+ "Top":0.820208,
+ "Width":0.608542,
+ "Height":2.38125,
+ "Font":{
+ "Name":"Arial",
+ "Size":90000,
+ "Weight":400
+ },
+ "TextAlign":"TopLeft",
+ "TextOrientation":"U2DR2L1",
+ "Text":"Supplier ID:"
+ },
+ {
+ "Type":"MemoBox",
+ "Name":"MemoBox3",
+ "Left":2.11667,
+ "Top":0.820208,
+ "Width":0.608542,
+ "Height":1.79917,
+ "Font":{
+ "Name":"Arial",
+ "Size":90000,
+ "Weight":400
+ },
+ "TextAlign":"TopLeft",
+ "TextOrientation":"U2DR2L1",
+ "Text":"Purchase:"
+ },
+ {
+ "Type":"MemoBox",
+ "Name":"MemoBox4",
+ "Left":1.21708,
+ "Top":0.820208,
+ "Width":0.608542,
+ "Height":2.83104,
+ "Font":{
+ "Name":"Arial",
+ "Size":90000,
+ "Weight":400
+ },
+ "TextAlign":"TopLeft",
+ "TextOrientation":"U2DR2L1",
+ "Text":"Supplier Data:"
+ },
+ {
+ "Type":"MemoBox",
+ "Name":"MemoBox5",
+ "Left":9.55146,
+ "Top":5.76792,
+ "Width":0.608542,
+ "Height":1.79917,
+ "Font":{
+ "Name":"Arial",
+ "Size":90000,
+ "Weight":400
+ },
+ "TextAlign":"TopLeft",
+ "TextOrientation":"U2DR2L1",
+ "Text":"PartNo.:"
+ },
+ {
+ "Type":"MemoBox",
+ "Name":"MemoBox6",
+ "Left":7.77875,
+ "Top":5.76792,
+ "Width":0.608542,
+ "Height":2.64583,
+ "Font":{
+ "Name":"Arial",
+ "Size":90000,
+ "Weight":400
+ },
+ "TextAlign":"TopLeft",
+ "TextOrientation":"U2DR2L1",
+ "Text":"Man.part No.:"
+ },
+ {
+ "Type":"MemoBox",
+ "Name":"MemoBox7",
+ "Left":8.96938,
+ "Top":5.76792,
+ "Width":0.608542,
+ "Height":1.79917,
+ "Font":{
+ "Name":"Arial",
+ "Size":90000,
+ "Weight":400
+ },
+ "TextAlign":"TopLeft",
+ "TextOrientation":"U2DR2L1",
+ "Text":"Quatity:"
+ },
+ {
+ "Type":"MemoBox",
+ "Name":"MemoBox8",
+ "Left":8.36083,
+ "Top":5.76792,
+ "Width":0.608542,
+ "Height":2.03729,
+ "Font":{
+ "Name":"Arial",
+ "Size":90000,
+ "Weight":400
+ },
+ "TextAlign":"TopLeft",
+ "TextOrientation":"U2DR2L1",
+ "Text":"Add.info:"
+ },
+ {
+ "Type":"MemoBox",
+ "Name":"MemoBox9",
+ "Left":7.19667,
+ "Top":5.74146,
+ "Width":0.582083,
+ "Height":2.06375,
+ "Font":{
+ "Name":"Arial",
+ "Size":90000,
+ "Weight":400
+ },
+ "TextAlign":"TopLeft",
+ "TextOrientation":"U2DR2L1",
+ "Text":"Man. Date:"
+ },
+ {
+ "Type":"MemoBox",
+ "Name":"MemoBox10",
+ "Left":6.61458,
+ "Top":5.74146,
+ "Width":0.608542,
+ "Height":1.71979,
+ "Font":{
+ "Name":"Arial",
+ "Size":90000,
+ "Weight":400
+ },
+ "TextAlign":"TopLeft",
+ "TextOrientation":"U2DR2L1",
+ "Text":"Man.Loc:"
+ },
+ {
+ "Type":"MemoBox",
+ "Name":"MemoBox11",
+ "Left":5.97958,
+ "Top":5.74146,
+ "Width":0.608542,
+ "Height":1.71979,
+ "Font":{
+ "Name":"Arial",
+ "Size":90000,
+ "Weight":400
+ },
+ "TextAlign":"TopLeft",
+ "TextOrientation":"U2DR2L1",
+ "Text":"1.Batch:"
+ },
+ {
+ "Type":"MemoBox",
+ "Name":"MemoBox12",
+ "Left":5.3975,
+ "Top":5.74146,
+ "Width":0.608542,
+ "Height":1.71979,
+ "Font":{
+ "Name":"Arial",
+ "Size":90000,
+ "Weight":400
+ },
+ "TextAlign":"TopLeft",
+ "TextOrientation":"U2DR2L1",
+ "Text":"2.Batch:"
+ },
+ {
+ "Type":"MemoBox",
+ "Name":"MemoBox13",
+ "Left":3.04271,
+ "Top":5.63563,
+ "Width":0.608542,
+ "Height":2.32833,
+ "Font":{
+ "Name":"Arial",
+ "Size":90000,
+ "Weight":400
+ },
+ "TextAlign":"TopLeft",
+ "TextOrientation":"U2DR2L1",
+ "Text":"Package-ID:"
+ },
+ {
+ "Type":"MemoBox",
+ "Name":"MemoBox14",
+ "Left":2.11667,
+ "Top":5.63563,
+ "Width":0.608542,
+ "Height":2.8575,
+ "Font":{
+ "Name":"Arial",
+ "Size":90000,
+ "Weight":400
+ },
+ "TextAlign":"TopLeft",
+ "TextOrientation":"U2DR2L1",
+ "Text":"Shipping Note:"
+ },
+ {
+ "Type":"MemoBox",
+ "Name":"MemoBox15",
+ "Left":9.02229,
+ "Top":10.3452,
+ "Width":0.608542,
+ "Height":1.77271,
+ "Font":{
+ "Name":"Arial",
+ "Size":90000,
+ "Weight":400
+ },
+ "TextAlign":"TopLeft",
+ "TextOrientation":"U2DR2L1",
+ "Text":"MS-Level:"
+ },
+ {
+ "Type":"MemoBox",
+ "Name":"MemoBox16",
+ "Left":9.57792,
+ "Top":10.3452,
+ "Width":0.608542,
+ "Height":1.37583,
+ "Font":{
+ "Name":"Arial",
+ "Size":90000,
+ "Weight":400
+ },
+ "TextAlign":"TopLeft",
+ "TextOrientation":"U2DR2L1",
+ "Text":"Index:"
+ },
+ {
+ "Type":"MemoBox",
+ "Name":"MemoBox17",
+ "Left":7.80521,
+ "Top":10.3452,
+ "Width":0.608542,
+ "Height":3.51896,
+ "Font":{
+ "Name":"Arial",
+ "Size":90000,
+ "Weight":400
+ },
+ "TextAlign":"TopLeft",
+ "TextOrientation":"U2DR2L1",
+ "Text":"Part description:"
+ },
+ {
+ "Type":"MemoBox",
+ "Name":"MemoBox18",
+ "Left":7.19667,
+ "Top":10.3452,
+ "Width":0.608542,
+ "Height":2.54,
+ "Font":{
+ "Name":"Arial",
+ "Size":90000,
+ "Weight":400
+ },
+ "TextAlign":"TopLeft",
+ "TextOrientation":"U2DR2L1",
+ "Text":"Expiry Date:"
+ },
+ {
+ "Type":"MemoBox",
+ "Name":"MemoBox19",
+ "Left":1.16417,
+ "Top":12.5413,
+ "Width":0.608542,
+ "Height":1.27,
+ "Font":{
+ "Name":"Arial",
+ "Size":142500,
+ "Bold":true
+ },
+ "TextAlign":"TopLeft",
+ "TextOrientation":"U2DR2L1",
+ "Text":"RoHS"
+ },
+ {
+ "Type":"FieldBox",
+ "Name":"FieldBox1",
+ "Left":3.99521,
+ "Top":3.20146,
+ "Width":0.608542,
+ "Height":3.46604,
+ "Font":{
+ "Name":"Arial",
+ "Size":90000,
+ "Weight":400
+ },
+ "TextAlign":"TopLeft",
+ "TextOrientation":"U2DR2L1",
+ "DataField":"SupplierName"
+ },
+ {
+ "Type":"FieldBox",
+ "Name":"FieldBox2",
+ "Left":3.04271,
+ "Top":2.80458,
+ "Width":0.608542,
+ "Height":2.24896,
+ "Font":{
+ "Name":"Arial",
+ "Size":90000,
+ "Weight":400
+ },
+ "TextAlign":"TopLeft",
+ "TextOrientation":"U2DR2L1",
+ "DataField":"SupplierID"
+ },
+ {
+ "Type":"FieldBox",
+ "Name":"FieldBox3",
+ "Left":2.11667,
+ "Top":2.56646,
+ "Width":0.608542,
+ "Height":2.24896,
+ "Font":{
+ "Name":"Arial",
+ "Size":90000,
+ "Weight":400
+ },
+ "TextAlign":"TopLeft",
+ "TextOrientation":"U2DR2L1",
+ "DataField":"Purchase"
+ },
+ {
+ "Type":"FieldBox",
+ "Name":"FieldBox4",
+ "Left":1.21708,
+ "Top":3.06917,
+ "Width":0.608542,
+ "Height":2.46063,
+ "Font":{
+ "Name":"Arial",
+ "Size":90000,
+ "Weight":400
+ },
+ "TextAlign":"TopLeft",
+ "TextOrientation":"U2DR2L1",
+ "DataField":"SupplierData"
+ },
+ {
+ "Type":"FieldBox",
+ "Name":"FieldBox5",
+ "Left":2.11667,
+ "Top":7.96396,
+ "Width":0.608542,
+ "Height":4.445,
+ "Font":{
+ "Name":"Arial",
+ "Size":90000,
+ "Weight":400
+ },
+ "TextAlign":"TopLeft",
+ "TextOrientation":"U2DR2L1",
+ "DataField":"ShippingNote"
+ },
+ {
+ "Type":"FieldBox",
+ "Name":"FieldBox6",
+ "Left":3.06917,
+ "Top":7.62,
+ "Width":0.608542,
+ "Height":3.62479,
+ "Font":{
+ "Name":"Arial",
+ "Size":90000,
+ "Weight":400
+ },
+ "TextAlign":"TopLeft",
+ "TextOrientation":"U2DR2L1",
+ "DataField":"PackageID"
+ },
+ {
+ "Type":"FieldBox",
+ "Name":"FieldBox7",
+ "Left":5.3975,
+ "Top":7.11729,
+ "Width":0.608542,
+ "Height":2.24896,
+ "Font":{
+ "Name":"Arial",
+ "Size":90000,
+ "Weight":400
+ },
+ "TextAlign":"TopLeft",
+ "TextOrientation":"U2DR2L1",
+ "DataField":"2Batch"
+ },
+ {
+ "Type":"FieldBox",
+ "Name":"FieldBox8",
+ "Left":5.97958,
+ "Top":7.11729,
+ "Width":0.582083,
+ "Height":2.27542,
+ "Font":{
+ "Name":"Arial",
+ "Size":90000,
+ "Weight":400
+ },
+ "TextAlign":"TopLeft",
+ "TextOrientation":"U2DR2L1",
+ "DataField":"1Batch"
+ },
+ {
+ "Type":"FieldBox",
+ "Name":"FieldBox9",
+ "Left":6.61458,
+ "Top":7.19667,
+ "Width":0.582083,
+ "Height":2.91042,
+ "Font":{
+ "Name":"Arial",
+ "Size":90000,
+ "Weight":400
+ },
+ "TextAlign":"TopLeft",
+ "TextOrientation":"U2DR2L1",
+ "DataField":"ManLoc"
+ },
+ {
+ "Type":"FieldBox",
+ "Name":"FieldBox10",
+ "Left":7.19667,
+ "Top":7.59354,
+ "Width":0.582083,
+ "Height":2.24896,
+ "Font":{
+ "Name":"Arial",
+ "Size":90000,
+ "Weight":400
+ },
+ "TextAlign":"TopLeft",
+ "TextOrientation":"U2DR2L1",
+ "DataField":"ManDate"
+ },
+ {
+ "Type":"FieldBox",
+ "Name":"FieldBox11",
+ "Left":7.77875,
+ "Top":7.99042,
+ "Width":0.582083,
+ "Height":2.24896,
+ "Font":{
+ "Name":"Arial",
+ "Size":90000,
+ "Weight":400
+ },
+ "TextAlign":"TopLeft",
+ "TextOrientation":"U2DR2L1",
+ "DataField":"ManPartNo"
+ },
+ {
+ "Type":"FieldBox",
+ "Name":"FieldBox12",
+ "Left":8.36083,
+ "Top":7.19667,
+ "Width":0.582083,
+ "Height":2.24896,
+ "Font":{
+ "Name":"Arial",
+ "Size":90000,
+ "Weight":400
+ },
+ "TextAlign":"TopLeft",
+ "TextOrientation":"U2DR2L1",
+ "DataField":"Addinfo"
+ },
+ {
+ "Type":"FieldBox",
+ "Name":"FieldBox14",
+ "Left":9.55146,
+ "Top":7.19667,
+ "Width":0.582083,
+ "Height":3.25438,
+ "Font":{
+ "Name":"Arial",
+ "Size":90000,
+ "Bold":true
+ },
+ "TextAlign":"TopLeft",
+ "TextOrientation":"U2DR2L1",
+ "DataField":"PartNo"
+ },
+ {
+ "Type":"FieldBox",
+ "Name":"FieldBox15",
+ "Left":9.57792,
+ "Top":11.4035,
+ "Width":0.582083,
+ "Height":2.24896,
+ "Font":{
+ "Name":"Arial",
+ "Size":90000,
+ "Weight":400
+ },
+ "TextAlign":"TopLeft",
+ "TextOrientation":"U2DR2L1",
+ "DataField":"Index"
+ },
+ {
+ "Type":"FieldBox",
+ "Name":"FieldBox16",
+ "Left":9.02229,
+ "Top":12.0121,
+ "Width":0.582083,
+ "Height":2.24896,
+ "Font":{
+ "Name":"Arial",
+ "Size":90000,
+ "Weight":400
+ },
+ "TextAlign":"TopLeft",
+ "TextOrientation":"U2DR2L1",
+ "DataField":"MS-Level"
+ },
+ {
+ "Type":"FieldBox",
+ "Name":"FieldBox17",
+ "Left":7.80521,
+ "Top":12.991,
+ "Width":0.582083,
+ "Height":2.24896,
+ "Font":{
+ "Name":"Arial",
+ "Size":90000,
+ "Weight":400
+ },
+ "TextAlign":"TopLeft",
+ "TextOrientation":"U2DR2L1",
+ "DataField":"PartDescription"
+ },
+ {
+ "Type":"FieldBox",
+ "Name":"FieldBox18",
+ "Left":7.19667,
+ "Top":12.3825,
+ "Width":0.582083,
+ "Height":2.24896,
+ "Font":{
+ "Name":"Arial",
+ "Size":90000,
+ "Weight":400
+ },
+ "TextAlign":"TopLeft",
+ "TextOrientation":"U2DR2L1",
+ "DataField":"ExpiryDate"
+ },
+ {
+ "Type":"FieldBox",
+ "Name":"FieldBox19",
+ "Left":8.94292,
+ "Top":7.01146,
+ "Width":0.582083,
+ "Height":1.98438,
+ "Font":{
+ "Name":"Arial",
+ "Size":90000,
+ "Bold":true
+ },
+ "TextAlign":"TopLeft",
+ "TextOrientation":"U2DR2L1",
+ "DataField":"Quatity"
+ }
+ ],
+ "ColSpan":7,
+ "RowSpan":2
+ }
+ ]
+ }
+ ]
+ }
+ ]
+}
\ No newline at end of file
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_BadReason.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_BadReason.html"
index 5cccf2b..0bfee42 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_BadReason.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_BadReason.html"
@@ -186,7 +186,7 @@
var option = [];
var HModName = "Gy_BadReason";
//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
- var titleData = ["HItemID"];
+ var titleData = ["HItemID","榛樿宸ュ簭"];
//#endregion
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 101f624..f104892 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"
@@ -321,6 +321,16 @@
</div>
</div>
</div>
+ <div class="layui-inline">
+ <label class="layui-form-label">澶勭悊鍘熷洜:</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HBadReasonName" id="HBadReasonName" class="layui-input" value="" style="float:left;width:150px;" disabled>
+ <input type="hidden" name="HBadReasonID" id="HBadReasonID" class="layui-input" value="0" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HBadReasonList" id="HBadReasonList" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
</div>
</div>
<div class="layui-tab-item">
@@ -666,6 +676,8 @@
, "HHandleEmpName": data[0]["澶勭悊浜�"]
, "HHandleNote": data[0]["澶勭悊鍐呭"]
, "HHandleDate": data[0]["澶勭悊瀹屾垚鏃堕棿"]
+ , "HBadReasonID": data[0]["HBadReasonID"]
+ , "HBadReasonName": data[0]["澶勭悊鍘熷洜"]
, "HMainSourceInterID": data[0]["婧愬崟ID"] //婧愬崟ID
@@ -1147,6 +1159,45 @@
});
});
+ //澶勭悊鍘熷洜
+ form.on('submit(HBadReasonList)', function () {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '澶勭悊鍘熷洜',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_DisposeWayList.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('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HBadReasonName").val(checkStatus.data[0].澶勭悊鏂规鍚嶇О);
+ $("#HBadReasonID").val(checkStatus.data[0].HItemID);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ });
+
+
//澶勭悊浜�
form.on('submit(HHandleEmpList)', function () {
//椤甸潰灞�-鑷畾涔�
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\267\245\350\211\272\345\217\202\346\225\260\350\256\242\345\215\225\347\202\271\346\243\200\350\241\250/SB_EquipICMOTechParamBillEdit.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\267\245\350\211\272\345\217\202\346\225\260\350\256\242\345\215\225\347\202\271\346\243\200\350\241\250/SB_EquipICMOTechParamBillEdit.html"
index b9c55dc..762ce7e 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\267\245\350\211\272\345\217\202\346\225\260\350\256\242\345\215\225\347\202\271\346\243\200\350\241\250/SB_EquipICMOTechParamBillEdit.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\267\245\350\211\272\345\217\202\346\225\260\350\256\242\345\215\225\347\202\271\346\243\200\350\241\250/SB_EquipICMOTechParamBillEdit.html"
@@ -1577,7 +1577,7 @@
form.on('submit(btn_Cancel)', function () {
layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
//鎿嶄綔绫诲瀷锛圤perationType=1鏂板銆丱perationType=2缂栬緫锛�
- if (OperationType == 2) {
+ if (OperationType == 2 || OperationType == 1) {
Pub_Close(1);
}
else {
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 954c58f..d2e2ec7 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"
@@ -2362,10 +2362,10 @@
}
if (HQty > 0) {
document.querySelectorAll("[name='HCheckerResult']")[0].removeAttribute('checked'); //鍒犻櫎閫夋嫨灞炴��
- $("input:radio[name=HCheckerResult][value=" + false + "]").attr("checked", "true"); //娣诲姞閫夋嫨灞炴��
+ $("input:radio[name=HCheckerResult][value=" + false + "]").prop("checked", "true"); //娣诲姞閫夋嫨灞炴��
} else {
document.querySelectorAll("[name='HCheckerResult']")[1].removeAttribute('checked'); //鍒犻櫎閫夋嫨灞炴��
- $("input:radio[name=HCheckerResult][value=" + true + "]").attr("checked", "true"); //娣诲姞閫夋嫨灞炴��
+ $("input:radio[name=HCheckerResult][value=" + true + "]").prop("checked", "true"); //娣诲姞閫夋嫨灞炴��
}
form.render('radio');
}
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\243\200\351\252\214\345\217\226\346\240\267\350\277\230\346\240\267\345\215\225/QC_Add_BackSampleCheckBill.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\243\200\351\252\214\345\217\226\346\240\267\350\277\230\346\240\267\345\215\225/QC_Add_BackSampleCheckBill.html"
index 39f09a5..4e0023e 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\243\200\351\252\214\345\217\226\346\240\267\350\277\230\346\240\267\345\215\225/QC_Add_BackSampleCheckBill.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\243\200\351\252\214\345\217\226\346\240\267\350\277\230\346\240\267\345\215\225/QC_Add_BackSampleCheckBill.html"
@@ -301,7 +301,8 @@
//鍒濆鍖栧埗鍗曚汉鍜屽埗鍗曟椂闂�
$("#HMaker").val(sessionStorage["HUserName"]);
$("#HMakerDate").val(Format(new Date(), "yyyy-MM-dd"));
-
+ $("#HEmp").val(sessionStorage["HEmpID"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鎿嶄綔鍛業D
+ $("#HEmpName").val(sessionStorage["HEmpName"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鎿嶄綔鍛�
//鍒濆鍖栨棩鏈�
$("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
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 f1b5920..ee40cdf 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"
@@ -49,7 +49,16 @@
<div class="layui-input-block">
<input type="date" class="layui-input ForFilteringSchemes" id="HEndDate" style="width:190px;">
</div>
- </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">宸ュ簭鍚嶇О</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" lay-verify="HProcName" name="HProcName" id="HProcName" value="" style="background-color: #efefef4d; width: 65%; display: inline-block;" readonly>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHProc" id="btnHProc" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ </div>
+ </div>
<div class="layui-row" style="margin-top:5px;margin-left:82px;margin-bottom:5px;">
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鐗╂枡缂栫爜</label>
@@ -79,7 +88,7 @@
</div>
</div>
</div>
- <div class="layui-row" style="margin-top:5px;margin-left:82px;margin-bottom:5px;">
+ <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>
<div class="layui-input-block" style="margin-left: 120px; width: 185px;">
@@ -266,7 +275,6 @@
if (data1.count == 1) {
var data = [];//鍒楀瓧娈垫暟鎹�
var col = [];
- var totalArray = ["鏁伴噺", "鍏宠仈鏁伴噺", "鏈叧鑱旀暟閲�", "鎵撳嵃鏉＄爜鏁伴噺", "鏈墦鍗版潯鐮佹暟閲�", "瀹炴敹鏁伴噺", "閲戦"];
//缁欑┖鐨勬暟缁勮祴鍊�
for (var key in data1.list) {
data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
@@ -278,9 +286,7 @@
if ($.inArray(data[i].name, titleData) > -1) {
col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
}
- else if ($.inArray(data[i].name, totalArray) > -1) { //璁＄畻鍒�
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
- } else if (data[i].name == '鍗曟嵁鍙�') {//娣诲姞瓒呴摼鎺�
+ else if (data[i].name == '鍗曟嵁鍙�') {//娣诲姞瓒呴摼鎺�
col.push({
field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '鍗曟嵁鍙�', templet: function (d) {
return '<span style="color: blue;">' + d.鍗曟嵁鍙� + '</span>'
@@ -347,6 +353,7 @@
var HMaterName = $("#HMaterName").val();//鐗╂枡鍚嶇О
var HBatchNo = $("#HBatchNo").val();//鎵规鍙�
var HProjectNum = $("#HProjectNum").val();//椤圭洰鍙�
+ var HProcName = $("#HProcName").val();//宸ュ簭鍚嶇О
sWhere = {
HBeginDate: HBeginDate
@@ -358,6 +365,7 @@
, HMaterName: HMaterName
, HBatchNo: HBatchNo
, HProjectNum: HProjectNum
+ , HProcName: HProcName
}
set_InitGrid();
get_Display(JSON.stringify(sWhere));
@@ -375,6 +383,7 @@
$("#HMaterName").val("");//鐗╂枡鍚嶇О
$("#HBatchNo").val("");//鎵规鍙�
$("#HProjectNum").val("");//椤圭洰鍙�
+ $("#HProcName").val("");//宸ュ簭鍚嶇О
form.render('select');
sWhere = "";
@@ -456,6 +465,43 @@
}
+ //宸ュ簭
+ form.on('submit(btnHProc)', function () {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '宸ュ簭鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['90%', '90%'],
+ maxmin: true,
+ content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Process.html', 'yes'],
+ btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {
+
+ //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HProcName").val(checkStatus.data[0].宸ュ簭鍚嶇О);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ });
+
//闅愯棌鍒楄缃�
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_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 69ecbc6..4953cdb 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"
@@ -185,16 +185,32 @@
</div>
</div>
</div>
- <div>
+ <div class="layui-tab layui-tab-card">
<table class="" id="mainTable" lay-filter="mainTable"></table>
- <div id="histogram_Avg" style="width:99.5%;height:calc(100vh);margin-top:5px;">
+ <ul class="layui-tab-title">
+ <li class="layui-this">x虅绠″埗鍥�</li>
+ <li>R绠″埗鍥�</li>
+ <li>妫�娴嬪��</li>
+ </ul>
+ <div class="layui-tab-content">
+ <div class="layui-tab-item layui-show">
+ <!--x虅绠″埗鍥�-->
+ <div id="histogram_Avg" style="width: 99.5%; height: calc(100vh);">
- </div>
- <div id="histogram_Diff" style="width:99.5%;height:calc(100vh);margin-top:15px;">
+ </div>
+ </div>
+ <div class="layui-tab-item layui-show">
+ <!--R绠″埗鍥�-->
+ <div id="histogram_Diff" style="width: 99.5%; height: calc(100vh);">
- </div>
- <div id="histogram_SJZ" style="width:99.5%;height:calc(100vh);margin-top:15px;">
+ </div>
+ </div>
+ <div class="layui-tab-item layui-show">
+ <!--妫�娴嬪��-->
+ <div id="histogram_SJZ" style="width: 99.5%; height: calc(100vh);">
+ </div>
+ </div>
</div>
</div>
<script type="text/html" id="toolbarDemo">
@@ -446,6 +462,7 @@
var x_AVG = 0;
var x_SUM = 0;
var x_PPK = 0;
+ var x_CPK = 0;
var numCount = 0
var c4 = [0.7979, 0.8862, 0.9213, 0.9400, 0.9515, 0.9594, 0.9650, 0.9693, 0.9727, 0.9754, 0.9776, 0.9794, 0.9810, 0.9823, 0.9835, 0.9845, 0.9854, 0.9862, 0.9869, 0.9876, 0.9882, 0.9887, 0.9892, 0.9896];
@@ -467,7 +484,7 @@
}
x_PPK = Math.sqrt(calc(x_SUM, (numCount - 1), "/"));
-
+ x_CPK = Math.sqrt(calc(x_SUM, numCount, "/"));
var limit = $("#limit").val();
if (parseInt(limit) >= 9) {
$("#HCenterline_S").val(x_PPK.toFixed(4));
@@ -477,21 +494,53 @@
if (limit == 1) {
$("#HControlUpperLimit_X").val(calc(x_AVG, calc(x_PPK, 3, "*"), "+"))
$("#HControlLowerLimit_X").val(calc(x_AVG, calc(x_PPK, 3, "*"), "-"))
- }
- //涓婇檺
- if ($("#HUpLimit").val() != "" && $("#HDownLimit").val() == "") {
- var HUpLimit = calc(calc(calc(parseFloat($("#HUpLimit").val()), parseFloat($("#HTargetVal").val()), "+"), x_AVG, "-"), calc(calc(3, x_PPK, "*"), c4[option.data.length - 4], "/"), "/");
- $("#HPPK").val(HUpLimit.toFixed(4));
- }
- //涓嬮檺
- else if ($("#HDownLimit").val() != "" && $("#HUpLimit").val() == "") {
- var HDownLimit = calc(calc(x_AVG, calc(parseFloat($("#HDownLimit").val()), parseFloat($("#HTargetVal").val()), "+"), "-"), calc(calc(3, x_PPK, "*"), c4[option.data.length - 4], "/"), "/");
- $("#HPPK").val(HDownLimit.toFixed(4));
+ //璁＄畻鏍锋湰閲忎负1 鐨� ppk
+ var min = calc(calc(x_AVG, calc(parseFloat($("#HDownLimit").val()), parseFloat($("#HTargetVal").val()), "+"), "-"), calc(3, x_PPK, "*"), "/");
+ var max = calc(calc(calc(parseFloat($("#HUpLimit").val()), parseFloat($("#HTargetVal").val()), "+"), x_AVG, "-"), calc(3, x_PPK, "*"), "/");
+ var DataHCPK = min > max ? max : min;
+ $("#HPPK").val(DataHCPK);
+
+ //璁＄畻鏍锋湰閲忎负1 鐨� cpk
+
+ var cpkSum = 0;
+ var CPK_U = 0;
+ var CPK_N = 0;
+ for (var i = 1; i < option.cols[0].length; i++) {
+ for (var j = 0; j < option.data.length - 3; j++) {
+ if (i == 1) {
+ CPK_U = option.data[j][option.cols[0][i].field];
+ } else {
+ CPK_N = option.data[j][option.cols[0][i].field];
+ var data_un = CPK_U > CPK_N ? calc(CPK_U, CPK_N, "-") : calc(CPK_N, CPK_U, "-");
+ cpkSum = calc(cpkSum, data_un, "+");
+ CPK_U = CPK_N;
+ }
+ }
+ }
+ cpkSum = calc(cpkSum, option.cols[0].length - 2, "/");
+ var HAVG_CPK = calc(cpkSum, 1.128, "/");
+
+ min = calc(calc(x_AVG, calc(parseFloat($("#HDownLimit").val()), parseFloat($("#HTargetVal").val()), "+"), "-"), calc(3, HAVG_CPK, "*"), "/");
+ max = calc(calc(calc(parseFloat($("#HUpLimit").val()), parseFloat($("#HTargetVal").val()), "+"), x_AVG, "-"), calc(3, HAVG_CPK, "*"), "/");
+ DataHCPK = min > max ? max : min;
+
+ $("#HCPK").val(DataHCPK);
} else {
- var HUpLimit = calc(calc(calc(parseFloat($("#HUpLimit").val()), parseFloat($("#HTargetVal").val()), "+"), x_AVG, "-"), calc(calc(3, x_PPK, "*"), c4[option.data.length - 4], "/"), "/");
- var HDownLimit = (x_AVG - calc(parseFloat($("#HDownLimit").val()), parseFloat($("#HTargetVal").val()), "+")) / ((3 * x_PPK) / c4[option.data.length - 4]);
- $("#HPPK").val(HUpLimit > HDownLimit ? HDownLimit.toFixed(4) : HUpLimit.toFixed(4));
+ //涓婇檺
+ if ($("#HUpLimit").val() != "" && $("#HDownLimit").val() == "") {
+ var HUpLimit = calc(calc(calc(parseFloat($("#HUpLimit").val()), parseFloat($("#HTargetVal").val()), "+"), x_AVG, "-"), calc(calc(3, x_PPK, "*"), c4[option.data.length - 4], "/"), "/");
+ $("#HPPK").val(HUpLimit.toFixed(4));
+ }
+ //涓嬮檺
+ else if ($("#HDownLimit").val() != "" && $("#HUpLimit").val() == "") {
+ var HDownLimit = calc(calc(x_AVG, calc(parseFloat($("#HDownLimit").val()), parseFloat($("#HTargetVal").val()), "+"), "-"), calc(calc(3, x_PPK, "*"), c4[option.data.length - 4], "/"), "/");
+ $("#HPPK").val(HDownLimit.toFixed(4));
+ } else {
+ var HUpLimit = calc(calc(calc(parseFloat($("#HUpLimit").val()), parseFloat($("#HTargetVal").val()), "+"), x_AVG, "-"), calc(calc(3, x_PPK, "*"), c4[option.data.length - 4], "/"), "/");
+ var HDownLimit = (x_AVG - calc(parseFloat($("#HDownLimit").val()), parseFloat($("#HTargetVal").val()), "+")) / ((3 * x_PPK) / c4[option.data.length - 4]);
+ $("#HPPK").val(HUpLimit > HDownLimit ? HDownLimit.toFixed(4) : HUpLimit.toFixed(4));
+ }
}
}
@@ -535,30 +584,32 @@
$("#HControlUpperLimit_X").val(calc(x_AVG, calc(A2[$("#limit").val() - 1], s_AVG, "*"), "+"))
$("#HControlLowerLimit_X").val(calc(x_AVG, calc(A2[$("#limit").val() - 1], s_AVG, "*"), "-"))
}
-
-
+
//宸�� 鎺у埗涓婇檺 鎺у埗涓嬮檺
$("#HControlUpperLimit_S").val(calc(D4[$("#limit").val() - 1], s_AVG, "*"));
- $("#HControlLowerLimit_S").val(calc(D3[$("#limit").val() - 1], s_AVG, "*"))
+ $("#HControlLowerLimit_S").val(calc(D3[$("#limit").val() - 1], s_AVG, "*"));
+ var limit = $("#limit").val();
- //涓婇檺
- if ($("#HUpLimit").val() != "" && $("#HDownLimit").val() == "") {
- var HUpLimit = calc(calc(calc(parseFloat($("#HUpLimit").val()), parseFloat($("#HTargetVal").val()), "+"), x_AVG, "-"), (3 * s_CPK), "/");
- $("#HCPK").val(HUpLimit.toFixed(4));
- }
- //涓嬮檺
- else if ($("#HDownLimit").val() != "" && $("#HUpLimit").val() == "") {
- var HDownLimit = calc(calc(x_AVG, calc(parseFloat($("#HDownLimit").val()), parseFloat($("#HTargetVal").val()), "+"), "-"), (3 * s_CPK), "/");
- $("#HCPK").val(HDownLimit.toFixed(4));
- } else {
- var HUpLimit = calc(calc(calc(parseFloat($("#HUpLimit").val()), parseFloat($("#HTargetVal").val()), "+"), x_AVG, "-"), (3 * s_CPK), "/");
- var HDownLimit = calc(calc(x_AVG, calc(parseFloat($("#HDownLimit").val()), parseFloat($("#HTargetVal").val()), "+"), "-"), (3 * s_CPK), "/");
- if (s_CPK == 0) {
- $("#HCPK").val(0);
- } else {
- $("#HCPK").val(HUpLimit > HDownLimit ? HDownLimit.toFixed(4) : HUpLimit.toFixed(4));
+ if (limit > 1) {
+ //涓婇檺
+ if ($("#HUpLimit").val() != "" && $("#HDownLimit").val() == "") {
+ var HUpLimit = calc(calc(calc(parseFloat($("#HUpLimit").val()), parseFloat($("#HTargetVal").val()), "+"), x_AVG, "-"), (3 * s_CPK), "/");
+ $("#HCPK").val(HUpLimit.toFixed(4));
}
+ //涓嬮檺
+ else if ($("#HDownLimit").val() != "" && $("#HUpLimit").val() == "") {
+ var HDownLimit = calc(calc(x_AVG, calc(parseFloat($("#HDownLimit").val()), parseFloat($("#HTargetVal").val()), "+"), "-"), (3 * s_CPK), "/");
+ $("#HCPK").val(HDownLimit.toFixed(4));
+ } else {
+ var HUpLimit = calc(calc(calc(parseFloat($("#HUpLimit").val()), parseFloat($("#HTargetVal").val()), "+"), x_AVG, "-"), (3 * s_CPK), "/");
+ var HDownLimit = calc(calc(x_AVG, calc(parseFloat($("#HDownLimit").val()), parseFloat($("#HTargetVal").val()), "+"), "-"), (3 * s_CPK), "/");
+ if (s_CPK == 0) {
+ $("#HCPK").val(0);
+ } else {
+ $("#HCPK").val(HUpLimit > HDownLimit ? HDownLimit.toFixed(4) : HUpLimit.toFixed(4));
+ }
+ }
}
}
@@ -971,7 +1022,7 @@
//Type 2 鏍规嵁閫変腑鐨勭墿鏂欏幓鏌ヨ鏁版嵁
var sWheres = "";
if (Type == 1) {
- sWheres = " and 妫�楠岄」鐩唬鐮�='" + $("#HQCCheckItemNumber").val() + "'";
+ sWheres = " and 妫�楠岄」鐩唬鐮�='" + $("#HQCCheckItemNumber").val() + "' and 鐗╂枡浠ｇ爜='" + $("#HMaterNumber").val() + "'";
}
if (Type == 2) {
sWheres = " and 鐗╂枡浠ｇ爜='" + $("#HMaterNumber").val() + "'";
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_QualityMonthSumReport.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_QualityMonthSumReport.html"
index 283b4e5..e1587bc 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_QualityMonthSumReport.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_QualityMonthSumReport.html"
@@ -69,7 +69,7 @@
</select>
</div>
</div>
- <div class="layui-inline">
+ <div class="layui-inline" style="display:none">
<label class="layui-form-label" style="width: 85px;">椤圭洰鍙�</label>
<div class="layui-input-block" style="margin-left: 120px; width: 185px;">
<select name="HProject" id="HProject" class=" ForFilteringSchemes" lay-verify="HProject">
@@ -704,13 +704,13 @@
//鏌辩姸鍥剧粦瀹氭暟鎹�
var H_X = ['1鏈�', '2鏈�', '3鏈�', '4鏈�', '5鏈�', '6鏈�', '7鏈�', '8鏈�', '9鏈�', '10鏈�', '11鏈�', '12鏈�'];//X杞存爣棰�
- var HAverage = []; //y杞达細璐ㄩ噺闂ㄩ�冮�哥巼
+ var HAverage = []; //X杞达細璐ㄩ噺闂ㄩ�冮�哥巼
var HTarget = []; //y杞达細涓婇檺鍊�
for (let i = 0; i < option.data.length; i++) {
//鑾峰彇璐ㄩ噺闂ㄩ�冮�哥巼琛屾暟鍊�
if (option.data[i].椤圭洰 == '璐ㄩ噺闂ㄩ�冮�哥巼') {
for (let j = 1; j <= 12; j++) {
- HAverage.push(option.data[i][j + "鏈�"]);
+ HAverage.push((option.data[i][j + "鏈�"]).replace('%', ''));
}
}
//鑾峰彇涓婇檺鍊艰鏁板��
@@ -737,19 +737,25 @@
top: 'bottom', // 灏嗗浘渚嬫斁缃湪鍥捐〃鐨勪笅鏂�
left: 'center' // 鎴栬�� 'right'锛屾牴鎹渶瑕佽皟鏁存按骞充綅缃�
},
- //toolbox: { //宸ュ叿鏍�
- // show: true,
- // orient: 'vertical',
- // left: 'right',
- // top: 'center',
- // feature: {
- // mark: { show: true },
- // dataView: { show: true, readOnly: false },
- // magicType: { show: true, type: ['line', 'bar', 'stack'] },
- // restore: { show: true },
- // saveAsImage: { show: true }
- // }
- //},
+ tooltip: {
+ trigger: 'axis',
+ axisPointer: {
+ type: 'shadow'
+ },
+ formatter: function (params) {
+ let tooltipHtml = params[0].axisValue + '<br>'; // X杞存暟鍊�
+
+ params.forEach(function (item) {
+ if (item.seriesType === 'line') {
+ let valueToShow = parseFloat(item.value); // 灏嗗瓧绗︿覆杞崲涓烘暟鍊�
+ tooltipHtml += item.seriesName + ': ' + valueToShow.toFixed(3) + '%' + '<br>'; // 鎶樼嚎鍥炬暟鎹牸寮忓寲涓虹櫨鍒嗘瘮
+ }
+ });
+
+ return tooltipHtml;
+ }
+
+ },
grid:
{
left: '5%',
@@ -774,11 +780,7 @@
temp += '\n' + value.slice(i);
}
}
-
return temp;
-
- // 浣跨敤 '\n' 瀹炵幇鎹㈣
- //return value.length > 5 ? value.slice(0, 5) + '\n' + value.slice(5) : value;
},
width: 30 // 璁剧疆鍒诲害鏍囩鐨勫搴︼紝瓒呰繃杩欎釜瀹藉害浼氳嚜鍔ㄦ崲琛�
}
@@ -786,16 +788,23 @@
],
yAxis: [ //璁剧疆y杞存暟鎹被鍨�
{
- type: 'value'
+ type: 'value',
+ name: '涓婇檺鍊�',
+ axisLabel: {
+ formatter: '{value}'
+ }
}
],
series: [ //璁剧疆y杞存暟鎹�
{
name: '璐ㄩ噺闂ㄩ�冮�哥巼',
type: 'line',
- barWidth: 30,
+ barWidth: 10,
barGap: 0,
- label: labelOption,
+ label: {
+ show: true,
+ formatter: '{c}%'
+ },
emphasis: {
focus: 'series'
},
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 4606c0d..fb5e90e 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"
@@ -64,7 +64,7 @@
</div>
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">缁勭粐</label>
- <div class="layui-input-block" style="margin-left: 120px; width: 125px;">
+ <div class="layui-input-block" style="margin-left: 120px; width: 140px;">
<select name="HOrgID" id="HOrgID" lay-verify="HOrgID">
<!--鍔ㄦ�佹覆鏌撳勾浠�-->
</select>
@@ -99,6 +99,30 @@
<select name="HDivisionName" id="HDivisionName" class=" ForFilteringSchemes" lay-verify="HDivisionName">
<!--鍔ㄦ�佹覆鏌撶粍缁�-->
</select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鍒ゆ柇缁撴灉</label>
+ <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
+ <select name="HResult" id="HResult" lay-verify="HResult">
+ <option value="">璇烽�夋嫨</option>
+ <option value="鎶ュ簾">鎶ュ簾</option>
+ <option value="杩斿伐">杩斿伐</option>
+ <option value="鐗归噰">鐗归噰</option>
+ <option value="鏀捐">鏀捐</option>
+ <option value="宸ュ簾">宸ュ簾</option>
+ <option value="鏂欏簾">鏂欏簾</option>
+ <option value="鏍蜂欢淇濈暀">鏍蜂欢淇濈暀</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">宸ュ簭鍚嶇О</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" lay-verify="HProcName" name="HProcName" id="HProcName" value="" style="background-color: #efefef4d; width: 65%; display: inline-block;" readonly>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHProc" id="btnHProc" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
</div>
</div>
</div>
@@ -257,6 +281,43 @@
})
}
+ //宸ュ簭
+ form.on('submit(btnHProc)', function () {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '宸ュ簭鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['90%', '90%'],
+ maxmin: true,
+ content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Process.html', 'yes'],
+ btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {
+
+ //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HProcName").val(checkStatus.data[0].宸ュ簭鍚嶇О);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ });
+
function set_InitGrid() {
var columns = [];
@@ -338,6 +399,8 @@
var HProject = $("#HProject").val();//椤圭洰鍙�
var HBatchWork = $("#HBatchWork").val();//鏄惁閲忎骇
var HDivisionName = $("#HDivisionName").val();//浜嬩笟閮�
+ var HResult = $("#HResult").val();//鍒ゅ畾缁撴灉
+ var HProcName = $("#HProcName").val();//宸ュ簭鍚嶇О
sWhere = {
HYear: HYear
, HMonth: HMonth
@@ -346,6 +409,8 @@
, HProject: HProject
, HBatchWork: HBatchWork
, HDivisionName: HDivisionName
+ , HResult: HResult
+ , HProcName: HProcName
}
set_InitGrid();
get_Display(JSON.stringify(sWhere));
@@ -358,7 +423,9 @@
$("#HProcExchBillNo").val("");
$("#HProject").val("");
$("#HBatchWork").val("0");
- $("#HDivisionName").val("0");
+ $("#HDivisionName").val("0");
+ $("#HBatchWork").val("");
+ $("#HDivisionName").val("");
form.render('select');
sWhere = "";
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/MES_ProductionLinePackaging.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/MES_ProductionLinePackaging.html"
index 328d5cc..98f44f5 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/MES_ProductionLinePackaging.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/MES_ProductionLinePackaging.html"
@@ -53,6 +53,7 @@
<select name="LDM" lay-verify="required" id="LDM">
<option value="DU3" selected>DU3</option>
<option value="QDR">QDR</option>
+ <option value="AAA">15杞﹂棿</option>
<option value="鍏朵粬">鍏朵粬</option>
</select>
</div>
@@ -605,16 +606,30 @@
return;
}
+ if (LDM == "AAA" && SubBarcode.length != 50) {
+ playSound();
+ layer.alert("瀛愪欢鏉＄爜闀垮害涓嶄负50浣�!", { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ return;
+ }
+
if (SubBarcode.match(/[^\x00-\xff]/g) != null) {
playSound();
layer.alert("蹇呴』鏄崐瑙掑瓧绗�!", { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
return;
}
- if (LDM != "鍏朵粬" && BBM != "鍏朵粬" && reg.test(SubBarcode)) {
- playSound();
- layer.alert("璇锋煡鐪嬪瓙浠舵潯鐮佸ぇ鍐欐槸鍚︽纭�!", { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
- return;
+ if (SubBarcode.length == 50) {
+ if (LDM != "鍏朵粬" && reg.test(SubBarcode)) {
+ playSound();
+ layer.alert("璇锋煡鐪嬪瓙浠舵潯鐮佸ぇ鍐欐槸鍚︽纭�!", { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ return;
+ }
+ } else {
+ if (LDM != "鍏朵粬" && BBM != "鍏朵粬" && reg.test(SubBarcode)) {
+ playSound();
+ layer.alert("璇锋煡鐪嬪瓙浠舵潯鐮佸ぇ鍐欐槸鍚︽纭�!", { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ return;
+ }
}
if (LDM != "鍏朵粬" && BBM != "鍏朵粬" && SubBarcode.indexOf(BBM) == -1) {
@@ -953,7 +968,11 @@
}
});
}
- $("#Print").click();
+ if (LDM == "AAA") {
+ $("#Print2").click();
+ } else {
+ $("#Print").click();
+ }
$("#HBarCode_White").val("");
//瀛愪欢鏉＄爜鏁伴噺宸叉壂瀹� 鏉＄爜鎵畬鍚�
if (pcmQty == pcmQtyFlag) {
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/MES_ProductionLinePackagingList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/MES_ProductionLinePackagingList.html"
index 0c54204..29e8ee2 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/MES_ProductionLinePackagingList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/MES_ProductionLinePackagingList.html"
@@ -21,7 +21,7 @@
<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">
+ <form class="layui-form" action="" lay-filter="component-form-group" >
<div class="layui-collapse">
<div class="layui-colla-item">
<div class="layui-colla-title layui-inline">
@@ -221,6 +221,9 @@
</button>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="Print1" id="Print1">
<i class="layui-icon layui-icon-file"></i>鏅彶鐗规墦鍗�
+ </button>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="WhiteSave" id="WhiteSave">
+ <i class="layui-icon layui-icon-file"></i>鐧芥爣鐢熸垚
</button>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="BtnDel" id="BtnDel">
<i class="layui-icon layui-icon-file"></i>鍒犻櫎
@@ -576,6 +579,28 @@
//});
+ //鐧芥爣鐢熸垚淇濆瓨
+ form.on('submit(WhiteSave)', function (obj) {//閫�鍑�
+ var checkStatus = table.checkStatus("mainTable"); //鑾峰彇閫変腑琛岀姸鎬�
+ if (checkStatus.data.length == 1) {
+ var HBarCode_Pack = checkStatus.data[0].鍞竴鏉＄爜;
+ layer.open({ //浣跨敤 layer鐨刼pen鎵撳紑寮瑰嚭 灞�
+ type: 2 //琛ㄧず寮瑰嚭灞傜殑鍐呭鏄竴涓� iframe
+ , area: ['100%', '100%']
+ , title: '鐧芥爣鎵撳嵃' //璁剧疆寮瑰嚭灞傜殑鍚嶅瓧鍜屽彉閲�
+ , closeBtn: 1//鏄剧ず鍏抽棴鎸夐挳
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../../杞﹂棿绠＄悊/浜х嚎/MES_WhiteLabelGeneration.html?OperationType=1&HBarCode_Pack=' + HBarCode_Pack //璁剧疆 iframe 鐨� URL锛孶RL 涓寘鍚簡鏌ヨ鍙傛暟锛屾潵璋冪敤鎵�闇�瑕佺殑鍊�
+ , resize: false, //鏄惁鍏佽鐢ㄦ埛璋冩暣寮瑰嚭澶у皬
+
+ })
+ } else {
+ layer.msg("璇烽�夋嫨涓�琛岃繘琛岀櫧鏍囩敓鎴�!");
+ }
+ });
+
form.on('submit(Print)', function (obj) {//閫�鍑�
var checkStatus = table.checkStatus("mainTable"); //鑾峰彇閫変腑琛岀姸鎬�
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/MES_WhiteLabelGeneration.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/MES_WhiteLabelGeneration.html"
new file mode 100644
index 0000000..ddb0b3d
--- /dev/null
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/MES_WhiteLabelGeneration.html"
@@ -0,0 +1,278 @@
+锘�<!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/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/grwebapp.js"></script>
+ <style>
+ .layui-form-item .layui-inline {
+ margin-top: 5px;
+ margin-bottom: 5px;
+ margin-right: 0px;
+ }
+
+ .layui-form-label {
+ width: 25%;
+ }
+ </style>
+</head>
+<body>
+
+ <div class="layui-fluid" style="padding: 0;">
+ <div class="layui-card" style="padding: 15px;">
+ <div class="layui-card-body" style="padding: 1px;">
+ <form id="form0" class="layui-form" lay-filter="component-form-group" action="">
+ <div class="layui-card-header">
+ <div class="layui-btn-group">
+ <button type="button" id="set_SaveBill" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_SaveBill">淇濆瓨</button>
+ <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Cancel">閫�鍑�</button>
+ </div>
+ </div>
+ <div class="layui-form-item" style="padding-top: 10px;">
+ <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
+ <ul class="layui-tab-title">
+ <li class="layui-this">鍩烘湰淇℃伅</li>
+ </ul>
+ <div class="layui-tab-content">
+ <div class="layui-tab-item layui-show">
+ <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" name="ProjectNo" id="ProjectNo" lay-verify="ProjectNo" value="" autocomplete="off" placeholder="" class="layui-input">
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">Ordering-Code</label>
+ <div class="layui-input-inline">
+ <input type="text" name="OrderingCode" id="OrderingCode" lay-verify="OrderingCode" value="" autocomplete="off" placeholder="" class="layui-input">
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">鍥剧焊鐗堟湰鍙�</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="DrawVersionNumber" id="DrawVersionNumber" value="" autocomplete="off">
+ </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" name="CustomerOrderNumber" id="CustomerOrderNumber" value="" lay-verify="CustomerOrderNumber" autocomplete="off" placeholder="" class="layui-input">
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">杩愬崟鍙�</label>
+ <div class="layui-input-inline">
+ <input type="text" name="WaybillNumber" id="WaybillNumber" value="" lay-verify="WaybillNumber" autocomplete="off" placeholder="" class="layui-input">
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">澶囨敞</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HRemark" id="HRemark" lay-verify="HRemark" value="" autocomplete="off" placeholder="" class="layui-input">
+ <input type="text" name="HBarCode_Pack" id="HBarCode_Pack" value="" hidden>
+ <input type="text" name="HBillType" id="HBillType" value="" hidden>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </form>
+ </div>
+ </div>
+ </div>
+
+ <script>
+ //#region 鎶樺彔娉ㄩ噴
+ //#endregion
+ 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 sWhere = "";
+ var date = new Date();
+ var day = date.getDate();
+ var month = date.getMonth() + 1;
+ var year = date.getFullYear();
+ var shijian = year + "-" + month + "-" + day;
+ //#endregion
+
+
+ //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+ //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
+ get_LoginIs();
+
+ //鑾峰彇椤甸潰璺宠浆鍙傛暟
+ var params = get_UrlVars();
+ if (typeof (params[params[0]]) == "undefined") {
+ var OperationType = 1;//鎿嶄綔绫诲瀷
+ } else {
+ var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
+ var linterid = params[params[1]];//婧愬崟id
+ $("#HBarCode_Pack").val(linterid);
+ }
+
+ //#endregion
+
+
+ //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+ //閫�鍑烘寜閽�
+ form.on('submit(Cancel)', function () {
+ Pub_Close(1);
+ })
+
+ //淇濆瓨鎸夐挳
+ form.on('submit(set_SaveBill)', function (data) {
+ set_SaveBill(data);
+ });
+
+ //#endregion
+
+
+ //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
+
+ //#region 鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
+ function get_LoginIs() {
+ 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 淇濆瓨鏂规硶
+ function set_SaveBill(data) {
+
+ var sMainStr = JSON.stringify(data.field);
+ if ($("#ProjectNo").val()=="") {
+ layer.msg("鍐呴儴椤圭洰鍙蜂笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+ if ($("#OrderingCode").val()=="") {
+ layer.msg("Ordering-Code涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+ if ($("#DrawVersionNumber").val() == "") {
+ layer.msg("鍥剧焊鐗堟湰鍙蜂笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+ if ($("#CustomerOrderNumber").val() == "") {
+ layer.msg("瀹㈡埛璁㈠崟鍙蜂笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+ if ($("#WaybillNumber").val() == "") {
+ layer.msg("杩愬崟鍙蜂笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+
+ $.ajax({
+ type: "POST",
+ url: GetWEBURL() + "Cj_StationOutBill_Detail/MES_WhiteLabelGeneration", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: true,
+ data: { "oMain": sMainStr },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ layer.msg(data.Message, { icon: 1 });
+ $('#set_SaveBill').addClass("layui-btn-disabled").attr("disabled", true);
+ Print();
+ }
+ else {
+ layer.alert(data.Message, { icon: 5 });
+ }
+ layer.closeAll("loading");
+ },
+ error: function (err) {
+ layer.alert("閿欒:" + err, { icon: 5 });
+ console.log("Reason" + sMainStr);
+ }
+ });
+ }
+ //#endregion
+
+
+ //鎵撳嵃鎸夐挳
+
+ function Print() {
+ //鎵撳紑鎵撳嵃妯℃澘
+ var linterid = $("#HBarCode_Pack").val();
+
+ var sWhere = "exec h_p_Cj_SMRPrintSelect '" + linterid + "'";
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Gy_SOPBillList/WindowPrintList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: true,
+ data: { "sWhere": sWhere },
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+
+ if (data.data.length != 0) {
+ var dataPrint = [];
+ dataPrint.push({ "HBarCode_White": data.data[0]["HBarCode_White"], "PartNo": data.data[0]["PartNo"], "Index": data.data[0]["Index"], "MS-Level": data.data[0]["MS-Level"], "Addinfo": data.data[0]["Addinfo"], "ManPartNo": data.data[0]["ManPartNo"], "PartDescription": data.data[0]["PartDescription"], "ManDate": data.data[0]["ManDate"], "ExpiryDate": data.data[0]["ExpiryDate"], "ManLoc": data.data[0]["ManLoc"], "1Batch": data.data[0]["1Batch"], "2Batch": data.data[0]["2Batch"], "SupplierName": data.data[0]["SupplierName"], "SupplierID": data.data[0]["SupplierID"], "Purchase": data.data[0]["Purchase"], "SupplierData": data.data[0]["SupplierData"], "PackageID": data.data[0]["PackageID"], "ShippingNote": data.data[0]["ShippingNote"]}
+ );
+
+ var Customer = {
+ "Table": dataPrint
+ }
+
+ var report1 = urlAddRandomNo("../../grf/15鐧芥爣鎵撳嵃.grf");
+
+ var args = {
+ type: "print",
+ showOptionDlg: false, //濡傛灉涓嶆樉绀烘墦鍗板璇濇鑰岀洿鎺ユ墦鍗帮紝灏嗘琛屾敞閲婂幓鎺夊嵆鍙�
+ report: report1,
+ data: Customer
+ };
+ //var args = {
+ // report: urlAddRandomNo("../../views/grf/鍖呰鍗曠墿鏂欐爣璇嗗崱(缃戦〉鐗�).grf"),
+ // data: Customer
+ //};
+ webapp_ws_ajax_run(args);
+ } else {
+ layer.msg("鏌ユ棤鏁版嵁!");
+ }
+ }
+ else {
+ layer.msg(data.Message, { icon: 5 });
+ }
+ layer.closeAll("loading");
+ },
+ error: function (err) {
+ layer.msg("閿欒:" + err, { icon: 5 });
+ }
+ })
+ }
+ //#endregion
+
+
+ //浠ヤ笂鏄痩ayui妯″潡
+ });
+ </script>
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\220\257\345\212\250\347\202\271\346\243\200\345\215\225/Sc_WorkBeginDotCheckBill.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\220\257\345\212\250\347\202\271\346\243\200\345\215\225/Sc_WorkBeginDotCheckBill.html"
index 3559bc0..b7d7a6f 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\220\257\345\212\250\347\202\271\346\243\200\345\215\225/Sc_WorkBeginDotCheckBill.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\220\257\345\212\250\347\202\271\346\243\200\345\215\225/Sc_WorkBeginDotCheckBill.html"
@@ -295,7 +295,7 @@
<!--鍒犻櫎-->
<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>
+ <!--<a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>-->
</script>
<!--琛屼笅鎷夐�夋嫨(缁撴灉)-->
<script type="text/html" id="HCheckResult">
@@ -425,6 +425,7 @@
get_InitGrid();
//鑾峰彇鎶ュ伐鍙拌烦杞暟鎹�
RoadBillEdit(HMaterID, HProcID, HSourceID, SCOrder);
+ Get_HNowMould(HSourceID);
//绂佺敤缁勭粐閫夐」
$('#HOrgID').attr("disabled", true);
}
@@ -1394,6 +1395,36 @@
}
//#endregion
+ //#region 鑾峰彇鏈�杩戠殑涓�娆′笂妯″崟璧嬪��
+ function Get_HNowMould(HSourceID)
+ {
+ $.ajax({
+ url: GetWEBURL() + "/Sc_WorkBeginDotCheckBill/锘縎c_WorkBeginDotCheckBill_HMould",
+ type: "GET",
+ async: false,
+ data: { "HSourceID": HSourceID, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ var tableSub = result.data;
+ //瀛愯〃 璧嬪��
+
+ for (var i = 0; i < option.data.length; i++) {
+ if (option.data[i]["HDotCheckType"] == "妯″叿") {
+ option.data[i]["HRelationName"] = tableSub[0]["妯″叿鍚嶇О"];
+ option.data[i]["HRelationID"] = tableSub[0]["HMouldID"] == null ? "0" : tableSub[0]["HMouldID"];
+ }
+ }
+ var tables = option.data;
+ option.data = option.data;
+ table.render(option);
+ for (var i = 0; i < tables.length; i++) {
+ $('#HDotCheckType' + (i + 1)).find("option[value='" + tables[i]["HDotCheckType"] + "']").attr("selected", true);
+ }
+ form.render('select');
+ }
+ })
+ }
+ //#endregion
+
//#endregion
});
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill_CurrentWork.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill_CurrentWork.html"
index 779f2c2..e53a123 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill_CurrentWork.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill_CurrentWork.html"
@@ -354,6 +354,8 @@
var HEmpName = ""; //鎿嶄綔鍛�
var HManagerName = ""; //璐熻矗浜�
var HGroupName = ""; //鐝粍
+ var HSourceID = 0; //鐢熶骇璧勬簮id
+ var HSourceName = ""; //鐢熶骇璧勬簮
var edit = function (data) {
HBillType = data[0].HBillType;
@@ -367,6 +369,7 @@
HICMOInterID = data[0].HICMOInterID;//鐢熶骇璁㈠崟涓诲唴鐮�
HICMOEntryID = data[0].HICMOEntryID;//鐢熶骇璁㈠崟瀛愬唴鐮�
HSourceID = data[0].HSourceID;//鐢熶骇璧勬簮id
+ HSourceName = data[0].HSourceName;//鐢熶骇璧勬簮
HEmpName = data[0].HEmpName;//鎿嶄綔鍛�
HManagerName = data[0].HManagerName;//璐熻矗浜�
HGroupName = data[0].HGroupName;//鐝粍
@@ -406,6 +409,8 @@
$("#HEmpName").text(HEmpName);//鎿嶄綔鍛�
$("#HManagerName").text(HManagerName);//璐熻矗浜�
$("#HGroupName").text(HGroupName);//鐝粍
+ $("#HSourceID").val(HSourceID);//鐢熶骇璧勬簮id
+ $("#HSourceName").val(HSourceName);//鐢熶骇璧勬簮
//#endregion
//#region 銆愪华琛ㄧ洏銆�
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBill.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBill.html"
index 8fce09d..ff0ee97 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBill.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBill.html"
@@ -554,7 +554,7 @@
//#region 閫�鍑烘寜閽�
form.on('submit(Cancel)', function () {
layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
- if (OperationType == 1) {
+ if (OperationType == 1) {
Pub_Close(closeType);
} else if (OperationType == 3) {
Pub_Close(1);
--
Gitblit v1.9.1