From c70718b511583294298b1055f8e581c1ec18f97e Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期五, 19 八月 2022 14:45:57 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI
---
WebTM/views/验收入库/外购入库/Kf_POStockInBill_Fast.html | 7 -
WebTM/views/验收入库/外购入库/Kf_POStockInBill_FastList.html | 12 ++
WebTM/views/验收入库/产品入库/Kf_ProductInBill_Fast.html | 12 -
WebTM/views/验收入库/产品入库/Kf_ProductInBill_FastList.html | 12 ++
WebTM/views/仓存管理/仓库调拨/Kf_MoveStockBill_Fast.html | 14 +-
WebTM/views/领料发货/领料出库/Kf_MateOutBill_FastList.html | 12 ++
WebTM/views/领料发货/销售出库/Kf_SellOutBill_Fast.html | 186 ++++++++++++++++++-------------------
WebTM/Properties/PublishProfiles/JFTM.pubxml.user | 3
8 files changed, 133 insertions(+), 125 deletions(-)
diff --git a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
index 5d4e565..eb6912d 100644
--- a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
+++ b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
@@ -2828,6 +2828,9 @@
<File Include="views/鐢熶骇绠＄悊/鏃ヨ鍒掓姤琛�/ReportMOMaterReadysBillList.html">
<publishTime>08/09/2022 16:56:03</publishTime>
</File>
+ <File Include="views/鐢熶骇绠＄悊/鏃ヨ鍒掓姤琛�/ReportMOMaterReadysBillList.html">
+ <publishTime>08/04/2022 11:04:35</publishTime>
+ </File>
<File Include="views/鐢熶骇绠＄悊/鏃ヨ鍒掓姤琛�/ReportPODemandPlanBillList.html">
<publishTime>06/21/2022 02:57:43</publishTime>
</File>
diff --git "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockBill_Fast.html" "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockBill_Fast.html"
index 389763a..4f2003c 100644
--- "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockBill_Fast.html"
+++ "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockBill_Fast.html"
@@ -845,11 +845,7 @@
//閫�鍑烘寜閽�
form.on('submit(Cancel)', function () {
- //parent.location.href = "../../../views/index.html"
- //window.close();//鍏抽棴褰撳墠椤�
- layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
- window.close();
- });
+ parent.location.href = "../../../views/index.html"
})
//鎻愪氦
@@ -1059,7 +1055,7 @@
type: "Get",
url: GetWEBURL() + "/ProductIn/Delete_Json",
async: true,
- data: { "HInterID": sInterID, "HBillNo": sBillNo, "HBillType": sBillType, "HBarCode": sBarCode },
+ data: { "HInterID": sInterID, "HBillNo": sBillNo, "HBillType": '1207', "HBarCode": sBarCode },
dataType: "json",
success: function (data) {
if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜�
@@ -1137,7 +1133,7 @@
$.ajax({
url: GetWEBURL() + "/MoveStockBill/get_InfoByBarCode_Source_Json",//37181
type: "GET",
- data: { "sCode": sBarCode, "sInterID": sInterID, "HBillType": HBillType, "sBillNo": sBillNo, "sMaker": sMaker, "WhID": WhID, "SPID": SPID, "HSCWhID": HSCWhID, "HSCSPID": HSCSPID, "sQty": sQty, "SourceFlag": sessionStorage["SourceFlag"], "sSourceBillNo": sSourceBillNo, "sHSourceBillType": sHBillType, "HStockInOrgID": HStockInOrgID, "HStockOutOrgID": HStockOutOrgID, "HScanStyle": HScanStyle},
+ data: { "sCode": sBarCode, "sInterID": sInterID, "HBillType": HBillType, "sBillNo": sBillNo, "sMaker": sMaker, "WhID": WhID, "SPID": SPID, "HSCWhID": HSCWhID, "HSCSPID": HSCSPID, "sQty": sQty, "SourceFlag": HSourceFlag, "sSourceBillNo": sSourceBillNo, "sHSourceBillType": sHBillType, "HStockInOrgID": HStockInOrgID, "HStockOutOrgID": HStockOutOrgID, "HScanStyle": HScanStyle},
success: function (result) {
if (result.count == 1) {
sessionStorage["SourceFlag"] = true;
@@ -1276,8 +1272,8 @@
$("#HStockOutOrgName").val(result.data[0].HSTOCKOUTORGName);
}
- $("#HDeptID").val(result.data[0].HDeptID);
- $("#HDeptName").val(result.data[0].HDeptName);
+ //$("#HDeptID").val(result.data[0].HDeptID);
+ //$("#HDeptName").val(result.data[0].HDeptName);
$("#HWHID").val(result.data[0].HWhID);
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 268b641..b4d0f61 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"
@@ -9,7 +9,7 @@
<link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
<link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
<style>
-
+
.layui-col-xs8 {
width: 55.666667%;
}
@@ -78,7 +78,7 @@
<label class="layui-form-label" style="width:60px;padding-left:0px;">鎵弿绫诲瀷</label>
</div>
<div class="layui-col-xs8">
- <select name=" HScanStyle" id="HScanStyle">
+ <select name=" HScanStyle" id="HScanStyle" disabled:"disabled">
<option value="鏁存墭鎵爜">鏁存墭鎵爜</option>
<option value="鍗曚釜鎷嗙爜">鍗曚釜鎷嗙爜</option>
<option value="鍙嶅悜鎷嗙爜">鍙嶅悜鎷嗙爜</option>
@@ -97,7 +97,7 @@
<input type="hidden" name="HWHID_FIFO" id="HWHID_FIFO" lay-verify="HWHID_FIFO" value="0" autocomplete="off" class="layui-input">
</div>
<div class="layui-col-xs3">
- <button type="button" lay-submit="" class="layui-btn" lay-filter="HWHID_FIFO-BT">...</button>
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HWHID_FIFO-BT" disabled:"disabled">...</button>
</div>
</div>
</div>
@@ -231,20 +231,20 @@
<!--鐗╂枡娓呭崟-->
<div class="layui-tab-item">
<div class="layui-form-item" style="padding:0px;margin:0px">
- <div class="layui-row">
- <div class="layui-col-xs4">
- <label class="layui-form-label" style="width:40px;padding-left:0px;">鏉＄爜</label>
- </div>
- <div class="layui-col-xs8">
- <input type="text" name="HBarCode" id="HBarCode" lay-verify="HBarCode" autocomplete="off" class="layui-input">
- </div>
- </div>
- </div>
+ <div class="layui-row">
+ <div class="layui-col-xs4">
+ <label class="layui-form-label" style="width:40px;padding-left:0px;">鏉＄爜</label>
+ </div>
+ <div class="layui-col-xs8">
+ <input type="text" name="HBarCode" id="HBarCode" lay-verify="HBarCode" autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ </div>
<table class="layui-hide" id="wl-table" lay-filter="wl-table"></table>
</div>
<!--鏄庣粏娓呭崟-->
-
+
<div class="layui-tab-item">
<table class="layui-hide" id="mx-table" lay-filter="mx-table"></table>
</div>
@@ -328,11 +328,11 @@
index: 'lib/index' //涓诲叆鍙ｆā鍧�
}).use(['index', 'form', 'laydate', 'table', 'element'], function () {
var $ = layui.$
- , admin = layui.admin
- , layer = layui.layer
- , table = layui.table
- , form = layui.form
- , element = layui.element;
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , element = layui.element;
@@ -346,7 +346,7 @@
, page: true
, cellMinWidth: 90
, cols: [[
- { field: '鍦ㄥ簱鐘舵��', title: '鍦ㄥ簱鐘舵��',width:180 }
+ { field: '鍦ㄥ簱鐘舵��', title: '鍦ㄥ簱鐘舵��', width: 180 }
, { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О' }
, { field: '鎵规', title: '鎵规' }
, { field: '鏁伴噺', title: '鏁伴噺' }
@@ -443,10 +443,10 @@
var params = getUrlVars();
var linterid = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
var lSourceBillType = params[params[2]]; //浠庡崟鎹幏鍙� 婧愬崟绫诲瀷
-
-
- function RoadBillMain(linterid)//鍔犺浇琛ㄥご
+
+
+ function RoadBillMain(linterid)//鍔犺浇琛ㄥご
{
$.ajax({
url: GetWEBURL() + "/Web/GetPonderationBill",
@@ -462,7 +462,7 @@
HSourceFlag = true;
$("#HDeptID").val(result.data[0].HDeptID);
$("#HDeptName").val(result.data[0].HDeptName);
-
+
//$("#HWHID").val(d.data[0].HWhID);
//$("#HStockPlaceID").val(d.data[0].HSPID);
//$("#HKeeperID").val(d.data[0].HKeeperID);
@@ -570,22 +570,22 @@
// }
//});
}
-
+
//鍔ㄦ�佸姞杞芥簮鍗曠被鍨嬪垪琛� new
-
-
-
+
+
+
//鍒ゆ柇鏄惁鏂板
if (linterid == null || linterid == 0) {
//鑾峰彇鏈�澶у崟鎹彿 new
$("#HInterID").val("");
- $("#HBillNo").val("");
+ $("#HBillNo").val("");
$.ajax({
- url: GetWEBURL() + "/Web/GetMAXNumPDA",
+ url: GetWEBURL() + "/Web/GetMAXNum",
type: "GET",
data: { "HBillType": '1205' },
success: function (d) {
@@ -596,13 +596,12 @@
//$("#HBillNo").val('421458026');
set_InitGrid();
}
- });
+ });
}
else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new-----涓嶄細璧�
RoadBillMain(linterid);
RoadBillSub(linterid);
}
-
form.on('submit(HWHID-BT)', function () {//閫夋嫨浠撳簱
layer.open({
@@ -759,12 +758,7 @@
});
form.on('submit(Cancel)', function () {
- //sessionStorage["SourceFlag"] = false;
- //parent.location.href = "../../../views/index.html"
- //window.close();//鍏抽棴褰撳墠椤�
- layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
- window.location.href = "http://localhost:8082/LuBaoUi/views/index_Mobile.html"
- });
+ parent.location.href = "../../../views/index.html"
})
//缂栬緫
@@ -882,7 +876,7 @@
// success: function (data) {
// if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜�
// table.render({
- // elem: '#wl-table'
+ // elem: '#wl-table'
// , url: GetWEBURL() + '/SellOut/DisBillEntryList_Webs_Json'
// , cellMinWidth: 80
// , toolbar: '#toolbarDemo'
@@ -943,43 +937,43 @@
} else {
Saver(sMainStr);
}
-
+
}
});
//鎻愪氦鏂规硶璋冪敤鐨刟jax
function Saver(sMainStr) {
layer.load(1);
$.ajax(
- {
- type: "POST",
- // url: "http://61.130.49.162:9090/WMSAPI///SellOut/set_SaveSellOutBill_Json", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- url: GetWEBURL() + "/SellOut/set_SaveSellOutBill_Json",
- async: true,
- data: { "oMain": sMainStr },
- dataType: "json",
- success: function (data) {
- if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜�
- layer.confirm(data.Message , {
- icon: 1, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['鏂板'],
- btn2: function () {
- //parent.layui.admin.events.closeThisTabs();鍏抽棴椤电
- //window.close();//鍏抽棴椤甸潰锛屾祻瑙堝櫒鏈夋晥锛孭DA鏃犳晥
- parent.location.href = "../../../views/index.html";
- }//鍏抽棴
- }, function () {
- //sessionStorage["SourceFlag"] = false;
- window.location.reload();
- });//鏂板
+ {
+ type: "POST",
+ // url: "http://61.130.49.162:9090/WMSAPI///SellOut/set_SaveSellOutBill_Json", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ url: GetWEBURL() + "/SellOut/set_SaveSellOutBill_Json",
+ async: true,
+ data: { "oMain": sMainStr },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜�
+ layer.confirm(data.Message, {
+ icon: 1, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['鏂板'],
+ btn2: function () {
+ //parent.layui.admin.events.closeThisTabs();鍏抽棴椤电
+ //window.close();//鍏抽棴椤甸潰锛屾祻瑙堝櫒鏈夋晥锛孭DA鏃犳晥
+ parent.location.href = "../../../views/index.html";
+ }//鍏抽棴
+ }, function () {
+ //sessionStorage["SourceFlag"] = false;
+ window.location.reload();
+ });//鏂板
+ }
+ else {
+ layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ layer.closeAll("loading");
+ },
+ error: function (err) {
+ layer.msg("鎺ュ彛璇锋眰澶辫触锛�" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
- else {
- layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- }
- layer.closeAll("loading");
- },
- error: function (err) {
- layer.msg("鎺ュ彛璇锋眰澶辫触锛�" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- }
- });
+ });
}
//鐩戝惉鎻愪氦
@@ -1004,7 +998,7 @@
form.on('submit(QueDin)', function (data) {
GetMeesageByBarCode();
});
-
+
$('#HStockPlaceName').on('keydown', function (event) { //鎵粨浣�
var HBarCode = $('#HStockPlaceName').val()
@@ -1107,7 +1101,7 @@
//});
//鎵簮鍗�
- $('#HSourceBillNo').on('keydown', function (event) {
+ $('#HSourceBillNo').on('keydown', function (event) {
if (event.keyCode == 13) {
GetMeesageBySourceBillNo();
}
@@ -1123,13 +1117,13 @@
// , url: 'http://localhost:8083/Web/SellOut/GetHBarCodeShowBillSub'
//, toolbar: '#toolbarDemo'
// , where: { sMsg: linterid, sMsg2: lentryid }
- , cols: [[
- , { field: 'HMaterID', title: '鐗╂枡ID', width: 100, hide: true }
- ]]
- , page: true
- , height: 500
- , done: function () {
- }
+ , cols: [[
+ , { field: 'HMaterID', title: '鐗╂枡ID', width: 100, hide: true }
+ ]]
+ , page: true
+ , height: 500
+ , done: function () {
+ }
});
//鎵簮鍗曟煡璐�
@@ -1182,7 +1176,7 @@
}
});
}
-
+
//鎵潯鐮�
function GetMeesageByBarCode(obj) { //杩斿洖宸ヤ綔涓績
var sOldBarCode = $('#HBarCode').val()
@@ -1238,10 +1232,10 @@
}
});
}
- else if (HScanStyle =="鏁存墭鍒犻櫎") {
+ else if (HScanStyle == "鏁存墭鍒犻櫎") {
var HBarCode = $('#HBarCode').val();
var HInterID = $('#HInterID').val();
- if (HBarCode=="") {
+ if (HBarCode == "") {
layer.msg("鏁存墭鍒犻櫎鏉＄爜涓嶈兘涓虹┖", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return;
}
@@ -1305,7 +1299,7 @@
$.ajax({
url: GetWEBURL() + "/SellOut/get_CheckTypeByBarCode_Json",
type: "GET",
- data: { "sCode": sBarCode, "sInterID": sInterID, "HBillType": sBillType, "sBillNo": sBillNo, "sMaker": sMaker, "WhID": sHWHID, "SPID": sHSPID, "sQty": sQty, "sRedBlue": false, "SourceFlag": HSourceFlag, "sSourceBillNo": sSourceBillNo, "sSourceType": sHBillType, "HOWNERID": sessionStorage["OrganizationID"], "HScanStyle": HScanStyle},
+ data: { "sCode": sBarCode, "sInterID": sInterID, "HBillType": sBillType, "sBillNo": sBillNo, "sMaker": sMaker, "WhID": sHWHID, "SPID": sHSPID, "sQty": sQty, "sRedBlue": false, "SourceFlag": HSourceFlag, "sSourceBillNo": sSourceBillNo, "sSourceType": sHBillType, "HOWNERID": sessionStorage["OrganizationID"], "HScanStyle": HScanStyle },
success: function (result) {
playSound1();
if (result.count == 1) {
@@ -1411,7 +1405,7 @@
$.ajax({
url: GetWEBURL() + '/OtherInStockBill/DisBillEntryList_Webs_New_Json1',
type: "GET",
- data: { HBillID: sInterID, HBillNo: sBillNo, HBillType: HBillType, sMouldManagerCtl: sMouldManagerCtl, sFIFOCtl: sFIFOCtl },
+ data: { HBillID: sInterID, HBillNo: sBillNo, HBillType: sBillType, sMouldManagerCtl: sMouldManagerCtl, sFIFOCtl: sFIFOCtl },
success: function (result) {
if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
listOption.data = result.data.list;
@@ -1477,17 +1471,17 @@
, totalRow: true
, cols: [[
{ type: 'radio' }
- , { field: 'HSNO', title: '搴忓彿', width: 60 }
- , { field: 'HQty', title: '鏁伴噺', width: 80, totalRow: true }
- , { field: 'HAuxQty', title: '杈呭姪鏁伴噺', width: 80, totalRow: true }
- , { field: 'HQtyMust', title: '搴斿彂鏁伴噺', width: 80 }
- , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 90 }
- , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 90 }
- , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 90 }
- , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 90 }
- , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 90 }
- , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 90 }
- , { field: 'HBatchNo', title: '鎵规', width: 90 }
+ , { field: 'HSNO', title: '搴忓彿', width: 60 }
+ , { field: 'HQty', title: '鏁伴噺', width: 80, totalRow: true }
+ , { field: 'HAuxQty', title: '杈呭姪鏁伴噺', width: 80, totalRow: true }
+ , { field: 'HQtyMust', title: '搴斿彂鏁伴噺', width: 80 }
+ , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 90 }
+ , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 90 }
+ , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 90 }
+ , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 90 }
+ , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 90 }
+ , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 90 }
+ , { field: 'HBatchNo', title: '鎵规', width: 90 }
]]
, height: 500
, done: function () {
@@ -1537,7 +1531,7 @@
audio.play();
}
//鎵簮鍗�
- function GetMeesageBySourceBillNo(obj) {
+ function GetMeesageBySourceBillNo(obj) {
var HSourceBillNo = $('#HSourceBillNo').val()
var sInterID = $("#HInterID").val()
var sBillNo = $("#HBillNo").val()
@@ -1553,7 +1547,7 @@
$.ajax({
url: GetWEBURL() + "/SellOut/set_SavePonderationBillMain_Temp_Source_Fast_Json",
type: "GET",
- data: { sInterID: sInterID, sBillNo: sBillNo, HBillType: '1205',"HSourceBillType": HSourceBillType, "HSourceBillNo": HSourceBillNo, "sInterID": sInterID, "sBillNo": sBillNo },
+ data: { sInterID: sInterID, sBillNo: sBillNo, HBillType: '1205', "HSourceBillType": HSourceBillType, "HSourceBillNo": HSourceBillNo, "sInterID": sInterID, "sBillNo": sBillNo },
success: function (result) {
if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
//GetSellOutFindSP();
@@ -1628,7 +1622,7 @@
}
});
}
-
+
});
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_FastList.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_FastList.html"
index ebacfd8..63ce67a 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_FastList.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_FastList.html"
@@ -233,8 +233,16 @@
//鎾ら攢鍔熻兘
form.on('submit(cmdRescind)', function () {
- var checkStatus = table.checkStatus('yd-table')
- , data = checkStatus.data;
+ var checkStatus = table.checkStatus('yd-table');
+ var checkStatus2 = table.checkStatus('sy-table');
+ var data = "";
+ if (checkStatus.data.length != 0) {
+ data = checkStatus.data;
+ } else if (checkStatus2.data.length != 0) {
+ data = checkStatus2.data;
+ } else {
+ return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+ }
var sInterID = data[0].HInterID
var sBillNo = data[0].HBillNo
var sBillType = '1204'
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\344\272\247\345\223\201\345\205\245\345\272\223/Kf_ProductInBill_Fast.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\344\272\247\345\223\201\345\205\245\345\272\223/Kf_ProductInBill_Fast.html"
index dd6aa5e..e14d5e3 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\344\272\247\345\223\201\345\205\245\345\272\223/Kf_ProductInBill_Fast.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\344\272\247\345\223\201\345\205\245\345\272\223/Kf_ProductInBill_Fast.html"
@@ -96,9 +96,9 @@
<div class="layui-col-xs8">
<input type="text" name="HSourceBillNo" id="HSourceBillNo" lay-verify="HSourceBillNo" autocomplete="off" class="layui-input">
</div>
- <div class="layui-col-xs2">
+ <!--<div class="layui-col-xs2">
<button type="button" lay-submit="" class="layui-btn" lay-filter="QueDin2">纭畾</button>
- </div>
+ </div>-->
</div>
</div>
</div>
@@ -421,6 +421,7 @@
$("#HBillNo").val(d.data[0].HBillNo);
$("#HBillType").val(d.data[0].HSourceBillType);
$("#HSourceBillNo").val(d.data[0].HSourceBillNo);
+ $("#HSourceBillNo").attr("disabled", "true");
//$("#HWHID").val(d.data[0].HWhID);
//$("#HStockPlaceID").val(d.data[0].HSPID);
//$("#HKeeperID").val(d.data[0].HKeeperID);
@@ -759,12 +760,7 @@
});
form.on('submit(Cancel)', function () {
- //sessionStorage["SourceFlag"] = false;
- //parent.location.href = "../../../views/index.html"
- //window.close();//鍏抽棴褰撳墠椤�
- layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
- window.close();
- });
+ parent.location.href = "../../../views/index.html"
})
////鍒犻櫎
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\344\272\247\345\223\201\345\205\245\345\272\223/Kf_ProductInBill_FastList.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\344\272\247\345\223\201\345\205\245\345\272\223/Kf_ProductInBill_FastList.html"
index 806ebd8..04069e6 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\344\272\247\345\223\201\345\205\245\345\272\223/Kf_ProductInBill_FastList.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\344\272\247\345\223\201\345\205\245\345\272\223/Kf_ProductInBill_FastList.html"
@@ -310,8 +310,16 @@
//鎾ら攢鍔熻兘
form.on('submit(cmdRescind)', function () {
- var checkStatus = table.checkStatus('yd-table')
- , data = checkStatus.data;
+ var checkStatus = table.checkStatus('yd-table');
+ var checkStatus2 = table.checkStatus('sy-table');
+ var data = "";
+ if (checkStatus.data.length != 0) {
+ data = checkStatus.data;
+ } else if (checkStatus2.data.length != 0) {
+ data = checkStatus2.data;
+ } else {
+ return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+ }
var sInterID = data[0].HInterID
var sBillNo = data[0].HBillNo
var sBillType = '1202'
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBill_Fast.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBill_Fast.html"
index e007cf4..150f1c0 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBill_Fast.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBill_Fast.html"
@@ -662,12 +662,7 @@
//閫�鍑�
form.on('submit(Cancel)', function () {
- sessionStorage["SourceFlag"] = false;
- //parent.location.href = "../../../views/index.html"
- //window.close();//鍏抽棴褰撳墠椤�
- layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
- window.close();
- });
+ parent.location.href = "../../../views/index.html"
})
//缂栬緫
form.on('submit(cmdModify)', function () {
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBill_FastList.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBill_FastList.html"
index 9abf502..dfe4c64 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBill_FastList.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBill_FastList.html"
@@ -209,8 +209,16 @@
});
//鎾ら攢鍔熻兘
form.on('submit(cmdRescind)', function () {
- var checkStatus = table.checkStatus('yd-table')
- , data = checkStatus.data;
+ var checkStatus = table.checkStatus('yd-table');
+ var checkStatus2 = table.checkStatus('sy-table');
+ var data = "";
+ if (checkStatus.data.length != 0) {
+ data = checkStatus.data;
+ } else if (checkStatus2.data.length != 0) {
+ data = checkStatus2.data;
+ } else {
+ return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+ }
var sInterID = data[0].HInterID
var sBillNo = data[0].HBillNo
var sBillType = '1201'
--
Gitblit v1.9.1