From 75406baccb61707c7b3bf528a86e341872c8d729 Mon Sep 17 00:00:00 2001 From: weizhiqiang <598748873@qq.com> Date: Sun, 25 Jun 2023 14:11:23 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AF=81=E7=85=A7=E5=80=9F=E7=94=A8=E6=89=98?= =?UTF-8?q?=E7=AE=A1=E5=88=B0=E8=A1=A8=E5=8D=95=E5=B8=83=E5=B1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../licenceManageBorrowAdd.js | 136 ------------- .../licenceManageBorrowDetails.js | 24 --- .../licenceManageBorrowEdit.js | 182 ------------------ .../licenceManageBorrowList.js | 116 +++++------ .../licenceManageBorrowAdd.html | 88 --------- .../licenceManageBorrowDetails.html | 92 --------- .../licenceManageBorrowEdit.html | 90 --------- .../licenceManageBorrowList.html | 74 +++---- .../js/dsFormPage/editPageContentIsTable.js | 22 +-- 9 files changed, 78 insertions(+), 746 deletions(-) delete mode 100644 admin-assistant/src/main/resources/template/js/licenceManageBorrow/licenceManageBorrowAdd.js delete mode 100644 admin-assistant/src/main/resources/template/js/licenceManageBorrow/licenceManageBorrowDetails.js delete mode 100644 admin-assistant/src/main/resources/template/js/licenceManageBorrow/licenceManageBorrowEdit.js delete mode 100644 admin-assistant/src/main/resources/template/tpl/licenceManageBorrow/licenceManageBorrowAdd.html delete mode 100644 admin-assistant/src/main/resources/template/tpl/licenceManageBorrow/licenceManageBorrowDetails.html delete mode 100644 admin-assistant/src/main/resources/template/tpl/licenceManageBorrow/licenceManageBorrowEdit.html diff --git a/admin-assistant/src/main/resources/template/js/licenceManageBorrow/licenceManageBorrowAdd.js b/admin-assistant/src/main/resources/template/js/licenceManageBorrow/licenceManageBorrowAdd.js deleted file mode 100644 index b1467e11d..000000000 --- a/admin-assistant/src/main/resources/template/js/licenceManageBorrow/licenceManageBorrowAdd.js +++ /dev/null @@ -1,136 +0,0 @@ -var licenceBorrows = new Array(); //证照集合 - -// 证照借用 -layui.config({ - base: basePath, - version: skyeyeVersion -}).extend({ - window: 'js/winui.window' -}).define(['window', 'jquery', 'winui', 'fileUpload', 'form'], function(exports) { - winui.renderColor(); - var index = parent.layer.getFrameIndex(window.name); - var $ = layui.$, - form = layui.form; - var serviceClassName = sysServiceMation["licenceManageBorrow"]["key"]; - var rowNum = 1; //表格的序号 - var nameHtml = ""; - - var usetableTemplate = $("#usetableTemplate").html(); - var selOption = getFileContent('tpl/template/select-option.tpl'); - - skyeyeEnclosure.init('enclosureUpload'); - - // 获取当前登录员工信息 - systemCommonUtil.getSysCurrentLoginUserMation(function (data) { - $("#useTitle").html("证照借用申请单-" + getYMDFormatDate() + '-' + data.bean.userName); - $("#useName").html(data.bean.userName); - }); - initLincenceNameHtml(); - - // 初始化证照名称 - function initLincenceNameHtml() { - AjaxPostUtil.request({url: flowableBasePath + "licenceborrow008", params: {}, type: 'json', callback: function(json) { - nameHtml = getDataUseHandlebars(selOption, json); //加载类别数据 - matchingLanguage(); - //渲染 - form.render(); - //初始化一行数据 - addRow(); - }}); - } - - // 保存为草稿 - form.on('submit(formAddBean)', function(data) { - if(winui.verifyForm(data.elem)) { - saveData("1", ""); - } - return false; - }); - - // 提交审批 - form.on('submit(formSubBean)', function(data) { - if(winui.verifyForm(data.elem)) { - activitiUtil.startProcess(serviceClassName, null, function (approvalId) { - saveData("2", approvalId); - }); - } - return false; - }); - - function saveData(subType, approvalId) { - // 获取已选证照数据 - var rowTr = $("#useTable tr"); - if(rowTr.length == 0) { - winui.window.msg('请选择需要借用的证照~', {icon: 2, time: 2000}); - return false; - } - var tableData = new Array(); - var noError = false; //循环遍历表格数据时，是否有其他错误信息 - $.each(rowTr, function(i, item) { - var rowNum = $(item).attr("trcusid").replace("tr", ""); - var row = { - licenceId: $("#licenceId" + rowNum).val(), - remark: $("#remark" + rowNum).val() - }; - tableData.push(row); - }); - if(noError) { - return false; - } - - var params = { - title: $("#useTitle").html(), - remark: $("#remark").val(), - licenceStr: JSON.stringify(tableData), - enclosureInfo: skyeyeEnclosure.getEnclosureIdsByBoxId('enclosureUpload'), - subType: subType, // 表单类型 1.保存草稿 2.提交审批 - approvalId: approvalId - }; - AjaxPostUtil.request({url: flowableBasePath + "licenceborrow002", params: params, type: 'json', callback: function(json) { - parent.layer.close(index); - parent.refreshCode = '0'; - }}); - } - - //新增行 - $("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 - licenceId: "licenceId" + rowNum.toString(), //证照id - remark: "remark" + rowNum.toString() //备注id - }; - $("#useTable").append(getDataUseHandlebars(usetableTemplate, par)); - //赋值给证照名称 - $("#" + "licenceId" + rowNum.toString()).html(nameHtml); - form.render('select'); - form.render('checkbox'); - rowNum++; - } - - //删除行 - 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/admin-assistant/src/main/resources/template/js/licenceManageBorrow/licenceManageBorrowDetails.js b/admin-assistant/src/main/resources/template/js/licenceManageBorrow/licenceManageBorrowDetails.js deleted file mode 100644 index cef8fe9d4..000000000 --- a/admin-assistant/src/main/resources/template/js/licenceManageBorrow/licenceManageBorrowDetails.js +++ /dev/null @@ -1,24 +0,0 @@ - -layui.config({ - base: basePath, - version: skyeyeVersion -}).extend({ - window: 'js/winui.window' -}).define(['window', 'jquery', 'winui'], function (exports) { - winui.renderColor(); - layui.use(['form'], function (form) { - var index = parent.layer.getFrameIndex(window.name); - var $ = layui.$; - - AjaxPostUtil.request({url: flowableBasePath + "licenceborrow003", params: {rowId: parent.rowId}, type: 'json', callback: function (json) { - json.bean.stateName = activitiUtil.showStateName2(json.bean.state, 1); - - $("#showForm").html(getDataUseHandlebars($("#useTemplate").html(), json)); - - // 附件回显 - skyeyeEnclosure.showDetails({"enclosureUploadBtn": json.bean.enclosureInfo}); - matchingLanguage(); - }}); - - }); -}); \ No newline at end of file diff --git a/admin-assistant/src/main/resources/template/js/licenceManageBorrow/licenceManageBorrowEdit.js b/admin-assistant/src/main/resources/template/js/licenceManageBorrow/licenceManageBorrowEdit.js deleted file mode 100644 index 5cd5f6770..000000000 --- a/admin-assistant/src/main/resources/template/js/licenceManageBorrow/licenceManageBorrowEdit.js +++ /dev/null @@ -1,182 +0,0 @@ -var licenceBorrows = new Array(); //证照集合 - -// 证照借用 -layui.config({ - base: basePath, - version: skyeyeVersion -}).extend({ - window: 'js/winui.window' -}).define(['window', 'jquery', 'winui', 'fileUpload', 'form'], function(exports) { - winui.renderColor(); - var index = parent.layer.getFrameIndex(window.name); - var $ = layui.$, - form = layui.form; - var serviceClassName = sysServiceMation["licenceManageBorrow"]["key"]; - var rowNum = 1; //表格的序号 - var nameHtml = ""; - - var usetableTemplate = $("#usetableTemplate").html(); - var selOption = getFileContent('tpl/template/select-option.tpl'); - - var sTableData = "" - - AjaxPostUtil.request({url: flowableBasePath + "licenceborrow004", params: {rowId: parent.rowId}, type: 'json', callback: function(json) { - $("#useTitle").html(json.bean.title); - $("#useName").html(json.bean.userName); - $("#remark").val(json.bean.remark); - // 附件回显 - skyeyeEnclosure.initTypeISData({'enclosureUpload': json.bean.enclosureInfo}); - - if(json.bean.state == '1'){ - $(".typeTwo").removeClass("layui-hide"); - } else { - $(".typeOne").removeClass("layui-hide"); - } - - sTableData = json.bean.goods; - initLincenceNameHtml(); - }}); - - //初始化证照名称 - function initLincenceNameHtml() { - AjaxPostUtil.request({url: flowableBasePath + "licenceborrow008", params: {}, type: 'json', callback: function(json) { - nameHtml = getDataUseHandlebars(selOption, json); //加载名称数据 - matchingLanguage(); - //渲染 - form.render(); - //加载表格数据 - initTableAssetList(); - }}); - } - - //加载表格数据 - function initTableAssetList() { - $.each(sTableData, function(i, item) { - addDataRow(item); - }); - } - - // 保存为草稿 - form.on('submit(formEditBean)', function(data) { - if(winui.verifyForm(data.elem)) { - saveData('1', ""); - } - return false; - }); - - // 提交审批 - form.on('submit(formSubBean)', function(data) { - if(winui.verifyForm(data.elem)) { - activitiUtil.startProcess(serviceClassName, null, function (approvalId) { - saveData("2", approvalId); - }); - } - return false; - }); - - // 保存 - form.on('submit(save)', function(data) { - if(winui.verifyForm(data.elem)) { - saveData('3', ""); - } - return false; - }); - - function saveData(subType, approvalId) { - // 获取已选证照数据 - var rowTr = $("#useTable tr"); - if(rowTr.length == 0) { - winui.window.msg('请选择需要借用的证照~', {icon: 2, time: 2000}); - return false; - } - var tableData = new Array(); - var noError = false; //循环遍历表格数据时，是否有其他错误信息 - $.each(rowTr, function(i, item) { - var rowNum = $(item).attr("trcusid").replace("tr", ""); - var row = { - licenceId: $("#licenceId" + rowNum).val(), - remark: $("#remark" + rowNum).val() - }; - tableData.push(row); - }); - if(noError) { - return false; - } - - var params = { - title: $("#useTitle").html(), - remark: $("#remark").val(), - licenceStr: JSON.stringify(tableData), - enclosureInfo: skyeyeEnclosure.getEnclosureIdsByBoxId('enclosureUpload'), - rowId: parent.rowId, - subType: subType, // 1：保存为草稿 2.提交到工作流 3.在工作流中编辑 - approvalId: approvalId, - }; - AjaxPostUtil.request({url: flowableBasePath + "licenceborrow005", params: params, type: 'json', callback: function(json) { - parent.layer.close(index); - parent.refreshCode = '0'; - }}); - } - - //加载数据行 - function addDataRow(item) { - var thisRowNum = rowNum.toString(); - var par = { - id: "row" + thisRowNum, //checkbox的id - trId: "tr" + thisRowNum, //行的id - licenceId: "licenceId" + thisRowNum, //证照id - remark: "remark" + thisRowNum //备注id - }; - $("#useTable").append(getDataUseHandlebars(usetableTemplate, par)); - //赋值给证照名称 - $("#" + "licenceId" + thisRowNum).html(nameHtml); - //数据回显 - $("#licenceId" + thisRowNum).val(item.licenceId); - $("#remark" + thisRowNum).val(item.remark); - form.render('select'); - form.render('checkbox'); - rowNum++; - } - - //新增行 - $("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 - licenceId: "licenceId" + rowNum.toString(), //证照id - remark: "remark" + rowNum.toString() //备注id - }; - $("#useTable").append(getDataUseHandlebars(usetableTemplate, par)); - //赋值给证照名称 - $("#" + "licenceId" + rowNum.toString()).html(nameHtml); - form.render('select'); - form.render('checkbox'); - rowNum++; - } - - //删除行 - 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/admin-assistant/src/main/resources/template/js/licenceManageBorrow/licenceManageBorrowList.js b/admin-assistant/src/main/resources/template/js/licenceManageBorrow/licenceManageBorrowList.js index e1a91505b..1dad8380b 100644 --- a/admin-assistant/src/main/resources/template/js/licenceManageBorrow/licenceManageBorrowList.js +++ b/admin-assistant/src/main/resources/template/js/licenceManageBorrow/licenceManageBorrowList.js @@ -1,30 +1,24 @@ -var rowId = ""; - layui.config({ base: basePath, version: skyeyeVersion }).extend({ window: 'js/winui.window' -}).define(['window', 'table', 'jquery', 'winui', 'form', 'laydate'], function (exports) { +}).define(['window', 'table', 'jquery', 'winui', 'form'], function (exports) { winui.renderColor(); var $ = layui.$, form = layui.form, - laydate = layui.laydate, table = layui.table; var serviceClassName = sysServiceMation["licenceManageBorrow"]["key"]; - // 证照借用 authBtn('1596969413440'); - laydate.render({elem: '#createTime', range: '~'}); - // 证照借用列表 table.render({ - id: 'borrowTable', - elem: '#borrowTable', + id: 'messageTable', + elem: '#messageTable', method: 'post', - url: flowableBasePath + 'licenceborrow001', + url: sysMainMation.admBasePath + 'licenceborrow001', where: getTableParams(), even: true, page: true, @@ -32,38 +26,40 @@ layui.config({ limit: getLimit(), cols: [[ { title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' }, - { field: 'title', title: '标题', width: 300, templet: function (d) { - return '' + d.title + ''; + { field: 'oddNumber', title: '单号', width: 200, align: 'center', templet: function (d) { + return '' + d.oddNumber + ''; }}, - { field: 'oddNum', title: '单号', width: 200, align: 'center' }, + { field: 'title', title: '标题', width: 300 }, { field: 'processInstanceId', title: '流程ID', width: 80, align: 'center', templet: function (d) { - if (!isNull(d.processInstanceId)) { - return '' + d.processInstanceId + ''; - } else { - return ""; - } + return '' + d.processInstanceId + ''; }}, { field: 'state', title: '状态', width: 90, align: 'center', templet: function (d) { - return activitiUtil.showStateName2(d.state, 1); + return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("flowableStateEnum", 'id', d.state, 'name'); }}, - { field: 'createTime', title: systemLanguage["com.skyeye.createTime"][languageType], width: 150, align: 'center'}, - { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 250, toolbar: '#borrowTableBar'} + { field: 'createName', title: systemLanguage["com.skyeye.createName"][languageType], 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 }, + { 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: '#messageTableBar' } ]], done: function(json) { matchingLanguage(); + initTableSearchUtil.initAdvancedSearch(this, json.searchFilter, form, "请输入单号，标题", function () { + table.reloadData("messageTable", {page: {curr: 1}, where: getTableParams()}); + }); } }); // 证照借用的操作事件 - table.on('tool(borrowTable)', function (obj) { + table.on('tool(messageTable)', function (obj) { var data = obj.data; var layEvent = obj.event; - if (layEvent === 'borrowDedails') { //借用详情 - borrowDedails(data); + if (layEvent === 'details') { //借用详情 + details(data); } else if (layEvent === 'processDetails') { //流程详情 activitiUtil.activitiDetails(data); - } else if (layEvent === 'borrowedit') { //编辑借用申请 - borrowEdit(data); + } else if (layEvent === 'edit') { //编辑借用申请 + edit(data); } else if (layEvent === 'subApproval') { //提交审批 subApproval(data); } else if (layEvent === 'cancellation') {//借用作废 @@ -78,24 +74,23 @@ layui.config({ var msg = '确认撤销该借用申请吗？'; layer.confirm(msg, { icon: 3, title: '撤销操作' }, function (index) { layer.close(index); - AjaxPostUtil.request({url: flowableBasePath + "licenceborrow010", params: {processInstanceId: data.processInstanceId}, type: 'json', method: "PUT", callback: function (json) { + AjaxPostUtil.request({url: sysMainMation.admBasePath + "licenceborrow010", params: {processInstanceId: data.processInstanceId}, type: 'json', method: "PUT", callback: function (json) { winui.window.msg("提交成功", {icon: 1, time: 2000}); - loadBorrowTable(); + loadTable(); }}); }); } // 编辑证照借用申请 - function borrowEdit(data) { - rowId = data.id; + function edit(data) { _openNewWindows({ - url: "../../tpl/licenceManageBorrow/licenceManageBorrowEdit.html", + url: systemCommonUtil.getUrl('FP2023062500002&id=' + data.id, null), title: "编辑证照借用申请", pageId: "licenceManageBorrowEdit", area: ['90vw', '90vh'], callBack: function (refreshCode) { winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000}); - loadBorrowTable(); + loadTable(); } }); } @@ -106,12 +101,12 @@ layui.config({ layer.close(index); activitiUtil.startProcess(serviceClassName, null, function (approvalId) { var params = { - rowId: data.id, + id: data.id, approvalId: approvalId }; - AjaxPostUtil.request({url: flowableBasePath + "licenceborrow006", params: params, type: 'json', callback: function (json) { + AjaxPostUtil.request({url: sysMainMation.admBasePath + "licenceborrow006", params: params, type: 'json', method: "POST", callback: function (json) { winui.window.msg("提交成功", {icon: 1, time: 2000}); - loadBorrowTable(); + loadTable(); }}); }); }); @@ -122,18 +117,17 @@ layui.config({ var msg = '确认作废该条借用申请吗？'; layer.confirm(msg, { icon: 3, title: '作废操作' }, function (index) { layer.close(index); - AjaxPostUtil.request({url: flowableBasePath + "licenceborrow007", params: {rowId: data.id}, type: 'json', callback: function (json) { + AjaxPostUtil.request({url: sysMainMation.admBasePath + "licenceborrow007", params: {id: data.id}, type: 'json', method: "POST", callback: function (json) { winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000}); - loadBorrowTable(); + loadTable(); }}); }); } // 证照借用详情 - function borrowDedails(data) { - rowId = data.id; + function details(data) { _openNewWindows({ - url: "../../tpl/licenceManageBorrow/licenceManageBorrowDetails.html", + url: systemCommonUtil.getUrl('FP2023062500003&id=' + data.id, null), title: systemLanguage["com.skyeye.detailsPageTitle"][languageType], pageId: "licenceManageBorrowDetails", area: ['90vw', '90vh'], @@ -143,49 +137,29 @@ layui.config({ } // 添加证照借用 - $("body").on("click", "#addBorrowBean", function() { + $("body").on("click", "#addBean", function() { _openNewWindows({ - url: "../../tpl/licenceManageBorrow/licenceManageBorrowAdd.html", + url: systemCommonUtil.getUrl('FP2023062500001', null), title: "证照借用申请", pageId: "licenceManageBorrowAdd", area: ['90vw', '90vh'], callBack: function (refreshCode) { winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000}); - loadBorrowTable(); + loadTable(); }}); }); - // 搜索表单 form.render(); - form.on('submit(formSearch)', function (data) { - if (winui.verifyForm(data.elem)) { - table.reloadData("borrowTable", {page: {curr: 1}, where: getTableParams()}); - } - return false; + $("body").on("click", "#reloadTable", function() { + loadTable(); }); + function loadTable() { + table.reloadData("messageTable", {where: getTableParams()}); + } - // 刷新证照借用列表 - $("body").on("click", "#reloadBorrowTable", function() { - loadBorrowTable(); - }); - - // 刷新证照借用列表数据 - function loadBorrowTable(){ - table.reloadData("borrowTable", {where: getTableParams()}); - } - - function getTableParams() { - var startTime = "", endTime = ""; - if (!isNull($("#createTime").val())) { - startTime = $("#createTime").val().split('~')[0].trim() + ' 00:00:00'; - endTime = $("#createTime").val().split('~')[1].trim() + ' 23:59:59'; - } - return { - state: $("#state").val(), - startTime: startTime, - endTime: endTime - }; - } + function getTableParams() { + return $.extend(true, {}, initTableSearchUtil.getSearchValue("messageTable")); + } exports('licenceManageBorrowList', {}); }); diff --git a/admin-assistant/src/main/resources/template/tpl/licenceManageBorrow/licenceManageBorrowAdd.html b/admin-assistant/src/main/resources/template/tpl/licenceManageBorrow/licenceManageBorrowAdd.html deleted file mode 100644 index 3bbe3f379..000000000 --- a/admin-assistant/src/main/resources/template/tpl/licenceManageBorrow/licenceManageBorrowAdd.html +++ /dev/null @@ -1,88 +0,0 @@ - - - - - - - - - -
-
-
- -
- -
-
-
- -
- 填单 -
-
-
- -
- -
-
-
- -
-
-
- - -
-
- - - - - - - - - - -
证照名称*备注
-
-
-
- -
- -
-
-
- -
-
-
-
-
- - - -
-
-
-
- - - - - - - - - \ No newline at end of file diff --git a/admin-assistant/src/main/resources/template/tpl/licenceManageBorrow/licenceManageBorrowDetails.html b/admin-assistant/src/main/resources/template/tpl/licenceManageBorrow/licenceManageBorrowDetails.html deleted file mode 100644 index 7bc6b8626..000000000 --- a/admin-assistant/src/main/resources/template/tpl/licenceManageBorrow/licenceManageBorrowDetails.html +++ /dev/null @@ -1,92 +0,0 @@ - - - - - - - - - -
-
- -
-
- - - - - - - - - \ No newline at end of file diff --git a/admin-assistant/src/main/resources/template/tpl/licenceManageBorrow/licenceManageBorrowEdit.html b/admin-assistant/src/main/resources/template/tpl/licenceManageBorrow/licenceManageBorrowEdit.html deleted file mode 100644 index 7e2a2daab..000000000 --- a/admin-assistant/src/main/resources/template/tpl/licenceManageBorrow/licenceManageBorrowEdit.html +++ /dev/null @@ -1,90 +0,0 @@ - - - - - - - - - -
-
-
- -
- -
-
-
- -
- 填单 -
-
-
- -
- -
-
-
- -
-
-
- - -
-
- - - - - - - - - - -
证照名称*备注
-
-
-
- -
- -
-
-
- -
- -
-
-
-
- - - - -
-
-
-
- - - - - - - - - \ No newline at end of file diff --git a/admin-assistant/src/main/resources/template/tpl/licenceManageBorrow/licenceManageBorrowList.html b/admin-assistant/src/main/resources/template/tpl/licenceManageBorrow/licenceManageBorrowList.html index 9537c0897..fd1cd110e 100644 --- a/admin-assistant/src/main/resources/template/tpl/licenceManageBorrow/licenceManageBorrowList.html +++ b/admin-assistant/src/main/resources/template/tpl/licenceManageBorrow/licenceManageBorrowList.html @@ -7,62 +7,32 @@ -
-
-
-
-
- -
- -
- -
- -
- - -
-
-
+
+
+ +
-
-
- - -
-
-
-
- -
+ {{# } }} + {{# if(d.editRow == '2'){ }} + {{# if(auth('1596969381983')){ }} + 撤销 + {{# } }} + {{# } }} +
diff --git a/common/src/main/resources/template/js/dsFormPage/editPageContentIsTable.js b/common/src/main/resources/template/js/dsFormPage/editPageContentIsTable.js index a5c9c7cb8..4a4d3889f 100644 --- a/common/src/main/resources/template/js/dsFormPage/editPageContentIsTable.js +++ b/common/src/main/resources/template/js/dsFormPage/editPageContentIsTable.js @@ -245,17 +245,6 @@ layui.config({ resetData(tableDataList); $.each(tableDataList, function (i, item) { item.orderBy = i + 1; - if (item.showType == showType[2].id) { - // 下拉框时，选择的数据源信息 - var dataFrom = JSON.parse($(`#dataFrom${item.id}`).attr('data')); - if (!isNull(dataFrom.dataType)) { - item.dataType = dataFrom.dataType; - item.defaultData = dataFrom.defaultData; - item.objectId = dataFrom.objectId; - item.businessApi = dataFrom.businessApi; - } - } - item.require = dataShowType.getData(`require${item.id}`); delete item["LAY_TABLE_INDEX"]; delete item["id"]; }); @@ -354,6 +343,17 @@ layui.config({ function resetData(tableDataList) { $.each(tableDataList, function (i, item) { item.align = $(`#align${item.id}`).val(); + item.require = dataShowType.getData(`require${item.id}`); + if (item.showType == showType[2].id) { + // 下拉框时，选择的数据源信息 + var dataFrom = JSON.parse($(`#dataFrom${item.id}`).attr('data')); + if (!isNull(dataFrom.dataType)) { + item.dataType = dataFrom.dataType; + item.defaultData = dataFrom.defaultData; + item.objectId = dataFrom.objectId; + item.businessApi = dataFrom.businessApi; + } + } }); } -- GitLab