From f5976e32889eb54f48f75ad791c32218d0ea9f6f Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期三, 29 十二月 2021 09:21:04 +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 | 33 ++++++++++++++++++++++++---------
1 files changed, 24 insertions(+), 9 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 f7e885b..9b56bce 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
@@ -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('&');
@@ -197,13 +206,13 @@
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';
@@ -211,7 +220,7 @@
//濮斿璁㈠崟
else if (type == 'SRM_EntrustOrderBill') {
mainUrl = 'GetHBarCodeShowBillMainBywy';
- subUrl = "GetHBarCodeShowBillSubBywy";
+ subUrl = "GetHBarCodeShowBillSubBywy"; //h_v_srm_EntrustOrderBillSub_ForWeb2
saveBarCode = "GetBarcodeSaveBillBoxBycg";//璋冪敤閲囪喘鏁版嵁
openTmpListType = 'SRM_POOrderBillList';
}
@@ -421,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 }
@@ -527,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=' + openTmpListType, 'yes']
+ , content: ['../../views/BaseSet/SRM_OpenTmpList.html?linterid=' + rows.toString() + '&HBarcode=&Type=' + openTmpListType, 'yes']
, resize: false
//, cancel: function () {
// $(".layui-btn").removeClass("layui-btn-disabled");
@@ -560,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: 'HMaterShortNumber', title: '鐗╂枡缂栫爜', width: 120 }
+ , { field: 'HMaterNumber', 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 }
@@ -733,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,
+ });
+ }
}
});
}
--
Gitblit v1.9.1