From 928efc9371c839b16d6de724eeb21dd29e4077e6 Mon Sep 17 00:00:00 2001
From: YL <YL@LAPTOP-SE03PLUR>
Date: 星期五, 17 十二月 2021 17:21:08 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/SRM-LAYUI
---
WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_BarCodeBill.html | 113 +++++++++++++++++++++++++++++++++-----------------------
1 files changed, 67 insertions(+), 46 deletions(-)
diff --git a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_BarCodeBill.html b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_BarCodeBill.html
index a6424d3..80140f1 100644
--- a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_BarCodeBill.html
+++ b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_BarCodeBill.html
@@ -106,7 +106,7 @@
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container">
<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-normal">鏅�氭潯鐮�</button>-->
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-box">鍐呭绠辨潯鐮�</button>
+ <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-box">鍐呭绠辨潯鐮�</button>-->
</div>
</script>
@@ -195,21 +195,25 @@
var linterid = params[params[0]];
var lentryid = params[params[1]];
var type = params[params[2]];
- //鍘熺敓鎴愭潯鐮佹柟娉�
+ //鍘熺敓鎴愭潯鐮佹柟娉�(閫佽揣鍗曢粯璁�)
var mainUrl = "GetHBarCodeShowBillMain"; //琛ㄥご鏁版嵁鍔犺浇ajax
var subUrl = "GetHBarCodeShowBillSub";//琛ㄤ綋鏁版嵁鍔犺浇ajax
var saveBarCode = "GetBarcodeSaveBillBox";//鏉＄爜鐢熸垚淇濆瓨鏂规硶ajax
+ var openTmpListType = "SRM_POInStockBillList"; //鏉＄爜鎵撳嵃鎸夐挳 寮瑰嚭鐣岄潰
//閲囪喘璁㈠崟鏉＄爜鐢熸垚瑙勫垯
if (type == 'SRM_POOrderBillList') {
mainUrl = 'GetHBarCodeShowBillMainBycg';
subUrl = "GetHBarCodeShowBillSubBycg";
saveBarCode = "GetBarcodeSaveBillBoxBycg";
+ openTmpListType = 'SRM_POOrderBillList';
+
}
//濮斿璁㈠崟
else if (type == 'SRM_EntrustOrderBill') {
mainUrl = 'GetHBarCodeShowBillMainBywy';
subUrl = "GetHBarCodeShowBillSubBywy";
saveBarCode = "GetBarcodeSaveBillBoxBycg";//璋冪敤閲囪喘鏁版嵁
+ openTmpListType = 'SRM_POOrderBillList';
}
// debugger;
$.ajax({
@@ -523,7 +527,7 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../views/BaseSet/SRM_OpenTmpList.html?linterid=' + rows.toString() + '&HBarcode=' + rows2.toString() + '&Type=HBarCodePrint', 'yes']
+ , content: ['../../views/BaseSet/SRM_OpenTmpList.html?linterid=' + rows.toString() + '&HBarcode=&Type=' + openTmpListType, 'yes']
, resize: false
//, cancel: function () {
// $(".layui-btn").removeClass("layui-btn-disabled");
@@ -565,8 +569,8 @@
, { field: 'HQty', title: '鏁伴噺', width: 100 }
, { field: 'HMinQty', title: '鍐呯鍖呰鏁�', width: 100, edit: 'text' }
, { field: 'HBQty', title: '鍐呯鏁�', width: 100 }
- , { field: 'HWXQty', title: '澶栫鍖呰鏁�', width: 100, edit: 'text' }
- , { field: 'HWBQty', title: '澶栫鏁�', width: 100 }
+ , { field: 'HWXQty', title: '澶栫鍖呰鏁�', width: 100 }
+ , { field: 'HWBQty', title: '澶栫鏁�', width: 100, edit: 'text' }
, { field: 'HPrice', title: '鍗曚环', width: 100, hide: true }
, { field: 'HMoney', title: '閲戦', width: 100, hide: true }
, { field: 'HMTONO', title: '璁″垝璺熻釜鍗曞彿', width: 100 }
@@ -785,6 +789,8 @@
var HMinQty = 0;
var HWXQty = 0;
var HKFPeriod = 0;
+ var HWBQty = 0;
+ var HBQty = 0;
if (obj.data.HMinQty != undefined) {
HMinQty = parseFloat(obj.data.HMinQty);
}
@@ -794,56 +800,71 @@
if (obj.data.HKFPeriod != undefined) {
HKFPeriod = parseFloat(obj.data.HKFPeriod);
}
- HKFPeriod
+ if (obj.data.HWBQty != undefined) {
+ HWBQty = parseFloat(obj.data.HWBQty);
+ }
+ if (obj.data.HBQty != undefined) {
+ HBQty = parseFloat(obj.data.HBQty);
+ }
switch (field) {
case "HMinQty":
- if (HMinQty > 0) {
- if (HWXQty >= 0) {
- if (isPositiveIntegerTimes(parseFloat(obj.value), HWXQty)) //澶栫鍖呰鏁拌兘琚唴绠卞寘瑁呮暟鏁撮櫎
- {
- obj.update({
- HBQty: Math.ceil(parseFloat(obj.data.HQty) / parseFloat(obj.value)),
- });
- }
- else {
- //obj.update({
- // HMinQty: 0,
- //});
- f_alert("澶栫鍖呰鏁板繀椤绘槸鍐呯鍖呰鏁扮殑鏁存暟鍊�!");
- }
- }
- }
- else {
- //obj.update({
- // HMinQty: 0,
- //});
+ if (HMinQty < 0) {
f_alert("鍐呯鍖呰鏁颁笉鑳戒负璐熸暟!");
}
+ else if (HWBQty > HBQty) {
+ f_alert("澶栫鏁伴噺涓嶈兘瓒呭嚭鍐呯鏁伴噺")
+ return;
+ }
+ else (HWXQty >= 0)
+ {
+ obj.update({
+ //澶栫鍖呰鎬绘暟 = 鍐呯鏁伴噺/澶栫鏁伴噺 * 鍐呯鍖呰鏁伴噺
+ HBQty: Math.ceil(parseFloat(obj.data.HQty) / parseFloat(obj.value)),
+ HWXQty: Math.ceil(parseFloat(obj.data.HBQty) / parseFloat(obj.data.HWBQty)) * parseFloat(obj.data.HMinQty),
+ });
+ }
break;
- case "HWXQty":
- if (HWXQty > 0) {
- if (HMinQty >= 0) {
- if (isPositiveIntegerTimes(HMinQty, parseFloat(obj.value))) //澶栫鍖呰鏁拌兘琚唴绠卞寘瑁呮暟鏁撮櫎
- {
- obj.update({
- HWBQty: Math.ceil(parseFloat(obj.data.HQty) / parseFloat(obj.value)),
- });
- }
- else {
- //obj.update({
- // HWXQty: 0,
- //});
- f_alert("澶栫鍖呰鏁板繀椤绘槸鍐呯鍖呰鏁扮殑鏁存暟鍊�!");
- }
- }
+ case "HWBQty": //澶栫涓暟鍙戠敓鍙樺寲
+ if (HWBQty < 0) {
+ f_alert("澶栫鏁伴噺涓嶈兘涓鸿礋鏁�")
+ return;
+ }
+ else if (HWBQty > HBQty) {
+ f_alert("澶栫鏁伴噺涓嶈兘瓒呭嚭鍐呯鏁伴噺")
+ return;
}
else {
- //obj.update({
- // HWXQty: 0,
- //});
- f_alert("澶栫鍖呰鏁颁笉鑳戒负璐熸暟!");
+ obj.update({
+ //澶栫鍖呰鎬绘暟 = 鍐呯鏁伴噺/澶栫鏁伴噺 * 鍐呯鍖呰鏁伴噺
+ HWXQty: Math.ceil(parseFloat(obj.data.HBQty) / parseFloat(obj.data.HWBQty)) * parseFloat(obj.data.HMinQty),
+ //HWXQty: 12
+ });
}
break;
+ //case "HWXQty":
+ // if (HWXQty > 0) {
+ // if (HMinQty >= 0) {
+ // if (isPositiveIntegerTimes(HMinQty, parseFloat(obj.value))) //澶栫鍖呰鏁拌兘琚唴绠卞寘瑁呮暟鏁撮櫎
+ // {
+ // obj.update({
+ // HWBQty: Math.ceil(parseFloat(obj.data.HQty) / parseFloat(obj.value)),
+ // });
+ // }
+ // else {
+ // //obj.update({
+ // // HWXQty: 0,
+ // //});
+ // f_alert("澶栫鍖呰鏁板繀椤绘槸鍐呯鍖呰鏁扮殑鏁存暟鍊�!");
+ // }
+ // }
+ // }
+ // else {
+ // //obj.update({
+ // // HWXQty: 0,
+ // //});
+ // f_alert("澶栫鍖呰鏁颁笉鑳戒负璐熸暟!");
+ // }
+ // break;
case "HKFPeriod":
if (HKFPeriod >= 0) {
var sKFDQDate = addDate(obj.data.HKFDate, HKFPeriod);
--
Gitblit v1.9.1