From 26f0d72d113dc6ec3e6cb7e776ec6154645694e3 Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期三, 05 一月 2022 16:46:41 +0800
Subject: [PATCH] 夏宝
---
WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_BarCodeBill.html | 102 ++++++++++++++++++++++++++++++++++----------------
1 files changed, 69 insertions(+), 33 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..40eaa76 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>
@@ -181,6 +181,15 @@
var time = date.getFullYear() + "-" + month + "-" + day
return time;
}
+ function DateDiff(sDate1, sDate2) { //sDate1鍜宻Date2鏄�2002-12-18鏍煎紡
+ var aDate, oDate1, oDate2, iDays
+ aDate = sDate1.split("-")
+ oDate1 = new Date(aDate[1] + '-' + aDate[2] + '-' + aDate[0]) //杞崲涓�12-18-2002鏍煎紡
+ aDate = sDate2.split("-")
+ oDate2 = new Date(aDate[1] + '-' + aDate[2] + '-' + aDate[0])
+ iDays = parseInt(Math.abs(oDate1 - oDate2) / 1000 / 60 / 60 / 24) //鎶婄浉宸殑姣鏁拌浆鎹负澶╂暟
+ return iDays
+ }
function getUrlVars() {
var vars = [], hash;
var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
@@ -195,21 +204,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 subUrl = "GetHBarCodeShowBillSub";//琛ㄤ綋鏁版嵁鍔犺浇ajax h_v_SRM_POInStockBillSub_ForWeb2
var saveBarCode = "GetBarcodeSaveBillBox";//鏉＄爜鐢熸垚淇濆瓨鏂规硶ajax
+ var openTmpListType = "SRM_POInStockBillList"; //鏉＄爜鎵撳嵃鎸夐挳 寮瑰嚭鐣岄潰
//閲囪喘璁㈠崟鏉＄爜鐢熸垚瑙勫垯
if (type == 'SRM_POOrderBillList') {
mainUrl = 'GetHBarCodeShowBillMainBycg';
- subUrl = "GetHBarCodeShowBillSubBycg";
+ subUrl = "GetHBarCodeShowBillSubBycg"; //h_v_Cg_POOrderBillSub_ForWeb2
saveBarCode = "GetBarcodeSaveBillBoxBycg";
+ openTmpListType = 'SRM_POOrderBillList';
+
}
//濮斿璁㈠崟
else if (type == 'SRM_EntrustOrderBill') {
mainUrl = 'GetHBarCodeShowBillMainBywy';
- subUrl = "GetHBarCodeShowBillSubBywy";
+ subUrl = "GetHBarCodeShowBillSubBywy"; //h_v_srm_EntrustOrderBillSub_ForWeb2
saveBarCode = "GetBarcodeSaveBillBoxBycg";//璋冪敤閲囪喘鏁版嵁
+ openTmpListType = 'SRM_POOrderBillList';
}
// debugger;
$.ajax({
@@ -417,7 +430,7 @@
});
table.render({
elem: '#subTable'
- , url: GetWEBURL() + 'GetHBarCodeShowBillSub3'
+ , url: GetWEBURL() + 'GetHBarCodeShowBillSub3' //h_v_Web_BarCodeBill_ForWeb1
, toolbar: '#toolbarDemo1'
, defaultToolbar: ['filter', 'exports']
, where: { sMsg: linterid }
@@ -523,7 +536,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");
@@ -556,9 +569,10 @@
, where: { sMsg: linterid, sMsg2: lentryid }
, cols: [[
, { field: 'HMaterID', title: '鐗╂枡ID', width: 100, hide: true }
- , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 100 }
- , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 200 }
- , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 200 }
+ , { field: 'HMaterNumber', 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 }
@@ -566,7 +580,7 @@
, { 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: 'HWBQty', title: '澶栫鏁�', width: 100}
, { field: 'HPrice', title: '鍗曚环', width: 100, hide: true }
, { field: 'HMoney', title: '閲戦', width: 100, hide: true }
, { field: 'HMTONO', title: '璁″垝璺熻釜鍗曞彿', width: 100 }
@@ -729,7 +743,12 @@
, done: function (value, date) {
data[field] = value;
obj.update(data);
-
+ if (obj.data.HKFDQDate != "" && obj.data.HKFDate != "") {
+ var days = DateDiff(obj.data.HKFDQDate, obj.data.HKFDate);
+ obj.update({
+ HKFPeriod: days,
+ });
+ }
}
});
}
@@ -785,6 +804,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,32 +815,47 @@
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 "HWBQty": //澶栫涓暟鍙戠敓鍙樺寲
+ // if (HWBQty < 0) {
+ // f_alert("澶栫鏁伴噺涓嶈兘涓鸿礋鏁�")
+ // return;
+ // }
+ // else if (HWBQty > HBQty) {
+ // f_alert("澶栫鏁伴噺涓嶈兘瓒呭嚭鍐呯鏁伴噺")
+ // return;
+ // }
+ // else {
+ // 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) {
--
Gitblit v1.9.1