From 42a7f5850954a1bee4fdd864b03bf158670a0d9d Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期三, 01 二月 2023 13:54:31 +0800
Subject: [PATCH] 111
---
WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBill_Edit.html | 55 +++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 47 insertions(+), 8 deletions(-)
diff --git a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBill_Edit.html b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBill_Edit.html
index bb0b8b2..5408e47 100644
--- a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBill_Edit.html
+++ b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBill_Edit.html
@@ -25,7 +25,7 @@
<div class="layui-card-header">
<div class="layui-btn-group">
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
- <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Aduit">瀹℃牳</button>
+ <!--<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Aduit">瀹℃牳</button>-->
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Print">鎵撳嵃</button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
</div>
@@ -109,8 +109,16 @@
<input class="layui-input" name="HInnerBillNo" id="HInnerBillNo" autocomplete="off">
</div>
</div>
+ <div class="layui-col-xs3">
+ <label class="layui-form-label"> 鐗╂祦鍗曞彿锛�</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HDeliveryNo" id="HDeliveryNo" autocomplete="off">
+ </div>
+ </div>
</div>
+
</div>
+
</div>
<div class="layui-tab-item">
<div class="layui-form-item">
@@ -259,16 +267,19 @@
, { field: 'sorderid', title: '搴忓彿', width: 80, hide: true, fixed: true }
, { field: 'HMTONO', title: '璁″垝璺熻釜鍗曞彿', width: 100, fixed: true, edit: 'text', hide: true }
, { field: 'HMaterID', title: '鐗╂枡ID', width: 100, hide: true }
- , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 120 }
+ , { field: 'HMaterNumber', title: '鐗╂枡缂栫爜', width: 120 }
+ , { field: 'HOldMaterNumber', title: '鏃х墿鏂欑紪鐮�', width: 120 }
+ , { field: 'HMaterShortNumber', title: '鐗╂枡浠ｇ爜', width: 120 }
, { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 120 }
, { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 120 }
, { field: 'HUnitName', title: '璁￠噺鍗曚綅', width: 100 }
, { field: 'HUnitNumber', title: '璁￠噺鍗曚綅浠ｇ爜', width: 100, hide: true }
, { field: 'HUnitID', title: '璁￠噺鍗曚綅ID', width: 100, hide: true }
- , { field: 'HQty', title: '閫佽揣鏁伴噺', width: 100, edit: 'text'/*, event: "inputHQty"*/ }
- , { field: 'HRQty', title: '鏈叆搴撴暟閲�', width: 100 }
+ , { field: 'FPrintCount', title: '鎵撳嵃鏉＄爜鏁伴噺', width: 120 }
+ , { field: 'HQty', title: '閫佽揣鏁伴噺', width: 100, edit: 'text' , event: "inputHQty"}
+ , { field: 'HRQty', title: '鍙彂璐ф暟閲�', width: 100 }
, { field: 'HSQty', title: '婧愬崟鏁伴噺', width: 100 }
- , { field: 'HBatchNo', title: '鎵规', width: 120}
+ , { field: 'HBatchNo', title: '鎵规', width: 120,edit: 'text',}
, { field: 'HKFDate', title: '鐢熶骇鏃ユ湡', align: 'center', width: 150, data_field: 'HKFDate', event: "chooseHKFDate" }
, { field: 'HKFPeriod', title: '淇濊川鏈�', width: 100 }
, { field: 'HDate', title: '棰勮鍒拌揣鏃ユ湡', align: 'center', width: 150, data_field: 'HDate', event: "chooseHDate", hide: true }
@@ -450,7 +461,7 @@
else if (obj.event == 'inputHQty') {
$(obj.tr).find(".layui-table-edit").keyup(function () {
var $input = $(this), val = $input.val();
- if (!val) val = "1";
+ if (!val) val = "0";
$input.val(val.replace(/[^\d]/g, ''));
});
}
@@ -467,7 +478,7 @@
HQty = parseFloat(obj.data.HQty);
}
if (parseFloat(obj.value) > obj.data.HRQty) {
- layer.msg("閿欒:" + "涓嬫帹閫佽揣鍗曪紝閫佽揣鏁伴噺涓嶈兘瓒呰繃鏈叆搴撴暟閲忥紒", { icon: 5 });
+ layer.msg("閿欒:" + "涓嬫帹閫佽揣鍗曪紝閫佽揣鏁伴噺涓嶈兘瓒呰繃鍙彂璐ф暟閲忥紒", { icon: 5 });
}
else {
var bresult = true;
@@ -487,7 +498,7 @@
});
}
else {
- layer.msg("閿欒:" + "涓嬫帹閫佽揣鍗曪紝鍚堣閫佽揣鏁伴噺涓嶈兘瓒呰繃鏈叆搴撴暟閲忥紒", { icon: 5 });
+ layer.msg("閿欒:" + "涓嬫帹閫佽揣鍗曪紝鍚堣閫佽揣鏁伴噺涓嶈兘瓒呰繃鍙彂璐ф暟閲忥紒", { icon: 5 });
}
}
}
@@ -646,6 +657,34 @@
layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,閫佽揣鏁伴噺涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
}
+ if (sSubStr[i].FPrintCount == 0) {
+ layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,娌℃湁杩涜鏉＄爜鎵撳嵃锛屼笉鑳界敓鎴愰�佽揣鍗�!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+ ////閫佽揣鏁伴噺 + 锛堟簮鍗曟暟閲�-鍙彂璐ф暟閲� = 宸茬敓鎴愰�佽揣鍗曟暟閲忥級 > 鎵撳嵃鏉＄爜鏁伴噺 鏃堕檺鍒�
+ //if (parseFloat(sSubStr[i].HQty) > parseFloat(sSubStr[i].FPrintCount)) {
+ // layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,閫佽揣鍗曟暟閲忎笉鑳借秴杩囧凡鐢熸垚鏉＄爜鏁伴噺!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // return Result = false;
+ //}
+ //閫佽揣鏁伴噺
+ if (parseFloat(sSubStr[i].HQty) > parseFloat(sSubStr[i].HRQty)) {
+ layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,閫佽揣鍗曟暟閲忎笉鑳借秴杩囧彲鍙戣揣鏁伴噺!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+ //閫佽揣鏁伴噺
+ if (parseFloat(sSubStr[i].HQty) > parseFloat(sSubStr[i].FPrintCount)) {
+ layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,閫佽揣鍗曟暟閲忎笉鑳借秴杩囨墦鍗版潯鐮佹暟閲�!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+ ////閫佽揣鏁伴噺 + 锛堟簮鍗曟暟閲�-鍙彂璐ф暟閲� = 宸茬敓鎴愰�佽揣鍗曟暟閲忥級 > 鎵撳嵃鏉＄爜鏁伴噺 鏃堕檺鍒�
+ //if (parseFloat(sSubStr[i].HQty) + parseFloat(sSubStr[i].HSQty) - parseFloat(sSubStr[i].HRQty) > parseFloat(sSubStr[i].FPrintCount)) {
+ // layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,閫佽揣鍗曟暟閲忎笉鑳借秴杩囧凡鐢熸垚鏉＄爜鏁伴噺!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // return Result = false;
+ //}
+ if (sSubStr[i].HBatchNo == "") {
+ layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鎵规涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
}
}
else {
--
Gitblit v1.9.1