From f3103613b15610a3a917e166e927de1fed42e015 Mon Sep 17 00:00:00 2001 From: weizhiqiang <> Date: Tue, 18 Oct 2022 16:59:55 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E6=95=B0=E6=8D=AE=E5=8A=A8?= =?UTF-8?q?=E6=80=81=E8=A1=A8=E5=8D=95=E5=85=B3=E8=81=94=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dsFormPageSequence/dsFormPageSequenceDraftProcessAdd.js | 2 +- .../dsFormObjectRelationChooseByFirstTypeCode.js | 1 + .../js/dsFormObjectRelation/dsFormObjectRelationDetails.js | 2 +- .../js/dsFormObjectRelation/dsFormObjectRelationEdit.js | 4 ++-- .../js/dsFormObjectRelation/dsFormObjectRelationList.js | 2 +- .../main/resources/template/js/dsFormPage/dsFormPageDesign.js | 2 +- ifs/src/main/resources/template/js/income/incomeList.js | 1 + .../template/assets/lib/layui/customer/dsFormUtil.js | 2 +- 8 files changed, 9 insertions(+), 7 deletions(-) diff --git a/activiti/src/main/resources/template/js/dsFormPageSequence/dsFormPageSequenceDraftProcessAdd.js b/activiti/src/main/resources/template/js/dsFormPageSequence/dsFormPageSequenceDraftProcessAdd.js index 6c6dc705e..948542fa2 100644 --- a/activiti/src/main/resources/template/js/dsFormPageSequence/dsFormPageSequenceDraftProcessAdd.js +++ b/activiti/src/main/resources/template/js/dsFormPageSequence/dsFormPageSequenceDraftProcessAdd.js @@ -15,7 +15,7 @@ layui.config({ var actFlowId = parent.actFlowId; // 加载动态表单页 - AjaxPostUtil.request({url: flowableBasePath + "dsformpage004", params: {rowId: parent.dsFormId}, type: 'json', callback: function (json) { + AjaxPostUtil.request({url: flowableBasePath + "dsformpage004", params: {pageId: parent.dsFormId}, type: 'json', method: 'GET', callback: function (json) { dsFormUtil.loadDsFormItemToEdit("showForm", json.rows); $("#showForm").append('
' + '' + diff --git a/dsform/src/main/resources/template/js/dsFormObjectRelation/dsFormObjectRelationChooseByFirstTypeCode.js b/dsform/src/main/resources/template/js/dsFormObjectRelation/dsFormObjectRelationChooseByFirstTypeCode.js index f84746450..e0a731c06 100644 --- a/dsform/src/main/resources/template/js/dsFormObjectRelation/dsFormObjectRelationChooseByFirstTypeCode.js +++ b/dsform/src/main/resources/template/js/dsFormObjectRelation/dsFormObjectRelationChooseByFirstTypeCode.js @@ -14,6 +14,7 @@ layui.config({ var firstTypeCode = GetUrlParam("firstTypeCode"); + // todo 待替换 /********* tree 处理 start *************/ var orderType = ""; var ztree = null; diff --git a/dsform/src/main/resources/template/js/dsFormObjectRelation/dsFormObjectRelationDetails.js b/dsform/src/main/resources/template/js/dsFormObjectRelation/dsFormObjectRelationDetails.js index 546483f59..05d79fdc8 100644 --- a/dsform/src/main/resources/template/js/dsFormObjectRelation/dsFormObjectRelationDetails.js +++ b/dsform/src/main/resources/template/js/dsFormObjectRelation/dsFormObjectRelationDetails.js @@ -12,7 +12,7 @@ layui.config({ showGrid({ id: "showForm", - url: flowableBasePath + "dsFormObjectRelation004", + url: reqBasePath + "dsFormObjectRelation004", params: {id: parent.rowId}, pagination: false, method: 'GET', diff --git a/dsform/src/main/resources/template/js/dsFormObjectRelation/dsFormObjectRelationEdit.js b/dsform/src/main/resources/template/js/dsFormObjectRelation/dsFormObjectRelationEdit.js index 2fb014e49..6b5b15409 100644 --- a/dsform/src/main/resources/template/js/dsFormObjectRelation/dsFormObjectRelationEdit.js +++ b/dsform/src/main/resources/template/js/dsFormObjectRelation/dsFormObjectRelationEdit.js @@ -14,7 +14,7 @@ layui.config({ showGrid({ id: "showForm", - url: flowableBasePath + "dsFormObjectRelation004", + url: reqBasePath + "dsFormObjectRelation004", params: {id: parent.rowId}, pagination: false, method: 'GET', @@ -45,7 +45,7 @@ layui.config({ dsFormPageIds: formPageId.join(","), id: parent.rowId }; - AjaxPostUtil.request({url: flowableBasePath + "dsFormObjectRelation005", params: params, type: 'json', method: "PUT", callback: function (json) { + AjaxPostUtil.request({url: reqBasePath + "dsFormObjectRelation005", params: params, type: 'json', method: "PUT", callback: function (json) { parent.layer.close(index); parent.refreshCode = '0'; }}); diff --git a/dsform/src/main/resources/template/js/dsFormObjectRelation/dsFormObjectRelationList.js b/dsform/src/main/resources/template/js/dsFormObjectRelation/dsFormObjectRelationList.js index 0b4968378..39f7928da 100644 --- a/dsform/src/main/resources/template/js/dsFormObjectRelation/dsFormObjectRelationList.js +++ b/dsform/src/main/resources/template/js/dsFormObjectRelation/dsFormObjectRelationList.js @@ -16,7 +16,7 @@ layui.config({ id: 'messageTable', elem: '#messageTable', method: 'post', - url: flowableBasePath + 'dsFormObjectRelation001', + url: reqBasePath + 'dsFormObjectRelation001', where: getTableParams(), even: true, page: true, diff --git a/dsform/src/main/resources/template/js/dsFormPage/dsFormPageDesign.js b/dsform/src/main/resources/template/js/dsFormPage/dsFormPageDesign.js index 9dc2e449b..a42c04b3f 100644 --- a/dsform/src/main/resources/template/js/dsFormPage/dsFormPageDesign.js +++ b/dsform/src/main/resources/template/js/dsFormPage/dsFormPageDesign.js @@ -19,7 +19,7 @@ layui.config({ authBtn('1567732055673');//保存控件 - AjaxPostUtil.request({url: flowableBasePath + "dsformpage004", params: {rowId: parent.rowId}, type: 'json', callback: function (json) { + AjaxPostUtil.request({url: flowableBasePath + "dsformpage004", params: {pageId: parent.rowId}, type: 'json', method: 'GET', callback: function (json) { // 加载表单控件 loadLeftBoxItem(); // 加载拖拽 diff --git a/ifs/src/main/resources/template/js/income/incomeList.js b/ifs/src/main/resources/template/js/income/incomeList.js index a40328043..eb53ab841 100644 --- a/ifs/src/main/resources/template/js/income/incomeList.js +++ b/ifs/src/main/resources/template/js/income/incomeList.js @@ -82,6 +82,7 @@ layui.config({ }); /********* tree 处理 start *************/ + // todo 待替换 var orderType = ""; var ztree = null; fsTree.render({ diff --git a/web/src/main/resources/template/assets/lib/layui/customer/dsFormUtil.js b/web/src/main/resources/template/assets/lib/layui/customer/dsFormUtil.js index ab21d31db..26e435457 100644 --- a/web/src/main/resources/template/assets/lib/layui/customer/dsFormUtil.js +++ b/web/src/main/resources/template/assets/lib/layui/customer/dsFormUtil.js @@ -113,7 +113,7 @@ var dsFormUtil = { dsFormObjectRelationCode: isNull(code) ? "" : code, dsFormObjectRelationId: isNull(dsFormObjectRelationId) ? "" : dsFormObjectRelationId }; - AjaxPostUtil.request({url: flowableBasePath + "dsFormObjectRelation006", params: params, method: "GET", type: 'json', callback: function(json) { + AjaxPostUtil.request({url: reqBasePath + "dsFormObjectRelation006", params: params, method: "GET", type: 'json', callback: function(json) { dsFormUtil.loadDsFormItem(showBoxId, json); }, async: false}); }, -- GitLab