ERP门户首页统计整改完成

gateway/src/main/resources/template/js/erpPage/erpPage.js → erp/src/main/resources/template/js/erpPage/erpPage.js

@@ -14,7 +14,7 @@ layui.config({
 	
 	initFourNumList();
 	function initFourNumList(){
-		AjaxPostUtil.request({url: reqBasePath + "erppage001", params: {}, type: 'json', callback: function (json) {
+		AjaxPostUtil.request({url: sysMainMation.erpBasePath + "erppage001", params: {}, type: 'json', callback: function (json) {
 			$("#salesMoney").html(json.bean.salesMoney);
 			$("#retailMoney").html(json.bean.retailMoney);
 			$("#purchaseMoney").html(json.bean.purchaseMoney);
@@ -25,7 +25,7 @@ layui.config({
 	
 	// 近六个月审核通过的采购订单
 	function initSixMonthPurchase(){
-		AjaxPostUtil.request({url: reqBasePath + "erppage002", params: {}, type: 'json', callback: function (json) {
+		AjaxPostUtil.request({url: sysMainMation.erpBasePath + "erppage002", params: {}, type: 'json', callback: function (json) {
 			renderLayer04Left(json.rows);
 			initSixMonthSales();
    		}});
@@ -33,7 +33,7 @@ layui.config({
 	
 	// 近六个月审核通过的销售订单
 	function initSixMonthSales(){
-		AjaxPostUtil.request({url: reqBasePath + "erppage003", params: {}, type: 'json', callback: function (json) {
+		AjaxPostUtil.request({url: sysMainMation.erpBasePath + "erppage003", params: {}, type: 'json', callback: function (json) {
 			renderLayer04Left2(json.rows);
 			initSixMonthProfit();
    		}});
@@ -41,7 +41,7 @@ layui.config({
 	
 	// 近12个月审核通过的利润订单
 	function initSixMonthProfit(){
-		AjaxPostUtil.request({url: reqBasePath + "erppage004", params: {}, type: 'json', callback: function (json) {
+		AjaxPostUtil.request({url: sysMainMation.erpBasePath + "erppage004", params: {}, type: 'json', callback: function (json) {
 			renderLayer04Left3(json.rows);
 			matchingLanguage();
    		}});
@@ -54,7 +54,7 @@ layui.config({
 		var numStr = new Array();
 		$.each(rows, function(i, item) {
 			nameStr.push(item.yearMonth);
-			numStr.push(item.purchaseMoney);
+			numStr.push(isNull(item.money) ? 0 : item.money);
 		});
 		myChart1.setOption({
 			title: {
@@ -86,7 +86,7 @@ layui.config({
 		var numStr = new Array();
 		$.each(rows, function(i, item) {
 			nameStr.push(item.yearMonth);
-			numStr.push(item.salesMoney);
+			numStr.push(isNull(item.money) ? 0 : item.money);
 		});
 		myChart2.setOption({
 			title: {
@@ -118,7 +118,7 @@ layui.config({
 		var numStr = new Array();
 		$.each(rows, function(i, item) {
 			nameStr.push(item.yearMonth);
-			numStr.push(item.profitMoney);
+			numStr.push(isNull(item.profitMoney) ? 0 : item.profitMoney);
 		});
 		myChart3.setOption({
 			title: {

web/src/main/resources/template/assets/lib/layui/customer/erpOrderUtil.js

@@ -71,28 +71,6 @@ var erpOrderUtil = {
         return submitType;
     },
 
-    /**
-     * 根据根据提交类型以及当前的状态设置按钮
-     *
-     * @param submitType 单据提交类型  1需要审核；2不需要审核
-     * @param state 单据状态
-     */
-    orderEditPageSetBtnBySubmitType: function(submitType, state) {
-        if (submitType == 1) {
-            if (state == 0 || state == 3 || state == 5) {
-                $(".formEditBean").removeClass("layui-hide");
-                $(".formSubOneBean").removeClass("layui-hide");
-            } else if (state == 1) {
-                $(".save").removeClass("layui-hide");
-            }
-        } else if (submitType == 2) {
-            if (state != 1) {
-                $(".formEditBean").removeClass("layui-hide");
-                $(".formSubTwoBean").removeClass("layui-hide");
-            }
-        }
-    },
-
     /**
      * 删除订单信息
      *
@@ -158,30 +136,6 @@ var erpOrderUtil = {
         });
     },
 
-    /**
-     * 获取提交类型名称
-     *
-     * @param data
-     * @returns {string}
-     */
-    getSubmitTypeName: function (data) {
-        if (data.submitType == 1) {
-            return '工作流审批';
-        } else if (data.submitType == 2) {
-            return '自主提交';
-        }
-        return '';
-    },
-
-    getProcessInstanceIdBySubmitType: function (data) {
-        if (data.submitType == 1) {
-            return '<a lay-event="activitiProcessDetails" class="notice-title-click">' + data.processInstanceId + '</a>';
-        } else if (data.submitType == 2) {
-            return '不涉及';
-        }
-        return '';
-    },
-
     /**
      * 获取所有仓库信息
      *