From 831c81f7a5ba637ce7c532b17bac5eb4a262f01b Mon Sep 17 00:00:00 2001 From: weizhiqiang <598748873@qq.com> Date: Sun, 10 Jul 2022 12:08:03 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90AMS=E3=80=91=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E6=95=85=E9=9A=9C=E7=B1=BB=E5=9E=8B=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sealseservicefaulttypeadd.js | 32 ---- .../sealseservicefaulttypeedit.js | 44 ------ .../sealseservicefaulttypelist.js | 141 ------------------ .../stateisstayfinished.js | 36 +---- .../sealseservicefaulttypeadd.html | 32 ---- .../sealseservicefaulttypeedit.html | 21 --- .../sealseservicefaulttypeeditTemplate.tpl | 14 -- .../sealseservicefaulttypelist.html | 70 --------- .../resources/template/json/sysDictData.json | 3 +- 9 files changed, 9 insertions(+), 384 deletions(-) delete mode 100644 seal-service/src/main/resources/template/js/sealseservicefaulttype/sealseservicefaulttypeadd.js delete mode 100644 seal-service/src/main/resources/template/js/sealseservicefaulttype/sealseservicefaulttypeedit.js delete mode 100644 seal-service/src/main/resources/template/js/sealseservicefaulttype/sealseservicefaulttypelist.js delete mode 100644 seal-service/src/main/resources/template/tpl/sealseservicefaulttype/sealseservicefaulttypeadd.html delete mode 100644 seal-service/src/main/resources/template/tpl/sealseservicefaulttype/sealseservicefaulttypeedit.html delete mode 100644 seal-service/src/main/resources/template/tpl/sealseservicefaulttype/sealseservicefaulttypeeditTemplate.tpl delete mode 100644 seal-service/src/main/resources/template/tpl/sealseservicefaulttype/sealseservicefaulttypelist.html diff --git a/seal-service/src/main/resources/template/js/sealseservicefaulttype/sealseservicefaulttypeadd.js b/seal-service/src/main/resources/template/js/sealseservicefaulttype/sealseservicefaulttypeadd.js deleted file mode 100644 index bf13107c1..000000000 --- a/seal-service/src/main/resources/template/js/sealseservicefaulttype/sealseservicefaulttypeadd.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 + "sealseservicefaulttype002", 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/seal-service/src/main/resources/template/js/sealseservicefaulttype/sealseservicefaulttypeedit.js b/seal-service/src/main/resources/template/js/sealseservicefaulttype/sealseservicefaulttypeedit.js deleted file mode 100644 index 7f19c2a27..000000000 --- a/seal-service/src/main/resources/template/js/sealseservicefaulttype/sealseservicefaulttypeedit.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 + "sealseservicefaulttype003", - params: {rowId: parent.rowId}, - pagination: false, - template: getFileContent('tpl/sealseservicefaulttype/sealseservicefaulttypeeditTemplate.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 + "sealseservicefaulttype004", 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/seal-service/src/main/resources/template/js/sealseservicefaulttype/sealseservicefaulttypelist.js b/seal-service/src/main/resources/template/js/sealseservicefaulttype/sealseservicefaulttypelist.js deleted file mode 100644 index d331821f4..000000000 --- a/seal-service/src/main/resources/template/js/sealseservicefaulttype/sealseservicefaulttypelist.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('1576203904120'); - table.render({ - id: 'messageTable', - elem: '#messageTable', - method: 'post', - url: flowableBasePath + 'sealseservicefaulttype001', - 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: 200}, - { 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/sealseservicefaulttype/sealseservicefaulttypeadd.html", - title: systemLanguage["com.skyeye.addPageTitle"][languageType], - pageId: "sealseservicefaulttypeadd", - 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/sealseservicefaulttype/sealseservicefaulttypeedit.html", - title: systemLanguage["com.skyeye.editPageTitle"][languageType], - pageId: "sealseservicefaulttypeedit", - 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 + "sealseservicefaulttype005", 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 + "sealseservicefaulttype006", 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 + "sealseservicefaulttype007", params: {rowId: data.id}, type: 'json', callback: function (json) { - winui.window.msg("下线成功", {icon: 1, time: 2000}); - loadTable(); - }}); - }); - } - - exports('sealseservicefaulttypelist', {}); -}); \ No newline at end of file diff --git a/seal-service/src/main/resources/template/js/stateisstayfinishedpro/stateisstayfinished.js b/seal-service/src/main/resources/template/js/stateisstayfinishedpro/stateisstayfinished.js index d258a6592..6f97b0d80 100644 --- a/seal-service/src/main/resources/template/js/stateisstayfinishedpro/stateisstayfinished.js +++ b/seal-service/src/main/resources/template/js/stateisstayfinishedpro/stateisstayfinished.js @@ -28,40 +28,18 @@ layui.config({ params: {rowId: parent.rowId}, pagination: false, template: $("#beanTemplate").html(), - ajaxSendLoadBefore: function(hdb){ - }, + ajaxSendLoadBefore: function(hdb){}, ajaxSendAfter: function (json) { - // 实际开工时间 - laydate.render({ - elem: '#comStarTime', - type: 'datetime', - trigger: 'click' - }); + laydate.render({elem: '#comStarTime', type: 'datetime', trigger: 'click'}); // 实际完工时间 - laydate.render({ - elem: '#comTime', - type: 'datetime', - trigger: 'click' - }); + laydate.render({elem: '#comTime', type: 'datetime', trigger: 'click'}); + + // 故障类型 + var defaultFaultTypeId = isNull(json.bean.faultTypeId) ? "" : json.bean.faultTypeId; + sysDictDataUtil.showDictDataListByDictTypeCode(sysDictData["amsServiceFaultType"]["key"], 'select', "faultTypeId", defaultFaultTypeId, form); - showGrid({ - id: "faultTypeId", - url: flowableBasePath + "sealseservicefaulttype008", - params: {}, - pagination: false, - template: selOption, - ajaxSendLoadBefore: function(hdb){ - }, - ajaxSendAfter:function(data){ - if(!isNull(json.bean.faultTypeId)){ - $("#faultTypeId").val(json.bean.faultTypeId); - } - form.render("select"); - } - }); - // 故障关键组件 if(!isNull(json.bean.faultKeyPartsId)){ faultKeyParts = { diff --git a/seal-service/src/main/resources/template/tpl/sealseservicefaulttype/sealseservicefaulttypeadd.html b/seal-service/src/main/resources/template/tpl/sealseservicefaulttype/sealseservicefaulttypeadd.html deleted file mode 100644 index 1b26669c7..000000000 --- a/seal-service/src/main/resources/template/tpl/sealseservicefaulttype/sealseservicefaulttypeadd.html +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - -
-
-
- -
- -
-
-
-
- - -
-
-
-
- - - - - \ No newline at end of file diff --git a/seal-service/src/main/resources/template/tpl/sealseservicefaulttype/sealseservicefaulttypeedit.html b/seal-service/src/main/resources/template/tpl/sealseservicefaulttype/sealseservicefaulttypeedit.html deleted file mode 100644 index 5f6bcdb12..000000000 --- a/seal-service/src/main/resources/template/tpl/sealseservicefaulttype/sealseservicefaulttypeedit.html +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - -
-
- -
-
- - - - - \ No newline at end of file diff --git a/seal-service/src/main/resources/template/tpl/sealseservicefaulttype/sealseservicefaulttypeeditTemplate.tpl b/seal-service/src/main/resources/template/tpl/sealseservicefaulttype/sealseservicefaulttypeeditTemplate.tpl deleted file mode 100644 index 51071cb55..000000000 --- a/seal-service/src/main/resources/template/tpl/sealseservicefaulttype/sealseservicefaulttypeeditTemplate.tpl +++ /dev/null @@ -1,14 +0,0 @@ -{{#bean}} -
- -
- -
-
-
-
- - -
-
-{{/bean}} \ No newline at end of file diff --git a/seal-service/src/main/resources/template/tpl/sealseservicefaulttype/sealseservicefaulttypelist.html b/seal-service/src/main/resources/template/tpl/sealseservicefaulttype/sealseservicefaulttypelist.html deleted file mode 100644 index 12a524f62..000000000 --- a/seal-service/src/main/resources/template/tpl/sealseservicefaulttype/sealseservicefaulttypelist.html +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - -
-
-
-
- -
- -
- -
- -
- - -
-
-
-
-
-
- - -
-
-
-
- -
- - - - - \ No newline at end of file diff --git a/web/src/main/resources/template/json/sysDictData.json b/web/src/main/resources/template/json/sysDictData.json index 3564cda8f..ccbe0f7e5 100644 --- a/web/src/main/resources/template/json/sysDictData.json +++ b/web/src/main/resources/template/json/sysDictData.json @@ -20,6 +20,7 @@ "amsServiceMode": {"name": "AMS-售后服务方式", "key": "AMS_SERVICE_MODE"}, "amsServiceType": {"name": "AMS-售后服务类型", "key": "AMS_SERVICE_TYPE"}, - "amsServiceEvaluateType": {"name": "AMS-售后服务评价类型", "key": "AMS_SERVICE_EVALUATE_TYPE"} + "amsServiceEvaluateType": {"name": "AMS-售后服务评价类型", "key": "AMS_SERVICE_EVALUATE_TYPE"}, + "amsServiceFaultType": {"name": "AMS-故障类型", "key": "AMS_SERVICE_FAULT_TYPE"} } \ No newline at end of file -- GitLab