diff --git a/seal-service/src/main/resources/template/js/feedBack/feedBackList.js b/seal-service/src/main/resources/template/js/feedBack/feedBackList.js
new file mode 100644
index 0000000000000000000000000000000000000000..d927026adfc11578849bdfd62e1644cff7bf524a
--- /dev/null
+++ b/seal-service/src/main/resources/template/js/feedBack/feedBackList.js
@@ -0,0 +1,131 @@
+
+var objectKey = "";
+var objectId = "";
+
+layui.config({
+ base: basePath,
+ version: skyeyeVersion
+}).extend({
+ window: 'js/winui.window'
+}).define(['window', 'jquery', 'winui', 'form', 'table'], function (exports) {
+ winui.renderColor();
+ var $ = layui.$,
+ form = layui.form,
+ table = layui.table;
+ objectKey = GetUrlParam("objectKey");
+ objectId = GetUrlParam("objectId");
+ if (isNull(objectKey) || isNull(objectId)) {
+ winui.window.msg("请传入适用对象信息", {icon: 2, time: 2000});
+ return false;
+ }
+
+ var state;
+ AjaxPostUtil.request({url: sysMainMation.sealServiceBasePath + "querySealServiceOrderById", params: {id: objectId}, type: 'json', method: 'GET', callback: function(json) {
+ state = json.bean.state;
+ if (state != 'beCompleted' && state != 'beEvaluated') {
+ $("#addBean").hide();
+ }
+ initTable();
+ }});
+
+ function initTable() {
+ table.render({
+ id: 'messageTable',
+ elem: '#messageTable',
+ method: 'post',
+ url: sysMainMation.sealServiceBasePath + 'queryFeedBackList',
+ where: getTableParams(),
+ even: true,
+ page: true,
+ limits: getLimits(),
+ limit: getLimit(),
+ cols: [[
+ { title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' },
+ { field: 'typeId', title: '反馈类型', width: 200, align: 'left', templet: function (d) {
+ return sysDictDataUtil.getDictDataNameByCodeAndKey(sysDictData["amsServiceFeedbBackType"]["key"], d.typeId);
+ }},
+ { field: 'content', title: '反馈内容', align: 'left', width: 300 },
+ { field: 'createName', title: systemLanguage["com.skyeye.createName"][languageType], align: 'left', 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: 120, templet: function (d) {
+ var str = '';
+ if (state == 'beCompleted' || state == 'beEvaluated') {
+ str += '';
+ str += '删除';
+ }
+ return str;
+ }}
+ ]],
+ done: function(json) {
+ matchingLanguage();
+ initTableSearchUtil.initAdvancedSearch(this, json.searchFilter, form, "暂不支持搜索", function () {
+ table.reloadData("messageTable", {page: {curr: 1}, where: getTableParams()});
+ });
+ }
+ });
+
+ table.on('tool(messageTable)', function (obj) {
+ var data = obj.data;
+ var layEvent = obj.event;
+ if (layEvent === 'edit') { //编辑
+ edit(data);
+ } else if (layEvent === 'del'){ //删除
+ del(data, obj);
+ }
+ });
+ }
+
+ // 添加
+ $("body").on("click", "#addBean", function() {
+ _openNewWindows({
+ url: systemCommonUtil.getUrl('FP2023091000006&objectId=' + objectId + '&objectKey=' + objectKey, null),
+ title: systemLanguage["com.skyeye.addPageTitle"][languageType],
+ pageId: "feedBackAdd",
+ area: ['90vw', '90vh'],
+ callBack: function (refreshCode) {
+ winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000});
+ loadTable();
+ }});
+ });
+
+ // 编辑
+ function edit(data) {
+ _openNewWindows({
+ url: systemCommonUtil.getUrl('FP2023091000007&objectId=' + objectId + '&objectKey=' + objectKey + '&id=' + data.id, null),
+ title: systemLanguage["com.skyeye.editPageTitle"][languageType],
+ pageId: "feedBackEdit",
+ 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('确认删除选中数据吗？', {icon: 3, title: '删除操作'}, function (index) {
+ layer.close(index);
+ AjaxPostUtil.request({url: sysMainMation.sealServiceBasePath + "deleteFeedBackById", params: {id: data.id}, type: 'json', method: 'DELETE', callback: function (json) {
+ winui.window.msg(systemLanguage["com.skyeye.deleteOperationSuccessMsg"][languageType], {icon: 1, time: 2000});
+ loadTable();
+ }});
+ });
+ }
+
+ form.render();
+ $("body").on("click", "#reloadTable", function() {
+ loadTable();
+ });
+ function loadTable() {
+ table.reloadData("messageTable", {where: getTableParams()});
+ }
+
+ function getTableParams() {
+ return $.extend(true, {objectKey: objectKey, objectId: objectId}, initTableSearchUtil.getSearchValue("messageTable"));
+ }
+
+ exports('feedBackList', {});
+});
diff --git a/seal-service/src/main/resources/template/js/feedback/feedbackadd.js b/seal-service/src/main/resources/template/js/feedback/feedbackadd.js
deleted file mode 100644
index 9968202dfb39f03f1c0adcfeb855a5631625c50a..0000000000000000000000000000000000000000
--- a/seal-service/src/main/resources/template/js/feedback/feedbackadd.js
+++ /dev/null
@@ -1,52 +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.$;
- var customerId = "",//客户id
- productId = "";//商品id
-
- AjaxPostUtil.request({url: flowableBasePath + "feedback002", params: {serviceId: parent.serviceId}, type: 'json', callback: function(json) {
- $("#orderNum").html(json.bean.orderNum);
- $("#customerName").html(json.bean.customerName);
- $("#productName").html(json.bean.productName);
- productId = json.bean.productId;
- customerId = json.bean.customerId;
-
- // 售后服务反馈类型
- sysDictDataUtil.showDictDataListByDictTypeCode(sysDictData["amsServiceFeedbBackType"]["key"], 'select', "typeId", '', form);
-
- matchingLanguage();
- }});
-
- skyeyeEnclosure.init('enclosureUpload');
- form.on('submit(formAddBean)', function(data) {
- if(winui.verifyForm(data.elem)) {
- var params = {
- typeId: $("#typeId").val(),
- content: $("#content").val(),
- customId: customerId,
- proId: productId,
- serviceId: parent.serviceId,
- enclosureInfo: skyeyeEnclosure.getEnclosureIdsByBoxId('enclosureUpload')
- };
- AjaxPostUtil.request({url: flowableBasePath + "feedback003", 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/feedback/feedbackdetails.js b/seal-service/src/main/resources/template/js/feedback/feedbackdetails.js
deleted file mode 100644
index 7e6bec47cd6ddf47105c2d1588681d256b42ad02..0000000000000000000000000000000000000000
--- a/seal-service/src/main/resources/template/js/feedback/feedbackdetails.js
+++ /dev/null
@@ -1,31 +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 + "feedback002", params: {serviceId: parent.serviceId}, type: 'json', callback: function(json) {
- $("#orderNum").html(json.bean.orderNum);
- $("#customerName").html(json.bean.customerName);
- $("#productName").html(json.bean.productName);
-
- // 获取反馈信息
- AjaxPostUtil.request({url: flowableBasePath + "feedback007", params: {rowId: parent.rowId}, type: 'json', callback: function(j) {
- $("#createName").html(j.bean.createName);
- $("#typeName").html(j.bean.typeName);
- $("#content").html(j.bean.content);
-
- // 附件回显
- skyeyeEnclosure.showDetails({"enclosureUploadBox": j.bean.enclosureInfo});
- }});
- matchingLanguage();
- }});
-
- });
-});
\ No newline at end of file
diff --git a/seal-service/src/main/resources/template/js/feedback/feedbackedit.js b/seal-service/src/main/resources/template/js/feedback/feedbackedit.js
deleted file mode 100644
index 5f85f184397086f9a0a02237be9690d808056e91..0000000000000000000000000000000000000000
--- a/seal-service/src/main/resources/template/js/feedback/feedbackedit.js
+++ /dev/null
@@ -1,53 +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 + "feedback002", params: {serviceId: parent.serviceId}, type: 'json', callback: function(json) {
- $("#orderNum").html(json.bean.orderNum);
- $("#customerName").html(json.bean.customerName);
- $("#productName").html(json.bean.productName);
-
- // 售后服务反馈类型
- sysDictDataUtil.showDictDataListByDictTypeCode(sysDictData["amsServiceFeedbBackType"]["key"], 'select', "typeId", '', form);
-
- // 获取反馈信息
- AjaxPostUtil.request({url: flowableBasePath + "feedback004", params: {rowId: parent.rowId}, type: 'json', callback: function(j) {
- $("#typeId").val(j.bean.typeId);
- $("#content").val(j.bean.content);
- // 附件回显
- skyeyeEnclosure.initTypeISData({'enclosureUpload': json.bean.enclosureInfo});
-
- matchingLanguage();
- form.render();
- form.on('submit(formEditBean)', function(data) {
- if(winui.verifyForm(data.elem)) {
- var params = {
- typeId: $("#typeId").val(),
- content: $("#content").val(),
- rowId: parent.rowId,
- enclosureInfo: skyeyeEnclosure.getEnclosureIdsByBoxId('enclosureUpload')
- };
- AjaxPostUtil.request({url: flowableBasePath + "feedback005", 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/feedback/feedbacklist.js b/seal-service/src/main/resources/template/js/feedback/feedbacklist.js
deleted file mode 100644
index faa556d85b97833652c318bb506197b293bde60a..0000000000000000000000000000000000000000
--- a/seal-service/src/main/resources/template/js/feedback/feedbacklist.js
+++ /dev/null
@@ -1,131 +0,0 @@
-
-var rowId = "";
-var serviceId = "";
-
-layui.config({
- base: basePath,
- version: skyeyeVersion
-}).extend({
- window: 'js/winui.window'
-}).define(['window', 'jquery', 'winui', 'table'], function (exports) {
- winui.renderColor();
- layui.use(['form'], function (form) {
- var index = parent.layer.getFrameIndex(window.name);
- var $ = layui.$,
- table = layui.table;
-
- serviceId = parent.rowId;
-
- showGrid({
- id: "showForm",
- url: flowableBasePath + "sealseservice039",
- params: {rowId: serviceId},
- pagination: false,
- template: $("#beanTemplate").html(),
- ajaxSendAfter: function (json) {
- //待完工或者待评价的工单可以进行反馈操作
- if(json.bean.state != 4 && json.bean.state != 5){
- $("#addBean").remove();
- }
-
-
- table.render({
- id: 'messageTable',
- elem: '#messageTable',
- method: 'post',
- url: flowableBasePath + 'feedback001',
- where: {serviceId: serviceId},
- 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: 'left', width: 120},
- { field: 'createName', title: '反馈人', align: 'left', width: 80 },
- { field: 'createTime', title: systemLanguage["com.skyeye.entryTime"][languageType], align: 'center', width: 140 },
- { field: 'content', title: '反馈内容', align: 'left', width: 300 },
- { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 150, toolbar: '#tableBar'}
- ]],
- done: function(json) {
- matchingLanguage();
- }
- });
-
- table.on('tool(messageTable)', function (obj) {
- var data = obj.data;
- var layEvent = obj.event;
- if (layEvent === 'edit') { //编辑
- edit(data);
- } else if (layEvent === 'delete'){ //删除
- deleteRow(data);
- } else if (layEvent === 'details'){ //详情
- details(data);
- }
- });
-
- matchingLanguage();
- form.render();
- }
- });
-
- $("body").on("click", "#reloadTable", function() {
- loadTable();
- });
-
- function loadTable() {
- table.reloadData("messageTable", {where: {serviceId: serviceId}});
- }
-
- //新增
- $("body").on("click", "#addBean", function() {
- _openNewWindows({
- url: "../../tpl/feedback/feedbackadd.html",
- title: systemLanguage["com.skyeye.addPageTitle"][languageType],
- pageId: "feedbackadd",
- 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/feedback/feedbackedit.html",
- title: systemLanguage["com.skyeye.editPageTitle"][languageType],
- pageId: "feedbackedit",
- area: ['90vw', '90vh'],
- callBack: function (refreshCode) {
- winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000});
- loadTable();
- }});
- }
-
- //删除
- function deleteRow(data) {
- layer.confirm(systemLanguage["com.skyeye.deleteOperationMsg"][languageType], {icon: 3, title: systemLanguage["com.skyeye.deleteOperation"][languageType]}, function (index) {
- layer.close(index);
- AjaxPostUtil.request({url: flowableBasePath + "feedback006", params: {rowId: data.id}, type: 'json', callback: function (json) {
- winui.window.msg(systemLanguage["com.skyeye.deleteOperationSuccessMsg"][languageType], {icon: 1, time: 2000});
- loadTable();
- }});
- });
- }
-
- //详情
- function details(data) {
- rowId = data.id;
- _openNewWindows({
- url: "../../tpl/feedback/feedbackdetails.html",
- title: systemLanguage["com.skyeye.detailsPageTitle"][languageType],
- pageId: "feedbackdetails",
- area: ['90vw', '90vh'],
- callBack: function (refreshCode) {
- }});
- }
-
- });
-});
\ No newline at end of file
diff --git a/seal-service/src/main/resources/template/js/sealService/sealServiceManage.js b/seal-service/src/main/resources/template/js/sealService/sealServiceManage.js
index fe8704568f7b2b3873961c623e18452ee7b351d7..7903232d672f847bbaf8fdd7ca2270466897b91b 100644
--- a/seal-service/src/main/resources/template/js/sealService/sealServiceManage.js
+++ b/seal-service/src/main/resources/template/js/sealService/sealServiceManage.js
@@ -27,6 +27,9 @@ layui.config({
}, {
title: '服务评价',
pageUrl: '../../tpl/sealEvaluate/sealEvaluateList.html'
+ }, {
+ title: '信息反馈',
+ pageUrl: '../../tpl/feedBack/feedBackList.html'
}],
element: layui.element,
object: {
diff --git a/seal-service/src/main/resources/template/tpl/feedBack/feedBackList.html b/seal-service/src/main/resources/template/tpl/feedBack/feedBackList.html
new file mode 100644
index 0000000000000000000000000000000000000000..7009b822b00362c03db06b9d0595d7582aac21a0
--- /dev/null
+++ b/seal-service/src/main/resources/template/tpl/feedBack/feedBackList.html
@@ -0,0 +1,28 @@
+
+
+
+
+
+
+
+
+
+
+ 只有待完工/待评价的工单才可以进行信息反馈操作。
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/seal-service/src/main/resources/template/tpl/feedback/feedbackadd.html b/seal-service/src/main/resources/template/tpl/feedback/feedbackadd.html
deleted file mode 100644
index 9744a2dcda3906cb16939eaaf74e5bb78e13b2d6..0000000000000000000000000000000000000000
--- a/seal-service/src/main/resources/template/tpl/feedback/feedbackadd.html
+++ /dev/null
@@ -1,62 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/seal-service/src/main/resources/template/tpl/feedback/feedbackdetails.html b/seal-service/src/main/resources/template/tpl/feedback/feedbackdetails.html
deleted file mode 100644
index bdd0076bbc7dfdb518951adbe8a6e00352d93260..0000000000000000000000000000000000000000
--- a/seal-service/src/main/resources/template/tpl/feedback/feedbackdetails.html
+++ /dev/null
@@ -1,59 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/seal-service/src/main/resources/template/tpl/feedback/feedbackedit.html b/seal-service/src/main/resources/template/tpl/feedback/feedbackedit.html
deleted file mode 100644
index 5f621dea7aaa1065fb9cf31b38747f800a0fdd52..0000000000000000000000000000000000000000
--- a/seal-service/src/main/resources/template/tpl/feedback/feedbackedit.html
+++ /dev/null
@@ -1,62 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/seal-service/src/main/resources/template/tpl/feedback/feedbacklist.html b/seal-service/src/main/resources/template/tpl/feedback/feedbacklist.html
deleted file mode 100644
index fb0bd44857d480330aaa1afa13825df839c78fa0..0000000000000000000000000000000000000000
--- a/seal-service/src/main/resources/template/tpl/feedback/feedbacklist.html
+++ /dev/null
@@ -1,83 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file