diff --git a/seal-service/src/main/resources/template/js/stateisstayworker/dispatchedworker.js b/seal-service/src/main/resources/template/js/stateisstayworker/dispatchedworker.js deleted file mode 100644 index b0b0e4e2596a96f6576e78d13576e18d95f3e337..0000000000000000000000000000000000000000 --- a/seal-service/src/main/resources/template/js/stateisstayworker/dispatchedworker.js +++ /dev/null @@ -1,87 +0,0 @@ - -//工单接收人信息 -var serviceUser = {}; - -layui.config({ - base: basePath, - version: skyeyeVersion -}).extend({ - window: 'js/winui.window' -}).define(['window', 'jquery', 'winui', 'tagEditor'], function (exports) { - winui.renderColor(); - layui.use(['form'], function (form) { - var index = parent.layer.getFrameIndex(window.name); - var $ = layui.$; - - var cooperationUser = new Array();//工单协助人集合 - - showGrid({ - id: "showForm", - url: flowableBasePath + "sealseservice013", - params: {rowId: parent.rowId}, - pagination: false, - template: getFileContent('tpl/stateisstayworker/dispatchedworkerTemplate.tpl'), - ajaxSendLoadBefore: function(hdb) { - }, - ajaxSendAfter: function (json) { - matchingLanguage(); - form.render(); - form.on('submit(dispatchedWorker)', function (data) { - if (winui.verifyForm(data.elem)) { - var params = { - rowId: parent.rowId, - serviceUserId: isNull(serviceUser.userId) ? "" : serviceUser.userId, - cooperationUserId: systemCommonUtil.tagEditorGetAllData('cooperationUserId', cooperationUser),//工单协助人，可为空 - }; - // 接收人 - if(isNull(params.serviceUserId)){ - winui.window.msg('请选择工单接收人', {icon: 2, time: 2000}); - return false; - } - AjaxPostUtil.request({url: flowableBasePath + "sealseservice014", params: params, type: 'json', callback: function (json) { - parent.layer.close(index); - parent.refreshCode = '0'; - }}); - } - return false; - }); - } - }); - - //工单接收人选择 - $("body").on("click", "#serviceUserIdSelPeople", function (e) { - _openNewWindows({ - url: "../../tpl/serviceworker/serviceworkershowlist.html", - title: "选择接收人", - pageId: "serviceworkershowlist", - area: ['90vw', '90vh'], - callBack: function (refreshCode) { - $("#serviceUserId").val(serviceUser.userName); - }}); - }); - - //工单协助人 - $('#cooperationUserId').tagEditor({ - initialTags: [], - placeholder: '请选择工单协助人', - beforeTagDelete: function(field, editor, tags, val) { - cooperationUser = [].concat(arrayUtil.removeArrayPointName(cooperationUser, val)); - } - }); - //工单协助人选择 - $("body").on("click", "#cooperationUserIdSelPeople", function (e) { - systemCommonUtil.userReturnList = [].concat(cooperationUser); - systemCommonUtil.chooseOrNotMy = "1"; // 人员列表中是否包含自己--1.包含；其他参数不包含 - systemCommonUtil.chooseOrNotEmail = "2"; // 人员列表中是否必须绑定邮箱--1.必须；其他参数没必要 - systemCommonUtil.checkType = "1"; // 人员选择类型，1.多选；其他。单选 - systemCommonUtil.openSysUserStaffChoosePage(function (userReturnList) { - // 重置数据 - cooperationUser = [].concat(systemCommonUtil.tagEditorResetData('cooperationUserId', userReturnList)); - }); - }); - - $("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/stateisstayworker/stateisstayworkerlist.js b/seal-service/src/main/resources/template/js/stateisstayworker/stateisstayworkerlist.js deleted file mode 100644 index ce182f3f7bedc098f3cd5d9be9f4b7bb5b8cbf3b..0000000000000000000000000000000000000000 --- a/seal-service/src/main/resources/template/js/stateisstayworker/stateisstayworkerlist.js +++ /dev/null @@ -1,152 +0,0 @@ - -var rowId = ""; -var startTime = ""; -var endTime = ""; - -layui.config({ - base: basePath, - version: skyeyeVersion -}).extend({ - window: 'js/winui.window' -}).define(['window', 'table', 'jquery', 'winui', 'form', 'laydate'], function (exports) { - winui.renderColor(); - var $ = layui.$, - form = layui.form, - laydate = layui.laydate, - table = layui.table; - - // 售后服务类型 - sysDictDataUtil.showDictDataListByDictTypeCode(sysDictData["amsServiceType"]["key"], 'select', "typeId", '', form); - - // 跟单时间 - laydate.render({elem: '#declarationTime', range: '~'}); - - initTable(); - // 待派工表格渲染 - function initTable(){ - table.render({ - id: 'messageTable', - elem: '#messageTable', - method: 'post', - url: flowableBasePath + 'sealseservice002', - where: {orderNum: $("#orderNum").val(), typeId: $("#typeId").val(), customerName: $("#customerName").val(), firstTime: '', lastTime: ''}, - even: true, - page: true, - limits: [8, 16, 24, 32, 40, 48, 56], - limit: 8, - cols: [[ - { title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' }, - { field: 'orderNum', title: '工单号', align: 'center', width: 220, templet: function (d) { - return '' + d.orderNum + ''; - }}, - { field: 'serviceTypeName', title: '服务类型', align: 'left', width: 120 }, - { field: 'declarationTime', title: '报单时间', align: 'center', width: 140 }, - { field: 'customerName', title: '客户名称', align: 'left', width: 120 }, - { field: 'productName', title: '商品名称', align: 'left', width: 120 }, - { 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 === 'stayWork') { //派工 - stayWork(data); - } else if (layEvent === 'details'){ //详情 - details(data); - } else if (layEvent === 'edit') { //编辑 - edit(data); - } else if (layEvent === 'delete'){ //删除 - deleteRow(data); - } - }); - } - - form.render(); - - $("body").on("click", "#formSearch", function() { - refreshTable(); - }); - - $("body").on("click", "#reloadTable", function() { - loadTable(); - }); - - function loadTable() { - if(isNull($("#declarationTime").val())) { - startTime = ""; - endTime = ""; - } else { - startTime = $("#declarationTime").val().split('~')[0].trim(); - endTime = $("#declarationTime").val().split('~')[1].trim(); - } - table.reloadData("messageTable", {where: {orderNum: $("#orderNum").val(), typeId: $("#typeId").val(), customerName: $("#customerName").val(), firstTime: startTime, lastTime: endTime}}); - } - - function refreshTable(){ - if(isNull($("#declarationTime").val())) { - startTime = ""; - endTime = ""; - } else { - startTime = $("#declarationTime").val().split('~')[0].trim(); - endTime = $("#declarationTime").val().split('~')[1].trim(); - } - table.reloadData("messageTable", {page: {curr: 1}, where: {orderNum: $("#orderNum").val(), typeId: $("#typeId").val(), customerName: $("#customerName").val(), firstTime: startTime, lastTime: endTime}}); - } - - //派工 - function stayWork(data) { - rowId = data.id; - _openNewWindows({ - url: "../../tpl/stateisstayworker/dispatchedworker.html", - title: "派工", - pageId: "dispatchedworker", - 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/sealseservice/sealseserviceedit.html", - title: systemLanguage["com.skyeye.editPageTitle"][languageType], - pageId: "sealseserviceedit", - area: ['90vw', '90vh'], - callBack: function (refreshCode) { - winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000}); - loadTable(); - }}); - } - - //详情 - function details(data) { - rowId = data.id; - _openNewWindows({ - url: "../../tpl/sealseservice/sealseservicedetails.html", - title: systemLanguage["com.skyeye.detailsPageTitle"][languageType], - pageId: "sealseservicedetails", - area: ['90vw', '90vh'], - callBack: function (refreshCode) { - }}); - } - - //删除 - 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 + "sealseservice020", params: {rowId: data.id}, type: 'json', callback: function (json) { - winui.window.msg(systemLanguage["com.skyeye.deleteOperationSuccessMsg"][languageType], {icon: 1, time: 2000}); - loadTable(); - }}); - }); - } - - exports('stateisstayworkerlist', {}); -}); \ No newline at end of file diff --git a/seal-service/src/main/resources/template/tpl/stateisstayworker/dispatchedworker.html b/seal-service/src/main/resources/template/tpl/stateisstayworker/dispatchedworker.html deleted file mode 100644 index e93abc6ff4379c7c47cfefd6bbcae3b76384da9a..0000000000000000000000000000000000000000 --- a/seal-service/src/main/resources/template/tpl/stateisstayworker/dispatchedworker.html +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - -
-
- -
-
- - - - - \ No newline at end of file diff --git a/seal-service/src/main/resources/template/tpl/stateisstayworker/dispatchedworkerTemplate.tpl b/seal-service/src/main/resources/template/tpl/stateisstayworker/dispatchedworkerTemplate.tpl deleted file mode 100644 index 9096ce2c2f98104e222d65f29f172eff3e0b761b..0000000000000000000000000000000000000000 --- a/seal-service/src/main/resources/template/tpl/stateisstayworker/dispatchedworkerTemplate.tpl +++ /dev/null @@ -1,72 +0,0 @@ -{{#bean}} -
- -
- {{orderNum}} -
-
-
- -
- {{serviceTypeName}} -
-
-
- -
- {{declarationTime}} -
-
-
- -
- {{contacts}} -
-
-
- -
- {{phone}} -
-
-
- -
- {{email}} -
-
-
- -
- {{qq}} -
-
-
- -
- {{addressProvince}} {{addressCity}} {{addressArea}} {{addressTownship}} {{addressDetailed}} -
-
- -
- -
- - -
-
-
- -
- - -
-
- -
-
- - -
-
-{{/bean}} \ No newline at end of file diff --git a/seal-service/src/main/resources/template/tpl/stateisstayworker/stateisstayworkerlist.html b/seal-service/src/main/resources/template/tpl/stateisstayworker/stateisstayworkerlist.html deleted file mode 100644 index ff845d96f87e53671c87898536a38e616c33a599..0000000000000000000000000000000000000000 --- a/seal-service/src/main/resources/template/tpl/stateisstayworker/stateisstayworkerlist.html +++ /dev/null @@ -1,62 +0,0 @@ - - - - - - - - - -
-
-
-
- -
- -
- -
- -
- -
- -
- -
- -
- - -
-
-
-
-
-
- -
-
-
-
- -
- - - - - \ No newline at end of file diff --git a/web/src/main/resources/template/assets/lib/layui/customer/skyeye/dsFormUtil.js b/web/src/main/resources/template/assets/lib/layui/customer/skyeye/dsFormUtil.js index e4638c32e2e3227c7639da765bcd16900da315c0..b292fd8c4b4657079fdec271da9fb5ca3b97e372 100644 --- a/web/src/main/resources/template/assets/lib/layui/customer/skyeye/dsFormUtil.js +++ b/web/src/main/resources/template/assets/lib/layui/customer/skyeye/dsFormUtil.js @@ -917,7 +917,7 @@ var dsFormTableUtil = { var array = bean.value.split(','); condition.push(`$.inArray(d.${bean.attrKey}, ` + JSON.stringify(array) + `) !== -1`); } else { - condition.push(`d.${bean.attrKey} ${bean.symbolsMark} ${bean.value}`); + condition.push(`d.${bean.attrKey} ${bean.symbolsMark} '${bean.value}'`); } }); var conditionStr = condition.join('&&');