From 2e1310631f2f518db35557e9677a0b46844b8e75 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期五, 31 十月 2025 10:43:57 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/车间管理/单品过站_小卫/Cj_ProcessItemStationPlatform_batch.html | 92 +----
WebTM/views/grf/物料条码_海诚 (2).grf | 581 ++++++++++++++++++++++++++++++++++++
WebTM/layuiadmin/Scripts/webConfig.js | 4
WebTM/views/质量管理/检验方案单/QC_Add_CheckProject.html | 37 ++
WebTM/views/生产管理/制造周期报表/Sc_ProductionCycleBillList.html | 225 ++++++++++---
5 files changed, 813 insertions(+), 126 deletions(-)
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index ae8dc98..a69a64d 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -7,11 +7,11 @@
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄤ箰鏈湴閰嶇疆
// var WEBURL = "http://localhost:8082/API/"; //鏉滆春鏈湴閰嶇疆
var WEBURL = "http://localhost:8082/API/"; //寮犵憺骞挎湰鍦伴厤缃�
- //var WEBURL = "http://localhost:81/API/" //缈佹稕娑涙湰鍦伴厤缃�
+ var WEBURL = "http://localhost:81/API/" //缈佹稕娑涙湰鍦伴厤缃�
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄤ箰鏈湴閰嶇疆
//var WEBURL = "http://47.96.97.237/API/"; //鏅轰簯鏈嶅姟鍣�
/* var WEBURL = "http://localhost:8082/LuBaoAPI/"; //浣欐�濇澃鏈湴閰嶇疆*/
- var WEBURL = "http://localhost:81/API/"; // 闄堥晲鍝叉湰鍦伴厤缃�*/
+ //var WEBURL = "http://localhost:81/API/"; // 闄堥晲鍝叉湰鍦伴厤缃�*/
// var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉庢灄淇婃湰鍦伴厤缃�
//var WEBURL = "http://localhost:8088/ARAPI/"; //浣欐�濇澃鏈湴閰嶇疆(瀹夌憺)
//var WEBURL = "http://61.164.86.218:8099/ABAPI/"; //濂ラ偊
diff --git "a/WebTM/views/grf/\347\211\251\346\226\231\346\235\241\347\240\201_\346\265\267\350\257\232 \0502\051.grf" "b/WebTM/views/grf/\347\211\251\346\226\231\346\235\241\347\240\201_\346\265\267\350\257\232 \0502\051.grf"
new file mode 100644
index 0000000..430f0f8
--- /dev/null
+++ "b/WebTM/views/grf/\347\211\251\346\226\231\346\235\241\347\240\201_\346\265\267\350\257\232 \0502\051.grf"
@@ -0,0 +1,581 @@
+锘縊bject Report
+ Version='6.8.2.2'
+ Title='鐢熶骇浠诲姟鍗�'
+ PrintAsDesignPaper=F
+ Object Font
+ Name='瀹嬩綋'
+ Size=135000,0
+ Weight=400
+ Charset=134
+ End
+ Object Printer
+ Size=256
+ Width=8
+ Height=5
+ LeftMargin=0
+ TopMargin=0
+ RightMargin=0
+ BottomMargin=0
+ End
+ Object DetailGrid
+ CenterView=T
+ ShowColLine=F
+ ShowRowLine=F
+ Object Border
+ Styles=[]
+ End
+ Object Recordset
+ Items Field
+ Item
+ Name='鏉＄爜缂栧彿'
+ End
+ Item
+ Name='渚涘簲鍟�'
+ End
+ Item
+ Name='鐗╂枡浠ｇ爜'
+ End
+ Item
+ Name='鐗╂枡鍚嶇О'
+ End
+ Item
+ Name='瑙勬牸鍨嬪彿'
+ End
+ Item
+ Name='鏁伴噺'
+ Type=Float
+ Format='0'
+ End
+ Item
+ Name='鏃ユ湡'
+ Type=DateTime
+ Format='yyyy/MM/dd'
+ End
+ Item
+ Name='瀹㈡埛缂栧彿'
+ End
+ Item
+ Name='娆惧彿'
+ End
+ Item
+ Name='鍒嗙粍'
+ End
+ Item
+ Name='閲囪喘鍗曞彿'
+ End
+ End
+ End
+ Items Column
+ Item
+ Name='Column3'
+ Width=7.99042
+ End
+ End
+Object ColumnContent
+ Height=4.9
+ RowsPerPage=1
+ Items ColumnContentCell
+ Item
+ Column='Column3'
+ FreeCell=T
+ CanGrow=T
+ Items Control
+ Item
+ Type=FreeGrid
+ Name='FreeGrid1'
+ Left=0.264583
+ Top=0.15875
+ ColumnCount=2
+ RowCount=16
+ ShowColLine=F
+ ShowRowLine=F
+ Items FreeGridColumn
+ Item[2]
+ Width=4.5
+ End
+ End
+ Items FreeGridRow
+ Item[1]
+ Height=0.38
+ End
+ Item[2]
+ Height=0.2
+ End
+ Item[3]
+ Height=0.38
+ End
+ Item[4]
+ Height=0.2
+ End
+ Item[5]
+ Height=0.38
+ End
+ Item[6]
+ Height=0.2
+ End
+ Item[7]
+ Height=0.38
+ End
+ Item[8]
+ Height=0.2
+ End
+ Item[9]
+ Height=0.38
+ End
+ Item[10]
+ Height=0.2
+ End
+ Item[11]
+ Height=0.38
+ End
+ Item[12]
+ Height=0.2
+ End
+ Item[13]
+ Height=0.38
+ End
+ Item[14]
+ Height=0.2
+ End
+ Item[15]
+ Height=0.38
+ End
+ Item[16]
+ Height=0.2
+ End
+ End
+ Items FreeGridCell
+ Item[1,1]
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Weight=400
+ Charset=134
+ End
+ Text='渚涘簲鍟�:'
+ End
+ Item[2,1]
+ Object Font
+ Name='Arial'
+ Size=52500,0
+ Weight=400
+ End
+ Text='(Supplier)'
+ End
+ Item[3,1]
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Weight=400
+ Charset=134
+ End
+ Text='鐗╂枡缂栫爜:'
+ End
+ Item[4,1]
+ Object Font
+ Name='Arial'
+ Size=52500,0
+ Weight=400
+ End
+ Text='(Material Code)'
+ End
+ Item[5,1]
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Weight=400
+ Charset=134
+ End
+ Text='鐗╂枡鍚嶇О:'
+ End
+ Item[6,1]
+ Object Font
+ Name='Arial'
+ Size=52500,0
+ Weight=400
+ End
+ Text='(Material Code)'
+ End
+ Item[7,1]
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Weight=400
+ Charset=134
+ End
+ Text='娆惧彿:'
+ End
+ Item[7,2]
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Weight=400
+ Charset=134
+ End
+ Text='閲囪喘鍗曞彿:'
+ End
+ Item[8,1]
+ Object Font
+ Name='Arial'
+ Size=52500,0
+ Weight=400
+ End
+ Text='(Style No.)'
+ End
+ Item[8,2]
+ Object Font
+ Name='Arial'
+ Size=52500,0
+ Weight=400
+ End
+ Text='(Purchase Order No.)'
+ End
+ Item[9,1]
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Weight=400
+ Charset=134
+ End
+ Text='鍒嗙粍:'
+ End
+ Item[9,2]
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Weight=400
+ Charset=134
+ End
+ Text='瑙勬牸:'
+ End
+ Item[10,1]
+ Object Font
+ Name='Arial'
+ Size=52500,0
+ Weight=400
+ End
+ Text='(Group)'
+ End
+ Item[10,2]
+ Object Font
+ Name='Arial'
+ Size=52500,0
+ Weight=400
+ End
+ Text='(SKU NO.)'
+ End
+ Item[11,1]
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Weight=400
+ Charset=134
+ End
+ Text='鏁伴噺:'
+ End
+ Item[11,2]
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Weight=400
+ Charset=134
+ End
+ Text='鏃ユ湡:'
+ End
+ Item[12,1]
+ Object Font
+ Name='Arial'
+ Size=52500,0
+ Weight=400
+ End
+ Text='(Quantity)'
+ End
+ Item[12,2]
+ Object Font
+ Name='Arial'
+ Size=52500,0
+ Weight=400
+ End
+ Text='(Date)'
+ End
+ Item[13,1]
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Weight=400
+ Charset=134
+ End
+ Text='妫�楠屽憳:'
+ End
+ Item[13,2]
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Weight=400
+ Charset=134
+ End
+ Text='瀹㈡埛缂栧彿:'
+ End
+ Item[14,1]
+ Object Font
+ Name='Arial'
+ Size=52500,0
+ Weight=400
+ End
+ Text='(QC)'
+ End
+ Item[14,2]
+ Object Font
+ Name='Arial'
+ Size=52500,0
+ Weight=400
+ End
+ Text='(Consumer No.)'
+ End
+ Item[15,1]
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Weight=400
+ Charset=134
+ End
+ Text='妫�楠岀粨鏋�:'
+ End
+ Item[16,1]
+ Object Font
+ Name='Arial'
+ Size=52500,0
+ Weight=400
+ End
+ Text='(Inspection status)'
+ End
+ End
+ End
+ Item
+ Type=Barcode
+ Name='Barcode1'
+ Left=6.00604
+ Top=0.211667
+ Width=1.5875
+ Height=1.5
+ BarcodeType=QRCode
+ CaptionPosition=None
+ Text='[#鏉＄爜缂栧彿#]'
+ End
+ Item
+ Type=FieldBox
+ Name='FieldBox9'
+ Left=1.5875
+ Top=0.15875
+ Width=4.20688
+ Height=0.45
+ Object Font
+ Name='瀹嬩綋'
+ Size=105000,0
+ Weight=400
+ Charset=134
+ End
+ ShrinkFontToFit=T
+ DataField='渚涘簲鍟�'
+ End
+ Item
+ Type=StaticBox
+ Name='StaticBox5'
+ Left=3.20146
+ Top=4.20688
+ Width=3.99521
+ Height=0.45
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Weight=400
+ Charset=134
+ End
+ Text='鈻″悎鏍� 鈻′笉鍚堟牸 鈻＄壒閲�'
+ End
+ Item
+ Type=StaticBox
+ Name='StaticBox6'
+ Left=3.41313
+ Top=4.60375
+ Width=3.99521
+ Height=0.211667
+ Object Font
+ Name='Arial'
+ Size=52500,0
+ Weight=400
+ End
+ Text='(Pass) (Fail) (Spec.accepted)'
+ End
+ Item
+ Type=FieldBox
+ Name='FieldBox10'
+ Left=2.19604
+ Top=0.714375
+ Width=3.59833
+ Height=0.45
+ Object Font
+ Name='瀹嬩綋'
+ Size=105000,0
+ Weight=400
+ Charset=134
+ End
+ ShrinkFontToFit=T
+ DataField='鐗╂枡浠ｇ爜'
+ End
+ Item
+ Type=FieldBox
+ Name='FieldBox11'
+ Left=1.79917
+ Top=1.29646
+ Width=3.99521
+ Height=0.45
+ Object Font
+ Name='瀹嬩綋'
+ Size=105000,0
+ Weight=400
+ Charset=134
+ End
+ ShrinkFontToFit=T
+ DataField='鐗╂枡鍚嶇О'
+ End
+ Item
+ Type=FieldBox
+ Name='FieldBox12'
+ Left=1.19063
+ Top=1.905
+ Width=2.61938
+ Height=0.45
+ Object Font
+ Name='瀹嬩綋'
+ Size=120000,0
+ Bold=T
+ Charset=134
+ End
+ ShrinkFontToFit=T
+ DataField='娆惧彿'
+ End
+ Item
+ Type=FieldBox
+ Name='FieldBox13'
+ Left=1.19063
+ Top=2.48708
+ Width=2.61938
+ Height=0.45
+ Object Font
+ Name='瀹嬩綋'
+ Size=105000,0
+ Weight=400
+ Charset=134
+ End
+ ShrinkFontToFit=T
+ DataField='鍒嗙粍'
+ End
+ Item
+ Type=FieldBox
+ Name='FieldBox14'
+ Left=4.78896
+ Top=1.87854
+ Width=2.80458
+ Height=0.45
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Bold=T
+ Charset=134
+ End
+ ShrinkFontToFit=T
+ DataField='閲囪喘鍗曞彿'
+ End
+ Item
+ Type=FieldBox
+ Name='FieldBox15'
+ Left=4.20688
+ Top=2.46063
+ Width=3.38667
+ Height=0.45
+ Object Font
+ Name='瀹嬩綋'
+ Size=105000,0
+ Weight=400
+ Charset=134
+ End
+ ShrinkFontToFit=T
+ DataField='瑙勬牸鍨嬪彿'
+ End
+ Item
+ Type=FieldBox
+ Name='FieldBox16'
+ Left=4.20688
+ Top=3.04271
+ Width=3.38667
+ Height=0.45
+ Object Font
+ Name='瀹嬩綋'
+ Size=105000,0
+ Weight=400
+ Charset=134
+ End
+ ShrinkFontToFit=T
+ DataField='鏃ユ湡'
+ End
+ Item
+ Type=FieldBox
+ Name='FieldBox17'
+ Left=4.78896
+ Top=3.62479
+ Width=2.80458
+ Height=0.45
+ Object Font
+ Name='瀹嬩綋'
+ Size=105000,0
+ Weight=400
+ Charset=134
+ End
+ ShrinkFontToFit=T
+ DataField='瀹㈡埛缂栧彿'
+ End
+ Item
+ Type=MemoBox
+ Name='MemoBox1'
+ Left=1.19063
+ Top=3.06917
+ Width=2.61938
+ Height=0.45
+ Object Font
+ Name='瀹嬩綋'
+ Size=120000,0
+ Bold=T
+ Charset=134
+ End
+ Text='[#鏁伴噺#]'
+ End
+End
+End
+End
+End
+Object ColumnTitle
+ Height=0
+ Items ColumnTitleCell
+ Item
+ GroupTitle=F
+ Column='Column3'
+ Text='Column1'
+ End
+ End
+End
+End
+Items ReportHeader
+ Item
+ Name='ReportHeader1'
+ Height=0
+ RepeatOnPage=T
+ End
+End
+Items ReportFooter
+ Item
+ Name='ReportFooter1'
+ Height=0
+ End
+End
+End
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\210\266\351\200\240\345\221\250\346\234\237\346\212\245\350\241\250/Sc_ProductionCycleBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\210\266\351\200\240\345\221\250\346\234\237\346\212\245\350\241\250/Sc_ProductionCycleBillList.html"
index ffe6dc8..a982037 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\210\266\351\200\240\345\221\250\346\234\237\346\212\245\350\241\250/Sc_ProductionCycleBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\210\266\351\200\240\345\221\250\346\234\237\346\212\245\350\241\250/Sc_ProductionCycleBillList.html"
@@ -1,5 +1,6 @@
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
+
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>鍒堕�犲懆鏈熸姤琛�</title>
@@ -15,8 +16,9 @@
<script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
<script src="../../../layuiadmin/PubCustom.js"></script>
-
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
</head>
+
<body>
<div class="layui-fluid">
<div class="layui-col-md12">
@@ -31,51 +33,85 @@
</div>
</div>
<div class="layui-inline">
+ <label class="layui-form-label">鏃ユ湡闂撮殧</label>
+ <div class="layui-input-block">
+ <select name="HInitTimeCycle" id="HInitTimeCycle" class="ForFilteringSchemes"
+ lay-filter="HInitTimeCycle" style="width:190px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">寮�濮嬫棩鏈�</label>
+ <div class="layui-input-block">
+ <input type="date" class="layui-input ForFilteringSchemes" id="HBeginDate"
+ style="width:190px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">缁撴潫鏃ユ湡</label>
+ <div class="layui-input-block">
+ <input type="date" class="layui-input ForFilteringSchemes" id="HEndDate"
+ style="width:190px;">
+ </div>
+ </div>
+ <div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">閿�鍞鍗曞彿</label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input ForFilteringSchemes" name="HSeOrderBillNo" id="HSeOrderBillNo">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HSeOrderBillNo"
+ id="HSeOrderBillNo">
</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 ForFilteringSchemes" name="HMaterNumber" id="HMaterNumber">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HMaterNumber"
+ id="HMaterNumber">
</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="HOrgID" id="HOrgID" lay-verify="HOrgID" class="ForFilteringSchemes">
+ <select name="HOrgID" id="HOrgID" lay-verify="HOrgID"
+ class="ForFilteringSchemes">
<!--鍔ㄦ�佹覆鏌撶粍缁�-->
</select>
</div>
</div>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit=""
+ lay-filter="btnSearch" id="btnSearch">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit=""
+ lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
<!--鏄剧ず褰撳墠杩囨护鏂规-->
<div class="layui-inline" style="margin-left:5px;">
- <div style="text-align:center;font-size:15px;font-weight:bold;color:#fc9393" id="HFilterScheme_Now"></div>
+ <div style="text-align:center;font-size:15px;font-weight:bold;color:#fc9393"
+ id="HFilterScheme_Now"></div>
</div>
<div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
<div class="layui-row" style="margin-top:5px">
<div class="layui-inline">
<label class="layui-form-label">杩囨护</label>
<div class="layui-input-block">
- <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;" class="ForFilteringSchemes">
+ <select name="ColName" id="ColName" lay-filter="ColName"
+ style="width:190px;" class="ForFilteringSchemes">
</select>
</div>
</div>
<div class="layui-inline">
- <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;" class="ForFilteringSchemes">
+ <select name="Comparator" id="Comparator" lay-filter="Comparator"
+ style="width:190px;" class="ForFilteringSchemes">
<option value="0" selected="selected"></option>
<option value="=">=</option>
<option value=">=">>=</option>
<option value=">">></option>
- <option value="<="><=</option>
- <option value="<"><</option>
- <option value="<>"><></option>
+ <option value="<=">
+ <=< /option>
+ <option value="<">
+ << /option>
+ <option value="<>">
+ <>
+ </option>
<option value="7">鍖呭惈</option>
<option value="8">宸﹀寘鍚�</option>
<option value="9">鍙冲寘鍚�</option>
@@ -83,26 +119,33 @@
</select>
</div>
<div class="layui-inline">
- <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
+ <input type="text" class="layui-input ForFilteringSchemes" value=""
+ name="ColContent" id="ColContent">
</div>
</div>
<div class="layui-row" style=" margin-top: 10px;">
<div class="layui-inline">
<label class="layui-form-label">杩囨护</label>
<div class="layui-input-block">
- <select name="ColName1" id="ColName1" class="ForFilteringSchemes" lay-filter="ColName1" style="width:190px;">
+ <select name="ColName1" id="ColName1" class="ForFilteringSchemes"
+ lay-filter="ColName1" style="width:190px;">
</select>
</div>
</div>
<div class="layui-inline">
- <select name="Comparator1" id="Comparator1" class="ForFilteringSchemes" lay-filter="Comparator1" style="width:190px;">
+ <select name="Comparator1" id="Comparator1" class="ForFilteringSchemes"
+ lay-filter="Comparator1" style="width:190px;">
<option value="0" selected="selected"></option>
<option value="=">=</option>
<option value=">=">>=</option>
<option value=">">></option>
- <option value="<="><=</option>
- <option value="<"><</option>
- <option value="<>"><></option>
+ <option value="<=">
+ <=< /option>
+ <option value="<">
+ << /option>
+ <option value="<>">
+ <>
+ </option>
<option value="7">鍖呭惈</option>
<option value="8">宸﹀寘鍚�</option>
<option value="9">鍙冲寘鍚�</option>
@@ -110,7 +153,8 @@
</select>
</div>
<div class="layui-inline">
- <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent1" id="ColContent1">
+ <input type="text" class="layui-input ForFilteringSchemes" value=""
+ name="ColContent1" id="ColContent1">
</div>
</div>
@@ -118,19 +162,25 @@
<div class="layui-inline">
<label class="layui-form-label">杩囨护</label>
<div class="layui-input-block">
- <select name="ColName2" id="ColName2" class="ForFilteringSchemes" lay-filter="ColName2" style="width:190px;">
+ <select name="ColName2" id="ColName2" class="ForFilteringSchemes"
+ lay-filter="ColName2" style="width:190px;">
</select>
</div>
</div>
<div class="layui-inline">
- <select name="Comparator2" id="Comparator2" class="ForFilteringSchemes" lay-filter="Comparator2" style="width:190px;">
+ <select name="Comparator2" id="Comparator2" class="ForFilteringSchemes"
+ lay-filter="Comparator2" style="width:190px;">
<option value="0" selected="selected"></option>
<option value="=">=</option>
<option value=">=">>=</option>
<option value=">">></option>
- <option value="<="><=</option>
- <option value="<"><</option>
- <option value="<>"><></option>
+ <option value="<=">
+ <=< /option>
+ <option value="<">
+ << /option>
+ <option value="<>">
+ <>
+ </option>
<option value="7">鍖呭惈</option>
<option value="8">宸﹀寘鍚�</option>
<option value="9">鍙冲寘鍚�</option>
@@ -138,7 +188,8 @@
</select>
</div>
<div class="layui-inline">
- <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
+ <input type="text" class="layui-input ForFilteringSchemes" value=""
+ name="ColContent2" id="ColContent2">
</div>
</div>
</div>
@@ -179,7 +230,7 @@
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
index: 'lib/index', //涓诲叆鍙ｆā鍧�
- }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate','soulTable'], function () {
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate', 'soulTable'], function () {
//#region 鍏敤鍙橀噺
var $ = layui.$
@@ -199,7 +250,7 @@
var HBillType = "Sc_ProductionCycleBillList";
var set_HideButton_ID = "toolbarDemo_ButtonSet";//闇�瑕佽缃殑鎸夐挳鐨勭埗绾ц妭鐐圭殑id
//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
- var titleData = ["HItemID", "Hprocid", "HUSEORGID", "HCREATEORGID","HParentID", 'sorderid', 'HInterID', 'HEntryID','HProcExchInterID'];
+ var titleData = ["HItemID", "Hprocid", "HUSEORGID", "HCREATEORGID", "HParentID", 'sorderid', 'HInterID', 'HEntryID', 'HProcExchInterID'];
//#endregion
//#region 銆愯繃婊ゆ柟妗堛��
@@ -215,7 +266,7 @@
//#endregion
- //#region 杩涘叆椤甸潰鍗冲姞杞�
+ //#region 杩涘叆椤甸潰鍗冲姞杞�
var Htype = "";
//鑾峰彇椤甸潰璺宠浆鍙傛暟
var params = get_UrlVars();
@@ -228,14 +279,14 @@
//鍒濆鍖栫晫闈�
set_ClearBill();
- //#endregion
+ //#endregion
- //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+ //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
//#region 澶村伐鍏锋爮浜嬩欢
table.on('toolbar(mainTable)', function (obj) {
- switch (obj.event) {
+ switch (obj.event) {
//瀵煎嚭excel
case 'get_export':
get_Export();
@@ -248,7 +299,7 @@
break;
//閫�鍑烘寜閽�
case 'get_Exit': Pub_Close(2);
- break;
+ break;
//淇濆瓨鏂规
case 'set_SaveScheme': set_SaveScheme();
break;
@@ -290,7 +341,7 @@
//瀛樺偍鏉′欢
get_WriteConfigFile();
get_FastQuery(2);
-
+
});
//#endregion
@@ -308,6 +359,25 @@
}
});
+ //鏃ユ湡闂撮殧涓嬫媺鍒楄〃鐩戝惉
+ form.on('select(HInitTimeCycle)', function (data) {
+ var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
+ //鑻ユ棩鏈熼棿闅斾笉涓� 浠绘剰闂撮殧锛屽垯绂佺敤寮�濮嬫棩鏈熶笌缁撴潫鏃ユ湡鐨勯�夋嫨
+ if (HInitTimeCycle != -1) {
+ $('#HBeginDate').prop('disabled', true);
+ $('#HEndDate').prop('disabled', true);
+
+ $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
+ $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+
+ //鎵ц鏌ヨ鏂规硶
+ get_FastQuery();
+ } else {
+ $('#HBeginDate').prop('disabled', false);
+ $('#HEndDate').prop('disabled', false);
+ }
+ });
+
//#region 閲嶇疆鎸夐挳
form.on('submit(btnReSearch)', function (data) {
set_ClearQuery();
@@ -319,23 +389,39 @@
btnrowDouble(obj);
})
- //#endregion
+ //#endregion
-
- //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
+
+ //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
//#region 鍒濆鍖栫晫闈�
function set_ClearBill() {
+ //鍒濆鍖栨棩鏈熼棿闅斻�佸紑濮嬫棩鏈熴�佺粨鏉熸棩鏈�
+ setSelect_HInitTimeCycle();
+ //鑻ユ棩鏈熼棿闅斾笉涓� 浠绘剰闂撮殧锛屽垯绂佺敤寮�濮嬫棩鏈熶笌缁撴潫鏃ユ湡鐨勯�夋嫨
+ var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
+ if (HInitTimeCycle != -1) {
+ $('#HBeginDate').prop('disabled', true);
+ $('#HEndDate').prop('disabled', true);
+ } else {
+ $('#HBeginDate').prop('disabled', false);
+ $('#HEndDate').prop('disabled', false);
+ }
+
+ //鏍规嵁鏃ユ湡闂撮殧璁剧疆寮�濮嬫椂闂翠笌缁撴潫鏃堕棿
+ $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
+ $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+
//鍒濆鍖栫粍缁�
- Organ();
+ Organ();
//鍒濆鍖栬〃鏍�
set_InitGrid();
//鏌ヨ
get_FastQuery(1);
get_DefaultModule();//鍔犺浇鏂规
-
+
}
//#endregion
@@ -369,7 +455,7 @@
elem: '#mainTable'
, toolbar: '#toolbarDemo'
, height: 'full-50'
- , page: false
+ , page: false
, totalRow: true
//, cellMinWidth: 90
, limit: 50
@@ -430,7 +516,7 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: '../鐢熶骇鍩虹璧勬枡/Add_Edit_Gy_Source.html?OperationType=3&linterid='+linterid+'&HSouceBillType=' //璁剧疆 iframe 鐨� URL锛孶RL 涓寘鍚簡鏌ヨ鍙傛暟锛屾潵璋冪敤鎵�闇�瑕佺殑鍊�
+ , content: '../鐢熶骇鍩虹璧勬枡/Add_Edit_Gy_Source.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=' //璁剧疆 iframe 鐨� URL锛孶RL 涓寘鍚簡鏌ヨ鍙傛暟锛屾潵璋冪敤鎵�闇�瑕佺殑鍊�
, resize: false, //鏄惁鍏佽鐢ㄦ埛璋冩暣寮瑰嚭澶у皬
end: function () { //褰撳叧闂椂璋冪敤
get_FastQuery(table, option);
@@ -441,7 +527,7 @@
})
}
});
- //#endregion
+ //#endregion
//#region 鏌ヨ
function get_Display(sWhere) {
var ajaxLoad = layer.load();
@@ -450,7 +536,7 @@
url: GetWEBURL() + '/Gy_Source/list',
type: "GET",
async: false,
- data: { "sWhere": sWhere,"user": sessionStorage["HUserName"] },
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
success: function (data1) {
if (data1.count == 1) {
var data = [];
@@ -532,7 +618,7 @@
layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
}
- });
+ });
}
//#endregion
@@ -668,12 +754,12 @@
}
-
+
function btnrowDouble(obj) {
var data = [];
data.push(obj.data);
- //杩斿洖鏂规硶
+ //杩斿洖鏂规硶
parent.GetGySource(data);
var index = parent.layer.getFrameIndex(window.name);
parent.layer.close(index);
@@ -681,7 +767,8 @@
//#region 蹇�熻繃婊�
function get_FastQuery(number) {
-
+ var HBeginDate = $("#HBeginDate").val();
+ var HEndDate = $("#HEndDate").val();
var HSeOrderBillNo = $("#HSeOrderBillNo").val();
var HMaterNumber = $("#HMaterNumber").val();
var HOrgID = "";
@@ -758,7 +845,7 @@
}
sWhere += " and " + ColName2 + " " + com2;
}
-
+
//if (number == 1) {
// HOrgID = sessionStorage["OrganizationID"];
//}
@@ -779,7 +866,11 @@
sWhere += " and 閿�鍞鍗曞彿 like '%" + HSeOrderBillNo + "%'";
}
if (HMaterNumber) {
- sWhere += " and 鎴愬搧鐗╂枡缂栫爜 like '%" + HMaterNumber + "%'";
+ sWhere += " and 鎴愬搧鐗╂枡缂栫爜 like '%" + HMaterNumber + "%'";
+ }
+
+ if (HBeginDate && HEndDate) {
+ sWhere += " and CONVERT(varchar(100),鐢熶骇璁㈠崟鏃ユ湡, 23) between '" + HBeginDate + "' and '" + HEndDate + "'"
}
sWhere += addSWhereByOpenType();
@@ -793,8 +884,10 @@
//#endregion
//#region 閲嶇疆杩囨护鏉′欢鏂规硶
- function set_ClearQuery() {
-
+ function set_ClearQuery() {
+ var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
+ $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd")); //寮�濮嬫棩鏈�
+ $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd")); //缁撴潫鏃ユ湡
$("#HSeOrderBillNo").val("");
$("#HMaterNumber").val("");
$("#HOrgID").val(sessionStorage["OrganizationID"]);
@@ -812,7 +905,7 @@
$("#btnSearch").click();
}
//#endregion
-
+
//#region 鏂板
function set_AddNew() {
layer.open({
@@ -860,8 +953,8 @@
get_FastQuery(2);
}
//#endregion
-
-
+
+
//#region 鍒ゆ柇鏄洿鎺ユ墦寮�椤甸潰杩樻槸鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑锛屽苟鏄剧ず鐩稿簲鏁版嵁
function addSWhereByOpenType() {
//鑾峰彇鍙傛暟
@@ -1140,8 +1233,27 @@
})
}
+ //#region 鍒濆鏃ユ湡闂撮殧 涓嬫媺鍒楄〃
+ function setSelect_HInitTimeCycle() {
+ var valueList = [0, 1, 2, 3, 4, 5, 6, 29];
+ var titleList = ["浠婂ぉ", "杩戜袱澶�", "杩戜笁澶�", "杩戝洓澶�", "杩戜簲澶�", "杩戝叚澶�", "杩戜竷澶�", "杩�30澶�"];
+
+ var HInitTimeCycle_ArrayList = '<option value="-1" selected="selected" >浠绘剰闂撮殧</option>';
+ for (var i = 0; i < valueList.length; i++) {
+ HInitTimeCycle_ArrayList += '<option style="color:blue;" value="' + valueList[i] + '">' + titleList[i] + '</option>';
+ }
+
+ $("#HInitTimeCycle").empty();
+ $("#HInitTimeCycle").append(HInitTimeCycle_ArrayList);
+ form.render('select');
+
+ $("#HInitTimeCycle").val("29");
+ }
//#endregion
- //浠ヤ笂鏄痩ayui妯″潡
+
+
+ //#endregion
+ //浠ヤ笂鏄痩ayui妯″潡
});
//#region 銆愯繃婊ゆ柟妗堣繑鍥炴暟鎹��
function HFilterScheme(obj) //杩斿洖杩囨护鏂规
@@ -1181,10 +1293,11 @@
});
}
//#endregion
-
+
</script>
</body>
-</html>
+
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\243\200\351\252\214\346\226\271\346\241\210\345\215\225/QC_Add_CheckProject.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\243\200\351\252\214\346\226\271\346\241\210\345\215\225/QC_Add_CheckProject.html"
index 6c6c06d..7c16cba 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\243\200\351\252\214\346\226\271\346\241\210\345\215\225/QC_Add_CheckProject.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\243\200\351\252\214\346\226\271\346\241\210\345\215\225/QC_Add_CheckProject.html"
@@ -314,6 +314,18 @@
<option value="1" selected>鍚堟牸</option>
</select>
</script>
+ <!--琛屼笅鎷夐�夋嫨(鐘舵��)-->
+ <script type="text/html" id="HCompareSymbol">
+ <select name="HCompareSymbol" lay-filter="HCompareSymbol" id="HCompareSymbol{{d.LAY_TABLE_INDEX+1}}">
+ <option value="1" selected="selected">=</option>
+ <option value="2">></option>
+ <option value="3=">>=</option>
+ <option value="4"><</option>
+ <option value="5"><=</option>
+ <option value="6"><></option>
+ <option value="7">between</option>
+ </select>
+ </script>
<!--澶嶉�夋锛堥噸鐐规鏌ワ級-->
<script type="text/html" id="HKeyInspect">
<input type="checkbox" value="{{d.HKeyInspect}}" lay-skin="primary" id="HKeyInspect{{d.LAY_TABLE_INDEX+1}}" lay-filter="HKeyInspect" {{ d.HKeyInspect == 1 ? 'checked' : '' }}>
@@ -428,7 +440,7 @@
var NewRow = {
"HPrjNo": 0, "HQCCheckItemID": 0, "HQCCheckItemNumber": "", "HQCCheckItemName": "", "HQCStd": "", "HQCStdMax": "", "HQCUnit": ""
, "HRemark": "", "HQCTool": "", "HAnalysisMethod": 1, "HDefectLevel": 3, "HDestructInspect": 0, "HKeyInspect": 0, "HQualityStdID": 0
- , "HInspectMethodID": 0, "HInspectInstruMentID": 0, "HInspectBasisID": 0, "HSampleSchemeID": 0, "HStatus": 1, "HCompareSymbol": ""
+ , "HInspectMethodID": 0, "HInspectInstruMentID": 0, "HInspectBasisID": 0, "HSampleSchemeID": 0, "HStatus": 1, "HCompareSymbol": "="
, "HTargetVal": "", "HUpLimit": "", "HDownLimit": "", "HUpOffSet": "", "HDownOffSet": "", "HTargetValKey": "", "HUpLimitKey": ""
, "HDownLimitKey": "", "HUpOffSetKey": "", "HDownOffSetKey": "", "HTargetValQ": 0, "HUpLimitQ": 0, "HDownLimitQ": 0, "HUpOffSetQ": 0
, "HDownOffSetQ": 0, "HTargetValB": 0, "HUpLimitB": 0, "HDownLimitB": 0, "HUpOffSetB": 0, "HDownOffSetB": 0
@@ -762,6 +774,17 @@
$.each(option.data, function (index, value) {
if (value.LAY_TABLE_INDEX == dataindex) {
value.HStatus = data.value;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+ }
+ });
+ });
+ //琛岄�夋嫨澶勭悊锛堢姸鎬侊級
+ form.on('select(HCompareSymbol)', function (data) {
+ //鑾峰彇涓嬫媺妗嗛�変腑鐨勫��
+ var elem = data.othis.parents('tr');
+ var dataindex = elem.attr("data-index");
+ $.each(option.data, function (index, value) {
+ if (value.LAY_TABLE_INDEX == dataindex) {
+ value.HCompareSymbol = data.value;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
}
});
});
@@ -1142,7 +1165,7 @@
, { field: 'HSampleSchemeID', title: '鎶芥牱鏂规ID', edit: 'text', hide: true }
, { field: 'HSampleSchemeName', title: '鎶芥牱鏂规', edit: 'text', event: 'HSampleSchemeName' }
, { field: 'HStatus', title: '鐘舵��', templet: '#HStatus' }
- , { field: 'HCompareSymbol', title: '姣旇緝绗�', edit: 'text' }
+ , { field: 'HCompareSymbol', title: '姣旇緝绗�', templet: '#HCompareSymbol'}
, { field: 'HTargetVal', title: '鐩爣鍊�', edit: 'text' }
, { field: 'HUpLimit', title: '涓婇檺鍊�', edit: 'text' }
, { field: 'HDownLimit', title: '涓嬮檺鍊�', edit: 'text' }
@@ -1257,7 +1280,7 @@
option.data = [{
"HPrjNo": 0, "HQCCheckItemID": 0, "HQCCheckItemNumber": "", "HQCCheckItemName": "", "HQCStd": "", "HQCStdMax": "", "HQCUnit": ""
, "HRemark": "", "HQCTool": "", "HAnalysisMethod": 1, "HDefectLevel": 3, "HDestructInspect": 0, "HKeyInspect": 0, "HQualityStdID": 0
- , "HInspectMethodID": 0, "HInspectInstruMentID": 0, "HInspectBasisID": 0, "HSampleSchemeID": 0, "HStatus": 1, "HCompareSymbol": ""
+ , "HInspectMethodID": 0, "HInspectInstruMentID": 0, "HInspectBasisID": 0, "HSampleSchemeID": 0, "HStatus": 1, "HCompareSymbol": "1"
, "HTargetVal": "", "HUpLimit": "", "HDownLimit": "", "HUpOffSet": "", "HDownOffSet": "", "HTargetValKey": "", "HUpLimitKey": ""
, "HDownLimitKey": "", "HUpOffSetKey": "", "HDownOffSetKey": "", "HTargetValQ": 0, "HUpLimitQ": 0, "HDownLimitQ": 0, "HUpOffSetQ": 0
, "HDownOffSetQ": 0, "HTargetValB": 0, "HUpLimitB": 0, "HDownLimitB": 0, "HUpOffSetB": 0, "HDownOffSetB": 0
@@ -1278,7 +1301,7 @@
option.data = [{
"HPrjNo": 0, "HQCCheckItemID": 0, "HQCCheckItemNumber": "", "HQCCheckItemName": "", "HQCStd": "", "HQCStdMax": "", "HQCUnit": ""
, "HRemark": "", "HQCTool": "", "HAnalysisMethod": 1, "HDefectLevel": 3, "HDestructInspect": 0, "HKeyInspect": 0, "HQualityStdID": 0
- , "HInspectMethodID": 0, "HInspectInstruMentID": 0, "HInspectBasisID": 0, "HSampleSchemeID": 0, "HStatus": 1, "HCompareSymbol": ""
+ , "HInspectMethodID": 0, "HInspectInstruMentID": 0, "HInspectBasisID": 0, "HSampleSchemeID": 0, "HStatus": 1, "HCompareSymbol": "1"
, "HTargetVal": "", "HUpLimit": "", "HDownLimit": "", "HUpOffSet": "", "HDownOffSet": "", "HTargetValKey": "", "HUpLimitKey": ""
, "HDownLimitKey": "", "HUpOffSetKey": "", "HDownOffSetKey": "", "HTargetValQ": 0, "HUpLimitQ": 0, "HDownLimitQ": 0, "HUpOffSetQ": 0
, "HDownOffSetQ": 0, "HTargetValB": 0, "HUpLimitB": 0, "HDownLimitB": 0, "HUpOffSetB": 0, "HDownOffSetB": 0
@@ -1498,6 +1521,8 @@
$('#HAnalysisMethod' + i + '').find("option[value='" + (data[(i - 1)].鍒嗘瀽鏂规硶) + "']").attr("selected", true);
$('#HDefectLevel' + i + '').find("option[value='" + (data[(i - 1)].缂洪櫡绛夌骇) + "']").attr("selected", true);
$('#HStatus' + i + '').find("option[value='" + (data[(i - 1)].鐘舵��) + "']").attr("selected", true);
+ $('#HCompareSymbol' + i + '').find("option[value='" + (data[(i - 1)].姣旇緝绗�) + "']").attr("selected", true);
+
if (data[(i - 1)].鐮村潖鎬ф楠�) {
$('#HDestructInspect' + (i)).attr("checked", true);
@@ -1529,6 +1554,7 @@
$('#HAnalysisMethod' + i + '').find("option[value='" + option.data[i - 1].HAnalysisMethod + "']").attr("selected", true);
$('#HDefectLevel' + i + '').find("option[value='" + option.data[i - 1].HDefectLevel + "']").attr("selected", true);
$('#HStatus' + i + '').find("option[value='" + option.data[i - 1].HStatus + "']").attr("selected", true);
+ $('#HCompareSymbol' + i + '').find("option[value='" + option.data[i - 1].HCompareSymbol + "']").attr("selected", true);
if (option.data[i - 1].HDestructInspect) {
$('#HDestructInspect' + i + '').attr("checked", true);
@@ -1560,6 +1586,7 @@
$('#HAnalysisMethod' + i + '').find("option[value='" + option.data[i - 1].HAnalysisMethod + "']").attr("selected", true);
$('#HDefectLevel' + i + '').find("option[value='" + option.data[i - 1].HDefectLevel + "']").attr("selected", true);
$('#HStatus' + i + '').find("option[value='" + option.data[i - 1].HStatus + "']").attr("selected", true);
+ $('#HCompareSymbol' + i + '').find("option[value='" + option.data[i - 1].HCompareSymbol + "']").attr("selected", true);
if (option.data[i - 1].HDestructInspect) {
$('#HDestructInspect' + i + '').attr("checked", true);
@@ -1701,6 +1728,7 @@
$('#HAnalysisMethod' + i + '').find("option[value='" + option.data[i - 1].HAnalysisMethod + "']").attr("selected", true);
$('#HDefectLevel' + i + '').find("option[value='" + option.data[i - 1].HDefectLevel + "']").attr("selected", true);
$('#HStatus' + i + '').find("option[value='" + option.data[i - 1].HStatus + "']").attr("selected", true);
+ $('#HCompareSymbol' + i + '').find("option[value='" + option.data[i - 1].HCompareSymbol + "']").attr("selected", true);
if (option.data[i - 1].HDestructInspect) {
$('#HDestructInspect' + i + '').attr("checked", true);
@@ -1715,6 +1743,7 @@
$('#HAnalysisMethod' + i + '').find("option[value='" + option.data[i - 1].HAnalysisMethod + "']").attr("selected", true);
$('#HDefectLevel' + i + '').find("option[value='" + option.data[i - 1].HDefectLevel + "']").attr("selected", true);
$('#HStatus' + i + '').find("option[value='" + option.data[i - 1].HStatus + "']").attr("selected", true);
+ $('#HCompareSymbol' + i + '').find("option[value='" + option.data[i - 1].HCompareSymbol + "']").attr("selected", true);
if (option.data[i - 1].HDestructInspect) {
$('#HDestructInspect' + i + '').attr("checked", true);
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_batch.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_batch.html"
index 05b6b59..f775c17 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_batch.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_batch.html"
@@ -233,7 +233,7 @@
, element = layui.element;
//瀹氫箟鍏ㄥ眬鍙橀噺
- var params = getUrlVars();
+ var params = get_UrlVars();
var HModName = "Cj_ProcessItemStationPlatform_batch";
var option = [];
//#endregion
@@ -260,35 +260,8 @@
});
//鎵规鐮佸洖杞︽柟娉�
$('#HBarCode_Batch').on('keydown', function (event) {
- var HBarCode = $('#HBarCodeSN').val();
- var HBardCodeProcExchBillNo = $('#HBardCodeProcExchBillNo').val();
+ var HBarCode = $('#HBarCode_Batch').val();
if (event.keyCode == 13) {
- if (!HBardCodeProcExchBillNo) {
- layer.msg(get_MessageError("[0000-2-034]璇峰厛鎵祦杞崱锛�", sessionStorage["HTranSlate"]))
- return;
- } else {
- HBarCode = HBarCode.toUpperCase();
- if (!HBarCode) {
- layer.msg(get_MessageError("[0000-2-019]鏉″舰鐮佷笉鑳戒负绌猴紒", sessionStorage["HTranSlate"]))
- return;
- } else {
- if (HBarCode.length != 29 && HBarCode.length != 50) {
- layer.alert(get_MessageError("[3791-2-012]瀛愪欢鏉＄爜闀垮害涓嶄负29浣嶆垨50浣�!", sessionStorage["HTranSlate"]), { icon: 5, btn: [get_MessageError('[0000-2-035]閫�鍑�', sessionStorage["HTranSlate"])], time: 100000, offset: 't' });
- return;
- }
-
- if (HBarCode.match(/[^\x00-\xff]/g) != null) {
- layer.alert(get_MessageError("[3791-2-013]蹇呴』鏄崐瑙掑瓧绗�!", sessionStorage["HTranSlate"]), { icon: 5, btn: [get_MessageError('[0000-2-035]閫�鍑�', sessionStorage["HTranSlate"])], time: 100000, offset: 't' });
- return;
- }
- }
- }
- for (var i = 0; i < option.data.length; i++) {
- if (option.data[i]["HBatchNo"] == "") {
- layer.msg(get_MessageError("[3791-2-014]褰撳墠宸ュ簭鎵规涓嶈兘涓虹┖锛�", sessionStorage["HTranSlate"]))
- return;
- }
- }
txtHBarCode_KeyDown(HBarCode);
}
});
@@ -341,7 +314,20 @@
form.on('submit(btnHProc)', function () {
btnHProc();
});
-
+ //鍙樻洿
+ form.on('submit(btnChange)', function (data) {
+ $("#HBarCode_Batch").val("");
+ $("#HBarCode_Batch").prop("readonly", false);
+ $("#HBarCode_BatchSec").val("");
+ $("#HBatchNo").val("");
+ $("#HMaterNumber").val("");
+ $("#HMaterName").val("");
+ $("#HMaterModel").val("");
+ $("#HSupID").val(0)
+ $("#HSupName").val(0)
+ //杩涘叆椤甸潰榛樿鍏夋爣鍦ㄦ祦杞崱涓�
+ $("#HBarCode_Batch").focus();
+ });
//閫�鍑�
form.on('submit(btnExit)', function (data) {
@@ -443,53 +429,31 @@
//鏉＄爜鍥炶溅鏌ヨ
function txtHBarCode_KeyDown(HBarCode) {
- var HProcExchBillNo = $("#HProcExchBillNo").val();
var indexs = layer.load();
$.ajax({
type: "GET",
- url: GetWEBURL() + "/Cj_SingleStation/SNHBardCodeList",
+ url: GetWEBURL() + "/Cj_SingleStation/checkHBarCode_Batch",
async: false,
- data: { "HBarCode": HBarCode, "HProcExchBillNo": HProcExchBillNo, "user": sessionStorage["HUserName"], "HOrgID": sessionStorage["OrganizationID"] },
+ data: { "HBarCode": HBarCode,"user": sessionStorage["HUserName"], "HOrgID": sessionStorage["OrganizationID"] },
dataType: "json",
success: function (data1) {
if (data1.count == 1) {
layer.close(indexs);
- var index = layer.load();
-
- $.ajax({
- type: "GET",
- url: GetWEBURL() + "/Cj_SingleStation/HBardCodeSNList",
- async: false,
- data: { "HBarCode": HBarCode, "user": sessionStorage["HUserName"] },
- dataType: "json",
- success: function (data1) {
- if (data1.count == 1) {
- layer.close(index);
- $("#HBarCode_P").val(HBarCode);
- if (AllowLoadData()) {
- //淇濆瓨鏁版嵁
- set_AddAssemblyBill();
- }
- }
- else {
- layer.close(index);
- layer.msg(get_MessageError(data1.Message, sessionStorage["HTranSlate"]), { icon: 5, btn: [get_MessageError('[0000-2-008]纭', sessionStorage["HTranSlate"])], time: 100000, offset: 't', skin: 'layui-layer-lan', title: get_MessageError("[0000-2-009]娓╅Θ鎻愮ず", sessionStorage["HTranSlate"]) });
- }
- $("#HBarCodeSN").val("");
- },
- error: function (err) {
- layer.close(index);
- layer.msg(get_MessageError("閿欒:" + err, sessionStorage["HTranSlate"]), { icon: 5, btn: [get_MessageError('[0000-2-008]纭', sessionStorage["HTranSlate"])], time: 100000, offset: 't', skin: 'layui-layer-lan', title: get_MessageError("[0000-2-009]娓╅Θ鎻愮ず", sessionStorage["HTranSlate"]) });
- }
- });
+ $("#HBarCode_BatchSec").val(HBarCode);
+ const parts = HBarCode.split('@');
+ $("#HBatchNo").val(parts[2]);
+ $("#HMaterNumber").val(data1.data[0]["HMaterNumber"])
+ $("#HMaterName").val(data1.data[0]["HMaterName"])
+ $("#HMaterModel").val(data1.data[0]["HMaterModel"])
+ $("#HSupID").val(data1.data[0]["HSupID"])
+ $("#HSupName").val(data1.data[0]["HSupName"])
+ $("#HBarCode_Batch").prop("readonly", true);
}
else {
layer.close(indexs);
layer.msg(get_MessageError(data1.Message, sessionStorage["HTranSlate"]));
}
- //鍏夋爣璺宠浆鍒癝N鏉＄爜鏂囨湰妗嗕笂
- //$("#HBarCodeSN").focus();
- $("#HBarCodeSN").val("");
+
},
error: function (err) {
layer.close(indexs);
--
Gitblit v1.9.1