From 5cabf7aed3e4578fa717760c92f0c22bcfb0dd4a Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期一, 25 七月 2022 17:27:58 +0800
Subject: [PATCH] nothing
---
WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_BarCodeBill.html | 120 ++++++++++++++++++++++++++++++-----------------------------
1 files changed, 61 insertions(+), 59 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 9b56bce..6d21464 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
@@ -207,8 +207,8 @@
//鍘熺敓鎴愭潯鐮佹柟娉�(閫佽揣鍗曢粯璁�)
var mainUrl = "GetHBarCodeShowBillMain"; //琛ㄥご鏁版嵁鍔犺浇ajax
var subUrl = "GetHBarCodeShowBillSub";//琛ㄤ綋鏁版嵁鍔犺浇ajax h_v_SRM_POInStockBillSub_ForWeb2
- var saveBarCode = "GetBarcodeSaveBillBox";//鏉＄爜鐢熸垚淇濆瓨鏂规硶ajax
- var openTmpListType = "SRM_POInStockBillList"; //鏉＄爜鎵撳嵃鎸夐挳 寮瑰嚭鐣岄潰
+ var saveBarCode = "GetBarcodeSaveBillOnlyInnerBox";//鏉＄爜鐢熸垚淇濆瓨鏂规硶ajax
+ var openTmpListType = "HBarCodePrint"; //鏉＄爜鎵撳嵃鎸夐挳 寮瑰嚭鐣岄潰
//閲囪喘璁㈠崟鏉＄爜鐢熸垚瑙勫垯
if (type == 'SRM_POOrderBillList') {
mainUrl = 'GetHBarCodeShowBillMainBycg';
@@ -423,6 +423,7 @@
layer.msg(data.Message, { icon: 1 });
element.tabDelete('tabDemo', '2'); //鍒犻櫎
element.tabDelete('tabDemo', '3'); //鍒犻櫎
+ /*
element.tabAdd('tabDemo', {
title: '澶栫鏉＄爜'
, content: '<table class="layui-hide" id="subTable" lay-filter="subTable"></table>' //鏀寔浼犲叆(html浠ｇ爜锛変笉鎸佹敮鐩存帴浼犲叆html椤甸潰
@@ -459,6 +460,7 @@
layer.closeAll("loading");
}
});
+ */
element.tabAdd('tabDemo', {
title: '鍐呯鏉＄爜'
, content: '<table class="layui-hide" id="subTable2" lay-filter="subTable2"></table>' //鏀寔浼犲叆(html浠ｇ爜锛変笉鎸佹敮鐩存帴浼犲叆html椤甸潰
@@ -515,6 +517,10 @@
, data2 = layui.table.cache["subTable2"];
var rows = '';
var rows2 = '';
+ if (data1 == undefined || data2 == undefined) {
+ layer.msg("璇峰厛鐢熸垚鍐呭绠辨潯鐮侊紒")
+ return;
+ }
for (var i = 0; i < data1.length; i++) {
rows += data1[i].HItemID.toString() + ',';
rows2 += data1[i].HBarCode.toString() + ',';
@@ -527,6 +533,7 @@
rows2 = rows2.substring(rows2.length - 1, 0);
if (rows == "") {
layer.msg("鑷冲皯閫夋嫨涓�琛岃褰曪紒")
+ return;
}
else {
layer.open({
@@ -569,18 +576,19 @@
, where: { sMsg: linterid, sMsg2: lentryid }
, cols: [[
, { field: 'HMaterID', title: '鐗╂枡ID', width: 100, hide: true }
- , { field: 'HMaterShortNumber', title: '鐗╂枡缂栫爜', width: 120 }
- , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 120 }
+ , { 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 }
, { field: 'HQty', title: '鏁伴噺', width: 100 }
+ , { field: 'FMinPackCount', title: '鏈�灏忓寘瑁呮暟', width: 100 }
, { field: 'HMinQty', title: '鍐呯鍖呰鏁�', width: 100, edit: 'text' }
, { field: 'HBQty', title: '鍐呯鏁�', width: 100 }
- , { field: 'HWXQty', title: '澶栫鍖呰鏁�', width: 100 }
- , { field: 'HWBQty', title: '澶栫鏁�', width: 100, edit: 'text' }
+ , { field: 'HWXQty', title: '澶栫鍖呰鏁�', width: 100,hide: true }
+ , { field: 'HWBQty', title: '澶栫鏁�', width: 100,hide: true }
, { field: 'HPrice', title: '鍗曚环', width: 100, hide: true }
, { field: 'HMoney', title: '閲戦', width: 100, hide: true }
, { field: 'HMTONO', title: '璁″垝璺熻釜鍗曞彿', width: 100 }
@@ -786,21 +794,11 @@
});
}
});
- //table.on('tool(mainTable)', function (d) {
- // switch (d.event) {
- // case "inputHKFPeriod":
- // $(d.tr).find(".layui-table-edit").keyup(function () {
- // var $input = $(this), val = $input.val();
- // if (!val) val = "1";
- // $input.val(val.replace(/[^\d]/g, ''));
- // });
- // break;
- // }
- //});
table.on('edit(mainTable)', function (obj) { //娉細edit鏄浐瀹氫簨浠跺悕锛宼est鏄痶able鍘熷瀹瑰櫒鐨勫睘鎬� lay-filter="瀵瑰簲鐨勫��"
var value = obj.value //寰楀埌淇敼鍚庣殑鍊�
, data = obj.data //寰楀埌鎵�鍦ㄨ鎵�鏈夐敭鍊�
, field = obj.field; //寰楀埌瀛楁
+
var HMinQty = 0;
var HWXQty = 0;
var HKFPeriod = 0;
@@ -821,65 +819,69 @@
if (obj.data.HBQty != undefined) {
HBQty = parseFloat(obj.data.HBQty);
}
+ //HMinQty 鍐呯鍖呰鏁�
+ //HBQty 鍐呯鏁�
+ //HWXQty 澶栫鍖呰鏁�
+ //HWBQty 澶栫鏁� HWBQty
switch (field) {
- case "HMinQty":
+ case "HQty":
+ obj.update({
+ HMinQty: 0,
+ HBQty: 0,
+ HWXQty: 0,
+ HWBQty: 0,
+ });
+ break;
+ case "HMinQty": //鍐呯鍖呰鏁�
if (HMinQty < 0) {
f_alert("鍐呯鍖呰鏁颁笉鑳戒负璐熸暟!");
}
- else if (HWBQty > HBQty) {
- f_alert("澶栫鏁伴噺涓嶈兘瓒呭嚭鍐呯鏁伴噺")
+ else if (HWXQty > 0 && HMinQty > HWXQty) {
+ f_alert("鍐呯鍖呰鏁伴噺涓嶈兘瓒呭嚭澶栫鍖呰鏁伴噺")
+ obj.update({
+ HBQty: Math.ceil(parseFloat(obj.data.HQty) / parseFloat(obj.value)),
+ HWXQty: 0,
+ HWBQty: 0,
+ });
return;
}
- else (HWXQty >= 0)
+ else (HWXQty > 0)//澶栫鍖呰鏁板ぇ浜�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),
+
});
+ if (parseFloat(obj.data.HWBQty) > 0)
+ obj.update({
+ 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;
+ 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: Math.ceil(parseFloat(obj.data.HBQty) / parseFloat(obj.data.HWBQty)) * parseFloat(obj.data.HMinQty),
- //HWXQty: 12
- });
+ //obj.update({
+ // HWXQty: 0,
+ //});
+ f_alert("澶栫鍖呰鏁颁笉鑳戒负璐熸暟!");
}
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