工作流流程设计参数修改，明细账详情修改

activiti/src/main/resources/template/js/actFlow/actFlowAdd.js

@@ -12,7 +12,7 @@ layui.config({
 
 	treeSelectUtil.init({
 		eleTree: layui.eleTree,
-		elem: 'serviceClassName',
+		elem: 'applyServiceClassName',
 		url: reqBasePath + "queryServiceClassForTree"
 	});
 
@@ -23,7 +23,7 @@ layui.config({
 			var params = {
 				flowName: $("#flowName").val(),
 				modelKey: $("#modelKey").val(),
-				serviceClassName: $("#serviceClassName").attr("serviceClassName")
+				applyServiceClassName: $("#serviceClassName").attr("applyServiceClassName")
 			};
 
 			AjaxPostUtil.request({url: flowableBasePath + "writeActFlowMation", params: params, type: 'json', method: 'POST', callback: function (json) {

activiti/src/main/resources/template/js/actFlow/actFlowEdit.js

@@ -21,9 +21,9 @@ layui.config({
 
 			treeSelectUtil.init({
 				eleTree: layui.eleTree,
-				elem: 'serviceClassName',
+				elem: 'applyServiceClassName',
 				url: reqBasePath + "queryServiceClassForTree",
-				defaultId: json.bean.serviceClassName
+				defaultId: json.bean.applyServiceClassName
 			});
 
 			matchingLanguage();
@@ -34,7 +34,7 @@ layui.config({
 						id: parent.rowId,
 						flowName: $("#flowName").val(),
 						modelKey: $("#modelKey").val(),
-						serviceClassName: $("#serviceClassName").attr("serviceClassName")
+						applyServiceClassName: $("#applyServiceClassName").attr("applyServiceClassName")
 					};
 
 					AjaxPostUtil.request({url: flowableBasePath + "writeActFlowMation", params: params, type: 'json', method: 'POST', callback: function (json) {

activiti/src/main/resources/template/js/actFlow/actFlowList.js

@@ -43,7 +43,7 @@ layui.config({
 			{ field: 'modelId', title: '模型ID', width: 100 },
 			{ field: 'modelKey', title: '模型key', width: 250 },
 			{ field: 'version', title: '版本', width: 80, templet: function (d) {return d.model.version}},
-			{ field: 'serviceClassName', title: '适用对象', width: 400 },
+			{ field: 'applyServiceClassName', title: '适用对象', width: 400 },
 			{ field: 'deploymentId', title: '发布状态', align: "center", width: 80, templet: function (d) {
 				if (isNull(d.model.deploymentId)) {
 					return "<span class='state-new'>未发布</span>";

activiti/src/main/resources/template/tpl/actFlow/actFlowAdd.html

@@ -28,7 +28,7 @@
 			<div class="layui-form-item layui-col-xs6">
 				<label class="layui-form-label">适用对象<i class="red">*</i></label>
 				<div class="layui-input-block">
-					<input type="text" id="serviceClassName" name="serviceClassName" placeholder="请选择适用对象" class="layui-input" readonly="readonly" typeId=""/>
+					<input type="text" id="applyServiceClassName" name="applyServiceClassName" placeholder="请选择适用对象" class="layui-input" readonly="readonly" typeId=""/>
 				</div>
 			</div>
 

activiti/src/main/resources/template/tpl/actFlow/actFlowEdit.html

@@ -34,7 +34,7 @@
 		<div class="layui-form-item layui-col-xs6">
 			<label class="layui-form-label">适用对象<i class="red">*</i></label>
 			<div class="layui-input-block">
-				<input type="text" id="serviceClassName" name="serviceClassName" placeholder="请选择适用对象" class="layui-input" readonly="readonly" typeId=""/>
+				<input type="text" id="applyServiceClassName" name="applyServiceClassName" placeholder="请选择适用对象" class="layui-input" readonly="readonly" typeId=""/>
 			</div>
 		</div>
 

ifs/src/main/resources/template/js/income/incomeList.js

@@ -118,7 +118,7 @@ layui.config({
     function details(data) {
         rowId = data.id;
         _openNewWindows({
-            url: "../../tpl/income/incomeInfo.html",
+            url: systemCommonUtil.getUrl('FP2023032200001&id=' + data.id, null),
             title: systemLanguage["com.skyeye.detailsPageTitle"][languageType],
             pageId: "incomeInfo",
             area: ['90vw', '90vh'],

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

@@ -40,7 +40,11 @@ var dsFormUtil = {
                     </div>
                 </div>
              {{/bean}}`, // 表格展示
-        '6': `{{#bean}}
+        '6': `
+            <link href="../../assets/lib/winui/css/customer/voucherUtil.css" rel="stylesheet" />
+            <script src="../../assets/lib/layui/customer/voucher/spinbox.js"></script>
+            <script src="../../assets/lib/layui/customer/voucher/voucherUtil.js"></script>
+            {{#bean}}
                 <div class="layui-form-item {{width}}" controlType="{{dsFormComponent.numCode}}" contentId="{{id}}">
                     <label class="layui-form-label">{{title}}：</label>
                     <div class="layui-input-block ver-center" id="showVoucher{{orderBy}}"></div>

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

@@ -84,6 +84,9 @@ var voucherUtil = {
 
     initDataDetails: function (boxId, data){
         $("#" + boxId).html(voucherUtil.tableHtmlDom);
+        if (isNull(data)) {
+            return false;
+        }
         for(var i = 0; i < data.length; i++){
             voucherUtil.addItem();
             var _this = $("#useTable").find("tr").eq(i);

web/src/main/resources/template/json/sysServiceMation.json

@@ -56,7 +56,7 @@
     "assetArticlesUse": {"name": "用品领用", "key": "com.skyeye.eve.articles.service.impl.ArticlesUseServiceImpl"},
     "assetArticlesPurchase": {"name": "用品采购", "key": "com.skyeye.eve.articles.service.impl.ArticlesPurchaseServiceImpl"},
 
-    "incomeOrder": {"name": "财务明细账", "key": "com.skyeye.service.impl.IncomeServiceImpl"},
+    "incomeOrder": {"name": "财务明细账", "key": "com.skyeye.order.service.impl.IncomeOrderServiceImpl"},
 
     "bossPersonRequire": {"name": "人员需求申请", "key": "com.skyeye.service.impl.BossPersonRequireServiceImpl"},
     "bossInterviewRegularWorker": {"name": "转正申请", "key": "com.skyeye.service.impl.BossInterviewRegularWorkerServiceImpl"},