From 9faee056f357b1c79ec6fd7335515ee9d319ced7 Mon Sep 17 00:00:00 2001 From: weizhiqiang <598748873@qq.com> Date: Sun, 10 Jul 2022 20:56:37 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90PM=E3=80=91=E5=88=A0=E9=99=A4=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E8=AE=A8=E8=AE=BA=E6=9D=BF=E5=88=86=E7=B1=BB=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../js/proproject/myproprojectlist.js | 6 +- .../proprojectdiscuss/proprojectdiscussadd.js | 18 +-- .../proprojectdiscusslist.js | 2 - .../proprojectdiscusstypeadd.js | 32 ---- .../proprojectdiscusstypeedit.js | 44 ------ .../proprojectdiscusstypelist.js | 141 ------------------ .../proprojectdiscusstypeadd.html | 32 ---- .../proprojectdiscusstypeedit.html | 21 --- .../proprojectdiscusstypeeditTemplate.tpl | 14 -- .../proprojectdiscusstypelist.html | 70 --------- .../tpl/protask/taskinstructionsshow.html | 1 + .../resources/template/json/sysDictData.json | 3 +- 12 files changed, 10 insertions(+), 374 deletions(-) delete mode 100644 pro/src/main/resources/template/js/proprojectdiscusstype/proprojectdiscusstypeadd.js delete mode 100644 pro/src/main/resources/template/js/proprojectdiscusstype/proprojectdiscusstypeedit.js delete mode 100644 pro/src/main/resources/template/js/proprojectdiscusstype/proprojectdiscusstypelist.js delete mode 100644 pro/src/main/resources/template/tpl/proprojectdiscusstype/proprojectdiscusstypeadd.html delete mode 100644 pro/src/main/resources/template/tpl/proprojectdiscusstype/proprojectdiscusstypeedit.html delete mode 100644 pro/src/main/resources/template/tpl/proprojectdiscusstype/proprojectdiscusstypeeditTemplate.tpl delete mode 100644 pro/src/main/resources/template/tpl/proprojectdiscusstype/proprojectdiscusstypelist.html diff --git a/pro/src/main/resources/template/js/proproject/myproprojectlist.js b/pro/src/main/resources/template/js/proproject/myproprojectlist.js index 4c8ed6549..4415f313f 100644 --- a/pro/src/main/resources/template/js/proproject/myproprojectlist.js +++ b/pro/src/main/resources/template/js/proproject/myproprojectlist.js @@ -113,7 +113,7 @@ layui.config({ } }else if (layEvent === 'proappoint') { //项目任命 proappoint(data); - }else if (layEvent === 'end') { //信息完善 + }else if (layEvent === 'end') { //成果和总结 end(data); }else if (layEvent === 'discussList') { //讨论板 discussList(data); @@ -181,12 +181,12 @@ layui.config({ }}); } - // 信息完善 + // 成果和总结 function end(data){ rowId = data.id; _openNewWindows({ url: "../../tpl/proproject/properfectinformation.html", - title: "信息完善", + title: "成果和总结", pageId: "properfectinformation", area: ['90vw', '90vh'], callBack: function(refreshCode){ diff --git a/pro/src/main/resources/template/js/proprojectdiscuss/proprojectdiscussadd.js b/pro/src/main/resources/template/js/proprojectdiscuss/proprojectdiscussadd.js index ea788fcc9..55a0104d9 100644 --- a/pro/src/main/resources/template/js/proprojectdiscuss/proprojectdiscussadd.js +++ b/pro/src/main/resources/template/js/proprojectdiscuss/proprojectdiscussadd.js @@ -14,19 +14,10 @@ layui.config({ layedit = layui.layedit; var rowId = parent.parent.rowId; - showGrid({ - id: "typeId", - url: flowableBasePath + "proprojectdiscusstype008", - params: {}, - pagination: false, - template: getFileContent('tpl/template/select-option.tpl'), - ajaxSendLoadBefore: function(hdb){ - }, - ajaxSendAfter: function (json) { - form.render('select'); - } - }); - + + // 项目讨论板分类 + sysDictDataUtil.showDictDataListByDictTypeCode(sysDictData["pmProjectDiscussType"]["key"], 'select', "typeId", '', form); + layedit.set({ uploadImage: { url: reqBasePath + "common003", //接口url @@ -85,7 +76,6 @@ layui.config({ matchingLanguage(); form.on('submit(formAddBean)', function (data) { - if (winui.verifyForm(data.elem)) { var params = { proId: rowId, diff --git a/pro/src/main/resources/template/js/proprojectdiscuss/proprojectdiscusslist.js b/pro/src/main/resources/template/js/proprojectdiscuss/proprojectdiscusslist.js index c01442e43..eb7fe105a 100644 --- a/pro/src/main/resources/template/js/proprojectdiscuss/proprojectdiscusslist.js +++ b/pro/src/main/resources/template/js/proprojectdiscuss/proprojectdiscusslist.js @@ -9,11 +9,9 @@ layui.config({ window: 'js/winui.window' }).define(['window', 'table', 'jquery', 'winui', 'form'], function (exports) { winui.renderColor(); - var $ = layui.$, form = layui.form, table = layui.table; - rowId = parent.rowId; table.render({ diff --git a/pro/src/main/resources/template/js/proprojectdiscusstype/proprojectdiscusstypeadd.js b/pro/src/main/resources/template/js/proprojectdiscusstype/proprojectdiscusstypeadd.js deleted file mode 100644 index 2bd441a83..000000000 --- a/pro/src/main/resources/template/js/proprojectdiscusstype/proprojectdiscusstypeadd.js +++ /dev/null @@ -1,32 +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.$; - - matchingLanguage(); - form.render(); - form.on('submit(formAddBean)', function (data) { - if (winui.verifyForm(data.elem)) { - var params = { - typeName: $("#typeName").val() - }; - AjaxPostUtil.request({url: flowableBasePath + "proprojectdiscusstype002", params: params, type: 'json', callback: function (json) { - parent.layer.close(index); - parent.refreshCode = '0'; - }}); - } - return false; - }); - - $("body").on("click", "#cancle", function() { - parent.layer.close(index); - }); - }); -}); \ No newline at end of file diff --git a/pro/src/main/resources/template/js/proprojectdiscusstype/proprojectdiscusstypeedit.js b/pro/src/main/resources/template/js/proprojectdiscusstype/proprojectdiscusstypeedit.js deleted file mode 100644 index ebafcf755..000000000 --- a/pro/src/main/resources/template/js/proprojectdiscusstype/proprojectdiscusstypeedit.js +++ /dev/null @@ -1,44 +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.$; - - showGrid({ - id: "showForm", - url: flowableBasePath + "proprojectdiscusstype003", - params: {rowId: parent.rowId}, - pagination: false, - template: getFileContent('tpl/proprojectdiscusstype/proprojectdiscusstypeeditTemplate.tpl'), - ajaxSendLoadBefore: function(hdb){ - }, - ajaxSendAfter: function (json) { - matchingLanguage(); - form.render(); - form.on('submit(formEditBean)', function (data) { - if (winui.verifyForm(data.elem)) { - var params = { - rowId: parent.rowId, - typeName: $("#typeName").val() - }; - AjaxPostUtil.request({url: flowableBasePath + "proprojectdiscusstype004", params: params, type: 'json', callback: function (json) { - parent.layer.close(index); - parent.refreshCode = '0'; - }}); - } - return false; - }); - } - }); - - $("body").on("click", "#cancle", function() { - parent.layer.close(index); - }); - }); -}); \ No newline at end of file diff --git a/pro/src/main/resources/template/js/proprojectdiscusstype/proprojectdiscusstypelist.js b/pro/src/main/resources/template/js/proprojectdiscusstype/proprojectdiscusstypelist.js deleted file mode 100644 index 350625dc2..000000000 --- a/pro/src/main/resources/template/js/proprojectdiscusstype/proprojectdiscusstypelist.js +++ /dev/null @@ -1,141 +0,0 @@ -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('1574130121952'); - table.render({ - id: 'messageTable', - elem: '#messageTable', - method: 'post', - url: flowableBasePath + 'proprojectdiscusstype001', - where: {typeName: $("#typeName").val(), state: $("#state").val()}, - even: true, - page: true, - limits: [8, 16, 24, 32, 40, 48, 56], - limit: 8, - cols: [[ - { title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers'}, - { field: 'typeName', title: '类型名称', align: 'center', width: 120 }, - { field: 'state', title: '状态', width: 100, align: 'center', templet: function (d) { - if(d.state == '1'){ - return "新建"; - }else if(d.state == '2'){ - return "上线"; - }else if(d.state == '3'){ - return "下线"; - } else { - return "参数错误"; - } - }}, - { field: 'createTime', title: systemLanguage["com.skyeye.createTime"][languageType], align: 'center', width: 150}, - { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 250, toolbar: '#tableBar'} - ]], - done: function(){ - matchingLanguage(); - } - }); - - table.on('tool(messageTable)', function (obj) { - var data = obj.data; - var layEvent = obj.event; - if (layEvent === 'edit') { //编辑 - edit(data); - }else if (layEvent === 'delete'){ //删除 - del(data); - }else if (layEvent === 'up') { //上线 - up(data); - }else if (layEvent === 'down') { //下线 - down(data); - } - }); - - form.render(); - - $("body").on("click", "#formSearch", function() { - refreshTable(); - }); - - $("body").on("click", "#reloadTable", function() { - loadTable(); - }); - - function loadTable(){ - table.reload("messageTable", {where: {typeName: $("#typeName").val(), state: $("#state").val()}}); - } - - function refreshTable(){ - table.reload("messageTable", {page: {curr: 1}, where: {typeName: $("#typeName").val(), state: $("#state").val()}}); - } - - //新增 - $("body").on("click", "#addBean", function() { - _openNewWindows({ - url: "../../tpl/proprojectdiscusstype/proprojectdiscusstypeadd.html", - title: systemLanguage["com.skyeye.addPageTitle"][languageType], - pageId: "proprojectdiscusstypeadd", - area: ['90vw', '90vh'], - callBack: function(refreshCode){ - winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000}); - loadTable(); - }}); - }); - - //编辑 - function edit(data){ - rowId = data.id; - _openNewWindows({ - url: "../../tpl/proprojectdiscusstype/proprojectdiscusstypeedit.html", - title: systemLanguage["com.skyeye.editPageTitle"][languageType], - pageId: "proprojectdiscusstypeedit", - area: ['90vw', '90vh'], - callBack: function(refreshCode){ - winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000}); - loadTable(); - }}); - } - - //删除 - function del(data, obj){ - layer.confirm(systemLanguage["com.skyeye.deleteOperationMsg"][languageType], {icon: 3, title: systemLanguage["com.skyeye.deleteOperation"][languageType]}, function(index){ - layer.close(index); - AjaxPostUtil.request({url: flowableBasePath + "proprojectdiscusstype005", params: {rowId: data.id}, type: 'json', callback: function (json) { - winui.window.msg(systemLanguage["com.skyeye.deleteOperationSuccessMsg"][languageType], {icon: 1, time: 2000}); - loadTable(); - }}); - }); - } - - //上线 - function up(data, obj){ - var msg = obj ? '确认将【' + obj.data.typeName + '】上线吗?' : '确认将选中数据上线吗?'; - layer.confirm(msg, {icon: 3, title: '上线操作'}, function (index) { - layer.close(index); - AjaxPostUtil.request({url: flowableBasePath + "proprojectdiscusstype006", params: {rowId: data.id}, type: 'json', callback: function (json) { - winui.window.msg("上线成功", {icon: 1, time: 2000}); - loadTable(); - }}); - }); - } - - //下线 - function down(data, obj){ - var msg = obj ? '确认将【' + obj.data.typeName + '】下线吗?' : '确认将选中数据下线吗?'; - layer.confirm(msg, {icon: 3, title: '下线操作'}, function (index) { - layer.close(index); - AjaxPostUtil.request({url: flowableBasePath + "proprojectdiscusstype007", params: {rowId: data.id}, type: 'json', callback: function (json) { - winui.window.msg("下线成功", {icon: 1, time: 2000}); - loadTable(); - }}); - }); - } - - exports('proprojectdiscusstypelist', {}); -}); \ No newline at end of file diff --git a/pro/src/main/resources/template/tpl/proprojectdiscusstype/proprojectdiscusstypeadd.html b/pro/src/main/resources/template/tpl/proprojectdiscusstype/proprojectdiscusstypeadd.html deleted file mode 100644 index d28b40b3e..000000000 --- a/pro/src/main/resources/template/tpl/proprojectdiscusstype/proprojectdiscusstypeadd.html +++ /dev/null @@ -1,32 +0,0 @@ - - -
- -