From 954616996351bb11b222adac1e0b83bae6b86cfb Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期五, 15 八月 2025 09:35:21 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/WMS扫码模块/生产调拨/Kf_MoveStockStepInBill_PDA.html | 258 ++++++++++++++++++++++++++++++---------------------
1 files changed, 152 insertions(+), 106 deletions(-)
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockStepInBill_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockStepInBill_PDA.html"
index 2ca55d0..daec2cc 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockStepInBill_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockStepInBill_PDA.html"
@@ -31,21 +31,49 @@
</div>
<div class="layui-form-item" style="padding:15px;margin:0px">
<div class="layui-row">
- <div class="layui-col-xs3">
- <label class="layui-form-label" style="width: 30px;padding-left: 0px;">鏉＄爜</label>
- </div>
- <div class="layui-col-xs7">
- <input type="text" name="HBarCode" id="HBarCode" lay-verify="HBarCode" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
- </div>
- <div class="layui-col-xs2">
- <button type="button" lay-submit="" lay-filter="HBarCode-BT" class="layui-btn layui_btn_sm" id="HBarCode-BT">纭畾</button>
- </div>
- <div class="layui-row">
+ <div class="layui-col-xs6">
<div class="layui-col-xs3">
- <label class="layui-form-label" style="width:30px;padding-left:0px;">鏁伴噺</label>
+ <label class="layui-form-label" style="width: 30px;padding-left: 0px;">鏉＄爜</label>
</div>
- <div class="layui-col-xs7">
+ <div class="layui-col-xs9">
+ <input type="text" name="HBarCode" id="HBarCode" lay-verify="HBarCode" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
+ </div>
+ </div>
+ <div class="layui-col-xs6">
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width: 30px; margin-left: 8px; padding-left: 0px;">鏁伴噺</label>
+ </div>
+ <div class="layui-col-xs5">
<input type="number" name="HQty" id="HQty" lay-verify="HQty" onkeyup="if(!this.value.match(/^[\+\-]?\d*?\.?\d*?$/)){if(!this.t_value>0){this.value=''}else{this.value=this.t_value;}}else this.t_value=this.value;if(this.value.match(/^(?:[\+\-]?\d+(?:\.\d+)?)?$/))this.o_value=this.value" autocomplete="off" class="layui-input" onfocus="this.select();">
+ </div>
+ <div class="layui-col-xs4">
+ <button type="button" lay-submit="" lay-filter="HBarCode-BT" class="layui-btn" id="HBarCode-BT" style="width: 45px; margin-left: 8px;padding-left:12px">OK</button>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row" style="margin-top: 5px; margin-bottom: 0px;">
+ <div class="layui-col-xs6">
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:30px;padding-left:0px;">浠撳簱</label>
+ </div>
+ <div class="layui-col-xs6">
+ <input type="text" name="HSCWHName" id="HSCWHName" lay-verify="HSCWHName" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
+ <input type="hidden" name="HSCWHID" id="HSCWHID" lay-verify="HSCWHID" value="0" autocomplete="off" class="layui-input">
+ </div>
+ <div class="layui-col-xs3">
+ <button type="button" lay-submit="" lay-filter="HSCWHID-BT" class="layui-btn" id="HSCWHID-BT" style="width: 30px; margin-left: 8px;padding-left:8px">...</button>
+ </div>
+ </div>
+ <div class="layui-col-xs6">
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:30px;padding-left:0px;">浠撲綅</label>
+ </div>
+ <div class="layui-col-xs6">
+ <input type="text" name="HOutStockPlaceName" id="HOutStockPlaceName" lay-verify="HOutStockPlaceName" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
+ <input type="hidden" name="HOutStockPlaceID" id="HOutStockPlaceID" lay-verify="HOutStockPlaceID" value="0" autocomplete="off" class="layui-input">
+ </div>
+ <div class="layui-col-xs3">
+ <button type="button" lay-submit="" lay-filter="HSCSpID-BT" class="layui-btn" id="HSCSpID-BT" style="width: 30px; margin-left: 8px;padding-left:8px">...</button>
</div>
</div>
</div>
@@ -76,11 +104,18 @@
<div class="layui-col-xs3">
<label class="layui-form-label" style="width:60px;padding-left:0px;">婧愬崟鍗曞彿</label>
</div>
- <div class="layui-col-xs7">
- <input type="text" name="HSourceBillNo" id="HSourceBillNo" lay-verify="HSourceBillNo" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
- </div>
- <div class="layui-col-xs2">
- <button type="button" lay-submit="" lay-filter="HSourceBillNo-BT" class="layui-btn" id="HSourceBillNo-BT">纭畾</button>
+ <div class="layui-col-xs9">
+ <div class="layui-col-xs8">
+ <input type="text" name="HSourceBillNo" id="HSourceBillNo" lay-verify="HSourceBillNo" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
+ </div>
+ <div class="layui-col-xs2">
+ <button type="button" lay-submit="" lay-filter="cmdHSourceBillNo" class="layui-btn" id="cmdHSourceBillNo" style="width: 45px; margin-left: 10px; padding-left: 12px">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-2px;"></i>
+ </button>
+ </div>
+ <div class="layui-col-xs2" style="float: right;">
+ <button type="button" lay-submit="" lay-filter="HSourceBillNo-BT" class="layui-btn" id="HSourceBillNo-BT" style="width: 45px; margin-left: -5px;padding-left:12px">OK</button>
+ </div>
</div>
</div>
<div class="layui-row">
@@ -132,10 +167,10 @@
<div class="layui-tab-item">
<div class="layui-form-item" style="padding:0px;margin:0px">
<div class="layui-row">
- <div class="layui-col-xs2">
+ <div class="layui-col-xs2" style="margin-left:-10px">
<label class="layui-form-label" style="width:60px;padding-left:0px;">璋冨叆浠撳簱</label>
</div>
- <div class="layui-col-xs10">
+ <div class="layui-col-xs10" style="margin-left:10px">
<div class="layui-col-xs10">
<input type="text" name="HWHName" id="HWHName" lay-verify="HWHName" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
<input type="hidden" name="HWHID" id="HWHID" lay-verify="HWHID" value="0" autocomplete="off" class="layui-input">
@@ -148,48 +183,16 @@
</div>
<div class="layui-form-item" style="padding:0px;margin:0px">
<div class="layui-row">
- <div class="layui-col-xs2">
+ <div class="layui-col-xs2" style="margin-left:-10px">
<label class="layui-form-label" style="width:60px;padding-left:0px;">璋冨叆浠撲綅</label>
</div>
- <div class="layui-col-xs10">
+ <div class="layui-col-xs10" style="margin-left:10px">
<div class="layui-col-xs10">
<input type="text" name="HStockPlaceName" id="HStockPlaceName" lay-verify="HStockPlaceName" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
<input type="hidden" name="HStockPlaceID" id="HStockPlaceID" lay-verify="HStockPlaceID" value="0" autocomplete="off" class="layui-input">
</div>
<div class="layui-col-xs2">
<button type="button" lay-submit="" lay-filter="HSpID-BT" class="layui-btn" id="HSpID-BT">...</button>
- </div>
- </div>
- </div>
- </div>
- <div class="layui-form-item" style="padding:0px;margin:0px">
- <div class="layui-row">
- <div class="layui-col-xs2">
- <label class="layui-form-label" style="width:60px;padding-left:0px;">璋冨嚭浠撳簱</label>
- </div>
- <div class="layui-col-xs10">
- <div class="layui-col-xs10">
- <input type="text" name="HSCWHName" id="HSCWHName" lay-verify="HSCWHName" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
- <input type="hidden" name="HSCWHID" id="HSCWHID" lay-verify="HSCWHID" value="0" autocomplete="off" class="layui-input">
- </div>
- <div class="layui-col-xs2">
- <button type="button" lay-submit="" lay-filter="HSCWHID-BT" class="layui-btn" id="HSCWHID-BT">...</button>
- </div>
- </div>
- </div>
- </div>
- <div class="layui-form-item" style="padding:0px;margin:0px">
- <div class="layui-row">
- <div class="layui-col-xs2">
- <label class="layui-form-label" style="width:60px;padding-left:0px;">璋冨嚭浠撲綅</label>
- </div>
- <div class="layui-col-xs10">
- <div class="layui-col-xs10">
- <input type="text" name="HOutStockPlaceName" id="HOutStockPlaceName" lay-verify="HOutStockPlaceName" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
- <input type="hidden" name="HOutStockPlaceID" id="HOutStockPlaceID" lay-verify="HOutStockPlaceID" value="0" autocomplete="off" class="layui-input">
- </div>
- <div class="layui-col-xs2">
- <button type="button" lay-submit="" lay-filter="HSCSpID-BT" class="layui-btn" id="HSCSpID-BT">...</button>
</div>
</div>
</div>
@@ -212,10 +215,10 @@
</div>
<div class="layui-form-item" style="padding:0px;margin:0px">
<div class="layui-row">
- <div class="layui-col-xs2">
+ <div class="layui-col-xs2" style="margin-left:-10px">
<label class="layui-form-label" style="width:60px;padding-left:0px;">璋冨嚭缁勭粐</label>
</div>
- <div class="layui-col-xs10">
+ <div class="layui-col-xs10" style="margin-left:10px">
<select name=" HStockOutOrgID" id="HStockOutOrgID" disabled>
<!--鍔ㄦ�佹覆鏌撶粍缁�-->
</select>
@@ -224,10 +227,10 @@
</div>
<div class="layui-form-item" style="padding:0px;margin:0px">
<div class="layui-row">
- <div class="layui-col-xs2">
+ <div class="layui-col-xs2" style="margin-left:-10px">
<label class="layui-form-label" style="width:60px;padding-left:0px;">璋冨叆缁勭粐</label>
</div>
- <div class="layui-col-xs10">
+ <div class="layui-col-xs10" style="margin-left:10px">
<select name=" HStockInOrgID" id="HStockInOrgID" disabled>
<!--鍔ㄦ�佹覆鏌撶粍缁�-->
</select>
@@ -318,40 +321,40 @@
</div>
<div class="layui-form-item" style="padding: 0px; margin: 0px">
<div class="layui-row">
- <div class="layui-col-xs2">
+ <div class="layui-col-xs2" style="margin-left:-10px">
<label class="layui-form-label" style="width:60px;padding-left:0px;">璋冨叆浠撳簱</label>
</div>
- <div class="layui-col-xs10">
+ <div class="layui-col-xs10" style="margin-left:10px">
<input type="text" name="HWHName_B" id="HWHName_B" class="layui-input" style="border-radius: 5px;background-color:#efefef4d;" disabled>
</div>
</div>
</div>
<div class="layui-form-item" style="padding:0px;margin:0px">
<div class="layui-row">
- <div class="layui-col-xs2">
+ <div class="layui-col-xs2" style="margin-left:-10px">
<label class="layui-form-label" style="width:60px;padding-left:0px;">璋冨叆浠撲綅</label>
</div>
- <div class="layui-col-xs10">
+ <div class="layui-col-xs10" style="margin-left:10px">
<input type="text" name="HSPName_B" id="HSPName_B" class="layui-input" style="border-radius: 5px;background-color:#efefef4d;" disabled>
</div>
</div>
</div>
<div class="layui-form-item" style="padding: 0px; margin: 0px">
<div class="layui-row">
- <div class="layui-col-xs2">
+ <div class="layui-col-xs2" style="margin-left:-10px">
<label class="layui-form-label" style="width:60px;padding-left:0px;">璋冨嚭浠撳簱</label>
</div>
- <div class="layui-col-xs10">
+ <div class="layui-col-xs10" style="margin-left:10px">
<input type="text" name="HSCWHName_B" id="HSCWHName_B" class="layui-input" style="border-radius: 5px;background-color:#efefef4d;" disabled>
</div>
</div>
</div>
<div class="layui-form-item" style="padding:0px;margin:0px">
<div class="layui-row">
- <div class="layui-col-xs2">
+ <div class="layui-col-xs2" style="margin-left:-10px">
<label class="layui-form-label" style="width:60px;padding-left:0px;">璋冨嚭浠撲綅</label>
</div>
- <div class="layui-col-xs10">
+ <div class="layui-col-xs10" style="margin-left:10px">
<input type="text" name="HSCSPName_B" id="HSCSPName_B" class="layui-input" style="border-radius: 5px;background-color:#efefef4d;" disabled>
</div>
</div>
@@ -380,6 +383,7 @@
<input type="hidden" name="HBillType" id="HBillType">
<input type="hidden" name="HBillerID" id="HBillerID">
<input type="hidden" name="HRedBlueFlag" id="HRedBlueFlag">
+ <input type="hidden" name="HSourceBillListCtl" id="HSourceBillListCtl">
<!--澶辫触鎻愮ず闊�-->
<div id="" style="display:none;">
<audio id="cs" hidden controls>
@@ -458,7 +462,7 @@
}
else {
layer.msg(d.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () { parent.location.href = "../../../views/index_Mobile.html"; });
}
},
@@ -510,7 +514,7 @@
$("#HStockOutOrgID").val(sessionStorage["OrganizationID"]);
$("#HBillType").val("1251");
$("#HRedBlueFlag").val("false");
- if (sessionStorage["HSCWHSPFlag"]) {
+ if (sessionStorage["HSCWHID"] != 0 && sessionStorage["HSCWHSPFlag"] == 'false') {
$("#HStockPlaceID").val("0");
$("#HStockPlaceName").val("");
$("#HStockPlaceName").attr("disabled", "disabled");
@@ -522,7 +526,7 @@
$("#HStockPlaceName").removeAttr("disabled");
$('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
}
- if (sessionStorage["HWhSPFlag"]) {
+ if (sessionStorage["HWHID"] != 0 && sessionStorage["HWhSPFlag"] == 'false') {
$("#HOutStockPlaceID").val("0");
$("#HOutStockPlaceName").val("");
$("#HOutStockPlaceName").attr("disabled", "disabled");
@@ -602,7 +606,7 @@
, totalRow: true
, height: 'full-60'
, cellMinWidth: 90
- , limit: 50
+ , limit: 200
};
//婧愬崟瀵瑰簲鎵�鎵弿鏉＄爜
@@ -678,7 +682,7 @@
//鏄剧ず琛ㄤ綋鏄庣粏
DisBillEntryList();
HSourceFlag = true;
- element.tabChange('tab-Kf_MoveStockStepInBill_PDA', '2');
+ element.tabChange('tab-Kf_MoveStockStepInBill_PDA', '3');
}
else {
//鑾峰彇鏈�澶у崟鎹甀D銆佸崟鎹彿
@@ -695,7 +699,7 @@
HBillNo = $('#HBillNo').val()
}
else {
- layer.msg(d.Message, { icon: 0, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(d.Message, { icon: 0, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
@@ -740,6 +744,7 @@
if (d.data[0].HMulSourceBill == 0) {
$("#HSourceBillNo").attr("disabled", "disabled");
$('#HSourceBillNo-BT').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
+ $('#cmdHSourceBillNo').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
}
if (d.data[0].HDeptID != 0) {
$("#HDeptID").val(d.data[0].HDeptID);
@@ -778,7 +783,7 @@
$("#HOutStockPlaceName").removeAttr("disabled");
$('#HSCSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
layer.msg("璋冨嚭浠撳簱鏉＄爜涓虹┖锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HSCWHName").select();
$("#HSCWHName").focus();
@@ -806,7 +811,6 @@
$("#HOutStockPlaceName").removeAttr("disabled");
$('#HSCSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
}
- element.tabChange('tab-Kf_MoveStockStepInBill_PDA', '2');
//鍏夋爣鏄剧ず鍒版潯鐮佷笂
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -820,7 +824,7 @@
$("#HOutStockPlaceName").removeAttr("disabled");
$('#HSCSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HSCWHName").select();
$("#HSCWHName").focus();
@@ -869,7 +873,7 @@
$("#HOutStockPlaceID").val("0");
$("#HOutStockPlaceName").val("");
layer.msg("璋冨嚭浠撲綅鏉＄爜涓虹┖锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HOutStockPlaceName").select();
$("#HOutStockPlaceName").focus();
@@ -889,7 +893,6 @@
$("#HOutStockPlaceID").val(result.data[0].HItemID);
$("#HSCWHName").val(result.data[0].HWhName);
$("#HSCWHID").val(result.data[0].HWHID);
- element.tabChange('tab-Kf_MoveStockStepInBill_PDA', '2');
//鍏夋爣鏄剧ず鍒版潯鐮佷笂
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -901,7 +904,7 @@
$("#HOutStockPlaceID").val("0");
$("#HOutStockPlaceName").val("");
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HOutStockPlaceName").select();
$("#HOutStockPlaceName").focus();
@@ -951,7 +954,7 @@
$("#HStockPlaceName").removeAttr("disabled");
$('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
layer.msg("璋冨叆浠撳簱鏉＄爜涓虹┖锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HWHName").select();
$("#HWHName").focus();
@@ -993,7 +996,7 @@
$("#HStockPlaceName").removeAttr("disabled");
$('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HWHName").select();
$("#HWHName").focus();
@@ -1042,7 +1045,7 @@
$("#HStockPlaceID").val("0");
$("#HStockPlaceName").val("");
layer.msg("璋冨叆浠撲綅鏉＄爜涓虹┖锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HStockPlaceName").select();
$("#HStockPlaceName").focus();
@@ -1074,7 +1077,7 @@
$("#HStockPlaceID").val("0");
$("#HStockPlaceName").val("");
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HStockPlaceName").select();
$("#HStockPlaceName").focus();
@@ -1120,7 +1123,7 @@
$("#HDeptID").val("0");
$("#HDeptName").val("");
layer.msg("閮ㄩ棬鏉＄爜涓虹┖锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HDeptName").select();
$("#HDeptName").focus();
@@ -1148,7 +1151,7 @@
$("#HDeptID").val("0");
$("#HDeptName").val("");
layer.msg(result.Message, {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HDeptName").select();
$("#HDeptName").focus();
@@ -1170,7 +1173,7 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
+ , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_DepartmentList_PDA.html?HStockOrgID=' + HStockOrgID + '&Type=HDept1', 'yes']
, resize: false
, cancel: function () {
//$(".layui-btn").removeClass("layui-btn-disabled");
@@ -1239,12 +1242,12 @@
});//鏂板
}
else {
- layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
complete: function (XHR, TS) { XHR = null },//鍥炴敹璧勬簮
error: function (err) {
- layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
layer.closeAll("loading");
@@ -1316,12 +1319,12 @@
}
else {
playSound();
- layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
complete: function (XHR, TS) { XHR = null },//鍥炴敹璧勬簮
error: function (err) {
- layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
layer.closeAll("loading");
@@ -1350,6 +1353,39 @@
})
//#endregion
+
+ //#endregion
+
+
+ //#region 婧愬崟閫夋嫨
+
+ form.on('submit(cmdHSourceBillNo)', function () {
+ var HSourceTitle = "";
+ var HSourceBillType = $("#HMainSourceBillType").val()
+ if (HSourceBillType == '1250') {
+ HSourceTitle = "鍒嗘寮忚皟鍑哄崟";
+ }
+
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: HSourceTitle + '鍒楄〃'//鏍囬
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../../views/鍏叡椤甸潰/Kf_SourceBillEditDlg_PDA.html?HBillType =' + HBillType + '&HSourceBillType =' + HSourceBillType + '&HStockOrgID =' + HStockOrgID, 'yes']
+ , resize: false
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ , end: function () {
+ if ($("#HSourceBillListCtl").val() == '1') {
+ GetMeesageBySourceBillNo();
+ $("#HSourceBillListCtl").val("0"); //鐢ㄤ簬鍖哄垎婧愬崟鍒楄〃鐣岄潰鍏抽棴鐘舵�侊紙1涓鸿繑鍥烇紝0涓洪��鍑猴級
+ }
+ }
+ })
+ });
//#endregion
@@ -1393,6 +1429,7 @@
if (result.data.hMulSourceFlagField == 0) {
$("#HSourceBillNo").attr("disabled", "disabled");
$('#HSourceBillNo-BT').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
+ $('#cmdHSourceBillNo').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
}
$("#HStockStyle").val(result.data.hStockStyleField);
$("#HStockStyle").attr("disabled", "disabled");
@@ -1403,7 +1440,7 @@
form.render('select');
HStockInOrgID = $('#HStockInOrgID').val()
HStockOutOrgID = $('#HStockOutOrgID').val()
- element.tabChange('tab-Kf_MoveStockStepInBill_PDA', '2');
+ element.tabChange('tab-Kf_MoveStockStepInBill_PDA', '3');
$("#HBarCode").select();
$("#HBarCode").focus();
//璋冨叆璋冨嚭缁勭粐涓庣櫥鍏ョ粍缁囦笉鍚屾椂锛屾竻绌鸿皟鍏ヨ皟鍑轰粨搴撲粨浣嶆暟鎹�
@@ -1433,7 +1470,7 @@
else {
playSound();
layer.msg(result.Message, {
- icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
element.tabChange('tab-Kf_MoveStockStepInBill_PDA', '1');
$("#HSourceBillNo").select();
@@ -1497,7 +1534,7 @@
if (sBarCode == "") {
playSound();
layer.msg("璇锋壂鎻忚鍒犻櫎鐨勬潯鐮�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -1526,7 +1563,7 @@
else {
playSound();
layer.msg(data.Message, {
- icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -1537,7 +1574,7 @@
error: function (err) {
playSound();
layer.msg('閿欒' + err, {
- icon: 2, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 2, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -1551,7 +1588,7 @@
if (sBarCode == '') {
playSound();
layer.msg("鏉＄爜涓虹┖锛岃鎵弿鏉＄爜锛�", {
- icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -1567,7 +1604,7 @@
layer.load(3)
$.ajax({
type: "GET",
- url: GetWEBURL() + "/WEBSController/get_BarCode_MoveStock_Json",
+ url: GetWEBURL() + "/WEBSController/get_BarCode_MoveStock_New_Json",
async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
data: { "sBarCode": sBarCode, "HInterID": HInterID, "HBillType": HBillType, "HBillNo": HBillNo, "HMaker": HMaker, "HWhID": sHWHID, "HSPID": sHSPID, "HSCWHID": sHSCWHID, "HSCSPID": sHSCSPID, "HQty": sHQty, "SourceFlag": HSourceFlag, "HSourceBillNo": sSourceBillNo, "HSourceBillType": sSourceBillType, "HStockInOrgID": HStockInOrgID, "HStockOutOrgID": HStockOutOrgID, "HScanStyle": "", "HCustom1": "", "HCustom2": "" },
success: function (result) {
@@ -1586,7 +1623,6 @@
$("#HOutStockPlaceName").removeAttr("disabled");
$('#HSCSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
}
- element.tabChange('tab-Kf_MoveStockStepInBill_PDA', '2'); //璺宠浆椤电
return;//缁撴潫
}
else if (result.data.hBarTypeField == '浠撲綅鏉＄爜') {
@@ -1594,7 +1630,6 @@
$("#HOutStockPlaceID").val(result.data.hSPIDField);
$("#HSCWHName").val(result.data.hWhNameField);
$("#HSCWHID").val(result.data.hWhIDField);
- element.tabChange('tab-Kf_MoveStockStepInBill_PDA', '2');//璺宠浆椤电
return;//缁撴潫
}
else if (result.data.hBarTypeField == '閮ㄩ棬鏉＄爜') {
@@ -1630,6 +1665,7 @@
if (result.data.hMulSourceFlagField == 0) {
$("#HSourceBillNo").attr("disabled", "disabled");
$('#HSourceBillNo-BT').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
+ $('#cmdHSourceBillNo').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
}
$("#HStockStyle").val(result.data.hStockStyleField);
$("#HStockStyle").attr("disabled", "disabled");
@@ -1681,6 +1717,7 @@
$("#HSourceBillNo").val("");
$("#HSourceBillNo").attr("disabled", "disabled");
$('#HSourceBillNo-BT').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
+ $('#cmdHSourceBillNo').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
$("#HStockStyle").attr("disabled", "disabled");
element.tabChange('tab-Kf_MoveStockStepInBill_PDA', '3');
}
@@ -1693,7 +1730,7 @@
else {
playSound();
layer.msg(result.Message, {
- icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -1704,7 +1741,7 @@
error: function (err) {
playSound();
layer.msg("閿欒锛�" + err, {
- icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -1751,14 +1788,16 @@
switch (data[i].Type) {
//int
case 'DateTime':
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
+ col.push({ field: data[i].id, title: data[i].name, align: 'left', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 120 });
break;
default:
if (data[i].name == '鏁伴噺' || data[i].name == '婧愬崟鏁伴噺' || data[i].name == '鏉＄爜涓暟') {
- col.push({ field: data[i].id, title: data[i].name, align: 'center', totalRow: true });
+ col.push({ field: data[i].id, title: data[i].name, align: 'left', totalRow: true });
+ } else if (data[i].name == '鐗╂枡鍚嶇О' || data[i].name == '瑙勬牸鍨嬪彿') {
+ col.push({ field: data[i].id, title: data[i].name, align: 'left', width: 180 });
} else {
- col.push({ field: data[i].id, title: data[i].name, align: 'center' });
+ col.push({ field: data[i].id, title: data[i].name, align: 'left', width: 150 });
}
}
}
@@ -1903,19 +1942,26 @@
$("#HDeptID").val(obj[0].HItemID);
}
}
+ //鐐瑰嚮鎸夐挳閫夋嫨鍚� 杩斿洖婧愬崟鍗曞彿
+ function GetHSourceBillValue(obj) {
+ if (obj.length > 0) {
+ $("#HSourceBillNo").val(obj[0].鍗曟嵁鍙�);
+ $("#HSourceBillListCtl").val("1");
+ }
+ }
//鍗曟嵁涓婁紶鍓嶅垽鏂�
function AllowLoadData(sSubStr) {
if (HInterID == 0) {
- layer.msg("鍗曟嵁鍐呯爜鑾峰彇澶辫触锛岄敊璇殑鍗曟嵁鍐呯爜锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("鍗曟嵁鍐呯爜鑾峰彇澶辫触锛岄敊璇殑鍗曟嵁鍐呯爜锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
if (HBillNo == '') {
- layer.msg("鍗曟嵁鍙疯幏鍙栧け璐ワ紝閿欒鐨勫崟鎹彿锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("鍗曟嵁鍙疯幏鍙栧け璐ワ紝閿欒鐨勫崟鎹彿锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
if (sSubStr.length == 0) {
- layer.msg("娌℃湁鎵爜淇℃伅锛岃鍏堟壂鎻忔潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("娌℃湁鎵爜淇℃伅锛岃鍏堟壂鎻忔潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
//鍒ゆ柇鏄惁宸叉壂鎻忕墿鏂欐潯鐮�
@@ -1927,7 +1973,7 @@
}
}
if (s == 0) {
- layer.msg("娌℃湁鎵弿鐗╂枡鏉＄爜锛岃鍏堟壂鎻忕墿鏂欐潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("娌℃湁鎵弿鐗╂枡鏉＄爜锛岃鍏堟壂鎻忕墿鏂欐潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
}
--
Gitblit v1.9.1