From fca692325049ff7ecda6ad5191c9192a68c8a097 Mon Sep 17 00:00:00 2001
From: zrg <z1873@LAPTOP-EAVL132E>
Date: 星期四, 26 三月 2026 15:32:40 +0800
Subject: [PATCH] 1
---
WebTM/views/车间管理/单品过站_小卫/Cj_ProcessItemStationPlatform_checkSN.html | 72 ++++
WebTM/views/Baseset/基础资料/saomazutuo_xiaowei.html | 7
WebTM/views/质量管理/巡检记录单/QC_PatrolProcCheckBillList.html | 51 ++
WebTM/views/质量管理/出厂检验单/QC_OutCompCheckBillList.html | 24 +
WebTM/views/模治具管理/模治具管理/Gy_BarCodeBillList.html | 61 ++++
WebTM/views/质量管理/巡检记录单/QC_Add_Edit_PatrolProcCheckBill_XW.html | 13
WebTM/views/质量管理/来料检验单/QC_POStockInCheckBillList.html | 28 +
WebTM/views/基础资料/公用基础资料/HBarPlanPrint.html | 3
WebTM/views/车间管理/单品过站_小卫/Cj_BarCodePrint.html | 527 +++++++++++++++++++++++++++++++++++++
WebTM/views/车间管理/单品过站_小卫/Cj_ProcessItemStationPlatform_UnbindList.html | 19
WebTM/WebTM.csproj | 1
11 files changed, 771 insertions(+), 35 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 1e1674d..0c054ba 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -993,6 +993,7 @@
<Content Include="views\杞﹂棿绠＄悊\鍏抽敭浠剁粦瀹歕Sc_KeyElementBindingList.html" />
<Content Include="views\杞﹂棿绠＄悊\鍏抽敭浠剁粦瀹歕Sc_KeyElementBinding.html" />
<Content Include="views\杞﹂棿绠＄悊\鍗曞搧杩囩珯\SingleItemTransitList.html" />
+ <Content Include="views\杞﹂棿绠＄悊\鍗曞搧杩囩珯_灏忓崼\Cj_BarCodePrint.html" />
<Content Include="views\杞﹂棿绠＄悊\鍗曞搧杩囩珯_灏忓崼\Cj_zuituoxiaowei_cacheList.html" />
<Content Include="views\杞﹂棿绠＄悊\鍗曞搧杩囩珯_灏忓崼\Cj_ProcessItemStationPlatform_ShippingExport.html" />
<Content Include="views\杞﹂棿绠＄悊\鍗曞搧杩囩珯_灏忓崼\Cj_SaveSNByICMO.html" />
diff --git "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/saomazutuo_xiaowei.html" "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/saomazutuo_xiaowei.html"
index 91931a0..b2ce05f 100644
--- "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/saomazutuo_xiaowei.html"
+++ "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/saomazutuo_xiaowei.html"
@@ -482,6 +482,9 @@
success: function (res) {
if (res.count == 1) {
sBarCode = res.data[0].HCaseCode;
+ hform.HBarCode_middle.push(res.data[0].HCaseCode);
+ } else {
+ layer.msg("闈炰腑绠辩爜锛屼笖鏈尮閰嶅埌涓鐮佷俊鎭紒鎵弿鏉＄爜锛�" + sBarCode)
}
},
error: function (res) {
@@ -490,12 +493,14 @@
return;
}
});
+ } else {
+ hform.HBarCode_middle.push(sBarCode);
}
if (!sBarCode) {
layer.msg('鏉＄爜涓嶈兘涓虹┖锛岃鎵弿鏉＄爜锛�', { icon: 2 });
return;
}
- hform.HBarCode_middle.push(sBarCode);
+
console.log(hform.HBarCode_middle)
console.log(sBarCode.toString().charAt(sBarCode.length - 1))
if (sBarCode.toString().charAt(sBarCode.length - 1) != "W") {
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/HBarPlanPrint.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/HBarPlanPrint.html"
index 7801f74..3ff2cb2 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/HBarPlanPrint.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/HBarPlanPrint.html"
@@ -399,6 +399,9 @@
case "HGy_BarCodeBill_xiaowei": //zutuoxiaowei鏄庣粏
CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlLBM_HGy_BarCodeBill_ZB.aspx?linterid=" + value, true, "");
break;
+ case "HGy_BarCodeBill_ZB": //灏忓崼鏍堟澘鐮佹槑缁�
+ CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlLBM_HGy_BarCodeBill_ZB.aspx?linterid=" + value, true, "");
+ break;
}
</script>
</body>
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_BarCodeBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_BarCodeBillList.html"
index 01f1d98..d62e0dc 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_BarCodeBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_BarCodeBillList.html"
@@ -870,7 +870,68 @@
});
}
//#endregion
+
+ //#region 鏍堟澘鐮佹墦鍗�
+ function PrintZB() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ var ModRightName = 'Gy_BarCodeBillList_Print';
+ $.ajax({
+ url: GetWEBURL() + '/Gy_BarCodeBillList/GetBarCodeBillPermission',
+ type: "GET",
+ async: false,
+ data: { "user": sessionStorage["HUserName"] },
+ success: function (res) {
+ if (res.data == 1) {
+ if (checkStatus.data.length == 1) {
+ var rows = '';
+ for (var i = 0; i < data.length; i++) {
+ rows += data[i].涓鐮�.toString() + ',';
+ }
+ rows = rows.substring(rows.length - 1, 0);
+ var sql = "select top 1 HBarCode_Pack from Sc_PackUnionBillsub with(nolock) where HBarCode = '" + rows + "'"
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Gy_SOPBillList/WindowPrintList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: false,
+ data: { "sWhere": sql },
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ rows = data.data[0].rows;
+ }
+ else {
+ layer.msg(data.Message, { icon: 5 });
+ }
+ layer.closeAll("loading");
+ },
+ error: function (err) {
+ layer.msg("閿欒:" + err, { icon: 5 });
+ }
+ })
+
+ layer.open({
+ type: 2
+ , area: ['40%', '80%']
+ , title: '鎵撳嵃妯＄増閫夋嫨'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + rows + '&MyMsg=' + rows + '&Type=HGy_BarCodeBill_ZB', 'yes']
+ , resize: false
+ })
+ }
+ else {
+ layer.msg(get_MessageError('[0000-1-016]璇烽�夋嫨涓�鏉℃暟鎹墦鍗帮紒', sessionStorage["HTranSlate"]));
+ }
+ }
+ else {
+ layer.alert(get_MessageError("鏃犳墦鍗版潈闄�!", sessionStorage["HTranSlate"]), { icon: 5 });
+ }
+ }
+ });
+ }
+ //#endregion
//#region 鍑虹珯鍗曠敓鎴愮殑绠辩爜鎵撳嵃
function PrintX() {
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\207\272\345\216\202\346\243\200\351\252\214\345\215\225/QC_OutCompCheckBillList.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\207\272\345\216\202\346\243\200\351\252\214\345\215\225/QC_OutCompCheckBillList.html"
index 21723b2..5c34623 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\207\272\345\216\202\346\243\200\351\252\214\345\215\225/QC_OutCompCheckBillList.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\207\272\345\216\202\346\243\200\351\252\214\345\215\225/QC_OutCompCheckBillList.html"
@@ -155,6 +155,7 @@
<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="btn_Export" id="btn_Export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_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>
@@ -197,6 +198,7 @@
var size = 50;
var sWhere = "";
var HModName = "QC_OutCompCheckBillList";
+ var ins; //鐢ㄤ簬瀵煎嚭excel
//#region 杩涘叆椤甸潰鍗冲姞杞�
//#region 銆愯繃婊ゆ柟妗堛��
@@ -220,6 +222,9 @@
//#region 澶村伐鍏锋爮浜嬩欢
table.on('toolbar(mainTable)', function (obj) {
switch (obj.event) {
+ //瀵煎嚭鎸夐挳
+ case 'btn_Export': btn_Export();
+ break;
//鏂板鎸夐挳
case 'set_AddNew': set_AddNew();
break;
@@ -475,6 +480,7 @@
option.totalRow = true;
table.render(option);
laypage.render(optionPage);
+ ins = table.render(option);
DisPlay_HideColumn();
@@ -817,7 +823,25 @@
}
//#endregion
+ //#region 瀵煎嚭Execel
+ function btn_Export() {
+ option.data.forEach((item) => {
+ for (let itemobj in item) {
+ if (item[itemobj] == null) {
+ item[itemobj] = "";
+ }
+ if (item[itemobj].length > 0) { // 鍋囪瀛楁鍚嶄负field
+ item[itemobj] = item[itemobj].toString().replaceAll(/[\r\n]+/g, ''); // 灏嗘崲琛岀鏇挎崲涓虹┖瀛楃涓�
+ }
+ if (itemobj === '瑙勬牸鍨嬪彿') {
+ item[itemobj] = item[itemobj].replace(/,/g, '锛�'); // 鏇挎崲鑻辨枃閫楀彿涓轰腑鏂囬�楀彿
+ }
+ }
+ });
+ table.exportFile(ins.config.id, option.data, "xls");
+ }
+ //#endregion
//#region 闅愯棌鍒楄缃�
function get_HideColumn() {
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_XW.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_XW.html"
index a224684..d543814 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_XW.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_XW.html"
@@ -68,7 +68,7 @@
</button>
</div>
</div>
- <div class="layui-inline" style="display:none;">
+ <div class="layui-inline">
<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>
@@ -125,6 +125,12 @@
<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" style="background-color: #efefef4d;" value="0" readonly>
+ </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="HPrdQty" id="HPrdQty" onkeyup="this.value=this.value.replace(/\D/g,'')" lay-verify="" autocomplete="off" class="layui-input" style="" value="0" onfocus="this.select();">
</div>
</div>
<div class="layui-inline">
@@ -1406,10 +1412,11 @@
form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
"HBillNo": data.鍗曟嵁鍙�
, "HDate": formatDate(data.鏃ユ湡)
- //, "HSource": data.鐢熶骇璧勬簮鍚嶇О
- //, "HSourceID": data.鐢熶骇璧勬簮ID
+ , "HSource": data.鐢熶骇璧勬簮鍚嶇О
+ , "HSourceID": data.鐢熶骇璧勬簮ID
, "HICMOBillNo": data.鐢熸垚璁㈠崟鍙�
, "HICMOQty": data.鐢熶骇璁㈠崟鏁伴噺
+ , "HPrdQty": data.浜ч噺
, "HICMOInterID": data.鐢熶骇璁㈠崟涓诲唴鐮�
, "HICMOEntryID": data.鐢熶骇璁㈠崟瀛愬唴鐮�
, "HMaterName": data.浜у搧鍚嶇О
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 f340ab7..7fe68c5 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"
@@ -157,6 +157,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" style="display:none;" lay-event="btn_Export" id="btn_Export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-Add" lay-event="btn-Add"><i class="layui-icon layui-icon-form"></i>鏂板</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-Edit" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-Delete" lay-event="btn-Delete"><i class="layui-icon layui-icon-form"></i>鍒犻櫎</button>
@@ -250,7 +251,7 @@
//鍏敤鍙橀噺
var option = [];
var HModName = "QC_PatrolProcCheckBillList";
-
+ var ins; //鐢ㄤ簬瀵煎嚭excel
//#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
var HModuleType = "7506";
@@ -351,6 +352,9 @@
table.on('toolbar(mainTable)', function (obj) {
var checkStatus = table.checkStatus(obj.config.id);
switch (obj.event) {
+ //瀵煎嚭鎸夐挳
+ case 'btn_Export': btn_Export();
+ break;
case 'btn-Add':
set_AddNew();
break;
@@ -481,23 +485,24 @@
success: function (result) {
if (result.count == 1) {
ajaxReturnData = JSON.parse(JSON.stringify(result)).data;
- table.reload('mainTable', {
- data: ajaxReturnData
- , height: 'full-10'
- , page: {
- curr: _cur_page //蹇呴』浠庣 1 椤靛紑濮�
- }
- , loading: false
- , done: function (index, res) {
- soulTable.render(this);
- }
- });
+ //table.reload('mainTable', {
+ // data: ajaxReturnData
+ // , height: 'full-10'
+ // , page: {
+ // curr: _cur_page //蹇呴』浠庣 1 椤靛紑濮�
+ // }
+ // , loading: false
+ // , done: function (index, res) {
+ // soulTable.render(this);
+ // }
+ //});
+ option.data = ajaxReturnData
+ ins = table.render(option);
layer.close(ajaxLoad);
//杩囨护
if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
ColFilter();
}
-
//鍒锋柊鎸夐挳鏄剧ず
var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
var HBillType = "7506";
@@ -809,6 +814,26 @@
});
}
+ //#region 瀵煎嚭Execel
+ function btn_Export() {
+ option.data.forEach((item) => {
+ for (let itemobj in item) {
+ if (item[itemobj] == null) {
+ item[itemobj] = "";
+ }
+ if (item[itemobj].length > 0) { // 鍋囪瀛楁鍚嶄负field
+ item[itemobj] = item[itemobj].toString().replaceAll(/[\r\n]+/g, ''); // 灏嗘崲琛岀鏇挎崲涓虹┖瀛楃涓�
+ }
+ if (itemobj === '瑙勬牸鍨嬪彿') {
+ item[itemobj] = item[itemobj].replace(/,/g, '锛�'); // 鏇挎崲鑻辨枃閫楀彿涓轰腑鏂囬�楀彿
+ }
+ }
+ });
+
+ table.exportFile(ins.config.id, option.data, "xls");
+ }
+ //#endregion
+
//闅愯棌鍒楄缃�
function get_HideColumn() {
var colName = "";
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\235\245\346\226\231\346\243\200\351\252\214\345\215\225/QC_POStockInCheckBillList.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\235\245\346\226\231\346\243\200\351\252\214\345\215\225/QC_POStockInCheckBillList.html"
index ba41881..b7a4c1c 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\235\245\346\226\231\346\243\200\351\252\214\345\215\225/QC_POStockInCheckBillList.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\235\245\346\226\231\346\243\200\351\252\214\345\215\225/QC_POStockInCheckBillList.html"
@@ -177,13 +177,14 @@
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container">
<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="get_PrintReport"><i class="layui-icon layui-icon-print"></i>棰勮</button>-->
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Export" id="btn_Export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_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="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Close" id="btn-Close"><i class="layui-icon layui-icon-radio"></i>鍏抽棴</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Close" id="btn-Close"><i class="layui-icon layui-icon-radio"></i>鍏抽棴</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeClose" id="btn-DeClose"><i class="layui-icon layui-icon-radio"></i>鍙嶅叧闂�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Drop" id="btn-Drop"><i class="layui-icon layui-icon-radio"></i>浣滃簾</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeDrop" id="btn-DeDrop"><i class="layui-icon layui-icon-radio"></i>鍙嶄綔搴�</button>
@@ -217,6 +218,7 @@
var option = [];
var sWhere = "";
var HModName = "QC_POStockInCheckBillList";
+ var ins; //鐢ㄤ簬瀵煎嚭excel
//#region 杩涘叆椤甸潰鍗冲姞杞�
@@ -242,6 +244,9 @@
//#region 澶村伐鍏锋爮浜嬩欢
table.on('toolbar(mainTable)', function (obj) {
switch (obj.event) {
+ //瀵煎嚭鎸夐挳
+ case 'btn_Export': btn_Export();
+ break;
//鏂板鎸夐挳
case 'set_AddNew': set_AddNew();
break;
@@ -454,6 +459,7 @@
DisPlay_HideColumn();
option.data = data1.data;
table.render(option);
+ ins = table.render(option);
layer.close(ajaxLoad);
} else {
layer.close(ajaxLoad);
@@ -733,6 +739,26 @@
}
//#endregion
+ //#region 瀵煎嚭Execel
+ function btn_Export() {
+ option.data.forEach((item) => {
+ for (let itemobj in item) {
+ if (item[itemobj] == null) {
+ item[itemobj] = "";
+ }
+ if (item[itemobj].length > 0) { // 鍋囪瀛楁鍚嶄负field
+ item[itemobj] = item[itemobj].toString().replaceAll(/[\r\n]+/g, ''); // 灏嗘崲琛岀鏇挎崲涓虹┖瀛楃涓�
+ }
+ if (itemobj === '瑙勬牸鍨嬪彿') {
+ item[itemobj] = item[itemobj].replace(/,/g, '锛�'); // 鏇挎崲鑻辨枃閫楀彿涓轰腑鏂囬�楀彿
+ }
+ }
+ });
+
+ table.exportFile(ins.config.id, option.data, "xls");
+ }
+ //#endregion
+
//闅愯棌鍒楄缃�
function get_HideColumn() {
var colName = "";
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_BarCodePrint.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_BarCodePrint.html"
new file mode 100644
index 0000000..c314878
--- /dev/null
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_BarCodePrint.html"
@@ -0,0 +1,527 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+ <meta charset="utf-8" />
+ <title>鏍囩琛ユ墦</title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <script src="../../../layuiadmin/grwebapp.js"></script>
+ <style type="text/css">
+
+ /*begin 姝ゆ牱寮忕敤浜庢秷闄よ鍏冪礌涓竷灞�瀹藉害涓嶅鐨勯棶棰�*/
+ .layui-form-item .layui-inline {
+ margin-top: 5px;
+ margin-bottom: 5px;
+ margin-right: 0px;
+ }
+ /*end*/
+ .layui-table-cell .layui-form-checkbox[lay-skin="primary"] {
+ margin-left: 35%;
+ }
+
+ .layui-input-block {
+ margin-left: 0px;
+ }
+ </style>
+</head>
+<body>
+ <div id="layout1" class="layui-fluid">
+ <div class="layui-row layui-col-space15">
+ <div class="layui-col-md12">
+ <div class="layui-card">
+ <form id="form0" class="layui-form" lay-filter="component-form-group" action="">
+ <div class="layui-card-header">
+ <div class="layui-input-block">
+ <button type="button" class="layui-btn" id="ToolExit" lay-submit="" lay-filter="ToolExit">閫�鍑�</button>
+ </div>
+ </div>
+ <div class="layui-card-body">
+ <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
+ <h1 style="text-align:center;"><b>鏍囩琛ユ墦</b></h1>
+ <ul class="layui-tab-title">
+ <li lay-id="1" class="layui-this">SN鐮佽ˉ鎵�</li>
+ <li lay-id="2">涓鐮佽ˉ鎵�</li>
+ <li lay-id="3">鏍堟澘鐮佽ˉ鎵�</li>
+ </ul>
+ <div class="layui-tab-content">
+ <div class="layui-tab-item layui-show">
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label">SN妯℃澘</label>
+ <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
+ <select name="HPrintTemplate" id="HPrintTemplate" class="ForFilteringSchemes" lay-filter="HPrintTemplate"
+ lay-verify="HPrintTemplate">
+ <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">SN鐮�</label>
+ <div class="layui-input-inline" style="width:600px;">
+ <input class="layui-input" name="HBarCode" id="HBarCode" autocomplete="off" style="float:left;width:410px;" onfocus="this.select();" placeholder="璇疯緭鍏ュ崟涓ˉ鎵撴潯鐮佺紪鍙凤紝涓嶆敮鎸佹壒閲忚ˉ鎵�">
+ <button type="button" class="layui-btn" id="PrintBarCode" lay-submit="" lay-filter="PrintBarCode" style="float:left;">琛ユ墦鏉＄爜</button>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="layui-tab-item">
+ <div class="layui-inline">
+ <label class="layui-form-label">涓妯℃澘</label>
+ <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
+ <select name="HPrintTemplate_ZX" id="HPrintTemplate_ZX" class="ForFilteringSchemes" lay-filter="HPrintTemplate_ZX"
+ lay-verify="HPrintTemplate_ZX">
+ <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">涓鐮�</label>
+ <div class="layui-input-inline" style="width:600px;">
+ <input class="layui-input" name="HBarCode_ZX" id="HBarCode_ZX" autocomplete="off" style="float:left;width:410px;" onfocus="this.select();" placeholder="璇疯緭鍏ュ崟涓ˉ鎵撴潯鐮佺紪鍙凤紝涓嶆敮鎸佹壒閲忚ˉ鎵�">
+ <button type="button" class="layui-btn" id="PrintBarCode_ZX" lay-submit="" lay-filter="PrintBarCode_ZX" style="float:left;">琛ユ墦鏉＄爜</button>
+ </div>
+ </div>
+ </div>
+ <div class="layui-tab-item">
+ <div class="layui-inline">
+ <label class="layui-form-label">鏍堟澘妯℃澘</label>
+ <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
+ <select name="HPrintTemplate_ZB" id="HPrintTemplate_ZB" class="ForFilteringSchemes" lay-filter="HPrintTemplate_ZB"
+ lay-verify="HPrintTemplate_ZB">
+ <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鏍堟澘鐮�</label>
+ <div class="layui-input-inline" style="width:600px;">
+ <input class="layui-input" name="HBarCode_ZB" id="HBarCode_ZB" autocomplete="off" style="float:left;width:410px;" onfocus="this.select();" placeholder="璇疯緭鍏ュ崟涓ˉ鎵撴潯鐮佺紪鍙凤紝涓嶆敮鎸佹壒閲忚ˉ鎵�">
+ <button type="button" class="layui-btn" id="PrintBarCode_ZB" lay-submit="" lay-filter="PrintBarCode_ZB" style="float:left;">琛ユ墦鏉＄爜</button>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
+ <script type="text/html" id="barDemo">
+ <!--<a class="layui-btn layui-btn-xs" lay-event="edit">缂栬緫</a>-->
+ <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
+ </script>
+ <script>
+ //鑾峰彇鍙傛暟
+ var params = get_UrlVars();
+ if (typeof (params[params[0]]) == "undefined") {
+ var OperationType = 1;//鎿嶄綔绫诲瀷
+ var closeType = 2; //鍏抽棴绫诲瀷
+ } else {
+ debugger;
+ var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
+ var linterid = params[params[1]];//婧愬崟id
+ var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
+ var closeType = params[params[3]]; //鍏抽棴绫诲瀷
+ }
+
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index' //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+ //#region 鍏叡鍙橀噺
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , laydate = layui.laydate
+ , element = layui.element;
+ //鏌ヨ鏉′欢
+ var option = [];
+ var option_New = [];
+ var sWhere = "";
+ var HModName = "Cj_BarCodePrint";
+ var titleData = [];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ var HWhetherToPrint = true; //鏄惁鎵撳嵃
+ var ModRightName = "Gy_BarCodeBillList"; //妯″潡鏉冮檺鍙傛暟
+ var HMaker = sessionStorage["HUserName"]
+ //#endregion
+
+ //#region 杩涘叆椤甸潰鏃㈠姞杞�
+
+ //#region 鐢ㄦ埛妯″潡鏉冮檺鍒ゆ柇
+
+ //鐢ㄦ埛妯″潡鏉冮檺鍒ゆ柇
+ CheckModRight();
+
+ function CheckModRight() {
+ layer.load(3);
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/WEBSController/CheckModRight_Json",
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "ModRightName": ModRightName, "HUserName": HMaker },
+ success: function (d) {
+ if (d.count == 1) {
+ }
+ else {
+ layer.msg(d.Message, {
+ icon: 0, time: 3000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ }, function () {
+ if (linterid == undefined) {
+ //鍏抽棴椤电
+ Pub_Close(2);
+ }
+ else {
+ //鍏抽棴椤电
+ Pub_Close(1);
+ }
+ });
+ }
+ },
+ complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
+ });
+ layer.closeAll("loading");
+ }
+ //#endregion
+
+ //鑾峰彇SN鎵撳嵃妯℃澘
+ getTem_SN();
+ //鑾峰彇涓鎵撳嵃妯℃澘
+ getTem_ZX();
+ //鑾峰彇鏍堟澘鎵撳嵃妯℃澘
+ getTem_ZB();
+ //#endregion
+
+ //琛ユ墦SN鏉＄爜
+ form.on('submit(PrintBarCode)', function (data) {
+ PrintBarCode();
+ })
+ //琛ユ墦涓鏉＄爜
+ form.on('submit(PrintBarCode_ZX)', function (data) {
+ PrintBarCode_ZX();
+ })
+ //琛ユ墦鏍堟澘鏉＄爜
+ form.on('submit(PrintBarCode_ZB)', function (data) {
+ PrintBarCode_ZB();
+ })
+
+ form.on('select(HPrintTemplate)', function (data) {
+ // 2. 鑾峰彇閫変腑鐨勫��
+ const selectedValue = data.value;
+
+ // 3. 淇濆瓨鍒� localStorage锛堥敭鍚嶄负 "BlueToothselectedTemplate"锛�
+ localStorage.setItem('SNselectedTemplate', selectedValue);
+
+ console.log('宸蹭繚瀛橀�夋嫨鐨勬ā鏉�:', selectedValue);
+ });
+
+ form.on('select(HPrintTemplate_ZX)', function (data) {
+ // 2. 鑾峰彇閫変腑鐨勫��
+ const selectedValue = data.value;
+
+ // 3. 淇濆瓨鍒� localStorage锛堥敭鍚嶄负 "BlueToothselectedTemplate"锛�
+ localStorage.setItem('ZXselectedTemplate', selectedValue);
+
+ console.log('宸蹭繚瀛橀�夋嫨鐨勬ā鏉�:', selectedValue);
+ });
+
+ form.on('select(HPrintTemplate_ZB)', function (data) {
+ // 2. 鑾峰彇閫変腑鐨勫��
+ const selectedValue = data.value;
+
+ // 3. 淇濆瓨鍒� localStorage锛堥敭鍚嶄负 "BlueToothselectedTemplate"锛�
+ localStorage.setItem('ZBselectedTemplate', selectedValue);
+
+ console.log('宸蹭繚瀛橀�夋嫨鐨勬ā鏉�:', selectedValue);
+ });
+
+ //SN鏉＄爜缂栧彿鍥炶溅鏂规硶
+ $('#HBarCode').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ PrintBarCode();
+ }
+ });
+
+ //涓鏉＄爜缂栧彿鍥炶溅鏂规硶
+ $('#HBarCode_ZX').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ PrintBarCode_ZX();
+ }
+ });
+
+ //鏍堟澘鏉＄爜缂栧彿鍥炶溅鏂规硶
+ $('#HBarCode_ZB').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ PrintBarCode_ZB();
+ }
+ });
+
+ //閫�鍑�
+ form.on('submit(ToolExit)', function (data) {
+ if (linterid == undefined) {
+ //鍏抽棴椤电
+ Pub_Close(2);
+ }
+ else {
+ //鍏抽棴椤电
+ Pub_Close(1);
+ }
+ });
+
+ //#endregion
+
+ //#region 姝ら〉闈㈡墍鏈夋柟娉�
+
+ //#region 鑾峰彇鎵撳嵃妯℃澘
+ function getTem_SN() {
+ $.ajax({
+ type: "get",
+ async: false,
+ url: GetWEBURL() + "/Open_PrintTem/GetOpenTmpList_Json",
+ data: { "HNumber": "HGy_BarCodeBill" },
+ success: function (result) {
+ var template = "";
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data;
+ for (var i = 0; i < data.length; i++) {
+ template += '<option style="color:blue;" value="' + data[i].HName + '">' + data[i].HName + '</option>';
+ }
+ $("#HPrintTemplate").append(template);
+ $("#HPrintTemplate").val(localStorage.getItem('SNselectedTemplate'))
+ form.render('select');
+ }
+ layer.closeAll("loading");
+ }
+ })
+ }
+
+ function getTem_ZX() {
+ $.ajax({
+ type: "get",
+ async: false,
+ url: GetWEBURL() + "/Open_PrintTem/GetOpenTmpList_Json",
+ data: { "HNumber": "HGy_BarCodeBill_MiddleBox" },
+ success: function (result) {
+ var template = "";
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data;
+ for (var i = 0; i < data.length; i++) {
+ template += '<option style="color:blue;" value="' + data[i].HName + '">' + data[i].HName + '</option>';
+ }
+ $("#HPrintTemplate_ZX").append(template);
+ $("#HPrintTemplate_ZX").val(localStorage.getItem('ZXselectedTemplate'))
+ form.render('select');
+ }
+ layer.closeAll("loading");
+ }
+ })
+ }
+
+ function getTem_ZB() {
+ $.ajax({
+ type: "get",
+ async: false,
+ url: GetWEBURL() + "/Open_PrintTem/GetOpenTmpList_Json",
+ data: { "HNumber": "HGy_BarCodeBill_ZB" },
+ success: function (result) {
+ var template = "";
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data;
+ for (var i = 0; i < data.length; i++) {
+ template += '<option style="color:blue;" value="' + data[i].HName + '">' + data[i].HName + '</option>';
+ }
+ $("#HPrintTemplate_ZB").append(template);
+ $("#HPrintTemplate_ZB").val(localStorage.getItem('ZBselectedTemplate'))
+ form.render('select');
+ }
+ layer.closeAll("loading");
+ }
+ })
+ }
+ //#endregion
+
+
+
+ //琛ユ墦SN鏉＄爜
+ function PrintBarCode() {
+ var HBarCode = $("#HBarCode").val();
+
+ var sWhere = "select top 1 a.HItemID,HBarCode 鏉＄爜缂栧彿,isnull(ms.HCusRelationNumber,'') SKU from Gy_BarCodeBill a with(nolock) left join Gy_Material m with(nolock) on a.HMaterID = m.HItemID left join Gy_MateNumRelation_Sec ms with(nolock) on m.HMASTERID = ms.HMaterID where a.HBarCode = '" + HBarCode + "'";
+
+ if ($("#HPrintTemplate").val().indexOf("闂荤尞") !== -1) {
+ sWhere = "exec h_p_IF_BarCodeBillList_XWPrint '" + HBarCode + "'"
+ }
+
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Gy_SOPBillList/WindowPrintList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: false,
+ data: { "sWhere": sWhere },
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+
+ if (data.data.length != 0) {
+ if (data.data[0].SKU == "") {
+ layer.msg("鐗╂枡SKU鏈淮鎶わ紝璇疯仈绯荤鐞嗗憳纭锛�");
+ return;
+ }
+
+ var dataPrint = [];
+ for (var i = 0; i < data.data.length; i++) {
+ dataPrint.push(data.data[i])
+ }
+
+ var Customer = {
+ "Table": dataPrint
+ }
+
+ var args = {
+ type: "print",//鎵撳嵃妯″紡
+ //type: "preview",//棰勮妯″紡
+ showOptionDlg: false, //濡傛灉涓嶆樉绀烘墦鍗板璇濇鑰岀洿鎺ユ墦鍗帮紝灏嗘琛屾敞閲婂幓鎺夊嵆鍙�
+ report: urlAddRandomNo("../../grf/" + $("#HPrintTemplate").val() + ".grf"),
+ data: Customer
+ };
+
+ console.log("鎵撳嵃SN鏉＄爜锛�" + data.data[0].鏉＄爜缂栧彿);
+
+ webapp_ws_ajax_run(args);
+
+ } else {
+ layer.msg("鏌ユ棤鏁版嵁!");
+ }
+ }
+ else {
+ layer.msg(data.Message, { icon: 5 });
+ }
+ layer.closeAll("loading");
+ },
+ error: function (err) {
+ layer.msg("閿欒:" + err, { icon: 5 });
+ }
+ })
+ }
+
+ //琛ユ墦涓鏉＄爜
+ function PrintBarCode_ZX() {
+ var HBarCode = $("#HBarCode_ZX").val();
+
+ var sWhere = "exec h_p_Gy_GetCaseCodeInfo '" + HBarCode + "'";
+
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Gy_SOPBillList/WindowPrintList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: false,
+ data: { "sWhere": sWhere },
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+
+ if (data.data.length != 0) {
+
+ var dataPrint = [];
+ for (var i = 0; i < data.data.length; i++) {
+ dataPrint.push(data.data[i])
+ }
+
+ var Customer = {
+ "Table": dataPrint
+ }
+
+ var args = {
+ type: "print",//鎵撳嵃妯″紡
+ //type: "preview",//棰勮妯″紡
+ showOptionDlg: false, //濡傛灉涓嶆樉绀烘墦鍗板璇濇鑰岀洿鎺ユ墦鍗帮紝灏嗘琛屾敞閲婂幓鎺夊嵆鍙�
+ report: urlAddRandomNo("../../grf/" + $("#HPrintTemplate_ZX").val() + ".grf"),
+ data: Customer
+ };
+
+ console.log("鎵撳嵃涓鏉＄爜锛�" + data.data[0].鏉＄爜缂栧彿);
+
+ webapp_ws_ajax_run(args);
+
+ } else {
+ layer.msg("鏌ユ棤鏁版嵁!");
+ }
+ }
+ else {
+ layer.msg(data.Message, { icon: 5 });
+ }
+ layer.closeAll("loading");
+ },
+ error: function (err) {
+ layer.msg("閿欒:" + err, { icon: 5 });
+ }
+ })
+ }
+
+ //琛ユ墦鏍堟澘鏉＄爜
+ function PrintBarCode_ZB() {
+ var HBarCode = $("#HBarCode_ZB").val();
+
+ var sWhere = "exec h_p_Gy_GetPalletBarInfo '" + HBarCode + "'";
+
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Gy_SOPBillList/WindowPrintList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: false,
+ data: { "sWhere": sWhere },
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+
+ if (data.data.length != 0) {
+
+ var dataPrint = [];
+ for (var i = 0; i < data.data.length; i++) {
+ dataPrint.push(data.data[i])
+ }
+
+ var Customer = {
+ "Table": dataPrint
+ }
+
+ var args = {
+ type: "print",//鎵撳嵃妯″紡
+ //type: "preview",//棰勮妯″紡
+ showOptionDlg: false, //濡傛灉涓嶆樉绀烘墦鍗板璇濇鑰岀洿鎺ユ墦鍗帮紝灏嗘琛屾敞閲婂幓鎺夊嵆鍙�
+ report: urlAddRandomNo("../../grf/" + $("#HPrintTemplate_ZB").val() + ".grf"),
+ data: Customer
+ };
+
+ console.log("鎵撳嵃鏍堟澘鏉＄爜锛�" + data.data[0].鏉＄爜缂栧彿);
+
+ webapp_ws_ajax_run(args);
+
+ } else {
+ layer.msg("鏌ユ棤鏁版嵁!");
+ }
+ }
+ else {
+ layer.msg(data.Message, { icon: 5 });
+ }
+ layer.closeAll("loading");
+ },
+ error: function (err) {
+ layer.msg("閿欒:" + err, { icon: 5 });
+ }
+ })
+ }
+
+
+ //#endregion
+ });
+ </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\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_UnbindList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_UnbindList.html"
index 463601d..86c6ee0 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_UnbindList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_UnbindList.html"
@@ -328,8 +328,10 @@
//SN鐮佸洖杞︽柟娉�
$('#HBarcode_SN').on('keydown', function (event) {
if (event.keyCode == 13) {
- get_FastQuery(2);
- }
+ //get_FastQuery(2);
+ $('#HBarcode_SN').val($('#HBarcode_SN').val() + ',')
+ //console.log($('#HBarcode_SN').val());
+ }
});
//鏍堟澘鐮佸洖杞︽柟娉�
@@ -551,6 +553,7 @@
// sWhere += " and DSN like '%" + HBarcode_SN + "%'";
//}
if (HBarcode_SN) {
+ HBarcode_SN = HBarcode_SN.substring(0, HBarcode_SN.length - 1)
HBarcode_SN = HBarcode_SN.replace(/锛�/g, ',')
.split(',')
.map(item => `'${item.trim()}'`)
@@ -565,12 +568,12 @@
if (HBarcode_ZX) {
sWhere += "and 涓鐮� like '%" + HBarcode_ZX + "%'";
}
- //if (HDate) {
- // sWhere += " and CONVERT(varchar(100),鐢熶骇鏃ユ湡, 23) >= '" + HDate + "'";
- //}
- //if (HDate1) {
- // sWhere += " and CONVERT(varchar(100),鐢熶骇鏃ユ湡, 23) <= '" + HDate1 + "'";
- //}
+ if (HDate) {
+ sWhere += " and CONVERT(varchar(100),鐢熶骇鏃ユ湡, 23) >= '" + HDate + "'";
+ }
+ if (HDate1) {
+ sWhere += " and CONVERT(varchar(100),鐢熶骇鏃ユ湡, 23) <= '" + HDate1 + "'";
+ }
get_Display(sWhere);
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_checkSN.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_checkSN.html"
index a734252..36e6336 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_checkSN.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_checkSN.html"
@@ -31,21 +31,20 @@
<div class="layui-row">
<div class="layui-input-block" style="display: inline-block; margin-left: 0px; float: left">
<label class="layui-form-label" style="padding-left:0px" id="">闀洉鐮�:</label>
- <input type="text" class="layui-input" name="HBarCode_SN" lay-verify="HBarCode_SN" autocomplete="off" placeholder="璇烽敭鍏ュ悗鍥炶溅" id="HBarCode_SN" style="width: 500px;">
+ <input type="text" class="layui-input" name="HBarCode_SN" lay-verify="HBarCode_SN" autocomplete="off" placeholder="璇烽敭鍏ュ悗鍥炶溅" id="HBarCode_SN" style="width: 400px;">
</div>
<button class="layui-btn layui-btn-normal" style="" type="button" lay-submit="" lay-filter="btnChange" id="btnChange">鍙樻洿</button>
<button class="layui-btn layui-btn-normal" style="float:right" type="button" lay-submit="" lay-filter="btnExit" id="btnExit">閫�鍑�</button>
<div class="layui-input-block" style="display: inline-block; margin-left: 0px; float: right">
- <label class="layui-form-label" style="padding-left:0px" id="">SN鐮�:</label>
- <input type="text" class="layui-input" name="HBarCode_SN2" lay-verify="HBarCode_SN2" autocomplete="off" placeholder="璇烽敭鍏ュ悗鍥炶溅" id="HBarCode_SN2" style="width: 500px;">
+ <label class="layui-form-label" style="padding-left:0px" id="">69鐮�:</label>
+ <input type="text" class="layui-input" name="HBarCode_SN3" lay-verify="HBarCode_SN3" autocomplete="off" placeholder="璇烽敭鍏ュ悗鍥炶溅" id="HBarCode_SN3" style="width: 400px;">
</div>
-
-
-
+ <div class="layui-input-block" style="display: inline-block; margin-left: 0px; float: right">
+ <label class="layui-form-label" style="padding-left:0px" id="">SN鐮�:</label>
+ <input type="text" class="layui-input" name="HBarCode_SN2" lay-verify="HBarCode_SN2" autocomplete="off" placeholder="璇烽敭鍏ュ悗鍥炶溅" id="HBarCode_SN2" style="width: 400px;">
+ </div>
</div>
-
-
</div>
<div class="layui-tab layui-tab-card" style="float: left; background-color: white;height:200px;width:100%">
<ul class="layui-tab-title" lay-filter="tab-all">
@@ -115,6 +114,12 @@
<input type="text" class="layui-input" name="HICMOBillNo" lay-verify="HICMOBillNo" id="HICMOBillNo" value="" style="background-color:#efefef4d;">
<input type="hidden" class="layui-input" name="HICMOInterID" lay-verify="HICMOInterID" id="HICMOInterID" value="0">
<input type="hidden" class="layui-input" name="HICMOEntryID" lay-verify="HICMOEntryID" id="HICMOEntryID" value="0">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;" id="">鏍囩69鐮侊細</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HLabelCode" lay-verify="HLabelCode" id="HLabelCode" style="" placeholder="璇疯緭鍏ユ湰娆＄敓浜х殑鏍囩69鐮�">
</div>
</div>
</div>
@@ -331,8 +336,54 @@
$("#HBarCode_SN").focus();
return
}
- if (HBarCode) {
+ if (HBarCode && ($("#HMaterNumber").val() != '12020042' && $("#HMaterNumber").val() != '12020037')) {
txtHBarCodeSN_KeyDown(HBarCode);
+ } else {
+ if ($("#HBarCode_SN").val() != HBarCode) {
+ layer.confirm("褰╃洅SN鐮佹牎楠屽け璐ヨ妫�鏌�,褰╃洅SN鐮�:" + HBarCode, {
+ btn: ['纭畾'] //鎸夐挳
+ });
+ $("#HBarCode_SN2").val("");
+ $("#HBarCode_SN2").focus();
+ return
+ } else {
+ $("#HBarCode_SN3").focus();
+ }
+ }
+ }
+ });
+
+ //69鐮佸洖杞︽柟娉�
+ $('#HBarCode_SN3').on('keydown', function (event) {
+ if ( $("#HMaterNumber").val() != '12020042' && $("#HMaterNumber").val() != '12020037') {
+ layer.msg("鐗╂枡涓嶇敤鏍￠獙69鏍囩");
+ return
+ }
+
+ var HBarCode2 = $('#HBarCode_SN2').val();
+ var HLabelCode = $('#HLabelCode').val();
+ var HBarCode3 = $('#HBarCode_SN3').val();
+ if (event.keyCode == 13) {
+ if (HBarCode2 == "" || HBarCode2 == null) {
+ layer.msg("鏈壂sn鐮佽鍏堟壂sn鐮�");
+ $("#HBarCode_SN2").focus();
+ return
+ }
+
+ if (HLabelCode == "" || HLabelCode == null) {
+ layer.msg("鏍囩69鐮佹湭鎵嬪伐杈撳叆锛岃杈撳叆鍚庡湪杩涜鏍￠獙姣斿銆�");
+ $("#HLabelCode").focus();
+ return
+ }
+
+ if (HLabelCode != HBarCode3) {
+ layer.msg("69鏍囩鏍￠獙澶辫触锛佹寚瀹�69鐮侊細" + HLabelCode + "锛屾壂鎻�69鐮侊細" + HBarCode3);
+ $("#HLabelCode").focus();
+ return
+ }
+
+ if (HBarCode2) {
+ txtHBarCodeSN_KeyDown(HBarCode2);
}
}
});
@@ -553,6 +604,7 @@
$("#HBarCode_SN").prop("readonly", false);
$("#HBarCode_SN").val("");
$("#HBarCode_SN2").val("");
+ $("#HBarCode_SN3").val("");
$("#HBarCode_SN").focus();
$("#HReturnMessage").text("鎴愬姛鎵爜涓�涓�:" + HBarCode);
@@ -560,6 +612,7 @@
}
else {
$("#HBarCode_SN2").val("");
+ $("#HBarCode_SN3").val("");
layer.close(indexs);
layer.msg(data1.Message, { icon: 5, btn: ["纭"], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "鍑虹幇閿欒" });
}
@@ -567,6 +620,7 @@
},
error: function (err) {
$("#HBarCode_SN2").val("");
+ $("#HBarCode_SN3").val("");
layer.close(indexs);
layer.msg(get_MessageError("閿欒:" + err, sessionStorage["HTranSlate"]), { icon: 5, btn: [get_MessageError('[0000-2-008]纭', sessionStorage["HTranSlate"])], time: 100000, offset: 't', skin: 'layui-layer-lan', title: get_MessageError("[0000-2-009]娓╅Θ鎻愮ず", sessionStorage["HTranSlate"]) });
}
--
Gitblit v1.9.1