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 | 236 ++++++++++++++++++++++++++++++++++------------------------
1 files changed, 139 insertions(+), 97 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 cdef343..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,38 +195,52 @@
var linterid = params[params[0]];
var lentryid = params[params[1]];
var type = params[params[2]];
- var mainUrl = "GetHBarCodeShowBillMain";
- var subUrl = "GetHBarCodeShowBillSub";
+ //鍘熺敓鎴愭潯鐮佹柟娉�(閫佽揣鍗曢粯璁�)
+ 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({
- url: GetWEBURL() + mainUrl,
- type: "GET",
- data: { "sMsg": linterid },
- success: function (d) {
- console.log(d.data);
- //$("#HDate").val(d.)
- $("#HInterID").val(d.data[0].HInterID);
- $("#HBillNo").val(d.data[0].HBillNo);
- $("#HRemark").val(d.data[0].HRemark);
- $("#HDate").val(d.data[0].HDateForWeb);
- //$("#HMaker").val(d.data[0].HMaker);
- $("#HMakerDate").val(d.data[0].HMakerDate)
- $("#HChecker").val(d.data[0].HChecker);
- $("#HCheckDate").val(d.data[0].HCheckDate);
- $("#HSupID").val(d.data[0].HSupID);
- $("#HSupName").val(d.data[0].HSupName);
- $("#HEmpID").val(d.data[0].HEmpID);
- $("#HEmpName").val(d.data[0].HEmpName);
- $("#HManagerID").val(d.data[0].HManagerID);
- $("#HManagerName").val(d.data[0].HManagerName);
- $("#HMaker").val(sessionStorage["HUserName"]);
- }
- });
-
+ $.ajax({
+ url: GetWEBURL() + mainUrl,
+ type: "GET",
+ data: { "sMsg": linterid },
+ success: function (d) {
+ console.log(d.data);
+ //$("#HDate").val(d.)
+ $("#HInterID").val(d.data[0].HInterID);
+ $("#HBillNo").val(d.data[0].HBillNo);
+ $("#HRemark").val(d.data[0].HRemark);
+ $("#HDate").val(d.data[0].HDateForWeb);
+ //$("#HMaker").val(d.data[0].HMaker);
+ $("#HMakerDate").val(d.data[0].HMakerDate)
+ $("#HChecker").val(d.data[0].HChecker);
+ $("#HCheckDate").val(d.data[0].HCheckDate);
+ $("#HSupID").val(d.data[0].HSupID);
+ $("#HSupName").val(d.data[0].HSupName);
+ $("#HEmpID").val(d.data[0].HEmpID);
+ $("#HEmpName").val(d.data[0].HEmpName);
+ $("#HManagerID").val(d.data[0].HManagerID);
+ $("#HManagerName").val(d.data[0].HManagerName);
+ $("#HMaker").val(sessionStorage["HUserName"]);
+ }
+ });
+
layui.config({
base: '../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
@@ -391,7 +405,7 @@
$.ajax(
{
type: "POST",
- url: GetWEBURL() + "GetBarcodeSaveBillBox", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ url: GetWEBURL() + saveBarCode, //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
async: true,
data: { "msg": sMainSub },
dataType: "json",
@@ -513,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");
@@ -537,7 +551,7 @@
}
});
layer.load(3)
-
+
table.render({
elem: '#mainTable'
, url: GetWEBURL() + subUrl
@@ -555,15 +569,17 @@
, { 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 }
, { field: 'HBatchNo', title: '鎵规', width: 100, edit: 'text' }
- , { field: 'HKFDate', title: '鐢熶骇鏃ユ湡', align: 'center', width: 150 }//, data_field: 'HKFDate', event: "chooseHKFDate"
- , { field: 'HKFPeriod', title: '淇濊川鏈�', width: 100 }//, edit: 'text', event: "inputHKFPeriod"
- , { field: 'HKFDQDate', title: '鍒版湡鏃ユ湡', align: 'center', width: 150 }//, data_field: 'HKFDQDate', event: "chooseHKFDQDate"
+ //, { field: 'HBeginDate', title: '鐢熶骇鏃ユ湡', width: 120, data_field: 'HBeginDate', event: "chooseHBeginDate" }
+ //, { field: 'HEndDate', title: '澶辨晥鏃ユ湡', width: 120, data_field: 'HEndDate', event: "chooseHEndDate" }
+ , { field: 'HKFDate', title: '鐢熶骇鏃ユ湡', align: 'center', width: 150, data_field: 'HKFDate', event: "chooseHKFDate" }//
+ , { field: 'HKFPeriod', title: '淇濊川鏈�', width: 100, edit: 'text', event: "inputHKFPeriod" }//
+ , { field: 'HKFDQDate', title: '鍒版湡鏃ユ湡', align: 'center', width: 150, data_field: 'HKFDQDate', event: "chooseHKFDQDate" }//
//, { field: 'HDate', title: '瑕佹眰浜よ揣鏃ユ湡', width: 150 }
, { field: 'HPOOrderInterID', title: '閲囪喘璁㈠崟涓诲唴鐮�', width: 150, hide: true }
, { field: 'HPOOrderEntryID', title: '閲囪喘璁㈠崟瀛愬唴鐮�', width: 150, hide: true }
@@ -577,29 +593,10 @@
, { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 150, hide: true }
, { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 150, hide: true }
, { field: 'HSupID', title: '渚涘簲鍟咺D', width: 150, hide: true }
+ , { field: 'HSupName', title: '渚涘簲鍟嗗悕绉�', width: 150, hide: true }
]]
- // , data: [linterid]
- // , page: true
- //, height: 500
-
, done: function (res, curr, count) {
- //鏃ユ湡鎺т欢
- //$(".layui-input-date").each(function (i) {
- // layui.laydate.render({
- // elem: this
- // ,format: "yyyy-MM-dd"
- // , value: this.value
- // ,trigger:'click'//閲囩敤click寮瑰嚭
- // , done: function (value, date, endDate) {
- // table.cache.mainTable.
- // //if (res && res.data[i]) {
- // // $.extend(res.data[i], { 'HKFDate': value })
- // //}
- // }
- // });
- //});
-
console.log(res);
layer.closeAll("loading");
}
@@ -632,6 +629,8 @@
, { field: 'HMoney', title: '閲戦', width: 100, hide: true }
, { field: 'HMTONO', title: '璁″垝璺熻釜鍗曞彿', width: 100 }
, { field: 'HBatchNo', title: '鎵规', width: 100, edit: 'text' }
+ //, { field: 'HBeginDate', title: '鐢熶骇鏃ユ湡', width: 120, data_field: 'HBeginDate', event: "chooseHBeginDate" }
+ //, { field: 'HEndDate', title: '澶辨晥鏃ユ湡', width: 120, data_field: 'HEndDate', event: "chooseHEndDate" }
, { field: 'HKFDate', title: '鐢熶骇鏃ユ湡', align: 'center', width: 150, data_field: 'HKFDate', event: "chooseHKFDate" }
, { field: 'HKFPeriod', title: '淇濊川鏈�', width: 100, edit: 'text', event: "inputHKFPeriod" }
, { field: 'HKFDQDate', title: '鍒版湡鏃ユ湡', align: 'center', width: 150, data_field: 'HKFDQDate', event: "chooseHKFDQDate" }
@@ -738,6 +737,32 @@
}
});
}
+ else if (obj.event == 'chooseHBeginDate') {
+ var field = $(this).data('field');
+ laydate.render({
+ elem: this.firstChild
+ , show: true //鐩存帴鏄剧ず
+ , closeStop: this
+ , done: function (value, date) {
+ data[field] = value;
+ obj.update(data);
+
+ }
+ });
+ }
+ else if (obj.event == 'chooseHEndDate') {
+ var field = $(this).data('field');
+ laydate.render({
+ elem: this.firstChild
+ , show: true //鐩存帴鏄剧ず
+ , closeStop: this
+ , done: function (value, date) {
+ data[field] = value;
+ obj.update(data);
+
+ }
+ });
+ }
else if (obj.event == 'inputHKFPeriod') {
$(obj.tr).find(".layui-table-edit").keyup(function () {
var $input = $(this), val = $input.val();
@@ -764,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);
}
@@ -773,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