From 7eba8f2ef5b1f008bdd41a354108ead57d0237a8 Mon Sep 17 00:00:00 2001 From: weizhiqiang <598748873@qq.com> Date: Sun, 16 Apr 2023 11:20:33 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BD=A6=E9=97=B4=E7=AE=A1=E7=90=86=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 --- .../template/js/operate/writeOperate.js | 10 +- .../template/js/erpFarm/erpFarmAdd.js | 96 ---------- .../template/js/erpFarm/erpFarmChoose.js | 111 ++++------- .../template/js/erpFarm/erpFarmDetail.js | 34 ---- .../template/js/erpFarm/erpFarmEdit.js | 116 ------------ .../template/js/erpFarm/erpFarmList.js | 173 ------------------ .../template/tpl/erpFarm/erpFarmAdd.html | 86 --------- .../template/tpl/erpFarm/erpFarmChoose.html | 50 +---- .../template/tpl/erpFarm/erpFarmDetail.html | 89 --------- .../template/tpl/erpFarm/erpFarmEdit.html | 100 ---------- .../template/tpl/erpFarm/erpFarmList.html | 66 ------- .../lib/layui/customer/skyeye/dsFormUtil.js | 8 +- .../customer/tableUtil/initTableChooseUtil.js | 16 +- 13 files changed, 66 insertions(+), 889 deletions(-) delete mode 100644 erp-produce/src/main/resources/template/js/erpFarm/erpFarmAdd.js delete mode 100644 erp-produce/src/main/resources/template/js/erpFarm/erpFarmDetail.js delete mode 100644 erp-produce/src/main/resources/template/js/erpFarm/erpFarmEdit.js delete mode 100644 erp-produce/src/main/resources/template/js/erpFarm/erpFarmList.js delete mode 100644 erp-produce/src/main/resources/template/tpl/erpFarm/erpFarmAdd.html delete mode 100644 erp-produce/src/main/resources/template/tpl/erpFarm/erpFarmDetail.html delete mode 100644 erp-produce/src/main/resources/template/tpl/erpFarm/erpFarmEdit.html delete mode 100644 erp-produce/src/main/resources/template/tpl/erpFarm/erpFarmList.html diff --git a/base-server/src/main/resources/template/js/operate/writeOperate.js b/base-server/src/main/resources/template/js/operate/writeOperate.js index 0786147e9..173c82ba0 100644 --- a/base-server/src/main/resources/template/js/operate/writeOperate.js +++ b/base-server/src/main/resources/template/js/operate/writeOperate.js @@ -74,10 +74,7 @@ layui.config({ $.each(businessApi.params, function(key, value) { var params = { "key": key, - "attrKey": { - "html": attrHtml, - "value": value - } + "attrKey": value }; initTableChooseUtil.resetData('apiParams', params); }); @@ -103,10 +100,7 @@ layui.config({ $.each(operateOpenPage.params, function(key, value) { var params = { "key": key, - "attrKey": { - "html": attrHtml, - "value": value - } + "attrKey": value }; initTableChooseUtil.resetData('pageParams', params); }); diff --git a/erp-produce/src/main/resources/template/js/erpFarm/erpFarmAdd.js b/erp-produce/src/main/resources/template/js/erpFarm/erpFarmAdd.js deleted file mode 100644 index ce07061ff..000000000 --- a/erp-produce/src/main/resources/template/js/erpFarm/erpFarmAdd.js +++ /dev/null @@ -1,96 +0,0 @@ - -// 工序选择必备参数 -var procedureCheckType = 2;//工序选择类型：1.单选procedureMation；2.多选procedureMationList -var procedureMationList = new Array(); - -layui.config({ - base: basePath, - version: skyeyeVersion -}).extend({ - window: 'js/winui.window' -}).define(['window', 'jquery', 'winui', 'textool'], function (exports) { - winui.renderColor(); - layui.use(['form'], function (form) { - var index = parent.layer.getFrameIndex(window.name); - var $ = layui.$, - form = layui.form, - textool = layui.textool; - - // 车间负责人信息 - var chargeUser = []; - - var selOption = getFileContent('tpl/template/select-option.tpl'); - - textool.init({eleId: 'remark', maxlength: 200}); - - // 获取当前登录用户所属企业的所有部门信息 - systemCommonUtil.queryDepartmentListByCurrentUserBelong(function(data) { - $("#departmentId").html(getDataUseHandlebars(selOption, data)); - form.render('select'); - }); - - matchingLanguage(); - form.render(); - form.on('submit(formAddBean)', function (data) { - if (winui.verifyForm(data.elem)) { - if(procedureMationList.length == 0){ - winui.window.msg('请选择工序', {icon: 2, time: 2000}); - return false; - } - if(chargeUser.length == 0){ - winui.window.msg('请选择车间负责人', {icon: 2, time: 2000}); - return false; - } - var params = { - farmNumber: $("#farmNumber").val(), - farmName: $("#farmName").val(), - departmentId: $("#departmentId").val(), - desc: $("#remark").val(), - chargePerson: chargeUser[0].id, - farmProcedure: JSON.stringify(procedureMationList) - }; - AjaxPostUtil.request({url: flowableBasePath + "erpfarm002", params: params, type: 'json', callback: function (json) { - parent.layer.close(index); - parent.refreshCode = '0'; - }}); - } - return false; - }); - - // 工序选择 - $("body").on("click", "#procedureChoose", function() { - _openNewWindows({ - url: "../../tpl/erpWorkProcedure/erpWorkProcedureChoose.html", - title: "工序选择", - pageId: "erpWorkProcedureChoose", - area: ['90vw', '90vh'], - callBack: function (refreshCode) { - var str = ""; - $.each(procedureMationList, function(i, item) { - str += '' + item.number + '' + item.procedureName + '' + item.unitPrice + '' + item.departmentName + ''; - }); - $("#procedureBody").html(str); - }}); - }); - - // 车间负责人选择 - $("body").on("click", "#chargeUserIdSelPeople", function (e) { - systemCommonUtil.userReturnList = [].concat(chargeUser); - systemCommonUtil.chooseOrNotMy = "1"; // 人员列表中是否包含自己--1.包含；其他参数不包含 - systemCommonUtil.chooseOrNotEmail = "2"; // 人员列表中是否必须绑定邮箱--1.必须；其他参数没必要 - systemCommonUtil.checkType = "2"; // 人员选择类型，1.多选；其他。单选 - systemCommonUtil.openSysUserStaffChoosePage(function (userReturnList) { - chargeUser = [].concat(userReturnList); - if(chargeUser.length > 0){ - $("#chargeUserId").val(chargeUser[0].name); - } - }); - }); - - // 取消 - $("body").on("click", "#cancle", function() { - parent.layer.close(index); - }); - }); - -}); \ No newline at end of file diff --git a/erp-produce/src/main/resources/template/js/erpFarm/erpFarmChoose.js b/erp-produce/src/main/resources/template/js/erpFarm/erpFarmChoose.js index fa03e8a37..5dae6d920 100644 --- a/erp-produce/src/main/resources/template/js/erpFarm/erpFarmChoose.js +++ b/erp-produce/src/main/resources/template/js/erpFarm/erpFarmChoose.js @@ -13,23 +13,12 @@ layui.config({ tableCheckBoxUtil = layui.tableCheckBoxUtil; var checkType = '1';// 车间选择类型：1.单选；2.多选 - if (!isNull(parent.farmCheckType)){ checkType = parent.farmCheckType; + } else { + checkType = GetUrlParam("checkType"); } - - var selOption = getFileContent('tpl/template/select-option.tpl'); - - AjaxPostUtil.request({url: flowableBasePath + "erpworkprocedure009", params: {}, type: 'json', callback: function(json) { - // 加载工序数据 - $("#procedureId").html(getDataUseHandlebars(selOption, json)); - if (!isNull(parent.procedureId)){ - $("#procedureId").val(parent.procedureId); - } - // 初始化表格 - initTable(); - }}); - + //设置提示信息 var s = "车间选择规则："; if(checkType == "1"){ @@ -41,23 +30,19 @@ layui.config({ } s += '如没有查到要选择的车间，请检查车间信息是否满足当前规则。'; $("#showInfo").html(s); - + + initTable(); function initTable(){ if(checkType == '2'){ - //初始化值 var ids = []; $.each(parent.farmMationList, function(i, item) { - ids.push(item.farmId); - }); - tableCheckBoxUtil.setIds({ - gridId: 'messageTable', - fieldName: 'farmId', - ids: ids + ids.push(item.id); }); tableCheckBoxUtil.init({ gridId: 'messageTable', filterId: 'messageTable', - fieldName: 'farmId' + fieldName: 'id', + ids: ids }); } @@ -65,35 +50,27 @@ layui.config({ id: 'messageTable', elem: '#messageTable', method: 'post', - url: flowableBasePath + 'erpfarm010', + url: sysMainMation.erpBasePath + 'erpfarm001', where: getTableParams(), even: true, page: true, - limits: [8, 16, 24, 32, 40, 48, 56], - limit: 8, + limits: getLimits(), + limit: getLimit(), cols: [[ { type: checkType == '1' ? 'radio' : 'checkbox'}, { title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' }, - { field: 'farmNumber', title: '车间编号', align: 'left', width: 100, templet: function (d) { - return '' + d.farmNumber + ''; - }}, - { field: 'farmName', title: '车间名称', align: 'left', width: 250}, - { field: 'state', title: '状态', align: 'left', width: 80, templet: function (d) { - if(d.state == '1'){ - return "正常"; - } else if (d.state == '2'){ - return "维修整改"; - } else { - return "参数错误"; - } - }}, - { field: 'createName', title: systemLanguage["com.skyeye.createName"][languageType], align: 'left', width: 120 }, - { field: 'createTime', title: systemLanguage["com.skyeye.createTime"][languageType], align: 'center', width: 100 }, - { field: 'lastUpdateName', title: systemLanguage["com.skyeye.lastUpdateName"][languageType], align: 'left', width: 120 }, - { field: 'lastUpdateTime', title: '最后修改时间', align: 'center', width: 100} + { field: 'number', title: '车间编号', align: 'left', width: 100 }, + { field: 'name', title: '名称', align: 'left', width: 250 }, + { field: 'enabled', title: '状态', align: 'center', width: 80, templet: function (d) { + return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("commonEnable", 'id', d.enabled, 'name'); + }} ]], done: function(res, curr, count){ matchingLanguage(); + initTableSearchUtil.initAdvancedSearch(this, res.searchFilter, form, "请输入名称、车间编号", function () { + table.reloadData("messageTable", {page: {curr: 1}, where: getTableParams()}); + }); + if(checkType == '1'){ $('#messageTable').next().find('.layui-table-body').find("table" ).find("tbody").children("tr").on('dblclick',function(){ var dubClick = $('#messageTable').next().find('.layui-table-body').find("table").find("tbody").find(".layui-table-hover"); @@ -113,11 +90,10 @@ layui.config({ form.render(); }) } else { - //多选 - //设置选中 + // 多选 tableCheckBoxUtil.checkedDefault({ gridId: 'messageTable', - fieldName: 'procedureId' + fieldName: 'id' }); } } @@ -131,39 +107,26 @@ layui.config({ var selectedData = tableCheckBoxUtil.getValue({ gridId: 'messageTable' }); - AjaxPostUtil.request({url: flowableBasePath + "erpfarm011", params: {ids: selectedData.toString()}, type: 'json', callback: function (json) { - parent.procedureMationList = [].concat(json.rows); - parent.layer.close(index); - parent.refreshCode = '0'; - }}); + if (selectedData.length == 0) { + winui.window.msg("请选择车间", {icon: 2, time: 2000}); + return false; + } + parent.farmMationList = [].concat(selectedData); + parent.layer.close(index); + parent.refreshCode = '0'; }); - + form.render(); - form.on('submit(formSearch)', function (data) { - if (winui.verifyForm(data.elem)) { - refreshTable(); - } - return false; - }); - $("body").on("click", "#reloadTable", function() { - loadTable(); - }); - - function loadTable() { - table.reloadData("messageTable", {where: getTableParams()}); - } - - function refreshTable(){ - table.reloadData("messageTable", {page: {curr: 1}, where: getTableParams()}); - } + loadTable(); + }); + + function loadTable() { + table.reloadData("messageTable", {where: getTableParams()}); + } function getTableParams() { - return { - farmNumber: $("#farmNumber").val(), - farmName: $("#farmName").val(), - procedureId: $("#procedureId").val() - }; + return $.extend(true, {}, initTableSearchUtil.getSearchValue("messageTable")); } exports('erpFarmChoose', {}); diff --git a/erp-produce/src/main/resources/template/js/erpFarm/erpFarmDetail.js b/erp-produce/src/main/resources/template/js/erpFarm/erpFarmDetail.js deleted file mode 100644 index 903c2e8f9..000000000 --- a/erp-produce/src/main/resources/template/js/erpFarm/erpFarmDetail.js +++ /dev/null @@ -1,34 +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.$, - form = layui.form; - - showGrid({ - id: "showForm", - url: flowableBasePath + "erpfarm006", - params: {rowId: parent.rowId}, - pagination: false, - template: $("#beanTemplate").html(), - ajaxSendLoadBefore: function(hdb) { - }, - ajaxSendAfter: function (json) { - matchingLanguage(); - form.render(); - } - }); - - // 取消 - $("body").on("click", "#cancle", function() { - parent.layer.close(index); - }); - }); - -}); \ No newline at end of file diff --git a/erp-produce/src/main/resources/template/js/erpFarm/erpFarmEdit.js b/erp-produce/src/main/resources/template/js/erpFarm/erpFarmEdit.js deleted file mode 100644 index 7101ba960..000000000 --- a/erp-produce/src/main/resources/template/js/erpFarm/erpFarmEdit.js +++ /dev/null @@ -1,116 +0,0 @@ - -// 工序选择必备参数 -var procedureCheckType = 2;//工序选择类型：1.单选procedureMation；2.多选procedureMationList -var procedureMationList = new Array(); - -layui.config({ - base: basePath, - version: skyeyeVersion -}).extend({ - window: 'js/winui.window' -}).define(['window', 'jquery', 'winui', 'textool'], function (exports) { - winui.renderColor(); - layui.use(['form'], function (form) { - var index = parent.layer.getFrameIndex(window.name); - var $ = layui.$, - form = layui.form, - textool = layui.textool; - - // 车间负责人信息 - var chargeUser = []; - - var selOption = getFileContent('tpl/template/select-option.tpl'); - - showGrid({ - id: "showForm", - url: flowableBasePath + "erpfarm003", - params: {rowId: parent.rowId}, - pagination: false, - template: $("#beanTemplate").html(), - ajaxSendLoadBefore: function(hdb) { - }, - ajaxSendAfter: function (json) { - procedureMationList = [].concat(json.bean.procedureList); - - // 获取当前登录用户所属企业的所有部门信息 - systemCommonUtil.queryDepartmentListByCurrentUserBelong(function(data) { - $("#departmentId").html(getDataUseHandlebars(selOption, data)); - $("#departmentId").val(json.bean.departmentId); - form.render('select'); - }); - - chargeUser.push({ - id: json.bean.chargePerson, - name: json.bean.chargeName - }); - - textool.init({eleId: 'remark', maxlength: 200}); - - matchingLanguage(); - form.render(); - form.on('submit(formEditBean)', function (data) { - if (winui.verifyForm(data.elem)) { - if(procedureMationList.length == 0){ - winui.window.msg('请选择工序', {icon: 2, time: 2000}); - return false; - } - if(chargeUser.length == 0){ - winui.window.msg('请选择车间负责人', {icon: 2, time: 2000}); - return false; - } - var params = { - farmNumber: $("#farmNumber").val(), - farmName: $("#farmName").val(), - departmentId: $("#departmentId").val(), - desc: $("#remark").val(), - chargePerson: chargeUser[0].id, - farmProcedure: JSON.stringify(procedureMationList), - rowId: parent.rowId - }; - AjaxPostUtil.request({url: flowableBasePath + "erpfarm004", params: params, type: 'json', callback: function (json) { - parent.layer.close(index); - parent.refreshCode = '0'; - }}); - } - return false; - }); - } - }); - - // 工序选择 - $("body").on("click", "#procedureChoose", function() { - _openNewWindows({ - url: "../../tpl/erpWorkProcedure/erpWorkProcedureChoose.html", - title: "工序选择", - pageId: "erpWorkProcedureChoose", - area: ['90vw', '90vh'], - callBack: function (refreshCode) { - var str = ""; - $.each(procedureMationList, function(i, item) { - str += '' + item.number + '' + item.procedureName + '' + item.unitPrice + '' + item.departmentName + ''; - }); - $("#procedureBody").html(str); - }}); - }); - - // 车间负责人选择 - $("body").on("click", "#chargeUserIdSelPeople", function(e) { - systemCommonUtil.userReturnList = [].concat(chargeUser); - systemCommonUtil.chooseOrNotMy = "1"; // 人员列表中是否包含自己--1.包含；其他参数不包含 - systemCommonUtil.chooseOrNotEmail = "2"; // 人员列表中是否必须绑定邮箱--1.必须；其他参数没必要 - systemCommonUtil.checkType = "2"; // 人员选择类型，1.多选；其他。单选 - systemCommonUtil.openSysUserStaffChoosePage(function (userReturnList) { - chargeUser = [].concat(userReturnList); - if(chargeUser.length > 0){ - $("#chargeUserId").val(chargeUser[0].name); - } - }); - }); - - // 取消 - $("body").on("click", "#cancle", function() { - parent.layer.close(index); - }); - }); - -}); \ No newline at end of file diff --git a/erp-produce/src/main/resources/template/js/erpFarm/erpFarmList.js b/erp-produce/src/main/resources/template/js/erpFarm/erpFarmList.js deleted file mode 100644 index 77f009661..000000000 --- a/erp-produce/src/main/resources/template/js/erpFarm/erpFarmList.js +++ /dev/null @@ -1,173 +0,0 @@ - -var rowId = ""; - -layui.config({ - base: basePath, - version: skyeyeVersion -}).extend({ - window: 'js/winui.window' -}).define(['window', 'table', 'jquery', 'winui', 'form', 'soulTable'], function (exports) { - winui.renderColor(); - var $ = layui.$, - form = layui.form, - soulTable = layui.soulTable, - table = layui.table; - - authBtn('1598779841062');// 新增 - - table.render({ - id: 'messageTable', - elem: '#messageTable', - method: 'post', - url: flowableBasePath + 'erpfarm001', - where: getTableParams(), - even: true, - page: true, - overflow: { - type: 'tips', - hoverTime: 300, // 悬停时间，单位ms, 悬停 hoverTime 后才会显示，默认为 0 - minWidth: 150, // 最小宽度 - maxWidth: 500 // 最大宽度 - }, - limits: getLimits(), - limit: getLimit(), - cols: [[ - { title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' }, - { field: 'farmNumber', title: '车间编号', align: 'left', width: 100, templet: function (d) { - return '' + d.farmNumber + ''; - }}, - { field: 'farmName', title: '车间名称', align: 'left', width: 250}, - { field: 'state', title: '状态', align: 'left', width: 80, templet: function (d) { - if(d.state == '1'){ - return "正常"; - } else if (d.state == '2'){ - return "维修整改"; - } else { - return "参数错误"; - } - }}, - { field: 'createName', title: systemLanguage["com.skyeye.createName"][languageType], align: 'left', width: 120 }, - { field: 'createTime', title: systemLanguage["com.skyeye.createTime"][languageType], align: 'center', width: 100 }, - { field: 'lastUpdateName', title: systemLanguage["com.skyeye.lastUpdateName"][languageType], align: 'left', width: 120 }, - { field: 'lastUpdateTime', title: '最后修改时间', align: 'center', width: 100}, - { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 257, toolbar: '#tableBar'} - ]], - done: function(json) { - matchingLanguage(); - soulTable.render(this); - } - }); - - table.on('tool(messageTable)', function (obj) { - var data = obj.data; - var layEvent = obj.event; - if (layEvent === 'delete') { // 删除 - deletemember(data); - } else if (layEvent === 'details') { // 详情 - details(data); - } else if (layEvent === 'edit') { // 编辑 - edit(data); - } else if (layEvent === 'norms') { // 正常 - norms(data); - } else if (layEvent === 'rectification') { // 维修整改 - rectification(data); - } - }); - - // 搜索表单 - form.render(); - form.on('submit(formSearch)', function (data) { - if (winui.verifyForm(data.elem)) { - table.reloadData("messageTable", {page: {curr: 1}, where: getTableParams()}) - } - return false; - }); - - // 编辑 - function edit(data) { - rowId = data.id; - _openNewWindows({ - url: "../../tpl/erpFarm/erpFarmEdit.html", - title: systemLanguage["com.skyeye.editPageTitle"][languageType], - pageId: "erpFarmEdit", - area: ['90vw', '90vh'], - callBack: function (refreshCode) { - winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000}); - loadTable(); - }}); - } - - // 删除 - function deletemember(data) { - layer.confirm(systemLanguage["com.skyeye.deleteOperationMsg"][languageType], {icon: 3, title: systemLanguage["com.skyeye.deleteOperation"][languageType]}, function (index) { - AjaxPostUtil.request({url: flowableBasePath + "erpfarm005", 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/erpFarm/erpFarmDetail.html", - title: systemLanguage["com.skyeye.detailsPageTitle"][languageType], - pageId: "erpFarmDetail", - area: ['90vw', '90vh'], - callBack: function (refreshCode) { - }}); - } - - // 恢复正常 - function norms(data) { - layer.confirm('确认要恢复正常吗？', { icon: 3, title: '恢复操作' }, function (index) { - AjaxPostUtil.request({url: flowableBasePath + "erpfarm008", params: {rowId: data.id}, type: 'json', callback: function (json) { - winui.window.msg("提交成功。", {icon: 1, time: 2000}); - loadTable(); - }}); - }); - } - - // 维修整改 - function rectification(data) { - layer.confirm('确认要维修整改吗？', { icon: 3, title: '维修整改操作' }, function (index) { - AjaxPostUtil.request({url: flowableBasePath + "erpfarm009", params: {rowId: data.id}, type: 'json', callback: function (json) { - winui.window.msg("提交成功。", {icon: 1, time: 2000}); - loadTable(); - }}); - }); - } - - //添加 - $("body").on("click", "#addBean", function() { - _openNewWindows({ - url: "../../tpl/erpFarm/erpFarmAdd.html", - title: systemLanguage["com.skyeye.addPageTitle"][languageType], - pageId: "erpFarmAdd", - area: ['90vw', '90vh'], - callBack: function (refreshCode) { - winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000}); - loadTable(); - }}); - }); - - $("body").on("click", "#reloadTable", function() { - loadTable(); - }); - - //刷新 - function loadTable() { - table.reloadData("messageTable", {where: getTableParams()}); - } - - function getTableParams(){ - return { - farmNumber: $("#farmNumber").val(), - farmName: $("#farmName").val(), - state: $("#state").val() - }; - } - - exports('erpFarmList', {}); -}); diff --git a/erp-produce/src/main/resources/template/tpl/erpFarm/erpFarmAdd.html b/erp-produce/src/main/resources/template/tpl/erpFarm/erpFarmAdd.html deleted file mode 100644 index d8e389f59..000000000 --- a/erp-produce/src/main/resources/template/tpl/erpFarm/erpFarmAdd.html +++ /dev/null @@ -1,86 +0,0 @@ - - - - - - - - - -
-
-
- 车间信息
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
该列表为当前用户所在企业的部门列表
-
-
-
- -
- - -
-
-
- -
- -
-
-
- 加工工序
-
-
- -
- - - - - - - - - - - - -
工序编号工序名称加工单价加工部门
-
-
- -
-
- - -
-
-
-
- - - - - - \ No newline at end of file diff --git a/erp-produce/src/main/resources/template/tpl/erpFarm/erpFarmChoose.html b/erp-produce/src/main/resources/template/tpl/erpFarm/erpFarmChoose.html index 7496b767a..21cad1ee3 100644 --- a/erp-produce/src/main/resources/template/tpl/erpFarm/erpFarmChoose.html +++ b/erp-produce/src/main/resources/template/tpl/erpFarm/erpFarmChoose.html @@ -5,50 +5,20 @@ - - -
-
- +
+ +
+
+
+ +
-
-
-
- -
- -
- -
- -
- -
- -
- - -
-
-
-
-
- - -
-
-
-
-
-
-
+
+
+
- - - - - - \ No newline at end of file diff --git a/erp-produce/src/main/resources/template/tpl/erpFarm/erpFarmEdit.html b/erp-produce/src/main/resources/template/tpl/erpFarm/erpFarmEdit.html deleted file mode 100644 index 5ca06fe5b..000000000 --- a/erp-produce/src/main/resources/template/tpl/erpFarm/erpFarmEdit.html +++ /dev/null @@ -1,100 +0,0 @@ - - - - - - - - - -
-
- -
-
- - - - - - - - \ No newline at end of file diff --git a/erp-produce/src/main/resources/template/tpl/erpFarm/erpFarmList.html b/erp-produce/src/main/resources/template/tpl/erpFarm/erpFarmList.html deleted file mode 100644 index 2085820ea..000000000 --- a/erp-produce/src/main/resources/template/tpl/erpFarm/erpFarmList.html +++ /dev/null @@ -1,66 +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 697fdfaae..5f0f89267 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 @@ -163,7 +163,7 @@ var dsFormUtil = { if (showType == 8 && dsFormComponent.numCode == 'userStaffChoose') { var key = attrDefinition.attrKey; // 例如：将key由relationUserId变为relationUserMation - key = key.replace("Id", "") + "Mation"; + key = dsFormUtil.getKeyIdToMation(key); value = data[key]; if (!isNull(value) && !$.isEmptyObject(value)) { // 判断值是否为对象，如果是对象，则组装成数组 @@ -532,7 +532,7 @@ var dsFormUtil = { if (showType == 8) { var key = attrDefinition.attrKey; // 例如：将key由relationUserId变为relationUserMation - key = key.replace("Id", "") + "Mation"; + key = dsFormUtil.getKeyIdToMation(key); value = data[key]; if (!isNull(value) && !$.isEmptyObject(value)) { // 判断值是否为对象，如果是对象，则组装成数组 @@ -546,6 +546,10 @@ var dsFormUtil = { return value; }, + getKeyIdToMation: function (key) { + return key.replace("Id", "") + "Mation"; + }, + /** * 目前用于工作流详情展示 * diff --git a/web/src/main/resources/template/assets/lib/layui/customer/tableUtil/initTableChooseUtil.js b/web/src/main/resources/template/assets/lib/layui/customer/tableUtil/initTableChooseUtil.js index 67b11e4a5..db5e8dc4c 100644 --- a/web/src/main/resources/template/assets/lib/layui/customer/tableUtil/initTableChooseUtil.js +++ b/web/src/main/resources/template/assets/lib/layui/customer/tableUtil/initTableChooseUtil.js @@ -63,7 +63,11 @@ var initTableChooseUtil = { var headerStr = ''; $.each(newOptions.cols, function (i, item) { var colHeaderId = isNull(item.colHeaderId) ? "" : ("id = " + item.colHeaderId); - headerStr += '' + item.title + ''; + var bs = ''; + if (item.verify.indexOf('required') >= 0) { + bs = '*'; + } + headerStr += '' + item.title + bs + ''; }); $("#header" + newOptions.id).html(headerStr); }, @@ -191,7 +195,7 @@ var initTableChooseUtil = { value = $("#" + tdId).val(); } else if (bean.formType == 'detail') { value = $("#" + tdId).html(); - } else if (item.formType == 'chooseInput') { + } else if (bean.formType == 'chooseInput') { value = $("#" + tdId).attr("data-id"); } row[bean.id] = value; @@ -278,13 +282,15 @@ var initTableChooseUtil = { if (formType == 'input') { $("#" + tdId).val(value); } else if (formType == 'chooseInput') { - $("#" + tdId).val(value); - + $("#" + tdId).attr("data-id", value); + var key = dsFormUtil.getKeyIdToMation(bean.id); + value = data[key]; + $("#" + tdId).val(value.name || value.title); } else if (formType == 'select') { if (!isNull(value["html"])) { $("#" + tdId).html(value["html"]); } - $("#" + tdId).val(value["value"]); + $("#" + tdId).val(value); } else if (formType == 'detail') { $("#" + tdId).html(value); } -- GitLab