purovps/jshERP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

多账户单个金额中的数值优化

Browse Source
This commit is contained in:
季圣华
2017-11-05 21:40:22 +08:00
parent 9f8d3e608f
commit 6d7aa039af
2 changed files with 254 additions and 207 deletions
Download Patch File Download Diff File Expand all files Collapse all files

446
src/main/webapp/js/common/common.js
View File

@@ -1,227 +1,263 @@
$(function()
{
domresize();
});
//========================页面高度自动调节================================
var heightInfo;
var widthInfo;
var initPageSize;
var initPageNum;
var webH;
var webW;
//改变表格宽高
function domresize()
{
webH = document.documentElement.clientHeight;
webW = document.documentElement.offsetWidth;
widthInfo = $("body").outerWidth() -27;
var mtopH = $("#searchTable").outerHeight();
var positionH = $("#position").outerHeight();
heightInfo = webH - mtopH - 86;
//分页信息修改成 15条
if(heightInfo > 450)
$(function()
{
initPageSize = 15;
initPageNum = [15,30,50];
}
else
domresize();
});
//========================页面高度自动调节================================
var heightInfo;
var widthInfo;
var initPageSize;
var initPageNum;
var webH;
var webW;
//改变表格宽高
function domresize()
{
initPageSize = 10;
initPageNum = [10,20,30,50];
webH = document.documentElement.clientHeight;
webW = document.documentElement.offsetWidth;
widthInfo = $("body").outerWidth() -27;
var mtopH = $("#searchTable").outerHeight();
var positionH = $("#position").outerHeight();
heightInfo = webH - mtopH - 86;
//分页信息修改成 15条
if(heightInfo > 450)
{
initPageSize = 15;
initPageNum = [15,30,50];
}
else
{
initPageSize = 10;
initPageNum = [10,20,30,50];
}
}
}
//========================页面高度自动调节================================
//========================页面高度自动调节================================
//判断浏览器的类型
function getOs()
{
if(navigator.userAgent.indexOf("MSIE")>0)
{
return "MSIE";
}
else if(isFirefox=navigator.userAgent.indexOf("Firefox")>0)
{
return "Firefox";
}
else if(isSafari=navigator.userAgent.indexOf("Safari")>0)
{
return "Safari";
}
else if(isCamino=navigator.userAgent.indexOf("Camino")>0)
{
return "Camino";
}
else if(isMozilla=navigator.userAgent.indexOf("Gecko/")>0)
{
return "Gecko";
}
}
//判断浏览器的类型
function getOs()
{
if(navigator.userAgent.indexOf("MSIE")>0)
{
return "MSIE";
}
else if(isFirefox=navigator.userAgent.indexOf("Firefox")>0)
{
return "Firefox";
}
else if(isSafari=navigator.userAgent.indexOf("Safari")>0)
{
return "Safari";
}
else if(isCamino=navigator.userAgent.indexOf("Camino")>0)
{
return "Camino";
}
else if(isMozilla=navigator.userAgent.indexOf("Gecko/")>0)
{
return "Gecko";
}
}
/**
* js生成唯一ID值 32位值随机值
* @returns 生成的字符串
*/
function uuid()
{
var s = [];
var hexDigits = "0123456789abcdef";
for (var i = 0; i < 36; i++)
s[i] = hexDigits.substr(Math.floor(Math.random() * 0x10), 1);
s[14] = "4"; // bits 12-15 of the time_hi_and_version field to 0010
s[19] = hexDigits.substr((s[19] & 0x3) | 0x8, 1); // bits 6-7 of the clock_seq_hi_and_reserved to 01
s[8] = s[13] = s[18] = s[23] = "";
return s.join("");
}
/**
* js获取浏览器的地址参数
* @param name 地址参数
* @return
*/
function getUrlParam(name) {
var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)"); //构造一个含有目标参数的正则表达式对象
var r = window.location.search.substr(1).match(reg); //匹配目标参数
if (r != null) return unescape(r[2]); return null; //返回参数值
}
/**
* js生成唯一ID值 32位值随机值
* @returns 生成的字符串
*/
function uuid()
{
var s = [];
var hexDigits = "0123456789abcdef";
for (var i = 0; i < 36; i++)
s[i] = hexDigits.substr(Math.floor(Math.random() * 0x10), 1);
s[14] = "4"; // bits 12-15 of the time_hi_and_version field to 0010
s[19] = hexDigits.substr((s[19] & 0x3) | 0x8, 1); // bits 6-7 of the clock_seq_hi_and_reserved to 01
s[8] = s[13] = s[18] = s[23] = "";
return s.join("");
}
/**
* js获取浏览器的地址参数
* @param name 地址参数
* @return
*/
function getUrlParam(name) {
var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)"); //构造一个含有目标参数的正则表达式对象
var r = window.location.search.substr(1).match(reg); //匹配目标参数
if (r != null) return unescape(r[2]); return null; //返回参数值
}
/**
* 获取按钮的权限
*/
function getBtnStr() {
var funId = window.parent.window.funId; //功能id
var btnStrList = window.parent.window.winBtnStrList; //按钮功能列表 JSON字符串
var btnEnableList =""; //按钮列表
if(funId && btnStrList) {
btnStrList = JSON.parse(btnStrList);
for(var i=0; i<btnStrList.length; i++){
if(btnStrList[i].funId ==funId){
if(btnStrList[i].btnStr) {
btnEnableList = btnEnableList + btnStrList[i].btnStr + ",";
/**
* 获取按钮的权限
*/
function getBtnStr() {
var funId = window.parent.window.funId; //功能id
var btnStrList = window.parent.window.winBtnStrList; //按钮功能列表 JSON字符串
var btnEnableList =""; //按钮列表
if(funId && btnStrList) {
btnStrList = JSON.parse(btnStrList);
for(var i=0; i<btnStrList.length; i++){
if(btnStrList[i].funId ==funId){
if(btnStrList[i].btnStr) {
btnEnableList = btnEnableList + btnStrList[i].btnStr + ",";
}
}
}
if(btnEnableList) {
btnEnableList = btnEnableList.substring(0,btnEnableList.length-1);
}
}
if(btnEnableList) {
btnEnableList = btnEnableList.substring(0,btnEnableList.length-1);
return btnEnableList;
}
/**
* js获取当前时间， 格式“yyyy-MM-dd HH:MM:SS”
*/
function getNowFormatDateTime() {
var date = new Date();
var seperator1 = "-";
var seperator2 = ":";
var month = date.getMonth() + 1;
var strDate = date.getDate();
var strHours = date.getHours();
var strMinutes = date.getMinutes();
var strSeconds = date.getSeconds();
if (month >= 1 && month <= 9) {
month = "0" + month;
}
if (strDate >= 0 && strDate <= 9) {
strDate = "0" + strDate;
}
if (strHours >= 0 && strHours <= 9) {
strHours = "0" + strHours;
}
if (strMinutes >= 0 && strMinutes <= 9) {
strMinutes = "0" + strMinutes;
}
if (strSeconds >= 0 && strSeconds <= 9) {
strSeconds = "0" + strSeconds;
}
var currentdate = date.getFullYear() + seperator1 + month + seperator1 + strDate
+ " " + strHours + seperator2 + strMinutes
+ seperator2 + strSeconds;
return currentdate;
}
return btnEnableList;
}
/**
* js获取当前时间， 格式“yyyy-MM-dd HH:MM:SS”
*/
function getNowFormatDateTime() {
var date = new Date();
var seperator1 = "-";
var seperator2 = ":";
var month = date.getMonth() + 1;
var strDate = date.getDate();
var strHours = date.getHours();
var strMinutes = date.getMinutes();
var strSeconds = date.getSeconds();
if (month >= 1 && month <= 9) {
month = "0" + month;
/**
* js获取当前时间， 格式“yyyy-MM”
*/
function getNowFormatMonth() {
var date = new Date();
var seperator1 = "-";
var month = date.getMonth() + 1;
if (month >= 1 && month <= 9) {
month = "0" + month;
}
var currentdate = date.getFullYear() + seperator1 + month;
return currentdate;
}
if (strDate >= 0 && strDate <= 9) {
strDate = "0" + strDate;
}
if (strHours >= 0 && strHours <= 9) {
strHours = "0" + strHours;
}
if (strMinutes >= 0 && strMinutes <= 9) {
strMinutes = "0" + strMinutes;
}
if (strSeconds >= 0 && strSeconds <= 9) {
strSeconds = "0" + strSeconds;
}
var currentdate = date.getFullYear() + seperator1 + month + seperator1 + strDate
+ " " + strHours + seperator2 + strMinutes
+ seperator2 + strSeconds;
return currentdate;
}
/**
* js获取当前时间， 格式“yyyy-MM”
*/
function getNowFormatMonth() {
var date = new Date();
var seperator1 = "-";
var month = date.getMonth() + 1;
if (month >= 1 && month <= 9) {
month = "0" + month;
/**
* js获取当前时间， 格式“yyyy-MM-dd”
*/
function getNowFormatDate() {
var date = new Date();
var seperator1 = "-";
var seperator2 = ":";
var month = date.getMonth() + 1;
var strDate = date.getDate();
if (month >= 1 && month <= 9) {
month = "0" + month;
}
if (strDate >= 0 && strDate <= 9) {
strDate = "0" + strDate;
}
var currentdate = date.getFullYear() + seperator1 + month + seperator1 + strDate;
return currentdate;
}
var currentdate = date.getFullYear() + seperator1 + month;
return currentdate;
}
/**
* js获取当前时间， 格式“yyyy-MM-dd”
*/
function getNowFormatDate() {
var date = new Date();
var seperator1 = "-";
var seperator2 = ":";
var month = date.getMonth() + 1;
var strDate = date.getDate();
if (month >= 1 && month <= 9) {
month = "0" + month;
/**
* js获取当前时间， 格式“yyyyMMdd”
*/
function getNowFormatDateTwo() {
var date = new Date();
var month = date.getMonth() + 1;
var strDate = date.getDate();
if (month >= 1 && month <= 9) {
month = "0" + month;
}
if (strDate >= 0 && strDate <= 9) {
strDate = "0" + strDate;
}
var currentdate = date.getFullYear() + month.toString() + strDate.toString();
return currentdate;
}
if (strDate >= 0 && strDate <= 9) {
strDate = "0" + strDate;
}
var currentdate = date.getFullYear() + seperator1 + month + seperator1 + strDate;
return currentdate;
}
/**
* js获取当前时间， 格式“yyyyMMdd”
*/
function getNowFormatDateTwo() {
var date = new Date();
var month = date.getMonth() + 1;
var strDate = date.getDate();
if (month >= 1 && month <= 9) {
month = "0" + month;
/**
* js根据时间生成编号， 格式“yyyyMMddHHMMSS”
*/
function getNowFormatDateNum() {
var date = new Date();
var seperator1 = "-";
var seperator2 = ":";
var month = date.getMonth() + 1;
var strDate = date.getDate();
var strHours = date.getHours();
var strMinutes = date.getMinutes();
var strSeconds = date.getSeconds();
if (month >= 1 && month <= 9) {
month = "0" + month;
}
if (strDate >= 0 && strDate <= 9) {
strDate = "0" + strDate;
}
if (strHours >= 0 && strHours <= 9) {
strHours = "0" + strHours;
}
if (strMinutes >= 0 && strMinutes <= 9) {
strMinutes = "0" + strMinutes;
}
if (strSeconds >= 0 && strSeconds <= 9) {
strSeconds = "0" + strSeconds;
}
var currentdate = date.getFullYear() + month.toString() + strDate.toString() + strHours
+ strMinutes + strSeconds;
return currentdate;
}
if (strDate >= 0 && strDate <= 9) {
strDate = "0" + strDate;
}
var currentdate = date.getFullYear() + month.toString() + strDate.toString();
return currentdate;
}
/**
* js根据时间生成编号， 格式“yyyyMMddHHMMSS”
*/
function getNowFormatDateNum() {
var date = new Date();
var seperator1 = "-";
var seperator2 = ":";
var month = date.getMonth() + 1;
var strDate = date.getDate();
var strHours = date.getHours();
var strMinutes = date.getMinutes();
var strSeconds = date.getSeconds();
if (month >= 1 && month <= 9) {
month = "0" + month;
function encode(name){
return encodeURI(encodeURI(name));
}
if (strDate >= 0 && strDate <= 9) {
strDate = "0" + strDate;
}
if (strHours >= 0 && strHours <= 9) {
strHours = "0" + strHours;
}
if (strMinutes >= 0 && strMinutes <= 9) {
strMinutes = "0" + strMinutes;
}
if (strSeconds >= 0 && strSeconds <= 9) {
strSeconds = "0" + strSeconds;
}
var currentdate = date.getFullYear() + month.toString() + strDate.toString() + strHours
+ strMinutes + strSeconds;
return currentdate;
}
function encode(name){
return encodeURI(encodeURI(name));
}
/**
* 将数组单个金额中的数值转为正数
* @param arr
* @returns {Array}
*/
function changeListFmtPlus(arr) {
var newArr = new Array();
for(var i=0; i<arr.length; i++) {
if(arr[i] < 0){
newArr.push((0 - arr[i]).toString());
}
else {
newArr.push((arr[i]-0).toString());
}
}
return newArr;
}
/**
* 将数组单个金额中的数值转为负数
* @param arr
* @returns {Array}
*/
function changeListFmtMinus(arr) {
var newArr = new Array();
for(var i=0; i<arr.length; i++) {
if(arr[i] < 0){
newArr.push((arr[i]-0).toString());
}
else {
newArr.push((0 - arr[i]).toString());
}
}
return newArr;
}

15
src/main/webapp/js/pages/materials/in_out.js
View File

@@ -1683,6 +1683,7 @@
$("#AccountId").val("many"); //下拉框选中多账户
var accountArr = depotHeadInfo[22].split(",");
var accountMoneyArr = depotHeadInfo[23].split(",");
accountMoneyArr = changeListFmtPlus(accountMoneyArr) //将数组单个金额中的数值转为正数
if(listSubType == "零售" || listSubType == "零售退货") {
var manyAccountMoney = 0; //多账户合计-零售
@@ -1739,7 +1740,11 @@
for(var i = 0 ;i < accountList.length;i++){
var account = accountList[i];
if(accountArr[j] == account.id) {
accountIdShow = accountIdShow + account.name + "(" + accountMoneyArr[j] +"元) ";
var currentAccountMoney = accountMoneyArr[j]-0;
if(currentAccountMoney < 0){
currentAccountMoney = 0-currentAccountMoney;
}
accountIdShow = accountIdShow + account.name + "(" + currentAccountMoney +"元) ";
manyAccountMoney += accountMoneyArr[j]-0; //多账户合计-零售
}
}
@@ -1984,10 +1989,16 @@
if($('#OrganId').length){
OrganId = $('#OrganId').combobox('getValue');
}
var accountMoneyList = $("#AccountId").attr("data-accountmoneyarr"); //账户金额列表-多账户
accountMoneyList = accountMoneyList.replace("[","").replace("]","").toString();
var reg=new RegExp("\"","g"); //创建正则RegExp对象
accountMoneyList = accountMoneyList.replace(reg,""); //替换所有的双引号
var accountMoneyArr = accountMoneyList.split(","); //转为数组
if(listSubType === "采购"||listSubType === "零售退货"||listSubType === "销售退货"){
//付款为负数
ChangeAmount = 0 - ChangeAmount;
TotalPrice = 0 - TotalPrice;
accountMoneyArr = changeListFmtMinus(accountMoneyArr); //将数组单个金额中的数值转为负数
}
//零售时候，可以从会员预付款中扣款
var thisPayType = "现付";
@@ -2035,7 +2046,7 @@
PayType: thisPayType, //现付/预付款
Remark: $.trim($("#Remark").val()),
AccountIdList: $("#AccountId").attr("data-accountarr"), //账户列表-多账户
AccountMoneyList: $("#AccountId").attr("data-accountmoneyarr"), //账户金额列表-多账户
AccountMoneyList: JSON.stringify(accountMoneyArr), //账户金额列表-多账户
Discount: $.trim($("#Discount").val()),
DiscountMoney: $.trim($("#DiscountMoney").val()),
DiscountLastMoney: $.trim($("#DiscountLastMoney").val()),