feat: 客户新增已销售产品，供应商新增已采购商品

b9f354de · doc_wei · 68bd67c5 · b9f354de · b9f354de · b9f354de
6 changed file
--- a/crm/src/main/resources/template/js/customerManage/customerManage.js
+++ b/crm/src/main/resources/template/js/customerManage/customerManage.js
@@ -19,6 +19,9 @@ layui.config({
 			pageUrl: systemCommonUtil.getUrl('FP2023030300001&id=' + objectId, null)
 		}],
 		suffixData: [{
+			title: '已销售产品',
+			pageUrl: '../../tpl/holder/holderNormsList.html'
+		}, {
 			title: '团队',
 			pageUrl: '../../tpl/teamBusiness/teamBusinessDetails.html'
 		}],

--- a/erp/src/main/resources/template/js/holder/holderNormsList.js
+++ b/erp/src/main/resources/template/js/holder/holderNormsList.js
+
+var objectKey = "";
+var objectId = "";
+
+layui.config({
+	base: basePath, 
+	version: skyeyeVersion
+}).extend({
+    window: 'js/winui.window'
+}).define(['window', 'table', 'jquery', 'winui', 'form'], function (exports) {
+	winui.renderColor();
+	var $ = layui.$,
+		form = layui.form,
+		table = layui.table;
+	objectKey = GetUrlParam("objectKey");
+	objectId = GetUrlParam("objectId");
+	if (isNull(objectKey) || isNull(objectId)) {
+		winui.window.msg("请传入适用对象信息", {icon: 2, time: 2000});
+		return false;
+	}
+
+	table.render({
+	    id: 'messageTable',
+	    elem: '#messageTable',
+	    method: 'post',
+	    url: sysMainMation.erpBasePath + 'queryHolderNormsList',
+	    where: getTableParams(),
+	    even: true,
+	    page: true,
+	    limits: getLimits(),
+	    limit: getLimit(),
+	    cols: [[
+	        { title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' },
+			{ field: 'materialId', title: '产品名称', align: 'left',width: 150, templet: function (d) {
+				return isNull(d.materialMation) ? '' : d.materialMation.name;
+			}},
+			{ field: 'normsId', title: '产品规格', align: 'left',width: 400, templet: function (d) {
+				return isNull(d.normsMation) ? '' : d.normsMation.name;
+			}}
+	    ]],
+	    done: function(json) {
+	    	matchingLanguage();
+			initTableSearchUtil.initAdvancedSearch(this, json.searchFilter, form, "暂不支持搜索", function () {
+				table.reloadData("messageTable", {page: {curr: 1}, where: getTableParams()});
+			});
+	    }
+	});
+	
+	table.on('tool(messageTable)', function (obj) {
+        var data = obj.data;
+        var layEvent = obj.event;
+    });
+
+	form.render();
+	$("body").on("click", "#reloadTable", function() {
+		loadTable();
+	});
+	function loadTable() {
+		table.reloadData("messageTable", {where: getTableParams()});
+	}
+
+	function getTableParams() {
+		return $.extend(true, {holderKey: objectKey, holderId: objectId}, initTableSearchUtil.getSearchValue("messageTable"));
+	}
+	
+    exports('holderNormsList', {});
+});
\ No newline at end of file
--- a/erp/src/main/resources/template/js/supplier/supplierManage.js
+++ b/erp/src/main/resources/template/js/supplier/supplierManage.js
@@ -19,6 +19,9 @@ layui.config({
 			pageUrl: systemCommonUtil.getUrl('FP2023080200005&id=' + objectId, null)
 		}],
 		suffixData: [{
+			title: '已采购产品',
+			pageUrl: '../../tpl/holder/holderNormsList.html'
+		}, {
 			title: '团队',
 			pageUrl: '../../tpl/teamBusiness/teamBusinessDetails.html'
 		}],

--- a/erp/src/main/resources/template/tpl/holder/holderNormsList.html
+++ b/erp/src/main/resources/template/tpl/holder/holderNormsList.html
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <title></title>
+    <link href="../../assets/lib/layui/css/layui.css" rel="stylesheet" />
+    <link href="../../assets/lib/winui/css/winui.css" rel="stylesheet" />
+</head>
+<body>
+    <div class="winui-toolbar">
+        <div class="winui-tool">
+            <button id="reloadTable" class="winui-toolbtn search-table-btn-right"><i class="fa fa-refresh" aria-hidden="true"></i><language showName="com.skyeye.refreshDataBtn"></language></button>
+        </div>
+    </div>
+    <div style="margin:auto 10px;">
+        <table id="messageTable" lay-filter="messageTable"></table>
+    </div>
+    <script src="../../assets/lib/layui/layui.js"></script>
+    <script src="../../assets/lib/layui/custom.js"></script>
+    <script type="text/javascript">
+        layui.config({base: '../../js/holder/'}).use('holderNormsList');
+    </script>
+</body>
+</html>
\ No newline at end of file
--- a/pro/src/main/resources/template/js/project/projectList.js
+++ b/pro/src/main/resources/template/js/project/projectList.js
@@ -119,7 +119,7 @@ layui.config({
 	// 服务
 	function giveService(data) {
 		_openNewWindows({
-			url: systemCommonUtil.getUrl('../../tpl/project/projectManage.html?objectId=' + data.id + '&objectKey=' + data.serviceClassName, null),
+			url: '../../tpl/project/projectManage.html?objectId=' + data.id + '&objectKey=' + data.serviceClassName,
 			title: "服务",
 			pageId: "projectGiveService",
 			area: ['90vw', '90vh'],

--- a/school/src/main/resources/template/js/subject/subjectManage.js
+++ b/school/src/main/resources/template/js/subject/subjectManage.js
@@ -20,10 +20,10 @@ layui.config({
 		}],
 		suffixData: [{
 			title: '章节',
-			pageUrl: systemCommonUtil.getUrl('../../tpl/chapter/chapterList.html', null)
+			pageUrl: '../../tpl/chapter/chapterList.html'
 		}, {
 			title: '知识点',
-			pageUrl: systemCommonUtil.getUrl('../../tpl/knowledge/knowledgeList.html', null)
+			pageUrl: '../../tpl/knowledge/knowledgeList.html'
 		}],
 		element: layui.element,
 		object: {