From 07cf94734c36d4eae6ddbc4dd338bf5af81a2193 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期一, 28 十月 2024 16:11:39 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/WMS扫码模块/生产领料/Kf_MateOutBill_PDA.html | 86 ++++++++++++++++++++++++++++++++++++++++---
1 files changed, 80 insertions(+), 6 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\351\242\206\346\226\231/Kf_MateOutBill_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\351\242\206\346\226\231/Kf_MateOutBill_PDA.html"
index c6b534c..efddcdb 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\351\242\206\346\226\231/Kf_MateOutBill_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\351\242\206\346\226\231/Kf_MateOutBill_PDA.html"
@@ -70,6 +70,7 @@
<option value="3720">鐢熶骇鐢ㄦ枡娓呭崟</option>
<option value="3721">鐢熶骇澶囨枡鍗�</option>
<option value="1214">鐢熶骇鍙戞枡閫氱煡鍗�</option>
+ <option value="3710">鐢熶骇璁㈠崟</option>
<option value="-1">鎵嬪伐褰曞叆</option>
</select>
</div>
@@ -78,11 +79,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:55px;">
+ <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: 40px; margin-left: 0px;padding-left:10px">OK</button>
+ </div>
</div>
</div>
<div class="layui-row">
@@ -350,6 +358,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>
@@ -480,7 +489,7 @@
$("#HStockOrgName").val(sessionStorage["Organization"]);
$("#HBillType").val("1204");
$("#HRedBlueFlag").val("false");
- if (sessionStorage["HWhSPFlag"]) {
+ if (sessionStorage["HWHID"] != 0 && sessionStorage["HWhSPFlag"]) {
$("#HStockPlaceID").val("0");
$("#HStockPlaceName").val("");
$("#HStockPlaceName").attr("disabled", "disabled");
@@ -647,6 +656,14 @@
$("#HMainSourceBillType").empty();
var optionHtml = '';
optionHtml += "<option value = '" + d.data[0].HSourceBillType + "' >" + '鐢熶骇鍙戞枡閫氱煡鍗�' + "</option>";
+ $("#HMainSourceBillType").append(optionHtml);
+ layui.form.render('select');
+ $("#HMainSourceBillType").attr("disabled", "disabled");
+ }
+ else if (d.data[0].HSourceBillType == "3710") {
+ $("#HMainSourceBillType").empty();
+ var optionHtml = '';
+ optionHtml += "<option value = '" + d.data[0].HSourceBillType + "' >" + '鐢熶骇璁㈠崟' + "</option>";
$("#HMainSourceBillType").append(optionHtml);
layui.form.render('select');
$("#HMainSourceBillType").attr("disabled", "disabled");
@@ -1325,6 +1342,48 @@
//#endregion
+ //#region 婧愬崟閫夋嫨
+
+ form.on('submit(cmdHSourceBillNo)', function () {
+ var HSourceTitle = "";
+ var HSourceBillType = $("#HMainSourceBillType").val()
+ if (HSourceBillType == '3720') {
+ HSourceTitle = "鐢熶骇鐢ㄦ枡娓呭崟";
+ }
+ else if (HSourceBillType == '3721') {
+ HSourceTitle = "鐢熶骇澶囨枡鍗�";
+ }
+ else if (HSourceBillType == '1214') {
+ HSourceTitle = "鐢熶骇鍙戞枡閫氱煡鍗�";
+ }
+ else if (HSourceBillType == '3710') {
+ 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 鎵弿婧愬崟鏉＄爜
//鎵弿婧愬崟鏉＄爜
@@ -1575,6 +1634,14 @@
layui.form.render('select');
$("#HMainSourceBillType").attr("disabled", "disabled");
}
+ else if (result.data.hSourceBillTypeField == "3710") {
+ $("#HMainSourceBillType").empty();
+ var optionHtml = '';
+ optionHtml += "<option value = '" + result.data.hSourceBillTypeField + "' >" + '鐢熶骇璁㈠崟' + "</option>";
+ $("#HMainSourceBillType").append(optionHtml);
+ layui.form.render('select');
+ $("#HMainSourceBillType").attr("disabled", "disabled");
+ }
else {
$("#HMainSourceBillType").empty();
var optionHtml = '';
@@ -1820,6 +1887,13 @@
$("#HDeptID").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