From 3b5dc3ddf32738abd19ca300273e0e77f0830a3b Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期六, 02 九月 2023 18:54:02 +0800
Subject: [PATCH] 1
---
WebTM/views/车间管理/工序流转/MES_StationOutBill_PDA.html | 4
WebTM/views/质量管理/巡检记录单/QC_PatrolProcCheckBillList.html | 27
WebTM/views/Baseset/基础资料/Sc_ICMOBillListView.html | 2
WebTM/views/车间管理/工序流转/MES_StationOutBill_PDA_QiaoYi.html | 4
WebTM/views/车间管理/工序流转卡/MES_ColorRecordBillList.html | 568 ++++
WebTM/views/基础资料/生产基础资料/Gy_Process.html | 4
WebTM/views/index_Mobile.html | 12
WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_Material.html | 147 +
WebTM/views/质量管理/首件检验单/QC_FirstPieceCheckBillList.html | 12
WebTM/views/车间管理/工序流转/MES_StationInBill_PDA_QiaoYi.html | 4
WebTM/views/质量管理/工序检验单/QC_ProcessCheckBill.html | 103
WebTM/views/车间管理/工序进站接收单/Cj_StationInBill.html | 2
WebTM/views/质量管理/首件检验单/QC_Add_Edit_FirstPieceCheckBill.html | 254 +
WebTM/views/index.html | 16
WebTM/views/基础资料/生产基础资料/Add_Edit_Gy_Process.html | 130 +
WebTM/layuiadmin/PubCustom.js | 12
WebTM/views/车间管理/工序流转/MES_ColorRecordBill_PDA.html | 536 ++++
WebTM/views/采购管理/采购订单/Cg_POOrderBillList.html | 75
WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBill.html | 2
WebTM/views/车间管理/工序流转卡/WindowPrint.html | 1748 +------------
WebTM/views/质量管理/巡检记录单/QC_Add_Edit_PatrolProcCheckBill.html | 2774 ++++++---------------
WebTM/views/采购管理/报价单/Sup_QuotePriceBillEdit.html | 2
WebTM/views/计划管理/工艺路线/Gy_RoutingBill.html | 104
WebTM/views/车间管理/工序流转卡/MES_SampleRecordBillList.html | 568 ++++
WebTM/views/采购管理/报价单/Sup_QuotePriceBillList.html | 2
WebTM/views/车间管理/工序流转/MES_SampleRecordBill_PDA.html | 536 ++++
WebTM/views/车间管理/工序流转/MES_StationInBill_PDA.html | 4
WebTM/WebTM.csproj | 4
28 files changed, 3,922 insertions(+), 3,734 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index df09491..5bab29a 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -276,6 +276,10 @@
<Content Include="views\杞﹂棿绠＄悊\浜х嚎缁勮杩芥函\Cj_AssemblyTraceability.html" />
<Content Include="views\杞﹂棿绠＄悊\浜х嚎缁勮杩芥函\Cj_AssemblyTraceabilityList.html" />
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭鍑虹珯姹囨姤鍗昞Cj_StationOutBillSubList.html" />
+ <Content Include="views\杞﹂棿绠＄悊\宸ュ簭娴佽浆\MES_ColorRecordBill_PDA.html" />
+ <Content Include="views\杞﹂棿绠＄悊\宸ュ簭娴佽浆\MES_SampleRecordBill_PDA.html" />
+ <Content Include="views\杞﹂棿绠＄悊\宸ュ簭娴佽浆鍗MES_ColorRecordBillList.html" />
+ <Content Include="views\杞﹂棿绠＄悊\宸ュ簭娴佽浆鍗MES_SampleRecordBillList.html" />
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭娴佽浆鍗Sc_ProcessExchangeBillQuery_Mobile.html" />
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭娴佽浆鍗Sc_ProcessExchangeBillSubList.html" />
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭娴佽浆鍗Sc_ProcessExchangeBill_Change.html" />
diff --git a/WebTM/layuiadmin/PubCustom.js b/WebTM/layuiadmin/PubCustom.js
index 760b295..ac8d3cb 100644
--- a/WebTM/layuiadmin/PubCustom.js
+++ b/WebTM/layuiadmin/PubCustom.js
@@ -33,6 +33,18 @@
return fmt;
}
+// 缂栬緫鑾峰彇琛ㄥご鏃舵椂闂存牸寮忕煫姝ｆ柟寮�
+function formatDate(date) {
+ var d = new Date(date),
+ month = '' + (d.getMonth() + 1),
+ day = '' + d.getDate(),
+ year = d.getFullYear();
+
+ if (month.length < 2) month = '0' + month;
+ if (day.length < 2) day = '0' + day;
+
+ return [year, month, day].join('-');
+}
/**
*鍒ゆ柇鎵嬫満杩樻槸鐢佃剳锛岀數鑴戣繑鍥瀟rue锛屾墜鏈鸿繑鍥瀎alse
*by zgq
diff --git "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Sc_ICMOBillListView.html" "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Sc_ICMOBillListView.html"
index dd57ee4..2e20edc 100644
--- "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Sc_ICMOBillListView.html"
+++ "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Sc_ICMOBillListView.html"
@@ -48,7 +48,7 @@
//var sMainStr = JSON.stringify(table.cache['mainTable']);
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
- //parent.GetICMOBillValue(data[0].hmainid);
+ parent.GetICMOBillValue(data);
var index = parent.layer.getFrameIndex(window.name);
parent.layer.close(index);
});
diff --git a/WebTM/views/index.html b/WebTM/views/index.html
index 0cf0c60..cf6de17 100644
--- a/WebTM/views/index.html
+++ b/WebTM/views/index.html
@@ -148,6 +148,20 @@
<dd><a lay-href="閲囪喘绠＄悊/閲囪喘閫�鏂欏崟/Cg_PurchaseReturnList.html">閲囪喘閫�鏂欏崟缁存姢</a></dd>
</dl>
</dd>
+ <dd>
+ <a>璇环鍗�</a>
+ <dl class="layui-nav-child">
+ <dd><a lay-href="閲囪喘绠＄悊/璇环鍗�/Sup_AskPriceBillList.html">璇环鍗曠淮鎶�</a></dd>
+ <dd><a lay-href="閲囪喘绠＄悊/璇环鍗�/Sup_AskPriceBillEdit.html">璇环鍗�</a></dd>
+ </dl>
+ </dd>
+ <dd>
+ <a>鎶ヤ环鍗�</a>
+ <dl class="layui-nav-child">
+ <dd><a lay-href="閲囪喘绠＄悊/鎶ヤ环鍗�/Sup_QuotePriceBillList.html">鎶ヤ环鍗曠淮鎶�</a></dd>
+ <dd><a lay-href="閲囪喘绠＄悊/鎶ヤ环鍗�/Sup_QuotePriceBillEdit.html">鎶ヤ环鍗�</a></dd>
+ </dl>
+ </dd>
</dl>
</li>
<!-- 閿�鍞鐞� -->
@@ -463,6 +477,8 @@
<dd><a lay-href="杞﹂棿绠＄悊/宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeBill.html">宸ュ簭娴佽浆鍗�</a></dd>
<dd><a lay-href="杞﹂棿绠＄悊/宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeBillList.html">宸ュ簭娴佽浆鍗＄淮鎶�</a></dd>
<dd><a lay-href="杞﹂棿绠＄悊/宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeBillSubList.html">宸ュ簭瀛愭祦杞崱缁存姢</a></dd>
+ <dd><a lay-href="杞﹂棿绠＄悊/宸ュ簭娴佽浆鍗�/MES_SampleRecordBillList.html">璇曟牱璁板綍鍗曞垪琛�</a></dd>
+ <dd><a lay-href="杞﹂棿绠＄悊/宸ュ簭娴佽浆鍗�/MES_ColorRecordBillList.html">瀵硅壊璁板綍鍗曞垪琛�</a></dd>
<dd><a lay-href="杞﹂棿绠＄悊/宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeIssueBillList.html">宸ュ簭娴佽浆鍗★紙涓嬭揪锛�</a></dd>
<dd><a lay-href="杞﹂棿绠＄悊/宸ュ簭娴佽浆鍗�/Sc_ProcExchWorkBackBillList.html">宸ュ簭杩斿伐鐢宠鍒楄〃</a></dd>
<!--<dd><a lay-href="杞﹂棿绠＄悊/宸ュ簭娴佽浆鍗�/Sc_ProcExchWorkBackBillEdit.html">宸ュ簭杩斿伐鐢宠</a></dd>-->
diff --git a/WebTM/views/index_Mobile.html b/WebTM/views/index_Mobile.html
index 0bdec33..481fc55 100644
--- a/WebTM/views/index_Mobile.html
+++ b/WebTM/views/index_Mobile.html
@@ -185,6 +185,18 @@
鎸囧紩鍗″畬宸ュ崟
</a>
</dd>
+ <dd>
+ <a href="杞﹂棿绠＄悊/宸ュ簭娴佽浆/MES_SampleRecordBill_PDA.html" target="main_self_frame" style="color: aqua;">
+ <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
+ 璇曟牱璁板綍鍗�
+ </a>
+ </dd>
+ <dd>
+ <a href="杞﹂棿绠＄悊/宸ュ簭娴佽浆/MES_ColorRecordBill_PDA.html" target="main_self_frame" style="color: aqua;">
+ <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
+ 瀵硅壊璁板綍鍗�
+ </a>
+ </dd>
</dl>
</li>
<!-- 妯℃不鍏风鐞� -->
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Material.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Material.html"
index 95dd4e9..038aebf 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Material.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Material.html"
@@ -93,15 +93,15 @@
</div>
</div>
<!--<div class="layui-inline">
- <label class="layui-form-label">涓昏閲忓崟浣嶏細</label>
- <div class="layui-input-inline">
- <input class="layui-input" type="text" name="HUnitName" id="HUnitName" value="0" readonly>
- <input class="layui-input" type="hidden" name="HUnitID" id="HUnitID" value="0" readonly>
- <button type="button" lay-submit="" class="layui-btn" lay-filter="Department" style="width:40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
- </button>
- </div>
- </div>-->
+ <label class="layui-form-label">涓昏閲忓崟浣嶏細</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="HUnitName" id="HUnitName" value="0" readonly>
+ <input class="layui-input" type="hidden" name="HUnitID" id="HUnitID" value="0" readonly>
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="Department" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ </div>
+ </div>-->
</div>
<div class="layui-inline">
<label class="layui-form-label">鍏嬮噸</label>
@@ -164,11 +164,40 @@
</div>
</div>
</div>
-
-
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label">棣栦欢妫�楠屾柟妗�</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HQCSchemeName_Fst" id="HQCSchemeName_Fst" class="layui-input" value="" style="float: left; width: 100px; background-color: #efefef4d;" readonly>
+ <input type="hidden" name="HQCSchemeID_Fst" id="HQCSchemeID_Fst" value="0">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HQCSchemeID_Fst-BT" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">杞簭妫�楠屾柟妗�</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HQCSchemeName_Proc" id="HQCSchemeName_Proc" class="layui-input" value="" style="float: left; width: 100px; background-color: #efefef4d;" readonly>
+ <input type="hidden" name="HQCSchemeID_Proc" id="HQCSchemeID_Proc" value="0">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HQCSchemeID_Proc-BT" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">宸℃妫�楠屾柟妗�</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HQCSchemeName_Patrol" id="HQCSchemeName_Patrol" class="layui-input" value="" style="float: left; width: 100px; background-color: #efefef4d;" readonly>
+ <input type="hidden" name="HQCSchemeID_Patrol" id="HQCSchemeID_Patrol" value="0">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HQCSchemeID_Patrol-BT" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
</div>
-
<div class="layui-row">
<div class="layui-inline">
<label class="layui-form-label"> 鐧藉澂瑕佹眰锛�</label>
@@ -613,6 +642,20 @@
$("#HStopwagesFlag").val(data.elem.checked);
});
+ //閫夋嫨棣栦欢妫�楠屾柟妗堟寜閽�
+ form.on('submit(HQCSchemeID_Fst-BT)', function () {
+ get_checkQCSchemeID_Fst();
+ });
+
+ //閫夋嫨杞簭妫�楠屾柟妗堟寜閽�
+ form.on('submit(HQCSchemeID_Proc-BT)', function () {
+ get_checkQCSchemeID_Proc();
+ });
+
+ //閫夋嫨宸℃妫�楠屾柟妗堟寜閽�
+ form.on('submit(HQCSchemeID_Patrol-BT)', function () {
+ get_checkHQCSchemeID_Patrol();
+ });
//璇诲彇閰嶇疆鏂囦欢
function get_ReadConfigFile() {
@@ -721,6 +764,12 @@
, "HWidth": data.HWidth
, "HWeight": data.HWeight
, "HColorRemark": data.鏌撹壊瑕佹眰
+ , "HQCSchemeID_Fst": data.HQCSchemeID_Fst
+ , "HQCSchemeName_Fst": data.棣栦欢妫�楠屾柟妗�
+ , "HQCSchemeID_Proc": data.HQCSchemeID_Proc
+ , "HQCSchemeName_Proc": data.杞簭妫�楠屾柟妗�
+ , "HQCSchemeID_Patrol": data.HQCSchemeID_Patrol
+ , "HQCSchemeName_Patrol": data.宸℃妫�楠屾柟妗�
});
console.log($('#HUnitGroupID').val());
} else {
@@ -1024,6 +1073,80 @@
parent.layer.close(index); //鍐嶆墽琛屽叧闂�
});
+ //#region 閫夋嫨棣栦欢妫�楠屾柟妗堟柟娉�
+ function get_checkQCSchemeID_Fst() {
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '妫�楠屾柟妗堝垪琛�'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../Baseset/鍩虹璧勬枡/Gy_QCCheckProjectListView.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('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HQCSchemeName_Fst").val(checkStatus.data[0].鏂规鍚嶇О);
+ $("#HQCSchemeID_Fst").val(checkStatus.data[0].HItemID);
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
+ }
+ //#endregion
+
+ //#region 閫夋嫨杞簭妫�楠屾柟妗堟柟娉�
+ function get_checkQCSchemeID_Proc() {
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '妫�楠屾柟妗堝垪琛�'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../Baseset/鍩虹璧勬枡/Gy_QCCheckProjectListView.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('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HQCSchemeName_Proc").val(checkStatus.data[0].鏂规鍚嶇О);
+ $("#HQCSchemeID_Proc").val(checkStatus.data[0].HItemID);
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
+ }
+ //#endregion
+
+ //#region 閫夋嫨宸℃妫�楠屾柟妗堟柟娉�
+ function get_checkHQCSchemeID_Patrol() {
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '妫�楠屾柟妗堝垪琛�'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../Baseset/鍩虹璧勬枡/Gy_QCCheckProjectListView.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('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HQCSchemeName_Patrol").val(checkStatus.data[0].鏂规鍚嶇О);
+ $("#HQCSchemeID_Patrol").val(checkStatus.data[0].HItemID);
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
+ }
+ //#endregion
//閫夋嫨璁￠噺鍗曚綅
form.on('submit(HUnitList)', function () {//閫夋嫨鑱屽姟
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/Add_Edit_Gy_Process.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/Add_Edit_Gy_Process.html"
index 611f3f6..eee91ef 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/Add_Edit_Gy_Process.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/Add_Edit_Gy_Process.html"
@@ -83,6 +83,38 @@
<input type="checkbox" name="checkboxHTProcessFlag" id="checkboxHTProcessFlag" lay-filter="checkboxHTProcessFlag" lay-skin="primary" value="true" title="鏄惁杞伐搴�">
<input type="hidden" value="false" name="HTProcessFlag" id="HTProcessFlag">
</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="HQCSchemeName_Fst" id="HQCSchemeName_Fst" class="layui-input" value="" style="float: left; width: 150px; background-color: #efefef4d;" readonly>
+ <input type="hidden" name="HQCSchemeID_Fst" id="HQCSchemeID_Fst" value="0">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HQCSchemeID_Fst-BT" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">杞簭妫�楠屾柟妗�</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HQCSchemeName_Proc" id="HQCSchemeName_Proc" class="layui-input" value="" style="float: left; width: 150px; background-color: #efefef4d;" readonly>
+ <input type="hidden" name="HQCSchemeID_Proc" id="HQCSchemeID_Proc" value="0">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HQCSchemeID_Proc-BT" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">宸℃妫�楠屾柟妗�</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HQCSchemeName_Patrol" id="HQCSchemeName_Patrol" class="layui-input" value="" style="float: left; width: 150px; background-color: #efefef4d;" readonly>
+ <input type="hidden" name="HQCSchemeID_Patrol" id="HQCSchemeID_Patrol" value="0">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HQCSchemeID_Patrol-BT" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
</div>
</div>
<div class="layui-row">
@@ -94,7 +126,7 @@
</div>
</div>
<div class="layui-col-xs8 layui-inline">
- <label class="layui-form-label"style="width: 12.5%;">缁勭粐*</label>
+ <label class="layui-form-label" style="width: 12.5%;">缁勭粐*</label>
<div class="layui-input-inline" style="margin-bottom: -15px;">
<div class="layui-form">
<div class="layui-form-item" style=" width: 375%;">
@@ -416,6 +448,21 @@
get_checkDept();
});
+ //閫夋嫨棣栦欢妫�楠屾柟妗堟寜閽�
+ form.on('submit(HQCSchemeID_Fst-BT)', function () {
+ get_checkQCSchemeID_Fst();
+ });
+
+ //閫夋嫨杞簭妫�楠屾柟妗堟寜閽�
+ form.on('submit(HQCSchemeID_Proc-BT)', function () {
+ get_checkQCSchemeID_Proc();
+ });
+
+ //閫夋嫨宸℃妫�楠屾柟妗堟寜閽�
+ form.on('submit(HQCSchemeID_Patrol-BT)', function () {
+ get_checkHQCSchemeID_Patrol();
+ });
+
//閫夋嫨宸ヤ綔涓績鎸夐挳
form.on('submit(HWorkCenterID-BT)', function () {
get_checkWorkCenter();
@@ -564,6 +611,12 @@
, "HWHName": data.HWHName
, "HWorkCenterID": data.HWorkCenterID
, "HWorkCenterName": data.HWorkCenterName
+ , "HQCSchemeID_Fst": data.HQCSchemeID_Fst
+ , "HQCSchemeName_Fst": data.棣栦欢妫�楠屾柟妗�
+ , "HQCSchemeID_Proc": data.HQCSchemeID_Proc
+ , "HQCSchemeName_Proc": data.杞簭妫�楠屾柟妗�
+ , "HQCSchemeID_Patrol": data.HQCSchemeID_Patrol
+ , "HQCSchemeName_Patrol": data.宸℃妫�楠屾柟妗�
});
layer.close(ajaxLoad);
} else {
@@ -744,6 +797,81 @@
}
//#endregion
+ //#region 閫夋嫨棣栦欢妫�楠屾柟妗堟柟娉�
+ function get_checkQCSchemeID_Fst() {
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '妫�楠屾柟妗堝垪琛�'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../Baseset/鍩虹璧勬枡/Gy_QCCheckProjectListView.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('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HQCSchemeName_Fst").val(checkStatus.data[0].鏂规鍚嶇О);
+ $("#HQCSchemeID_Fst").val(checkStatus.data[0].HItemID);
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
+ }
+ //#endregion
+
+ //#region 閫夋嫨杞簭妫�楠屾柟妗堟柟娉�
+ function get_checkQCSchemeID_Proc() {
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '妫�楠屾柟妗堝垪琛�'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../Baseset/鍩虹璧勬枡/Gy_QCCheckProjectListView.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('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HQCSchemeName_Proc").val(checkStatus.data[0].鏂规鍚嶇О);
+ $("#HQCSchemeID_Proc").val(checkStatus.data[0].HItemID);
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
+ }
+ //#endregion
+
+ //#region 閫夋嫨宸℃妫�楠屾柟妗堟柟娉�
+ function get_checkHQCSchemeID_Patrol() {
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '妫�楠屾柟妗堝垪琛�'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../Baseset/鍩虹璧勬枡/Gy_QCCheckProjectListView.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('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HQCSchemeName_Patrol").val(checkStatus.data[0].鏂规鍚嶇О);
+ $("#HQCSchemeID_Patrol").val(checkStatus.data[0].HItemID);
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
+ }
+ //#endregion
+
//#region 閫夋嫨鐝粍鏂规硶
function get_checkGroup() {
layer.open({
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_Process.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_Process.html"
index 992612b..66b6409 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_Process.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_Process.html"
@@ -632,7 +632,9 @@
dataCol = data1.data[0].HGridString.split(',');
for (var i = 0; i < option.cols[0].length - 2; i++) {
- var dataCols = dataCol[i].split('|');
+ if (dataCol[i]) {
+ var dataCols = dataCol[i].split('|');
+ }
//闅愯棌鍒�
if (dataCols[1] == 1) {
option.cols[0][i + 1]["hide"] = true;
diff --git "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html" "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html"
index 8d50602..48ae135 100644
--- "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html"
+++ "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html"
@@ -489,7 +489,10 @@
, "HBeginDayQty": 0, "HBeginFixQty": 0, "HFixWorkDays": 0, "HTrunWorkDays": 0, "HReadyTimes": 0
, "HICMOReadyTimes": 0, "HAutoTrunFlag": false, "HTechnologyParameter": "", "HPicNum": "", "HProcCheckNote": ""
, "HProcWorkNum": "", "HBadWHID": 0, "HBadWHName": "", "HWasterWHID": 0, "HWasterWHName": ""
- , "HWHID": 0, "HWHName": "","HRemark":""
+ , "HWHID": 0, "HWHName": "", "HRemark": ""
+ , "HQCSchemeID_Fst": 0, "HQCSchemeNumber_Fst": "", "HQCSchemeName_Fst": ""
+ , "HQCSchemeID_Proc": 0, "HQCSchemeNumber_Proc": "", "HQCSchemeName_Proc": ""
+ , "HQCSchemeID_Patrol": 0, "HQCSchemeNumber_Patrol": "", "HQCSchemeName_Patrol": ""
}];
var HModName = "Gy_RoutingBill";
//#endregion
@@ -530,6 +533,17 @@
//, { field: 'HTimeUnit', title: '鏃堕棿鍗曚綅', edit: 'text' }
//, { field: 'HUnitTime', title: '杩愯鏃堕棿', edit: 'text' }
, { field: 'HWorkQty', title: '鍔犲伐鏁伴噺', edit: 'text' }//榛樿
+
+ , { field: 'HQCSchemeID_Fst', title: '棣栦欢妫�楠屾柟妗圛D', hide: true }//f7
+ , { field: 'HQCSchemeNumber_Fst', title: '棣栦欢妫�楠屾柟妗堜唬鐮�', edit: 'text', event: "HQCSchemeNumber_Fst",width:125 }
+ , { field: 'HQCSchemeName_Fst', title: '棣栦欢妫�楠屾柟妗堝悕绉�', width: 125 }//f7
+ , { field: 'HQCSchemeID_Proc', title: '杞簭妫�楠屾柟妗圛D', hide: true }//f7
+ , { field: 'HQCSchemeNumber_Proc', title: '杞簭妫�楠屾柟妗堜唬鐮�', edit: 'text', event: "HQCSchemeNumber_Proc", width: 125}
+ , { field: 'HQCSchemeName_Proc', title: '杞簭妫�楠屾柟妗堝悕绉�', width: 125}//f7
+ , { field: 'HQCSchemeID_Patrol', title: '宸℃妫�楠屾柟妗圛D', hide: true }//f7
+ , { field: 'HQCSchemeNumber_Patrol', title: '宸℃妫�楠屾柟妗堜唬鐮�', edit: 'text', event: "HQCSchemeNumber_Patrol", width: 125}
+ , { field: 'HQCSchemeName_Patrol', title: '宸℃妫�楠屾柟妗堝悕绉�', width: 125}//f7
+
//, { field: 'HPassRate', title: '鑹巼', edit: 'text' }//榛樿
//, { field: 'HProcID_S', title: '宸ユ', edit: 'text' }
////, { field: 'HCenterID_S', title: '浜х嚎涓績id', hide: true }//hide: true
@@ -825,6 +839,9 @@
, "HICMOReadyTimes": 0, "HAutoTrunFlag": false, "HTechnologyParameter": "", "HPicNum": "", "HProcCheckNote": ""
, "HProcWorkNum": "", "HBadWHID": 0, "HBadWHName": "", "HWasterWHID": 0, "HWasterWHName": ""
, "HWHID": 0, "HWHName": "", "HRemark": ""
+ , "HQCSchemeID_Fst": 0, "HQCSchemeNumber_Fst": "", "HQCSchemeName_Fst": ""
+ , "HQCSchemeID_Proc": 0, "HQCSchemeNumber_Proc": "", "HQCSchemeName_Proc": ""
+ , "HQCSchemeID_Patrol": 0, "HQCSchemeNumber_Patrol": "", "HQCSchemeName_Patrol": ""
};
switch (obj.event) {
case 'btn-AddLine':
@@ -1438,6 +1455,9 @@
, "HICMOReadyTimes": 0, "HAutoTrunFlag": false, "HTechnologyParameter": "", "HPicNum": "", "HProcCheckNote": ""
, "HProcWorkNum": "", "HBadWHID": 0, "HBadWHName": "", "HWasterWHID": 0, "HWasterWHName": ""
, "HWHID": 0, "HWHName": "", "HRemark": ""
+ , "HQCSchemeID_Fst": 0, "HQCSchemeNumber_Fst": "", "HQCSchemeName_Fst": ""
+ , "HQCSchemeID_Proc": 0, "HQCSchemeNumber_Proc": "", "HQCSchemeName_Proc": ""
+ , "HQCSchemeID_Patrol": 0, "HQCSchemeNumber_Patrol": "", "HQCSchemeName_Patrol": ""
})
j++;
}
@@ -1626,6 +1646,85 @@
}
})
}
+ //棣栦欢妫�楠屾柟妗�
+ if (obj.event == "HQCSchemeNumber_Fst") {
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '妫�楠屾柟妗堝垪琛�'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../Baseset/鍩虹璧勬枡/Gy_QCCheckProjectListView.html', 'yes']
+ , btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ obj.update({
+ "HQCSchemeID_Fst": checkStatus.data[0].HItemID
+ , "HQCSchemeNumber_Fst": checkStatus.data[0].妫�楠屾柟妗堜唬鐮�
+ , "HQCSchemeName_Fst": checkStatus.data[0].鏂规鍚嶇О
+ })
+
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
+ }
+ //杞簭妫�楠屾柟妗�
+ if (obj.event == "HQCSchemeNumber_Proc") {
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '妫�楠屾柟妗堝垪琛�'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../Baseset/鍩虹璧勬枡/Gy_QCCheckProjectListView.html', 'yes']
+ , btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ obj.update({
+ "HQCSchemeID_Proc": checkStatus.data[0].HItemID
+ , "HQCSchemeNumber_Proc": checkStatus.data[0].妫�楠屾柟妗堜唬鐮�
+ , "HQCSchemeName_Proc": checkStatus.data[0].鏂规鍚嶇О
+ })
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
+ }
+ //宸℃妫�楠屾柟妗�
+ if (obj.event == "HQCSchemeNumber_Patrol") {
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '妫�楠屾柟妗堝垪琛�'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../Baseset/鍩虹璧勬枡/Gy_QCCheckProjectListView.html', 'yes']
+ , btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ obj.update({
+ "HQCSchemeID_Patrol": checkStatus.data[0].HItemID
+ , "HQCSchemeNumber_Patrol": checkStatus.data[0].妫�楠屾柟妗堜唬鐮�
+ , "HQCSchemeName_Patrol": checkStatus.data[0].鏂规鍚嶇О
+ })
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
+ }
obj.event = "";
return false;
@@ -1721,6 +1820,9 @@
, "HICMOReadyTimes": d.data[i].鎹㈠崟鍑嗗鏃堕棿, "HAutoTrunFlag": d.data[i].鑷姩绉昏浆, "HTechnologyParameter": d.data[i].宸ヨ壓鍙傛暟, "HPicNum": d.data[i].鍥剧焊缂栧彿, "HProcCheckNote": d.data[i].鏈伐搴忕‘璁よ褰�
, "HProcWorkNum": d.data[i].绋嬪簭鍙�, "HBadWHID": d.data[i].HBadWHID, "HBadWHName": d.data[i].HBadWHName, "HWasterWHID": d.data[i].HWasterWHID, "HWasterWHName": d.data[i].HWasterWHName
, "HWHID": d.data[i].HWHID, "HWHName": d.data[i].HWHName, "HRemark": d.data[i].琛ㄤ綋澶囨敞
+ , "HQCSchemeID_Fst": d.data[i].HQCSchemeID_Fst, "HQCSchemeNumber_Fst": d.data[i].棣栦欢妫�楠屾柟妗堜唬鐮�, "HQCSchemeName_Fst": d.data[i].棣栦欢妫�楠屾柟妗�
+ , "HQCSchemeID_Proc": d.data[i].HQCSchemeID_Proc, "HQCSchemeNumber_Proc": d.data[i].杞簭妫�楠屾柟妗堜唬鐮�, "HQCSchemeName_Proc": d.data[i].杞簭妫�楠屾柟妗�
+ , "HQCSchemeID_Patrol": d.data[i].HQCSchemeID_Patrol, "HQCSchemeNumber_Patrol": d.data[i].宸℃妫�楠屾柟妗堜唬鐮�, "HQCSchemeName_Patrol": d.data[i].宸℃妫�楠屾柟妗�
}
)
}
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_Add_Edit_PatrolProcCheckBill.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_Add_Edit_PatrolProcCheckBill.html"
index 5954661..1ed6d9a 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_Add_Edit_PatrolProcCheckBill.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_Add_Edit_PatrolProcCheckBill.html"
@@ -8,9 +8,20 @@
<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">
+ <style>
+ /* 闃叉涓嬫媺妗嗙殑涓嬫媺鍒楄〃琚殣钘�---蹇呴』璁剧疆--- */
+ .layui-table-cell {
+ overflow: visible !important;
+ }
+ /* 浣垮緱涓嬫媺妗嗕笌鍗曞厓鏍煎垰濂藉悎閫� */
+ td .layui-form-select {
+ margin-top: -10px;
+ margin-left: -15px;
+ margin-right: -15px;
+ }
+ </style>
</head>
<body>
-
<div id="layout1" class="layui-fluid">
<div class="layui-row layui-col-space15">
<div class="layui-col-md12">
@@ -18,170 +29,190 @@
<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="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Cancel">閫�鍑�</button>
-
-
</div>
-
</div>
<div class="layui-card-body">
<div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
- <!--<ul class="layui-tab-title">
- <li class="layui-this">鍩烘湰淇℃伅</li>-->
- <!--<li>鍏朵粬淇℃伅</li>-->
- <!--</ul>-->
<h1 style="text-align:center;"><b>宸℃鍗�</b></h1>
<div class="layui-tab-content">
<div class="layui-tab-item layui-show">
-
<div class="layui-form-item">
<div class="layui-row">
<div class="layui-inline">
- <label class="layui-form-label">鍗� 鎹� 鍙凤細</label>
+ <label class="layui-form-label">鍗� 鎹� 鍙�</label>
<div class="layui-input-inline">
<input class="layui-input" name="HBillNo" lay-verify="HBillNo" id="HBillNo" readonly="readonly" autocomplete="off">
<input id="HInterID" name="HInterID" value="0" type="hidden" />
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">鍗曟嵁鏃ユ湡锛�</label>
+ <label class="layui-form-label">鍗曟嵁鏃ユ湡</label>
<div class="layui-input-inline">
- <input class="layui-input" name="HDate" id="HDate" readonly="readonly" autocomplete="off" disabled>
+ <input type="date" class="layui-input" name="HDate" id="HDate" style="padding-left: 32px; width: 110%;">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鐢熶骇璧勬簮锛�</label>
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">妫�楠屽憳</label>
+ <div class="layui-input-block" style="margin-left: 77px;">
+ <input type="text" class="layui-input" lay-verify="HEmpName" name="HEmpName" id="HEmpName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input id="HFirstCheckEmp" name="HFirstCheckEmp" type="hidden" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="HEmployeeID-BT" id="HEmployeeID-BT" 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-inline" style="display:none">
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鐢熶骇璧勬簮</label>
<div class="layui-input-block" style="margin-left: 77px;">
<input type="text" class="layui-input" lay-verify="HSource" name="HSource" id="HSource" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
- <input id="HSourceID" name="HSourceID" type="hidden" />
+ <input id="HSourceID" name="HSourceID" type="hidden" value="0">
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="ProductionResources-BT" id="ProductionResources-BT" style="padding: 0 10px;float: right;margin-right: 3px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
</div>
</div>
</div>
- <!--<button class="layui-btn" data-type="reload">閫夋嫨</button>-->
</div>
<div class="layui-form-item">
<div class="layui-row">
<div class="layui-inline">
- <label class="layui-form-label" style="width: 80px;">浠诲姟鍗曞彿锛�</label>
- <div class="layui-input-block" style="margin-left: 72px;">
- <input type="text" class="layui-input" lay-verify="HICMOBillNo" name="HICMOBillNo" id="HICMOBillNo" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
- <input id="HFirstCheckEmp" name="HFirstCheckEmp" type="hidden" />
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="HEmployeeID-BT" id="HEmployeeID-BT" 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-inline">
- <label class="layui-form-label" style="margin-left:5px;">浠诲姟鍗曟暟閲忥細</label>
- <div class="layui-input-inline">
- <input type="text" name="HICMOQty" id="HICMOQty" onkeyup="this.value=this.value.replace(/\D/g,'')" lay-verify="" autocomplete="off" class="layui-input">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label" style="margin-left:10px;">浠诲姟鍗曞唴鐮侊細</label>
- <div class="layui-input-inline">
- <input type="text" name="HICMOInterID" id="HICMOInterID" onkeyup="this.value=this.value.replace(/\D/g,'')" lay-verify="" autocomplete="off" class="layui-input">
- </div>
- </div>
- </div>
- </div>
- <div class="layui-form-item">
- <div class="layui-row">
-
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 80px;">浜у搧鍐呯爜锛�</label>
- <div class="layui-input-block" style="margin-left: 72px;">
- <input type="text" class="layui-input" lay-verify="HMater" name="HMater" id="HMater" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
- <input id="HMaterID" name="HMaterID" type="hidden" />
- <input id="HMaterNumber" name="HMaterNumber" type="hidden" />
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="HMateria-BT" id="HMateria-BT" 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-inline">
- <label class="layui-form-label" style="margin-left:5px;"> 娴佽浆鍗℃暟閲忥細</label>
- <div class="layui-input-inline">
- <input class="layui-input" name="HProcExchQty" onkeyup="this.value=this.value.replace(/\D/g,'')" value="0" lay-verify="" id="HProcExchQty" autocomplete="off">
-
- </div>
- </div>
-
- <div class="layui-inline">
- <label class="layui-form-label" style="margin-left:10px;"> 宸ュ簭娴佽浆鍗″彿锛�</label>
- <div class="layui-input-inline">
- <input type="text" name="HProcExchBillNo" id="HProcExchBillNo" lay-verify="" autocomplete="off" class="layui-input">
-
- </div>
- </div>
- </div>
- </div>
-
- <!--<div class="layui-form-item" pane>
- <div class="layui-col-xs5">
- <label class="layui-form-label"> 鍒ゅ畾缁撹:</label>
- <div class="layui-input-inline">
-
- <input type="radio" name="checkboxHCheckerResult" id="checkboxHCheckerResult" lay-skin="primary" lay-filter="checkboxHCheckerResult" value="true" title="鏄惁鍚堟牸">
- <input type="hidden" value="false" name="HLastResult" id="HLastResult">
- </div>
- </div>
- </div>-->
- <div class="layui-form-item">
- <div class="layui-row">
- <div class="layui-inline">
- <label class="layui-form-label"> 娴佽浆鍗D锛�</label>
- <div class="layui-input-inline">
- <input class="layui-input" name="HProcExchInterID" value="0" lay-verify="" id="HProcExchInterID" autocomplete="off">
-
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label"> 娴佽浆鍗″瓙ID锛�</label>
- <div class="layui-input-inline">
- <input class="layui-input" name="HProcExchEntryID" value="0" lay-verify="" id="HProcExchEntryID" autocomplete="off">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">妫�楠屽憳锛�</label>
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">宸ュ簭浠ｇ爜</label>
<div class="layui-input-block" style="margin-left: 77px;">
- <input type="text" class="layui-input" lay-verify="HEmpName" name="HEmpName" id="HEmpName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
- <input id="HFirstCheckEmp" name="HFirstCheckEmp" type="hidden" />
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="HEmployeeID-BT" id="HEmployeeID-BT" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <input type="text" class="layui-input" lay-verify="HMainProcNumber" name="HMainProcNumber" id="HMainProcNumber" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input id="HMainProcID" name="HMainProcID" type="hidden" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="HMainProcNumber-BT" id="HMainProcNumber-BT" style="padding: 0 10px;float: right;margin-right: 3px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
</div>
</div>
- </div>
- </div>
- <div class="layui-form-item">
- <div class="layui-row">
-
- <div class="layui-colorpicker-xs">
- <label class="layui-form-label"> 澶囨敞锛�</label>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="margin-left:5px;">宸ュ簭鍚嶇О</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HMainProcName" id="HMainProcName" onkeyup="this.value=this.value.replace(/\D/g,'')" lay-verify="" autocomplete="off" class="layui-input" value="">
+ </div>
+ </div>
+ <div class="layui-colorpicker-xs" style="margin-top:15px">
+ <label class="layui-form-label"> 澶囨敞</label>
<div class="layui-input-block">
<input class="layui-input" name="HRemark" id="HRemark" autocomplete="off">
</div>
</div>
</div>
</div>
- </div>
+ <div class="layui-form-item">
+ <div class="layui-row" style="display:none">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 80px;">浠诲姟鍗曞彿</label>
+ <div class="layui-input-block" style="margin-left: 72px;">
+ <input type="text" class="layui-input" lay-verify="HICMOBillNo" name="HICMOBillNo" id="HICMOBillNo" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchICMOBill" id="btnSearchICMOBill" 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-inline">
+ <label class="layui-form-label" style="margin-left:5px;">浠诲姟鍗曟暟閲�</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HICMOQty" id="HICMOQty" onkeyup="this.value=this.value.replace(/\D/g,'')" lay-verify="" autocomplete="off" class="layui-input" value="0">
+ </div>
+ </div>
+ <div class="layui-inline" style="display:none">
+ <label class="layui-form-label" style="margin-left:10px;">浠诲姟鍗曞唴鐮�</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HICMOInterID" id="HICMOInterID" onkeyup="this.value=this.value.replace(/\D/g,'')" lay-verify="" autocomplete="off" class="layui-input" value="0">
+ <input type="hidden" name="HICMOEntryID" id="HICMOEntryID" value="0">
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <div class="layui-row" style="display:none">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 80px;">浜у搧浠ｇ爜</label>
+ <div class="layui-input-block" style="margin-left: 72px;">
+ <input type="text" class="layui-input" lay-verify="HMaterNumber" name="HMaterNumber" id="HMaterNumber" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input id="HMaterID" name="HMaterID" type="hidden" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="HMateria-BT" id="HMateria-BT" 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-inline">
+ <label class="layui-form-label" style="margin-left:5px;"> 浜у搧鍚嶇О</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HMaterName" onkeyup="this.value=this.value.replace(/\D/g,'')" value="" lay-verify="" id="HMaterName" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="margin-left:5px;"> 瑙勬牸鍨嬪彿</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HMaterModel" onkeyup="this.value=this.value.replace(/\D/g,'')" value="" lay-verify="" id="HMaterModel" autocomplete="off">
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <div class="layui-row" style="display:none">
+ <div class="layui-inline" style="display:none">
+ <label class="layui-form-label"> 娴佽浆鍗D</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HProcExchInterID" value="0" lay-verify="" id="HProcExchInterID" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline" style="display:none">
+ <label class="layui-form-label"> 娴佽浆鍗″瓙ID</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HProcExchEntryID" value="0" lay-verify="" id="HProcExchEntryID" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="margin-left:5px;"> 娴佽浆鍗℃暟閲�</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HProcExchQty" onkeyup="this.value=this.value.replace(/\D/g,'')" value="0" lay-verify="" id="HProcExchQty" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="margin-left:10px;"> 娴佽浆鍗″彿</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HProcExchBillNo" id="HProcExchBillNo" lay-verify="" autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ </div>
</div>
</div>
+ </div>
+ </div>
</div>
- <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+ <div class="layui-tab layui-tab-card">
+ <ul class="layui-tab-title">
+ <li class="layui-this">妫�楠岄」鐩�</li>
+ <li>涓嶈壇鍘熷洜</li>
+ </ul>
+ <div class="layui-tab-content">
+ <div class="layui-tab-item layui-show">
+ <!--妫�楠岄」鐩�-->
+ <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+ </div>
+ <div class="layui-tab-item">
+ <!--涓嶈壇鍘熷洜-->
+ <table class="layui-hide" id="BadReTable" lay-filter="BadReTable"></table>
+ </div>
+ </div>
+ </div>
+
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container">
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button>
+ </div>
+ </script>
+ <script type="text/html" id="toolbarDemo2">
+ <div class="layui-btn-container">
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine_Bad"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine_Bad"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button>
</div>
</script>
<script type="text/html" id="xuhao">
@@ -196,12 +227,45 @@
<!--<a class="layui-btn layui-btn-xs" lay-event="edit">缂栬緫</a>-->
<a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
</script>
+ <!--琛屼笅鎷夐�夋嫨(妫�楠岃褰�1)-->
+ <script type="text/html" id="HQCNote1">
+ <select name="HQCNote1" lay-filter="HQCNote1" id="HQCNote1{{d.LAY_TABLE_INDEX+1}}">
+ <option value="">璇烽�夋嫨</option>
+ <option value="鍚堟牸">鍚堟牸</option>
+ <option value="涓嶅悎鏍�">涓嶅悎鏍�</option>
+ </select>
+ </script>
+ <!--琛屼笅鎷夐�夋嫨(妫�楠岃褰�2)-->
+ <script type="text/html" id="HQCNote2">
+ <select name="HQCNote2" lay-filter="HQCNote2" id="HQCNote2{{d.LAY_TABLE_INDEX+1}}">
+ <option value="">璇烽�夋嫨</option>
+ <option value="鍚堟牸">鍚堟牸</option>
+ <option value="涓嶅悎鏍�">涓嶅悎鏍�</option>
+ </select>
+ </script>
+ <!--琛屼笅鎷夐�夋嫨(妫�楠岃褰�3)-->
+ <script type="text/html" id="HQCNote3">
+ <select name="HQCNote3" lay-filter="HQCNote3" id="HQCNote3{{d.LAY_TABLE_INDEX+1}}">
+ <option value="">璇烽�夋嫨</option>
+ <option value="鍚堟牸">鍚堟牸</option>
+ <option value="涓嶅悎鏍�">涓嶅悎鏍�</option>
+ </select>
+ </script>
+ <!--琛屼笅鎷夐�夋嫨(妫�楠岃褰�4)-->
+ <script type="text/html" id="HQCNote4">
+ <select name="HQCNote4" lay-filter="HQCNote4" id="HQCNote4{{d.LAY_TABLE_INDEX+1}}">
+ <option value="">璇烽�夋嫨</option>
+ <option value="鍚堟牸">鍚堟牸</option>
+ <option value="涓嶅悎鏍�">涓嶅悎鏍�</option>
+ </select>
+ </script>
<script src="../../../layuiadmin/layui/layui.js"></script>
<script src="../../../layuiadmin/Scripts/json2.js"></script>
<script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
<script>
-
//鑾峰彇鍙傛暟
function getUrlVars() {
var vars = [], hash;
@@ -214,11 +278,15 @@
return vars;
}
-
-
var params = getUrlVars();
- var hID = params[params[0]];//缂栬緫鏌ョ湅
-
+ if (typeof (params[params[0]]) == "undefined") {
+ var OperationType = 1;//鎿嶄綔绫诲瀷
+ } else {
+ var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
+ var linterid = params[params[1]];//婧愬崟id
+ var HEntryID = params[params[2]];//婧愬崟瀛恑d
+ var HSouceBillType = params[params[3]];//婧愬崟绫诲瀷
+ }
layui.config({
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
@@ -230,6 +298,7 @@
, layer = layui.layer
, table = layui.table
, form = layui.form
+ , laydate = layui.laydate
, element = layui.element;
//鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
@@ -238,6 +307,7 @@
// icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
// }, function () { window.location.href = "../../user/login.html"; });
//}
+ //debugger
var tableReload = table.reload;
var option = {
elem: '#mainTable'
@@ -246,46 +316,126 @@
//,url: '/demo/table/user/' //鏁版嵁鎺ュ彛
, page: true //寮�鍚垎椤�
, cols: [[ //琛ㄥご
- {type:'checkbox', fixed: 'left'}
- ,{ templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left',event:"qwe" }
- , { field: 'HQCCheckItemID', title: '妫�楠岄」鐩甀D', edit: 'text'}
- , { field: 'HQCStd', title: '妫�楠屾爣鍑�',edit: 'text', event: "" }
- , { field: 'HQCNote1', title: '妫�楠岃褰�1', event: "", edit: 'text' }
- , { field: 'HQCNote2', title: '妫�楠岃褰�2', edit: 'text' }
- , { field: 'HQCNote3', title: '妫�楠岃褰�3', edit: 'text' }
- , { field: 'HQCNote4', title: '妫�楠岃褰�4', edit: 'text' }
- , { field: 'HQCNote5', title: '妫�楠岃褰�5', edit: 'text' }
- , { field: 'HQCNote6', title: '妫�楠岃褰�6', edit: 'text' }
- , { field: 'HQCNote7', title: '妫�楠岃褰�7', edit: 'text' }
- , { field: 'HQCNote8', title: '妫�楠岃褰�8', edit: 'text' }
- , { field: 'HQCNote9', title: '妫�楠岃褰�9', edit: 'text' }
- , { field: 'HQCNote10', title: '妫�楠岃褰�10', edit: 'text' }
- , { field: 'HRemark', title: '澶囨敞', edit: 'text'}
- ,{fixed: 'right', title:'鎿嶄綔', toolbar: '#barDemo', width:150}
+ { type: 'checkbox', fixed: 'left' }
+ , { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe", width: 75 }
+ , { field: '妫�楠岄」鐩垎绫�', title: '妫�楠岄」鐩垎绫�', event: "", width: 120 }
+ , { field: 'HQCCheckItemID', title: '妫�楠岄」鐩甀D', edit: 'text', hide: true }
+ , { field: 'HQCCheckItemName', title: '妫�楠岄」鐩悕绉�', edit: 'text', width: 120 }
+ , { field: 'HQCStd', title: '妫�楠屾爣鍑�', edit: 'text', event: "", width: 95, hide: true }
+ , { field: 'HQCNote1', title: '妫�楠岃褰�1(08:00--12:00)', width: 185, templet: '#HQCNote1' }
+ , { field: 'HQCNote2', title: '妫�楠岃褰�2(13:00--17:00)', width: 185, templet: '#HQCNote2' }
+ , { field: 'HQCNote3', title: '妫�楠岃褰�3(18:00--23:00)', width: 185, templet: '#HQCNote3' }
+ , { field: 'HQCNote4', title: '妫�楠岃褰�4(00:00--07:00)', width: 185, templet: '#HQCNote4' }
+ , { field: 'HQCNote5', title: '妫�楠岃褰�5(16:00--18:00)', edit: 'text', width: 185, hide: true }
+ , { field: 'HQCNote6', title: '妫�楠岃褰�6(18:00--20:00)', edit: 'text', width: 185, hide: true }
+ , { field: 'HQCNote7', title: '妫�楠岃褰�7', edit: 'text', hide: true }
+ , { field: 'HQCNote8', title: '妫�楠岃褰�8', edit: 'text', hide: true }
+ , { field: 'HQCNote9', title: '妫�楠岃褰�9', edit: 'text', hide: true }
+ , { field: 'HQCNote10', title: '妫�楠岃褰�10', edit: 'text', hide: true }
+ , { field: 'HRemark', title: '澶囨敞', edit: 'text', width: 120 }
+ , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 75 }
]]
- , limit: 500 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
+ , limit: 500 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
};
+
+ var option_BadRe = {
+ elem: '#BadReTable'
+ , toolbar: '#toolbarDemo2'
+ , height: 500
+ //,url: '/demo/table/user/' //鏁版嵁鎺ュ彛
+ , page: true //寮�鍚垎椤�
+ , cols: [[ //琛ㄥご
+ { type: 'checkbox', fixed: 'left' }
+ , { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe", width: 75 }
+ , { field: 'HBadReasonID', title: '涓嶈壇鍘熷洜ID', edit: 'text', hide: true }
+ , { field: 'HBadReasonNumber', title: '涓嶈壇鍘熷洜浠ｇ爜', edit: 'text', width: 120, event: "HBadReason" }
+ , { field: 'HBadReasonName', title: '涓嶈壇鍘熷洜', edit: 'text', width: 120 }
+ , { field: 'HQty', title: '鏁伴噺', edit: 'text', width: 120, event: "HQty" }
+ , { field: 'HEmpID', title: '璐ｄ换浜篒D', edit: 'text', hide: true }
+ , { field: 'HEmpNumber', title: '璐ｄ换浜轰唬鐮�', edit: 'text', width: 120, event: "HEmp" }
+ , { field: 'HEmpName', title: '璐ｄ换浜�', edit: 'text', width: 120 }
+ , { field: 'HProcID', title: '璐ｄ换宸ュ簭ID', edit: 'text', hide: true }
+ , { field: 'HProcNumber', title: '璐ｄ换宸ュ簭浠ｇ爜', edit: 'text', width: 120, event: "HProc" }
+ , { field: 'HProcName', title: '璐ｄ换宸ュ簭', edit: 'text', width: 120 }
+ , { field: 'HCheckEmpID', title: '纭浜篒D', edit: 'text', hide: true }
+ , { field: 'HCheckEmpNumber', title: '纭浜轰唬鐮�', edit: 'text', width: 120, event: "HCheckEmp" }
+ , { field: 'HCheckEmpName', title: '纭浜�', edit: 'text', width: 120 }
+ , { field: 'HMaterID', title: '鐗╂枡ID', edit: 'text', hide: true }
+ , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', edit: 'text', width: 120, event: "HMater" }
+ , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', edit: 'text', width: 120 }
+ , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', edit: 'text', width: 120 }
+ , { field: 'HCreateDate', title: '鐧昏鏃ユ湡', edit: 'text', width: 120, event: 'HCreateDate' }
+ , { field: 'HFinishDate', title: '瀹屾垚鏃ユ湡', edit: 'text', width: 120, event: 'HFinishDate' }
+ , { field: 'HRemark', title: '澶囨敞', edit: 'text', width: 120 }
+ , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 75 }
+ ]]
+ , limit: 500 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
+ };
+
//鍒ゆ柇鏄惁鏂板
- if (hID == null || hID == 0)
- {
+ if (OperationType == 1) {
//鍒濆鍔犺浇琛ㄦ牸{ "ID": 0, "HWasterReasonName": " ","HBadReasonID":0,"HEmpName": " ", "HSQProcName": " ","HProcID":0, "HZRProcName": " ", "HMRBChecker": " ", "HRemark": " ", "HPSProcName": " ", "HCloseMan": " " }
- option.data = [{ "HQCCheckItemID": 0, "HQCStd": " ", "HQCNote1": " ", "HQCNote2": " ", "HQCNote3": " ", "HQCNote4": " ", "HQCNote5": " ", "HQCNote6": " ", "HQCNote7": " ", "HQCNote8": " ", "HQCNote9": " ", "HQCNote10": " ", "HRemark": " " }];
+ option.data = [{ "妫�楠岄」鐩垎绫�":"","HQCCheckItemID":0,"HQCCheckItemName": "", "HQCStd": " ", "HQCNote1": " ", "HQCNote2": " ", "HQCNote3": " ", "HQCNote4": " ", "HQCNote5": " ", "HQCNote6": " ", "HQCNote7": " ", "HQCNote8": " ", "HQCNote9": " ", "HQCNote10": " ", "HRemark": " " }];
table.render(option);
+
+ option_BadRe.data = [{
+ "HBadReasonID":0,"HBadReasonNumber": "", "HBadReasonName": "", "HEmpID": 0, "HEmpNumber": "", "HEmpName": "", "HProcID": 0,
+ "HProcNumber": "", "HProcName": "", "HCheckEmpID": 0, "HCheckEmpNumber": "", "HCheckEmpName": "", "HMaterID": 0, "HMaterNumber": "",
+ "HMaterName": "", "HMaterModel": "", "HCreateDate": Format(new Date(), "yyyy-MM-dd"), "HFinishDate": Format(new Date(), "yyyy-MM-dd"), "HQty": 0, "HRemark": ""
+ }];
+ table.render(option_BadRe);
}
- else
- {
- $("#HInterID").val(hID);//淇敼鏃朵富琛↖D
- //缂栬緫鍔犺浇鏁版嵁
+ else if (OperationType == 2) {
+ $("#HInterID").val(linterid);//淇敼鏃朵富琛↖D
+ //缂栬緫鍔犺浇鏁版嵁--琛ㄤ綋
$.ajax({
url: GetWEBURL() + 'MES_QC_PatrolProcCheckDetail_Json',
type: "GET",
- data: { "sqlWhere": "and HInterID="+hID },
+ data: { "sqlWhere": "and HInterID=" + linterid },
success: function (result) {
- console.log('gouba' + result);
if (result.count == 1) {
- option.data = result.data;
- table.render(option);
+ //妫�楠岄」鐩�
+ var rowdata = [];
+ var data = result.data;
+ for (let i = 0; i < result.data.length; i++) {
+ rowdata.push({
+ "妫�楠岄」鐩垎绫�": data[i].妫�楠岄」鐩垎绫�, "HQCCheckItemID": data[i].HQCCheckItemID, "HQCCheckItemName": data[i].妫�楠岄」鐩悕绉�,
+ "HQCStd": data[i].HQCStd, "HQCNote1": data[i].HQCNote1, "HQCNote2": data[i].HQCNote2, "HQCNote3": data[i].HQCNote3,
+ "HQCNote4": data[i].HQCNote4, "HQCNote5": data[i].HQCNote5, "HQCNote6": data[i].HQCNote6, "HQCNote7": data[i].HQCNote7,
+ "HQCNote8": data[i].HQCNote8, "HQCNote9": data[i].HQCNote9, "HQCNote10": data[i].HQCNote10, "HRemark": data[i].琛ㄤ綋澶囨敞
+ });
+ }
+ option.data = rowdata;
+ table.render(option);
+ for (var i = 0; i < result.data.length; i++) {
+ $('#HQCNote1' + (i + 1)).find("option[value='" + result.data[i].HQCNote1 + "']").attr("selected", true);
+ $('#HQCNote2' + (i + 1)).find("option[value='" + result.data[i].HQCNote2 + "']").attr("selected", true);
+ $('#HQCNote3' + (i + 1)).find("option[value='" + result.data[i].HQCNote3 + "']").attr("selected", true);
+ $('#HQCNote4' + (i + 1)).find("option[value='" + result.data[i].HQCNote4 + "']").attr("selected", true);
+ }
+ form.render('select');
+
+ //涓嶈壇鍘熷洜
+ var baddata = [];
+ var HSEQArr = [];
+ for (let i = 0; i < result.data.length; i++) {
+ if (HSEQArr.indexOf(data[i].琛屽彿) == -1) {
+ HSEQArr.push(data[i].琛屽彿);
+ baddata.push({
+ "HBadReasonID": data[i].HBadReasonID, "HBadReasonNumber": data[i].涓嶈壇鍘熷洜浠ｇ爜, "HBadReasonName": data[i].涓嶈壇鍘熷洜鍚嶇О,
+ "HEmpID": data[i].HEmpID, "HEmpNumber": data[i].璐ｄ换浜轰唬鐮�, "HEmpName": data[i].璐ｄ换浜哄悕绉�, "HProcID": data[i].HProcID,
+ "HProcNumber": data[i].璐ｄ换宸ュ簭浠ｇ爜, "HProcName": data[i].璐ｄ换宸ュ簭鍚嶇О, "HCheckEmpID": data[i].HCheckEmpID,
+ "HCheckEmpNumber": data[i].纭浜轰唬鐮�, "HCheckEmpName": data[i].纭浜哄悕绉�, "HMaterID": data[i].HMaterID,
+ "HMaterNumber": data[i].鐗╂枡浠ｇ爜, "HMaterName": data[i].鐗╂枡鍚嶇О, "HMaterModel": data[i].瑙勬牸鍨嬪彿,
+ "HCreateDate": Format(new Date(data[i].鐧昏鏃ユ湡), "yyyy-MM-dd"), "HFinishDate": Format(new Date(data[i].瀹屾垚鏃ユ湡), "yyyy-MM-dd"),
+ "HQty": data[i].涓嶈壇鏁伴噺, "HRemark": data[i].涓嶈壇澶囨敞
+ });
+ }
+ }
+
+ option_BadRe.data = baddata;
+ table.render(option_BadRe);
} else {
layer.alert(result.code + result.Message, { icon: 5 });
}
@@ -297,19 +447,18 @@
}
-
- //澶村伐鍏锋爮浜嬩欢
+ //澶村伐鍏锋爮浜嬩欢
var rowid = 0;
var rows = 0;
table.on('toolbar(mainTable)', function (obj) {
var checkStatus = table.checkStatus('mainTable')
- ,data = checkStatus.data;;
+ , data = checkStatus.data;;
var AddRow = table.cache['mainTable'];
var NewRow = { "HQCCheckItemID": 0, "HQCStd": " ", "HQCNote1": " ", "HQCNote2": " ", "HQCNote3": " ", "HQCNote4": " ", "HQCNote5": " ", "HQCNote6": " ", "HQCNote7": " ", "HQCNote8": " ", "HQCNote9": " ", "HQCNote10": " ", "HRemark": " " };
switch (obj.event) {
case 'btn-AddLine':
//table.cache["mainTable"].push(AddRow[rows]);
- table.cache["mainTable"].push(NewRow);
+ table.cache["mainTable"].push(NewRow);
option.data = table.cache["mainTable"];
table.render(option);
rows++;
@@ -320,12 +469,12 @@
if (data.length <= 0) {
layer.alert("璇烽�夋嫨闇�瑕佸鍒剁殑涓�琛岋紒");
}
- else if (data.length>1) {
+ else if (data.length > 1) {
layer.alert("鍙兘閫夋嫨澶嶅埗涓�琛岋紒");
}
else {
var copydata2 = copydata.substring(1, copydata.length);//鍘婚櫎棣栬瀛楃'['
- var copyrow =copydata2.substring(0, copydata2.length - 1);//鍘婚櫎鏈熬瀛楃']'
+ var copyrow = copydata2.substring(0, copydata2.length - 1);//鍘婚櫎鏈熬瀛楃']'
table.cache["mainTable"].push(JSON.parse(copyrow));//灏嗗鍒剁殑琛屽己杞垚json杩藉姞鍒拌〃鏍间笂
option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
table.render(option);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
@@ -334,14 +483,295 @@
break;
}
});
+ //涓嶈壇鍘熷洜
+ table.on('toolbar(BadReTable)', function (obj) {
+ var checkStatus = table.checkStatus('BadReTable')
+ , data = checkStatus.data;;
+ var AddRow = table.cache['BadReTable'];
+ var NewRow = {
+ "HQCCheckItemID": 0, "HBadReasonID": 0, "HBadReasonNumber": "", "HBadReasonName": "", "HEmpID": 0, "HEmpNumber": "", "HEmpName": "", "HProcID": 0,
+ "HProcNumber": "", "HProcName": "", "HCheckEmpID": 0, "HCheckEmpNumber": "", "HCheckEmpName": "", "HMaterID": 0, "HMaterNumber": "",
+ "HMaterName": "", "HMaterModel": "", "HCreateDate": Format(new Date(), "yyyy-MM-dd"), "HFinishDate": Format(new Date(), "yyyy-MM-dd"), "HQty": 0, "HRemark": ""
+ };
+ switch (obj.event) {
+ case 'btn-AddLine_Bad':
+ table.cache["BadReTable"].push(NewRow);
+ option_BadRe.data = table.cache["BadReTable"];
+ table.render(option_BadRe);
+ rows++;
+ layer.msg('澧炲姞涓�琛屾寜閽紒')
+ break;
+ case 'btn-CopyLine_Bad':
+ var copydata = JSON.stringify(data);
+ if (data.length <= 0) {
+ layer.alert("璇烽�夋嫨闇�瑕佸鍒剁殑涓�琛岋紒");
+ }
+ else if (data.length > 1) {
+ layer.alert("鍙兘閫夋嫨澶嶅埗涓�琛岋紒");
+ }
+ else {
+ var copydata2 = copydata.substring(1, copydata.length);//鍘婚櫎棣栬瀛楃'['
+ var copyrow = copydata2.substring(0, copydata2.length - 1);//鍘婚櫎鏈熬瀛楃']'
+ table.cache["BadReTable"].push(JSON.parse(copyrow));//灏嗗鍒剁殑琛屽己杞垚json杩藉姞鍒拌〃鏍间笂
+ option_BadRe.data = table.cache["BadReTable"];//灏嗘暟鎹粦瀹氬埌data涓�
+ table.render(option_BadRe);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
+ //layer.alert(copyrow);
+ }
+ break;
+ }
+ });
+
+ //琛屽唴浜嬩欢--涓嶈壇鍘熷洜
+ table.on('tool(BadReTable)', function (obj) {
+ var data = obj.data;
+ if (obj.event == 'HCreateDate') {
+ var field = $(this).data('field');
+ laydate.render({
+ elem: this.firstChild
+ , show: true //鐩存帴鏄剧ず
+ , closeStop: this
+ , done: function (nowDate) {
+ //鏃堕棿閫夋嫨瀹屾垚锛岃鏁版嵁鏇存柊
+ data[field] = nowDate;
+ obj.update(data);
+ //鍒锋柊澶嶉�夋
+ //checkRefresh();
+ }
+ });
+ }
+ if (obj.event == 'HFinishDate') {
+ var field = $(this).data('field');
+ laydate.render({
+ elem: this.firstChild
+ , show: true //鐩存帴鏄剧ず
+ , closeStop: this
+ , done: function (nowDate) {
+ //鏃堕棿閫夋嫨瀹屾垚锛岃鏁版嵁鏇存柊
+ data[field] = nowDate;
+ obj.update(data);
+ //鍒锋柊澶嶉�夋
+ //checkRefresh();
+ }
+ });
+ }
+ if (obj.event == 'HQty') {
+ $(obj.tr).find(".layui-table-edit").keyup(function () {
+ var $input = $(this), val = $input.val();
+ if (!val) val = "0";
+ $input.val(parseInt(val.replace(/[^\d*\.?\d*]/g, '')));
+ });
+ }
+
+
+ $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
+ if (event.key == "F7") {
+ if (obj.event == 'HBadReason') {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '涓嶈壇鍘熷洜鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['90%', '90%'],
+ maxmin: true,
+ content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_BadReasonList.html', 'yes'],
+ btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {
+
+ //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ obj.update({
+ HBadReasonID: checkStatus.data[0].HItemID
+ , HBadReasonNumber: checkStatus.data[0].HNumber
+ , HBadReasonName: checkStatus.data[0].HName
+ });
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ }
+ });
+ }
+ if (obj.event == 'HEmp') {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '璐ｄ换浜哄垪琛�',
+ closeBtn: 1,
+ shift: 2,
+ area: ['90%', '90%'],
+ maxmin: true,
+ content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html', 'yes'],
+ btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {
+
+ //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ obj.update({
+ HEmpID: checkStatus.data[0].HItemID
+ , HEmpNumber: checkStatus.data[0].HNumber
+ , HEmpName: checkStatus.data[0].HName
+ });
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ }
+ });
+ }
+ if (obj.event == 'HProc') {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '璐ｄ换宸ュ簭鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['90%', '90%'],
+ maxmin: true,
+ content: ['../../../views/鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/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('璇烽�夋嫨鏁版嵁');
+ }
+
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ obj.update({
+ HProcID: checkStatus.data[0].HItemID
+ , HProcNumber: checkStatus.data[0].宸ュ簭浠ｇ爜
+ , HProcName: checkStatus.data[0].宸ュ簭鍚嶇О
+ });
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ }
+ });
+ }
+ if (obj.event == 'HCheckEmp') {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '纭浜哄垪琛�',
+ closeBtn: 1,
+ shift: 2,
+ area: ['90%', '90%'],
+ maxmin: true,
+ content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html', 'yes'],
+ btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {
+
+ //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ obj.update({
+ HCheckEmpID: checkStatus.data[0].HItemID
+ , HCheckEmpNumber: checkStatus.data[0].HNumber
+ , HCheckEmpName: checkStatus.data[0].HName
+ });
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ }
+ });
+ }
+ if (obj.event == 'HMater') {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '鐗╂枡鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['90%', '90%'],
+ maxmin: true,
+ content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_MaterialList.html', 'yes'],
+ btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {
+
+ //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ obj.update({
+ HMaterID: checkStatus.data[0].HItemID
+ , HMaterNumber: checkStatus.data[0].HNumber
+ , HMaterName: checkStatus.data[0].HName
+ , HMaterModel: checkStatus.data[0].HModel
+ });
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ }
+ });
+ }
+
+ obj.event = "";
+ return false;
+
+ }
+ })
+ });
+
//琛屽唴浜嬩欢
table.on('tool(mainTable)', function (obj) {
var data = obj.data;
var rowIndex = $(obj.tr).attr("data-index");
- if (obj.event==='del') {
+ if (obj.event === 'del') {
layer.confirm('鐪熺殑鍒犻櫎琛屼箞', function (index) {
console.log("绱㈠紩涓�:" + rowIndex);
- if (rowIndex ==='0') {
+ if (rowIndex === '0') {
layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
} else {
obj.del();
@@ -366,354 +796,17 @@
, end: function () {
_obj.update({
HWasterReasonName: HReasonName
- ,HBadReasonID:ReasonID
+ , HBadReasonID: ReasonID
});
}
})
console.log("瀛楁璧嬪��" + data.HWasterReasonName);
console.log("琛屽彿锛�" + rowIndex);
break;
- case "1":
- //寮瑰嚭妗嗛�夋嫨涓嶈壇鍘熷洜
- layer.open({
- type: 2
- , area: ['80%', '80%']
- , title: '涓嶈壇鍘熷洜鍒楄〃'
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_BadReasonList.html', 'yes']
- , resize: false
- , end: function () {
- _obj.update({
- HWasterReasonName: HReasonName
- ,HBadReasonID:ReasonID
- });
- }
- })
- console.log("瀛楁璧嬪��" + data.HWasterReasonName);
- console.log("琛屽彿锛�" + rowIndex);
- break;
- case "2":
- //寮瑰嚭妗嗛�夋嫨涓嶈壇鍘熷洜
- layer.open({
- type: 2
- , area: ['80%', '80%']
- , title: '涓嶈壇鍘熷洜鍒楄〃'
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_BadReasonList.html', 'yes']
- , resize: false
- , end: function () {
- _obj.update({
- HWasterReasonName: HReasonName
- ,HBadReasonID:ReasonID
- });
- }
- })
- console.log("瀛楁璧嬪��" + data.HWasterReasonName);
- console.log("琛屽彿锛�" + rowIndex);
- break;
- case "3":
- //寮瑰嚭妗嗛�夋嫨涓嶈壇鍘熷洜
- layer.open({
- type: 2
- , area: ['80%', '80%']
- , title: '涓嶈壇鍘熷洜鍒楄〃'
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_BadReasonList.html', 'yes']
- , resize: false
- , end: function () {
- _obj.update({
- HWasterReasonName: HReasonName
- ,HBadReasonID:ReasonID
- });
- }
- })
- console.log("瀛楁璧嬪��" + data.HWasterReasonName);
- console.log("琛屽彿锛�" + rowIndex);
- break;
- case "4":
- //寮瑰嚭妗嗛�夋嫨涓嶈壇鍘熷洜
- layer.open({
- type: 2
- , area: ['80%', '80%']
- , title: '涓嶈壇鍘熷洜鍒楄〃'
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_BadReasonList.html', 'yes']
- , resize: false
- , end: function () {
- _obj.update({
- HWasterReasonName: HReasonName
- ,HBadReasonID:ReasonID
- });
- }
- })
- console.log("瀛楁璧嬪��" + data.HWasterReasonName);
- console.log("琛屽彿锛�" + rowIndex);
- break;
- case "5":
- //寮瑰嚭妗嗛�夋嫨涓嶈壇鍘熷洜
- layer.open({
- type: 2
- , area: ['80%', '80%']
- , title: '涓嶈壇鍘熷洜鍒楄〃'
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_BadReasonList.html', 'yes']
- , resize: false
- , end: function () {
- _obj.update({
- HWasterReasonName: HReasonName
- ,HBadReasonID:ReasonID
- });
- }
- })
- console.log("瀛楁璧嬪��" + data.HWasterReasonName);
- console.log("琛屽彿锛�" + rowIndex);
- break;
- case "6":
- //寮瑰嚭妗嗛�夋嫨涓嶈壇鍘熷洜
- layer.open({
- type: 2
- , area: ['80%', '80%']
- , title: '涓嶈壇鍘熷洜鍒楄〃'
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_BadReasonList.html', 'yes']
- , resize: false
- , end: function () {
- _obj.update({
- HWasterReasonName: HReasonName
- ,HBadReasonID:ReasonID
- });
- }
- })
- console.log("瀛楁璧嬪��" + data.HWasterReasonName);
- console.log("琛屽彿锛�" + rowIndex);
- break;
- case "7":
- //寮瑰嚭妗嗛�夋嫨涓嶈壇鍘熷洜
- layer.open({
- type: 2
- , area: ['80%', '80%']
- , title: '涓嶈壇鍘熷洜鍒楄〃'
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_BadReasonList.html', 'yes']
- , resize: false
- , end: function () {
- _obj.update({
- HWasterReasonName: HReasonName
- ,HBadReasonID:ReasonID
- });
- }
- })
- console.log("瀛楁璧嬪��" + data.HWasterReasonName);
- console.log("琛屽彿锛�" + rowIndex);
- break;
- case "8":
- //寮瑰嚭妗嗛�夋嫨涓嶈壇鍘熷洜
- layer.open({
- type: 2
- , area: ['80%', '80%']
- , title: '涓嶈壇鍘熷洜鍒楄〃'
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_BadReasonList.html', 'yes']
- , resize: false
- , end: function () {
- _obj.update({
- HWasterReasonName: HReasonName
- ,HBadReasonID:ReasonID
- });
- }
- })
- console.log("瀛楁璧嬪��" + data.HWasterReasonName);
- console.log("琛屽彿锛�" + rowIndex);
- break;
- case "9":
- //寮瑰嚭妗嗛�夋嫨涓嶈壇鍘熷洜
- layer.open({
- type: 2
- , area: ['80%', '80%']
- , title: '涓嶈壇鍘熷洜鍒楄〃'
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_BadReasonList.html', 'yes']
- , resize: false
- , end: function () {
- _obj.update({
- HWasterReasonName: HReasonName
- ,HBadReasonID:ReasonID
- });
- }
- })
- console.log("瀛楁璧嬪��" + data.HWasterReasonName);
- console.log("琛屽彿锛�" + rowIndex);
- break;
- case "10":
- //寮瑰嚭妗嗛�夋嫨涓嶈壇鍘熷洜
- layer.open({
- type: 2
- , area: ['80%', '80%']
- , title: '涓嶈壇鍘熷洜鍒楄〃'
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_BadReasonList.html', 'yes']
- , resize: false
- , end: function () {
- _obj.update({
- HWasterReasonName: HReasonName
- ,HBadReasonID:ReasonID
- });
- }
- })
- console.log("瀛楁璧嬪��" + data.HWasterReasonName);
- console.log("琛屽彿锛�" + rowIndex);
- break;
- case "11":
- //寮瑰嚭妗嗛�夋嫨涓嶈壇鍘熷洜
- layer.open({
- type: 2
- , area: ['80%', '80%']
- , title: '涓嶈壇鍘熷洜鍒楄〃'
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_BadReasonList.html', 'yes']
- , resize: false
- , end: function () {
- _obj.update({
- HWasterReasonName: HReasonName
- ,HBadReasonID:ReasonID
- });
- }
- })
- console.log("瀛楁璧嬪��" + data.HWasterReasonName);
- console.log("琛屽彿锛�" + rowIndex);
- break;
- case "12":
- //寮瑰嚭妗嗛�夋嫨涓嶈壇鍘熷洜
- layer.open({
- type: 2
- , area: ['80%', '80%']
- , title: '涓嶈壇鍘熷洜鍒楄〃'
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_BadReasonList.html', 'yes']
- , resize: false
- , end: function () {
- _obj.update({
- HWasterReasonName: HReasonName
- ,HBadReasonID:ReasonID
- });
- }
- })
- console.log("瀛楁璧嬪��" + data.HWasterReasonName);
- console.log("琛屽彿锛�" + rowIndex);
- break;
- case "13":
- //寮瑰嚭妗嗛�夋嫨涓嶈壇鍘熷洜
- layer.open({
- type: 2
- , area: ['80%', '80%']
- , title: '涓嶈壇鍘熷洜鍒楄〃'
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_BadReasonList.html', 'yes']
- , resize: false
- , end: function () {
- _obj.update({
- HWasterReasonName: HReasonName
- ,HBadReasonID:ReasonID
- });
- }
- })
- console.log("瀛楁璧嬪��" + data.HWasterReasonName);
- console.log("琛屽彿锛�" + rowIndex);
- break;
- case "14":
- //寮瑰嚭妗嗛�夋嫨涓嶈壇鍘熷洜
- layer.open({
- type: 2
- , area: ['80%', '80%']
- , title: '涓嶈壇鍘熷洜鍒楄〃'
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_BadReasonList.html', 'yes']
- , resize: false
- , end: function () {
- _obj.update({
- HWasterReasonName: HReasonName
- ,HBadReasonID:ReasonID
- });
- }
- })
- console.log("瀛楁璧嬪��" + data.HWasterReasonName);
- console.log("琛屽彿锛�" + rowIndex);
- break;
- case "15":
- //寮瑰嚭妗嗛�夋嫨涓嶈壇鍘熷洜
- layer.open({
- type: 2
- , area: ['80%', '80%']
- , title: '涓嶈壇鍘熷洜鍒楄〃'
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_BadReasonList.html', 'yes']
- , resize: false
- , end: function () {
- _obj.update({
- HWasterReasonName: HReasonName
- ,HBadReasonID:ReasonID
- });
- }
- })
- console.log("瀛楁璧嬪��" + data.HWasterReasonName);
- console.log("琛屽彿锛�" + rowIndex);
- break;
- case "16":
- //寮瑰嚭妗嗛�夋嫨涓嶈壇鍘熷洜
- layer.open({
- type: 2
- , area: ['80%', '80%']
- , title: '涓嶈壇鍘熷洜鍒楄〃'
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_BadReasonList.html', 'yes']
- , resize: false
- , end: function () {
- _obj.update({
- HWasterReasonName: HReasonName
- ,HBadReasonID:ReasonID
- });
- }
- })
- console.log("瀛楁璧嬪��" + data.HWasterReasonName);
- console.log("琛屽彿锛�" + rowIndex);
- break;
-
}
}
else if (obj.event === 'EmpNameEvent') {
- var _obj = obj;
+ var _obj = obj;
switch (rowIndex) {
case "0":
//寮瑰嚭妗嗛�夋嫨璐ｄ换浜�
@@ -735,331 +828,10 @@
console.log("瀛楁璧嬪��" + data.HEmpName);
console.log("琛屽彿锛�" + rowIndex);
break;
- case "1":
- //寮瑰嚭妗嗛�夋嫨璐ｄ换浜�
- layer.open({
- type: 2
- , area: ['80%', '80%']
- , title: '鑱屽憳鍒楄〃'
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HKeeper', 'yes']
- , resize: false
- , end: function () {
- _obj.update({
- HEmpName: EmpName
- });
- }
- })
- console.log("瀛楁璧嬪��" + data.HEmpName);
- console.log("琛屽彿锛�" + rowIndex);
- break;
- case "2":
- //寮瑰嚭妗嗛�夋嫨璐ｄ换浜�
- layer.open({
- type: 2
- , area: ['80%', '80%']
- , title: '鑱屽憳鍒楄〃'
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HKeeper', 'yes']
- , resize: false
- , end: function () {
- _obj.update({
- HEmpName: EmpName
- });
- }
- })
- console.log("瀛楁璧嬪��" + data.HEmpName);
- console.log("琛屽彿锛�" + rowIndex);
- break;
- case "3":
- //寮瑰嚭妗嗛�夋嫨璐ｄ换浜�
- layer.open({
- type: 2
- , area: ['80%', '80%']
- , title: '鑱屽憳鍒楄〃'
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HKeeper', 'yes']
- , resize: false
- , end: function () {
- _obj.update({
- HEmpName: EmpName
- });
- }
- })
- console.log("瀛楁璧嬪��" + data.HEmpName);
- console.log("琛屽彿锛�" + rowIndex);
- break;
- case "4":
- //寮瑰嚭妗嗛�夋嫨璐ｄ换浜�
- layer.open({
- type: 2
- , area: ['80%', '80%']
- , title: '鑱屽憳鍒楄〃'
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HKeeper', 'yes']
- , resize: false
- , end: function () {
- _obj.update({
- HEmpName: EmpName
- });
- }
- })
- console.log("瀛楁璧嬪��" + data.HEmpName);
- console.log("琛屽彿锛�" + rowIndex);
- break;
- case "5":
- //寮瑰嚭妗嗛�夋嫨璐ｄ换浜�
- layer.open({
- type: 2
- , area: ['80%', '80%']
- , title: '鑱屽憳鍒楄〃'
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HKeeper', 'yes']
- , resize: false
- , end: function () {
- _obj.update({
- HEmpName: EmpName
- });
- }
- })
- console.log("瀛楁璧嬪��" + data.HEmpName);
- console.log("琛屽彿锛�" + rowIndex);
- break;
- case "6":
- //寮瑰嚭妗嗛�夋嫨璐ｄ换浜�
- layer.open({
- type: 2
- , area: ['80%', '80%']
- , title: '鑱屽憳鍒楄〃'
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HKeeper', 'yes']
- , resize: false
- , end: function () {
- _obj.update({
- HEmpName: EmpName
- });
- }
- })
- console.log("瀛楁璧嬪��" + data.HEmpName);
- console.log("琛屽彿锛�" + rowIndex);
- break;
- case "7":
- //寮瑰嚭妗嗛�夋嫨璐ｄ换浜�
- layer.open({
- type: 2
- , area: ['80%', '80%']
- , title: '鑱屽憳鍒楄〃'
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HKeeper', 'yes']
- , resize: false
- , end: function () {
- _obj.update({
- HEmpName: EmpName
- });
- }
- })
- console.log("瀛楁璧嬪��" + data.HEmpName);
- console.log("琛屽彿锛�" + rowIndex);
- break;
- case "8":
- //寮瑰嚭妗嗛�夋嫨璐ｄ换浜�
- layer.open({
- type: 2
- , area: ['80%', '80%']
- , title: '鑱屽憳鍒楄〃'
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HKeeper', 'yes']
- , resize: false
- , end: function () {
- _obj.update({
- HEmpName: EmpName
- });
- }
- })
- console.log("瀛楁璧嬪��" + data.HEmpName);
- console.log("琛屽彿锛�" + rowIndex);
- break;
- case "9":
- //寮瑰嚭妗嗛�夋嫨璐ｄ换浜�
- layer.open({
- type: 2
- , area: ['80%', '80%']
- , title: '鑱屽憳鍒楄〃'
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HKeeper', 'yes']
- , resize: false
- , end: function () {
- _obj.update({
- HEmpName: EmpName
- });
- }
- })
- console.log("瀛楁璧嬪��" + data.HEmpName);
- console.log("琛屽彿锛�" + rowIndex);
- break;
- case "10":
- //寮瑰嚭妗嗛�夋嫨璐ｄ换浜�
- layer.open({
- type: 2
- , area: ['80%', '80%']
- , title: '鑱屽憳鍒楄〃'
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HKeeper', 'yes']
- , resize: false
- , end: function () {
- _obj.update({
- HEmpName: EmpName
- });
- }
- })
- console.log("瀛楁璧嬪��" + data.HEmpName);
- console.log("琛屽彿锛�" + rowIndex);
- break;
- case "11":
- //寮瑰嚭妗嗛�夋嫨璐ｄ换浜�
- layer.open({
- type: 2
- , area: ['80%', '80%']
- , title: '鑱屽憳鍒楄〃'
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HKeeper', 'yes']
- , resize: false
- , end: function () {
- _obj.update({
- HEmpName: EmpName
- });
- }
- })
- console.log("瀛楁璧嬪��" + data.HEmpName);
- console.log("琛屽彿锛�" + rowIndex);
- break;
- case "12":
- //寮瑰嚭妗嗛�夋嫨璐ｄ换浜�
- layer.open({
- type: 2
- , area: ['80%', '80%']
- , title: '鑱屽憳鍒楄〃'
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HKeeper', 'yes']
- , resize: false
- , end: function () {
- _obj.update({
- HEmpName: EmpName
- });
- }
- })
- console.log("瀛楁璧嬪��" + data.HEmpName);
- console.log("琛屽彿锛�" + rowIndex);
- break;
- case "13":
- //寮瑰嚭妗嗛�夋嫨璐ｄ换浜�
- layer.open({
- type: 2
- , area: ['80%', '80%']
- , title: '鑱屽憳鍒楄〃'
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HKeeper', 'yes']
- , resize: false
- , end: function () {
- _obj.update({
- HEmpName: EmpName
- });
- }
- })
- console.log("瀛楁璧嬪��" + data.HEmpName);
- console.log("琛屽彿锛�" + rowIndex);
- break;
- case "14":
- //寮瑰嚭妗嗛�夋嫨璐ｄ换浜�
- layer.open({
- type: 2
- , area: ['80%', '80%']
- , title: '鑱屽憳鍒楄〃'
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HKeeper', 'yes']
- , resize: false
- , end: function () {
- _obj.update({
- HEmpName: EmpName
- });
- }
- })
- console.log("瀛楁璧嬪��" + data.HEmpName);
- console.log("琛屽彿锛�" + rowIndex);
- break;
- case "15":
- //寮瑰嚭妗嗛�夋嫨璐ｄ换浜�
- layer.open({
- type: 2
- , area: ['80%', '80%']
- , title: '鑱屽憳鍒楄〃'
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HKeeper', 'yes']
- , resize: false
- , end: function () {
- _obj.update({
- HEmpName: EmpName
- });
- }
- })
- console.log("瀛楁璧嬪��" + data.HEmpName);
- console.log("琛屽彿锛�" + rowIndex);
- break;
- case "16":
- //寮瑰嚭妗嗛�夋嫨璐ｄ换浜�
- layer.open({
- type: 2
- , area: ['80%', '80%']
- , title: '鑱屽憳鍒楄〃'
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HKeeper', 'yes']
- , resize: false
- , end: function () {
- _obj.update({
- HEmpName: EmpName
- });
- }
- })
- console.log("瀛楁璧嬪��" + data.HEmpName);
- console.log("琛屽彿锛�" + rowIndex);
- break;
-
}
}
else if (obj.event === 'SQProcNameEvent') {
- var _obj = obj;
+ var _obj = obj;
switch (rowIndex) {
case "0":
//寮瑰嚭妗嗛�夋嫨鐢宠宸ュ簭
@@ -1082,347 +854,10 @@
console.log("瀛楁璧嬪��" + data.HSQProcName);
console.log("琛屽彿锛�" + rowIndex);
break;
- case "1":
- //寮瑰嚭妗嗛�夋嫨鐢宠宸ュ簭
- layer.open({
- type: 2
- , area: ['80%', '80%']
- , title: '鐢宠宸ュ簭鍒楄〃'
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html', 'yes']
- , resize: false
- , end: function () {
- _obj.update({
- HSQProcName: SQProcName
- , HProcID: ProcID
- });
- }
- })
- console.log("瀛楁璧嬪��" + data.HSQProcName);
- console.log("琛屽彿锛�" + rowIndex);
- break;
- case "2":
- //寮瑰嚭妗嗛�夋嫨鐢宠宸ュ簭
- layer.open({
- type: 2
- , area: ['80%', '80%']
- , title: '鐢宠宸ュ簭鍒楄〃'
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html', 'yes']
- , resize: false
- , end: function () {
- _obj.update({
- HSQProcName: SQProcName
- , HProcID: ProcID
- });
- }
- })
- console.log("瀛楁璧嬪��" + data.HSQProcName);
- console.log("琛屽彿锛�" + rowIndex);
- break;
- case "3":
- //寮瑰嚭妗嗛�夋嫨鐢宠宸ュ簭
- layer.open({
- type: 2
- , area: ['80%', '80%']
- , title: '鐢宠宸ュ簭鍒楄〃'
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html', 'yes']
- , resize: false
- , end: function () {
- _obj.update({
- HSQProcName: SQProcName
- , HProcID: ProcID
- });
- }
- })
- console.log("瀛楁璧嬪��" + data.HSQProcName);
- console.log("琛屽彿锛�" + rowIndex);
- break;
- case "4":
- //寮瑰嚭妗嗛�夋嫨鐢宠宸ュ簭
- layer.open({
- type: 2
- , area: ['80%', '80%']
- , title: '鐢宠宸ュ簭鍒楄〃'
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html', 'yes']
- , resize: false
- , end: function () {
- _obj.update({
- HSQProcName: SQProcName
- , HProcID: ProcID
- });
- }
- })
- console.log("瀛楁璧嬪��" + data.HSQProcName);
- console.log("琛屽彿锛�" + rowIndex);
- break;
- case "5":
- //寮瑰嚭妗嗛�夋嫨鐢宠宸ュ簭
- layer.open({
- type: 2
- , area: ['80%', '80%']
- , title: '鐢宠宸ュ簭鍒楄〃'
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html', 'yes']
- , resize: false
- , end: function () {
- _obj.update({
- HSQProcName: SQProcName
- , HProcID: ProcID
- });
- }
- })
- console.log("瀛楁璧嬪��" + data.HSQProcName);
- console.log("琛屽彿锛�" + rowIndex);
- break;
- case "6":
- //寮瑰嚭妗嗛�夋嫨鐢宠宸ュ簭
- layer.open({
- type: 2
- , area: ['80%', '80%']
- , title: '鐢宠宸ュ簭鍒楄〃'
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html', 'yes']
- , resize: false
- , end: function () {
- _obj.update({
- HSQProcName: SQProcName
- , HProcID: ProcID
- });
- }
- })
- console.log("瀛楁璧嬪��" + data.HSQProcName);
- console.log("琛屽彿锛�" + rowIndex);
- break;
- case "7":
- //寮瑰嚭妗嗛�夋嫨鐢宠宸ュ簭
- layer.open({
- type: 2
- , area: ['80%', '80%']
- , title: '鐢宠宸ュ簭鍒楄〃'
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html', 'yes']
- , resize: false
- , end: function () {
- _obj.update({
- HSQProcName: SQProcName
- , HProcID: ProcID
- });
- }
- })
- console.log("瀛楁璧嬪��" + data.HSQProcName);
- console.log("琛屽彿锛�" + rowIndex);
- break;
- case "8":
- //寮瑰嚭妗嗛�夋嫨鐢宠宸ュ簭
- layer.open({
- type: 2
- , area: ['80%', '80%']
- , title: '鐢宠宸ュ簭鍒楄〃'
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html', 'yes']
- , resize: false
- , end: function () {
- _obj.update({
- HSQProcName: SQProcName
- , HProcID: ProcID
- });
- }
- })
- console.log("瀛楁璧嬪��" + data.HSQProcName);
- console.log("琛屽彿锛�" + rowIndex);
- break;
- case "9":
- //寮瑰嚭妗嗛�夋嫨鐢宠宸ュ簭
- layer.open({
- type: 2
- , area: ['80%', '80%']
- , title: '鐢宠宸ュ簭鍒楄〃'
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html', 'yes']
- , resize: false
- , end: function () {
- _obj.update({
- HSQProcName: SQProcName
- , HProcID: ProcID
- });
- }
- })
- console.log("瀛楁璧嬪��" + data.HSQProcName);
- console.log("琛屽彿锛�" + rowIndex);
- break;
- case "10":
- //寮瑰嚭妗嗛�夋嫨鐢宠宸ュ簭
- layer.open({
- type: 2
- , area: ['80%', '80%']
- , title: '鐢宠宸ュ簭鍒楄〃'
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html', 'yes']
- , resize: false
- , end: function () {
- _obj.update({
- HSQProcName: SQProcName
- , HProcID: ProcID
- });
- }
- })
- console.log("瀛楁璧嬪��" + data.HSQProcName);
- console.log("琛屽彿锛�" + rowIndex);
- break;
- case "11":
- //寮瑰嚭妗嗛�夋嫨鐢宠宸ュ簭
- layer.open({
- type: 2
- , area: ['80%', '80%']
- , title: '鐢宠宸ュ簭鍒楄〃'
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html', 'yes']
- , resize: false
- , end: function () {
- _obj.update({
- HSQProcName: SQProcName
- , HProcID: ProcID
- });
- }
- })
- console.log("瀛楁璧嬪��" + data.HSQProcName);
- console.log("琛屽彿锛�" + rowIndex);
- break;
- case "12":
- //寮瑰嚭妗嗛�夋嫨鐢宠宸ュ簭
- layer.open({
- type: 2
- , area: ['80%', '80%']
- , title: '鐢宠宸ュ簭鍒楄〃'
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html', 'yes']
- , resize: false
- , end: function () {
- _obj.update({
- HSQProcName: SQProcName
- , HProcID: ProcID
- });
- }
- })
- console.log("瀛楁璧嬪��" + data.HSQProcName);
- console.log("琛屽彿锛�" + rowIndex);
- break;
- case "13":
- //寮瑰嚭妗嗛�夋嫨鐢宠宸ュ簭
- layer.open({
- type: 2
- , area: ['80%', '80%']
- , title: '鐢宠宸ュ簭鍒楄〃'
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html', 'yes']
- , resize: false
- , end: function () {
- _obj.update({
- HSQProcName: SQProcName
- , HProcID: ProcID
- });
- }
- })
- console.log("瀛楁璧嬪��" + data.HSQProcName);
- console.log("琛屽彿锛�" + rowIndex);
- break;
- case "14":
- //寮瑰嚭妗嗛�夋嫨鐢宠宸ュ簭
- layer.open({
- type: 2
- , area: ['80%', '80%']
- , title: '鐢宠宸ュ簭鍒楄〃'
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html', 'yes']
- , resize: false
- , end: function () {
- _obj.update({
- HSQProcName: SQProcName
- , HProcID: ProcID
- });
- }
- })
- console.log("瀛楁璧嬪��" + data.HSQProcName);
- console.log("琛屽彿锛�" + rowIndex);
- break;
- case "15":
- //寮瑰嚭妗嗛�夋嫨鐢宠宸ュ簭
- layer.open({
- type: 2
- , area: ['80%', '80%']
- , title: '鐢宠宸ュ簭鍒楄〃'
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html', 'yes']
- , resize: false
- , end: function () {
- _obj.update({
- HSQProcName: SQProcName
- , HProcID: ProcID
- });
- }
- })
- console.log("瀛楁璧嬪��" + data.HSQProcName);
- console.log("琛屽彿锛�" + rowIndex);
- break;
- case "16":
- //寮瑰嚭妗嗛�夋嫨鐢宠宸ュ簭
- layer.open({
- type: 2
- , area: ['80%', '80%']
- , title: '鐢宠宸ュ簭鍒楄〃'
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html', 'yes']
- , resize: false
- , end: function () {
- _obj.update({
- HSQProcName: SQProcName
- , HProcID: ProcID
- });
- }
- })
- console.log("瀛楁璧嬪��" + data.HSQProcName);
- console.log("琛屽彿锛�" + rowIndex);
- break;
-
}
}
else if (obj.event === 'ZRProcNameEvent') {
- var _obj = obj;
+ var _obj = obj;
switch (rowIndex) {
case "0":
//寮瑰嚭妗嗛�夋嫨璐ｄ换宸ュ簭
@@ -1444,452 +879,29 @@
console.log("瀛楁璧嬪��" + data.HZRProcName);
console.log("琛屽彿锛�" + rowIndex);
break;
- case "1":
- //寮瑰嚭妗嗛�夋嫨璐ｄ换宸ュ簭
- layer.open({
- type: 2
- , area: ['80%', '80%']
- , title: '璐ｄ换宸ュ簭鍒楄〃'
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html?Type=HZR', 'yes']
- , resize: false
- , end: function () {
- _obj.update({
- HZRProcName: ZRProcName
- });
- }
- })
- console.log("瀛楁璧嬪��" + data.HZRProcName);
- console.log("琛屽彿锛�" + rowIndex);
- break;
- case "2":
- //寮瑰嚭妗嗛�夋嫨璐ｄ换宸ュ簭
- layer.open({
- type: 2
- , area: ['80%', '80%']
- , title: '璐ｄ换宸ュ簭鍒楄〃'
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html?Type=HZR', 'yes']
- , resize: false
- , end: function () {
- _obj.update({
- HZRProcName: ZRProcName
- });
- }
- })
- console.log("瀛楁璧嬪��" + data.HZRProcName);
- console.log("琛屽彿锛�" + rowIndex);
- break;
- case "3":
- //寮瑰嚭妗嗛�夋嫨璐ｄ换宸ュ簭
- layer.open({
- type: 2
- , area: ['80%', '80%']
- , title: '璐ｄ换宸ュ簭鍒楄〃'
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html?Type=HZR', 'yes']
- , resize: false
- , end: function () {
- _obj.update({
- HZRProcName: ZRProcName
- });
- }
- })
- console.log("瀛楁璧嬪��" + data.HZRProcName);
- console.log("琛屽彿锛�" + rowIndex);
- break;
- case "4":
- //寮瑰嚭妗嗛�夋嫨璐ｄ换宸ュ簭
- layer.open({
- type: 2
- , area: ['80%', '80%']
- , title: '璐ｄ换宸ュ簭鍒楄〃'
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html?Type=HZR', 'yes']
- , resize: false
- , end: function () {
- _obj.update({
- HZRProcName: ZRProcName
- });
- }
- })
- console.log("瀛楁璧嬪��" + data.HZRProcName);
- console.log("琛屽彿锛�" + rowIndex);
- break;
- case "5":
- //寮瑰嚭妗嗛�夋嫨璐ｄ换宸ュ簭
- layer.open({
- type: 2
- , area: ['80%', '80%']
- , title: '璐ｄ换宸ュ簭鍒楄〃'
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html?Type=HZR', 'yes']
- , resize: false
- , end: function () {
- _obj.update({
- HZRProcName: ZRProcName
- });
- }
- })
- console.log("瀛楁璧嬪��" + data.HZRProcName);
- console.log("琛屽彿锛�" + rowIndex);
- break;
- case "6":
- //寮瑰嚭妗嗛�夋嫨璐ｄ换宸ュ簭
- layer.open({
- type: 2
- , area: ['80%', '80%']
- , title: '璐ｄ换宸ュ簭鍒楄〃'
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html?Type=HZR', 'yes']
- , resize: false
- , end: function () {
- _obj.update({
- HZRProcName: ZRProcName
- });
- }
- })
- console.log("瀛楁璧嬪��" + data.HZRProcName);
- console.log("琛屽彿锛�" + rowIndex);
- break;
- case "7":
- //寮瑰嚭妗嗛�夋嫨璐ｄ换宸ュ簭
- layer.open({
- type: 2
- , area: ['80%', '80%']
- , title: '璐ｄ换宸ュ簭鍒楄〃'
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html?Type=HZR', 'yes']
- , resize: false
- , end: function () {
- _obj.update({
- HZRProcName: ZRProcName
- });
- }
- })
- console.log("瀛楁璧嬪��" + data.HZRProcName);
- console.log("琛屽彿锛�" + rowIndex);
- break;
- case "8":
- //寮瑰嚭妗嗛�夋嫨璐ｄ换宸ュ簭
- layer.open({
- type: 2
- , area: ['80%', '80%']
- , title: '璐ｄ换宸ュ簭鍒楄〃'
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html?Type=HZR', 'yes']
- , resize: false
- , end: function () {
- _obj.update({
- HZRProcName: ZRProcName
- });
- }
- })
- console.log("瀛楁璧嬪��" + data.HZRProcName);
- console.log("琛屽彿锛�" + rowIndex);
- break;
- case "9":
- //寮瑰嚭妗嗛�夋嫨璐ｄ换宸ュ簭
- layer.open({
- type: 2
- , area: ['80%', '80%']
- , title: '璐ｄ换宸ュ簭鍒楄〃'
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html?Type=HZR', 'yes']
- , resize: false
- , end: function () {
- _obj.update({
- HZRProcName: ZRProcName
- });
- }
- })
- console.log("瀛楁璧嬪��" + data.HZRProcName);
- console.log("琛屽彿锛�" + rowIndex);
- break;
- case "10":
- //寮瑰嚭妗嗛�夋嫨璐ｄ换宸ュ簭
- layer.open({
- type: 2
- , area: ['80%', '80%']
- , title: '璐ｄ换宸ュ簭鍒楄〃'
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html?Type=HZR', 'yes']
- , resize: false
- , end: function () {
- _obj.update({
- HZRProcName: ZRProcName
- });
- }
- })
- console.log("瀛楁璧嬪��" + data.HZRProcName);
- console.log("琛屽彿锛�" + rowIndex);
- break;
- case "11":
- //寮瑰嚭妗嗛�夋嫨璐ｄ换宸ュ簭
- layer.open({
- type: 2
- , area: ['80%', '80%']
- , title: '璐ｄ换宸ュ簭鍒楄〃'
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html?Type=HZR', 'yes']
- , resize: false
- , end: function () {
- _obj.update({
- HZRProcName: ZRProcName
- });
- }
- })
- console.log("瀛楁璧嬪��" + data.HZRProcName);
- console.log("琛屽彿锛�" + rowIndex);
- break;
- case "12":
- //寮瑰嚭妗嗛�夋嫨璐ｄ换宸ュ簭
- layer.open({
- type: 2
- , area: ['80%', '80%']
- , title: '璐ｄ换宸ュ簭鍒楄〃'
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html?Type=HZR', 'yes']
- , resize: false
- , end: function () {
- _obj.update({
- HZRProcName: ZRProcName
- });
- }
- })
- console.log("瀛楁璧嬪��" + data.HZRProcName);
- console.log("琛屽彿锛�" + rowIndex);
- break;
- case "13":
- //寮瑰嚭妗嗛�夋嫨璐ｄ换宸ュ簭
- layer.open({
- type: 2
- , area: ['80%', '80%']
- , title: '璐ｄ换宸ュ簭鍒楄〃'
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html?Type=HZR', 'yes']
- , resize: false
- , end: function () {
- _obj.update({
- HZRProcName: ZRProcName
- });
- }
- })
- console.log("瀛楁璧嬪��" + data.HZRProcName);
- console.log("琛屽彿锛�" + rowIndex);
- break;
- case "14":
- //寮瑰嚭妗嗛�夋嫨璐ｄ换宸ュ簭
- layer.open({
- type: 2
- , area: ['80%', '80%']
- , title: '璐ｄ换宸ュ簭鍒楄〃'
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html?Type=HZR', 'yes']
- , resize: false
- , end: function () {
- _obj.update({
- HZRProcName: ZRProcName
- });
- }
- })
- console.log("瀛楁璧嬪��" + data.HZRProcName);
- console.log("琛屽彿锛�" + rowIndex);
- break;
- case "15":
- //寮瑰嚭妗嗛�夋嫨璐ｄ换宸ュ簭
- layer.open({
- type: 2
- , area: ['80%', '80%']
- , title: '璐ｄ换宸ュ簭鍒楄〃'
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html?Type=HZR', 'yes']
- , resize: false
- , end: function () {
- _obj.update({
- HZRProcName: ZRProcName
- });
- }
- })
- console.log("瀛楁璧嬪��" + data.HZRProcName);
- console.log("琛屽彿锛�" + rowIndex);
- break;
- case "16":
- //寮瑰嚭妗嗛�夋嫨璐ｄ换宸ュ簭
- layer.open({
- type: 2
- , area: ['80%', '80%']
- , title: '璐ｄ换宸ュ簭鍒楄〃'
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html?Type=HZR', 'yes']
- , resize: false
- , end: function () {
- _obj.update({
- HZRProcName: ZRProcName
- });
- }
- })
- console.log("瀛楁璧嬪��" + data.HZRProcName);
- console.log("琛屽彿锛�" + rowIndex);
- break;
-
}
}
else if (obj.event === 'BadQtyEvent') {
- var _obj = obj;
+ var _obj = obj;
switch (rowIndex) {
case "0":
break;
- case "1":
-
- break;
- case "2":
-
- break;
- case "3":
-
- break;
- case "4":
-
- break;
- case "5":
-
- break;
- case "6":
-
- break;
- case "7":
-
- break;
- case "8":
-
- break;
- case "9":
-
- break;
- case "10":
-
- break;
- case "11":
-
- break;
- case "12":
-
- break;
- case "13":
-
- break;
- case "14":
-
- break;
- case "15":
-
- break;
- case "16":
- //$(obj.tr).find(".layui-table-edit").keyup(function () {
- // var $input = $(this), val = $input.val();
- // if (!val) val = "1";
- // $input.val(val.replace(/[^\d]/g, ''));
- //});
- break;
-
}
}
else if (obj.event === 'RemarkEvent') {
- var _obj = obj;
+ var _obj = obj;
switch (rowIndex) {
case "0":
break;
- case "1":
-
- break;
- case "2":
-
- break;
- case "3":
-
- break;
- case "4":
-
- break;
- case "5":
-
- break;
- case "6":
-
- break;
- case "7":
-
- break;
- case "8":
-
- break;
- case "9":
-
- break;
- case "10":
-
- break;
- case "11":
-
- break;
- case "12":
-
- break;
- case "13":
-
- break;
- case "14":
-
- break;
- case "15":
-
- break;
- case "16":
-
- break;
-
}
}
else if (obj.event === 'PSProcNameEvent') {
- var _obj = obj;
+ var _obj = obj;
switch (rowIndex) {
case "0":
- //寮瑰嚭妗嗛�夋嫨涓嶈壇纭浜�
+ //寮瑰嚭妗嗛�夋嫨涓嶈壇纭浜�
layer.open({
type: 2
, area: ['80%', '80%']
@@ -1908,425 +920,54 @@
console.log("瀛楁璧嬪��" + data.HPSProcName);
console.log("琛屽彿锛�" + rowIndex);
break;
- case "1":
- //寮瑰嚭妗嗛�夋嫨涓嶈壇纭浜�
- layer.open({
- type: 2
- , area: ['80%', '80%']
- , title: '鑱屽憳鍒楄〃'
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HWorker', 'yes']
- , resize: false
- , end: function () {
- _obj.update({
- HPSProcName: QRName
- });
- }
- })
- console.log("瀛楁璧嬪��" + data.HPSProcName);
- console.log("琛屽彿锛�" + rowIndex);
- break;
- case "2":
- //寮瑰嚭妗嗛�夋嫨涓嶈壇纭浜�
- layer.open({
- type: 2
- , area: ['80%', '80%']
- , title: '鑱屽憳鍒楄〃'
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HWorker', 'yes']
- , resize: false
- , end: function () {
- _obj.update({
- HPSProcName: QRName
- });
- }
- })
- console.log("瀛楁璧嬪��" + data.HPSProcName);
- console.log("琛屽彿锛�" + rowIndex);
- break;
- case "3":
- //寮瑰嚭妗嗛�夋嫨涓嶈壇纭浜�
- layer.open({
- type: 2
- , area: ['80%', '80%']
- , title: '鑱屽憳鍒楄〃'
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HWorker', 'yes']
- , resize: false
- , end: function () {
- _obj.update({
- HPSProcName: QRName
- });
- }
- })
- console.log("瀛楁璧嬪��" + data.HPSProcName);
- console.log("琛屽彿锛�" + rowIndex);
- break;
- case "4":
- //寮瑰嚭妗嗛�夋嫨涓嶈壇纭浜�
- layer.open({
- type: 2
- , area: ['80%', '80%']
- , title: '鑱屽憳鍒楄〃'
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HWorker', 'yes']
- , resize: false
- , end: function () {
- _obj.update({
- HPSProcName: QRName
- });
- }
- })
- console.log("瀛楁璧嬪��" + data.HPSProcName);
- console.log("琛屽彿锛�" + rowIndex);
- break;
- case "5":
- //寮瑰嚭妗嗛�夋嫨涓嶈壇纭浜�
- layer.open({
- type: 2
- , area: ['80%', '80%']
- , title: '鑱屽憳鍒楄〃'
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HWorker', 'yes']
- , resize: false
- , end: function () {
- _obj.update({
- HPSProcName: QRName
- });
- }
- })
- console.log("瀛楁璧嬪��" + data.HPSProcName);
- console.log("琛屽彿锛�" + rowIndex);
- break;
- case "6":
- //寮瑰嚭妗嗛�夋嫨涓嶈壇纭浜�
- layer.open({
- type: 2
- , area: ['80%', '80%']
- , title: '鑱屽憳鍒楄〃'
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HWorker', 'yes']
- , resize: false
- , end: function () {
- _obj.update({
- HPSProcName: QRName
- });
- }
- })
- console.log("瀛楁璧嬪��" + data.HPSProcName);
- console.log("琛屽彿锛�" + rowIndex);
- break;
- case "7":
- //寮瑰嚭妗嗛�夋嫨涓嶈壇纭浜�
- layer.open({
- type: 2
- , area: ['80%', '80%']
- , title: '鑱屽憳鍒楄〃'
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HWorker', 'yes']
- , resize: false
- , end: function () {
- _obj.update({
- HPSProcName: QRName
- });
- }
- })
- console.log("瀛楁璧嬪��" + data.HPSProcName);
- console.log("琛屽彿锛�" + rowIndex);
- break;
- case "8":
- //寮瑰嚭妗嗛�夋嫨涓嶈壇纭浜�
- layer.open({
- type: 2
- , area: ['80%', '80%']
- , title: '鑱屽憳鍒楄〃'
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HWorker', 'yes']
- , resize: false
- , end: function () {
- _obj.update({
- HPSProcName: QRName
- });
- }
- })
- console.log("瀛楁璧嬪��" + data.HPSProcName);
- console.log("琛屽彿锛�" + rowIndex);
- break;
- case "9":
- //寮瑰嚭妗嗛�夋嫨涓嶈壇纭浜�
- layer.open({
- type: 2
- , area: ['80%', '80%']
- , title: '鑱屽憳鍒楄〃'
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HWorker', 'yes']
- , resize: false
- , end: function () {
- _obj.update({
- HPSProcName: QRName
- });
- }
- })
- console.log("瀛楁璧嬪��" + data.HPSProcName);
- console.log("琛屽彿锛�" + rowIndex);
- break;
- case "10":
- //寮瑰嚭妗嗛�夋嫨涓嶈壇纭浜�
- layer.open({
- type: 2
- , area: ['80%', '80%']
- , title: '鑱屽憳鍒楄〃'
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HWorker', 'yes']
- , resize: false
- , end: function () {
- _obj.update({
- HPSProcName: QRName
- });
- }
- })
- console.log("瀛楁璧嬪��" + data.HPSProcName);
- console.log("琛屽彿锛�" + rowIndex);
- break;
- case "11":
- //寮瑰嚭妗嗛�夋嫨涓嶈壇纭浜�
- layer.open({
- type: 2
- , area: ['80%', '80%']
- , title: '鑱屽憳鍒楄〃'
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HWorker', 'yes']
- , resize: false
- , end: function () {
- _obj.update({
- HPSProcName: QRName
- });
- }
- })
- console.log("瀛楁璧嬪��" + data.HPSProcName);
- console.log("琛屽彿锛�" + rowIndex);
- break;
- case "12":
- //寮瑰嚭妗嗛�夋嫨涓嶈壇纭浜�
- layer.open({
- type: 2
- , area: ['80%', '80%']
- , title: '鑱屽憳鍒楄〃'
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HWorker', 'yes']
- , resize: false
- , end: function () {
- _obj.update({
- HPSProcName: QRName
- });
- }
- })
- console.log("瀛楁璧嬪��" + data.HPSProcName);
- console.log("琛屽彿锛�" + rowIndex);
- break;
- case "13":
- //寮瑰嚭妗嗛�夋嫨涓嶈壇纭浜�
- layer.open({
- type: 2
- , area: ['80%', '80%']
- , title: '鑱屽憳鍒楄〃'
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HWorker', 'yes']
- , resize: false
- , end: function () {
- _obj.update({
- HPSProcName: QRName
- });
- }
- })
- console.log("瀛楁璧嬪��" + data.HPSProcName);
- console.log("琛屽彿锛�" + rowIndex);
- break;
- case "14":
- //寮瑰嚭妗嗛�夋嫨涓嶈壇纭浜�
- layer.open({
- type: 2
- , area: ['80%', '80%']
- , title: '鑱屽憳鍒楄〃'
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HWorker', 'yes']
- , resize: false
- , end: function () {
- _obj.update({
- HPSProcName: QRName
- });
- }
- })
- console.log("瀛楁璧嬪��" + data.HPSProcName);
- console.log("琛屽彿锛�" + rowIndex);
- break;
- case "15":
- //寮瑰嚭妗嗛�夋嫨涓嶈壇纭浜�
- layer.open({
- type: 2
- , area: ['80%', '80%']
- , title: '鑱屽憳鍒楄〃'
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HWorker', 'yes']
- , resize: false
- , end: function () {
- _obj.update({
- HPSProcName: QRName
- });
- }
- })
- console.log("瀛楁璧嬪��" + data.HPSProcName);
- console.log("琛屽彿锛�" + rowIndex);
- break;
- case "16":
- //寮瑰嚭妗嗛�夋嫨涓嶈壇纭浜�
- layer.open({
- type: 2
- , area: ['80%', '80%']
- , title: '鑱屽憳鍒楄〃'
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HWorker', 'yes']
- , resize: false
- , end: function () {
- _obj.update({
- HPSProcName: QRName
- });
- }
- })
- console.log("瀛楁璧嬪��" + data.HPSProcName);
- console.log("琛屽彿锛�" + rowIndex);
- break;
-
}
}
else if (obj.event === 'CloseManEvent') {
- var _obj = obj;
+ var _obj = obj;
switch (rowIndex) {
case "0":
break;
- case "1":
-
- break;
- case "2":
-
- break;
- case "3":
-
- break;
- case "4":
-
- break;
- case "5":
-
- break;
- case "6":
-
- break;
- case "7":
-
- break;
- case "8":
-
- break;
- case "9":
-
- break;
- case "10":
-
- break;
- case "11":
-
- break;
- case "12":
-
- break;
- case "13":
-
- break;
- case "14":
-
- break;
- case "15":
-
- break;
- case "16":
-
- break;
-
}
}
-
-
-
});
-
-
- function RoadBillMain(hID)//鍔犺浇琛ㄥご
+ function RoadBillMain(linterid)//鍔犺浇琛ㄥご
{
- alert(hID);
//鏌ヨ妫�楠屾柟妗堝崟鏄惁瀛樺湪
$.ajax({
url: GetWEBURL() + "GetQC_PatrolProcCheckDetail",
type: "GET",
data: {
- "HID": hID
+ "HID": linterid
},
success: function (result) {
if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
var data = result.data.h_v_QC_Edit_PatrolProcCheckBillList[0];
form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
"HBillNo": data.鍗曟嵁鍙�
- , "HDate": data.鏃ユ湡
- , "HSource": data.鐢熶骇璧勬簮鍚嶇О
- , "HSourceID": data.鐢熶骇璧勬簮ID
- , "HICMOBillNo": data.HICMOBillNo
- , "HICMOQty": data.HICMOQty
- , "HICMOInterID": data.HICMOInterID
- , "HMater": data.浜у搧鍚嶇О
- , "HMaterID": data.浜у搧ID
- , "HMaterNumber": data.浜у搧鍐呯爜
- , "HProcExchQty": data.HProcExchQty
- , "HProcExchBillNo": data.HProcExchBillNo
- , "HProcExchInterID": data.HProcExchInterID
- , "HProcExchEntryID": data.HProcExchEntryID
+ , "HDate": formatDate(data.鏃ユ湡)
+ //, "HSource": data.鐢熶骇璧勬簮鍚嶇О
+ //, "HSourceID": data.鐢熶骇璧勬簮ID
+ //, "HICMOBillNo": data.HICMOBillNo
+ //, "HICMOQty": data.HICMOQty
+ //, "HICMOInterID": data.HICMOInterID
+ //, "HMaterNumber": data.浜у搧鍚嶇О
+ //, "HMaterID": data.浜у搧ID
+ //, "HMaterNumber": data.浜у搧鍐呯爜
+ //, "HProcExchQty": data.HProcExchQty
+ //, "HProcExchBillNo": data.HProcExchBillNo
+ //, "HProcExchInterID": data.HProcExchInterID
+ //, "HProcExchEntryID": data.HProcExchEntryID
, "HEmpName": data.妫�楠屽憳鍚嶇О
, "HFirstCheckEmp": data.妫�楠屽憳ID
+ , "HMainProcID": data.HMainProcID
+ , "HMainProcNumber": data.宸ュ簭浠ｇ爜
+ , "HMainProcName": data.宸ュ簭鍚嶇О
, "HRemark": data.琛ㄥご澶囨敞
});
+
+
} else {
layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
@@ -2337,7 +978,6 @@
});
}
-
var date = new Date();
var day = date.getDate();
var month = date.getMonth() + 1;
@@ -2345,7 +985,7 @@
var shijian = year + "-" + month + "-" + day;
//鍒ゆ柇鏄惁鏂板
- if (hID == null || hID == 0) {
+ if (OperationType == 1) {
//鑾峰彇鏈�澶у崟鎹彿 new
$("#HInterID").val(0);
$("#HBillNo").val("");
@@ -2355,22 +995,86 @@
data: { "HBillType": '7506' },
success: function (d) {
//console.log(d.data);
- /* $("#HInterID").val(d.data[0].HInterID);*/
+ /* $("#HInterID").val(d.data[0].HInterID);*/
$("#HBillNo").val(d.data[0].HBillNo);
- $("#HDate").val(shijian);
+ //$("#HDate").val(shijian);
+ $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
$("#HInterID").val(0);
}
});
}
- else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
- $("#HInterID").val(hID);//淇敼鏃朵富琛↖D
- RoadBillMain(hID);
- /* RoadBillSub(linterid);*/
+ else if (OperationType == 2) {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
+ $("#HInterID").val(linterid);//淇敼鏃朵富琛↖D
+ RoadBillMain(linterid);
+ /* RoadBillSub(linterid);*/
}
form.on('checkbox(checkboxHCheckerResult)', function (data) {
$("#HLastResult").val(data.elem.checked);
+ });
+
+ //閫夋嫨宸ュ簭
+ form.on('submit(HMainProcNumber-BT)', function () {
+ layer.open({
+ type: 2
+ , area: ['80%', '80%']
+ , title: '宸ュ簭鍒楄〃'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ //, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Process.html', 'yes']
+ , resize: false
+ , 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('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HMainProcID").val(checkStatus.data[0].HItemID);
+ $("#HMainProcNumber").val(checkStatus.data[0].宸ュ簭浠ｇ爜);
+ $("#HMainProcName").val(checkStatus.data[0].宸ュ簭鍚嶇О);
+
+ var HQCSchemeID_Proc = checkStatus.data[0].HQCSchemeID_Proc;
+
+ $.ajax({
+ url: GetWEBURL() + "/Web/GetCheckItemByCheckProjectID",
+ type: "GET",
+ data: { "CheckProjectID": HQCSchemeID_Proc },
+ success: function (result) {
+ if (result.code == 1) {
+ var rowdata = [];
+ var data = result.data;
+ for (var i = 0; i < result.data.length; i++) {
+ //瀛愯〃 璧嬪��
+ rowdata.push({
+ "妫�楠岄」鐩垎绫�": data[i]["妫�楠岄」鐩垎绫�"], "HQCCheckItemID": data[i]["HQCCheckItemID"], "HQCCheckItemName": data[i]["妫�楠岄」鐩�"],
+ "HQCStd": "",
+ "HQCNote1": "",
+ "HQCNote2": "",
+ "HQCNote3": "",
+ "HQCNote4": "",
+ "HQCNote5": "",
+ "HQCNote6": "",
+ "HQCNote7": "",
+ "HQCNote8": "",
+ "HQCNote9": "",
+ "HQCNote10": "",
+ "HRemark": ""
+ });
+ }
+ option.data = rowdata;
+ table.render(option);
+ }
+ }
+ })
+
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ })
});
//閫夋嫨浜у搧寮圭獥
@@ -2509,6 +1213,45 @@
})
});
+ //琛ㄥご淇℃伅鐢熶骇浠诲姟鍗曞脊绐�
+ form.on('submit(btnSearchICMOBill)', function () {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '鐢熶骇浠诲姟鍗曞垪琛�',
+ closeBtn: 1,
+ shift: 2,
+ area: ['90%', '90%'],
+ maxmin: true,
+ content: ['../../../views/Baseset/鍩虹璧勬枡/Sc_ICMOBillListView.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('璇烽�夋嫨鏁版嵁');
+ // }
+ // $("#HICMOInterID").val(checkStatus.data[0].hmainid);
+ // $("#HICMOEntryID").val(checkStatus.data[0].hsubid);
+ // $("#HICMOBillNo").val(checkStatus.data[0].鍗曟嵁鍙�);
+ // $("#HICMOQty").val(checkStatus.data[0].璁″垝鐢熶骇鏁伴噺);
+ // layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ //}
+ //, btn2: function (index, layero) {
+ // //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ // //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ //},
+ //end: function () {
+
+ //},
+ //success: function (layero, index) {
+
+ //}
+ });
+ });
form.on('submit(Exit)', function (data) {//閫�鍑�
@@ -2517,11 +1260,10 @@
form.on('submit(Cancel)', function () {
//sessionStorage["SourceFlag"] = false;
- if (hID == null || hID==0) {
+ if (linterid == null || linterid == 0) {
parent.location.href = "../../../views/index.html"
}
- else
- {
+ else {
var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
parent.layer.close(index); //鍐嶆墽琛屽叧闂�
}
@@ -2532,7 +1274,8 @@
//debugger;
var sMainStr = JSON.stringify(data.field);
var sSubStr = JSON.stringify(table.cache['mainTable']);
- var sMainSub = sMainStr + ';' + sSubStr + ";" + sessionStorage["HUserName"];
+ var sBadStr = JSON.stringify(table.cache['BadReTable']);
+ var sMainSub = sMainStr + ';' + sSubStr + ";" + sessionStorage["HUserName"] + ";" + sBadStr;
$.ajax(
{
type: "POST",
@@ -2543,7 +1286,7 @@
success: function (data) {
if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
layer.msg(data.Message, { icon: 1 });
- $('#add-btn').addClass("layui-btn-disabled").attr("disabled",true);
+ $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
}
else {
@@ -2575,22 +1318,67 @@
}
});
+ //琛岄�夋嫨澶勭悊锛堟楠岃褰�1锛�
+ form.on('select(HQCNote1)', 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.HQCNote1 = data.value;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+ }
+ });
+ });
+ //琛岄�夋嫨澶勭悊锛堟楠岃褰�2锛�
+ form.on('select(HQCNote2)', 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.HQCNote2 = data.value;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+ }
+ });
+ });
+ //琛岄�夋嫨澶勭悊锛堟楠岃褰�3锛�
+ form.on('select(HQCNote3)', 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.HQCNote3 = data.value;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+ }
+ });
+ });
+ //琛岄�夋嫨澶勭悊锛堟楠岃褰�4锛�
+ form.on('select(HQCNote4)', 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.HQCNote4 = data.value;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+ }
+ });
+ });
});
//瀹氫箟鍏ㄥ眬鍙橀噺
var HReasonName, ReasonID, EmpName, SQProcName,
- ProcID,ZRProcName,QRName
+ ProcID, ZRProcName, QRName
;
function GetHReasonValue(obj) //杩斿洖涓嶈壇鍘熷洜
{
- HReasonName = obj[0].HName;
- ReasonID = obj[0].HItemID;
+ HReasonName = obj[0].HName;
+ ReasonID = obj[0].HItemID;
}
//杩斿洖鐗╂枡
function GetHMaterNameValue(obj) { //杩斿洖鐗╂枡
- $("#HMater").val(obj[0].HName);
$("#HMaterID").val(obj[0].HItemID);
$("#HMaterNumber").val(obj[0].HNumber);
+ $("#HMaterName").val(obj[0].HName);
+ $("#HMaterModel").val(obj[0].HModel);
}
//杩斿洖宸ュ簭
function GetHProcValue(obj) { //杩斿洖宸ュ簭
@@ -2603,7 +1391,7 @@
$("#HDeptID").val(obj[0].HItemID);
$("#HDeptNumber").val(obj[0].HNumber);
}
- //杩斿洖鍗曚綅
+ //杩斿洖鍗曚綅
function GetHUnitNameValue(obj) {
$("#HUName").val(obj[0].HName);
$("#HUnitID").val(obj[0].HItemID);
@@ -2650,6 +1438,14 @@
//$("#HQRName").val(obj[0].HName);
//$("#HItemID").val(obj[0].HItemID);
}
+
+ function GetICMOBillValue(obj) { //杩斿洖浠诲姟鍗�
+ $("#HICMOInterID").val(obj[0].hmainid);
+ $("#HICMOEntryID").val(obj[0].hsubid);
+ $("#HICMOBillNo").val(obj[0].鍗曟嵁鍙�);
+ $("#HICMOQty").val(obj[0].璁″垝鐢熶骇鏁伴噺);
+ }
+
function AllowLoadData(sSubStr) { //闈炵┖楠岃瘉
//if ($("#HSourceBillNo").val() == '') {
// layer.msg("璇峰厛鎵簮鍗�!", { icon: 5 });
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_PatrolProcCheckBillList.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_PatrolProcCheckBillList.html"
index bf002f8..dc7db9c 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_PatrolProcCheckBillList.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_PatrolProcCheckBillList.html"
@@ -57,6 +57,7 @@
<table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container">
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add"><i class="layui-icon layui-icon-form"></i>鏂板</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-form"></i>鍒犻櫎</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
@@ -203,6 +204,9 @@
table.on('toolbar(mainTable)', function (obj) {
var checkStatus = table.checkStatus(obj.config.id);
switch (obj.event) {
+ case 'btn-Add':
+ set_AddNew();
+ break;
case 'btn-getCheckData':
var data = checkStatus.data;
layer.alert(JSON.stringify(data));
@@ -220,7 +224,7 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: '../宸℃璁板綍鍗�/QC_Add_Edit_PatrolProcCheckBill.html?hID=' + hID
+ , content: '../宸℃璁板綍鍗�/QC_Add_Edit_PatrolProcCheckBill.html?OperationType=2&linterid=' + hID + '&HSouceBillType=0&closeType=1'
, resize: false
, cancel: function () {
//$(".layui-btn").removeClass("layui-btn-disabled");
@@ -414,6 +418,27 @@
active[type] ? active[type].call(this) : '';
});
+ //鏂板
+ function set_AddNew() {
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '鏂板宸℃鍗�',
+ closeBtn: 1,
+ shift: 2,
+ area: ['100%', '100%'],
+ maxmin: true,
+ content: './QC_Add_Edit_PatrolProcCheckBill.html?OperationType=1&linterid=&HSouceBillType=0&closeType=1',
+ end: function () {
+ //鍒锋柊椤甸潰,
+ //get_FastQuery(table, option);
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ }
+
//闅愯棌鍒楄缃�
function get_HideColumn() {
var colName = "";
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 4fec0d4..85cada1 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"
@@ -770,7 +770,7 @@
LoadingInformation2();
} else if (HSouceBillType == 3791) {
//鏍规嵁婧愬崟id鑾峰彇婧愬崟淇℃伅
- LoadingInformation();
+ LoadingInformation_StationOutBill();
} else {
layer.alert("婧愬崟绫诲瀷鏃犳晥锛�", { icon: 5 });
}
@@ -822,12 +822,12 @@
}
//鏍规嵁婧愬崟id鑾峰彇婧愬崟淇℃伅
- function LoadingInformation() {
+ function LoadingInformation_StationOutBill() {
var wait = layer.load();
$.ajax({
- url: GetWEBURL() + '/Cj_StationOutBill/get_Display',
+ url: GetWEBURL() + '/QC_ProcessCheckBill/get_StationOutBill',
type: "GET",
- data: { "sWhere": " and hmainid = " + linterid, "user": sessionStorage["HUserName"] },
+ data: { "HInterID": linterid, "user": sessionStorage["HUserName"] },
success: function (result) {
var data = result.data[0];
if (result.count == 1) {
@@ -846,6 +846,10 @@
$("#HMainSourceInterID").val(data.hmainid);
$("#HProcID").val(data.HProcID);
$("#HICMOEntryID").val(HICMOEntryID);
+ $("#HQCSchemeName").val(data.妫�楠屾柟妗堝悕绉�);
+ $("#HQCSchemeID").val(data.妫�楠屾柟妗圛D);
+ //鑾峰彇琛ㄤ綋妫�楠岄」鐩俊鎭�
+ get_CheckItem();
} else {
layer.alert(result.Message, { icon: 5 });
}
@@ -906,6 +910,31 @@
//閫�鍑烘寜閽�
form.on('submit(btn-Exit)', function (data) {
get_Exit();
+
+ sWhere = " and hmainid = " + $("#HInterID").val();
+ $.ajax({
+ url: GetWEBURL() + "/QC_ProcessCheckBill/QC_ProcessCheckBillList",
+ type: "GET",
+ async: false,
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 0) {
+ $.ajax({
+ url: GetWEBURL() + "/QC_ProcessCheckBill/Delete_Json",
+ type: "GET",
+ async: false,
+ data: { "HItemID": $("#HInterID").val(), "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ return;
+ } else {
+ layer.msg("鍒犻櫎妫�楠屽�煎け璐ワ紒" + result.Message, { icon: 5 });
+ }
+ }
+ })
+ }
+ }
+ })
});
//鏂板鎸夐挳
@@ -1545,44 +1574,44 @@
$.ajax({
url: GetWEBURL() + "/Web/GetCheckItemByCheckProjectID",
type: "GET",
- data: { "CheckProjectID": $("#HQCSchemeID").val() },
+ data: { "CheckProjectID": $("#HQCSchemeID").val() == '' ? 0 : $("#HQCSchemeID").val()},
success: function (result) {
- //option.data = result.data;
- //table.render(option);
- var rowdata = [];
- var data = result.data;
- for (var i = 0; i < result.data.length; i++) {
- //瀛愯〃 璧嬪��
- rowdata.push({
- "HQCCheckItemID": data[i]["HQCCheckItemID"], "妫�楠岄」鐩�": data[i]["妫�楠岄」鐩�"], "HInspectInstruMentID": 0, "妫�楠屼华鍣�": "","HQCStd": data[i]["HQCStd"], "HUnit": data[i]["HUnit"], "HQCNote": "", "HAnalysisMethod": data[i]["HAnalysisMethod"], "HResult": data[i]["HResult"],
- "HMax": "", "HMin": "", "HAvg": "", "HRemark": "", "HKeyInspect": false, "HStatus": 0, "HSampleSchemeID": 0, "HUnitID": 0,
- "HInspectVal": '', "HTargetVal": '', "HUpLimit": '', "HDownLimit": '', "HUpOffSet": '', "HDownOffSet": '', "HSampleDamageQty": '',
- "HSampleSchemeName": "", "HSampleQty": "", "HSampleDamageQty": "", "HAcceptQty": "", "HInspectionLevel": "", "HRejectQty": "",
- "HStrictness": "", "HSampleUnRightQty": "", "HAQL": "", "HSamplingType": ""
- });
- }
+ if (result.code == 1) {
+ var rowdata = [];
+ var data = result.data;
+ for (var i = 0; i < result.data.length; i++) {
+ //瀛愯〃 璧嬪��
+ rowdata.push({
+ "HQCCheckItemID": data[i]["HQCCheckItemID"], "妫�楠岄」鐩�": data[i]["妫�楠岄」鐩�"], "HInspectInstruMentID": 0, "妫�楠屼华鍣�": "", "HQCStd": data[i]["HQCStd"], "HUnit": data[i]["HUnit"], "HQCNote": "", "HAnalysisMethod": data[i]["HAnalysisMethod"], "HResult": data[i]["HResult"],
+ "HMax": "", "HMin": "", "HAvg": "", "HRemark": "", "HKeyInspect": false, "HStatus": 0, "HSampleSchemeID": 0, "HUnitID": 0,
+ "HInspectVal": '', "HTargetVal": '', "HUpLimit": '', "HDownLimit": '', "HUpOffSet": '', "HDownOffSet": '', "HSampleDamageQty": '',
+ "HSampleSchemeName": "", "HSampleQty": "", "HSampleDamageQty": "", "HAcceptQty": "", "HInspectionLevel": "", "HRejectQty": "",
+ "HStrictness": "", "HSampleUnRightQty": "", "HAQL": "", "HSamplingType": ""
+ });
+ }
- option.data = rowdata;
- table.render(option);
+ option.data = rowdata;
+ table.render(option);
- for (var i = 1; i <= result.data.length; i++) {
- //$('#HAnalysisMethod' + i + '').find("option[value='" + option.data[i - 1].HAnalysisMethod + "']").attr("selected", true);
- $('#HResult' + i + '').find("option[value='" + option.data[i - 1].HResult + "']").attr("selected", true);
- }
- form.render('select');
+ for (var i = 1; i <= result.data.length; i++) {
+ $('#HAnalysisMethod' + i + '').find("option[value='" + option.data[i - 1].HAnalysisMethod + "']").attr("selected", true);
+ $('#HResult' + i + '').find("option[value='" + option.data[i - 1].HResult + "']").attr("selected", true);
+ }
+ form.render('select');
- option_Check = result.data;
+ option_Check = result.data;
- $("[name='HEntryID']").attr("value", result.data.length);
- $("[name='HQCCheckItemID']").attr("value", result.data[result.data.length - 1].HQCCheckItemID);
- $("[name='HQCCheckItemName']").attr("value", result.data[result.data.length - 1].妫�楠岄」鐩�);
- //榛樿閫変腑鏈�鍚庝竴琛�
- $("tr[data-index = " + (result.data.length - 1) + "] .layui-form-checkbox").dblclick();
- //$("tr[data-index = " + (result.data.length - 1) + "] .layui-form-checkbox").addClass('layui-form-checked');
- $("tr[data-index = " + (result.data.length - 1) + "] ").attr({ "style": "background:#ceedfa;color:black" });
+ $("[name='HEntryID']").attr("value", result.data.length);
+ $("[name='HQCCheckItemID']").attr("value", result.data[result.data.length - 1].HQCCheckItemID);
+ $("[name='HQCCheckItemName']").attr("value", result.data[result.data.length - 1].妫�楠岄」鐩�);
+ //榛樿閫変腑鏈�鍚庝竴琛�
+ $("tr[data-index = " + (result.data.length - 1) + "] .layui-form-checkbox").dblclick();
+ //$("tr[data-index = " + (result.data.length - 1) + "] .layui-form-checkbox").addClass('layui-form-checked');
+ $("tr[data-index = " + (result.data.length - 1) + "] ").attr({ "style": "background:#ceedfa;color:black" });
- trindex = result.data.length - 1;
- $("#HEntryID").val() - 1
+ trindex = result.data.length - 1;
+ $("#HEntryID").val() - 1
+ }
}
})
}
@@ -1845,7 +1874,7 @@
, { field: 'HDownLimit', title: '涓嬮檺鍊�', edit: 'text', hide: true }
, { field: 'HUpOffSet', title: '涓婂亸宸�', edit: 'text', hide: true }
, { field: 'HDownOffSet', title: '涓嬪亸宸�', edit: 'text', hide: true }
- , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
+ , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 85 }
]]
, done: function (res, curr, count) {
option.data = res.data;
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html"
index 4b11114..040b521 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html"
@@ -752,7 +752,7 @@
//宸ュ簭杩涚珯鎺ユ敹鍗曞垪琛ㄩ妫�
else if (HSouceBillType == 3790) {
//鏍规嵁婧愬崟id鑾峰彇婧愬崟淇℃伅
- LoadingInformation();
+ LoadingInformation_StationInBill();
}
//宸ュ簭濮斿鎺ユ敹鍗曞垪琛ㄩ妫�
else if (HSouceBillType == 3793) {
@@ -779,12 +779,12 @@
set_InitGrid();
//鏍规嵁婧愬崟id鑾峰彇婧愬崟淇℃伅
- function LoadingInformation() {
+ function LoadingInformation_StationInBill() {
var wait = layer.load();
$.ajax({
- url: GetWEBURL() + '/Cj_StationInBill/get_Display',
+ url: GetWEBURL() + '/QC_FirstPieceCheckBill/get_StationInBill',
type: "GET",
- data: { "sWhere": "and HInterID = " + linterid, "user": sessionStorage["HUserName"] },
+ data: { "HInterID": linterid, "user": sessionStorage["HUserName"] },
success: function (result) {
var data = result.data[0];
if (result.count == 1) {
@@ -803,6 +803,10 @@
$("#HMainSourceBillType").val(data.HBillType);
$("#HMainSourceInterID").val(data.HInterID);
$("#HICMOEntryID").val(data.HICMOEntryID);
+ $("#HQCSchemeName").val(data.妫�楠屾柟妗堝悕绉�);
+ $("#HQCSchemeID").val(data.妫�楠屾柟妗圛D);
+ //鑾峰彇琛ㄤ綋妫�楠岄」鐩俊鎭�
+ get_CheckItem();
} else {
layer.alert(result.Message, { icon: 5 });
}
@@ -976,6 +980,31 @@
//閫�鍑烘寜閽�
form.on('submit(btn-Exit)', function (data) {
get_Exit();
+
+ sWhere = " and hmainid = " + $("#HInterID").val();
+ $.ajax({
+ url: GetWEBURL() + "/QC_FirstPieceCheckBill/QC_FirstPieceCheckBillList",
+ type: "GET",
+ async: false,
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 0) {
+ $.ajax({
+ url: GetWEBURL() + "/DeltetQC_FirstPieceCheck",
+ type: "GET",
+ async: false,
+ data: { "HInterID": $("#HInterID").val(), "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ return;
+ } else {
+ layer.msg("鍒犻櫎妫�楠屽�煎け璐ワ紒" + result.Message, { icon: 5 });
+ }
+ }
+ })
+ }
+ }
+ })
});
//鏂板鎸夐挳
@@ -1278,7 +1307,7 @@
});
//淇濆瓨
- function set_SaveBill(data) {
+ function set_SaveBill(data) {
//璧嬪�兼渶鍚庝竴涓�変腑琛岀殑鏁版嵁缁檕ption.data
Assignment(LastIndex, LastIndex);
//淇濆瓨鏈�鍚庝竴娆＄偣鍑昏鐨勬楠屽��
@@ -1394,8 +1423,8 @@
, "HProcExchEntryID": data.HProcExchEntryID
, "HFirstCheckEmp": data.HFirstCheckEmp
, "HFirstCheckEmpName": data.璐ㄦ鍛樺悕绉�
- //, "HQCSchemeID": data.妫�楠屾柟妗圛D
- //, "HQCSchemeName": data.妫�楠屾柟妗堝悕绉�
+ , "HQCSchemeID": data.妫�楠屾柟妗圛D
+ , "HQCSchemeName": data.妫�楠屾柟妗堝悕绉�
//, "HQCSchemeID": data.HManagerID
//, "HPSStyleID": data.HPSStyleID
, "HRemark": data.琛ㄥご澶囨敞
@@ -1443,29 +1472,38 @@
for (var i = 0; i < data.length; i++) {
rowdata.push(
{
- "HQCCheckItemID": data[i].HQCCheckItemID, "妫�楠岄」鐩�": data[i].妫�楠岄」鐩悕绉�, "HInspectInstruMentID": "0", "妫�楠屼华鍣�": "","HQCStd": data[i].妫�楠屾爣鍑�,
+ "HQCCheckItemID": data[i].HQCCheckItemID, "妫�楠岄」鐩�": data[i].妫�楠岄」鐩悕绉�, "HInspectInstruMentID": data[i].HInspectInstruMentID, "妫�楠屼华鍣�": data[i].妫�楠屼华鍣ㄥ悕绉�, "HQCStd": data[i].妫�楠屾爣鍑�,
"HUnit": data[i].妫�楠屽崟浣�, "HQCNote": data[i].妫�楠岃褰�, "HResult": data[i].缁撹,
"HMax": data[i].鏈�澶у��, "HMin": data[i].鏈�灏忓��, "HAvg": data[i].骞冲潎鍊�, "HRemark": data[i].琛ㄤ綋澶囨敞,
- "HAnalysisMethod": data[i].鍒嗘瀽鏂规硶, "HKeyInspect": data[i].閲嶇偣妫�鏌� == 0 ? false : true, "HSampleSchemeID": 0, "HUnitID": 0,
- "HInspectVal": '', "HTargetVal": '', "HUpLimit": '', "HDownLimit": '', "HUpOffSet": '', "HDownOffSet": '', "HSampleDamageQty": '',
- "HSampleSchemeName": "", "HSampleQty": "", "HSampleDamageQty": "", "HAcceptQty": "", "HInspectionLevel": "", "HRejectQty": "",
- "HStrictness": "", "HSampleUnRightQty": "", "HAQL": "", "HSamplingType": ""
+ "HAnalysisMethod": data[i].鍒嗘瀽鏂规硶 == "瀹氭�у垎鏋�" ? 1 : (data[i].鍒嗘瀽鏂规硶 == "瀹氶噺鍒嗘瀽" ? 2 : 3), "HKeyInspect": data[i].閲嶇偣妫�鏌� == "鍚�" ? false : true,
+ "HSampleSchemeID": data[i].HSampleSchemeID, "HUnitID": data[i].HUnitID,
+ "HInspectVal": data[i].妫�娴嬪��, "HTargetVal": data[i].鐩爣鍊�, "HUpLimit": data[i].涓婇檺鍊�, "HDownLimit": data[i].涓嬮檺鍊�, "HUpOffSet": data[i].涓婂亸宸�, "HDownOffSet": data[i].涓嬪亸宸�, "HSampleDamageQty": data[i].鏍锋湰鐮村潖鏁�,
+ "HSampleSchemeName": data[i].鎶芥牱鏂规鍚嶇О, "HSampleQty": data[i].鏍锋湰閲�, "HSampleDamageQty": data[i].鏍锋湰鐮村潖鏁�, "HAcceptQty": data[i].鍏佽鏁�, "HInspectionLevel": 0, "HRejectQty": data[i].鎷掔粷鏁�,
+ "HStrictness": 0, "HSampleUnRightQty": data[i].鏍锋湰涓嶅悎鏍兼暟, "HAQL": data[i].AQL, "HSamplingType": 0
}
)
+ console.log(rowdata[i].HSampleQty);
+ SummaryIndex.push(i.toString());
}
option.data = rowdata;
+ console.log(rowdata);
table.render(option);
for (let j = 0; j < data.length; j++) {
$("#HResult" + (j + 1)).val(data[j].缁撹)
}
for (let j = 0; j < data.length; j++) {
- $("#HAnalysisMethod" + (j + 1)).val(data[j].鍒嗘瀽鏂规硶)
+ $("#HAnalysisMethod" + (j + 1)).val(data[j].鍒嗘瀽鏂规硶 == "瀹氭�у垎鏋�" ? 1 : (data[j].鍒嗘瀽鏂规硶 == "瀹氶噺鍒嗘瀽" ? 2 : 3))
}
for (var i = 1; i <= data.length; i++) {
- $('#HKeyInspect' + i + '').find("option[value='" + (data[i - 1].閲嶇偣妫�鏌� == 0 ? false : true) + "']").attr("selected", true);
+ $('#HKeyInspect' + i + '').find("option[value='" + (data[i - 1].閲嶇偣妫�鏌� == "鍚�" ? false : true) + "']").attr("selected", true);
}
form.render('select');
+
+ //榛樿閫変腑鏈�鍚庝竴琛�
+ $("tr[data-index = " + (option.data.length - 1) + "] .layui-form-checkbox").dblclick();
+ //$("tr[data-index = " + (result.data.length - 1) + "] .layui-form-checkbox").addClass('layui-form-checked');
+ $("tr[data-index = " + (option.data.length - 1) + "] ").attr({ "style": "background:#ceedfa;color:black" });
layer.close(ajaxLoad);
} else {
@@ -1770,42 +1808,44 @@
$.ajax({
url: GetWEBURL() + "/Web/GetCheckItemByCheckProjectID",
type: "GET",
- data: { "CheckProjectID": $("#HQCSchemeID").val() },
+ data: { "CheckProjectID": $("#HQCSchemeID").val() == '' ? 0 : $("#HQCSchemeID").val()},
success: function (result) {
- var rowdata = [];
- var data = result.data;
- for (var i = 0; i < result.data.length; i++) {
- //瀛愯〃 璧嬪��
- rowdata.push({
- "HQCCheckItemID": data[i]["HQCCheckItemID"], "妫�楠岄」鐩�": data[i]["妫�楠岄」鐩�"], "HInspectInstruMentID": 0, "妫�楠屼华鍣�": "", "HQCStd": data[i]["HQCStd"], "HUnit": data[i]["HUnit"], "HQCNote": "", "HAnalysisMethod": data[i]["HAnalysisMethod"], "HResult": data[i]["HResult"],
- "HMax": "", "HMin": "", "HAvg": "", "HRemark": "", "HKeyInspect": false, "HStatus": 0, "HSampleSchemeID": 0, "HUnitID": 0,
- "HInspectVal": '', "HTargetVal": '', "HUpLimit": '', "HDownLimit": '', "HUpOffSet": '', "HDownOffSet": '', "HSampleDamageQty": '',
- "HSampleSchemeName": "", "HSampleQty": "", "HSampleDamageQty": "", "HAcceptQty": "", "HInspectionLevel": "", "HRejectQty": "",
- "HStrictness": "", "HSampleUnRightQty": "", "HAQL": "", "HSamplingType": ""
- });
- }
+ if (result.code == 1) {
+ var rowdata = [];
+ var data = result.data;
+ for (var i = 0; i < result.data.length; i++) {
+ //瀛愯〃 璧嬪��
+ rowdata.push({
+ "HQCCheckItemID": data[i]["HQCCheckItemID"], "妫�楠岄」鐩�": data[i]["妫�楠岄」鐩�"], "HInspectInstruMentID": 0, "妫�楠屼华鍣�": "", "HQCStd": data[i]["HQCStd"], "HUnit": data[i]["HUnit"], "HQCNote": "", "HAnalysisMethod": data[i]["HAnalysisMethod"], "HResult": data[i]["HResult"],
+ "HMax": "", "HMin": "", "HAvg": "", "HRemark": "", "HKeyInspect": false, "HStatus": 0, "HSampleSchemeID": 0, "HUnitID": 0,
+ "HInspectVal": '', "HTargetVal": '', "HUpLimit": '', "HDownLimit": '', "HUpOffSet": '', "HDownOffSet": '', "HSampleDamageQty": '',
+ "HSampleSchemeName": "", "HSampleQty": "", "HSampleDamageQty": "", "HAcceptQty": "", "HInspectionLevel": "", "HRejectQty": "",
+ "HStrictness": "", "HSampleUnRightQty": "", "HAQL": "", "HSamplingType": ""
+ });
+ }
- option.data = rowdata;
- table.render(option);
+ option.data = rowdata;
+ table.render(option);
- for (var i = 1; i <= result.data.length; i++) {
- //$('#HAnalysisMethod' + i + '').find("option[value='" + option.data[i - 1].HAnalysisMethod + "']").attr("selected", true);
- $('#HResult' + i + '').find("option[value='" + option.data[i - 1].HResult + "']").attr("selected", true);
- }
- form.render('select');
+ for (var i = 1; i <= result.data.length; i++) {
+ $('#HAnalysisMethod' + i + '').find("option[value='" + option.data[i - 1].HAnalysisMethod + "']").attr("selected", true);
+ $('#HResult' + i + '').find("option[value='" + option.data[i - 1].HResult + "']").attr("selected", true);
+ }
+ form.render('select');
- option_Check = result.data;
+ option_Check = result.data;
- $("[name='HEntryID']").attr("value", result.data.length);
- $("[name='HQCCheckItemID']").attr("value", result.data[result.data.length - 1].HQCCheckItemID);
- $("[name='HQCCheckItemName']").attr("value", result.data[result.data.length - 1].妫�楠岄」鐩�);
- //榛樿閫変腑鏈�鍚庝竴琛�
- $("tr[data-index = " + (result.data.length - 1) + "] .layui-form-checkbox").dblclick();
- //$("tr[data-index = " + (result.data.length - 1) + "] .layui-form-checkbox").addClass('layui-form-checked');
- $("tr[data-index = " + (result.data.length - 1) + "] ").attr({ "style": "background:#ceedfa;color:black" });
+ $("[name='HEntryID']").attr("value", result.data.length);
+ $("[name='HQCCheckItemID']").attr("value", result.data[result.data.length - 1].HQCCheckItemID);
+ $("[name='HQCCheckItemName']").attr("value", result.data[result.data.length - 1].妫�楠岄」鐩�);
+ //榛樿閫変腑鏈�鍚庝竴琛�
+ $("tr[data-index = " + (result.data.length - 1) + "] .layui-form-checkbox").dblclick();
+ //$("tr[data-index = " + (result.data.length - 1) + "] .layui-form-checkbox").addClass('layui-form-checked');
+ $("tr[data-index = " + (result.data.length - 1) + "] ").attr({ "style": "background:#ceedfa;color:black" });
- trindex = result.data.length - 1;
- $("#HEntryID").val() - 1
+ trindex = result.data.length - 1;
+ $("#HEntryID").val() - 1
+ }
}
})
}
@@ -2069,7 +2109,7 @@
, { field: 'HDownLimit', title: '涓嬮檺鍊�', edit: 'text', hide: true }
, { field: 'HUpOffSet', title: '涓婂亸宸�', edit: 'text', hide: true }
, { field: 'HDownOffSet', title: '涓嬪亸宸�', edit: 'text', hide: true }
- , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
+ , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 85 }
]]
, done: function (res, curr, count) {
option.data = res.data;
@@ -2181,7 +2221,7 @@
}
}
if (HQty > 0) {
- document.querySelectorAll("[name='HLastResult']")[0].removeAttribute('checked'); //鍒犻櫎閫夋嫨灞炴��
+ document.querySelectorAll("[name='HLastResult']")[0].removeAttribute('checked'); //鍒犻櫎閫夋嫨灞炴��
$("input:radio[name=HLastResult][value=" + false + "]").attr("checked", "true"); //娣诲姞閫夋嫨灞炴��
} else {
document.querySelectorAll("[name='HLastResult']")[1].removeAttribute('checked'); //鍒犻櫎閫夋嫨灞炴��
@@ -2889,45 +2929,91 @@
//鑾峰彇鏂囨湰妗嗗��
var maindata = table.cache['mainTable'];
- var dataobj = {
- HEntryID: $("#HEntryID").val(), //琛屽彿
- HStatus: $("#HStatus").val(), //鐘舵��
- HSampleSchemeID: $("#HSampleSchemeID").val(), //鎶芥牱鏂规ID
- HSampleSchemeName: $("#HSampleSchemeName").val(), //鎶芥牱鏂规
- //xxx: $("#xxx").val(),
- HUnitID: $("#HUnitID").val(), //鍗曚綅ID
- HUnit: $("#HUnit").val(), //鍗曚綅
- HInspectVal: $("#HInspectVal").val(), //妫�楠屽��
- HTargetVal: $("#HTargetVal").val(), //鐩爣鍊�
- HUpLimit: $("#HUpLimit").val(), //涓婇檺鍊�
- HDownLimit: $("#HDownLimit").val(), //涓嬮檺鍊�
- HUpOffSet: $("#HUpOffSet").val(), //涓婂亸宸�
- HDownOffSet: $("#HDownOffSet").val(), //涓嬪亸宸�
- HSampleDamageQty: $("#HSampleDamageQty").val(), //鏍锋湰鐮村潖鏁�
- HSampleQty: $("#HSampleQty").val(), //鏍锋湰閲�
- HAcceptQty: $("#HAcceptQty").val(), //鍏佽鏁�
- HInspectionLevel: $("#HInspectionLevel").val(), //妫�楠屾按骞�
- HRejectQty: $("#HRejectQty").val(), //鎷掔粷鏁�
- HStrictness: $("#HStrictness").val(), //涓ユ牸搴�
- HSampleUnRightQty: $("#HSampleUnRightQty").val(), //鏍锋湰涓嶅悎鏍兼暟
- HAQL: $("#HAQL").val(), //AQL
- HSamplingType: $("#HSamplingType").val(),
+ if (OperationType == 3) {
+ $("[name='HEntryID']").val(Number(nowindex) + Number(1));
+ $("[name='HQCCheckItemName']").val(option.data[nowindex].妫�楠岄」鐩�);
- HSampleQty: $("#HSampleQty").val(), //鏍锋湰閲�
- HInspectResultToSee: $("#HInspectResultToSee").val(), //妫�楠岀粨鏋�
- HInspectResultToSee2: $("#HInspectResultToSee2").val(), //妫�楠岀粨鏋�2
- HSampleUnRightQty: $("#HSampleUnRightQty").val(), //鏍锋湰涓嶅悎鏍兼暟
- HUnitID: $("#HUnitID").val(), //鍗曚綅ID
- HUnitName: $("#HUnitName").val(), //鍗曚綅
- HInspectValB: $("#HInspectValB").val(), //妫�楠屽�糏D
- HInspectVal: $("#HInspectVal").val(), //妫�楠屽��
- HTargetValB: $("#HTargetValB").val(), //鐩爣鍊糏D
- HTargetVal: $("#HTargetVal").val(), //鐩爣鍊�
- HUpLimit: $("#HUpLimit").val(), //涓婇檺鍊�
- HDownLimit: $("#HDownLimit").val(), //涓嬮檺鍊�
- HUpOffSet: $("#HUpOffSet").val(), //涓婂亸宸�
- HDownOffSet: $("#HDownOffSet").val(), //涓嬪亸宸�
- };
+ var dataobj = {
+ HEntryID: $("#HEntryID").val(), //琛屽彿
+ HStatus: $("#HStatus").val(), //鐘舵��
+ HSampleSchemeID: option.data[nowindex].HSampleSchemeID, //鎶芥牱鏂规ID
+ HSampleSchemeName: option.data[nowindex].HSampleSchemeName, //鎶芥牱鏂规
+ //xxx: $("#xxx").val(),
+ HUnitID: option.data[nowindex].HUnitID, //鍗曚綅ID
+ HUnit: option.data[nowindex].HUnit,//鍗曚綅
+ HInspectVal: option.data[nowindex].HInspectVal, //妫�楠屽��
+ HTargetVal: option.data[nowindex].HTargetVal, //鐩爣鍊�
+ HUpLimit: option.data[nowindex].HUpLimit, //涓婇檺鍊�
+ HDownLimit: option.data[nowindex].HDownLimit, //涓嬮檺鍊�
+ HUpOffSet: option.data[nowindex].HUpOffSet, //涓婂亸宸�
+ HDownOffSet: option.data[nowindex].HDownOffSet, //涓嬪亸宸�
+ HSampleDamageQty: option.data[nowindex].HSampleDamageQty, //鏍锋湰鐮村潖鏁�
+ HSampleQty: option.data[nowindex].HSampleQty, //鏍锋湰閲�
+ HAcceptQty: option.data[nowindex].HAcceptQty,//鍏佽鏁�
+ HInspectionLevel: option.data[nowindex].HInspectionLevel, //妫�楠屾按骞�
+ HRejectQty: option.data[nowindex].HRejectQty, //鎷掔粷鏁�
+ HStrictness: option.data[nowindex].HStrictness, //涓ユ牸搴�
+ HSampleUnRightQty: option.data[nowindex].HSampleUnRightQty, //鏍锋湰涓嶅悎鏍兼暟
+ HAQL: option.data[nowindex].HAQL, //AQL
+ HSamplingType: option.data[nowindex].HSamplingType,
+
+ HSampleQty: option.data[nowindex].HSampleQty, //鏍锋湰閲�
+ HInspectResultToSee: '', //妫�楠岀粨鏋�
+ HInspectResultToSee2: '', //妫�楠岀粨鏋�2
+ HSampleUnRightQty: option.data[nowindex].HSampleUnRightQty,//鏍锋湰涓嶅悎鏍兼暟
+ HUnitID: option.data[nowindex].HUnitID, //鍗曚綅ID
+ HUnitName: option.data[nowindex].HUnit, //鍗曚綅
+ HInspectValB: option.data[nowindex].HInspectValB,//妫�楠屽�糏D
+ HInspectVal: option.data[nowindex].HInspectVal, //妫�楠屽��
+ HTargetValB: option.data[nowindex].HTargetValB, //鐩爣鍊糏D
+ HTargetVal: option.data[nowindex].HTargetVal,//鐩爣鍊�
+ HUpLimit: option.data[nowindex].HUpLimit, //涓婇檺鍊�
+ HDownLimit: option.data[nowindex].HDownLimit, //涓嬮檺鍊�
+ HUpOffSet: option.data[nowindex].HUpOffSet, //涓婂亸宸�
+ HDownOffSet: option.data[nowindex].HDownOffSet, //涓嬪亸宸�
+ };
+ } else {
+ var dataobj = {
+ HEntryID: $("#HEntryID").val(), //琛屽彿
+ HStatus: $("#HStatus").val(), //鐘舵��
+ HSampleSchemeID: $("#HSampleSchemeID").val(), //鎶芥牱鏂规ID
+ HSampleSchemeName: $("#HSampleSchemeName").val(), //鎶芥牱鏂规
+ //xxx: $("#xxx").val(),
+ HUnitID: $("#HUnitID").val(), //鍗曚綅ID
+ HUnit: $("#HUnit").val(), //鍗曚綅
+ HInspectVal: $("#HInspectVal").val(), //妫�楠屽��
+ HTargetVal: $("#HTargetVal").val(), //鐩爣鍊�
+ HUpLimit: $("#HUpLimit").val(), //涓婇檺鍊�
+ HDownLimit: $("#HDownLimit").val(), //涓嬮檺鍊�
+ HUpOffSet: $("#HUpOffSet").val(), //涓婂亸宸�
+ HDownOffSet: $("#HDownOffSet").val(), //涓嬪亸宸�
+ HSampleDamageQty: $("#HSampleDamageQty").val(), //鏍锋湰鐮村潖鏁�
+ HSampleQty: $("#HSampleQty").val(), //鏍锋湰閲�
+ HAcceptQty: $("#HAcceptQty").val(), //鍏佽鏁�
+ HInspectionLevel: $("#HInspectionLevel").val(), //妫�楠屾按骞�
+ HRejectQty: $("#HRejectQty").val(), //鎷掔粷鏁�
+ HStrictness: $("#HStrictness").val(), //涓ユ牸搴�
+ HSampleUnRightQty: $("#HSampleUnRightQty").val(), //鏍锋湰涓嶅悎鏍兼暟
+ HAQL: $("#HAQL").val(), //AQL
+ HSamplingType: $("#HSamplingType").val(),
+
+ HSampleQty: $("#HSampleQty").val(), //鏍锋湰閲�
+ HInspectResultToSee: $("#HInspectResultToSee").val(), //妫�楠岀粨鏋�
+ HInspectResultToSee2: $("#HInspectResultToSee2").val(), //妫�楠岀粨鏋�2
+ HSampleUnRightQty: $("#HSampleUnRightQty").val(), //鏍锋湰涓嶅悎鏍兼暟
+ HUnitID: $("#HUnitID").val(), //鍗曚綅ID
+ HUnitName: $("#HUnitName").val(), //鍗曚綅
+ HInspectValB: $("#HInspectValB").val(), //妫�楠屽�糏D
+ HInspectVal: $("#HInspectVal").val(), //妫�楠屽��
+ HTargetValB: $("#HTargetValB").val(), //鐩爣鍊糏D
+ HTargetVal: $("#HTargetVal").val(), //鐩爣鍊�
+ HUpLimit: $("#HUpLimit").val(), //涓婇檺鍊�
+ HDownLimit: $("#HDownLimit").val(), //涓嬮檺鍊�
+ HUpOffSet: $("#HUpOffSet").val(), //涓婂亸宸�
+ HDownOffSet: $("#HDownOffSet").val(), //涓嬪亸宸�
+ };
+ }
+
//璧嬪�硷紝鍌ㄥ瓨鏁版嵁
maindata[dataindex].HStatus = dataobj.HStatus;
maindata[dataindex].HSampleSchemeID = dataobj.HSampleSchemeID;
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_FirstPieceCheckBillList.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_FirstPieceCheckBillList.html"
index a1593cf..5878f36 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_FirstPieceCheckBillList.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_FirstPieceCheckBillList.html"
@@ -461,6 +461,18 @@
layer.close(wait);
//layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
} else {
+ option_Value = {
+ elem: '#mainTable_Value'
+ //, toolbar: '#toolbarDemo2'
+ , cols: []
+ , data: ""
+ , height: 550
+ , page: true
+ , cellMinWidth: 90
+ , limit: 50
+ , limits: [50, 500, 5000, 20000]
+ }
+ table.render(option_Value);
layer.close(wait);
layer.alert(data1.code + data1.Message, { icon: 5 });
}
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.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.html"
index 34cdf5e..df7c8a9 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.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.html"
@@ -1330,7 +1330,7 @@
return;
}
var tableData = data.field;
- var oMain = JSON.stringify(data.field) + ";" + sessionStorage["HUserName"];
+ var oMain = JSON.stringify(data.field) + ";" + sessionStorage["HUserName"] + ";" + OperationType;
var index = layer.load();
$.ajax({
type: "POST",
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254/MES_ColorRecordBill_PDA.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254/MES_ColorRecordBill_PDA.html"
new file mode 100644
index 0000000..5ae6d2f
--- /dev/null
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254/MES_ColorRecordBill_PDA.html"
@@ -0,0 +1,536 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+ <meta charset="utf-8" />
+ <title>瀵硅壊璁板綍鍗�</title>
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <!--寮曠敤layui js鏂囦欢-->
+ <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/zgqCustom/zgqCustom.js"></script>
+ <!--鑷畾涔夋牱寮�-->
+ <style>
+ /* .maintitle {
+ background-color: #1492ff;
+ color: #fff;
+ padding: 5px 10px;
+ border: none;
+ border-radius: 4px;
+ }
+
+ .title {
+ border-left: 4px solid #1492ff;
+ padding-left: 6px;
+ margin: 20px 10px 4px;
+ font-size: 16px;
+ color: #333;
+ }
+
+ .buttom_box_little {
+ width: 60px;
+ height: 36px;
+ color: #fff;
+ background-color: #1492ff;
+ border-radius: 4px;
+ border: none;
+ margin: 10px;
+ }
+
+ .layui-input {
+ width: 93%;
+ }
+
+ .layui-inline, img {
+ display: block;
+ vertical-align: middle
+ }
+
+ .layui-input, .layui-textarea {
+ display: inline-block;
+ width: 100%;
+ padding-left: 10px;
+ }
+
+ .laydate-time-list ol {
+ overflow-x: hidden !important;
+ overflow-y: auto !important;
+ }
+
+ .layui-form-label {
+ padding: 9px 5px;
+ width: 85px;
+ }
+
+ .layui-input-block {
+ margin-left: 85px;
+ min-height: 36px;
+ }*/
+
+ .layui-form-label {
+ font-size: 14px;
+ width: 85px;
+ text-align: inherit;
+ }
+ /*鍏ㄥ眬璁剧疆杈撳叆妗嗛珮搴�*/
+ .layui-input {
+ height: 30px;
+ }
+ /*璁剧疆琛ㄥご杈撳叆妗�*/
+ .t1_input {
+ padding: 1%;
+ }
+ /*鏈珯淇℃伅td*/
+ .bz_td {
+ display: -webkit-box; /*璁剧疆鎸夐挳涓嶆崲琛�*/
+ padding: 1%; /*璁剧疆杈撳叆妗嗚竟璺�*/
+ }
+ /*璁剧疆鏈珯淇℃伅鎸夐挳楂樺害*/
+ .bz_btu {
+ height: 30px;
+ width: 60px;
+ line-height: 30px;
+ }
+
+ th {
+ width: 70px;
+ text-align: left;
+ }
+ </style>
+</head>
+<body>
+ <div class="layui-fluid" style="padding: 0;">
+ <div class="layui-card">
+ <div class="layui-card-body" style="padding: 1px;">
+ <form class="layui-form" action="" lay-filter="formData" id="formData" style="background-color:white;">
+ <div style="background-color:#0085E8;">
+ <span style="color: white;" class="gxcz"><i class="layui-icon layui-icon-form"></i>瀵硅壊璁板綍鍗�</span>
+ </div>
+ <div class="layui-form-item" style="margin: 1% 2%;text-align: right;">
+ <button type="button" lay-submit="" lay-filter="Saver" class="layui-btn layui-btn-radius" id="Saver">淇濆瓨</button>
+ <button type="button" lay-submit="" lay-filter="Add" class="layui-btn layui-btn-radius" id="Add">鏂板</button>
+ <!--<button type="button" lay-submit="" lay-filter="Detail" class="layui-btn layui-btn-radius" id="Detail">鏄庣粏</button>-->
+
+ <button type="button" lay-submit="" lay-filter="Cancel" class="layui-btn layui-btn-radius layui-btn-danger">閫�鍑�</button>
+ </div>
+ <div class="layui-form-item">
+ <div class="layui-tab layui-tab-card" lay-filter="TabTest">
+ <div class="layui-tab-content">
+ <div class="layui-tab-item layui-show">
+ <table style="width:80%;">
+ <tbody>
+ <tr>
+ <th>鏉″舰鐮�</th>
+ <td class="bz_td">
+ <input type="text" name="HBarCode" class="layui-input" id="HBarCode" placeholder="璇疯緭鍏ユ潯褰㈢爜鍚庡洖杞�" style="border-radius: 50px;">
+ <button type="button" lay-submit="" class="layui-btn layui-col-xs2 bz_btu layui-btn-radius" lay-filter="QueDin" style="line-height: 30px;">纭畾</button>
+ </td>
+ </tr>
+ <tr>
+ <th>鏁伴噺</th>
+ <td class="bz_td">
+ <input type="text" name="HQty" class="layui-input" id="HQty" value="0" placeholder="璇疯緭鍏ユ暟閲�" style="border-radius: 50px;">
+ </td>
+ </tr>
+ <tr>
+ <th>鐢熶骇璧勬簮</th>
+ <td class="bz_td">
+ <input type="text" name="HSourceName" class="layui-input" id="HSourceName" placeholder="閫夋嫨鐢熶骇璧勬簮" style="border-radius: 50px; background-color: #efefef4d;">
+ <input type="hidden" name="HSourceID" id="HSourceID" value="0" autocomplete="off" class="layui-input">
+ <button type="button" lay-submit="" class="layui-btn layui-col-xs2 bz_btu" lay-filter="ProductionResources-BT" id="ProductionResources-BT" style="font-weight:bolder;">...</button>
+ </td>
+ </tr>
+ <tr>
+ <th>璇曟牱缁撹</th>
+ <td class="bz_td">
+ <input type="radio" name="HLastResult" value="true" title="OK" checked="">
+ <input type="radio" name="HLastResult" value="false" title="NG">
+ </td>
+ </tr>
+ <tr>
+ <th>鍗曟嵁鏃ユ湡</th>
+ <td class="t1_input">
+ <input type="text" name="HDate" class="layui-input" id="HDate" style="border-radius: 50px;" placeholder="璇烽�夋嫨鏃ユ湡" readonly>
+ </td>
+ </tr>
+ <tr>
+ <th>鍗曟嵁鍙�</th>
+ <td class="bz_td">
+ <input type="text" name="HBillNo" class="layui-input" id="HBillNo" placeholder="鍗曟嵁鍙�" style="border-radius: 50px;background-color:#efefef4d;" readonly>
+ <input type="hidden" name="HInterID" id="HInterID" value="0" autocomplete="off" class="layui-input">
+ </td>
+ </tr>
+ <tr>
+ <th>鐢熶骇缁勭粐</th>
+ <td class="bz_td">
+ <input type="text" name="HPRDORGName" class="layui-input" id="HPRDORGName" placeholder="鐢熶骇缁勭粐" style="border-radius: 50px;background-color:#efefef4d;" readonly>
+ <input type="hidden" name="HPRDORGID" id="HPRDORGID" value="0" autocomplete="off" class="layui-input">
+ </td>
+ </tr>
+ <tr>
+ <th>鐢熶骇璁㈠崟鍙�</th>
+ <td class="bz_td">
+ <input type="text" name="HICMOBillNo" class="layui-input" id="HICMOBillNo" placeholder="鐢熶骇璁㈠崟鍙�" style="border-radius: 50px;background-color:#efefef4d;" readonly>
+ <input type="hidden" name="HICMOInterID" id="HICMOInterID" value="0" autocomplete="off" class="layui-input">
+ </tr>
+ <tr>
+ <th>鎸囧紩鍗�</th>
+ <td class="bz_td">
+ <input type="text" name="HProcExchBillNo" class="layui-input" id="HProcExchBillNo" placeholder="鎸囧紩鍗�" style="border-radius: 50px;background-color:#efefef4d;" readonly>
+ <input type="hidden" name="HProcExchHinteID" class="layui-input" id="HProcExchHinteID">
+ </td>
+ </tr>
+ <tr>
+ <th>鐗╂枡浠ｇ爜</th>
+ <td class="bz_td">
+ <input type="text" name="HMaterNumber" class="layui-input" id="HMaterNumber" placeholder="浜у搧浠ｇ爜" style="border-radius: 50px;background-color:#efefef4d;" readonly>
+ <input type="hidden" name="HMaterID" class="layui-input" id="HMaterID">
+ </td>
+ </tr>
+ <tr>
+ <th>鐗╂枡鍚嶇О</th>
+ <td class="bz_td">
+ <input type="text" name="HMaterName" class="layui-input" id="HMaterName" value="" placeholder="鐗╂枡鍚嶇О" style="border-radius: 50px;background-color:#efefef4d;" readonly>
+ </td>
+ </tr>
+ <tr>
+ <th>瑙勬牸鍨嬪彿</th>
+ <td class="bz_td">
+ <input type="text" name="HMaterModel" class="layui-input" id="HMaterModel" placeholder="瑙勬牸鍨嬪彿" style="border-radius: 50px;background-color:#efefef4d;" readonly>
+ </td>
+ </tr>
+ <tr>
+ <th>璁￠噺鍗曚綅</th>
+ <td class="bz_td">
+ <input type="text" name="HUnitName" class="layui-input" id="HUnitName" placeholder="閫夋嫨璁￠噺鍗曚綅" style="border-radius: 50px; background-color: #efefef4d;">
+ <input type="hidden" name="HUnitID" id="HUnitID" value="0" autocomplete="off" class="layui-input">
+ <button type="button" lay-submit="" class="layui-btn layui-col-xs2 bz_btu" lay-filter="BtnHUnit" id="BtnHUnit" style="font-weight:bolder">...</button>
+ </td>
+ </tr>
+ <tr>
+ <th>宸ュ簭</th>
+ <td class="bz_td">
+ <input type="text" name="HProcName" class="layui-input" id="HProcName" placeholder="閫夋嫨宸ュ簭" style="background-color:#efefef4d;border-radius: 50px;">
+ <input type="hidden" name="HProcID" id="HProcID" value="0" autocomplete="off" class="layui-input">
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ <div class="layui-tab-item">
+ <table style="width:80%;">
+ <tbody>
+ <tr>
+ <th>鍒跺崟浜�</th>
+ <td class="bz_td">
+ <input type="text" name="HMaker" class="layui-input" id="HMaker" style="border-radius: 50px;background-color:#efefef4d;" readonly>
+ </td>
+ </tr>
+ <tr>
+ <th>鍒跺崟鏃ユ湡</th>
+ <td class="bz_td">
+ <input type="text" name="HMakeDate" class="layui-input" id="HMakeDate" style="border-radius: 50px;background-color:#efefef4d;" readonly>
+ </td>
+ </tr>
+ <tr>
+ <th>淇敼浜�</th>
+ <td class="bz_td">
+ <input type="text" name="HUpDater" class="layui-input" id="HUpDater" style="border-radius: 50px;background-color:#efefef4d;" readonly>
+ </td>
+ </tr>
+ <tr>
+ <th>淇敼鏃ユ湡</th>
+ <td class="bz_td">
+ <input type="text" name="HUpDateDate" class="layui-input" id="HUpDateDate" style="border-radius: 50px;background-color:#efefef4d;" readonly>
+ </td>
+ </tr>
+ <tr>
+ <th>瀹℃牳浜�</th>
+ <td class="bz_td">
+ <input type="text" name="HChecker" class="layui-input" id="HChecker" style="border-radius: 50px;background-color:#efefef4d;" readonly>
+ </td>
+ </tr>
+ <tr>
+ <th>瀹℃牳鏃ユ湡</th>
+ <td class="bz_td">
+ <input type="text" name="HCheckDate" class="layui-input" id="HCheckDate" style="border-radius: 50px;background-color:#efefef4d;" readonly>
+ </td>
+ </tr>
+ <tr>
+ <th>浣滃簾浜�</th>
+ <td class="bz_td">
+ <input type="text" name="HDeleteMan" class="layui-input" id="HDeleteMan" style="border-radius: 50px;background-color:#efefef4d;" readonly>
+ </td>
+ </tr>
+ <tr>
+ <th>浣滃簾鏃ユ湡</th>
+ <td class="bz_td">
+ <input type="text" name="HDeleteDate" class="layui-input" id="HDeleteDate" style="border-radius: 50px;background-color:#efefef4d;" readonly>
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ </div>
+ <ul class="layui-tab-title">
+ <li class="layui-this">鍗曟嵁淇℃伅</li>
+ <li>鍒跺崟淇℃伅</li>
+ </ul>
+ </div>
+ </div>
+ <!--闅愯棌瀛楁-->
+ <input type="hidden" name="lngICMOEntryID" id="lngICMOEntryID">
+ <input type="hidden" name="lngBillKey" id="lngBillKey" value="0">
+ <input type="hidden" name="lngBillSubKey" id="lngBillSubKey" value="0">
+ <input type="hidden" name="eventType" id="eventType" value="Add">
+ <input type="hidden" name="HMainInterID" id="HMainInterID" value="0">
+ </form>
+ </div>
+ </div>
+ </div>
+</body>
+</html>
+<script>
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index' //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'laydate', 'table', 'element', 'upload'], function () {
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , laydate = layui.laydate
+ , upload = layui.upload
+ , element = layui.element;
+ //#region 鍏叡鍙橀噺
+ var params = get_UrlVars();
+ var option = [];
+ var titleData = [];
+
+ //#endregion
+
+ //#region 杩涘叆椤甸潰鍗冲姞杞�
+ var params = getUrlVars();
+ if (typeof (params[params[0]]) == "undefined") {
+ var OperationType = 1;//鎿嶄綔绫诲瀷
+ var closeType = 2; //鍏抽棴绫诲瀷
+ }
+ else {
+ var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
+ var linterid = params[params[1]];//婧愬崟id
+ var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
+ var HBillNo = params[params[3]]; //鑾峰彇鍗曟嵁鍙�
+ var closeType = params[params[4]]; //鍏抽棴绫诲瀷
+ }
+
+ //鍒ゆ柇鏄惁鏂板
+ if (OperationType == 1) {
+ $("#HInterID").val("");
+ $("#HBillNo").val("");
+ //鑾峰彇鏈�澶у崟鎹彿
+ $.ajax({
+ url: GetWEBURL() + "/Web/GetMAXNum",
+ type: "GET",
+ data: { "HBillType": '7505' },
+ success: function (d) {
+ $("#HInterID").val(d.data[0].HInterID);
+ $("#HBillNo").val(d.data[0].HBillNo);
+ }
+ });
+ $('#Add').addClass("layui-btn-disabled").attr("disabled", true);//鏂板鎸夐挳榛樿绂佺敤
+ //GetDefValByUser();
+ }
+
+ //杩涘叆椤甸潰榛樿鍏夋爣鍦ㄦ潯褰㈢爜涓�
+ $("#HBarCode").focus();
+ //娴佽浆鍗℃槸鍚︽壂鎻忔爣璁�
+ var HProcExchBillNoFlag = false;
+ //鍒濆鍩烘湰淇℃伅璧嬪��
+ $("#HMaker").val(sessionStorage["HUserName"]);
+ $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));
+ $("#HDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
+
+ //#endregion
+
+ //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+ //鏉″舰鐮佸洖杞︽柟娉�
+ $('#HBarCode').on('keydown', function (event) {
+ var HBarCode = $('#HBarCode').val();
+ if (event.keyCode == 13) {
+ if (!HBarCode) {
+ layer.msg("鏉″舰鐮佷笉鑳戒负绌猴紒")
+ return;
+ }
+ txtHBarCode_KeyDown(HBarCode);
+ }
+ });
+
+ //閫夋嫨鐢熶骇璧勬簮寮圭獥
+ form.on('submit(ProductionResources-BT)', function () {//鐢熶骇璧勬簮
+ layer.open({
+ type: 2 //绫诲瀷
+ , skin: 'layui-layer-rim'//鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '鐢熶骇璧勬簮鍒楄〃'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Source.html', 'yes']
+ , btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ //鑾峰彇鏁版嵁
+ $("#HSourceID").val(checkStatus.data[0].HItemID);
+ $("#HSourceName").val(checkStatus.data[0].鐢熶骇璧勬簮鍚嶇О);
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ })
+ });
+
+ //閫夋嫨璁￠噺鍗曚綅
+ form.on('submit(BtnHUnit)', function () {//鐢熶骇璧勬簮
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "璁￠噺鍗曚綅鍒楄〃" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["90%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ["../../../views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html", "yes"]
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鎸夐挳涓� 鐨勫洖璋�
+ var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+ if (checkStatus.data.length != 1) {
+ return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+ }
+
+ $("#HUnitID").val(checkStatus.data[0].HItemID);//鍐呯爜
+ $("#HUnitName").val(checkStatus.data[0].璁￠噺鍗曚綅鍚嶇О);//鍚嶇О
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ })
+ });
+
+ //鎻愪氦
+ form.on('submit(Saver)', function (data) {//鎻愪氦
+ if (!HProcExchBillNoFlag) {
+ layer.msg("璇锋壂鏉＄爜!");
+ return;
+ }
+ Get_Save(data);
+
+ });
+
+ form.on('submit(Add)', function () {//鎻愪氦
+ layer.confirm('鏂板鍚庨〉闈㈡暟鎹皢娑堝け锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
+ location.replace('MES_ColorRecordBill_PDA.html?OperationType=1&linterid=0&HSouceBillType=&HBillNo=&closeType=2');
+ });
+ })
+ //#endregion
+
+ //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
+
+ function txtHBarCode_KeyDown(HBarCode) {
+ //鎵爜绫诲瀷2
+ var barNo2 = HBarCode.substr(0, 4);
+ var index = layer.load();
+ $.ajax({
+ url: GetWEBURL() + "/MES_SampleRecordBill_PDA/SampleRecordBillHBarCode_KeyDown",
+ type: "GET",
+ data: { "HBarCode": HBarCode, "HInterID": $('#HProcExchHinteID').val(), "UserID": sessionStorage["Czybm"], "HBillType": "" },
+ success: function (result) {
+ if (result.count == 1) {
+ var data = result.data[0];
+
+ switch (barNo2) {
+ case "GXLX":
+ form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+ "HProcExchBillNo": data.鍗曟嵁鍙�,
+ "HICMOInterID": data.hicmointerid,
+ "HICMOBillNo": data.浠诲姟鍗曞彿,
+ "HMaterID": data.HMaterID,
+ "HMaterName": data.浜у搧,
+ "HMaterNumber": data.浜у搧浠ｇ爜,
+ "HMaterModel": data.瑙勬牸鍨嬪彿,
+ "HPRDORGID": data.缁勭粐,
+ "HPRDORGName": data.缁勭粐鍚嶇О,
+ });
+ HProcExchBillNoFlag = true;
+
+ var HProcExchHinteID = $('#HProcExchHinteID').val();
+ var HInterID = data.hmainid;
+ break;
+ }
+ layer.close(index);
+ //娓呯┖鏉＄爜妗�
+ $('#HBarCode').val("");
+ }
+ else {
+ layer.close(index);
+ layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ },
+ error: function (err) {
+ layer.close(index);
+ layer.msg("鎺ュ彛璇锋眰澶辫触锛�" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ });
+ }
+
+ //淇濆瓨
+ function Get_Save(data) {
+ var tableData = data.field;
+ var oMain = JSON.stringify(data.field) + ";" + sessionStorage["HUserName"] + ";" + OperationType;
+ var index = layer.load();
+ $.ajax({
+ type: "POST",
+ url: GetWEBURL() + "/MES_SampleRecordBill_PDA/ColorRecordAddBill",
+ async: false,
+ data: { "oMain": oMain },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) {
+ layer.close(index);
+ layer.msg("鎻愪氦鎴愬姛");
+ $('#Add').removeClass("layui-btn-disabled").attr("disabled", false);//鏂板鎸夐挳鍚敤
+ $('#Saver').addClass("layui-btn-disabled").attr("disabled", true);//绂佺敤淇濆瓨鎸夐挳
+ }
+ else {
+ layer.close(index);
+ layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ },
+ error: function (err) {
+ layer.close(index);
+ layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ });
+ }
+
+ //鑾峰彇鍙傛暟
+ function getUrlVars() {
+ var vars = [], hash;
+ var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
+ for (var i = 0; i < hashes.length; i++) {
+ hash = hashes[i].split('=');
+ vars.push(hash[0]);
+ vars[hash[0]] = hash[1];
+ }
+ return vars;
+ }
+ //#endregion
+ //浠ヤ笂涓簂ayui妯″潡
+ });
+</script>
\ No newline at end of file
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254/MES_SampleRecordBill_PDA.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254/MES_SampleRecordBill_PDA.html"
new file mode 100644
index 0000000..7c84683
--- /dev/null
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254/MES_SampleRecordBill_PDA.html"
@@ -0,0 +1,536 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+ <meta charset="utf-8" />
+ <title>璇曟牱璁板綍鍗�</title>
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <!--寮曠敤layui js鏂囦欢-->
+ <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/zgqCustom/zgqCustom.js"></script>
+ <!--鑷畾涔夋牱寮�-->
+ <style>
+ /* .maintitle {
+ background-color: #1492ff;
+ color: #fff;
+ padding: 5px 10px;
+ border: none;
+ border-radius: 4px;
+ }
+
+ .title {
+ border-left: 4px solid #1492ff;
+ padding-left: 6px;
+ margin: 20px 10px 4px;
+ font-size: 16px;
+ color: #333;
+ }
+
+ .buttom_box_little {
+ width: 60px;
+ height: 36px;
+ color: #fff;
+ background-color: #1492ff;
+ border-radius: 4px;
+ border: none;
+ margin: 10px;
+ }
+
+ .layui-input {
+ width: 93%;
+ }
+
+ .layui-inline, img {
+ display: block;
+ vertical-align: middle
+ }
+
+ .layui-input, .layui-textarea {
+ display: inline-block;
+ width: 100%;
+ padding-left: 10px;
+ }
+
+ .laydate-time-list ol {
+ overflow-x: hidden !important;
+ overflow-y: auto !important;
+ }
+
+ .layui-form-label {
+ padding: 9px 5px;
+ width: 85px;
+ }
+
+ .layui-input-block {
+ margin-left: 85px;
+ min-height: 36px;
+ }*/
+
+ .layui-form-label {
+ font-size: 14px;
+ width: 85px;
+ text-align: inherit;
+ }
+ /*鍏ㄥ眬璁剧疆杈撳叆妗嗛珮搴�*/
+ .layui-input {
+ height: 30px;
+ }
+ /*璁剧疆琛ㄥご杈撳叆妗�*/
+ .t1_input {
+ padding: 1%;
+ }
+ /*鏈珯淇℃伅td*/
+ .bz_td {
+ display: -webkit-box; /*璁剧疆鎸夐挳涓嶆崲琛�*/
+ padding: 1%; /*璁剧疆杈撳叆妗嗚竟璺�*/
+ }
+ /*璁剧疆鏈珯淇℃伅鎸夐挳楂樺害*/
+ .bz_btu {
+ height: 30px;
+ width: 60px;
+ line-height: 30px;
+ }
+
+ th {
+ width: 70px;
+ text-align: left;
+ }
+ </style>
+</head>
+<body>
+ <div class="layui-fluid" style="padding: 0;">
+ <div class="layui-card">
+ <div class="layui-card-body" style="padding: 1px;">
+ <form class="layui-form" action="" lay-filter="formData" id="formData" style="background-color:white;">
+ <div style="background-color:#0085E8;">
+ <span style="color: white;" class="gxcz"><i class="layui-icon layui-icon-form"></i>璇曟牱璁板綍鍗�</span>
+ </div>
+ <div class="layui-form-item" style="margin: 1% 2%;text-align: right;">
+ <button type="button" lay-submit="" lay-filter="Saver" class="layui-btn layui-btn-radius" id="Saver">淇濆瓨</button>
+ <button type="button" lay-submit="" lay-filter="Add" class="layui-btn layui-btn-radius" id="Add">鏂板</button>
+ <!--<button type="button" lay-submit="" lay-filter="Detail" class="layui-btn layui-btn-radius" id="Detail">鏄庣粏</button>-->
+
+ <button type="button" lay-submit="" lay-filter="Cancel" class="layui-btn layui-btn-radius layui-btn-danger">閫�鍑�</button>
+ </div>
+ <div class="layui-form-item">
+ <div class="layui-tab layui-tab-card" lay-filter="TabTest">
+ <div class="layui-tab-content">
+ <div class="layui-tab-item layui-show">
+ <table style="width:80%;">
+ <tbody>
+ <tr>
+ <th>鏉″舰鐮�</th>
+ <td class="bz_td">
+ <input type="text" name="HBarCode" class="layui-input" id="HBarCode" placeholder="璇疯緭鍏ユ潯褰㈢爜鍚庡洖杞�" style="border-radius: 50px;">
+ <button type="button" lay-submit="" class="layui-btn layui-col-xs2 bz_btu layui-btn-radius" lay-filter="QueDin" style="line-height: 30px;">纭畾</button>
+ </td>
+ </tr>
+ <tr>
+ <th>鏁伴噺</th>
+ <td class="bz_td">
+ <input type="text" name="HQty" class="layui-input" id="HQty" value="0" placeholder="璇疯緭鍏ユ暟閲�" style="border-radius: 50px;" >
+ </td>
+ </tr>
+ <tr>
+ <th>鐢熶骇璧勬簮</th>
+ <td class="bz_td">
+ <input type="text" name="HSourceName" class="layui-input" id="HSourceName" placeholder="閫夋嫨鐢熶骇璧勬簮" style="border-radius: 50px; background-color: #efefef4d;">
+ <input type="hidden" name="HSourceID" id="HSourceID" value="0" autocomplete="off" class="layui-input">
+ <button type="button" lay-submit="" class="layui-btn layui-col-xs2 bz_btu" lay-filter="ProductionResources-BT" id="ProductionResources-BT" style="font-weight:bolder;">...</button>
+ </td>
+ </tr>
+ <tr>
+ <th>璇曟牱缁撹</th>
+ <td class="bz_td">
+ <input type="radio" name="HLastResult" value="1" title="OK" checked="">
+ <input type="radio" name="HLastResult" value="0" title="NG">
+ </td>
+ </tr>
+ <tr>
+ <th>鍗曟嵁鏃ユ湡</th>
+ <td class="t1_input">
+ <input type="text" name="HDate" class="layui-input" id="HDate" style="border-radius: 50px;" placeholder="璇烽�夋嫨鏃ユ湡" readonly>
+ </td>
+ </tr>
+ <tr>
+ <th>鍗曟嵁鍙�</th>
+ <td class="bz_td">
+ <input type="text" name="HBillNo" class="layui-input" id="HBillNo" placeholder="鍗曟嵁鍙�" style="border-radius: 50px;background-color:#efefef4d;" readonly>
+ <input type="hidden" name="HInterID" id="HInterID" value="0" autocomplete="off" class="layui-input">
+ </td>
+ </tr>
+ <tr>
+ <th>鐢熶骇缁勭粐</th>
+ <td class="bz_td">
+ <input type="text" name="HPRDORGName" class="layui-input" id="HPRDORGName" placeholder="鐢熶骇缁勭粐" style="border-radius: 50px;background-color:#efefef4d;" readonly>
+ <input type="hidden" name="HPRDORGID" id="HPRDORGID" value="0" autocomplete="off" class="layui-input">
+ </td>
+ </tr>
+ <tr>
+ <th>鐢熶骇璁㈠崟鍙�</th>
+ <td class="bz_td">
+ <input type="text" name="HICMOBillNo" class="layui-input" id="HICMOBillNo" placeholder="鐢熶骇璁㈠崟鍙�" style="border-radius: 50px;background-color:#efefef4d;" readonly>
+ <input type="hidden" name="HICMOInterID" id="HICMOInterID" value="0" autocomplete="off" class="layui-input">
+ </tr>
+ <tr>
+ <th>鎸囧紩鍗�</th>
+ <td class="bz_td">
+ <input type="text" name="HProcExchBillNo" class="layui-input" id="HProcExchBillNo" placeholder="鎸囧紩鍗�" style="border-radius: 50px;background-color:#efefef4d;" readonly>
+ <input type="hidden" name="HProcExchHinteID" class="layui-input" id="HProcExchHinteID" >
+ </td>
+ </tr>
+ <tr>
+ <th>鐗╂枡浠ｇ爜</th>
+ <td class="bz_td">
+ <input type="text" name="HMaterNumber" class="layui-input" id="HMaterNumber" placeholder="浜у搧浠ｇ爜" style="border-radius: 50px;background-color:#efefef4d;" readonly>
+ <input type="hidden" name="HMaterID" class="layui-input" id="HMaterID" >
+ </td>
+ </tr>
+ <tr>
+ <th>鐗╂枡鍚嶇О</th>
+ <td class="bz_td">
+ <input type="text" name="HMaterName" class="layui-input" id="HMaterName" value="" placeholder="鐗╂枡鍚嶇О" style="border-radius: 50px;background-color:#efefef4d;" readonly >
+ </td>
+ </tr>
+ <tr>
+ <th>瑙勬牸鍨嬪彿</th>
+ <td class="bz_td">
+ <input type="text" name="HMaterModel" class="layui-input" id="HMaterModel" placeholder="瑙勬牸鍨嬪彿" style="border-radius: 50px;background-color:#efefef4d;" readonly >
+ </td>
+ </tr>
+ <tr>
+ <th>璁￠噺鍗曚綅</th>
+ <td class="bz_td">
+ <input type="text" name="HUnitName" class="layui-input" id="HUnitName" placeholder="閫夋嫨璁￠噺鍗曚綅" style="border-radius: 50px; background-color: #efefef4d;">
+ <input type="hidden" name="HUnitID" id="HUnitID" value="0" autocomplete="off" class="layui-input">
+ <button type="button" lay-submit="" class="layui-btn layui-col-xs2 bz_btu" lay-filter="BtnHUnit" id="BtnHUnit" style="font-weight:bolder">...</button>
+ </td>
+ </tr>
+ <tr>
+ <th>宸ュ簭</th>
+ <td class="bz_td">
+ <input type="text" name="HProcName" class="layui-input" id="HProcName" placeholder="閫夋嫨宸ュ簭" style="background-color:#efefef4d;border-radius: 50px;">
+ <input type="hidden" name="HProcID" id="HProcID" value="0" autocomplete="off" class="layui-input">
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ <div class="layui-tab-item">
+ <table style="width:80%;">
+ <tbody>
+ <tr>
+ <th>鍒跺崟浜�</th>
+ <td class="bz_td">
+ <input type="text" name="HMaker" class="layui-input" id="HMaker" style="border-radius: 50px;background-color:#efefef4d;" readonly>
+ </td>
+ </tr>
+ <tr>
+ <th>鍒跺崟鏃ユ湡</th>
+ <td class="bz_td">
+ <input type="text" name="HMakeDate" class="layui-input" id="HMakeDate" style="border-radius: 50px;background-color:#efefef4d;" readonly>
+ </td>
+ </tr>
+ <tr>
+ <th>淇敼浜�</th>
+ <td class="bz_td">
+ <input type="text" name="HUpDater" class="layui-input" id="HUpDater" style="border-radius: 50px;background-color:#efefef4d;" readonly>
+ </td>
+ </tr>
+ <tr>
+ <th>淇敼鏃ユ湡</th>
+ <td class="bz_td">
+ <input type="text" name="HUpDateDate" class="layui-input" id="HUpDateDate" style="border-radius: 50px;background-color:#efefef4d;" readonly>
+ </td>
+ </tr>
+ <tr>
+ <th>瀹℃牳浜�</th>
+ <td class="bz_td">
+ <input type="text" name="HChecker" class="layui-input" id="HChecker" style="border-radius: 50px;background-color:#efefef4d;" readonly>
+ </td>
+ </tr>
+ <tr>
+ <th>瀹℃牳鏃ユ湡</th>
+ <td class="bz_td">
+ <input type="text" name="HCheckDate" class="layui-input" id="HCheckDate" style="border-radius: 50px;background-color:#efefef4d;" readonly>
+ </td>
+ </tr>
+ <tr>
+ <th>浣滃簾浜�</th>
+ <td class="bz_td">
+ <input type="text" name="HDeleteMan" class="layui-input" id="HDeleteMan" style="border-radius: 50px;background-color:#efefef4d;" readonly>
+ </td>
+ </tr>
+ <tr>
+ <th>浣滃簾鏃ユ湡</th>
+ <td class="bz_td">
+ <input type="text" name="HDeleteDate" class="layui-input" id="HDeleteDate" style="border-radius: 50px;background-color:#efefef4d;" readonly>
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ </div>
+ <ul class="layui-tab-title">
+ <li class="layui-this">鍗曟嵁淇℃伅</li>
+ <li>鍒跺崟淇℃伅</li>
+ </ul>
+ </div>
+ </div>
+ <!--闅愯棌瀛楁-->
+ <input type="hidden" name="lngICMOEntryID" id="lngICMOEntryID">
+ <input type="hidden" name="lngBillKey" id="lngBillKey" value="0">
+ <input type="hidden" name="lngBillSubKey" id="lngBillSubKey" value="0">
+ <input type="hidden" name="eventType" id="eventType" value="Add">
+ <input type="hidden" name="HMainInterID" id="HMainInterID" value="0">
+ </form>
+ </div>
+ </div>
+ </div>
+</body>
+</html>
+<script>
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index' //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'laydate', 'table', 'element', 'upload'], function () {
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , laydate = layui.laydate
+ , upload = layui.upload
+ , element = layui.element;
+ //#region 鍏叡鍙橀噺
+ var params = get_UrlVars();
+ var option = [];
+ var titleData = [];
+
+ //#endregion
+
+ //#region 杩涘叆椤甸潰鍗冲姞杞�
+ var params = getUrlVars();
+ if (typeof (params[params[0]]) == "undefined") {
+ var OperationType = 1;//鎿嶄綔绫诲瀷
+ var closeType = 2; //鍏抽棴绫诲瀷
+ }
+ else {
+ var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
+ var linterid = params[params[1]];//婧愬崟id
+ var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
+ var HBillNo = params[params[3]]; //鑾峰彇鍗曟嵁鍙�
+ var closeType = params[params[4]]; //鍏抽棴绫诲瀷
+ }
+
+ //鍒ゆ柇鏄惁鏂板
+ if (OperationType == 1) {
+ $("#HInterID").val("");
+ $("#HBillNo").val("");
+ //鑾峰彇鏈�澶у崟鎹彿
+ $.ajax({
+ url: GetWEBURL() + "/Web/GetMAXNum",
+ type: "GET",
+ data: { "HBillType": '7510' },
+ success: function (d) {
+ $("#HInterID").val(d.data[0].HInterID);
+ $("#HBillNo").val(d.data[0].HBillNo);
+ }
+ });
+ $('#Add').addClass("layui-btn-disabled").attr("disabled", true);//鏂板鎸夐挳榛樿绂佺敤
+ //GetDefValByUser();
+ }
+
+ //杩涘叆椤甸潰榛樿鍏夋爣鍦ㄦ潯褰㈢爜涓�
+ $("#HBarCode").focus();
+ //娴佽浆鍗℃槸鍚︽壂鎻忔爣璁�
+ var HProcExchBillNoFlag = false;
+ //鍒濆鍩烘湰淇℃伅璧嬪��
+ $("#HMaker").val(sessionStorage["HUserName"]);
+ $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));
+ $("#HDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
+
+ //#endregion
+
+ //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+ //鏉″舰鐮佸洖杞︽柟娉�
+ $('#HBarCode').on('keydown', function (event) {
+ var HBarCode = $('#HBarCode').val();
+ if (event.keyCode == 13) {
+ if (!HBarCode) {
+ layer.msg("鏉″舰鐮佷笉鑳戒负绌猴紒")
+ return;
+ }
+ txtHBarCode_KeyDown(HBarCode);
+ }
+ });
+
+ //閫夋嫨鐢熶骇璧勬簮寮圭獥
+ form.on('submit(ProductionResources-BT)', function () {//鐢熶骇璧勬簮
+ layer.open({
+ type: 2 //绫诲瀷
+ , skin: 'layui-layer-rim'//鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '鐢熶骇璧勬簮鍒楄〃'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Source.html', 'yes']
+ , btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ //鑾峰彇鏁版嵁
+ $("#HSourceID").val(checkStatus.data[0].HItemID);
+ $("#HSourceName").val(checkStatus.data[0].鐢熶骇璧勬簮鍚嶇О);
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ })
+ });
+
+ //閫夋嫨璁￠噺鍗曚綅
+ form.on('submit(BtnHUnit)', function () {//鐢熶骇璧勬簮
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "璁￠噺鍗曚綅鍒楄〃" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["90%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ["../../../views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html", "yes"]
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鎸夐挳涓� 鐨勫洖璋�
+ var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+ if (checkStatus.data.length != 1) {
+ return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+ }
+
+ $("#HUnitID").val(checkStatus.data[0].HItemID);//鍐呯爜
+ $("#HUnitName").val(checkStatus.data[0].璁￠噺鍗曚綅鍚嶇О);//鍚嶇О
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ })
+ });
+
+ //鎻愪氦
+ form.on('submit(Saver)', function (data) {//鎻愪氦
+ if (!HProcExchBillNoFlag) {
+ layer.msg("璇锋壂鏉＄爜!");
+ return;
+ }
+ Get_Save(data);
+
+ });
+
+ form.on('submit(Add)', function () {//鎻愪氦
+ layer.confirm('鏂板鍚庨〉闈㈡暟鎹皢娑堝け锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
+ location.replace('MES_SampleRecordBill_PDA.html?OperationType=1&linterid=0&HSouceBillType=&HBillNo=&closeType=2');
+ });
+ })
+ //#endregion
+
+ //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
+
+ function txtHBarCode_KeyDown(HBarCode) {
+ //鎵爜绫诲瀷2
+ var barNo2 = HBarCode.substr(0, 4);
+ var index = layer.load();
+ $.ajax({
+ url: GetWEBURL() + "/MES_SampleRecordBill_PDA/SampleRecordBillHBarCode_KeyDown",
+ type: "GET",
+ data: { "HBarCode": HBarCode, "HInterID": $('#HProcExchHinteID').val(), "UserID": sessionStorage["Czybm"], "HBillType": "" },
+ success: function (result) {
+ if (result.count == 1) {
+ var data = result.data[0];
+
+ switch (barNo2) {
+ case "GXLX":
+ form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+ "HProcExchBillNo": data.鍗曟嵁鍙�,
+ "HICMOInterID": data.hicmointerid,
+ "HICMOBillNo": data.浠诲姟鍗曞彿,
+ "HMaterID": data.HMaterID,
+ "HMaterName": data.浜у搧,
+ "HMaterNumber": data.浜у搧浠ｇ爜,
+ "HMaterModel": data.瑙勬牸鍨嬪彿,
+ "HPRDORGID": data.缁勭粐,
+ "HPRDORGName": data.缁勭粐鍚嶇О,
+ });
+ HProcExchBillNoFlag = true;
+
+ var HProcExchHinteID = $('#HProcExchHinteID').val();
+ var HInterID = data.hmainid;
+ break;
+ }
+ layer.close(index);
+ //娓呯┖鏉＄爜妗�
+ $('#HBarCode').val("");
+ }
+ else {
+ layer.close(index);
+ layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ },
+ error: function (err) {
+ layer.close(index);
+ layer.msg("鎺ュ彛璇锋眰澶辫触锛�" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ });
+ }
+
+ //淇濆瓨
+ function Get_Save(data) {
+ var tableData = data.field;
+ var oMain = JSON.stringify(data.field) + ";" + sessionStorage["HUserName"] + ";" + OperationType;
+ var index = layer.load();
+ $.ajax({
+ type: "POST",
+ url: GetWEBURL() + "/MES_SampleRecordBill_PDA/SampleRecordAddBill",
+ async: false,
+ data: { "oMain": oMain },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) {
+ layer.close(index);
+ layer.msg("鎻愪氦鎴愬姛");
+ $('#Add').removeClass("layui-btn-disabled").attr("disabled", false);//鏂板鎸夐挳鍚敤
+ $('#Saver').addClass("layui-btn-disabled").attr("disabled", true);//绂佺敤淇濆瓨鎸夐挳
+ }
+ else {
+ layer.close(index);
+ layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ },
+ error: function (err) {
+ layer.close(index);
+ layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ });
+ }
+
+ //鑾峰彇鍙傛暟
+ function getUrlVars() {
+ var vars = [], hash;
+ var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
+ for (var i = 0; i < hashes.length; i++) {
+ hash = hashes[i].split('=');
+ vars.push(hash[0]);
+ vars[hash[0]] = hash[1];
+ }
+ return vars;
+ }
+ //#endregion
+ //浠ヤ笂涓簂ayui妯″潡
+ });
+</script>
\ No newline at end of file
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254/MES_StationInBill_PDA.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254/MES_StationInBill_PDA.html"
index 397485d..4204dcc 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254/MES_StationInBill_PDA.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254/MES_StationInBill_PDA.html"
@@ -1449,7 +1449,9 @@
, end: function () {
var sProcNo = $('#HProcNo').val();
var sBillNo = $('#HBarCode').val();
- txtHProcNo_KeyDown(sBillNo, sProcNo);
+ if (sProcNo != "") {
+ txtHProcNo_KeyDown(sBillNo, sProcNo);
+ }
}
})
} else {
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254/MES_StationInBill_PDA_QiaoYi.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254/MES_StationInBill_PDA_QiaoYi.html"
index bfb74f8..00e65b6 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254/MES_StationInBill_PDA_QiaoYi.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254/MES_StationInBill_PDA_QiaoYi.html"
@@ -1467,7 +1467,9 @@
, end: function () {
var sProcNo = $('#HProcNo').val();
var sBillNo = $('#HProcExchBillNo').val();
- txtHProcNo_KeyDown(sBillNo, sProcNo);
+ if (sProcNo != "") {
+ txtHProcNo_KeyDown(sBillNo, sProcNo);
+ }
}
})
} else {
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254/MES_StationOutBill_PDA.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254/MES_StationOutBill_PDA.html"
index afa04f5..e21ffd6 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254/MES_StationOutBill_PDA.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254/MES_StationOutBill_PDA.html"
@@ -1516,7 +1516,9 @@
, end: function () {
var sProcNo = $('#HProcNo').val();
var sBillNo = $('#HBarCode').val();
- txtHProcNo_KeyDown(sBillNo, sProcNo);
+ if (sProcNo != "") {
+ txtHProcNo_KeyDown(sBillNo, sProcNo);
+ }
}
//, btn: ['纭畾', '鍙栨秷']
//, btn1: function (index, layero) {
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254/MES_StationOutBill_PDA_QiaoYi.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254/MES_StationOutBill_PDA_QiaoYi.html"
index c4f0799..3e27413 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254/MES_StationOutBill_PDA_QiaoYi.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254/MES_StationOutBill_PDA_QiaoYi.html"
@@ -1535,7 +1535,9 @@
, end: function () {
var sProcNo = $('#HProcNo').val();
var sBillNo = $('#HProcExchBillNo').val();
- txtHProcNo_KeyDown(sBillNo, sProcNo);
+ if (sProcNo != "") {
+ txtHProcNo_KeyDown(sBillNo, sProcNo);
+ }
}
//, btn: ['纭畾', '鍙栨秷']
//, btn1: function (index, layero) {
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/MES_ColorRecordBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/MES_ColorRecordBillList.html"
new file mode 100644
index 0000000..a9546f3
--- /dev/null
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/MES_ColorRecordBillList.html"
@@ -0,0 +1,568 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <title>瀵硅壊璁板綍鍗曞垪琛�</title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <style type="text/css">
+ input.layui-input.layui-unselect {
+ padding-right: 0;
+ }
+ </style>
+</head>
+<body>
+ <div class="layui-fluid">
+ <div class="layui-col-md12">
+ <div class="layui-card" style="padding: 1px">
+ <div class="layui-card-body" style="padding: 1px;">
+ <form class="layui-form" action="" lay-filter="component-form-group">
+ <div class="layui-collapse">
+ <div class="layui-colla-item">
+ <div class="layui-colla-title layui-inline">
+ <div class="layui-inline">
+ <span>鏇村</span>
+ </div>
+ </div>
+ <div class="layui-form layui-inline" style="position:relative;top:10px;">
+ <label class="layui-form-label">鏃ユ湡</label>
+ <div class="layui-form-item layui-inline">
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input type="date" class="layui-input" id="HBeginDate" style="width:190px;" placeholder="yyyy-MM-dd">
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item layui-inline">
+ <div class="layui-inline">
+ <label class="layui-form-label">-</label>
+ <div class="layui-input-inline">
+ <input type="date" class="layui-input" id="HEndDate" style="width:190px;" placeholder="yyyy-MM-dd">
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鎸囧紩鍗″彿</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HBillNo" id="HBillNo">
+ </div>
+ </div>
+ <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>
+ <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
+ <div class="layui-row" style="margin-top:10px;">
+ <!--鍏朵粬鏉′欢-->
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">浜у搧浠ｇ爜</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="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;">
+ <input type="text" class="layui-input" name="HProductName" id="HProductName">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">瑙勬牸鍨嬪彿</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HProductModel" id="HProductModel">
+ </div>
+ </div>
+ </div>
+ <div class="layui-row" style="margin:10px 0px">
+ <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;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator" id="Comparator" lay-filter="Comparator" 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="7">鍖呭惈</option>
+ <option value="8">宸﹀寘鍚�</option>
+ <option value="9">鍙冲寘鍚�</option>
+ <option value="10">涓嶅寘鍚�</option>
+ </select>
+ </div>
+ <div class="layui-inline">
+ <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <table class="" id="mainTable" lay-filter="mainTable"></table>
+ <script type="text/html" id="toolbarDemo">
+ <div class="layui-btn-container">
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btnCheck"><i class="layui-icon layui-icon-form"></i>瀹℃牳</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btnAdutCheck"><i class="layui-icon layui-icon-form"></i>鍙嶅鏍�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btnDel"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="HideColumn"><i class="layui-icon layui-icon-form"></i>闅愯棌鍒楄缃�</button>
+ </div>
+ </script>
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <script>
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index', //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
+
+ //#region 鍏叡鍙橀噺
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , element = layui.element
+ , laypage = layui.laypage
+ , laydate = layui.laydate
+ , util = layui.util
+ //鏌ヨ鏉′欢
+ var sWhere = "";
+ var option = [];
+ var HModName = "MES_SampleRecordBillList";
+
+ //#endregion
+
+ //#region 杩涘叆椤甸潰鏃㈠姞杞�
+
+ //#region 鍒濆鍖栫晫闈�
+
+ set_ClearBill();
+
+ //#endregion
+
+ //#region 鐐瑰嚮浜嬩欢鍖呮嫭on form浜嬩欢绛�
+ //澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(mainTable)', function (obj) {
+ switch (obj.event) {
+ //瀹℃牳
+ case 'btnCheck': btnCheck(1);
+ break;
+ //鍙嶅鏍�
+ case 'btnAdutCheck': btnCheck(2);
+ break;
+ //鍒犻櫎
+ case 'btnDel': btnDel();
+ break;
+ //閫�鍑�
+ case 'btn-exit': Pub_Close(2);
+ break;
+ //闅愯棌鍒楄缃�
+ case 'HideColumn':
+ get_HideColumn();
+ break;
+ };
+ });
+ //閲嶇疆鎸夐挳
+ form.on('submit(btnReSearch)', function (data) {
+ set_ClearQuery();
+ });
+ //鏌ヨ鎸夐挳
+ form.on('submit(btnSearch)', function (data) {
+ get_FastQuery();
+ });
+
+ //琛岀洃鍚簨浠�-鍗曞嚮
+ table.on('row(mainTable)', function (obj) {
+ var flag = !obj.tr.find(':checkbox:first').prop('checked');
+ obj.tr.find(':checkbox').prop('checked', flag);
+ if (flag) {
+ obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked'); //璁剧疆澶嶉�夋閫変腑鏍峰紡
+ $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+ } else {
+ obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//鍙栨秷澶嶉�夋閫変腑鏍峰紡
+ $(obj.tr.selector).attr({ "style": "background:" });//鍙栨秷褰撳墠tr棰滆壊
+ }
+ //mainTable 涓鸿〃鏍糏D 娉ㄦ剰姝ゅ濡傛灉ID涓嶆纭皢瀵艰嚧浣犲湪鐩戝惉澶嶉�夋鏃惰幏鍙栦笉鍒颁綘閫夋嫨鐨勬暟鎹紝鍓嶉潰鐨勫彧鏄坊鍔犳垨鍒犻櫎閫変腑鏈�変腑鏍峰紡浠ュ強璁剧疆鑳屾櫙鑹诧紝瀛椾綋棰滆壊
+ layui.each(table.cache.mainTable, function (i, l) {
+ if (obj.tr.index() == l.LAY_TABLE_INDEX) {
+ l.LAY_CHECKED = flag;
+ }
+ });
+ });
+ //#endregion
+
+ //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
+
+ //鍒濆鍖栫晫闈�
+ function set_ClearBill() {
+ //鍒濆鍖栨椂闂�
+ $("#HBeginDate").val(Format(new Date() - 1000 * 60 * 60 * 24 * 30, "yyyy-MM-dd"));
+ $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+
+ //鍔犺浇鏁版嵁鍒扮綉鏍�
+ get_FastQuery();
+ DisPlay_HideColumn();
+ }
+
+ //鍒楁槑鏄剧ず涓嬫媺妗�
+ function ColFilter() {
+ var Organization = '<option value="0" selected="selected" ></option>';
+ for (var i = 1; i < option.cols[0].length; i++) {
+ if (option.cols[0][i].hide != true) {
+ Organization += '<option style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>';
+ }
+ }
+ $("#ColName").empty();
+ $("#ColName").append(Organization);
+ form.render('select');
+ }
+
+
+ //鍔犺浇缃戞牸
+ function get_Display(sWhere) {
+ //鍔ㄦ�佸垪-缂撳瓨鍒楄〃
+ $.ajax({
+ url: GetWEBURL() + "/ColorRecord/ColorRecordList",
+ type: "GET",
+ async: false,
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+
+ if (data1.count == 1) {
+
+ var data = [];
+ var col = [];
+ //缁欑┖鐨勬暟缁勮祴鍊�
+ for (var key in data1.list) {
+ data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+ }
+
+ //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+ col.push({ type: 'checkbox', fixed: 'left' });
+ for (var i = 0; i < data.length; i++) {
+ if ($.inArray(data[i].name, "") > -1) {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+ }
+ else {
+ switch (data[i].Type) {
+ //int
+ case 'DateTime':
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true });
+ break;
+ default:
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true });
+ }
+ }
+ }
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , cellMinWidth: 120
+ , page: true
+ , limit: 50
+ , limits: [50, 500, 5000, 20000]
+ , height: 'full-70'
+ , totalRow: false //寮�鍚悎璁�
+ , cols: [col]
+ , data: data1.data
+ };
+ table.render(option);
+ }
+ },
+ error: function (err) {
+ layer.msg('閿欒' + err, {
+ icon: 5,
+ time: 20000
+ }, function () {
+ //do something
+ });
+ }
+ })
+ }
+
+ //蹇�熻繃婊�
+ function get_FastQuery() {
+ var HBeginDate = $("#HBeginDate").val();//涓嬭揪鏃ユ湡 寮�濮嬫棩鏈�
+ var HEndDate = $("#HEndDate").val();//缁撴潫鏃ユ湡
+ var HMaterNumber = $("#HMaterNumber").val();//鐗╂枡浠ｇ爜
+ var HBillNo = $("#HBillNo").val(); //鍗曟嵁鍙�
+ var HProductName = $("#HProductName").val();//浜у搧鍚嶇О
+ var HProductModel = $("#HProductModel").val();//浜у搧瑙勬牸
+
+ if (HBeginDate != "" && HEndDate != "") {
+ sWhere += " and 鏃ユ湡 between '" + HBeginDate + "' and '" + HEndDate + "' ";
+ }
+
+ if (HMaterNumber != "") {
+ sWhere += " and 鐗╂枡浠ｇ爜='" + HMaterNumber + "' ";
+ }
+
+ if (HBillNo != "") {
+ sWhere += " and 鎸囧紩鍗″彿='" + HBillNo + "' ";
+ }
+
+ if (HProductName != "") {
+ sWhere += " and 鐗╂枡鍚嶇О='" + HProductName + "' ";
+ }
+
+ if (HProductModel != "") {
+ sWhere += " and 瑙勬牸鍨嬪彿='" + HProductModel + "' ";
+ }
+
+ //浠绘剰瀛楁鏉′欢杩囨护 鏉′欢鎻愬彇
+ var ColName = $("#ColName").val();//澶嶉�夋
+ var Comparator = $("#Comparator").val()
+ var ColContent = $("#ColContent").val();
+
+ //鎷兼帴浠讳竴瀛楁杩囨护鏌ヨ鏉′欢
+ var com = "";
+ if (ColName != 0 && Comparator != 0) {
+ switch (Comparator) {
+ case "7":
+ com = "like '%" + ColContent + "%'";
+ break;
+ case "8":
+ com = "like '%" + ColContent + "'";
+ break;
+ case "9":
+ com = "like '" + ColContent + "%'";
+ break;
+ case "10":
+ com = "not like '%" + ColContent + "%'";
+ break;
+ default:
+ com = "" + Comparator + " '" + ColContent + "'";
+ break;
+ }
+ com = " and (" + ColName + " " + com + ")";
+ }
+ sWhere += com;
+
+ get_Display(sWhere);
+ //璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ sWhere = "";
+ }
+
+ //閲嶇疆杩囨护鏉′欢
+ function set_ClearQuery() {
+ //鍒濆鍖栨椂闂�
+ $("#HBeginDate").val(Format(new Date() - 1000 * 60 * 60 * 24 * 30, "yyyy-MM-dd"));
+ $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HMaterNumber").val("");
+ $("#HBillNo").val("");
+ $("#HProductName").val("");
+ $("#HProductModel").val("");
+ $("#ColContent").val("");
+ $("#ColName").val("0");
+ $("#Comparator").val("0");
+ ColFilter();
+ sWhere = "";
+ }
+
+ //瀹℃牳 [1 瀹℃牳銆�2 鍙嶅鏍竇
+ function btnCheck(num) {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+
+ if (data.length == 1) {
+ layer.confirm("纭瑕佸鏍稿悧?", function (index) {
+ var wait = layer.load();
+ var HInterID = data[0].hmainid;
+ $.ajax({
+ url: GetWEBURL() + '/ColorRecord/CheckColorRecordBill',
+ type: "GET",
+ data: { "HInterID": HInterID, "Type": num, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ get_FastQuery();
+ layer.msg(result.Message, { icon: 1 });
+ layer.close(wait);
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ layer.close(wait);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ layer.close(wait);
+ }
+ });
+ })
+ } else {
+ layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�!");
+ }
+ }
+
+ //鍒犻櫎
+ function btnDel() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var hmainid = data[0].hmainid;
+ layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+ var wait = layer.load();
+ //閫昏緫鍒犻櫎鏂规硶
+ $.ajax({
+ url: GetWEBURL() + '/ColorRecord/DelColorRecordBill',
+ type: "GET",
+ data: { "lngBillKey": hmainid, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ console.log('gouba' + result);
+ if (result.count == 1) {
+ layer.msg(result.Message, { icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(wait);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ get_FastQuery();
+ });
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ layer.close(wait);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ layer.close(wait);
+ }
+ });
+ })
+
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+ }
+
+ }
+
+ //闅愯棌鍒楄缃�
+ function get_HideColumn() {
+ var colName = "";
+ for (var i = 1; i < option.cols[0].length; i++) {
+ colName += option.cols[0][i]["title"] + ",";
+ }
+
+ colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "闅愯棌鍒楄缃�" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["50%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ['../../鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName, "yes"]
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ })
+ }
+
+ //鏄剧ず鍒楁暟鎹�
+ function DisPlay_HideColumn() {
+ ColFilter();
+ $.ajax({
+ url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+ type: "GET",
+ data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.data.length != 0) {
+
+ var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+ var titleData = [];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+
+ dataCol = data1.data[0].HGridString.split(',');
+
+ for (var i = 0; i < option.cols[0].length - 1; i++) {
+ if (dataCol[i]) {
+ var dataCols = dataCol[i].split('|');
+ }
+ //闅愯棌鍒�
+ if (dataCols[1] == 1) {
+ option.cols[0][i + 1]["hide"] = true;
+ }
+ //璁剧疆鍐呭瀛椾綋澶у皬
+ if (data1.data[0].HFontSize != 0) {
+ option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+ } else {
+ option.cols[0][i + 1]["style"] = "font-size:100%";
+ }
+ //璁剧疆鍒楀
+ if (dataCols[3] > 0) {
+ option.cols[0][i + 1]["width"] = dataCols[3];
+ }
+ //鏄剧ず鍒�
+ if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
+ option.cols[0][i + 1]["hide"] = false;
+ }
+ //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+ switch (dataCols[2]) {
+ case "L":
+ option.cols[0][i + 1]["align"] = "left";
+ break;
+ case "M":
+ option.cols[0][i + 1]["align"] = "center";
+ break;
+ case "R":
+ option.cols[0][i + 1]["align"] = "right";
+ break;
+ }
+ }
+
+ //鍙栨秷鍐荤粨鍒�
+ for (var i = 1; i < option.cols[0].length - 1; i++) {
+ if (option.cols[0][i]["fixed"] != null) {
+ option.cols[0][i]["fixed"] = null;
+ }
+ else {
+ break;
+ }
+ }
+ //鍐荤粨鍒�
+ if (data1.data[0].HFixCols != 0) {
+ for (var i = 0; i < data1.data[0].HFixCols; i++) {
+ if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
+ data1.data[0].HFixCols += 1;
+ }
+ option.cols[0][i + 1]["fixed"] = "left";
+ }
+ }
+ table.render(option);
+ } else {
+ table.render(option);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ })
+ }
+
+ //#endregion
+ });
+ </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\267\245\345\272\217\346\265\201\350\275\254\345\215\241/MES_SampleRecordBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/MES_SampleRecordBillList.html"
new file mode 100644
index 0000000..d550f14
--- /dev/null
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/MES_SampleRecordBillList.html"
@@ -0,0 +1,568 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <title>璇曟牱璁板綍鍗曞垪琛�</title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <style type="text/css">
+ input.layui-input.layui-unselect {
+ padding-right: 0;
+ }
+ </style>
+</head>
+<body>
+ <div class="layui-fluid">
+ <div class="layui-col-md12">
+ <div class="layui-card" style="padding: 1px">
+ <div class="layui-card-body" style="padding: 1px;">
+ <form class="layui-form" action="" lay-filter="component-form-group">
+ <div class="layui-collapse">
+ <div class="layui-colla-item">
+ <div class="layui-colla-title layui-inline">
+ <div class="layui-inline">
+ <span>鏇村</span>
+ </div>
+ </div>
+ <div class="layui-form layui-inline" style="position:relative;top:10px;">
+ <label class="layui-form-label">鏃ユ湡</label>
+ <div class="layui-form-item layui-inline">
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input type="date" class="layui-input" id="HBeginDate" style="width:190px;" placeholder="yyyy-MM-dd">
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item layui-inline">
+ <div class="layui-inline">
+ <label class="layui-form-label">-</label>
+ <div class="layui-input-inline">
+ <input type="date" class="layui-input" id="HEndDate" style="width:190px;" placeholder="yyyy-MM-dd">
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鎸囧紩鍗″彿</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HBillNo" id="HBillNo">
+ </div>
+ </div>
+ <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>
+ <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
+ <div class="layui-row" style="margin-top:10px;">
+ <!--鍏朵粬鏉′欢-->
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">浜у搧浠ｇ爜</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="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;">
+ <input type="text" class="layui-input" name="HProductName" id="HProductName">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">瑙勬牸鍨嬪彿</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HProductModel" id="HProductModel">
+ </div>
+ </div>
+ </div>
+ <div class="layui-row" style="margin:10px 0px">
+ <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;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator" id="Comparator" lay-filter="Comparator" 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="7">鍖呭惈</option>
+ <option value="8">宸﹀寘鍚�</option>
+ <option value="9">鍙冲寘鍚�</option>
+ <option value="10">涓嶅寘鍚�</option>
+ </select>
+ </div>
+ <div class="layui-inline">
+ <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <table class="" id="mainTable" lay-filter="mainTable"></table>
+ <script type="text/html" id="toolbarDemo">
+ <div class="layui-btn-container">
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btnCheck"><i class="layui-icon layui-icon-form"></i>瀹℃牳</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btnAdutCheck"><i class="layui-icon layui-icon-form"></i>鍙嶅鏍�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btnDel"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="HideColumn"><i class="layui-icon layui-icon-form"></i>闅愯棌鍒楄缃�</button>
+ </div>
+ </script>
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <script>
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index', //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
+
+ //#region 鍏叡鍙橀噺
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , element = layui.element
+ , laypage = layui.laypage
+ , laydate = layui.laydate
+ , util = layui.util
+ //鏌ヨ鏉′欢
+ var sWhere = "";
+ var option = [];
+ var HModName = "MES_SampleRecordBillList";
+
+ //#endregion
+
+ //#region 杩涘叆椤甸潰鏃㈠姞杞�
+
+ //#region 鍒濆鍖栫晫闈�
+
+ set_ClearBill();
+
+ //#endregion
+
+ //#region 鐐瑰嚮浜嬩欢鍖呮嫭on form浜嬩欢绛�
+ //澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(mainTable)', function (obj) {
+ switch (obj.event) {
+ //瀹℃牳
+ case 'btnCheck': btnCheck(1);
+ break;
+ //鍙嶅鏍�
+ case 'btnAdutCheck': btnCheck(2);
+ break;
+ //鍒犻櫎
+ case 'btnDel': btnDel();
+ break;
+ //閫�鍑�
+ case 'btn-exit': Pub_Close(2);
+ break;
+ //闅愯棌鍒楄缃�
+ case 'HideColumn':
+ get_HideColumn();
+ break;
+ };
+ });
+ //閲嶇疆鎸夐挳
+ form.on('submit(btnReSearch)', function (data) {
+ set_ClearQuery();
+ });
+ //鏌ヨ鎸夐挳
+ form.on('submit(btnSearch)', function (data) {
+ get_FastQuery();
+ });
+
+ //琛岀洃鍚簨浠�-鍗曞嚮
+ table.on('row(mainTable)', function (obj) {
+ var flag = !obj.tr.find(':checkbox:first').prop('checked');
+ obj.tr.find(':checkbox').prop('checked', flag);
+ if (flag) {
+ obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked'); //璁剧疆澶嶉�夋閫変腑鏍峰紡
+ $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+ } else {
+ obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//鍙栨秷澶嶉�夋閫変腑鏍峰紡
+ $(obj.tr.selector).attr({ "style": "background:" });//鍙栨秷褰撳墠tr棰滆壊
+ }
+ //mainTable 涓鸿〃鏍糏D 娉ㄦ剰姝ゅ濡傛灉ID涓嶆纭皢瀵艰嚧浣犲湪鐩戝惉澶嶉�夋鏃惰幏鍙栦笉鍒颁綘閫夋嫨鐨勬暟鎹紝鍓嶉潰鐨勫彧鏄坊鍔犳垨鍒犻櫎閫変腑鏈�変腑鏍峰紡浠ュ強璁剧疆鑳屾櫙鑹诧紝瀛椾綋棰滆壊
+ layui.each(table.cache.mainTable, function (i, l) {
+ if (obj.tr.index() == l.LAY_TABLE_INDEX) {
+ l.LAY_CHECKED = flag;
+ }
+ });
+ });
+ //#endregion
+
+ //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
+
+ //鍒濆鍖栫晫闈�
+ function set_ClearBill() {
+ //鍒濆鍖栨椂闂�
+ $("#HBeginDate").val(Format(new Date() - 1000 * 60 * 60 * 24 * 30, "yyyy-MM-dd"));
+ $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+
+ //鍔犺浇鏁版嵁鍒扮綉鏍�
+ get_FastQuery();
+ DisPlay_HideColumn();
+ }
+
+ //鍒楁槑鏄剧ず涓嬫媺妗�
+ function ColFilter() {
+ var Organization = '<option value="0" selected="selected" ></option>';
+ for (var i = 1; i < option.cols[0].length; i++) {
+ if (option.cols[0][i].hide != true) {
+ Organization += '<option style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>';
+ }
+ }
+ $("#ColName").empty();
+ $("#ColName").append(Organization);
+ form.render('select');
+ }
+
+
+ //鍔犺浇缃戞牸
+ function get_Display(sWhere) {
+ //鍔ㄦ�佸垪-缂撳瓨鍒楄〃
+ $.ajax({
+ url: GetWEBURL() + "/MES_SampleRecordBill_PDA/SampleRecordList",
+ type: "GET",
+ async: false,
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+
+ if (data1.count == 1) {
+
+ var data = [];
+ var col = [];
+ //缁欑┖鐨勬暟缁勮祴鍊�
+ for (var key in data1.list) {
+ data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+ }
+
+ //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+ col.push({ type: 'checkbox', fixed: 'left' });
+ for (var i = 0; i < data.length; i++) {
+ if ($.inArray(data[i].name, "") > -1) {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+ }
+ else {
+ switch (data[i].Type) {
+ //int
+ case 'DateTime':
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true });
+ break;
+ default:
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true });
+ }
+ }
+ }
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , cellMinWidth: 120
+ , page: true
+ , limit: 50
+ , limits: [50, 500, 5000, 20000]
+ , height: 'full-70'
+ , totalRow: false //寮�鍚悎璁�
+ , cols: [col]
+ , data: data1.data
+ };
+ table.render(option);
+ }
+ },
+ error: function (err) {
+ layer.msg('閿欒' + err, {
+ icon: 5,
+ time: 20000
+ }, function () {
+ //do something
+ });
+ }
+ })
+ }
+
+ //蹇�熻繃婊�
+ function get_FastQuery() {
+ var HBeginDate = $("#HBeginDate").val();//涓嬭揪鏃ユ湡 寮�濮嬫棩鏈�
+ var HEndDate = $("#HEndDate").val();//缁撴潫鏃ユ湡
+ var HMaterNumber = $("#HMaterNumber").val();//鐗╂枡浠ｇ爜
+ var HBillNo = $("#HBillNo").val(); //鍗曟嵁鍙�
+ var HProductName = $("#HProductName").val();//浜у搧鍚嶇О
+ var HProductModel = $("#HProductModel").val();//浜у搧瑙勬牸
+
+ if (HBeginDate != "" && HEndDate != "") {
+ sWhere += " and 鏃ユ湡 between '" + HBeginDate + "' and '" + HEndDate + "' ";
+ }
+
+ if (HMaterNumber != "") {
+ sWhere += " and 鐗╂枡浠ｇ爜='" + HMaterNumber + "' ";
+ }
+
+ if (HBillNo != "") {
+ sWhere += " and 鎸囧紩鍗″彿='" + HBillNo + "' ";
+ }
+
+ if (HProductName != "") {
+ sWhere += " and 鐗╂枡鍚嶇О='" + HProductName + "' ";
+ }
+
+ if (HProductModel != "") {
+ sWhere += " and 瑙勬牸鍨嬪彿='" + HProductModel + "' ";
+ }
+
+ //浠绘剰瀛楁鏉′欢杩囨护 鏉′欢鎻愬彇
+ var ColName = $("#ColName").val();//澶嶉�夋
+ var Comparator = $("#Comparator").val()
+ var ColContent = $("#ColContent").val();
+
+ //鎷兼帴浠讳竴瀛楁杩囨护鏌ヨ鏉′欢
+ var com = "";
+ if (ColName != 0 && Comparator != 0) {
+ switch (Comparator) {
+ case "7":
+ com = "like '%" + ColContent + "%'";
+ break;
+ case "8":
+ com = "like '%" + ColContent + "'";
+ break;
+ case "9":
+ com = "like '" + ColContent + "%'";
+ break;
+ case "10":
+ com = "not like '%" + ColContent + "%'";
+ break;
+ default:
+ com = "" + Comparator + " '" + ColContent + "'";
+ break;
+ }
+ com = " and (" + ColName + " " + com + ")";
+ }
+ sWhere += com;
+
+ get_Display(sWhere);
+ //璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ sWhere = "";
+ }
+
+ //閲嶇疆杩囨护鏉′欢
+ function set_ClearQuery() {
+ //鍒濆鍖栨椂闂�
+ $("#HBeginDate").val(Format(new Date() - 1000 * 60 * 60 * 24 * 30, "yyyy-MM-dd"));
+ $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HMaterNumber").val("");
+ $("#HBillNo").val("");
+ $("#HProductName").val("");
+ $("#HProductModel").val("");
+ $("#ColContent").val("");
+ $("#ColName").val("0");
+ $("#Comparator").val("0");
+ ColFilter();
+ sWhere = "";
+ }
+
+ //瀹℃牳 [1 瀹℃牳銆�2 鍙嶅鏍竇
+ function btnCheck(num) {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+
+ if (data.length == 1) {
+ layer.confirm("纭瑕佸鏍稿悧?", function (index) {
+ var wait = layer.load();
+ var HInterID = data[0].hmainid;
+ $.ajax({
+ url: GetWEBURL() + '/MES_SampleRecordBill_PDA/CheckSampleRecordBill',
+ type: "GET",
+ data: { "HInterID": HInterID, "Type": num, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ get_FastQuery();
+ layer.msg(result.Message, { icon: 1 });
+ layer.close(wait);
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ layer.close(wait);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ layer.close(wait);
+ }
+ });
+ })
+ } else {
+ layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�!");
+ }
+ }
+
+ //鍒犻櫎
+ function btnDel() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var hmainid = data[0].hmainid;
+ layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+ var wait = layer.load();
+ //閫昏緫鍒犻櫎鏂规硶
+ $.ajax({
+ url: GetWEBURL() + '/MES_SampleRecordBill_PDA/DelSampleRecordBill',
+ type: "GET",
+ data: { "lngBillKey": hmainid, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ console.log('gouba' + result);
+ if (result.count == 1) {
+ layer.msg(result.Message, { icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(wait);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ get_FastQuery();
+ });
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ layer.close(wait);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ layer.close(wait);
+ }
+ });
+ })
+
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+ }
+
+ }
+
+ //闅愯棌鍒楄缃�
+ function get_HideColumn() {
+ var colName = "";
+ for (var i = 1; i < option.cols[0].length; i++) {
+ colName += option.cols[0][i]["title"] + ",";
+ }
+
+ colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "闅愯棌鍒楄缃�" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["50%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ['../../鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName, "yes"]
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ })
+ }
+
+ //鏄剧ず鍒楁暟鎹�
+ function DisPlay_HideColumn() {
+ ColFilter();
+ $.ajax({
+ url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+ type: "GET",
+ data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.data.length != 0) {
+
+ var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+ var titleData = [];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+
+ dataCol = data1.data[0].HGridString.split(',');
+
+ for (var i = 0; i < option.cols[0].length - 1; i++) {
+ if (dataCol[i]) {
+ var dataCols = dataCol[i].split('|');
+ }
+ //闅愯棌鍒�
+ if (dataCols[1] == 1) {
+ option.cols[0][i + 1]["hide"] = true;
+ }
+ //璁剧疆鍐呭瀛椾綋澶у皬
+ if (data1.data[0].HFontSize != 0) {
+ option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+ } else {
+ option.cols[0][i + 1]["style"] = "font-size:100%";
+ }
+ //璁剧疆鍒楀
+ if (dataCols[3] > 0) {
+ option.cols[0][i + 1]["width"] = dataCols[3];
+ }
+ //鏄剧ず鍒�
+ if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
+ option.cols[0][i + 1]["hide"] = false;
+ }
+ //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+ switch (dataCols[2]) {
+ case "L":
+ option.cols[0][i + 1]["align"] = "left";
+ break;
+ case "M":
+ option.cols[0][i + 1]["align"] = "center";
+ break;
+ case "R":
+ option.cols[0][i + 1]["align"] = "right";
+ break;
+ }
+ }
+
+ //鍙栨秷鍐荤粨鍒�
+ for (var i = 1; i < option.cols[0].length - 1; i++) {
+ if (option.cols[0][i]["fixed"] != null) {
+ option.cols[0][i]["fixed"] = null;
+ }
+ else {
+ break;
+ }
+ }
+ //鍐荤粨鍒�
+ if (data1.data[0].HFixCols != 0) {
+ for (var i = 0; i < data1.data[0].HFixCols; i++) {
+ if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
+ data1.data[0].HFixCols += 1;
+ }
+ option.cols[0][i + 1]["fixed"] = "left";
+ }
+ }
+ table.render(option);
+ } else {
+ table.render(option);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ })
+ }
+
+ //#endregion
+ });
+ </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\267\245\345\272\217\346\265\201\350\275\254\345\215\241/WindowPrint.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/WindowPrint.html"
index 8048e89..946cf31 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/WindowPrint.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/WindowPrint.html"
@@ -1,1602 +1,178 @@
锘�<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml">
+<html lang="en">
<head>
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <title>宸ュ簭娴佽浆鍗″垪琛�</title>
- <meta name="renderer" content="webkit">
- <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
- <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
- <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
- <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
- <script src="../../../layuiadmin/layui/layui.js"></script>
- <script src="../../../layuiadmin/Scripts/json2.js"></script>
- <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
- <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
- <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
- <script src="../../../layuiadmin/PubCustom.js"></script>
- <script src="../../../layuiadmin/grwebapp.js"></script>
-
+ <meta charset="UTF-8" />
+ <title>Serial Logger and Plotter</title>
+ <!--<script src="https://cdn.jsdelivr.net/npm/chart.js@2.8.0"></script>-->
+ <script src="../../../layuiadmin/ckou.js"></script>
</head>
<body>
- <div class="layui-fluid">
- <div class="layui-col-md12">
- <div class="layui-card" style="padding: 1px">
- <div class="layui-card-body" style="padding: 1px;">
- <form class="layui-form" action="" lay-filter="component-form-group">
- <div class="layui-collapse">
- <div class="layui-colla-item">
- <div class="layui-colla-title layui-inline">
- <div class="layui-inline">
- <span>鏇村</span>
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">鎵撳嵃鐘舵��</label>
- <div class="layui-input-block" style="width:100px">
- <select name="city" lay-verify="required" id="SHPrintQty">
- <option value="鍏ㄩ儴">鍏ㄩ儴</option>
- <option value="鏈墦鍗�">鏈墦鍗�</option>
- <option value="宸叉墦鍗�">宸叉墦鍗�</option>
- </select>
- </div>
- </div>
- <input type="checkbox" id="wybj" name="wybj" title="鍙樉绀哄澶�" lay-filter="wybj" lay-skin="primary">
- <div class="layui-inline">
- <label class="layui-form-label">寮�濮嬫棩鏈�</label>
- <div class="layui-input-block">
- <input type="date" class="layui-input" id="HDate">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">缁撴潫鏃ユ湡</label>
- <div class="layui-input-block">
- <input type="date" class="layui-input" id="HDate1">
- </div>
- </div>
- <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>
- <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
- <div class="layui-row" style="margin-top:10px;">
- <div class="layui-inline">
- <label class="layui-form-label">璁㈠崟璺熻釜鍙�</label>
- <div class="layui-input-block">
- <input type="text" class="layui-input" name="HOrderProcNO" id="HOrderProcNO">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">鐗╂枡</label>
- <div class="layui-input-block">
- <input type="text" class="layui-input" name="HProcExchBillNo" id="SHname">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">浠诲姟鍗曞彿</label>
- <div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HWorkBillNo" id="HWorkBillNo">
- </div>
- </div>
- </div>
- <div class="layui-row" style="margin-top: 10px; margin-bottom: 10px;">
- <div class="layui-inline">
- <label class="layui-form-label">鍗曟嵁鍙�</label>
- <div class="layui-input-block">
- <input type="text" class="layui-input" name="HBillNo" id="HBillNo">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">鍞竴ID</label>
- <div class="layui-input-block">
- <input type="text" class="layui-input" name="HErpID" id="HErpID">
- </div>
- </div>
- </div>
- </div>
- </div>
- </div>
- <!--<div class="layui-tab-item layui-show">-->
- <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
- <!--</div>-->
- <!--<table class="" id="mainTable" lay-filter="mainTable"></table>
- <table class="" id="mainTable2" lay-filter="mainTable2"></table>-->
- <div class="layui-tab layui-tab-card">
- <ul class="layui-tab-title">
- <li class="layui-this">宸ヨ壓娴佺▼</li>
- <li>鍣ㄥ叿娓呭崟</li>
- <li>宸ヨ壓鍙傛暟娓呭崟</li>
- </ul>
- <div class="layui-tab-content">
- <div class="layui-tab-item layui-show">
- <!--宸ヨ壓娴佺▼-->
- <table class="layui-hide" id="mainTable2" lay-filter="mainTable2"></table>
- </div>
- <div class="layui-tab-item">
- <!--鍣ㄥ叿娓呭崟-->
- <table class="layui-hide" id="mainTable1" lay-filter="mainTable1"></table>
- </div>
- <div class="layui-tab-item">
- <!--宸ヨ壓鍙傛暟娓呭崟-->
- <table class="layui-hide" id="mainTable3" lay-filter="mainTable3"></table>
- </div>
- </div>
- </div>
- <script type="text/html" id="toolbarDemo">
- <div class="layui-btn-container">
- <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>娴嬭瘯鎵撳嵃</button>
- </div>
- </script>
- <script type="text/html" id="toolbarDemo2">
- <div class="layui-btn-container">
- <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_view"><i class="layui-icon layui-icon-tips"></i>棰勮</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_print"><i class="layui-icon layui-icon-print"></i>鎵撳嵃</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="set_StationOut"><i class="layui-icon layui-icon-form"></i>宸ュ簭鍑虹珯姹囨姤鍗�</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="get_StationIn"><i class="layui-icon layui-icon-form"></i>宸ュ簭杩涚珯鎺ユ敹鍗�</button>-->
- <button type="button" class="layui-btn layui-btn-sm" lay-event="get_HideColumn2"><i class="layui-icon layui-icon-file-b"></i>鏄庣粏鍒楄缃�</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Fg"><i class="layui-icon layui-icon-file-b"></i>宸ュ簭杩斿伐</button>
- </div>
- </script>
- <script type="text/html" id="toolbarDemo3">
- <div class="layui-btn-container">
- <button type="button" class="layui-btn layui-btn-sm" lay-event="get_HideColumn3"><i class="layui-icon layui-icon-file-b"></i>鍒楄缃�</button>
- </div>
- </script>
- <script type="text/html" id="toolbarDemo4">
- <div class="layui-btn-container">
- <button type="button" class="layui-btn layui-btn-sm" lay-event="get_HideColumn4"><i class="layui-icon layui-icon-file-b"></i>鍒楄缃�</button>
- </div>
- </script>
- </form>
- </div>
- </div>
- </div>
+ <canvas id="myChart" height="100"></canvas>
+ <div>
+ <button id="butConnect">connect</button><span style="padding: 1%"></span><button id="butEnd">end</button>
</div>
-
- <style>
- .layui-table-cell {
- height: 22px;
- }
- </style>
+ <div style="margin: 10px">Received:</div>
+ <div id="received-data-list" style="border: groove; margin: 10px"></div>
<script>
- layui.config({
- base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
- }).extend({
- index: 'lib/index', //涓诲叆鍙ｆā鍧�
- }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
- //#region 鍏叡鍙橀噺
- var $ = layui.$
- , admin = layui.admin
- , layer = layui.layer
- , table = layui.table
- , form = layui.form
- , element = layui.element
- , laypage = layui.laypage
- , laydate = layui.laydate
- , util = layui.util
- //var sWhere = " 浜у搧浠ｇ爜 = 'BX0002'";
- var sWhere = "";
- var option = "";
- var option2 = "";
- var option3 = "";
- var option4 = "";
- var HBillNo = "";
- var wybj = false;
- var QJQD = 0;//鍒ゆ柇鍣ㄥ叿娓呭崟鏌ヨ鍒楄〃鏄惁鏈夋暟鎹� 0娌℃湁 1鏈�
- var Organization = sessionStorage["Organization"]
- //#endregion
+ /*** find the chart and list tag below ***/
+ var ctx = document.getElementById("myChart").getContext("2d");
+ var chart = new Chart(ctx, {
+ // The type of chart we want to create
+ type: "line",
- //#region 杩涘叆椤甸潰鍗冲姞杞�
-
- //
- var HModName = "Sc_ProcessExchangeBillList";
- //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞� 锛堜富琛級
- var titleData = ["HItemID", "HEntryID", "HWorkShopID", "HMaterID", "HSupID", "HPRDORGID", "HEquipMentID", "hsubid", "HICMOEntryID", "HDeptID"];
- //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞� 锛堝伐鑹烘祦绋嬶級
- var titleData2 = ["HEntryID", "HProcID", "HCenterID", "HDeptID", "hmainid", "hicmointerid", "HWorkShopID", "HMaterID", "HUnitID", "hsubid", "HSupID"];
- //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞� 锛堝櫒鍏锋竻鍗曪級
- var titleData3 = ["HEntryID", "HMouldID", "HMaterID", "HUnitID", "hmainid","hicmointerid"];
- //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞� 锛堝伐鑹哄弬鏁版竻鍗曪級
- var titleData4 = ["HItemID"];
- //鍒濆鍖栫晫闈�
- set_ClearBill();
-
- //#endregion
-
- //#region 澶村伐鍏锋爮浜嬩欢
- table.on('toolbar(mainTable)', function (obj) {
- switch (obj.event) {
- //鏂板
- case 'set_AddNew': set_AddNew();
- break;
- //缂栬緫
- case 'set_ShowBill': set_ShowBill();
- break;
- //鍒犻櫎
- case 'set_DeleteBill': set_DeleteBill();
- break;
- //鎷嗗垎
- case 'set_cf': set_cf();
- break;
- //鍒锋柊
- case 'get_Refresh': get_Refresh();
- break;
- //閫�鍑烘寜閽�
- case 'get_Exit': Pub_Close(2);
- break;
- //棰勮
- case 'btn_view': get_view();
- break;
- //鎵撳嵃
- case 'btn_print': get_print();
- break;
- //宸ュ簭鍑虹珯姹囨姤鍗�
- case 'set_StationOut': set_StationOut();
- break;
- //宸ュ簭杩涚珯鎺ユ敹鍗�
- case 'get_StationIn': get_StationIn();
- break;
- //鍒楄缃�
- case 'get_HideColumn1': get_HideColumn1();
- break;
- ////鏄庣粏鍒楄缃�
- //case 'get_HideColumn2': get_HideColumn2();
- // break;
- ////鏄庣粏鍒楄缃�
- //case 'get_HideColumn3': get_HideColumn3();
- // break;
- ////鏄庣粏鍒楄缃�
- //case 'get_HideColumn4': get_HideColumn4();
- // break;
-
- };
- });
-
- table.on('toolbar(mainTable1)', function (obj) {
- switch (obj.event) {
- //鏄庣粏鍒楄缃�
- case 'get_HideColumn3': get_HideColumn3();
- break;
-
- };
- });
- table.on('toolbar(mainTable2)', function (obj) {
- switch (obj.event) {
- //鏂板
- case 'set_AddNew': set_AddNew();
- break;
- //缂栬緫
- case 'set_ShowBill': set_ShowBill();
- break;
- //鍒犻櫎
- case 'set_DeleteBill': set_DeleteBill();
- break;
- //鍒锋柊
- case 'get_Refresh': get_Refresh();
- break;
- //閫�鍑烘寜閽�
- case 'get_Exit': Pub_Close(2);
- break;
- //棰勮
- case 'btn_view': get_view();
- break;
- //鎵撳嵃
- case 'btn_print': get_print();
- break;
- //宸ュ簭鍑虹珯姹囨姤鍗�
- case 'set_StationOut': set_StationOut();
- break;
- //宸ュ簭杩涚珯鎺ユ敹鍗�
- case 'get_StationIn': get_StationIn();
- break;
- //鍒楄缃�
- //case 'get_HideColumn1': get_HideColumn1();
- // break;
- //鏄庣粏鍒楄缃�
- case 'get_HideColumn2': get_HideColumn2();
- break
- //宸ュ簭杩斿伐鍗�
- case 'get_Fg': get_Fg();
- break
- };
- });
- table.on('toolbar(mainTable3)', function (obj) {
- switch (obj.event) {
- //鏄庣粏鍒楄缃�
- case 'get_HideColumn4': get_HideColumn4();
- break;
- };
- });
-
- //#endregion
-
- //#region 閲嶇疆鎸夐挳
- form.on('submit(btnReSearch)', function (data) {
- set_ClearQuery();
- });
- //#endregion
-
- //#region 鏌ヨ鎸夐挳
- form.on('submit(btnSearch)', function (data) {
- get_FastQuery();
- });
- //#endregion
-
-
- //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
- function set_ClearBill() {
- $("#HDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));//寮�濮嬫棩鏈�
- $("#HDate1").val(Format(new Date(), "yyyy-MM-dd"));//缁撴潫鏃ユ湡
- //鍒濆鍖栦富琛ㄥ垪琛�
- set_InitGrid();
- //鍒濆鍖栦粠琛ㄥ垪琛�
- set_InitGrid2();
- //鍒濆鍖栦粠琛ㄥ垪琛�
- set_InitGrid3();
- //鍒濆鍖栦粠琛ㄥ垪琛�
- set_InitGrid4();
- table.render(option2);
- //鏌ヨ
- get_FastQuery();
- }
-
-
- //#region 閲嶇疆杩囨护鏉′欢鏂规硶
- function set_ClearQuery() {
- $("#SHPrintQty").val("");//鎵撳嵃鐘舵��
- $("input[type='checkbox'][name='wybj']").prop('checked', false);
- form.render("checkbox");//濮斿鏍囪
- $("#HDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));//寮�濮嬫棩鏈�
- $("#HDate1").val(Format(new Date(), "yyyy-MM-dd"));//缁撴潫鏃ユ湡
- $("#HOrderProcNO").val("");//璁㈠崟璺熻釜鍙�
- $("#SHname").val("");//鐗╂枡|瀛愪欢鍚嶇О|瀛愪欢瑙勬牸
- $("#HBillNo").val("");//鍗曟嵁鍙�
- //$("#btnSearch").click();
- sWhere = "";
- get_FastQuery();
- }
- //#endregion
-
- //#region 蹇�熻繃婊�
- function get_FastQuery() {
- var SHPrintQty = $("#SHPrintQty").val();//鎵撳嵃鐘舵��
- var HDate = $("#HDate").val();//寮�濮嬫棩鏈�
- var HDate1 = $("#HDate1").val();//缁撴潫鏃ユ湡
- var HOrderProcNO = $("#HOrderProcNO").val();//璁㈠崟璺熻釜鍙�
- var HWorkBillNo = $("#HWorkBillNo").val();
- var SHname = $("#SHname").val();//鐗╂枡|瀛愪欢鍚嶇О|瀛愪欢瑙勬牸
- var HBillNo = $("#HBillNo").val();//鍗曟嵁鍙�
- var HErpID = $("#HErpID").val();//鍞竴ID
- if (SHPrintQty) {//鍒ゆ柇鎵撳嵃鐘舵��
- if (SHPrintQty == "鍏ㄩ儴") {
- sWhere = " and 鎵撳嵃娆℃暟 >= 0 ";
- }
- if (SHPrintQty == "宸叉墦鍗�") {
- sWhere = " and 鎵撳嵃娆℃暟 > 0 ";
- }
- if (SHPrintQty == "鏈墦鍗�") {
- sWhere = " and 鎵撳嵃娆℃暟 = 0 ";
- }
- }
- if (wybj) {
- sWhere += " and 濮斿鏍囪 = 'Y'";
- }
- if (HDate) {
- sWhere += " and 鏃ユ湡 >= '" + HDate + "'";
- }
- if (HDate1) {
- sWhere += " and 鏃ユ湡 <= '" + HDate1 + "'";
- }
- if (HWorkBillNo) {
- sWhere += " and 鐢熶骇璁㈠崟鍙� like '%" + HWorkBillNo + "%'";
- }
- if (HOrderProcNO) {
- sWhere += " and 璁㈠崟璺熻釜鍙� like '%" + HOrderProcNO + "%'";
- }
- if (SHname) {
- sWhere += " and 瀛愪欢浠ｇ爜 like '%" + SHname + "%'";
- }
- if (HBillNo) {
- sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'"
- }
- if (HErpID) {
- sWhere += " and 鍞竴ID like '%" + HErpID + "%'";
- }
- get_Display(sWhere);
- sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
- }
- //#endregion
- //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
-
-
- //閫変腑鍒ゆ柇
- form.on('checkbox(wybj)', function (data) {
- wybj = data.elem.checked; //鏄惁琚�変腑锛宼rue鎴栬�協alse
- });
-
- //鐐瑰嚮涓昏〃甯﹀嚭浠庤〃鏁版嵁
- table.on('row(mainTable)', function (obj) { //娉細tool 鏄伐鍏锋潯浜嬩欢鍚嶏紝test 鏄� table 鍘熷瀹瑰櫒鐨勫睘鎬� lay-filter="瀵瑰簲鐨勫��"
- var datas = obj.data; //鑾峰緱褰撳墠琛屾暟鎹�
- HBillNo = datas["鍗曟嵁鍙�"].toString();
- var HMainID = datas.hmainid;
- var wait = layer.load();
- $.ajax({
- url: GetWEBURL() + '/LEMS/MES_Sc_ProcessExchangeBillQuerySub_Json',
- type: "GET",
- data: { "sWhere": HMainID },
- //success: function (data1) {
- // if (data1.count == 1) {
- // option2.data = data1.data;
- // table.render(option2);
- // layer.close(wait);
- // } else {
- // layer.alert(data1.code + data1.Message, { icon: 5 });
- // layer.close(wait);
- // }
- //}, error: function () {
- // layer.close(wait);
- // layer.alert("鎺ュ彛澶辨晥!", { icon: 5 });
- //}
- success: function (data1) {
- if (data1.count == 1) {
- var data = [];
- var col = [];
- //缁欑┖鐨勬暟缁勮祴鍊�
- for (var key in data1.list) {
- data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
- }
- //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
- col.push({ type: 'checkbox', fixed: 'left' });
- for (var i = 0; i < data.length; i++) {
- // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
- if ($.inArray(data[i].name, titleData2) > -1) {
- col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
- }
- else {
- switch (data[i].Type) {
- //int
- case 'DateTime':
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
- break;
- default:
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
- }
- }
- }
-
- //鍔ㄦ�佹樉绀哄垪鍚�
- option2 = {
- elem: '#mainTable2'
- , toolbar: '#toolbarDemo2'
- , cols: [col]
- , data: data1.data
- , height: 550
- , page: true
- , cellMinWidth: 90
- , limit: 50
- , limits: [50, 500, 5000, 20000]
- }
- table.render(option2);
-
- //鍒锋柊琛ㄦ牸鏁版嵁
- DisPlay_HideColumn();
-
- layer.close(wait);
- //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
- } else {
- layer.close(wait);
- layer.alert(data1.code + data1.Message, { icon: 5 });
- }
- }, error: function () {
- layer.close(wait);
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
- }
- });
- DisPlay_HideColumn_Sec();
- set_ClearBillHMainID(HMainID); //鍣ㄥ叿娓呭崟
- });
-
- //#endregion
-
-
- function set_ClearBillHMainID(HMainID) {
- resultTableHead = []; //娓呯┖琛ㄥご鍒楋紝闃叉閲嶅娓叉煋
- //鍒濆鏌ヨ
- get_DisplayHMainID(HMainID);
- get_Display4(HMainID);
- }
- //#endregion
-
- //#region 鏌ヨ (鍣ㄥ叿娓呭崟)
- function get_DisplayHMainID(HMainID) {
- var ajaxLoad = layer.load();
- $.ajax({
- url: GetWEBURL() + '/Sc_ProcessExchangeBillList/QJQD',
- type: "GET",
- data: { "HProcExchHinteID": HMainID },
- success: function (data1) {
- if (data1.count == 1) {
-
- if (data1.data.length == 0) {
- QJQD = 0;
- } else {
- QJQD = 1;
- }
-
- var data = [];
- //缁欑┖鐨勬暟缁勮祴鍊�
- for (var key in data1.list) {
- data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
- }
- var col = [];
- for (var i = 0; i < data.length; i++) {
- // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
- if ($.inArray(data[i].name, titleData3) > -1) {
- col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
- }
- else {
- switch (data[i].Type) {
- //int
- case 'DateTime':
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
- break;
- default:
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
- }
- }
- }
-
- //鍔ㄦ�佹樉绀哄垪鍚�
- option3 = {
- elem: '#mainTable1'
- , toolbar: '#toolbarDemo3'
- , cols: [col]
- , data: data1.data
- , height: 550
- , page: true
- , cellMinWidth: 90
- , limit: 50
- , limits: [50, 500, 5000, 20000]
- }
- table.render(option3);
-
- layer.close(ajaxLoad);
- //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
- } else {
- layer.close(ajaxLoad);
- layer.alert(data1.code + data1.Message, { icon: 5 });
- }
- }, error: function () {
- layer.close(ajaxLoad);
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
- }
- });
- DisPlay_HideColumn_Mod();
- }
- //#endregion
-
- //#region 鏌ヨ 宸ヨ壓鍙傛暟
- function get_Display4(HMainID) {
- var ajaxLoad = layer.load();
- $.ajax({
- url: GetWEBURL() + '/Sc_ProcessExchangeBill/GetProcessExchangeBillSubTech',
- type: "GET",
- data: { "HInterID": HMainID },
- success: function (data1) {
- if (data1.count == 1) {
- var data = [];
- //缁欑┖鐨勬暟缁勮祴鍊�
- for (var key in data1.list) {
- data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
- }
- var col = [];
- for (var i = 0; i < data.length; i++) {
- // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
- if ($.inArray(data[i].name, titleData4) > -1) {
- col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
- }
- else {
- switch (data[i].Type) {
- //int
- case 'DateTime':
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
- break;
- default:
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
- }
- }
- }
-
- //鍔ㄦ�佹樉绀哄垪鍚�
- option4 = {
- elem: '#mainTable3'
- , toolbar: '#toolbarDemo4'
- , cols: [col]
- , data: data1.data
- , height: 550
- , page: true
- , cellMinWidth: 90
- , limit: 50
- , limits: [50, 500, 5000, 20000]
- }
- table.render(option4);
-
- layer.close(ajaxLoad);
- //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
- } else {
- layer.close(ajaxLoad);
- layer.alert(data1.code + data1.Message, { icon: 5 });
- }
- }, error: function () {
- layer.close(ajaxLoad);
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
- }
- });
- DisPlay_HideColumn_Tech();
- }
- //#endregion
-
- //鍒濆鍖栦富琛ㄥ垪琛�
- function set_InitGrid() {
- option = {
- elem: '#mainTable'
- , toolbar: '#toolbarDemo'
- , page: true
- , height: 300
- , cellMinWidth: 90
- , limit: 50
- , limits: [50, 500, 5000, 20000]
- , cols: [[
- // { type: 'checkbox', fixed: 'left' }
- // , { field: 'hmainid', title: 'hmainid', width: 90, hide: true }
- // , { field: '鎵撳嵃娆℃暟', title: '鎵撳嵃娆℃暟' }
- // , { field: '绫诲瀷', title: '绫诲瀷' }
- // , {
- // field: '鏃ユ湡', title: '鏃ユ湡', width: 120, sort: true, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>"
- // }
- // , { field: '璁㈠崟璺熻釜鍙�', title: '璁㈠崟璺熻釜鍙�', width: 120 }
- // , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 190 }
- // , { field: 'hicmointerid', title: 'hicmointerid', width: 80, hide: true }
- // , { field: '浠诲姟鍗曞彿', title: '浠诲姟鍗曞彿', width: 140 }
- // , { field: '鍞竴ID', title: '鍞竴ID', width: 140 }
- // , { field: '鏃ヨ鍒掑伐鍗曟棩鏈�', title: '鏃ヨ鍒掑伐鍗曟棩鏈�', width: 140 }
- // , { field: 'HWorkShopID', title: 'HWorkShopID', width: 80, hide: true }
- // , { field: 'HDeptID', title: 'HDeptID', width: 80, hide: true }
- // , { field: '鐢熶骇杞﹂棿浠ｇ爜', title: '鐢熶骇杞﹂棿浠ｇ爜', width: 115 }
- // , { field: '鐢熶骇杞﹂棿', title: '鐢熶骇杞﹂棿' }
- // , { field: '濮斿鏍囪', title: '濮斿鏍囪' }
- // , { field: 'HMaterID', title: 'HMaterID', width: 80, hide: true }
- // , { field: '瀛愪欢浠ｇ爜', title: '瀛愪欢浠ｇ爜' }
- // , { field: '瀛愪欢鍚嶇О', title: '瀛愪欢鍚嶇О' }
- // , { field: '瀛愪欢瑙勬牸', title: '瀛愪欢瑙勬牸' }
- // , { field: '鎵瑰彿', title: '鎵瑰彿' }
- // , { field: '鍘熸枡鎵规鍙�', title: '鍘熸枡鎵规鍙�' }
- // , { field: 'HMaterID2', title: 'HMaterID2', width: 80, hide: true }
- // , { field: '浜у搧浠ｇ爜', title: '浜у搧浠ｇ爜' }
- // , { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О' }
- // , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿' }
- // , { field: 'HUnitID', title: 'HUnitID', width: 80, hide: true }
- // , { field: '鍗曚綅浠ｇ爜', title: '鍗曚綅浠ｇ爜' }
- // , { field: '鍗曚綅', title: '鍗曚綅' }
- // , { field: '璁惧妯″叿浠ｇ爜', title: '璁惧妯″叿浠ｇ爜' }
- // , { field: '璁惧妯″叿', title: '璁惧妯″叿' }
- // , { field: '鐢熶骇鏁伴噺', title: '鐢熶骇鏁伴噺' }
- // , { field: '娴佽浆鍗℃暟閲�', title: '娴佽浆鍗℃暟閲�' }
- // , { field: '璁″垝寮�宸ユ棩鏈�', title: '璁″垝寮�宸ユ棩鏈�' }
- // , { field: '璁″垝瀹屽伐鏃ユ湡', title: '璁″垝瀹屽伐鏃ユ湡' }
- // , { field: '鎽樿', title: '鎽樿' }
- // , { field: '鍐呴儴鍗曟嵁鍙�', title: '鍐呴儴鍗曟嵁鍙�' }
- // , { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞' }
- // , { field: '鍒跺崟浜�', title: '鍒跺崟浜�' }
- // , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡' }
- // , { field: '瀹℃牳浜�', title: '瀹℃牳浜�' }
- // , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡' }
- // , { field: '淇敼浜�', title: '淇敼浜�' }
- // , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡' }
- // , { field: '鍏抽棴浜�', title: '鍏抽棴浜�' }
- // , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡' }
- // , { field: '浣滃簾浜�', title: '浣滃簾浜�' }
- // , { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡' }
- // , { field: 'HBillType', title: 'HBillType', width: 80, hide: true }
- // , { field: 'hsubid', title: 'hsubid', width: 80, hide: true }
- // , { field: '鎷嗗垎鏁伴噺', title: '鎷嗗垎鏁伴噺' }
- // , { field: '婧愬崟瀹㈡埛缂栫爜', title: '婧愬崟瀹㈡埛缂栫爜', width: 80 }
- // , { field: '鍖呰鏍囪瘑', title: '鍖呰鏍囪瘑', width: 80 }
- // , { field: '鍖呰鏍囪瘑缂栫爜', title: '鍖呰鏍囪瘑缂栫爜', width: 80 }
- ]]
- };
- //table.render(option);
- }
-
- //鍒濆鍖栦粠琛ㄥ垪琛� 宸ヨ壓娴佺▼
- function set_InitGrid2() {
- option2 = {
- elem: '#mainTable2'
- //, toolbar: '#toolbarDemo'
- , page: false
- , height: 500
- , cellMinWidth: 90
- , limit: Number.MAX_VALUE//榛樿鏄剧ず鍏ㄩ儴
- , cols: [[
- //{ type: 'checkbox', fixed: 'left' }
- //, { field: 'hsubid', title: 'hsubid', hide: true }
- //, { field: '娴佹按鍙�', title: '娴佹按鍙�' }
- //, { field: 'HProcID', title: 'HProcID', hide: true }
- //, { field: '宸ュ簭浠ｇ爜', title: '宸ュ簭浠ｇ爜' }
- //, { field: '宸ュ簭鍚嶇О', title: '宸ュ簭鍚嶇О' }
- //, { field: '娴佽浆鍗℃暟閲�', title: '娴佽浆鍗℃暟閲�', width: 100 }
- //, { field: '杩涚珯鍏宠仈鏁伴噺', title: '杩涚珯鍏宠仈鏁伴噺', width: 120 }
- //, { field: '鍑虹珯鍏宠仈鏁伴噺', title: '鍑虹珯鍏宠仈鏁伴噺', width: 120 }
- //, { field: '鍑虹珯鎶ュ簾鍏宠仈鏁伴噺', title: '鍑虹珯鎶ュ簾鍏宠仈鏁伴噺', width: 150 }
- //, { field: '杩斿伐鏍囪', title: '杩斿伐鏍囪' }
- //, { field: '鍔犲伐璇存槑', title: '鍔犲伐璇存槑' }
- //, { field: '宸ヤ綔涓績浠ｇ爜', title: '宸ヤ綔涓績浠ｇ爜', width: 115 }
- //, { field: '宸ヤ綔涓績', title: '宸ヤ綔涓績' }
- //, { field: '璁″垝鏁伴噺', title: '璁″垝鏁伴噺' }
- //, { field: 'hmainid', title: 'hmainid', hide: true }
- //, { field: '鏃ユ湡', title: '鏃ユ湡', sort: true }
- //, { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 150 }
- //, { field: 'hicmointerid', title: 'hicmointerid', hide: true }
- //, { field: '浠诲姟鍗曞彿', title: '浠诲姟鍗曞彿', width: 100 }
- //, { field: 'HWorkShopID', title: 'HWorkShopID', hide: true }
- //, { field: '鐢熶骇杞﹂棿浠ｇ爜', title: '鐢熶骇杞﹂棿浠ｇ爜', width: 115 }
- //, { field: '鐢熶骇杞﹂棿', title: '鐢熶骇杞﹂棿' }
- //, { field: 'HMaterID', title: 'HMaterID', hide: true }
- //, { field: '浜у搧浠ｇ爜', title: '浜у搧浠ｇ爜' }
- //, { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О' }
- //, { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿' }
- //, { field: '鎵瑰彿', title: '鎵瑰彿' }
- //, { field: 'HUnitID', title: 'HUnitID', hide: true }
- //, { field: '鍗曚綅浠ｇ爜', title: '鍗曚綅浠ｇ爜' }
- //, { field: '鍗曚綅', title: '鍗曚綅' }
- //, { field: '鐢熶骇鏁伴噺', title: '鐢熶骇鏁伴噺' }
- //, { field: '璁″垝寮�宸ユ棩鏈�', title: '璁″垝寮�宸ユ棩鏈�' }
- //, { field: '璁″垝瀹屽伐鏃ユ湡', title: '璁″垝瀹屽伐鏃ユ湡' }
- //, { field: '鎽樿', title: '鎽樿' }
- //, { field: '鍐呴儴鍗曟嵁鍙�', title: '鍐呴儴鍗曟嵁鍙�' }
- //, { field: 'HSupID', title: 'HSupID', hide: true }
- //, { field: '濮斿鍔犲伐鍗曚綅浠ｇ爜', title: '濮斿鍔犲伐鍗曚綅浠ｇ爜' }
- //, { field: '濮斿鍔犲伐鍗曚綅', title: '濮斿鍔犲伐鍗曚綅' }
- //, { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞' }
- //, { field: 'HBillType', title: 'HBillType', hide: true }
- //, { field: '琛屽叧闂汉', title: '琛屽叧闂汉' }
- //, { field: '鍏抽棴绫诲瀷', title: '鍏抽棴绫诲瀷' }
- //, { field: '琛ㄤ綋澶囨敞', title: '琛ㄤ綋澶囨敞' }
- //, { field: '婧愬崟涓诲唴鐮�', title: '婧愬崟涓诲唴鐮�' }
- //, { field: '婧愬崟瀛愬唴鐮�', title: '婧愬崟瀛愬唴鐮�' }
- //, { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿' }
- //, { field: '婧愬崟绫诲瀷', title: '婧愬崟绫诲瀷' }
- //, { field: '姹囨姤鏁伴噺', title: '姹囨姤鏁伴噺' }
- //, { field: '娴佽浆宸ュ簭', title: '娴佽浆宸ュ簭' }
- //, { field: '鍑虹珯娴佽浆宸ュ簭', title: '鍑虹珯娴佽浆宸ュ簭' }
- //, { field: '棣栭亾宸ュ簭', title: '棣栭亾宸ュ簭' }
- //, { field: '鏈亾宸ュ簭', title: '鏈亾宸ュ簭' }
- //, { field: '涓嬮亾宸ュ簭鍙�', title: '涓嬮亾宸ュ簭鍙�' }
- //, { field: '涓嶈壇鍝佸叧鑱旀暟閲�', title: '涓嶈壇鍝佸叧鑱旀暟閲�' }
- ]]
- };
-
- }
- //鍒濆鍖栦粠琛ㄥ垪琛� 鍣ㄥ叿娓呭崟
- function set_InitGrid3() {
- option3 = {
- elem: '#mainTable1'
- //, toolbar: '#toolbarDemo'
- , page: false
- , height: 500
- , cellMinWidth: 90
- , limit: Number.MAX_VALUE//榛樿鏄剧ず鍏ㄩ儴
- , cols: [[]]
- };
-
- }
- //鍒濆鍖栦粠琛ㄥ垪琛� 宸ヨ壓鍙傛暟娓呭崟
- function set_InitGrid4() {
- option4 = {
- elem: '#mainTable3'
- //, toolbar: '#toolbarDemo'
- , page: false
- , height: 500
- , cellMinWidth: 90
- , limit: Number.MAX_VALUE//榛樿鏄剧ず鍏ㄩ儴
- , cols: [[]]
- };
-
- }
- //#region 鏌ヨ (涓昏〃)
- function get_Display(sWhere) {
- sWhere += " and HPRDORGID=" + sessionStorage["OrganizationID"] + " ";
- var ajaxLoad = layer.load();
- $.ajax({
- url: GetWEBURL() + '/LEMS/MES_Sc_ProcessExchangeBillQuery_Json',
- type: "GET",
- data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
- success: function (data1) {
- if (data1.count == 1) {
- var data = [];
- var col = [];
- //缁欑┖鐨勬暟缁勮祴鍊�
- for (var key in data1.list) {
- data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
- }
- //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
- col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' });
- for (var i = 0; i < data.length; i++) {
- // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
- if ($.inArray(data[i].name, titleData) > -1) {
- col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
- }
- else {
- switch (data[i].Type) {
- //int
- case 'DateTime':
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
- break;
- default:
- if (data[i].name == '鐢熶骇鏁伴噺' || data[i].name == '娴佽浆鍗℃暟閲�' || data[i].name == '鍏ュ簱鏁伴噺') {
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, totalRow: true });
- } else {
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
- }
- }
- }
- }
-
- //鍔ㄦ�佹樉绀哄垪鍚�
- option = {
- elem: '#mainTable'
- , toolbar: '#toolbarDemo'
- , cols: [col]
- , data: data1.data
- , height: 550
- , page: true
- , totalRow: true
- , cellMinWidth: 90
- , limit: 50
- , limits: [50, 500, 5000, 20000]
- }
- table.render(option);
-
- //鍒锋柊琛ㄦ牸鏁版嵁
- DisPlay_HideColumn();
-
- layer.close(ajaxLoad);
- //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
- } else {
- layer.close(ajaxLoad);
- layer.alert(data1.code + data1.Message, { icon: 5 });
- }
- }, error: function () {
- layer.close(ajaxLoad);
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
- }
- });
- DisPlay_HideColumn();
- }
- //#endregion
-
- //#region 闅愯棌鍒楄缃� (涓诲垪琛�)
- function get_HideColumn1() {
- var colName = "";
- for (var i = 1; i < option.cols[0].length - 1; i++) {
- colName += option.cols[0][i]["title"] + ",";
- }
-
- colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
- layer.open({
- type: 2
- , skin: "layui-layer-rim" //鍔犱笂杈规
- , title: "闅愯棌鍒楄缃�" //鏍囬
- , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
- , shift: 2 //寮瑰嚭鍔ㄧ敾
- , area: ["50%", "90%"] //绐椾綋澶у皬
- , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ['../../鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName, "yes"]
- , btn: ["纭畾", "鍙栨秷"]
- , btn1: function (index, laero) {
- //鍒锋柊琛ㄦ牸鏁版嵁
- DisPlay_HideColumn();
- //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
- layer.close(index);//鍏抽棴寮圭獥
- }
- })
- }
- //#endregion
-
- //#region 闅愯棌鍒楄缃� (宸ヨ壓娴佺▼)
- function get_HideColumn2() {
- var colName = "";
- for (var i = 1; i < option2.cols[0].length - 1; i++) {
- colName += option2.cols[0][i]["title"] + ",";
- }
-
- colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
- layer.open({
- type: 2
- , skin: "layui-layer-rim" //鍔犱笂杈规
- , title: "闅愯棌鍒楄缃�" //鏍囬
- , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
- , shift: 2 //寮瑰嚭鍔ㄧ敾
- , area: ["50%", "90%"] //绐椾綋澶у皬
- , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ['../../鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + "_Sec" + '&colName=' + colName, "yes"]
- , btn: ["纭畾", "鍙栨秷"]
- , btn1: function (index, laero) {
- //鍒锋柊琛ㄦ牸鏁版嵁
- DisPlay_HideColumn_Sec();
- //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
- layer.close(index);//鍏抽棴寮圭獥
- }
- })
- }
- //#endregion
-
- //宸ュ簭杩斿伐
- function get_Fg() {
- var checkStatus = table.checkStatus('mainTable2')
- , data = checkStatus.data;
- if (checkStatus.data.length === 1) {
- if (checkStatus.data[0]["娴佹按鍙�"] != "9999") {
- layer.open({
- type: 2
- , skin: "layui-layer-rim" //鍔犱笂杈规
- , title: "宸ュ簭杩斿伐鐢宠鍗曠紪杈�" //鏍囬
- , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
- , shift: 2 //寮瑰嚭鍔ㄧ敾
- , area: ["100%", "100%"] //绐椾綋澶у皬
- , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ['../../杞﹂棿绠＄悊/宸ュ簭娴佽浆鍗�/Sc_ProcExchWorkBackBillEdit.html?OperationType=1&linterid=' + checkStatus.data[0]["hmainid"] + '&HEntryID=' + checkStatus.data[0]["HEntryID"], "yes"]
- , btn: ["纭畾", "鍙栨秷"]
- , btn1: function (index, laero) {
- //鍒锋柊琛ㄦ牸鏁版嵁
- DisPlay_HideColumn();
- //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
- layer.close(index);//鍏抽棴寮圭獥
- }
- })
- } else {
- layer.msg('杩斿伐宸ュ簭涓嶈兘鏄浆宸ュ簭锛�');
- }
- } else {
- layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
- }
- }
-
- //#region 鏄剧ず鍒楁暟鎹� (涓诲垪琛�)
- function DisPlay_HideColumn() {
- $.ajax({
- url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
- type: "GET",
- data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
- success: function (data1) {
- if (data1.data.length != 0) {
-
-
- var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
- /*var titleData = ["hmainid", "hicmointerid", "HWorkShopID", "HDeptID", "HMaterID", "HMaterID2", "HUnitID", "HBillType", "hsubid"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�*/
-
- dataCol = data1.data[0].HGridString.split(',');
-
- for (var i = 0; i < option.cols[0].length - 2; i++) {
- if (dataCol[i]) {
- var dataCols = dataCol[i].split('|');
- }
- //闅愯棌鍒�
- if (dataCols[1] == 1) {
- option.cols[0][i + 1]["hide"] = true;
- }
- //璁剧疆鍒楀
- if (dataCols[3] > 0) {
- option.cols[0][i + 1]["width"] = dataCols[3];
- }
- //璁剧疆鍐呭瀛椾綋澶у皬
- if (data1.data[0].HFontSize != 0) {
- option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
- } else {
- option.cols[0][i + 1]["style"] = "font-size:100%";
- }
- //璁剧疆鍒楀
- //if (data1.data[0].HColumnWidth != 0) {
- // option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
- //} else {
- // option.cols[0][i + 1]["width"] = "";
- //}
- //鏄剧ず鍒�
- if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
- option.cols[0][i + 1]["hide"] = false;
- }
- //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
- switch (dataCols[2]) {
- case "L":
- option.cols[0][i + 1]["align"] = "left";
- break;
- case "M":
- option.cols[0][i + 1]["align"] = "center";
- break;
- case "R":
- option.cols[0][i + 1]["align"] = "right";
- break;
- }
- }
-
- //鍙栨秷鍐荤粨鍒�
- for (var i = 1; i < option.cols[0].length - 1; i++) {
- if (option.cols[0][i]["fixed"] != null) {
- option.cols[0][i]["fixed"] = null;
- }
- else {
- break;
- }
- }
- //鍐荤粨鍒�
- if (data1.data[0].HFixCols != 0) {
- for (var i = 0; i < data1.data[0].HFixCols; i++) {
- if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
- data1.data[0].HFixCols += 1;
- }
- option.cols[0][i + 1]["fixed"] = "left";
- }
- }
- table.render(option);
- } else {
- table.render(option);
- }
- }, error: function () {
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
- }
- })
- }
- //#endregion
-
- //#region 鏄剧ず鍒楁暟鎹� (宸ヨ壓娴佺▼)
- function DisPlay_HideColumn_Sec() {
- $.ajax({
- url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
- type: "GET",
- data: { "HModName": HModName + "_Sec", "user": sessionStorage["HUserName"] },
- success: function (data1) {
- if (data1.data.length != 0) {
-
-
- var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
- //var titleData = ["HMaterID", "HUnitID", "HICMOEmpID"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
-
- dataCol = data1.data[0].HGridString.split(',');
-
- for (var i = 0; i < option2.cols[0].length - 2; i++) {
- if (dataCol[i]) {
- var dataCols = dataCol[i].split('|');
- }
- //闅愯棌鍒�
- if (dataCols[1] == 1) {
- option2.cols[0][i + 1]["hide"] = true;
- }
- //璁剧疆鍒楀
- if (dataCols[3] > 0) {
- option2.cols[0][i + 1]["width"] = dataCols[3];
- }
- //璁剧疆鍐呭瀛椾綋澶у皬
- if (data1.data[0].HFontSize != 0) {
- option2.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
- } else {
- option2.cols[0][i + 1]["style"] = "font-size:100%";
- }
- //璁剧疆鍒楀
- //if (data1.data[0].HColumnWidth != 0) {
- // option2.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
- //} else {
- // option2.cols[0][i + 1]["width"] = "";
- //}
- //鏄剧ず鍒�
- if (dataCols[1] == 0 && $.inArray(option2.cols[0][i + 1]["title"], titleData2) == -1) {
- option2.cols[0][i + 1]["hide"] = false;
- }
- //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
- switch (dataCols[2]) {
- case "L":
- option2.cols[0][i + 1]["align"] = "left";
- break;
- case "M":
- option2.cols[0][i + 1]["align"] = "center";
- break;
- case "R":
- option2.cols[0][i + 1]["align"] = "right";
- break;
- }
- }
-
- //鍙栨秷鍐荤粨鍒�
- for (var i = 1; i < option2.cols[0].length - 1; i++) {
- if (option2.cols[0][i]["fixed"] != null) {
- option2.cols[0][i]["fixed"] = null;
- }
- else {
- break;
- }
- }
- //鍐荤粨鍒�
- if (data1.data[0].HFixCols != 0) {
- for (var i = 0; i < data1.data[0].HFixCols; i++) {
- if ($.inArray(option2.cols[0][i + 1]["title"], titleData2) != -1) {
- data1.data[0].HFixCols += 1;
- }
- option2.cols[0][i + 1]["fixed"] = "left";
- }
- }
- table.render(option2);
- } else {
- table.render(option2);
- }
- }, error: function () {
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
- }
- })
- }
- //#endregion
-
- //#region 闅愯棌鍒� 鏄剧ず鍒楁暟鎹� 锛堝櫒鍏锋竻鍗曪級
- //闅愯棌
- function get_HideColumn3() {
- var colName = "";
- for (var i = 1; i < option3.cols[0].length - 1; i++) {
- colName += option3.cols[0][i]["title"] + ",";
- }
-
- colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
- layer.open({
- type: 2
- , skin: "layui-layer-rim" //鍔犱笂杈规
- , title: "闅愯棌鍒楄缃�" //鏍囬
- , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
- , shift: 2 //寮瑰嚭鍔ㄧ敾
- , area: ["50%", "90%"] //绐椾綋澶у皬
- , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ['../../鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + "_Mod" + '&colName=' + colName, "yes"]
- , btn: ["纭畾", "鍙栨秷"]
- , btn1: function (index, laero) {
- //鍒锋柊琛ㄦ牸鏁版嵁
- DisPlay_HideColumn_Mod();
- //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
- layer.close(index);//鍏抽棴寮圭獥
- }
- })
- }
-
- //鏄剧ず
- function DisPlay_HideColumn_Mod() {
- $.ajax({
- url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
- type: "GET",
- data: { "HModName": HModName + "_Mod", "user": sessionStorage["HUserName"] },
- success: function (data1) {
- if (data1.data.length != 0) {
-
-
- var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
- /*var titleData = ["hmainid", "hicmointerid", "HWorkShopID", "HDeptID", "HMaterID", "HMaterID2", "HUnitID", "HBillType", "hsubid"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�*/
-
- dataCol = data1.data[0].HGridString.split(',');
-
- for (var i = 0; i < option3.cols[0].length - 2; i++) {
- if (dataCol[i]) {
- var dataCols = dataCol[i].split('|');
- }
- //闅愯棌鍒�
- if (dataCols[1] == 1) {
- option3.cols[0][i + 1]["hide"] = true;
- }
- //璁剧疆鍒楀
- if (dataCols[3] > 0) {
- option3.cols[0][i + 1]["width"] = dataCols[3];
- }
- //璁剧疆鍐呭瀛椾綋澶у皬
- if (data1.data[0].HFontSize != 0) {
- option3.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
- } else {
- option3.cols[0][i + 1]["style"] = "font-size:100%";
- }
- //璁剧疆鍒楀
- //if (data1.data[0].HColumnWidth != 0) {
- // option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
- //} else {
- // option.cols[0][i + 1]["width"] = "";
- //}
- //鏄剧ず鍒�
- if (dataCols[1] == 0 && $.inArray(option3.cols[0][i + 1]["title"], titleData3) == -1) {
- option3.cols[0][i + 1]["hide"] = false;
- }
- //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
- switch (dataCols[2]) {
- case "L":
- option3.cols[0][i + 1]["align"] = "left";
- break;
- case "M":
- option3.cols[0][i + 1]["align"] = "center";
- break;
- case "R":
- option3.cols[0][i + 1]["align"] = "right";
- break;
- }
- }
-
- //鍙栨秷鍐荤粨鍒�
- for (var i = 1; i < option3.cols[0].length - 1; i++) {
- if (option3.cols[0][i]["fixed"] != null) {
- option3.cols[0][i]["fixed"] = null;
- }
- else {
- break;
- }
- }
- //鍐荤粨鍒�
- if (data1.data[0].HFixCols != 0) {
- for (var i = 0; i < data1.data[0].HFixCols; i++) {
- if ($.inArray(option3.cols[0][i + 1]["title"], titleData3) != -1) {
- data1.data[0].HFixCols += 1;
- }
- option3.cols[0][i + 1]["fixed"] = "left";
- }
- }
- table.render(option3);
- } else {
- table.render(option3);
- }
- }, error: function () {
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
- }
- })
- }
- //#endregion
-
- //#region 闅愯棌鍒� 鏄剧ず鍒楁暟鎹� 锛堝伐鑹哄弬鏁版竻鍗曪級
- //闅愯棌
- function get_HideColumn4() {
- var colName = "";
- for (var i = 1; i < option4.cols[0].length - 1; i++) {
- colName += option4.cols[0][i]["title"] + ",";
- }
-
- colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
- layer.open({
- type: 2
- , skin: "layui-layer-rim" //鍔犱笂杈规
- , title: "闅愯棌鍒楄缃�" //鏍囬
- , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
- , shift: 2 //寮瑰嚭鍔ㄧ敾
- , area: ["50%", "90%"] //绐椾綋澶у皬
- , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ['../../鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + "_Tech" + '&colName=' + colName, "yes"]
- , btn: ["纭畾", "鍙栨秷"]
- , btn1: function (index, laero) {
- //鍒锋柊琛ㄦ牸鏁版嵁
- DisPlay_HideColumn_Tech();
- //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
- layer.close(index);//鍏抽棴寮圭獥
- }
- })
- }
-
- //鏄剧ず
- function DisPlay_HideColumn_Tech() {
- $.ajax({
- url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
- type: "GET",
- data: { "HModName": HModName + "_Tech", "user": sessionStorage["HUserName"] },
- success: function (data1) {
- if (data1.data.length != 0) {
-
-
- var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
- /*var titleData = ["hmainid", "hicmointerid", "HWorkShopID", "HDeptID", "HMaterID", "HMaterID2", "HUnitID", "HBillType", "hsubid"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�*/
-
- dataCol = data1.data[0].HGridString.split(',');
-
- for (var i = 0; i < option4.cols[0].length - 2; i++) {
- if (dataCol[i]) {
- var dataCols = dataCol[i].split('|');
- }
- //闅愯棌鍒�
- if (dataCols[1] == 1) {
- option4.cols[0][i + 1]["hide"] = true;
- }
- //璁剧疆鍒楀
- if (dataCols[3] > 0) {
- option4.cols[0][i + 1]["width"] = dataCols[3];
- }
- //璁剧疆鍐呭瀛椾綋澶у皬
- if (data1.data[0].HFontSize != 0) {
- option4.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
- } else {
- option4.cols[0][i + 1]["style"] = "font-size:100%";
- }
- //璁剧疆鍒楀
- //if (data1.data[0].HColumnWidth != 0) {
- // option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
- //} else {
- // option.cols[0][i + 1]["width"] = "";
- //}
- //鏄剧ず鍒�
- if (dataCols[1] == 0 && $.inArray(option4.cols[0][i + 1]["title"], titleData4) == -1) {
- option4.cols[0][i + 1]["hide"] = false;
- }
- //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
- switch (dataCols[2]) {
- case "L":
- option4.cols[0][i + 1]["align"] = "left";
- break;
- case "M":
- option4.cols[0][i + 1]["align"] = "center";
- break;
- case "R":
- option4.cols[0][i + 1]["align"] = "right";
- break;
- }
- }
-
- //鍙栨秷鍐荤粨鍒�
- for (var i = 1; i < option4.cols[0].length - 1; i++) {
- if (option4.cols[0][i]["fixed"] != null) {
- option4.cols[0][i]["fixed"] = null;
- }
- else {
- break;
- }
- }
- //鍐荤粨鍒�
- if (data1.data[0].HFixCols != 0) {
- for (var i = 0; i < data1.data[0].HFixCols; i++) {
- if ($.inArray(option4.cols[0][i + 1]["title"], titleData4) != -1) {
- data1.data[0].HFixCols += 1;
- }
- option4.cols[0][i + 1]["fixed"] = "left";
- }
- }
- table.render(option4);
- } else {
- table.render(option4);
- }
- }, error: function () {
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
- }
- })
- }
- //#endregion
-
- //#region 鏂板
- function set_AddNew() {
- var checkStatus = table.checkStatus('mainTable')
- , data = checkStatus.data;
- var HInterID = data[0].hmainid.toString();
- var sWhere = "select distinct b.娴佹按鍙�,a.娴佽浆鍗℃暟閲�,a.浜у搧浠ｇ爜,a.鐗堟湰,a.鎴愬搧缂栧彿,a.浜у搧鍚嶇О,a.鏃ユ湡,a.璁″垝瀹屽伐鏃ユ湡,a.鍗曟嵁鍙�,a.鏉愯川,b.宸ュ簭鍚嶇О,b.妯″叿缂栧彿,b.宸ヨ壓鍙傛暟,a.鍖呰鏍囪瘑,a.鍖呰鏍囪瘑缂栫爜,a.閿�鍞鍗曞彿 from h_v_Sc_ProcessExchangeBillQuery a left join h_v_Sc_ProcessExchangeBillQuerySub b on a.hmainid=b.hmainid where b.hmainid=" + HInterID;
- $.ajax({
- type: "GET",
- url: GetWEBURL() + "/Gy_SOPBillList/WindowPrintList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- async: true,
- data: { "sWhere": sWhere },
- success: function (data) {
- if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
-
- var dataPrint = [];
- for (var i = 0; i < data.data.length; i++) {
- dataPrint.push({ "鍗曟嵁鍙�": data.data[i]["鍗曟嵁鍙�"],"娴佹按鍙�": data.data[i]["娴佹按鍙�"], "宸ュ簭浠ｇ爜": data.data[i]["宸ュ簭浠ｇ爜"], "宸ュ簭鍚嶇О": data.data[i]["宸ュ簭鍚嶇О"], "浜у搧鍚嶇О": data.data[0]["浜у搧鍚嶇О"], "浜у搧浠ｇ爜": data.data[0]["浜у搧浠ｇ爜"], "鏃ユ湡": data.data[0]["鏃ユ湡"], "閿�鍞鍗曞彿": data.data[0]["閿�鍞鍗曞彿"], "鍖呰鏍囪瘑": data.data[0]["鍖呰鏍囪瘑"], "鍖呰鏍囪瘑缂栫爜": data.data[0]["鍖呰鏍囪瘑缂栫爜"], "娴佽浆鍗℃暟閲�": data.data[0]["娴佽浆鍗℃暟閲�"] }
- );
- }
-
- var Customer = {
- "b": dataPrint
- }
-
- //鐩存帴鎵撳嵃
- var args = {
- type: "print",
- showOptionDlg: false, //濡傛灉涓嶆樉绀烘墦鍗板璇濇鑰岀洿鎺ユ墦鍗帮紝灏嗘琛屾敞閲婂幓鎺夊嵆鍙�
- report: urlAddRandomNo("../../grf/ces5.grf"),
- data: Customer
- };
- ////棰勮
- //var args = {
- // report: urlAddRandomNo("../../grf/ces5.grf"),
- // data: Customer
- //};
- webapp_ws_ajax_run(args);
- }
- else {
- layer.msg(data.Message, { icon: 5 });
- }
- layer.closeAll("loading");
+ // The data for our dataset
+ data: {
+ labels: [],
+ datasets: [
+ {
+ label: "ugpm3",
+ borderColor: "rgb(255, 99, 132)",
+ data: [],
+ fill: false,
},
- error: function (err) {
- layer.msg("閿欒:" + err, { icon: 5 });
- }
- });
- }
- //#endregion
-
- //#region 缂栬緫
- function set_ShowBill() {
- var checkStatus = table.checkStatus('mainTable')
- , data = checkStatus.data;
- if (checkStatus.data.length === 1) {
- var linterid = data[0].hmainid;
- //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
- layer.open({
- type: 2
- , area: ['100%', '100%']
- , title: '宸ュ簭鍒楄〃-缂栬緫'
- , shift: 0//寮瑰嚭鍔ㄧ敾
- , content: '../宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeBill.html?OperationType=3&linterid=' + linterid + '&HEntryID=&HSouceBillType='
- })
- } else {
- layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
- }
- }
- //#endregion
-
- //鍒犻櫎
- function set_DeleteBill() {
- var checkStatus = table.checkStatus('mainTable')
- , data = checkStatus.data;
- if (checkStatus.data.length === 1) {
- var HInterID = data[0].hmainid.toString();
-
- //閫昏緫鍒犻櫎鏂规硶
- layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
- $.ajax({
- type: "GET",
- url: GetWEBURL() + "/Sc_ProcessExchangeBill/DeltetProcessExchangeBillByID", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- data: { "HInterID": HInterID, "HPRDORGID": sessionStorage["OrganizationID"], "user": sessionStorage["HUserName"] },
- success: function (result) {
- if (result.count == 1) {
- layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
- // 寰楀埌frame绱㈠紩
- var index = layer.getFrameIndex(window.name);
- //鍏抽棴褰撳墠frame
- layer.close(index);
- //淇敼涓哄姛鍚庡埛鏂扮晫闈�
- window.location.reload();
- });
-
- } else {
- layer.alert(result.code + result.Message, { icon: 5 });
- }
- }, error: function () {
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
- }
- });
- })
- }
- else {
- layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
- }
- }
-
- //鎷嗗垎
- function set_cf() {
- var checkStatus = table.checkStatus('mainTable')
- , data = checkStatus.data;
- if (checkStatus.data.length === 1) {
- var linterid = data[0].hmainid;
- //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
- layer.open({
- type: 2
- , area: ['100%', '100%']
- , title: '宸ュ簭鍒楄〃-缂栬緫'
- , shift: 0//寮瑰嚭鍔ㄧ敾
- , content: '../宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeBill_CF.html?OperationType=1&linterid=' + linterid + '&HEntryID=&HSouceBillType='
- })
- } else {
- layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
- }
- }
-
- //棰勮
- function get_view() {
- var checkStatus = table.checkStatus('mainTable')
- , data = checkStatus.data;
- if (checkStatus.data.length === 1) {
- layer.open({
- type: 2
- , area: ['50%', '50%']
- , title: '鎵撳嵃妯＄増閫夋嫨'
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + data[0].hmainid.toString() + QJQD + '&MyMsg=' + data[0].hmainid.toString() + '&Type=HProcessExchange', 'yes']
- , resize: false
- })
- }
- else {
- layer.msg('璇烽�夋嫨涓�琛屾暟鎹墦鍗帮紒');
- }
- }
- //鎵撳嵃
- function get_print() {
- var checkStatus = table.checkStatus('mainTable')
- , data = checkStatus.data;
- if (checkStatus.data.length === 1) {
- layer.open({
- type: 2
- , area: ['50%', '50%']
- , title: '鎵撳嵃妯＄増閫夋嫨'
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + data[0].hmainid.toString() +","+ QJQD + '&MyMsg=' + data[0].hmainid.toString() + '&Type=HProcessExchange', 'yes']
- , resize: false
- })
- }
- else {
- layer.msg('璇烽�夋嫨涓�琛屾暟鎹墦鍗帮紒');
- }
- }
-
- //宸ュ簭鍑虹珯姹囨姤鍗�
- function set_StationOut() {
- var checkStatus = table.checkStatus('mainTable2')
- , data = checkStatus.data;
- if (data.length === 1) {
- var HProcNo = data[0].娴佹按鍙�.toString();
-
- if (HProcNo == "9999") {
- return layer.msg("娴佹按鍙蜂笉鑳戒负杞伐搴忔祦姘村彿,璇烽噸鏂伴�夋嫨!");
- }
- else {
- layer.open({
- type: 2
- , area: ['100%', '100%']
- , title: '宸ュ簭娴佽浆鍗�-缂栬緫'
- , shift: 0//寮瑰嚭鍔ㄧ敾
- , content: '../../杞﹂棿绠＄悊/宸ュ簭鍑虹珯姹囨姤鍗�/Cj_StationOutBill.html?OperationType=2&HBillNo=' + HBillNo + '&HProcNo=' + HProcNo
- })
- }
-
- } else {
- layer.msg('璇烽�夋嫨涓�琛屾暟鎹笅鎺紒');
- }
- }
-
- //宸ュ簭杩涚珯鎺ユ敹鍗�
- function get_StationIn() {
- var checkStatus = table.checkStatus('mainTable2')
- , data = checkStatus.data;
- if (data.length === 1) {
- var HProcNo = data[0].娴佹按鍙�.toString();
-
- if (HProcNo == "9999") {
- return layer.msg("娴佹按鍙蜂笉鑳戒负杞伐搴忔祦姘村彿,璇烽噸鏂伴�夋嫨!");
- }
- else {
- layer.open({
- type: 2
- , area: ['100%', '100%']
- , title: '宸ュ簭娴佽浆鍗�-缂栬緫'
- , shift: 0//寮瑰嚭鍔ㄧ敾
- , content: '../../杞﹂棿绠＄悊/宸ュ簭杩涚珯鎺ユ敹鍗�/Cj_StationInBill.html?OperationType=2&HBillNo=' + HBillNo + '&HProcNo=' + HProcNo
- })
- }
-
- } else {
- layer.msg('璇烽�夋嫨涓�琛屾暟鎹笅鎺紒');
- }
- }
-
- //#region 鍒锋柊
- function get_Refresh() {
- set_ClearQuery();
- get_Display(sWhere);
- }
- //#endregion
- //浠ヤ笂鏄痩ayui妯″潡
+ {
+ label: "heat",
+ borderColor: "blue",
+ data: [],
+ fill: false,
+ },
+ {
+ label: "humidity",
+ borderColor: "green",
+ data: [],
+ fill: false,
+ },
+ ],
+ },
+ // Configuration options go here
+ options: {
+ title: {
+ display: true,
+ text: new Date().toLocaleDateString(),
+ },
+ },
});
+ const dataList = document.getElementById("received-data-list");
+ /*** find the chart and list tag above***/
+ /*** butConnect listener below ***/
+ let keepReading = true;
+ let reader;
+ let writer;
+ // all data parsed are stored in a list ordered by received time of the data frame.
+ let receivedframe = [];
+ document
+ .getElementById("butConnect")
+ .addEventListener("click", async () => {
+ const port = await navigator.serial.requestPort();
+ await port.open({ baudRate: 9600 }); // set baud rate
+ keepReading = true;
+ reader = port.readable.getReader();
+ writer = port.writable.getWriter();
+ // set how to write to device intervally
+ const writeInt = setInterval(async () => {
+ const commandframe = new Uint8Array([
+ 0x00,
+ 0xff,
+ /*...some bytes to be sent*/
+ ]);
+ await writer.write(commandframe);
+ }, 3000); // send a frame every 3000ms
+
+ while (port.readable && keepReading) {
+ try {
+ while (true) {
+ const { value, done } = await reader.read();
+ if (done) {
+ // Allow the serial port to be closed later.
+ reader.releaseLock();
+ // Allow the serial port to be closed later.
+ writer.releaseLock();
+ break;
+ }
+ if (value) {
+ /*** TODO: deal with the data value ***/
+ dealWithData(value);
+ }
+ }
+ } catch (error) {
+ // Handle non-fatal read error.
+ console.error(error);
+ } finally {
+ console.log(port.readable, keepReading);
+ }
+ }
+ clearInterval(writeInt);
+ await port.close();
+ console.log("port closed");
+ });
+ /*** butConnect listener above ***/
+
+ /*** function dealWithData below ***/
+ function dealWithData(value) {
+ // check the frame
+ function checkSum(buf) {
+ let checksum = 0;
+ buf.forEach((val, idx) => {
+ if (idx > 0 && idx < 12) {
+ checksum += val;
+ } else if (idx == 12) {
+ checksum = (~checksum & 0xff) + 1;
+ }
+ });
+ return buf[12] == checksum;
+ }
+
+ if (checkSum(value)) {
+ // parse the frame
+ let ugpm3 = (value[2] << 8) | value[3];
+ let heat = ((value[8] << 8) | value[9]) / 100;
+ let humidity = ((value[10] << 8) | value[11]) / 100;
+ let datatime = new Date();
+ let frame = {
+ datatime,
+ ugpm3,
+ heat,
+ humidity,
+ };
+
+ // record the frame
+ receivedframe.push(frame);
+
+ // print data on the page
+ dataList.innerHTML += `<p>[${datatime.toLocaleString()}] -> ugpm3: ${ugpm3}, heat: ${heat}, humidity: ${humidity}</p>`;
+
+ // update the chart
+ chart.data.labels.push(datatime.toLocaleTimeString());
+ chart.data.datasets.forEach((dataset) => {
+ dataset.data.push(frame[dataset.label]);
+ });
+ chart.update();
+ }
+ }
+ /*** function dealWithData above ***/
+
+ /*** butEnd listener below ***/
+ document.getElementById("butEnd").addEventListener("click", async () => {
+ keepReading = false;
+ reader.cancel();
+ // create a new handle
+ const jsonHandle = await window.showSaveFilePicker();
+ // create a FileSystemWritableFileStream to write to
+ const writableStream = await jsonHandle.createWritable();
+ // write our file
+ const aBlob = new Blob([JSON.stringify(receivedframe)], {
+ type: "text/plain",
+ });
+ await writableStream.write(aBlob);
+ receivedframe = [];
+ // close the file and write the contents to disk.
+ await writableStream.close();
+ });
+ /*** butEnd listener above ***/
</script>
-
</body>
</html>
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\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 f3e0f77..fdb86dc 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"
@@ -542,7 +542,7 @@
return;
}
//console.log(data.field);
- var oMain = JSON.stringify(data.field) + ";" + sessionStorage["HUserName"];
+ var oMain = JSON.stringify(data.field) + ";" + sessionStorage["HUserName"] + ";" + OperationType;
//var oMain = data.field;
var HUserName = sessionStorage["HUserName"];
var index = layer.load();
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\212\245\344\273\267\345\215\225/Sup_QuotePriceBillEdit.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\212\245\344\273\267\345\215\225/Sup_QuotePriceBillEdit.html"
index b525738..ceee5b2 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\212\245\344\273\267\345\215\225/Sup_QuotePriceBillEdit.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\212\245\344\273\267\345\215\225/Sup_QuotePriceBillEdit.html"
@@ -2,7 +2,7 @@
<html>
<head>
<meta charset="utf-8" />
- <title>渚涘簲鍟嗚浠峰崟缂栬緫</title>
+ <title>渚涘簲鍟嗘姤浠峰崟缂栬緫</title>
<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>
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\212\245\344\273\267\345\215\225/Sup_QuotePriceBillList.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\212\245\344\273\267\345\215\225/Sup_QuotePriceBillList.html"
index bace387..7294282 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\212\245\344\273\267\345\215\225/Sup_QuotePriceBillList.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\212\245\344\273\267\345\215\225/Sup_QuotePriceBillList.html"
@@ -2,7 +2,7 @@
<html>
<head>
<meta charset="utf-8" />
- <title>渚涘簲鍟嗚浠峰崟鍒楄〃</title>
+ <title>渚涘簲鍟嗘姤浠峰崟鍒楄〃</title>
<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>
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillList.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillList.html"
index 2d0d5b2..f8b6985 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillList.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillList.html"
@@ -86,6 +86,12 @@
</div>
<div class="layui-inline">
<label class="layui-form-label">涓氬姟鍛�</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HEmpName" id="HEmpName" style="width:190px;">
+ </div>
+ </div>
+ <!--<div class="layui-inline">
+ <label class="layui-form-label">涓氬姟鍛�</label>
<div class="layui-input-block" style="width:190px;">
<select name="HEmpName" lay-filter="HEmpName" id="HEmpName">
<option value="">鍏ㄩ儴</option>
@@ -96,7 +102,7 @@
<option value="鏄撴柊绾�">鏄撴柊绾�</option>
</select>
</div>
- </div>
+ </div>-->
<div class="layui-inline">
<label class="layui-form-label">鍗忓悓鐘舵��</label>
<div class="layui-input-block">
@@ -108,11 +114,11 @@
</div>
</div>
<!--<div class="layui-inline">
- <label class="layui-form-label">鍙嶉鐘舵��</label>
- <div class="layui-input-block">
- <input type="text" class="layui-input" name="HXTFKStatus" id="HXTFKStatus" style="width:190px;">
- </div>
- </div>-->
+ <label class="layui-form-label">鍙嶉鐘舵��</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HXTFKStatus" id="HXTFKStatus" style="width:190px;">
+ </div>
+ </div>-->
<div class="layui-inline">
<label class="layui-form-label">鐗╂枡缂栫爜</label>
<div class="layui-input-block">
@@ -211,6 +217,9 @@
var option = [];
var Name = "MouldProdInHouseCellWidth";
var HModName = "Cg_POOrderBillList";
+ //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ var titleData = ["hmainid","HBillType", "HSupID", "HPSStyleID", "HSSID", "HCurID", "HDeptID", "HManagerID", "HEmpID", "hsubid", "HMaterID", "HUnitID",
+ "HFeedback", "HPriority", "HUserID"];
//#endregion
//#region 杩涘叆椤甸潰鏃㈠姞杞�
@@ -445,23 +454,63 @@
}
//鍔犺浇缃戞牸
function get_Display(sWhere) {
- var wait = layer.load();//閬僵
+ var ajaxLoad = layer.load();
$.ajax({
url: GetWEBURL() + '/Cg_POOrderBill/list',
type: "GET",
data: { "sWhere": sWhere , "user": sessionStorage["HUserName"]},
success: function (data1) {
if (data1.count == 1) {
- DataList = data1.data;
- option.data = data1.data;
+ var data = [];
+ var col = [];
+ //缁欑┖鐨勬暟缁勮祴鍊�
+ for (var key in data1.list) {
+ data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+ }
+ //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+ col.push({ type: 'checkbox', fixed: 'left' });
+ for (var i = 0; i < data.length; i++) {
+ // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
+ if ($.inArray(data[i].name, titleData) > -1) {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+ }
+ else {
+ switch (data[i].Type) {
+ //int
+ case 'DateTime':
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
+ break;
+ default:
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+ }
+ }
+ }
+
+ //鍔ㄦ�佹樉绀哄垪鍚�
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , cols: [col]
+ , data: data1.data
+ , height: 550
+ , page: true
+ , cellMinWidth: 90
+ , limit: 50
+ , limits: [50, 500, 5000, 20000]
+ }
table.render(option);
- layer.close(wait);
+
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
+
+ layer.close(ajaxLoad);
+ //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
} else {
- layer.close(wait);
- layer.alert(data1.Message, { icon: 5 });
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
}
}, error: function () {
- layer.close(wait);
+ layer.close(ajaxLoad);
layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
}
});
--
Gitblit v1.9.1