From 2f1e5bde1de562bcc0ee334714b7799d1eec0ea8 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期二, 02 一月 2024 13:45:34 +0800
Subject: [PATCH] 生成条码时修改计算有效期至逻辑，新增生产日期不可为空控制；条码列表改为动态加载，新增列设置按钮；退货单模块；送货单列表新增凯贝修改前备份文件；送货单编辑模块新增选源单功能；采购订单列表备份；excel导入生成送货单添加行合计；
---
WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_BarCodeBill.html | 120 +++++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 82 insertions(+), 38 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 ac5c64f..f8cbeb4 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
@@ -24,7 +24,7 @@
<!--<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="HBarcodeSaverPZ">鐢熸垚鍝佺鐮�</button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="HBarcodeSaverWY">鐢熸垚鍞竴鐮�</button>-->
- <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="HBarcodeSaverBox">鐢熸垚鍐呭绠辨潯鐮�</button>
+ <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="HBarcodeSaverBox" id="HBarcodeSaverBox">鐢熸垚鍐呭绠辨潯鐮�</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>
@@ -115,6 +115,7 @@
<script src="../../layuiadmin/Scripts/json2.js" type="text/javascript"></script>
<script src="../../layuiadmin/Scripts/jquery-1.4.1.js" type="text/javascript"></script>
<script src="../../../../Scripts/webConfig.js"></script>
+ <script src="../../layuiadmin/Scripts/general.js"></script>
<!--<script src="../../../../Scripts/jquery-1.8.2.js"></script>-->
<script>
function f_alert(sMsg) {
@@ -149,33 +150,57 @@
}
}
}
- function addDate(date, days) {
- if (days == undefined || days == '') {
- days = 1;
- }
-
- var havingLeapYear = isDecimal(days / 365); //濡傛灉days涓嶈兘琚�365鏁撮櫎锛屽垯涓洪棸骞达紝闇�瑕佸噺灏戜竴澶�
- if (havingLeapYear) {
- days--;//缁忛獙璇侊紝澶╂暟鍙渶瑕佸噺灏戜竴娆″嵆鍙紝瀛樺湪澶氫釜闂板勾涓嶉渶瑕佸惊鐜�掑噺
- }
-
- var date = new Date(date);
- date.setDate(date.getDate() + days);
- var month = date.getMonth() + 1;
- var day = date.getDate();
- var mm = "'" + month + "'";
- var dd = "'" + day + "'";
+ function addDate(date, days, HExpUnit, HKFPeriod) {
+ //璁＄畻鏈夋晥鏈熻嚦
+ if (HExpUnit == "Y") {//骞�
+ date = new Date(date);
+ console.log(date.getFullYear(date));
+ date.setYear(date.getFullYear(date) + HKFPeriod);
+ console.log(Format(date, "yyyy-MM-dd"));
- //鍗曚綅鏁板墠闈㈠姞0
- if (mm.length == 3) {
- month = "0" + month;
+ return Format(date, "yyyy-MM-dd");
}
- if (dd.length == 3) {
- day = "0" + day;
+ if (HExpUnit == "M") {//鏈�
+ date = new Date(date);
+ date.setMonth(date.getMonth(date) + HKFPeriod);
+
+ return Format(date, "yyyy-MM-dd");
+ }
+ if (HExpUnit == "D") {//鏃�
+ date = new Date(date);
+ date.setDate(date.getDate(date) + HKFPeriod);
+ console.log(Format(date, "yyyy-MM-dd"));
+ return Format(date, "yyyy-MM-dd");
+ }
+ else { //瀹夌憺璁＄畻鏂瑰紡
+ if (days == undefined || days == '') {
+ days = 1;
+ }
+
+ var havingLeapYear = isDecimal(days / 365); //濡傛灉days涓嶈兘琚�365鏁撮櫎锛屽垯涓洪棸骞达紝闇�瑕佸噺灏戜竴澶�
+ if (havingLeapYear) {
+ days--;//缁忛獙璇侊紝澶╂暟鍙渶瑕佸噺灏戜竴娆″嵆鍙紝瀛樺湪澶氫釜闂板勾涓嶉渶瑕佸惊鐜�掑噺
+ }
+
+ var date = new Date(date);
+ date.setDate(date.getDate() + days);
+ var month = date.getMonth() + 1;
+ var day = date.getDate();
+ var mm = "'" + month + "'";
+ var dd = "'" + day + "'";
+
+ //鍗曚綅鏁板墠闈㈠姞0
+ if (mm.length == 3) {
+ month = "0" + month;
+ }
+ if (dd.length == 3) {
+ day = "0" + day;
+ }
+
+ var time = date.getFullYear() + "-" + month + "-" + day
+ return time;
}
- var time = date.getFullYear() + "-" + month + "-" + day
- return time;
}
function DateDiff(sDate1, sDate2) { //sDate1鍜宻Date2鏄�2002-12-18鏍煎紡
var aDate, oDate1, oDate2, iDays
@@ -396,7 +421,7 @@
});
return false;
});
- //鐢熸垚鍐呭绠辩爜
+ //鐢熸垚鍐呭绠辩爜
//鑾峰彇褰撳墠鏁版嵁鎵�鍦ㄦ暟缁勭殑涓嬫爣
function findIndex(HMaterNumber, HMaterModel, array) {
@@ -428,8 +453,8 @@
layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鏈鐢熸垚鏉＄爜鏁伴噺涓嶈兘瓒呭嚭鏈敓鎴愭潯鐮佹暟閲�!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
}
- if (_sSubStr[i].HQty > 0 && (_sSubStr[i].HBatchNo == "" || _sSubStr[i].HKFDate == "")) {
- layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鎵规鎴栫敓浜ф棩鏈熶笉鑳戒负绌�!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ if (_sSubStr[i].HQty > 0 && _sSubStr[i].HISKFPERIOD == 1 && (/*_sSubStr[i].HBatchNo == "" ||*/ _sSubStr[i].HKFDate == "")) {
+ layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鐢熶骇鏃ユ湡涓嶈兘涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
}
//鑾峰彇涓嬫爣
@@ -439,9 +464,11 @@
newArray.push(_sSubStr[i]);
} else {
- //濡傛灉鏁扮粍涓湁鍜屽綋鍓嶆暟鎹腑鐗╂枡浠ｇ爜銆佽鏍煎瀷鍙蜂竴鑷寸殑淇℃伅锛屽垯灏嗕粬浠殑鏁伴噺绱姞
- newArray[index].HQty = Number(newArray[index].HQty) + Number(_sSubStr[i].HQty);
- }
+ if (newArray[index].HPOOrderBillNo == _sSubStr[i].HPOOrderBillNo) {
+ //濡傛灉鏁扮粍涓湁鍜屽綋鍓嶆暟鎹腑鐗╂枡浠ｇ爜銆佽鏍煎瀷鍙蜂竴鑷寸殑淇℃伅锛屽垯灏嗕粬浠殑鏁伴噺绱姞
+ newArray[index].HQty = Number(newArray[index].HQty) + Number(_sSubStr[i].HQty);
+ }
+ }
}
for (let i = 0; i < newArray.length; i++) {
@@ -463,6 +490,8 @@
layer.msg(data.Message, { icon: 1 });
element.tabDelete('tabDemo', '2'); //鍒犻櫎
element.tabDelete('tabDemo', '3'); //鍒犻櫎
+
+ $('#HBarcodeSaverBox').addClass("layui-btn-disabled").attr("disabled", true);//鐢熸垚鏉＄爜鎸夐挳绂佺敤
element.tabAdd('tabDemo', {
title: '澶栫鏉＄爜'
@@ -595,7 +624,7 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../views/BaseSet/SRM_OpenTmpList.html?linterid=' + sessionStorage["HUserName"] + '&HBarcode=&Type=' + openTmpListType, 'yes']
+ , content: ['../../views/BaseSet/SRM_OpenTmpList.html?linterid=' + sessionStorage["linterid"] + '&HBarcode=&Type=SRM_POOrderBillList', 'yes']
, resize: false
//, cancel: function () {
// $(".layui-btn").removeClass("layui-btn-disabled");
@@ -647,13 +676,17 @@
, { field: 'HWBQty', title: '澶栫鏁�', width: 100 }
, { field: 'HPrice', title: '鍗曚环', width: 100, hide: true }
, { field: 'HMoney', title: '閲戦', width: 100, hide: true }
- , { field: 'HMTONO', title: '璁″垝璺熻釜鍗曞彿', width: 100 }
- , { field: 'HBatchNo', title: '鐢熶骇鏃ユ湡D/C', width: 100, edit: 'text' }
+ , { field: 'HMTONO', title: '璁″垝璺熻釜鍗曞彿', width: 100, hide: true }
+ , { field: 'HBatchNo', title: '鎵瑰彿', width: 100 }
+ , { field: 'HISKFPERIOD', title: '鏄惁鍚敤淇濊川鏈�', width: 100, edit: 'text', hide: true }
+ , { field: 'HEXPUNIT', title: '淇濊川鏈熷崟浣�', width: 100, edit: 'text', hide: true }
+ , { field: 'HKFDate', title: '鐢熶骇鏃ユ湡', align: 'center', width: 150, data_field: 'HKFDate' }//, event: "chooseHKFDate"
+ , { field: 'HKFPeriod', title: '淇濊川鏈�', width: 100 }//
+ , { field: 'HKFDQDate', title: '鍒版湡鏃ユ湡', align: 'center', width: 150, data_field: 'HKFDQDate' }//, event: "chooseHKFDQDate"
+ , { field: 'HSupMaterNumber', title: '渚涘簲鍟嗘枡鍙�', width: 100, edit: 'text' }
+ , { field: 'HSupBatchNo', 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", hide: true}//
- , { field: 'HKFPeriod', title: '淇濊川鏈�', width: 100, hide: true }//
- , { field: 'HKFDQDate', title: '鍒版湡鏃ユ湡', align: 'center', width: 150, data_field: 'HKFDQDate', hide: true}//, event: "chooseHKFDQDate"
//, { field: 'HDate', title: '瑕佹眰浜よ揣鏃ユ湡', width: 150 }
, { field: 'HPOOrderInterID', title: '閲囪喘璁㈠崟涓诲唴鐮�', width: 150, hide: true }
, { field: 'HPOOrderEntryID', title: '閲囪喘璁㈠崟瀛愬唴鐮�', width: 150, hide: true }
@@ -661,7 +694,7 @@
, { field: 'HWWOrderInterID', title: '濮斿璁㈠崟涓诲唴鐮�', width: 150, hide: true }
, { field: 'HWWOrderEntryID', title: '濮斿璁㈠崟瀛愬唴鐮�', width: 150, hide: true }
, { field: 'HWWOrderDetaiLID ', title: '濮斿璁㈠崟鏄庣粏鍐呯爜', width: 150, hide: true }
- , { field: 'HWWOrderBillNo', title: '濮斿璁㈠崟鍗曞彿', width: 200 }
+ , { field: 'HWWOrderBillNo', title: '濮斿璁㈠崟鍗曞彿', width: 200, hide: true }
, { field: 'HSourceBillType', title: '婧愬崟绫诲瀷', width: 100 }
, { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 200 }
, { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 150, hide: true }
@@ -754,6 +787,8 @@
, "HSourceInterID": data[i].HSourceInterID
, "HSupID": data[i].HSupID
, "HSupName": data[i].HSupName
+ , "HSupBatchNo": data[i].HSupBatchNo
+ , "HSupMaterNumber": data[i].HSupMaterNumber
}
//oldData.push(data1);
oldData.splice(dataindex, 0, data1);
@@ -876,6 +911,15 @@
var data = obj.data;
if (obj.event === 'chooseHKFDate') {
var field = $(this).data('field');
+ var HExpUnit = data.HEXPUNIT; //淇濊川鏈熷崟浣�
+ var HKFPeriod = data.HKFPeriod; //淇濊川鏈�
+ if (HExpUnit != 'Y' && HExpUnit != 'M' && HExpUnit != 'D') {
+ layer.msg("姝ょ墿鏂欐病鏈夊惎鐢ㄤ繚璐ㄦ湡锛�");
+ obj.update({
+ HKFDate: '',
+ });
+ return;
+ }
laydate.render({
elem: this.firstChild
, show: true //鐩存帴鏄剧ず
@@ -884,7 +928,7 @@
data[field] = value;
obj.update(data);
if (parseInt(obj.data.HKFPeriod) >= 0) {
- var sKFDQDate = addDate(value, parseInt(obj.data.HKFPeriod));
+ var sKFDQDate = addDate(value, parseInt(obj.data.HKFPeriod), HExpUnit, HKFPeriod);
obj.update({
HKFDQDate: sKFDQDate,
});
--
Gitblit v1.9.1