From 1d5b1dbeb856635513395bff0afe4c4900ab6e7a Mon Sep 17 00:00:00 2001
From: weizhiqiang <598748873@qq.com>
Date: Wed, 28 Dec 2022 23:41:23 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E6=B5=81=E5=B1=9E=E6=80=A7?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../activitiCommon/processInstanceDetails.js  |  4 +-
 .../template/tpl/actModel/actModelList.html   | 14 +---
 .../processInstanceDetails.html               | 77 -------------------
 .../js/assetReportManage/assetReportList.js   |  4 +-
 .../template/js/processAttr/processAttrAdd.js |  6 +-
 .../js/processAttr/processAttrEdit.js         | 15 ++--
 .../js/processAttr/processAttrList.js         |  2 +-
 .../lib/layui/customer/skyeye/dsFormUtil.js   | 62 ++++++++++++---
 8 files changed, 76 insertions(+), 108 deletions(-)

diff --git a/activiti/src/main/resources/template/js/activitiCommon/processInstanceDetails.js b/activiti/src/main/resources/template/js/activitiCommon/processInstanceDetails.js
index d26f5780e..5cf42e935 100644
--- a/activiti/src/main/resources/template/js/activitiCommon/processInstanceDetails.js
+++ b/activiti/src/main/resources/template/js/activitiCommon/processInstanceDetails.js
@@ -27,7 +27,9 @@ layui.config({
     	tableTemplate = $("#tableTemplate").html(),//表格展示
 		voucherTemplate = $("#voucherTemplate").html();//凭证展示
 
-    AjaxPostUtil.request({url: flowableBasePath + "activitimode025", params: {processInstanceId: processInstanceId}, type: 'json', method: 'GET', callback: function(j){
+    AjaxPostUtil.request({url: flowableBasePath + "queryBusinessData", params: {processInstanceId: processInstanceId}, type: 'json', method: 'POST', callback: function(json) {
+		console.log(json);
+		dsFormUtil.initSequenceDataDetails('showForm', json.rows);
 		var jsonStr = "";//实体json对象
 		var str = "";
 		$.each(j.rows, function(i, item) {
diff --git a/activiti/src/main/resources/template/tpl/actModel/actModelList.html b/activiti/src/main/resources/template/tpl/actModel/actModelList.html
index 571b63182..c821ede33 100644
--- a/activiti/src/main/resources/template/tpl/actModel/actModelList.html
+++ b/activiti/src/main/resources/template/tpl/actModel/actModelList.html
@@ -34,19 +34,9 @@
 	    	<div style="margin:auto 10px;">
         		<table id="messageTable" lay-filter="messageTable"></table>
         		<script type="text/html" id="tableBar">
-					{{# if(d.state == 3){ }}
-						{{# if(auth('1564106558827')){ }}
-            				<a class="layui-btn layui-btn-xs layui-btn-normal" lay-event="edit"><language showName="com.skyeye.editBtn"></language></a>
-						{{# } }}
-						{{# if(auth('1564106622099')){ }}
-            				<a class="layui-btn layui-btn-xs" lay-event="up">上线</a>
-						{{# } }}
-						{{# if(auth('1564106604765')){ }}
-            				<a class="layui-btn layui-btn-xs layui-btn-danger" lay-event="del">移除</a>
-						{{# } }}
-					{{# } else if (d.state == 2 && auth('1564106635178')){ }}
+					{{# if (d.state == 2 && auth('1564106635178')){ }}
             			<a class="layui-btn layui-btn-xs layui-btn-danger" lay-event="down">下线</a>
-					{{# } else if (d.state == 1){ }}
+					{{# } else if (d.state == 1 || d.state == 3) { }}
 						{{# if(auth('1564106558827')){ }}
             				<a class="layui-btn layui-btn-xs layui-btn-normal" lay-event="edit"><language showName="com.skyeye.editBtn"></language></a>
 						{{# } }}
diff --git a/activiti/src/main/resources/template/tpl/activitiCommon/processInstanceDetails.html b/activiti/src/main/resources/template/tpl/activitiCommon/processInstanceDetails.html
index 059f4e9e1..d8d98dac7 100644
--- a/activiti/src/main/resources/template/tpl/activitiCommon/processInstanceDetails.html
+++ b/activiti/src/main/resources/template/tpl/activitiCommon/processInstanceDetails.html
@@ -30,9 +30,6 @@
 			</ul>
 			<div class="layui-tab-content">
 				<div class="layui-tab-item layui-show">
-					<div class="layui-form-item layui-col-xs12">
-			   			<span class="hr-title" id="activitiTitle"></span><hr>
-			    	</div>
 			    	<div id="showForm" style="height: auto; width: 100%; float: left;">
 			    		
 			    	</div>
@@ -49,80 +46,6 @@
 		</div>
 	</div>
 	
-	<!-- 文本展示 -->
-	<script type="text/x-handlebars-template" id="textTemplate">
-        {{#bean}}
-            <div class="layui-form-item layui-col-xs{{proportion}}">
-	            <label class="layui-form-label">{{name}}：</label>
-	            <div class="layui-input-block ver-center">
-        			{{value}}
-        		</div>
-	        </div>
-        {{/bean}}
-    </script>
-    
-    <!-- 附件展示 -->
-    <script type="text/x-handlebars-template" id="enclosureTemplate">
-        {{#bean}}
-            <div class="layui-form-item layui-col-xs{{proportion}}">
-	            <label class="layui-form-label">{{name}}：</label>
-	            <div class="layui-input-block ver-center">
-        			{{#each value}}
-						<a rowid="{{id}}" class="enclosureItem" rowpath="{{fileAddress}}" href="javascript:;" style="color:blue;">{{name}}</a><br>
-					{{/each}}
-        		</div>
-	        </div>
-        {{/bean}}
-    </script>
-    
-    <!-- 富文本展示 -->
-    <script type="text/x-handlebars-template" id="eichTextTemplate">
-        {{#bean}}
-            <div class="layui-form-item layui-col-xs{{proportion}}">
-	            <label class="layui-form-label">{{name}}：</label>
-	            <div class="layui-input-block ver-center">
-        			{{{value}}}
-        		</div>
-	        </div>
-        {{/bean}}
-    </script>
-    
-    <!-- 图片展示 -->
-    <script type="text/x-handlebars-template" id="picTemplate">
-        {{#bean}}
-            <div class="layui-form-item layui-col-xs{{proportion}}">
-	            <label class="layui-form-label">{{name}}：</label>
-	            <div class="layui-input-block ver-center">
-        			{{#each photo}}
-                        <img src="{{photoValue}}" class="photo-img">
-                    {{/each}}
-        		</div>
-	        </div>
-        {{/bean}}
-    </script>
-    
-    <!-- 表格展示 -->
-    <script type="text/x-handlebars-template" id="tableTemplate">
-        {{#bean}}
-            <div class="layui-form-item layui-col-xs{{proportion}}">
-	            <label class="layui-form-label">{{name}}：</label>
-	            <div class="layui-input-block ver-center" id="showTable{{orderBy}}">
-        		</div>
-	        </div>
-        {{/bean}}
-    </script>
-
-	<!-- 凭证展示 -->
-	<script type="text/x-handlebars-template" id="voucherTemplate">
-		{{#bean}}
-		<div class="layui-form-item layui-col-xs{{proportion}}">
-			<label class="layui-form-label">{{name}}：</label>
-			<div class="layui-input-block ver-center" id="showVoucher{{orderBy}}" style="overflow-x: auto;">
-			</div>
-		</div>
-		{{/bean}}
-	</script>
-    
     <!-- 时间线审批历史列表模板 -->
     <script type="text/x-handlebars-template" id="timeTreeApprovalHistory">
 		{{#bean}}
diff --git a/admin-assistant/src/main/resources/template/js/assetReportManage/assetReportList.js b/admin-assistant/src/main/resources/template/js/assetReportManage/assetReportList.js
index ba545389e..670b0175d 100644
--- a/admin-assistant/src/main/resources/template/js/assetReportManage/assetReportList.js
+++ b/admin-assistant/src/main/resources/template/js/assetReportManage/assetReportList.js
@@ -1,4 +1,5 @@
 
+
 var rowId = "";
 
 layui.config({
@@ -12,7 +13,7 @@ layui.config({
 		form = layui.form,
 		table = layui.table;
 
-	// 未申领的资产明细列表
+	// 资产明细列表
 	table.render({
 		id: 'messageTable',
 		elem: '#messageTable',
@@ -64,6 +65,7 @@ layui.config({
 	// 详情
 	function details(data) {
 		rowId = data.id;
+		// todo 资产明细列表
 		_openNewWindows({
 			url: "",
 			title: systemLanguage["com.skyeye.detailsPageTitle"][languageType],
diff --git a/base-server/src/main/resources/template/js/processAttr/processAttrAdd.js b/base-server/src/main/resources/template/js/processAttr/processAttrAdd.js
index 32e61f6ed..397c6cd0f 100644
--- a/base-server/src/main/resources/template/js/processAttr/processAttrAdd.js
+++ b/base-server/src/main/resources/template/js/processAttr/processAttrAdd.js
@@ -11,6 +11,7 @@ layui.config({
 		form = layui.form,
 		table = layui.table,
 		soulTable = layui.soulTable;
+	var childServiceClassName = '';
 	var tableDataList = new Array();
 	var rowNum = 1;
 	$("#tableBox").hide();
@@ -47,6 +48,9 @@ layui.config({
 			var childAttr = [];
 			AjaxPostUtil.request({url: reqBasePath + "queryChildAttrDefinitionList", params: params, type: 'json', method: "POST", callback: function (json) {
 				childAttr = [].concat(json.rows);
+				if (childAttr.length > 0) {
+					childServiceClassName = childAttr[0].className;
+				}
 			}, async: false});
 			table.render({
 				id: 'messageTable',
@@ -140,7 +144,7 @@ layui.config({
 				}
 				$.each(tableDataList, function (i, item) {
 					item.id = null;
-					item.className = parent.objectId;
+					item.className = childServiceClassName;
 					item.parentAttrKey = $("#attrKey").val();
 					item.orderBy = i + 1;
 					item.actFlowId = parent.$("#actFlowId").val();
diff --git a/base-server/src/main/resources/template/js/processAttr/processAttrEdit.js b/base-server/src/main/resources/template/js/processAttr/processAttrEdit.js
index f1ee1ecda..0bf8192b9 100644
--- a/base-server/src/main/resources/template/js/processAttr/processAttrEdit.js
+++ b/base-server/src/main/resources/template/js/processAttr/processAttrEdit.js
@@ -11,6 +11,7 @@ layui.config({
 		form = layui.form,
 		table = layui.table,
 		soulTable = layui.soulTable;
+	var childServiceClassName = '';
 	var tableDataList = new Array();
 	var alignmentData;
 	var rowNum = 1;
@@ -47,9 +48,10 @@ layui.config({
 						winui.window.msg('请选择表格属性.', {icon: 2, time: 2000});
 						return false;
 					}
+					console.log(tableDataList)
 					$.each(tableDataList, function (i, item) {
 						item.id = null;
-						item.className = parent.objectId;
+						item.className = childServiceClassName;
 						item.parentAttrKey = $("#attrKey").val();
 						item.orderBy = i + 1;
 						item.actFlowId = parent.$("#actFlowId").val();
@@ -101,6 +103,9 @@ layui.config({
 			var childAttr = [];
 			AjaxPostUtil.request({url: reqBasePath + "queryChildAttrDefinitionList", params: params, type: 'json', method: "POST", callback: function (json) {
 				childAttr = [].concat(json.rows);
+				if (childAttr.length > 0) {
+					childServiceClassName = childAttr[0].className;
+				}
 			}, async: false});
 			table.render({
 				id: 'messageTable',
@@ -145,7 +150,7 @@ layui.config({
 					}},
 					{ field: 'templet', title: '脚本', align: 'left', width: 240, templet: function (d) {
 						return `<input type="text" id="templet${d.id}" placeholder="请填写脚本" cus-id="${d.id}" class="layui-input tableInput" ` +
-							`value="` + (isNull(d.templet) ? "" : d.templet) + `"/>`;
+							`value='` + (isNull(d.templet) ? "" : d.templet) + `'/>`;
 					}},
 				]],
 				done: function(json) {
@@ -163,13 +168,13 @@ layui.config({
 
 	form.on('select(tableSelect)', function(data) {
 		var id = data.elem.id;
-		buildData($(`#${id}`))
+		buildData($(`#${id}`));
 	});
 	$("body").on("input", ".tableInput", function () {
-		buildData($(this))
+		buildData($(this));
 	});
 	$("body").on("change", ".tableInput", function () {
-		buildData($(this))
+		buildData($(this));
 	});
 
 	function buildData(_this) {
diff --git a/base-server/src/main/resources/template/js/processAttr/processAttrList.js b/base-server/src/main/resources/template/js/processAttr/processAttrList.js
index 8ccc381f0..bbb32e9ad 100644
--- a/base-server/src/main/resources/template/js/processAttr/processAttrList.js
+++ b/base-server/src/main/resources/template/js/processAttr/processAttrList.js
@@ -38,7 +38,7 @@ layui.config({
 	    limit: getLimit(),
 	    cols: [[
 			{ title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' },
-			{ field: 'attrKey', title: '属性', align: 'left', width: 150 },
+			{ field: 'label', title: '属性', align: 'left', width: 150 },
 			{ field: 'proportion', title: '宽度比例', align: 'left', width: 120, templet: function (d) {
 				return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("widthScale", 'id', d.proportion, 'name');
 			}},
diff --git a/web/src/main/resources/template/assets/lib/layui/customer/skyeye/dsFormUtil.js b/web/src/main/resources/template/assets/lib/layui/customer/skyeye/dsFormUtil.js
index 42b3b47b2..f7507bf90 100644
--- a/web/src/main/resources/template/assets/lib/layui/customer/skyeye/dsFormUtil.js
+++ b/web/src/main/resources/template/assets/lib/layui/customer/skyeye/dsFormUtil.js
@@ -1,3 +1,4 @@
+
 // 动态表单工具函数
 var dsFormUtil = {
 
@@ -12,10 +13,13 @@ var dsFormUtil = {
     mastHaveImport: ['laydate', 'layedit', 'colorpicker', 'slider', 'fileUpload', 'codemirror', 'xml', 'clike', 'css', 'htmlmixed', 'javascript', 'nginx', 'solr', 'sql', 'vue',
         'matchbrackets', 'closebrackets', 'showHint', 'anywordHint', 'lint', 'jsonLint', 'foldcode', 'foldgutter', 'braceFold', 'commentFold', 'form'],
     showType: {
-        '1': '{{#bean}}<div class="layui-form-item {{defaultWidth}}"><label class="layui-form-label">{{labelContent}}：</label><div class="layui-input-block ver-center">{{text}}</div></div>{{/bean}}', // 文本展示
-        '2': '{{#bean}}<div class="layui-form-item {{defaultWidth}}"><label class="layui-form-label">{{labelContent}}：</label><div class="layui-input-block ver-center">{{#each text}}<a rowid="{{id}}" class="enclosureItem" rowpath="{{fileAddress}}" href="javascript:;" style="color:blue;">{{name}}</a><br>{{/each}}</div></div>{{/bean}}', // 附件展示
-        '3': '{{#bean}}<div class="layui-form-item {{defaultWidth}}"><label class="layui-form-label">{{labelContent}}：</label><div class="layui-input-block ver-center">{{{text}}}</div></div>{{/bean}}', // 富文本展示
-        '4': '{{#bean}}<div class="layui-form-item {{defaultWidth}}"><label class="layui-form-label">{{labelContent}}：</label><div class="layui-input-block ver-center">{{#each photo}}<img src="{{photoValue}}" class="photo-img">{{/each}}</div></div>{{/bean}}', // 图片展示
+        '1': '{{#bean}}<div class="layui-form-item {{proportion}}"><label class="layui-form-label">{{label}}：</label><div class="layui-input-block ver-center">{{displayValue}}</div></div>{{/bean}}', // 文本展示
+        '2': '{{#bean}}<div class="layui-form-item {{proportion}}"><label class="layui-form-label">{{label}}：</label><div class="layui-input-block ver-center">{{#each displayValue}}<a rowid="{{id}}" class="enclosureItem" rowpath="{{fileAddress}}" href="javascript:;" style="color:blue;">{{name}}</a><br>{{/each}}</div></div>{{/bean}}', // 附件展示
+        '3': '{{#bean}}<div class="layui-form-item {{proportion}}"><label class="layui-form-label">{{label}}：</label><div class="layui-input-block ver-center">{{{displayValue}}}</div></div>{{/bean}}', // 富文本展示
+        '4': '{{#bean}}<div class="layui-form-item {{proportion}}"><label class="layui-form-label">{{label}}：</label><div class="layui-input-block ver-center">{{#each photo}}<img src="{{photoValue}}" class="photo-img">{{/each}}</div></div>{{/bean}}', // 图片展示
+        '5': '{{#bean}}<div class="layui-form-item {{proportion}}"><label class="layui-form-label">{{label}}：</label><div class="layui-input-block ver-center" id="showTable{{orderBy}}">' +
+            '<table id="messageTable{{orderBy}}" lay-filter="messageTable{{orderBy}}"></table></div></div>{{/bean}}', // 表格展示
+        '6': '{{#bean}}<div class="layui-form-item {{proportion}}"><label class="layui-form-label">{{label}}：</label><div class="layui-input-block ver-center" id="showVoucher{{orderBy}}"></div></div>{{/bean}}', // 凭证展示
     },
 
     /**
@@ -301,13 +305,10 @@ var dsFormUtil = {
             var jsonStr = {
                 bean: item
             };
-            if(item.showType == 1){//文本展示
-            } else if (item.showType == 2){//附件展示
-            } else if (item.showType == 3){//富文本展示
-            } else if (item.showType == 4){//图片展示
+            if (item.showType == 4) { // 图片展示
                 var photoValue = [];
-                if (!isNull(jsonStr.bean.text)){
-                    photoValue = item.text.split(",");
+                if (!isNull(jsonStr.bean.displayValue)){
+                    photoValue = item.displayValue.split(",");
                 }
                 var rows = [];
                 $.each(photoValue, function(j, row){
@@ -315,9 +316,50 @@ var dsFormUtil = {
                 });
                 jsonStr.bean.photo = rows;
             }
+
+            // 加载html
             var str = getDataUseHandlebars(dsFormUtil.showType[item.showType], jsonStr);
             $("#" + customBoxId).append(str);
+
+            if (item.showType == 5) { // 表格展示
+                var _js = `<script>
+                        layui.define(["jquery", 'table'], function(exports) {
+                            var jQuery = layui.jquery,
+                                table = layui.table;
+                            table.render({
+                                id: "messageTable${item.orderBy}",
+                                elem: "#messageTable${item.orderBy}",
+                                data: ` + JSON.stringify(item.displayValue) + `,
+                                page: false,
+                                cols: ` + JSON.stringify(dsFormUtil.getTableHead(item.attrTransformTableList)) + `
+                            });
+                        });
+                       </script>`;
+                console.log(_js)
+                $("#" + customBoxId).append(_js);
+            } else  if (item.showType == 6) { // 凭证展示
+                var boxId = "showVoucher" + item.orderBy;
+                // 初始化凭证
+                voucherUtil.initDataDetails(boxId, item.value);
+            }
+        });
+    },
+
+    getTableHead: function (attrTransformTableList) {
+        var header = [];
+        $.each(attrTransformTableList, function (i, item) {
+            var field = {
+                field: item.attrKey,
+                title: item.label,
+                align: item.align,
+                width: item.width
+            };
+            if (!isNull(item.templet)) {
+                field['templet'] = item.templet;
+            }
+            header.push(field);
         });
+        return [header];
     },
 
     /**
-- 
GitLab