diff --git a/activiti/src/main/resources/template/js/dsFormPageSequence/dsFormPageSequenceDraftProcessAdd.js b/activiti/src/main/resources/template/js/dsFormPageSequence/dsFormPageSequenceDraftProcessAdd.js index 75b5c5e076e416b83a944bfc1a32ac903e89432b..76d257df486629f9f25cd114c7c40486b7b031f6 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 actKey = parent.actKey; // 加载动态表单页 - AjaxPostUtil.request({url:reqBasePath + "dsformpage012", params:{rowId: parent.dsFormId}, type:'json', callback:function(json){ + AjaxPostUtil.request({url:reqBasePath + "dsformpage004", params:{rowId: parent.dsFormId}, type:'json', callback:function(json){ if(json.returnCode == 0){ dsFormUtil.loadDsFormItemToEdit("showForm", json.rows); $("#showForm").append('
' + diff --git a/dsform/src/main/resources/template/js/dsFormObjectRelation/dsFormObjectRelationAdd.js b/dsform/src/main/resources/template/js/dsFormObjectRelation/dsFormObjectRelationAdd.js new file mode 100644 index 0000000000000000000000000000000000000000..f33459234b24015c40dd8dbacbd37263b33b80fb --- /dev/null +++ b/dsform/src/main/resources/template/js/dsFormObjectRelation/dsFormObjectRelationAdd.js @@ -0,0 +1,105 @@ + +layui.config({ + base: basePath, + version: skyeyeVersion +}).extend({ + window: 'js/winui.window' +}).define(['window', 'jquery', 'winui', 'form'], function (exports) { + winui.renderColor(); + var index = parent.layer.getFrameIndex(window.name); + var $ = layui.$, + form = layui.form; + var rowNum = 1; // 表格的序号 + var usetableTemplate = $("#usetableTemplate").html(); + + dsFormUtil.loadDsFormPageTypeByPId("firstTypeId", "0"); + form.on('select(firstTypeId)', function(data) { + var thisRowValue = data.value; + dsFormUtil.loadDsFormPageTypeByPId("secondTypeId", isNull(thisRowValue) ? "-" : thisRowValue); + form.render('select'); + }); + + matchingLanguage(); + form.render(); + form.on('submit(formAddBean)', function (data) { + if (winui.verifyForm(data.elem)) { + var rowTr = $("#useTable tr"); + var formPageId = new Array(); + $.each(rowTr, function(i, item) { + // 获取行编号 + var rowNum = $(item).attr("trcusid").replace("tr", ""); + formPageId.push($("#dsFormChooseList" + rowNum).attr("dataId")); + }); + + var params = { + title: $("#title").val(), + titleEn: $("#titleEn").val(), + encoded: $("#encoded").val(), + firstTypeId: $("#firstTypeId").val(), + secondTypeId: $("#secondTypeId").val(), + orderNum: $("#orderNum").val(), + remark: $("#remark").val(), + dsFormPageIds: formPageId.join(",") + }; + AjaxPostUtil.request({url: reqBasePath + "dsFormObjectRelation002", params: params, type: 'json', method: "POST", callback: function(json){ + if(json.returnCode == 0){ + parent.layer.close(index); + parent.refreshCode = '0'; + }else{ + winui.window.msg(json.returnMessage, {icon: 2, time: 2000}); + } + }}); + } + return false; + }); + + // 新增行 + $("body").on("click", "#addRow", function() { + addRow(); + }); + + // 删除行 + $("body").on("click", "#deleteRow", function() { + deleteRow(); + }); + + // 新增行 + function addRow() { + var par = { + id: "row" + rowNum.toString(), //checkbox的id + trId: "tr" + rowNum.toString(), //行的id + dsFormChooseList: "dsFormChooseList" + rowNum.toString(), // 动态表单选择id + pageName: "pageName" + rowNum.toString() // 动态表单页面名称id + }; + $("#useTable").append(getDataUseHandlebars(usetableTemplate, par)); + form.render('checkbox'); + rowNum++; + + // 加载动添表单选择按钮的点击事件 + var btnId = par.dsFormChooseList + "Btn"; + $("body").on("click", "#" + btnId, function(e){ + dsFormUtil.chooseType = false; // 单选 + dsFormUtil.openDsFormPageChoosePage(function (){ + $("#" + par.dsFormChooseList).val(dsFormUtil.dsFormChooseMation.pageNum); + $("#" + par.dsFormChooseList).attr("dataId", dsFormUtil.dsFormChooseMation.id); + $("#" + par.pageName).html(dsFormUtil.dsFormChooseMation.pageName); + }); + }); + } + + // 删除行 + function deleteRow() { + var checkRow = $("#useTable input[type='checkbox'][name='tableCheckRow']:checked"); + if(checkRow.length > 0) { + $.each(checkRow, function(i, item) { + $(item).parent().parent().remove(); + }); + } else { + winui.window.msg('请选择要删除的行', {icon: 2, time: 2000}); + } + } + + $("body").on("click", "#cancle", function(){ + parent.layer.close(index); + }); +}); \ No newline at end of file diff --git a/dsform/src/main/resources/template/js/dsFormObjectRelation/dsFormObjectRelationDetails.js b/dsform/src/main/resources/template/js/dsFormObjectRelation/dsFormObjectRelationDetails.js new file mode 100644 index 0000000000000000000000000000000000000000..05d79fdc8c99ab41a8455482bd38460f9e313eb8 --- /dev/null +++ b/dsform/src/main/resources/template/js/dsFormObjectRelation/dsFormObjectRelationDetails.js @@ -0,0 +1,27 @@ + +layui.config({ + base: basePath, + version: skyeyeVersion +}).extend({ + window: 'js/winui.window' +}).define(['window', 'jquery', 'winui', 'form'], function (exports) { + winui.renderColor(); + var index = parent.layer.getFrameIndex(window.name); + var $ = layui.$, + form = layui.form; + + showGrid({ + id: "showForm", + url: reqBasePath + "dsFormObjectRelation004", + params: {id: parent.rowId}, + pagination: false, + method: 'GET', + template: $("#beanTemplate").html(), + ajaxSendLoadBefore: function (hdb) { + }, + ajaxSendAfter: function (json) { + matchingLanguage(); + form.render(); + } + }); +}); \ No newline at end of file diff --git a/dsform/src/main/resources/template/js/dsFormObjectRelation/dsFormObjectRelationEdit.js b/dsform/src/main/resources/template/js/dsFormObjectRelation/dsFormObjectRelationEdit.js new file mode 100644 index 0000000000000000000000000000000000000000..1ede1d05804f6bd59c3a4af4f189a5a2da606b93 --- /dev/null +++ b/dsform/src/main/resources/template/js/dsFormObjectRelation/dsFormObjectRelationEdit.js @@ -0,0 +1,130 @@ + +layui.config({ + base: basePath, + version: skyeyeVersion +}).extend({ + window: 'js/winui.window' +}).define(['window', 'jquery', 'winui', 'form'], function (exports) { + winui.renderColor(); + var index = parent.layer.getFrameIndex(window.name); + var $ = layui.$, + form = layui.form; + var rowNum = 1; // 表格的序号 + var usetableTemplate = $("#usetableTemplate").html(); + + showGrid({ + id: "showForm", + url: reqBasePath + "dsFormObjectRelation004", + params: {id: parent.rowId}, + pagination: false, + method: 'GET', + template: $("#beanTemplate").html(), + ajaxSendLoadBefore: function (hdb) { + }, + ajaxSendAfter: function (json) { + $.each(json.bean.dsFormPageMations, function (i, item){ + addRow(); + $("#dsFormChooseList" + (rowNum - 1)).val(item.pageNum); + $("#dsFormChooseList" + (rowNum - 1)).attr("dataId", item.id); + $("#pageName" + (rowNum - 1)).html(item.pageName); + }) + + dsFormUtil.loadDsFormPageTypeByPId("firstTypeId", "0"); + $("#firstTypeId").val(json.bean.firstTypeId); + + dsFormUtil.loadDsFormPageTypeByPId("secondTypeId", json.bean.firstTypeId); + $("#secondTypeId").val(json.bean.secondTypeId); + + form.on('select(firstTypeId)', function(data) { + var thisRowValue = data.value; + dsFormUtil.loadDsFormPageTypeByPId("secondTypeId", isNull(thisRowValue) ? "-" : thisRowValue); + form.render('select'); + }); + + matchingLanguage(); + form.render(); + form.on('submit(formEditBean)', function (data) { + if (winui.verifyForm(data.elem)) { + var rowTr = $("#useTable tr"); + var formPageId = new Array(); + $.each(rowTr, function(i, item) { + // 获取行编号 + var rowNum = $(item).attr("trcusid").replace("tr", ""); + formPageId.push($("#dsFormChooseList" + rowNum).attr("dataId")); + }); + + var params = { + title: $("#title").val(), + titleEn: $("#titleEn").val(), + encoded: $("#encoded").val(), + firstTypeId: $("#firstTypeId").val(), + secondTypeId: $("#secondTypeId").val(), + orderNum: $("#orderNum").val(), + remark: $("#remark").val(), + dsFormPageIds: formPageId.join(","), + id: parent.rowId + }; + AjaxPostUtil.request({url: reqBasePath + "dsFormObjectRelation005", params: params, type: 'json', method: "PUT", callback: function(json){ + if(json.returnCode == 0){ + parent.layer.close(index); + parent.refreshCode = '0'; + }else{ + winui.window.msg(json.returnMessage, {icon: 2, time: 2000}); + } + }}); + } + return false; + }); + } + }); + + // 新增行 + $("body").on("click", "#addRow", function() { + addRow(); + }); + + // 删除行 + $("body").on("click", "#deleteRow", function() { + deleteRow(); + }); + + // 新增行 + function addRow() { + var par = { + id: "row" + rowNum.toString(), //checkbox的id + trId: "tr" + rowNum.toString(), //行的id + dsFormChooseList: "dsFormChooseList" + rowNum.toString(), // 动态表单选择id + pageName: "pageName" + rowNum.toString() // 动态表单页面名称id + }; + $("#useTable").append(getDataUseHandlebars(usetableTemplate, par)); + form.render('checkbox'); + rowNum++; + + // 加载动添表单选择按钮的点击事件 + var btnId = par.dsFormChooseList + "Btn"; + $("body").on("click", "#" + btnId, function(e){ + dsFormUtil.chooseType = false; // 单选 + dsFormUtil.openDsFormPageChoosePage(function (){ + $("#" + par.dsFormChooseList).val(dsFormUtil.dsFormChooseMation.pageNum); + $("#" + par.dsFormChooseList).attr("dataId", dsFormUtil.dsFormChooseMation.id); + $("#" + par.pageName).html(dsFormUtil.dsFormChooseMation.pageName); + }); + }); + } + + // 删除行 + function deleteRow() { + var checkRow = $("#useTable input[type='checkbox'][name='tableCheckRow']:checked"); + if(checkRow.length > 0) { + $.each(checkRow, function(i, item) { + $(item).parent().parent().remove(); + }); + } else { + winui.window.msg('请选择要删除的行', {icon: 2, time: 2000}); + } + } + + $("body").on("click", "#cancle", function(){ + parent.layer.close(index); + }); +}); \ No newline at end of file diff --git a/dsform/src/main/resources/template/js/dsFormObjectRelation/dsFormObjectRelationList.js b/dsform/src/main/resources/template/js/dsFormObjectRelation/dsFormObjectRelationList.js new file mode 100644 index 0000000000000000000000000000000000000000..53da08c2daf5b5dd925bd7640c745033ecae63a2 --- /dev/null +++ b/dsform/src/main/resources/template/js/dsFormObjectRelation/dsFormObjectRelationList.js @@ -0,0 +1,156 @@ + +var rowId = ""; + +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; + + authBtn('1641693529159'); + + dsFormUtil.loadDsFormPageTypeByPId("firstTypeId", "0"); + form.on('select(firstTypeId)', function(data) { + var thisRowValue = data.value; + dsFormUtil.loadDsFormPageTypeByPId("secondTypeId", isNull(thisRowValue) ? "-" : thisRowValue); + form.render('select'); + }); + + table.render({ + id: 'messageTable', + elem: '#messageTable', + method: 'post', + url: reqBasePath + 'dsFormObjectRelation001', + where: getTableParams(), + even: true, + page: true, + limits: getLimits(), + limit: getLimit(), + cols: [[ + { title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers'}, + { field: 'title', title: '中文名称', align: 'left', width: 120, templet: function(d){ + return '' + d.title + ''; + }}, + { field: 'titleEn', title: '英文名称', align: 'left', width: 120 }, + { field: 'code', title: '编码', align: 'left', width: 100 }, + { field: 'firstTypeName', title: '一级分类', align: 'left', width: 120 }, + { field: 'secondTypeName', title: '二级分类', align: 'left', width: 120 }, + { field: 'createName', title: systemLanguage["com.skyeye.createName"][languageType], width: 100 }, + { field: 'createTime', title: systemLanguage["com.skyeye.createTime"][languageType], align: 'center', width: 150 }, + { field: 'lastUpdateName', title: systemLanguage["com.skyeye.lastUpdateName"][languageType], align: 'left', width: 100 }, + { field: 'lastUpdateTime', title: systemLanguage["com.skyeye.lastUpdateTime"][languageType], align: 'center', width: 150}, + { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 200, toolbar: '#tableBar'} + ]], + done: function(){ + matchingLanguage(); + } + }); + + table.on('tool(messageTable)', function (obj) { + var data = obj.data; + var layEvent = obj.event; + if(layEvent === 'delet'){ // 删除 + delet(data); + }else if(layEvent === 'edit'){ // 编辑 + edit(data); + }else if (layEvent === 'details') { // 详情 + details(data); + } + }); + + // 添加 + $("body").on("click", "#addBean", function(){ + _openNewWindows({ + url: "../../tpl/dsFormObjectRelation/dsFormObjectRelationAdd.html", + title: systemLanguage["com.skyeye.addPageTitle"][languageType], + pageId: "dsFormObjectRelationAdd", + area: ['90vw', '90vh'], + callBack: function(refreshCode){ + if (refreshCode == '0') { + winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1,time: 2000}); + loadTable(); + } else if (refreshCode == '-9999') { + winui.window.msg(systemLanguage["com.skyeye.operationFailed"][languageType], {icon: 2,time: 2000}); + } + }}); + }); + + // 删除 + function delet(data){ + layer.confirm(systemLanguage["com.skyeye.deleteOperationMsg"][languageType], {icon: 3, title: systemLanguage["com.skyeye.deleteOperation"][languageType]}, function(index){ + layer.close(index); + AjaxPostUtil.request({url: reqBasePath + "dsFormObjectRelation003", params: {id: data.id}, type: 'json', method: "DELETE", callback: function(json){ + if(json.returnCode == 0){ + winui.window.msg(systemLanguage["com.skyeye.deleteOperationSuccessMsg"][languageType], {icon: 1, time: 2000}); + loadTable(); + }else{ + winui.window.msg(json.returnMessage, {icon: 2, time: 2000}); + } + }}); + }); + } + + // 编辑 + function edit(data){ + rowId = data.id; + _openNewWindows({ + url: "../../tpl/dsFormObjectRelation/dsFormObjectRelationEdit.html", + title: systemLanguage["com.skyeye.editPageTitle"][languageType], + pageId: "dsFormObjectRelationEdit", + area: ['90vw', '90vh'], + callBack: function(refreshCode){ + if (refreshCode == '0') { + winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1,time: 2000}); + loadTable(); + } else if (refreshCode == '-9999') { + winui.window.msg(systemLanguage["com.skyeye.operationFailed"][languageType], {icon: 2,time: 2000}); + } + }}); + } + + // 详情 + function details(data){ + rowId = data.id; + var url = erpOrderUtil.getErpDetailUrl(data); + _openNewWindows({ + url: "../../tpl/dsFormObjectRelation/dsFormObjectRelationDetails.html", + title: systemLanguage["com.skyeye.detailsPageTitle"][languageType], + pageId: "dsFormObjectRelationDetails", + area: ['90vw', '90vh'], + callBack: function(refreshCode){ + }}); + } + + // 刷新数据 + $("body").on("click", "#reloadTable", function(){ + loadTable(); + }); + + form.render(); + form.on('submit(formSearch)', function (data) { + if (winui.verifyForm(data.elem)) { + table.reload("messageTable", {page: {curr: 1}, where: getTableParams()}); + } + return false; + }); + + function loadTable(){ + table.reload("messageTable", {where: getTableParams()}); + } + + function getTableParams(){ + return { + title: $("#title").val(), + encoded: $("#encoded").val(), + firstTypeId: $("#firstTypeId").val(), + secondTypeId: $("#secondTypeId").val() + }; + } + + exports('dsFormObjectRelationList', {}); +}); diff --git a/dsform/src/main/resources/template/js/dsFormPage/dsFormPageListChoose.js b/dsform/src/main/resources/template/js/dsFormPage/dsFormPageListChoose.js index 85af0c50b7eafe03e7f6e3c58f15da8211bc315f..5737b88520c7a6f8b47ccc3236c8781514ca29e6 100644 --- a/dsform/src/main/resources/template/js/dsFormPage/dsFormPageListChoose.js +++ b/dsform/src/main/resources/template/js/dsFormPage/dsFormPageListChoose.js @@ -12,21 +12,27 @@ layui.config({ table = layui.table, tableCheckBoxUtil = layui.tableCheckBoxUtil; - var ids = []; - $.each(parent.dsFormUtil.dsFormChooseList, function(i, item){ - ids.push(item.id); - }); - tableCheckBoxUtil.setIds({ - gridId: 'messageTable', - fieldName: 'farmId', - ids: ids - }); + if(parent.dsFormUtil.chooseType) { + // 多选 + var ids = []; + $.each(parent.dsFormUtil.dsFormChooseList, function (i, item) { + ids.push(item.id); + }); + tableCheckBoxUtil.setIds({ + gridId: 'messageTable', + fieldName: 'farmId', + ids: ids + }); - tableCheckBoxUtil.init({ - gridId: 'messageTable', - filterId: 'messageTable', - fieldName: 'id' - }); + tableCheckBoxUtil.init({ + gridId: 'messageTable', + filterId: 'messageTable', + fieldName: 'id' + }); + }else{ + // 单选 + $("#saveCheckBox").hide(); + } dsFormUtil.loadDsFormPageTypeByPId("firstTypeId", "0"); @@ -48,7 +54,7 @@ layui.config({ limits: getLimits(), limit: getLimit(), cols: [[ - { type: 'checkbox', fixed: 'left'}, + { type: parent.dsFormUtil.chooseType ? 'checkbox' : 'radio', fixed: 'left'}, { field: 'pageName', title: '页面名称', align: 'left', width: 120 }, { field: 'firstTypeName', title: '一级分类', align: 'left', width: 120 }, { field: 'secondTypeName', title: '二级分类', align: 'left', width: 120 }, @@ -63,10 +69,32 @@ layui.config({ } }); - tableCheckBoxUtil.checkedDefault({ - gridId: 'messageTable', - fieldName: 'id' - }); + if(parent.dsFormUtil.chooseType) { + // 多选 + tableCheckBoxUtil.checkedDefault({ + gridId: 'messageTable', + fieldName: 'id' + }); + }else{ + // 单选 + $('#messageTable').next().find('.layui-table-body').find("table" ).find("tbody").children("tr").on('dblclick',function(){ + var dubClick = $('#messageTable').next().find('.layui-table-body').find("table").find("tbody").find(".layui-table-hover"); + dubClick.find("input[type='radio']").prop("checked", true); + form.render(); + var chooseIndex = JSON.stringify(dubClick.data('index')); + var obj = res.rows[chooseIndex]; + parent.dsFormUtil.dsFormChooseMation = obj; + + parent.refreshCode = '0'; + parent.layer.close(index); + }); + + $('#messageTable').next().find('.layui-table-body').find("table" ).find("tbody").children("tr").on('click',function(){ + var click = $('#messageTable').next().find('.layui-table-body').find("table").find("tbody").find(".layui-table-hover"); + click.find("input[type='radio']").prop("checked", true); + form.render(); + }); + } } }); @@ -75,6 +103,10 @@ layui.config({ var selectedData = tableCheckBoxUtil.getValue({ gridId: 'messageTable' }); + if(selectedData.length == 0){ + winui.window.msg("请选择表单", {icon: 2,time: 2000}); + return false; + } var result = []; $.each(selectedData, function(i, item){ result.push(getInPoingArr(tableList, "id", item, "")); diff --git a/dsform/src/main/resources/template/js/dsFormPage/pageList.js b/dsform/src/main/resources/template/js/dsFormPage/pageList.js index 430114307eb6f8b296d063a1f9f317073dd8d8df..33948a2cd7c135c2b27b84c89d657cfd05deb239 100644 --- a/dsform/src/main/resources/template/js/dsFormPage/pageList.js +++ b/dsform/src/main/resources/template/js/dsFormPage/pageList.js @@ -14,7 +14,6 @@ layui.config({ authBtn('1567731484858'); dsFormUtil.loadDsFormPageTypeByPId("firstTypeId", "0"); - form.on('select(firstTypeId)', function(data) { var thisRowValue = data.value; dsFormUtil.loadDsFormPageTypeByPId("secondTypeId", isNull(thisRowValue) ? "-" : thisRowValue); @@ -122,7 +121,7 @@ layui.config({ form.render(); form.on('submit(formSearch)', function (data) { if (winui.verifyForm(data.elem)) { - refreshTable(); + table.reload("messageTable", {page: {curr: 1}, where: getTableParams()}); } return false; }); @@ -135,10 +134,6 @@ layui.config({ function loadTable(){ table.reload("messageTable", {where: getTableParams()}); } - - function refreshTable(){ - table.reload("messageTable", {page: {curr: 1}, where: getTableParams()}); - } function getTableParams(){ return { diff --git a/dsform/src/main/resources/template/tpl/dsFormObjectRelation/dsFormObjectRelationAdd.html b/dsform/src/main/resources/template/tpl/dsFormObjectRelation/dsFormObjectRelationAdd.html new file mode 100644 index 0000000000000000000000000000000000000000..6232476be9099aa6554017ed683b7b936907efb3 --- /dev/null +++ b/dsform/src/main/resources/template/tpl/dsFormObjectRelation/dsFormObjectRelationAdd.html @@ -0,0 +1,117 @@ + + + + + + + + + +
+
+
+ 基本信息 +
+
+
+ +
+ +
该名称不能重复且不区分父子级别。
+
+
+
+ +
+ +
该名称不能重复且不区分父子级别。
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
唯一编码不区分父子级别。
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+ +
+ 表单关联信息 +
+
+
+ +
+
+
+ + +
+
+ + + + + + + + + + +
表单编号表单名称
+
+
+
+
+ + +
+
+
+
+ + + + + + + + + \ No newline at end of file diff --git a/dsform/src/main/resources/template/tpl/dsFormObjectRelation/dsFormObjectRelationDetails.html b/dsform/src/main/resources/template/tpl/dsFormObjectRelation/dsFormObjectRelationDetails.html new file mode 100644 index 0000000000000000000000000000000000000000..64dd1775db76d8e513b577ad3e52ce5a53ef6eaa --- /dev/null +++ b/dsform/src/main/resources/template/tpl/dsFormObjectRelation/dsFormObjectRelationDetails.html @@ -0,0 +1,99 @@ + + + + + + + + + +
+
+ +
+
+ + + + + + + + \ No newline at end of file diff --git a/dsform/src/main/resources/template/tpl/dsFormObjectRelation/dsFormObjectRelationEdit.html b/dsform/src/main/resources/template/tpl/dsFormObjectRelation/dsFormObjectRelationEdit.html new file mode 100644 index 0000000000000000000000000000000000000000..0d7da3d51bf900964839d5b166bc7c04a3f58cea --- /dev/null +++ b/dsform/src/main/resources/template/tpl/dsFormObjectRelation/dsFormObjectRelationEdit.html @@ -0,0 +1,123 @@ + + + + + + + + + +
+
+ +
+
+ + + + + + + + + + + \ No newline at end of file diff --git a/dsform/src/main/resources/template/tpl/dsFormObjectRelation/dsFormObjectRelationList.html b/dsform/src/main/resources/template/tpl/dsFormObjectRelation/dsFormObjectRelationList.html new file mode 100644 index 0000000000000000000000000000000000000000..ce8709396b3fc6870b0ca627509b0ba630f638f7 --- /dev/null +++ b/dsform/src/main/resources/template/tpl/dsFormObjectRelation/dsFormObjectRelationList.html @@ -0,0 +1,61 @@ + + + + + + + + + +
+
+
+
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ + +
+
+
+
+
+
+ + +
+
+
+
+ +
+ + + + + \ No newline at end of file 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 4dec95df6b67ad8f13def48909aa2b54ddb89224..d4ff9c7ec6f31bff121a31f5c78b338f383a64f1 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 @@ -1,7 +1,10 @@ // 动态表单工具函数 var dsFormUtil = { - dsFormChooseList: [], + dsFormChooseList: [], // 动态表单选择页面类型为【多选】时返回的参数 + dsFormChooseMation: {}, // 动态表单选择页面类型为【单选】时返回的参数 + chooseType: true, // 动态表单选择页面类型，true：多选；false：单选 + dsFormDataKey: "initData", dsFormBtnTemplate: '', customDsFormBox: '
{{pageName}}
', @@ -106,10 +109,10 @@ var dsFormUtil = { * 加载动态表单到页面 * * @param showBoxId要追加的boxid后面 - * @param code com.skyeye.common.constans.SystemFoundationSettingsConstants.CustomWithDsFormObject中的code + * @param code 动态表单-----业务逻辑表单关联表中的code */ loadPageByCode: function(showBoxId, code){ - AjaxPostUtil.request({url: reqBasePath + "dsformpage013", params: {dsFormCode: code}, method: "GET", type: 'json', callback: function(json) { + AjaxPostUtil.request({url: reqBasePath + "dsFormObjectRelation006", params: {dsFormObjectRelationCode: code}, method: "GET", type: 'json', callback: function(json) { if(json.returnCode == 0) { dsFormUtil.loadDsFormItem(showBoxId, json); } else {