Merge branch 'company_server' of https://gitee.com/doc_wei01/skyeye into company_server

common/src/main/resources/template/js/dsFormPage/dsFormPageDesign.js

@@ -14,6 +14,7 @@ var attrList = [];
 
 // 这两个参数为开启团队权限的对象拥有，这里没有实际用处，用于加载组件时临时有用。
 var objectId = '', objectKey = '';
+var objectParams = {};
 
 layui.config({
 	base: basePath, 

common/src/main/resources/template/js/dsFormPage/pageShow.js

 
 // 以下两个参数开启团队权限时有值
 var objectId = '', objectKey = '';
+var objectParams = {};
 // 根据以下两个参数判断：工作流的判断是否要根据serviceClassName的判断
 var serviceClassName;
 

erp/src/main/resources/template/js/material/materialReserveList.js

@@ -52,7 +52,7 @@ layui.config({
 				{ field: 'unit', title: '产品规格类型', align: 'center', width: 100, templet: function (d) {
 					return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("materialUnit", 'id', d.unit, 'name');
 				}},
-		        { field: 'norms', title: '库存', width: 150, templet: function (d) {
+		        { field: 'norms', title: '库存', width: 500, templet: function (d) {
 		        	var str = "";
 		        	$.each(d.materialNorms, function(i, item) {
 						if (!isNull(item.overAllStock)) {

erp/src/main/resources/template/js/purchaseDeliveryNote/deliveryToQualityInspection.js

@@ -33,6 +33,7 @@ layui.config({
                 }});
             },
             loadComponentCallback: function () {
+                $("div[controlType='supplier']").remove();
                 $("div[controlType='qualityInspectionFromType']").remove();
             },
             tableAddRowCallback: function (tableId) {

school/src/main/resources/template/js/knowledge/knowledgeList.js

@@ -14,6 +14,7 @@ layui.config({
 		table = layui.table;
 	objectKey = GetUrlParam("objectKey");
 	objectId = GetUrlParam("objectId");
+	subjectClassesId = GetUrlParam("subjectClassesId");
 	if (isNull(objectKey) || isNull(objectId)) {
 		winui.window.msg("请传入适用对象信息", {icon: 2, time: 2000});
 		return false;
@@ -34,9 +35,7 @@ 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: 'chapterId', title: '所属章节', align: 'left', width: 300, templet: function (d) {
-				return isNull(d.chapterMation) ? '' : '第 ' + d.chapterMation.section + '章 ' + d.chapterMation.name;
-			}},
+			{ field: 'content', title: '内容', align: 'left', width: 300},
 	        { field: 'createName', title: systemLanguage["com.skyeye.createName"][languageType], align: 'left', width: 120 },
 	        { field: 'createTime', title: systemLanguage["com.skyeye.createTime"][languageType], align: 'center', width: 150 },
 	        { field: 'lastUpdateName', title: systemLanguage["com.skyeye.lastUpdateName"][languageType], align: 'left', width: 120 },
@@ -65,8 +64,8 @@ layui.config({
 
 	// 新增
 	$("body").on("click", "#addBean", function() {
-    	parent._openNewWindows({
-			url: systemCommonUtil.getUrl('FP2023082800013&objectId=' + objectId + '&objectKey=' + objectKey, null),
+		parent._openNewWindows({
+			url: '../../tpl/knowledge/write.html?objectId=' + objectId + '&objectKey=' + objectKey + '&subjectClassesId=' + subjectClassesId,
 			title: systemLanguage["com.skyeye.addPageTitle"][languageType],
 			pageId: "knowledgeAdd",
 			area: ['90vw', '90vh'],
@@ -74,12 +73,12 @@ layui.config({
 				winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000});
 				loadTable();
 			}});
-    });
+	});
 	
 	// 编辑
 	function edit(data) {
 		parent._openNewWindows({
-			url: systemCommonUtil.getUrl('FP2023082800014&objectId=' + objectId + '&objectKey=' + objectKey + '&id=' + data.id, null),
+			url: '../../tpl/knowledge/write.html?objectId=' + objectId + '&objectKey=' + objectKey + '&subjectClassesId=' + subjectClassesId+ '&id=' + data.id,
 			title: systemLanguage["com.skyeye.editPageTitle"][languageType],
 			pageId: "knowledgeEdit",
 			area: ['90vw', '90vh'],
@@ -120,7 +119,7 @@ layui.config({
 	}
 
 	function getTableParams() {
-		return $.extend(true, {objectKey: objectKey, objectId: objectId}, initTableSearchUtil.getSearchValue("messageTable"));
+		return $.extend(true, {objectKey: objectKey, objectId: subjectClassesId}, initTableSearchUtil.getSearchValue("messageTable"));
 	}
 	
     exports('knowledgeList', {});

school/src/main/resources/template/js/knowledge/write.js

+
+// 以下两个参数开启团队权限时有值
+var objectId = '', objectKey = '';
+var objectParams = {};
+// 根据以下两个参数判断：工作流的判断是否要根据serviceClassName的判断
+var serviceClassName;
+
+layui.config({
+    base: basePath,
+    version: skyeyeVersion
+}).extend({
+    window: 'js/winui.window'
+}).define(['window', 'table', 'jquery'], function (exports) {
+    winui.renderColor();
+    var index = parent.layer.getFrameIndex(window.name);
+    var $ = layui.$;
+    var id = GetUrlParam("id");
+    var objectId = GetUrlParam("objectId");
+    var objectKey = GetUrlParam("objectKey");
+    objectParams.subjectClassesId = GetUrlParam("subjectClassesId");
+
+    if (isNull(id)) {
+        dsFormUtil.initAddPageForStatic('content', 'FP2023082800013', {
+            savePreParams: function (params) {
+                params.objectId = objectId;
+                params.objectKey = objectKey;
+                params.subjectClassesId = objectParams.subjectClassesId;
+            }
+        });
+    }else{
+        AjaxPostUtil.request({
+            url: sysMainMation.schoolBasePath + "queryKnowledgePointsById",
+            params: {id: id},
+            type: 'json',
+            method: 'GET',
+            callback: function (json) {
+                let data = json.bean;
+                dsFormUtil.initEditPageForStatic('content', 'FP2023082800014', data, {
+                    savePreParams: function (params) {
+                        params.subjectClassesId = subjectClassesId;
+                    }
+                });
+            }
+        });
+
+    }
+
+});
\ No newline at end of file

school/src/main/resources/template/tpl/knowledge/write.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 style="margin:0 auto;padding:20px;">
+        <form class="layui-form" action="" id="showForm" autocomplete="off">
+            <div id="content"></div>
+            <div class="layui-form-item layui-col-xs12">
+                <div class="layui-input-block">
+                    <button class="winui-btn" type="button" id="cancle"><language showName="com.skyeye.cancel"></language></button>
+                    <button class="winui-btn" lay-submit lay-filter="formWriteBean" id="formWriteBean">保存</button>
+                </div>
+            </div>
+        </form>
+    </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/knowledge/'}).use('write');
+    </script>
+</body>
+</html>
\ No newline at end of file