From 19dd6d8b638faffa073fb4b40f825f049aa93bdd Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期四, 12 十二月 2024 11:30:52 +0800
Subject: [PATCH] 1
---
WebTM/views/WMS扫码模块/生产调拨/Kf_MoveStockStepOutBill_PDA.html | 256 +++++++++++++++++++++++++++++++++-----------------
1 files changed, 167 insertions(+), 89 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_MoveStockStepOutBill_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_MoveStockStepOutBill_PDA.html"
index efee826..2667d8c 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_MoveStockStepOutBill_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_MoveStockStepOutBill_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>
@@ -77,23 +105,32 @@
<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">
+ <div class="layui-row" style="margin-top: 5px; margin-bottom: 0px;">
<div class="layui-col-xs3">
<label class="layui-form-label" style="width: 70px; padding-left: 0px;">鍏堣繘鍏堝嚭浠�</label>
</div>
- <div class="layui-col-xs7">
- <input type="text" name="HFIFOWHName" id="HFIFOWHName" lay-verify="HFIFOWHName" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
- <input type="hidden" name="HFIFOWHID" id="HFIFOWHID" lay-verify="HFIFOWHID" value="0" autocomplete="off" class="layui-input">
- </div>
- <div class="layui-col-xs2">
- <button type="button" lay-submit="" lay-filter="HFIFOWHID-BT" class="layui-btn" id="HFIFOWHID-BT" style="padding:0 26.5px">...</button>
+ <div class="layui-col-xs9">
+ <div class="layui-col-xs10" style="padding-right: 15px;">
+ <input type="text" name="HFIFOWHName" id="HFIFOWHName" lay-verify="HFIFOWHName" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
+ <input type="hidden" name="HFIFOWHID" id="HFIFOWHID" lay-verify="HFIFOWHID" value="0" autocomplete="off" class="layui-input">
+ </div>
+ <div class="layui-col-xs2">
+ <button type="button" lay-submit="" lay-filter="HFIFOWHID-BT" class="layui-btn" id="HFIFOWHID-BT" style="width: 45px; margin-left: -5px; padding-left: 12px">...</button>
+ </div>
</div>
</div>
<div class="layui-row">
@@ -101,7 +138,7 @@
<label class="layui-form-label" style="width:60px;padding-left:0px;">璋冩嫧绫诲瀷</label>
</div>
<div class="layui-col-xs9">
- <select name=" HStockStyle" id="HStockStyle"disabled>
+ <select name=" HStockStyle" id="HStockStyle" disabled>
<option value="缁勭粐鍐呰皟鎷�">缁勭粐鍐呰皟鎷�</option>
<option value="璺ㄧ粍缁囪皟鎷�">璺ㄧ粍缁囪皟鎷�</option>
</select>
@@ -145,10 +182,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">
@@ -161,48 +198,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>
@@ -241,11 +246,11 @@
</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">
- <select name=" HStockOutOrgID" id="HStockOutOrgID"disabled>
+ <div class="layui-col-xs10" style="margin-left:10px">
+ <select name=" HStockOutOrgID" id="HStockOutOrgID" disabled>
<!--鍔ㄦ�佹覆鏌撶粍缁�-->
</select>
</div>
@@ -253,11 +258,11 @@
</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">
- <select name=" HStockInOrgID" id="HStockInOrgID"disabled>
+ <div class="layui-col-xs10" style="margin-left:10px">
+ <select name=" HStockInOrgID" id="HStockInOrgID" disabled>
<!--鍔ㄦ�佹覆鏌撶粍缁�-->
</select>
</div>
@@ -347,40 +352,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>
@@ -409,6 +414,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>
@@ -539,7 +545,7 @@
$("#HStockOutOrgID").val(sessionStorage["OrganizationID"]);
$("#HBillType").val("1250");
$("#HRedBlueFlag").val("false");
- if (sessionStorage["HSCWHSPFlag"]) {
+ if (sessionStorage["HSCWHID"] != 0 && sessionStorage["HSCWHSPFlag"]) {
$("#HStockPlaceID").val("0");
$("#HStockPlaceName").val("");
$("#HStockPlaceName").attr("disabled", "disabled");
@@ -551,7 +557,7 @@
$("#HStockPlaceName").removeAttr("disabled");
$('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
}
- if (sessionStorage["HWhSPFlag"]) {
+ if (sessionStorage["HWHID"] != 0 && sessionStorage["HWhSPFlag"]) {
$("#HOutStockPlaceID").val("0");
$("#HOutStockPlaceName").val("");
$("#HOutStockPlaceName").attr("disabled", "disabled");
@@ -671,6 +677,32 @@
})
//#endregion
+ //#region 鐩戝惉缃戞牸琛ㄤ綋浜嬩欢
+ table.on('tool(wl-table)', function (obj) {
+ var data = obj.data;
+
+ //鐗╂枡浠ｇ爜瓒呴摼鎺�
+ if (obj.event == '鐗╂枡浠ｇ爜') { //妫�鏌� obj.event 鏄惁绛変簬瀛楃涓� '鐗╂枡浠ｇ爜'銆傚鏋滅瓑浜庯紝鍒欐墽琛宨f寰幆
+ var HMaterNumber = data.鐗╂枡浠ｇ爜.toString(); //澹版槑鍙橀噺HMaterNumber 涓� data.鐗╂枡浠ｇ爜
+ layer.open({ //浣跨敤 layer鐨刼pen鎵撳紑寮瑰嚭 灞�
+ type: 2 //琛ㄧず寮瑰嚭灞傜殑鍐呭鏄竴涓� iframe
+ , area: ['100%', '100%']
+ , title: '鍙婃椂搴撳瓨淇℃伅' //璁剧疆寮瑰嚭灞傜殑鍚嶅瓧鍜屽彉閲�
+ , closeBtn: 1 //鏄剧ず鍏抽棴鎸夐挳
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../../WMS鎵爜妯″潡/搴撳瓨鏌ヨ/KF_ICInventoryByCLD_PDA.html?OperationType=2&HMaterNumber=' + HMaterNumber //璁剧疆 iframe 鐨� URL锛孶RL 涓寘鍚簡鏌ヨ鍙傛暟锛屾潵璋冪敤鎵�闇�瑕佺殑鍊�
+ , resize: false, //鏄惁鍏佽鐢ㄦ埛璋冩暣寮瑰嚭澶у皬
+ end: function () { //褰撳叧闂椂璋冪敤
+ }
+ , cancel: function () { //鐐瑰嚮鍙栨秷鏃朵娇鐢ㄥ洖璋�
+ }
+ })
+ }
+ });
+ //#endregion
+
//鍒ゆ柇鏄惁鏂板锛岃幏鍙栨渶澶у崟鎹彿
if (HInterID != 0) {
HSourceFlag = true;
@@ -704,7 +736,7 @@
//鏄剧ず琛ㄤ綋鏄庣粏
DisBillEntryList();
HSourceFlag = true;
- element.tabChange('tab-Kf_MoveStockStepOutBill_PDA', '2');
+ element.tabChange('tab-Kf_MoveStockStepOutBill_PDA', '3');
}
else {
//鑾峰彇鏈�澶у崟鎹甀D銆佸崟鎹彿
@@ -917,7 +949,6 @@
$("#HOutStockPlaceName").removeAttr("disabled");
$('#HSCSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
}
- element.tabChange('tab-Kf_MoveStockStepOutBill_PDA', '2');
//鍏夋爣鏄剧ず鍒版潯鐮佷笂
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -1000,7 +1031,6 @@
$("#HOutStockPlaceID").val(result.data[0].HItemID);
$("#HSCWHName").val(result.data[0].HWhName);
$("#HSCWHID").val(result.data[0].HWHID);
- element.tabChange('tab-Kf_MoveStockStepOutBill_PDA', '2');
//鍏夋爣鏄剧ず鍒版潯鐮佷笂
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -1558,6 +1588,42 @@
//#endregion
+ //#region 婧愬崟閫夋嫨
+
+ form.on('submit(cmdHSourceBillNo)', function () {
+ var HSourceTitle = "";
+ var HSourceBillType = $("#HMainSourceBillType").val()
+ if (HSourceBillType == '1402') {
+ HSourceTitle = "鍙戣揣閫氱煡鍗�";
+ }
+ else if (HSourceBillType == '1243') {
+ 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
+
+
//#region 鎵弿婧愬崟鏉＄爜
//鎵弿婧愬崟鏉＄爜
@@ -1616,7 +1682,7 @@
//瀹㈡埛涓嶅彲缂栬緫
$("#HSupName").attr("disabled", "disabled");
$('#HSupID-BT').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
- element.tabChange('tab-Kf_MoveStockStepOutBill_PDA', '2');
+ element.tabChange('tab-Kf_MoveStockStepOutBill_PDA', '3');
$("#HBarCode").select();
$("#HBarCode").focus();
//璋冨叆璋冨嚭缁勭粐涓庣櫥鍏ョ粍缁囦笉鍚屾椂锛屾竻绌鸿皟鍏ヨ皟鍑轰粨搴撲粨浣嶆暟鎹�
@@ -1780,7 +1846,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) {
@@ -1799,7 +1865,6 @@
$("#HOutStockPlaceName").removeAttr("disabled");
$('#HSCSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
}
- element.tabChange('tab-Kf_MoveStockStepOutBill_PDA', '2'); //璺宠浆椤电
return;//缁撴潫
}
else if (result.data.hBarTypeField == '浠撲綅鏉＄爜') {
@@ -1807,7 +1872,6 @@
$("#HOutStockPlaceID").val(result.data.hSPIDField);
$("#HSCWHName").val(result.data.hWhNameField);
$("#HSCWHID").val(result.data.hWhIDField);
- element.tabChange('tab-Kf_MoveStockStepOutBill_PDA', '2');//璺宠浆椤电
return;//缁撴潫
}
else if (result.data.hBarTypeField == '閮ㄩ棬鏉＄爜') {
@@ -1972,19 +2036,26 @@
for (var i = 0; i < data.length; i++) {
if ($.inArray(data[i].name, titleData) > -1) {
col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
- }
- else {
+ } else if (data[i].name == '鐗╂枡浠ｇ爜') {
+ col.push({
+ field: data[i].id, title: data[i].name, align: 'left', sort: true, width: 120, event: '鐗╂枡浠ｇ爜', event: '鐗╂枡浠ｇ爜', templet: function (d) {
+ return '<span style="color: blue;">' + d.鐗╂枡浠ｇ爜 + '</span>'
+ }, style: 'cursor: pointer;'
+ });
+ } else {
switch (data[i].Type) {
//int
case 'DateTime':
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
+ 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 });
}
}
}
@@ -2146,6 +2217,13 @@
$("#HSupID").val(obj[0].HItemID);
}
}
+ //鐐瑰嚮鎸夐挳閫夋嫨鍚� 杩斿洖婧愬崟鍗曞彿
+ function GetHSourceBillValue(obj) {
+ if (obj.length > 0) {
+ $("#HSourceBillNo").val(obj[0].鍗曟嵁鍙�);
+ $("#HSourceBillListCtl").val("1");
+ }
+ }
//鍗曟嵁涓婁紶鍓嶅垽鏂�
function AllowLoadData(sSubStr) {
--
Gitblit v1.9.1