CRM统计整改完成

gateway/src/main/resources/template/js/crmPage/crmContractNewInsert.js → crm/src/main/resources/template/js/crmPage/crmContractNewInsert.js

@@ -28,7 +28,7 @@ layui.config({
 	initContractNewInsert(year);
 	// 获取合同在指定年度的月新增量
 	function initContractNewInsert(year){
-		AjaxPostUtil.request({url: reqBasePath + "crmpage004", params: {year: year}, type: 'json', callback: function (json) {
+		AjaxPostUtil.request({url: sysMainMation.crmBasePath + "crmpage004", params: {year: year}, type: 'json', callback: function (json) {
 			renderCharts1(json.rows);
 			matchingLanguage();
    		}});

gateway/src/main/resources/template/js/crmPage/crmCustomDocumentaryByType.js → crm/src/main/resources/template/js/crmPage/crmCustomDocumentaryByType.js

@@ -32,7 +32,7 @@ layui.config({
 			year: year,
 			crmDocumentaryType: sysDictData["crmDocumentaryType"]["key"]
 		};
-		AjaxPostUtil.request({url: reqBasePath + "crmpage003", params: params, type: 'json', callback: function (json) {
+		AjaxPostUtil.request({url: sysMainMation.crmBasePath + "crmpage003", params: params, type: 'json', callback: function (json) {
 			renderCharts1(json.rows);
 			matchingLanguage();
    		}});

gateway/src/main/resources/template/js/crmPage/crmCustomerByOther.js → crm/src/main/resources/template/js/crmPage/crmCustomerByOther.js

@@ -19,7 +19,7 @@ layui.config({
 		crmCustomerIndustry: sysDictData["crmCustomerIndustry"]["key"],
 		crmCustomerGroup: sysDictData["crmCustomerGroup"]["key"],
 	};
-	AjaxPostUtil.request({url: reqBasePath + "crmpage002", params: params, type: 'json', method: "POST", callback: function (json) {
+	AjaxPostUtil.request({url: sysMainMation.crmBasePath + "crmpage002", params: params, type: 'json', method: "POST", callback: function (json) {
 		renderCharts(json.bean);
 		matchingLanguage();
 	}});

gateway/src/main/resources/template/js/crmPage/crmDocumentaryNewInsert.js → crm/src/main/resources/template/js/crmPage/crmDocumentaryNewInsert.js

@@ -28,7 +28,7 @@ layui.config({
 	initContractNewInsert(year);
 	// 获取员工跟单在指定年度的月新增量
 	function initContractNewInsert(year){
-		AjaxPostUtil.request({url: reqBasePath + "crmpage005", params: {year: year}, type: 'json', callback: function (json) {
+		AjaxPostUtil.request({url: sysMainMation.crmBasePath + "crmpage005", params: {year: year}, type: 'json', callback: function (json) {
 			renderCharts1(json.rows);
 			matchingLanguage();
    		}});

gateway/src/main/resources/template/js/crmPage/crmNewCustomAndContactNum.js → crm/src/main/resources/template/js/crmPage/crmNewCustomAndContactNum.js

@@ -28,7 +28,7 @@ layui.config({
 	initNewInsertNumByYear(year);
 	// 获取指定年度的客户新增量，联系人新增量
 	function initNewInsertNumByYear(year){
-		AjaxPostUtil.request({url: reqBasePath + "crmpage001", params: {year: year}, type: 'json', callback: function (json) {
+		AjaxPostUtil.request({url: sysMainMation.crmBasePath + "crmpage001", params: {year: year}, type: 'json', callback: function (json) {
 			renderCharts1(json.rows);
 			matchingLanguage();
    		}});

crm/src/main/resources/template/js/customerManage/customerChoose.js

@@ -20,7 +20,7 @@ layui.config({
 	    id: 'messageTable',
 	    elem: '#messageTable',
 	    method: 'post',
-	    url: flowableBasePath + 'customer001',
+	    url: sysMainMation.crmBasePath + 'customer001',
 	    where: getTableParams(),
 	    even: true,
 	    page: true,
@@ -32,9 +32,15 @@ layui.config({
 	        { field: 'name', title: '客户名称', align: 'left', width: 200, templet: function (d) {
 	        	return '<a lay-event="details" class="notice-title-click">' + d.name + '</a>';
 	        }},
-	        { field: 'typeName', title: '客户分类', align: 'left', width: 120 },
-	        { field: 'fromName', title: '客户来源', align: 'left', width: 120 },
-	        { field: 'industryName', title: '所属行业', align: 'left', width: 180 }
+			{ field: 'typeId', title: '客户分类', align: 'left', width: 120, templet: function (d) {
+				return sysDictDataUtil.getDictDataNameByCodeAndKey("CRM_CUSTOMER_TYPE", d.typeId);
+			}},
+			{ field: 'fromId', title: '客户来源', align: 'left', width: 120, templet: function (d) {
+				return sysDictDataUtil.getDictDataNameByCodeAndKey("CRM_CUSTOMER_FROM", d.fromId);
+			}},
+			{ field: 'industryId', title: '所属行业', align: 'left', width: 180, templet: function (d) {
+				return sysDictDataUtil.getDictDataNameByCodeAndKey("CRM_CUSTOMER_INDUSTRY", d.industryId);
+			}},
 	    ]],
 	    done: function(res, curr, count){
 	    	matchingLanguage();
@@ -43,22 +49,8 @@ layui.config({
 				dubClick.find("input[type='radio']").prop("checked", true);
 				form.render();
 				var id = JSON.stringify(dubClick.data('index'));
-				var obj = res.rows[id];
-				var customerMation = {
-					id: obj.id,
-					customName: obj.name,
-					contacts: obj.contacts,
-					mobilePhone: obj.mobilePhone,
-					email: obj.email,
-					qq: obj.qq,
-					city: obj.city,
-					detailAddress: obj.detailAddress,
-					workPhone: obj.workPhone,
-					industryName: obj.industryName,
-					department: obj.department,
-					job: obj.job
-				}
-				parent.customerMation = customerMation;
+
+				parent.customerMation = res.rows[id];
 				parent.sysCustomerUtil.customerMation = customerMation;
 				parent.layer.close(index);
 				parent.refreshCode = '0';

crm/src/main/resources/template/js/customerManage/customerInternationalList.js

@@ -16,7 +16,7 @@ layui.config({
 	    id: 'messageTable',
 	    elem: '#messageTable',
 	    method: 'post',
-	    url: flowableBasePath + 'customer012',
+	    url: sysMainMation.crmBasePath + 'customer012',
 	    where: getTableParams(),
 	    even: true,
 	    page: true,
@@ -27,9 +27,15 @@ layui.config({
 	        { field: 'name', title: '客户名称', align: 'left', width: 300, templet: function (d) {
 	        	return '<a lay-event="details" class="notice-title-click">' + d.name + '</a>';
 	        }},
-	        { field: 'typeName', title: '客户分类', align: 'left', width: 120 },
-	        { field: 'fromName', title: '客户来源', align: 'left', width: 120 },
-	        { field: 'industryName', title: '所属行业', align: 'left', width: 180 },
+	        { field: 'typeId', title: '客户分类', align: 'left', width: 120, templet: function (d) {
+				return sysDictDataUtil.getDictDataNameByCodeAndKey("CRM_CUSTOMER_TYPE", d.typeId);
+			}},
+	        { field: 'fromId', title: '客户来源', align: 'left', width: 120, templet: function (d) {
+				return sysDictDataUtil.getDictDataNameByCodeAndKey("CRM_CUSTOMER_FROM", d.fromId);
+			}},
+	        { field: 'industryId', title: '所属行业', align: 'left', width: 180, templet: function (d) {
+				return sysDictDataUtil.getDictDataNameByCodeAndKey("CRM_CUSTOMER_INDUSTRY", d.industryId);
+			}},
 	        { field: 'noDocumentaryDayNum', title: '未跟单天数', align: 'left', width: 100 },
 	        { field: 'createName', title: systemLanguage["com.skyeye.createName"][languageType], align: 'left', width: 120 },
 	        { field: 'createTime', title: systemLanguage["com.skyeye.createTime"][languageType], align: 'center', width: 100 },
@@ -58,7 +64,7 @@ layui.config({
 	// 详情
 	function details(data) {
 		_openNewWindows({
-			url: "../../tpl/customerManage/customerDetails.html?objectId=" + data.id,
+			url: "../../tpl/customerManage/customerManage.html?objectId=" + data.id + "&objectKey=" + data.serviceClassName,
 			title: systemLanguage["com.skyeye.detailsPageTitle"][languageType],
 			pageId: "customerDetails",
 			area: ['90vw', '90vh'],

seal-service/src/main/resources/template/js/sealseservice/sealseservicedetails.js

@@ -94,7 +94,7 @@ layui.config({
 		// 客户详情
 		$("body").on("click", ".customerNameMation", function() {
 			_openNewWindows({
-				url: "../../tpl/customerManage/customerDetails.html?objectId=" +$(this).attr("rowid"),
+				url: "../../tpl/customerManage/customerManage.html?objectId=" +$(this).attr("rowid"),
 				title: systemLanguage["com.skyeye.detailsPageTitle"][languageType],
 				pageId: "customerDetails",
 				area: ['90vw', '90vh'],