From 67bb4962ac99bd7c0b1a4434c20f3375fe5bc6a5 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期三, 03 八月 2022 19:02:32 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI
---
WebTM/App_Data/MssqlReportData.cs | 3
WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBill.html | 55 +++
WebTM/views/组装单/Sc_PCruxBindingPDA.html | 72 +++---
WebTM/views/领料发货/销售出库/Kf_SellOutBill_Fast.html | 2
WebTM/Vlog/webapi20220731.txt | 61 +++++
WebTM/views/index_Mobile.html | 8
WebTM/views/领料发货/收料入库/Kf_ReciveBill_Check.html | 2
WebTM/views/领料发货/领料出库/Kf_MateOutBill_Fast.html | 2
WebTM/views/领料发货/收料入库/Kf_ReciveBill_Fast.html | 471 +++++++++++++++++++-------------------
9 files changed, 384 insertions(+), 292 deletions(-)
diff --git a/WebTM/App_Data/MssqlReportData.cs b/WebTM/App_Data/MssqlReportData.cs
index 7c22561..bfbbb2c 100644
--- a/WebTM/App_Data/MssqlReportData.cs
+++ b/WebTM/App_Data/MssqlReportData.cs
@@ -19,10 +19,9 @@
//public const string SqlConnStr = "Data Source=.;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";
//public const string SqlConnStr = "Data Source=.;Initial Catalog=HX_LimsSys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//ch娴嬭瘯
//public const string SqlConnStr = "Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//YL娴嬭瘯
- //public const string SqlConnStr = "Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//涓镐簳
+ public const string SqlConnStr = "Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//涓镐簳
//public const string SqlConnStr = "Data Source=192.168.0.200;Initial Catalog=HX_LimsSys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//涓镐簳鍦板潃
//public const string SqlConnStr = "Data Source=192.168.0.175;Initial Catalog=HX_LimsSys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//闆呯惇璇烘祴璇�
- public const string SqlConnStr = "Data Source=192.168.0.199;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//鐟炵惇
//public const string SqlConnStr = "Data Source=183.129.128.86:26589;Initial Catalog=HX_LimsSys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//鍑礉濂堢壒
//public string sServer;
diff --git a/WebTM/Vlog/webapi20220731.txt b/WebTM/Vlog/webapi20220731.txt
new file mode 100644
index 0000000..acc8676
--- /dev/null
+++ b/WebTM/Vlog/webapi20220731.txt
@@ -0,0 +1,61 @@
+2022/7/31 14:16:08 select b.HInterID,b.HEntryID,a.HDate as 鏃ユ湡,m.HNumber as 鐗╂枡浠ｇ爜,m.HName as 鐗╂枡鍚嶇О,m.HModel as 瑙勬牸鍨嬪彿,
+ b.HPieceQty as 浠舵暟,b.HQty as 鏁伴噺,a.HBillNo as 棰嗘枡鍗曞彿,p.HBillNo as 婧愬崟鍗曞彿,b.HMaker 鍒跺崟浜�,u.HName 璁￠噺鍗曚綅
+ from Kf_ICStockBillMain a
+ left join KF_ICSTOCKBILLSUB_WMS b on b.HInterID=a.HInterID
+ left join Gy_Material m on b.HMaterID=m.HItemID
+ left join gy_unit u on m.HUnitID=u.HItemID
+ JOIN Sc_PPBomBillMain p ON b.HSourceEntryID = p.HICMOEntryID
+ where convert(varchar(50),b.HInterID)+'-'+convert(varchar(50),b.HEntryID) in ('123159-163')
+
+2022/7/31 14:16:08 鎵撳嵃sql:select b.HInterID,b.HEntryID,a.HDate as 鏃ユ湡,m.HNumber as 鐗╂枡浠ｇ爜,m.HName as 鐗╂枡鍚嶇О,m.HModel as 瑙勬牸鍨嬪彿,
+ b.HPieceQty as 浠舵暟,b.HQty as 鏁伴噺,a.HBillNo as 棰嗘枡鍗曞彿,p.HBillNo as 婧愬崟鍗曞彿,b.HMaker 鍒跺崟浜�,u.HName 璁￠噺鍗曚綅
+ from Kf_ICStockBillMain a
+ left join KF_ICSTOCKBILLSUB_WMS b on b.HInterID=a.HInterID
+ left join Gy_Material m on b.HMaterID=m.HItemID
+ left join gy_unit u on m.HUnitID=u.HItemID
+ JOIN Sc_PPBomBillMain p ON b.HSourceEntryID = p.HICMOEntryID
+ where convert(varchar(50),b.HInterID)+'-'+convert(varchar(50),b.HEntryID) in ('123159-163')
+
+2022/7/31 14:18:53 select b.HInterID,b.HEntryID,a.HDate as 鏃ユ湡,m.HNumber as 鐗╂枡浠ｇ爜,m.HName as 鐗╂枡鍚嶇О,m.HModel as 瑙勬牸鍨嬪彿,
+ b.HPieceQty as 浠舵暟,b.HQty as 鏁伴噺,a.HBillNo as 棰嗘枡鍗曞彿,p.HBillNo as 婧愬崟鍗曞彿,b.HMaker 鍒跺崟浜�,u.HName 璁￠噺鍗曚綅
+ from Kf_ICStockBillMain a
+ left join KF_ICSTOCKBILLSUB_WMS b on b.HInterID=a.HInterID
+ left join Gy_Material m on b.HMaterID=m.HItemID
+ left join gy_unit u on m.HUnitID=u.HItemID
+ JOIN Sc_PPBomBillMain p ON b.HSourceEntryID = p.HICMOEntryID
+ where convert(varchar(50),b.HInterID)+'-'+convert(varchar(50),b.HEntryID) in ('123159-163')
+
+2022/7/31 14:18:53 鎵撳嵃sql:select b.HInterID,b.HEntryID,a.HDate as 鏃ユ湡,m.HNumber as 鐗╂枡浠ｇ爜,m.HName as 鐗╂枡鍚嶇О,m.HModel as 瑙勬牸鍨嬪彿,
+ b.HPieceQty as 浠舵暟,b.HQty as 鏁伴噺,a.HBillNo as 棰嗘枡鍗曞彿,p.HBillNo as 婧愬崟鍗曞彿,b.HMaker 鍒跺崟浜�,u.HName 璁￠噺鍗曚綅
+ from Kf_ICStockBillMain a
+ left join KF_ICSTOCKBILLSUB_WMS b on b.HInterID=a.HInterID
+ left join Gy_Material m on b.HMaterID=m.HItemID
+ left join gy_unit u on m.HUnitID=u.HItemID
+ JOIN Sc_PPBomBillMain p ON b.HSourceEntryID = p.HICMOEntryID
+ where convert(varchar(50),b.HInterID)+'-'+convert(varchar(50),b.HEntryID) in ('123159-163')
+
+2022/7/31 14:18:53 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;
+
+2022/7/31 14:18:53 ReportDataSet:1
+
+2022/7/31 14:19:14 select b.HInterID,b.HEntryID,a.HDate as 鏃ユ湡,m.HNumber as 鐗╂枡浠ｇ爜,m.HName as 鐗╂枡鍚嶇О,m.HModel as 瑙勬牸鍨嬪彿,
+ b.HPieceQty as 浠舵暟,b.HQty as 鏁伴噺,a.HBillNo as 棰嗘枡鍗曞彿,p.HBillNo as 婧愬崟鍗曞彿,b.HMaker 鍒跺崟浜�,u.HName 璁￠噺鍗曚綅
+ from Kf_ICStockBillMain a
+ left join KF_ICSTOCKBILLSUB_WMS b on b.HInterID=a.HInterID
+ left join Gy_Material m on b.HMaterID=m.HItemID
+ left join gy_unit u on m.HUnitID=u.HItemID
+ JOIN Sc_PPBomBillMain p ON b.HSourceEntryID = p.HICMOEntryID
+ where convert(varchar(50),b.HInterID)+'-'+convert(varchar(50),b.HEntryID) in ('123159-163')
+
+2022/7/31 14:19:14 鎵撳嵃sql:select b.HInterID,b.HEntryID,a.HDate as 鏃ユ湡,m.HNumber as 鐗╂枡浠ｇ爜,m.HName as 鐗╂枡鍚嶇О,m.HModel as 瑙勬牸鍨嬪彿,
+ b.HPieceQty as 浠舵暟,b.HQty as 鏁伴噺,a.HBillNo as 棰嗘枡鍗曞彿,p.HBillNo as 婧愬崟鍗曞彿,b.HMaker 鍒跺崟浜�,u.HName 璁￠噺鍗曚綅
+ from Kf_ICStockBillMain a
+ left join KF_ICSTOCKBILLSUB_WMS b on b.HInterID=a.HInterID
+ left join Gy_Material m on b.HMaterID=m.HItemID
+ left join gy_unit u on m.HUnitID=u.HItemID
+ JOIN Sc_PPBomBillMain p ON b.HSourceEntryID = p.HICMOEntryID
+ where convert(varchar(50),b.HInterID)+'-'+convert(varchar(50),b.HEntryID) in ('123159-163')
+
+2022/7/31 14:19:14 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;
+
+2022/7/31 14:19:14 ReportDataSet:1
diff --git a/WebTM/views/index_Mobile.html b/WebTM/views/index_Mobile.html
index 5b692fe..0e17adb 100644
--- a/WebTM/views/index_Mobile.html
+++ b/WebTM/views/index_Mobile.html
@@ -396,7 +396,7 @@
<dd>
<a href="棰嗘枡鍙戣揣/鏀舵枡鍏ュ簱/Kf_ReciveBill_Fast.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>
@@ -427,12 +427,6 @@
<a href="浠撳瓨绠＄悊/鏉＄爜搴撳瓨/KF_ICInventoryByMaterID.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="棰嗘枡鍙戣揣/鏀舵枡鍏ュ簱/Kf_ReciveBill_Check.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>
diff --git "a/WebTM/views/\347\273\204\350\243\205\345\215\225/Sc_PCruxBindingPDA.html" "b/WebTM/views/\347\273\204\350\243\205\345\215\225/Sc_PCruxBindingPDA.html"
index d965491..ef3335c 100644
--- "a/WebTM/views/\347\273\204\350\243\205\345\215\225/Sc_PCruxBindingPDA.html"
+++ "b/WebTM/views/\347\273\204\350\243\205\345\215\225/Sc_PCruxBindingPDA.html"
@@ -179,8 +179,8 @@
//琛ㄥご鍒濆鍖栬祴鍊硷紙鏍规嵁鐧诲綍鐢ㄦ埛鑾峰彇宸ュ簭 鐢熶骇璧勬簮銆佹搷浣滃憳銆佺敓浜х彮缁勶級 new
- //宸ュ簭
-
+ //宸ュ簭
+
$("#HProcID").val(sessionStorage["HProcID"]);
$("#HProc").val(sessionStorage["HProc"]);
//鐢熶骇璧勬簮
@@ -315,7 +315,7 @@
}
});
})
-
+
//鍒犻櫎
form.on('submit(cmdDelete)', function () {
var checkStatus = table.checkStatus('tm-table')
@@ -328,7 +328,7 @@
type: "Get",
url: GetWEBURL() + "/Sc_PckSplit/Delete_PHPCruxBillListByME",
async: true,
- data: { "HInterID": sInterID, "HMaterID": sMaterID, "HBarCode": sBarCode},
+ data: { "HInterID": sInterID, "HMaterID": sMaterID, "HBarCode": sBarCode },
dataType: "json",
success: function (data) {
if (data.count == 1) {
@@ -351,33 +351,33 @@
var sSubStr = JSON.stringify(table.cache['pj-table']);
var sSubStr1 = JSON.stringify(table.cache['tm-table']);
var sMainSub = sMainStr + ';' + sSubStr + ';' + sSubStr1 + ';' + sessionStorage["HUserName"];
- $.ajax(
- {
- type: "POST",
- url: GetWEBURL() + "/Sc_PckSplit/Add_PHPCruxBillList",
- async: true,
- data: { "msg": sMainSub },
- dataType: "json",
- success: function (data) {
- if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜�
- layer.msg("鎻愪氦鎴愬姛" + data.Message + $("#HBillNo").val(), { time: 1 * 1000, icon: 1 }, function () {
- location.reload();
- });
- //layer.msg("鎻愪氦鎴愬姛" + data.Message + $("#HBillNo").val(), { icon: 1, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- //location.reload();
- }
- else {
- //layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't' });
- layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- }
- layer.closeAll("loading");
- layui.form.render();
- },
- error: function (err) {
- //layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't' });
- layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ $.ajax(
+ {
+ type: "POST",
+ url: GetWEBURL() + "/Sc_PckSplit/Add_PHPCruxBillList",
+ async: true,
+ data: { "msg": sMainSub },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜�
+ layer.msg("鎻愪氦鎴愬姛" + data.Message + $("#HBillNo").val(), { time: 1 * 1000, icon: 1 }, function () {
+ location.reload();
+ });
+ //layer.msg("鎻愪氦鎴愬姛" + data.Message + $("#HBillNo").val(), { icon: 1, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ //location.reload();
}
- });
+ else {
+ //layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't' });
+ layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ layer.closeAll("loading");
+ layui.form.render();
+ },
+ error: function (err) {
+ //layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't' });
+ layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ });
});
//鐩戝惉鎻愪氦
@@ -410,7 +410,7 @@
url: GetWEBURL() + "/Sc_PckSplit/Get_PHPCruxSNBillList",
type: "GET",
async: false,
- data: { "HinterID": sInterID, "HBarCode": sBarCode, "HProcID": sProcID, "HBillNo": sBillNo},
+ data: { "HinterID": sInterID, "HBarCode": sBarCode, "HProcID": sProcID, "HBillNo": sBillNo },
success: function (result) {
if (result.count == 1) {
option.data = result.data;
@@ -426,7 +426,7 @@
$("#HPCrux").focus();
}
});
- //鍏抽敭浠跺洖杞︽柟娉�
+ //鍏抽敭浠跺洖杞︽柟娉�
$('#HPCrux').on('keydown', function (event) {
var sHPCrux = $('#HPCrux').val()
var sInterID = $('#HInterID').val()
@@ -440,7 +440,7 @@
url: GetWEBURL() + "/Sc_PckSplit/Get_PHPCruxBillList",
type: "GET",
async: false,
- data: { "HinterID": sInterID, "HPCrux": sHPCrux, "HBillNo": sBillNo},
+ data: { "HinterID": sInterID, "HPCrux": sHPCrux, "HBillNo": sBillNo },
success: function (result) {
if (result.count == 1) {
option1.data = result.data;
@@ -507,10 +507,10 @@
option1.data = [];
table1.render(option1);
}
-
+
});
-
-
+
+
</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\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 11d6277..685dbd4 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"
@@ -41,6 +41,7 @@
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_CheckBill" id="set_CheckBill">瀹℃牳</button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_AbandonCheck" id="set_AbandonCheck">鍙嶅鏍�</button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Cancel" id="Cancel">閫�鍑�</button>
+ <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-event="btn-InStorage" lay-filter="btn-InStorage" id="btn-InStorage"></i>鍏ュ簱</button>
</div>
</div>
<div class="layui-form-item" style="padding-top: 10px;">
@@ -504,6 +505,8 @@
, element = layui.element;
//杩涘叆椤甸潰榛樿鍏夋爣鍦ㄦ潯褰㈢爜涓�
$("#HBarCode").focus();
+ //杩涘叆椤甸潰鍏ュ簱鎸夐挳缃伆
+ $('#btn-InStorage').addClass("layui-btn-disabled").attr("disabled", true);
/*鍥哄畾浠ｇ爜锛屾瘡寮犲崟鎹兘瑕乥egin*/
/* 1.鏃犳簮鍗曟柊澧�
@@ -587,8 +590,8 @@
}
-
- function RoadBillMain(linterid)//鍔犺浇琛ㄥご
+ //鍔犺浇琛ㄥご
+ function RoadBillMain(linterid)
{
var index = layer.load();
$.ajax({
@@ -817,14 +820,10 @@
if (data.count == 1) {
layer.close(index);
layer.msg("鎻愪氦鎴愬姛");
-
- $("#HPlanQty").attr("disabled", "true");
- $("#HQty").attr("disabled", "true");
- $("#HWasterQty").attr("disabled", "true");
- $("#HWorkTimes").attr("disabled", "true");
if (result.Verify == "Y") {
location.replace('Cj_StationOutBill.html?OperationType=1&linterid=0&HSouceBillType=&HBillNo=&closeType=2');
- } else {
+ }
+ else {
//淇濆瓨鍚庢祻瑙�
ReRoadBillMain();
}
@@ -837,6 +836,33 @@
error: function (err) {
layer.close(index);
layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ });
+ });
+
+ //鍏ュ簱
+ form.on('submit(btn-InStorage)', function (data) {
+ var InterID = $("#HInterID").val();
+ var BillNo = $("#HBillNo").val();
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Sc_ProcessMangement/SaveICMOReportBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: true,
+ data: { "InterID": InterID, "user": sessionStorage["HUserName"], "BillNo": BillNo, "OrganizationID": sessionStorage["OrganizationID"] },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
+ var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
+ parent.layer.close(index); //鍐嶆墽琛屽叧闂� 聽 聽 聽 聽 聽聽 聽聽聽 聽
+ });
+ }
+ else {
+ layer.alert(data.Message, { icon: 5 });
+ }
+ },
+ error: function (err) {
+ layer.alert(err.Message, { icon: 5 });
}
});
});
@@ -921,9 +947,18 @@
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
, content: ['../../Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HWorker', 'yes']
- , resize: false
- , cancel: function (index, layero) {
+ , 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('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HEmpName").val(checkStatus.data[0].HName);
+ $("#HEmpID").val(checkStatus.data[0].HItemID);
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
+ , btn2: function (index, layero) { }
})
});
//閫夋嫨鎿嶄綔鍛�2
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\346\224\266\346\226\231\345\205\245\345\272\223/Kf_ReciveBill_Check.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\346\224\266\346\226\231\345\205\245\345\272\223/Kf_ReciveBill_Check.html"
index 6246036..8ef19e7 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\346\224\266\346\226\231\345\205\245\345\272\223/Kf_ReciveBill_Check.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\346\224\266\346\226\231\345\205\245\345\272\223/Kf_ReciveBill_Check.html"
@@ -183,14 +183,12 @@
form.on('submit(QueDin)', function (data) {
GetMeesageByBarCode();
});
-
//閫�鍑�-鍏抽棴椤甸潰鏂规硶
$('#btn_Cancel').on('click', function () {
layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
window.close();
});
})
-
//瀹℃牳
form.on('submit(btn_Check)', function (data) {//瀹℃牳
var index = layer.load();
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\346\224\266\346\226\231\345\205\245\345\272\223/Kf_ReciveBill_Fast.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\346\224\266\346\226\231\345\205\245\345\272\223/Kf_ReciveBill_Fast.html"
index 0cbe137..c6c2075 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\346\224\266\346\226\231\345\205\245\345\272\223/Kf_ReciveBill_Fast.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\346\224\266\346\226\231\345\205\245\345\272\223/Kf_ReciveBill_Fast.html"
@@ -1,81 +1,152 @@
锘�<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml">
+<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <title>鍒拌揣鐐规暟</title>
+ <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">
+ <!--寮曠敤layui鏍峰紡鏂囦欢-->
<link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
<link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
-</head>
+ <!--寮曠敤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/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: 50%;
+ }
+
+ .layui-inline, img {
+ display: block;
+ vertical-align: middle
+ }
+
+ .layui-input, .layui-textarea {
+ display: inline-block;
+ width: 50%;
+ 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;
+ }
+ </style>
+</head>
<body>
- <div class="layui-fluid">
- <div class="layui-card" style="padding: 1px">
+ <div class="layui-fluid" style="padding: 0;">
+ <div class="layui-card" style="padding: 15px;background-color: #efefef;">
<div class="layui-card-body" style="padding: 1px;">
- <form class="layui-form" action="" lay-filter="component-form-group">
- <div class="layui-tab" lay-filter="tab-SellOutBackBill">
- <ul class="layui-tab-title" lay-filter="tab-all">
- <li lay-id="1">鍗曟嵁淇℃伅</li>
- <li lay-id="2">鏄庣粏淇℃伅</li>
+ <form class="layui-form" action="" lay-filter="formData" id="formData" style="background-color:white;">
+ <div class="maintitle">鍒拌揣纭</div>
+ <div class="layui-form-item" style="padding-top: 10px;">
+ <div class="layui-row">
+ <label class="layui-form-label" style="width: 85px;"><span style="color:red;">*</span>鏉＄爜</label>
+ <div class="layui-input-block" style="margin-left: 100px;width:46%;">
+ <input type="text" name="HBarCode" id="HBarCode" lay-verify="required" placeholder="璇烽敭鍏ュ悗鍥炶溅" autocomplete="off" class="layui-input">
+ <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="QueDin" name="QueDin" id="QueDin" style="width: 70px; background-color: #1492ff;color:white">纭畾</button>
+ </div>
+ </div>
+ </div>
+
+ <div class="layui-tab layui-tab-card" lay-filter="TabTest">
+ <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">
- <div class="layui-form-item">
+ <div class="layui-form-item" style="padding-top: 10px;">
<div class="layui-row">
- <div class="layui-col-xs4">
- <label class="layui-form-label" style="width:60px;padding-left:0px;">婧愬崟鍙�</label>
- </div>
- <div class="layui-col-xs8">
- <input type="text" name="HSourceBillNo" id="HSourceBillNo" lay-verify="HSourceBillNo" autocomplete="off" class="layui-input">
- <input type="hidden" name="hmainid" id="hmainid" lay-verify="hmainid" autocomplete="off" class="layui-input">
-
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 75px;padding: 9px 5px;">渚涘簲鍟�:</label>
+ <div class="layui-input-block">
+ <input type="text" name="HSupName" id="HSupName" class="layui-input" disabled="disabled">
+ </div>
</div>
</div>
- </div>
- <div class="layui-form-item">
<div class="layui-row">
- <div class="layui-col-xs4">
- <label class="layui-form-label" style="width:60px;padding-left:0px;">渚涘簲鍟�</label>
- </div>
- <div class="layui-col-xs8">
- <input type="text" name="HSupplierName" id="HSupplierName" lay-verify="HSupplierName" readonly autocomplete="off" class="layui-input">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 75px;padding: 9px 5px;">閮ㄩ棬:</label>
+ <div class="layui-input-block">
+ <input type="text" name="HDeptName" id="HDeptName" class="layui-input" disabled="disabled">
+ </div>
</div>
</div>
- </div>
-
- <div class="layui-form-item">
<div class="layui-row">
- <div class="layui-col-xs4">
- <label class="layui-form-label" style="width:60px;padding-left:0px;">閮ㄩ棬</label>
- </div>
- <div class="layui-col-xs8">
- <input type="text" name="HDepartmentNmae" id="HDepartmentNmae" lay-verify="HDepartmentNmae" readonly autocomplete="off" class="layui-input">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 75px;">鍗曟嵁鍙�:</label>
+ <div class="layui-input-block" style="margin-left: 85px;">
+ <input type="text" class="layui-input" name="HBillNo" id="HBillNo" disabled="disabled">
+ <input type="text" class="layui-input" name="HInterID" id="HInterID" disabled="disabled" style="width:100px">
+ </div>
</div>
</div>
</div>
</div>
+
<div class="layui-tab-item">
- <table class="layui-hide" id="wl-table" lay-filter="wl-table"></table>
+ <table class="" id="mainTable" lay-filter="mainTable"></table>
+ <script type="text/html" id="xuhao">
+ {{d.LAY_TABLE_INDEX+1}}
+ </script>
+ <script type="text/html" id="barDemo">
+ <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
+ </script>
</div>
</div>
- <div class="layui-form-item" style="margin-bottom: 20px;">
- <div class="layui-row">
- <div class="layui-col-xs3">
- <button type="button" lay-submit="" class="layui-btn" lay-filter="Saver">纭</button>
- </div>
- </div>
- </div>
+ </div>
+
+ <div class="layer-footer" style="text-align: center;">
+ <button type="button" lay-submit="" class="layui-btn buttom_box_little" lay-filter="btn_Check" id="btn_Check">瀹℃牳</button>
+ <button type="button" class="layui-btn buttom_box_little" lay-filter="btn_Cancel" id="btn_Cancel">閫�鍑�</button>
</div>
</form>
</div>
</div>
</div>
- <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>
layui.config({
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
@@ -87,211 +158,145 @@
, layer = layui.layer
, table = layui.table
, form = layui.form
+ , laydate = layui.laydate
, element = layui.element;
+ var option = [];
+ //鍒濆鍖栬〃鏍�
+ set_InitGrid();
- //琛ㄥご鍒濆鍖栬祴鍊硷紙鏍规嵁鐧诲綍鐢ㄦ埛鑾峰彇 榛樿浠撳簱銆侀儴闂ㄣ�侀獙鏀躲�佷繚绠°�侀噾铦剁敤鎴凤級 new
- $("#HWHID").val(sessionStorage["HWHID"]);
- $("#HWHNAME").val(sessionStorage["HWHName"]);
- $("#HStockPlaceID").val(sessionStorage["HSPID"]);
- $("#HStockPlaceName").val(sessionStorage["HSPName"]);
- //$("#HSupID").val(sessionStorage["HSupID"]);
- //$("#HSupName").val(sessionStorage["HSupName"]);
- $("#HDeptID").val(sessionStorage["HDeptID"]);
- $("#HDeptName").val(sessionStorage["HDept"]);
- $("#HSecManagerID").val(sessionStorage["HSecManagerID"]);
- $("#HSecManager").val(sessionStorage["HSecManager"]);
- $("#HKeeperID").val(sessionStorage["HKeeperID"]);
- $("#HKeeper").val(sessionStorage["HKeeper"]);
- $("#HMaker").val(sessionStorage["HUserName"]);
- $("#HMaker").hide();
- $("#HMakerID").hide();
- $("#HBillerID").val(sessionStorage["HBillerID"]);
- $("#HBillerID").hide();
+ //琛屽唴浜嬩欢
+ table.on('tool(mainTable)', function (obj) {
+ set_GridDelete(obj); //琛屽唴鍒犻櫎
+ });
- //鑾峰彇鍙傛暟
- 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];
+ //杩涘叆椤甸潰榛樿鍏夋爣鍦ㄦ潯褰㈢爜涓�
+ $("#HBarCode").focus();
+
+ //鏉″舰鐮佸洖杞︽柟娉�
+ $('#HBarCode').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ GetMeesageByBarCode();
}
- return vars;
- }
- var params = getUrlVars();
- var linterid = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
- var lSourceBillType = params[params[2]]; //浠庡崟鎹幏鍙� 婧愬崟绫诲瀷
- //function RoadBillMain(linterid)//鍔犺浇琛ㄥご
- //{
- // $.ajax({
- // url: GetWEBURL() + "/Web/GetPonderationBill",
- // type: "GET",
- // data: { "HInterID": linterid },
- // success: function (d) {
- // // console.log(d.data);
- // $("#HInterID").val(d.data[0].HInterID);
- // $("#HBillNo").val(d.data[0].HBillNo);
- // $("#HBillType").val(d.data[0].HSourceBillType);
- // $("#HSourceBillNo").val(d.data[0].HSourceBillNo);
- // //$("#HWHID").val(d.data[0].HWhID);
- // //$("#HKeeperID").val(d.data[0].HKeeperID);
- // //$("#HSecManagerID").val(d.data[0].HSecManagerID);
- // //$("#HDeptID").val(d.data[0].HDeptID);
- // //$("#HBarCode").val(d.data[0].HBarCode);
- // //$("#HQty").val(d.data[0].HQty);
- // RoadSup();
- // }
- // })
- //}
- //function RoadSup()//鏍规嵁婧愬崟绫诲瀷鍙婃簮鍗曞彿 鍔犺浇瀹㈡埛
- //{
- // //var sInterID = $("#HInterID").val()
- // var HSourceBillNo = $('#HSourceBillNo').val()
- // var sInterID = $("#HInterID").val()
- // var sBillNo = $("#HBillNo").val()
- // var HSourceBillType = $("#HBillType").val()
- // //鍒ゆ柇鏂囨湰妗嗘槸鍚︽湁鏁版嵁 new
- // if (HSourceBillNo == "" || sInterID <= 0) {
- // layer.msg($('#HSourceBillNo').val(), { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
- // return;
- // }
- // else {
- // $.ajax({
- // url: GetWEBURL() + "/SellOutBack/get_GetXs_SeOutStockBackBillList",
- // type: "GET",
- // data: { "HSourceBillType": HSourceBillType, "HSourceBillNo": HSourceBillNo, "sInterID": sInterID, "sBillNo": sBillNo },
- // success: function (result) {
- // if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- // $("#HSupID").val(result.data[0].HSupID);
- // $("#HSupName").val(result.data[0].HSupName);
- // $("#HDeptID").val(result.data[0].HDeptID);
- // $("#HDeptName").val(result.data[0].HDeptName);
- // sessionStorage["SourceFlag"] = true;
- // element.tabChange('tab-SellOutBackBill', '2');
- // layer.load(3);
- // }
- // else {
- // layer.msg(result.Message, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
- // }
- // layer.closeAll("loading");
- // }
- // });
- // }
- //}
- function RoadBillSub(HBillno)//鍔犺浇鏁版嵁
- {
+ });
+
+ //纭畾
+ form.on('submit(QueDin)', function (data) {
+ GetMeesageByBarCode();
+ });
+ //閫�鍑�-鍏抽棴椤甸潰鏂规硶
+ $('#btn_Cancel').on('click', function () {
+ layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
+ window.close();
+ });
+ })
+ //瀹℃牳
+ form.on('submit(btn_Check)', function (data) {//瀹℃牳
+ var index = layer.load();
+ var HInterID = $('#HInterID').val();
+ var HBillNo = $('#HBillNo').val();
$.ajax({
- url: GetWEBURL() + "/POStockInBillList/get_InfoByBillNo",
- type: "GET",
- data: { "HBillno": HBillno },
+ url: GetWEBURL() + "/POStockInBillList/AuditPOInStockBill",
+ type: "Get",
+ data: { "HInterID": HInterID, "CurUserName": sessionStorage["HUserName"], "HBillNo": HBillNo},
success: function (result) {
- if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- var data = result.data[0];
- form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
- "HSupplierName": data.渚涘簲鍟�
- , "HDepartmentNmae": data.閮ㄩ棬
- , "hmainid": data.hmainid
- });
+ if (result.code == "1") {
+ layer.msg("瀹℃牳鎴愬姛", { icon: 1, btn: ['纭'], time: 1000000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.close(index);
}
else {
- layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ layer.close(index);
+ layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
-
- table.render({
- elem: '#wl-table'
- , url: GetWEBURL() + '/POStockInBillList/get_InfoByBillNo'
- , toolbar: '#toolbarDemo'
- , where: { "HBillno": HBillno }
- , cols: [[
- { type: 'radio' }
- , { field: '鏁伴噺', title: '鏁伴噺', width: 150 }
- , { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 150 }
- , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 150 }
- , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 150 }
- , { field: '婧愬崟涓诲唴鐮�', title: '婧愬崟涓诲唴鐮�', width: 150 }
- , { field: '婧愬崟瀛愬唴鐮�', title: '婧愬崟瀛愬唴鐮�', width: 150 }
- , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 150 }
- , { field: '婧愬崟绫诲瀷', title: '婧愬崟绫诲瀷', width: 150 }
- ]]
- , height: 500
- , done: function () {
- layer.closeAll("loading");
- }
- });
-
},
- error: function () {
- layer.alert("鍙戠敓閿欒!", { icon: 5 });
+ error: function (err) {
+ layer.close(index);
+ layer.msg("鎺ュ彛璇锋眰澶辫触锛�" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
- var a = 1;
+ });
- }
- //鍒ゆ柇鏄惁鏂板
- /*RoadBillSub("");*/
- //鍗曞彿鍥炶溅
- $('#HSourceBillNo').on('keydown', function (event) {
- //鎵潯鐮�
- if (event.keyCode == 13) {
- if ($("#HSourceBillNo").val() == '') {
- layer.msg("鍗曟嵁鍙蜂负绌猴紝涓嶈兘鎵弿锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return false;
+ //鍒濆鍖栬〃鏍�
+ function set_InitGrid() {
+ //琛ㄥご
+ columns = [
+ { type: 'checkbox', fixed: 'left' }
+ , { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe" }
+ , { field: '鏁伴噺', title: '鍒拌揣鏁伴噺', edit: 'text', hide: true }
+ , { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', edit: 'text', event: "" }
+ , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', edit: 'text' }
+ , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', edit: 'text'}
+ , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 150 }
+ ];
+ option = {
+ id: 'mainTable'
+ , elem: '#mainTable'
+ , page: true
+ , cellMinWidth: 120
+ , height: 500
+ , cols: [columns]
+ , done: function (res, curr, count) {
}
- RoadBillSub($("#HSourceBillNo").val());
- }
+ };
+ option.data = [{ "鏁伴噺": 0, "鐗╂枡浠ｇ爜": 0, "鐗╂枡鍚嶇О": "", "瑙勬牸鍨嬪彿": ""}];
+ table.render(option);
}
- )
-
- //鎻愪氦
- form.on('submit(Saver)', function (data) {//鎻愪氦
- var hmainid = $("#hmainid").val();
- if ($("#hmainid").val() == '') {
- layer.msg("鍏堟壂鎻忓崟鎹紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return false;
- }
- $.ajax(
- {
- type: "POST",
- url: GetWEBURL() + "/POStockInBill/confirm",
- async: true,
- data: { "hmainid": hmainid },
- dataType: "json",
- success: function (data) {
- if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜�
- sessionStorage["SourceFlag"] = false;
- layer.confirm("鏀舵枡" + data.Message + $("#HBillNo").val(), {
- icon: 1,
- skin: 'layui-layer-lan',
- closeBtn: 0,
- btn: ['纭'],
- btn2: function () {
- //parent.layui.admin.events.closeThisTabs();鍏抽棴椤电
- //window.close();//鍏抽棴椤甸潰锛屾祻瑙堝櫒鏈夋晥锛孭DA鏃犳晥
- //window.location.reload();//鏂板
- parent.location.href = "../../../views/index.html"
- }//鍏抽棴
- }
- , function () { parent.location.href = "../../../views/index.html"; }//鏂板
- );
- }
- else {
- //layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't' });
- layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- }
- layer.closeAll("loading");
- layui.form.render();
- },
- error: function (err) {
- //layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't' });
- layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // 琛ㄦ牸琛屽唴浜嬩欢鍒犻櫎
+ function set_GridDelete(obj) {
+ var data = obj.data;
+ var index = layer.load();
+ var rowIndex = $(obj.tr).attr("data-index");
+ if (obj.event === 'del') {
+ layer.confirm('鐪熺殑鍒犻櫎琛屼箞', function (index) {
+ console.log("绱㈠紩涓�:" + rowIndex);
+ if (rowIndex === '0') {
+ layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
+ } else {
+ //obj.del();
+ layer.close(index);
+ var oldData = table.cache["mainTable"];
+ oldData.splice(obj.tr.data('index'), 1);
+ table.reload('mainTable', { data: oldData });
+ layer.close(index);
}
});
- return false;
-
- });
+ }
+ }
+ //鎵潯鐮�
+ function GetMeesageByBarCode(obj) { //杩斿洖宸ヤ綔涓績
+ var HBarCode = $('#HBarCode').val();//鏉″舰鐮侊紙娴佽浆鍗″彿锛夛紙鏁版嵁搴撲腑涓哄崟鎹彿锛�
+ if (!HBarCode) {
+ layer.msg("鏉″舰鐮佷笉鑳戒负绌猴紒")
+ return;
+ }
+ var index = layer.load();
+ $.ajax({
+ url: GetWEBURL() + "/POStockInBillList/Get_ReciveBill",
+ type: "GET",
+ data: { "HBillno": HBarCode },
+ success: function (result) {
+ if (result.code == "1") {
+ var data = result.data[0];
+ $("#HSupName").val(data.渚涘簲鍟�);
+ $("#HDeptName").val(data.閮ㄩ棬);
+ $("#HBillNo").val(data.鍗曟嵁鍙�);
+ $("#HInterID").val(data.hmainid);
+ option.data = result.data;
+ table.render(option);
+ layer.close(index);
+ }
+ else {
+ layer.close(index);
+ layer.msg("鏈煡鎵惧埌鏁版嵁", { 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: "娓╅Θ鎻愮ず" });
+ }
+ });
+ }
+ //浠ヤ笂涓簂ayui妯″潡
});
</script>
-
</body>
-</html>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_Fast.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_Fast.html"
index 7470878..268b641 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_Fast.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_Fast.html"
@@ -763,7 +763,7 @@
//parent.location.href = "../../../views/index.html"
//window.close();//鍏抽棴褰撳墠椤�
layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
- window.close();
+ window.location.href = "http://localhost:8082/LuBaoUi/views/index_Mobile.html"
});
})
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBill_Fast.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBill_Fast.html"
index 9e76c91..d7489ac 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBill_Fast.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBill_Fast.html"
@@ -684,7 +684,7 @@
//parent.location.href = "../../../views/index.html"
//window.close();//鍏抽棴褰撳墠椤�
layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
- window.close();
+ window.history.back();
});
})
--
Gitblit v1.9.1