diff --git a/admin-assistant/src/main/resources/template/js/assetManageUse/assetManageUseList.js b/admin-assistant/src/main/resources/template/js/assetManageUse/assetManageUseList.js index adab5381d8ebe1fe46e0d48025926b3d1cb58467..022366744c8f2c7b44009523445aa34e1f78b5ce 100644 --- a/admin-assistant/src/main/resources/template/js/assetManageUse/assetManageUseList.js +++ b/admin-assistant/src/main/resources/template/js/assetManageUse/assetManageUseList.js @@ -45,7 +45,7 @@ layui.config({ ]], done: function(json) { matchingLanguage(); - initTableSearchUtil.initAdvancedSearch(this, json.searchFilter, form, "请输入单号，标题", function () { + initTableSearchUtil.initAdvancedSearch(this, json.searchFilter, form, "请输入单号", function () { table.reloadData("messageTable", {page: {curr: 1}, where: getTableParams()}); }); } diff --git a/admin-assistant/src/main/resources/template/js/assetReportManage/assetReportList.js b/admin-assistant/src/main/resources/template/js/assetReportManage/assetReportList.js index 5a27948a535a6a1633acb4ffc0e18a4f112677cb..947735b5225d34864a14186d03624bb3d3987170 100644 --- a/admin-assistant/src/main/resources/template/js/assetReportManage/assetReportList.js +++ b/admin-assistant/src/main/resources/template/js/assetReportManage/assetReportList.js @@ -40,7 +40,6 @@ layui.config({ return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("assetReportState", 'id', d.state, 'name'); }}, { field: 'state1', title: '入库状态', rowspan: '2', width: 90, templet: function (d) { - // return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("assetReportState", 'id', d.state, 'name'); if (isNull(d.state)) { return '未入库'; } else { diff --git a/admin-assistant/src/main/resources/template/tpl/assetReportManage/batchCopy.html b/admin-assistant/src/main/resources/template/tpl/assetReportManage/batchCopy.html index 8ed6078f16a6eb794decd6a4e856cc674764cb4f..86ffcee732e0b27d017b68c6b88f7dd04d7d1df5 100644 --- a/admin-assistant/src/main/resources/template/tpl/assetReportManage/batchCopy.html +++ b/admin-assistant/src/main/resources/template/tpl/assetReportManage/batchCopy.html @@ -21,7 +21,7 @@
- diff --git a/erp-produce/src/main/resources/template/js/erpPick/erpPatchPickList.js b/erp-produce/src/main/resources/template/js/erpPick/erpPatchPickList.js index eb71ddb99f4fd4773ff90b53b81934cbe5df0888..0630aefa5bc03a81111380efe1fbcd32f46b7336 100644 --- a/erp-produce/src/main/resources/template/js/erpPick/erpPatchPickList.js +++ b/erp-produce/src/main/resources/template/js/erpPick/erpPatchPickList.js @@ -38,7 +38,7 @@ layui.config({ return '' + getNotUndefinedVal(d.processInstanceId) + ''; }}, { field: 'state', title: '状态', rowspan: '2', width: 90, templet: function (d) { - return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("erpOrderStateEnum", 'id', d.state, 'name'); + return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("flowableStateEnum", 'id', d.state, 'name'); }}, { field: 'otherState', title: '出库状态', rowspan: '2', width: 90, templet: function (d) { return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("outLetState", 'id', d.otherState, 'name'); diff --git a/erp-produce/src/main/resources/template/js/erpPick/erpPatchPickToOut.js b/erp-produce/src/main/resources/template/js/erpPick/erpPatchPickToOut.js index e30ba52ac452d157abb72032d18baf88ef5c7830..81d84e58d833d05c0f5b50a63ccbf097460e5ca8 100644 --- a/erp-produce/src/main/resources/template/js/erpPick/erpPatchPickToOut.js +++ b/erp-produce/src/main/resources/template/js/erpPick/erpPatchPickToOut.js @@ -21,8 +21,6 @@ layui.config({ // 仓库出库的【编辑布局】 dsFormUtil.initEditPageForStatic('content', 'FP2024070100006', data, { savePreParams: function (params) { - // params.holderId=data.holderId - // params.holderKey=data.holderKey }, saveData: function (params) { // 保存数据 diff --git a/erp-produce/src/main/resources/template/js/erpPick/erpPickToOut.js b/erp-produce/src/main/resources/template/js/erpPick/erpPickToOut.js index 14ee5845209217c506c2084414a946463915dbc3..ebf86199c09e54d1210c8f0b1a144a87bec7a1db 100644 --- a/erp-produce/src/main/resources/template/js/erpPick/erpPickToOut.js +++ b/erp-produce/src/main/resources/template/js/erpPick/erpPickToOut.js @@ -17,38 +17,36 @@ layui.config({ // 领料出库单转仓库出库 AjaxPostUtil.request({url: sysMainMation.erpBasePath + "queryRequisitionOutLetsTransById", params: {id: id}, type: 'json', method: 'GET', callback: function (json) { - let data = json.bean; - // 仓库出库的【编辑布局】 - dsFormUtil.initEditPageForStatic('content', 'FP2024070100006', data, { - savePreParams: function (params) { - // params.holderId=data.holderId - // params.holderKey=data.holderKey - }, - saveData: function (params) { - // 保存数据 - AjaxPostUtil.request({url: sysMainMation.erpBasePath + "insertRequisitionOutLetsToTurnDepot", params: params, type: 'json', method: "POST", callback: function(json) { - parent.layer.close(index); - parent.refreshCode = '0'; - }}); - }, - loadComponentCallback: function () { - $("select[attrkey='holderIdType']").prop('disabled', true); - $("select[attrkey='holderIdType']").parent().next().children('i').remove(); - $("div[controlType='depotOutFromType']").remove(); - }, - tableAddRowCallback: function (tableId) { - $("#addRow" + tableId).remove(); - $("div[controlType='simpleTable']").find(".unitPrice").prop('disabled', true); - $("div[controlType='simpleTable']").find(".amountOfMoney").prop('disabled', true); - $("div[controlType='simpleTable']").find(".taxRate").prop('disabled', true); - $("div[controlType='simpleTable']").find(".taxMoney").prop('disabled', true); - $("div[controlType='simpleTable']").find(".taxUnitPrice").prop('disabled', true); - $("div[controlType='simpleTable']").find(".taxLastMoney").prop('disabled', true); - $("div[controlType='simpleTable']").find(".chooseProductBtn").prop('disabled', true); - $("div[controlType='simpleTable']").find(".normsId").prop('disabled', true); - $("div[controlType='simpleTable']").find(".warehouse").prop('disabled', true); - } - }); - }}); + let data = json.bean; + // 仓库出库的【编辑布局】 + dsFormUtil.initEditPageForStatic('content', 'FP2024070100006', data, { + savePreParams: function (params) { + }, + saveData: function (params) { + // 保存数据 + AjaxPostUtil.request({url: sysMainMation.erpBasePath + "insertRequisitionOutLetsToTurnDepot", params: params, type: 'json', method: "POST", callback: function(json) { + parent.layer.close(index); + parent.refreshCode = '0'; + }}); + }, + loadComponentCallback: function () { + $("select[attrkey='holderIdType']").prop('disabled', true); + $("select[attrkey='holderIdType']").parent().next().children('i').remove(); + $("div[controlType='depotOutFromType']").remove(); + }, + tableAddRowCallback: function (tableId) { + $("#addRow" + tableId).remove(); + $("div[controlType='simpleTable']").find(".unitPrice").prop('disabled', true); + $("div[controlType='simpleTable']").find(".amountOfMoney").prop('disabled', true); + $("div[controlType='simpleTable']").find(".taxRate").prop('disabled', true); + $("div[controlType='simpleTable']").find(".taxMoney").prop('disabled', true); + $("div[controlType='simpleTable']").find(".taxUnitPrice").prop('disabled', true); + $("div[controlType='simpleTable']").find(".taxLastMoney").prop('disabled', true); + $("div[controlType='simpleTable']").find(".chooseProductBtn").prop('disabled', true); + $("div[controlType='simpleTable']").find(".normsId").prop('disabled', true); + $("div[controlType='simpleTable']").find(".warehouse").prop('disabled', true); + } + }); + }}); }); \ No newline at end of file diff --git a/erp-produce/src/main/resources/template/js/erpPick/erpRequisitionPickList.js b/erp-produce/src/main/resources/template/js/erpPick/erpRequisitionPickList.js index 9463b995a9bfabe68f20c572a585d23baac2254f..6f1a5cec129e9091d156557e7f3d0d77a51c8f23 100644 --- a/erp-produce/src/main/resources/template/js/erpPick/erpRequisitionPickList.js +++ b/erp-produce/src/main/resources/template/js/erpPick/erpRequisitionPickList.js @@ -37,7 +37,7 @@ layui.config({ return '' + getNotUndefinedVal(d.processInstanceId) + ''; }}, { field: 'state', title: '状态', rowspan: '2', width: 90, templet: function (d) { - return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("erpOrderStateEnum", 'id', d.state, 'name'); + return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("flowableStateEnum", 'id', d.state, 'name'); }}, { field: 'otherState', title: '出库状态', rowspan: '2', width: 90, templet: function (d) { return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("outLetState", 'id', d.otherState, 'name'); diff --git a/erp-produce/src/main/resources/template/js/erpPick/erpReturnPickList.js b/erp-produce/src/main/resources/template/js/erpPick/erpReturnPickList.js index 48aa18abe370a8d157210f6d860fecb046db84ff..5222a03345e705a7a03ecf95f6b1cbb5c6dd9d59 100644 --- a/erp-produce/src/main/resources/template/js/erpPick/erpReturnPickList.js +++ b/erp-produce/src/main/resources/template/js/erpPick/erpReturnPickList.js @@ -26,23 +26,23 @@ layui.config({ cols: [[ { title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers', rowspan: '2' }, { field: 'oddNumber', title: '单号', rowspan: '2', width: 200, align: 'center', templet: function (d) { - var str = '' + d.oddNumber + ''; - if (!isNull(d.fromId)) { - str += '[转]'; - } - return str; - }}, + var str = '' + d.oddNumber + ''; + if (!isNull(d.fromId)) { + str += '[转]'; + } + return str; + }}, { field: 'operTime', title: '单据日期', rowspan: '2', align: 'center', width: 140 }, { colspan: '2', title: '来源单据信息', align: 'center' }, { field: 'processInstanceId', title: '流程ID', rowspan: '2', width: 100, templet: function (d) { - return '' + getNotUndefinedVal(d.processInstanceId) + ''; - }}, + return '' + getNotUndefinedVal(d.processInstanceId) + ''; + }}, { field: 'state', title: '状态', rowspan: '2', width: 90, templet: function (d) { - return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("erpOrderStateEnum", 'id', d.state, 'name'); - }}, + return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("flowableStateEnum", 'id', d.state, 'name'); + }}, { field: 'otherState', title: '入库状态', rowspan: '2', width: 90, templet: function (d) { - return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("putState", 'id', d.otherState, 'name'); - }}, + return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("putState", 'id', d.otherState, 'name'); + }}, { field: 'createName', title: systemLanguage["com.skyeye.createName"][languageType], rowspan: '2', width: 120 }, { field: 'createTime', title: systemLanguage["com.skyeye.createTime"][languageType], rowspan: '2', align: 'center', width: 150 }, { field: 'lastUpdateName', title: systemLanguage["com.skyeye.lastUpdateName"][languageType], rowspan: '2', align: 'left', width: 120 }, @@ -50,11 +50,11 @@ layui.config({ { title: systemLanguage["com.skyeye.operation"][languageType], rowspan: '2', fixed: 'right', align: 'center', width: 200, toolbar: '#tableBar'} ], [ { field: 'fromTypeId', title: '来源类型', width: 150, templet: function (d) { - return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("pickFromType", 'id', d.fromTypeId, 'name'); - }}, + return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("pickFromType", 'id', d.fromTypeId, 'name'); + }}, { field: 'fromId', title: '单据编号', width: 200, templet: function (d) { - return getNotUndefinedVal(d.fromMation?.oddNumber); - }} + return getNotUndefinedVal(d.fromMation?.oddNumber); + }} ]], done: function(json) { matchingLanguage(); @@ -88,7 +88,7 @@ layui.config({ function turnReturnMaterialToPut(data) { _openNewWindows({ url: "../../tpl/erpPick/turnReturnMaterialToPut.html?id=" + data.id, - title: "转", + title: "转退料入库", pageId: "turnReturnMaterialToPut", area: ['90vw', '90vh'], callBack: function (refreshCode) { diff --git a/erp-produce/src/main/resources/template/js/erpPick/materialOutList.js b/erp-produce/src/main/resources/template/js/erpPick/materialOutList.js index 41067aa26a8e0c0805e2206af0002b0c95a68a1e..ac9744799d15eef7f5cd0b1d3dc1f8eb5ea9ffa2 100644 --- a/erp-produce/src/main/resources/template/js/erpPick/materialOutList.js +++ b/erp-produce/src/main/resources/template/js/erpPick/materialOutList.js @@ -39,7 +39,7 @@ layui.config({ return '' + getNotUndefinedVal(d.processInstanceId) + ''; }}, { field: 'state', title: '状态', rowspan: '2', width: 90, templet: function (d) { - return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("erpOrderStateEnum", 'id', d.state, 'name'); + return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("flowableStateEnum", 'id', d.state, 'name'); }}, { field: 'otherState', title: '出库状态', rowspan: '2', width: 90, templet: function (d) { return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("depotOutState", 'id', d.otherState, 'name'); diff --git a/erp-produce/src/main/resources/template/js/erpPick/returnMaterialPutList.js b/erp-produce/src/main/resources/template/js/erpPick/returnMaterialPutList.js index 7db561dd8ad7fbe495ebf0ed62c905cbb339819d..cbe38ce4c2e82d675f9ca89573376e142f2888cf 100644 --- a/erp-produce/src/main/resources/template/js/erpPick/returnMaterialPutList.js +++ b/erp-produce/src/main/resources/template/js/erpPick/returnMaterialPutList.js @@ -39,7 +39,7 @@ layui.config({ return '' + getNotUndefinedVal(d.processInstanceId) + ''; }}, { field: 'state', title: '状态', rowspan: '2', width: 90, templet: function (d) { - return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("erpOrderStateEnum", 'id', d.state, 'name'); + return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("flowableStateEnum", 'id', d.state, 'name'); }}, { field: 'otherState', title: '入库状态', rowspan: '2', width: 90, templet: function (d) { return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("depotPutState", 'id', d.otherState, 'name'); diff --git a/erp-produce/src/main/resources/template/js/erpPick/supplementOutList.js b/erp-produce/src/main/resources/template/js/erpPick/supplementOutList.js index 05069d8287e968b2fa5c146b7b4233697b3f00a4..c2fcd03d017e7e0330c698300f0f3f807864d6ba 100644 --- a/erp-produce/src/main/resources/template/js/erpPick/supplementOutList.js +++ b/erp-produce/src/main/resources/template/js/erpPick/supplementOutList.js @@ -38,7 +38,7 @@ layui.config({ return '' + getNotUndefinedVal(d.processInstanceId) + ''; }}, { field: 'state', title: '状态', rowspan: '2', width: 90, templet: function (d) { - return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("erpOrderStateEnum", 'id', d.state, 'name'); + return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("flowableStateEnum", 'id', d.state, 'name'); }}, { field: 'otherState', title: '出库状态', rowspan: '2', width: 90, templet: function (d) { return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("depotOutState", 'id', d.otherState, 'name'); diff --git a/erp-produce/src/main/resources/template/js/erpPick/turnPatchMaterialToTurnOut.js b/erp-produce/src/main/resources/template/js/erpPick/turnPatchMaterialToTurnOut.js index 47c0aeaee1a9d019843da45428fb09ed4853268d..246bc9322052ff517fa5a8241d6daa50201fae6b 100644 --- a/erp-produce/src/main/resources/template/js/erpPick/turnPatchMaterialToTurnOut.js +++ b/erp-produce/src/main/resources/template/js/erpPick/turnPatchMaterialToTurnOut.js @@ -24,7 +24,6 @@ layui.config({ item.unitPrice=item.normsMation.estimatePurchasePrice item.taxRate=0 }); - console.log(data.erpOrderItemList) // 补料出库的【编辑布局】 dsFormUtil.initEditPageForStatic('content', 'FP2024071200002', data, { savePreParams: function (params) { @@ -32,9 +31,9 @@ layui.config({ saveData: function (params) { // 保存数据 AjaxPostUtil.request({url: sysMainMation.erpBasePath + "insertPatchMaterialToTurnOut", params: params, type: 'json', method: "POST", callback: function(json) { - parent.layer.close(index); - parent.refreshCode = '0'; - }}); + parent.layer.close(index); + parent.refreshCode = '0'; + }}); }, loadComponentCallback: function () { $("select[attrkey='departmentId']").prop('disabled', true); diff --git a/erp-produce/src/main/resources/template/js/processAcceptance/processAcceptanceList.js b/erp-produce/src/main/resources/template/js/processAcceptance/processAcceptanceList.js new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/erp-produce/src/main/resources/template/js/workshopMaterialInventory/workshopMaterialInventoryList.js b/erp-produce/src/main/resources/template/js/workshopMaterialInventory/workshopMaterialInventoryList.js new file mode 100644 index 0000000000000000000000000000000000000000..e3388aa9ef3da67d0edf0d05bd9df3dd942bb366 --- /dev/null +++ b/erp-produce/src/main/resources/template/js/workshopMaterialInventory/workshopMaterialInventoryList.js @@ -0,0 +1,85 @@ + +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; + var selTemplate = getFileContent('tpl/template/select-option.tpl'); + + // 加载当前用户所属车间 + AjaxPostUtil.request({url: sysMainMation.erpBasePath + "queryStaffBelongFarmList", params: {}, type: 'json', method: "GET", callback: function(json) { + $("#workshopId").html(getDataUseHandlebars(selTemplate, json)); + form.render('select'); + initTable(); + }, async: false}); + + var workshopId = ""; + form.on('select(workshopId)', function(data) { + var thisRowValue = data.value; + workshopId = isNull(thisRowValue) ? "" : thisRowValue; + loadTable(); + }); + + function initTable() { + table.render({ + id: 'messageTable', + elem: '#messageTable', + method: 'post', + url: sysMainMation.erpBasePath + 'erpdepartstock001', + where: getTableParams(), + even: true, + page: true, + limits: getLimits(), + limit: getLimit(), + cols: [[ + {title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers'}, + { + field: 'materialMation', title: '产品', align: 'left', width: 120, templet: function (d) { + return isNull(d.materialMation) ? '' : d.materialMation.name + } + }, + { + field: 'normsMation', title: '规格', align: 'left', width: 200, templet: function (d) { + return isNull(d.normsMation) ? '' : d.normsMation.name + } + }, + { + field: 'departmentMation', title: '处理车间', align: 'left', width: 200, templet: function (d) { + return isNull(d.departmentMation) ? '' : d.departmentMation.name + } + }, + {field: 'stock', title: '车间库存', align: 'center', width: 80} + ]], + done: function (json) { + matchingLanguage(); + initTableSearchUtil.initAdvancedSearch(this, json.searchFilter, form, "暂不支持搜索", function () { + table.reloadData("messageTable", {page: {curr: 1}, where: getTableParams()}); + }); + } + }); + } + + form.render(); + $("body").on("click", "#reloadTable", function() { + loadTable(); + }); + + function loadTable() { + table.reloadData("messageTable", {where: getTableParams()}); + } + + function getTableParams() { + var params = { + type: 'farm', + objectId: workshopId + } + return $.extend(true, params, initTableSearchUtil.getSearchValue("messageTable")); + } + + exports('workshopMaterialInventoryList', {}); +}); diff --git a/erp-produce/src/main/resources/template/js/workshopPersonnel/workshopPersonnelAllocation.js b/erp-produce/src/main/resources/template/js/workshopPersonnel/workshopPersonnelAllocation.js new file mode 100644 index 0000000000000000000000000000000000000000..c2134b2338e167eddc081f5929f68af54f8131db --- /dev/null +++ b/erp-produce/src/main/resources/template/js/workshopPersonnel/workshopPersonnelAllocation.js @@ -0,0 +1,133 @@ +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('1720880910884'); + + loadWorkshop(); + + form.render(); + var chooseWorkshopId = ""; + function loadWorkshop() { + table.render({ + id: 'workshopTable', + elem: '#workshopTable', + method: 'get', + url: sysMainMation.erpBasePath + 'queryMyChargeFarmList', + even: false, + page: false, + limits: getLimits(), + limit: getLimit(), + cols: [[ + { title: systemLanguage["com.skyeye.serialNumber"][languageType], fixed: 'left', type: 'numbers' }, + { field: 'name', title: '车间', align: 'left', width: 150, templet: function (d) { + return '' + d.name + ''; + }} + ]], + done: function(json) { + matchingLanguage(); + chooseWorkshopId = ""; + loadStaff(""); + } + }); + table.on('tool(workshopTable)', function (obj) { + var data = obj.data; + var layEvent = obj.event; + if (layEvent == 'select') { + chooseWorkshopId = data.id; + loadStaff(data.id); + } + }); + } + + function loadStaff(workshopId) { + table.render({ + id: 'messageTable', + elem: '#messageTable', + method: 'post', + url: sysMainMation.erpBasePath + 'queryFarmStaffList', + where: {objectId: workshopId}, + even: true, + page: true, + limits: getLimits(), + limit: getLimit(), + cols: [[ + { title: systemLanguage["com.skyeye.serialNumber"][languageType], fixed: 'left', type: 'numbers' }, + { field: 'jobNumber', title: '工号', align: 'left', width: 140, templet: function (d) { + return getNotUndefinedVal(d.staffMation?.jobNumber); + }}, + { field: 'userName', title: '姓名', width: 120, templet: function (d) { + return getNotUndefinedVal(d.staffMation?.userName); + }}, + { field: 'companyName', title: '企业', width: 150, templet: function (d) { + return getNotUndefinedVal(d.staffMation?.companyName); + }}, + { field: 'departmentName', title: '部门', width: 140, templet: function (d) { + return getNotUndefinedVal(d.staffMation?.departmentName); + }}, + { field: 'jobName', title: '职位', width: 140, templet: function (d) { + return getNotUndefinedVal(d.staffMation?.jobName); + }}, + { 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 === 'delete') { // 删除 + delet(data); + } + }); + } + + // 删除 + function delet(data) { + layer.confirm(systemLanguage["com.skyeye.deleteOperationMsg"][languageType], {icon: 3, title: systemLanguage["com.skyeye.deleteOperation"][languageType]}, function (index) { + layer.close(index); + AjaxPostUtil.request({url: sysMainMation.erpBasePath + "deleteFarmStaffById", params: {id: data.id}, type: 'json', method: "DELETE", callback: function (json) { + winui.window.msg(systemLanguage["com.skyeye.deleteOperationSuccessMsg"][languageType], {icon: 1, time: 2000}); + table.reloadData("messageTable", {page: {curr: 1}, where: {objectId: chooseWorkshopId}}) + }}); + }); + } + + // 添加 + $("body").on("click", "#addBean", function() { + if (isNull(chooseWorkshopId)) { + winui.window.msg('请先选择车间信息.', {icon: 2, time: 2000}); + return false; + } + systemCommonUtil.userStaffCheckType = true; // // 人员选择类型，1.多选；其他。单选 + systemCommonUtil.checkStaffMation = []; // 选择时返回的对象 + systemCommonUtil.openSysAllUserStaffChoosePage(function (checkStaffMation) { + var list = new Array(); + console.log(checkStaffMation) + $.each(checkStaffMation, function (i, item) { + list.push(item.id); + }); + console.log(list) + var params = { + farmId: chooseWorkshopId, + staffId: JSON.stringify(list) + }; + AjaxPostUtil.request({url: sysMainMation.erpBasePath + "insertFarmStaff", params: params, type: 'json', method: "POST", callback: function (json) { + loadStaff(chooseWorkshopId); + }}); + }); + + }); + + exports('workshopPersonnelAllocation', {}); +}); diff --git a/erp-produce/src/main/resources/template/js/workshopTasks/workshopTasksList.js b/erp-produce/src/main/resources/template/js/workshopTasks/workshopTasksList.js new file mode 100644 index 0000000000000000000000000000000000000000..ad492c042f551adf205dcb634cfda1810996d584 --- /dev/null +++ b/erp-produce/src/main/resources/template/js/workshopTasks/workshopTasksList.js @@ -0,0 +1,182 @@ + +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; + var selTemplate = getFileContent('tpl/template/select-option.tpl'); + + // 加载当前用户所属车间 + AjaxPostUtil.request({url: sysMainMation.erpBasePath + "queryStaffBelongFarmList", params: {}, type: 'json', method: "GET", callback: function(json) { + $("#workshopId").html(getDataUseHandlebars(selTemplate, json)); + form.render('select'); + initTable(); + }, async: false}); + + var workshopId = ""; + form.on('select(workshopId)', function(data) { + var thisRowValue = data.value; + workshopId = isNull(thisRowValue) ? "" : thisRowValue; + loadTable(); + }); + + //车间任务 + function initTable() { + table.render({ + id: 'messageTable', + elem: '#messageTable', + method: 'post', + url: sysMainMation.erpBasePath + 'queryMachinProcedureFarmList', + where: getTableParams(), + even: true, + page: true, + limits: getLimits(), + limit: getLimit(), + cols: [[ + {title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers', rowspan: '2'}, + { + field: 'oddNumber', title: '单号', rowspan: '2', width: 200, align: 'center', templet: function (d) { + var str = '' + d.oddNumber + ''; + if (!isNull(d.fromId)) { + str += '[转]'; + } + return str; + } + }, + {field: 'operTime', title: '单据日期', rowspan: '2', align: 'center', width: 140}, + {colspan: '2', title: '来源单据信息', align: 'center'}, + { + field: 'processInstanceId', title: '流程ID', rowspan: '2', width: 100, templet: function (d) { + return '' + getNotUndefinedVal(d.processInstanceId) + ''; + } + }, + { + field: 'state', title: '状态', rowspan: '2', width: 90, templet: function (d) { + return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("erpOrderStateEnum", 'id', d.state, 'name'); + } + }, + { + field: 'otherState', title: '出库状态', rowspan: '2', width: 90, templet: function (d) { + return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("outLetState", 'id', d.otherState, 'name'); + } + }, + { + field: 'createName', + title: systemLanguage["com.skyeye.createName"][languageType], + rowspan: '2', + width: 120 + }, + { + field: 'createTime', + title: systemLanguage["com.skyeye.createTime"][languageType], + rowspan: '2', + align: 'center', + width: 150 + }, + { + field: 'lastUpdateName', + title: systemLanguage["com.skyeye.lastUpdateName"][languageType], + rowspan: '2', + align: 'left', + width: 120 + }, + { + field: 'lastUpdateTime', + title: systemLanguage["com.skyeye.lastUpdateTime"][languageType], + rowspan: '2', + align: 'center', + width: 150 + }, + { + title: systemLanguage["com.skyeye.operation"][languageType], + rowspan: '2', + fixed: 'right', + align: 'center', + width: 200, + toolbar: '#tableBar' + } + ], [ + { + field: 'fromTypeId', title: '来源类型', width: 150, templet: function (d) { + return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("pickFromType", 'id', d.fromTypeId, 'name'); + } + }, + { + field: 'fromId', title: '单据编号', width: 200, templet: function (d) { + return getNotUndefinedVal(d.fromMation?.oddNumber); + } + } + ]], + 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 === 'receive') { //接收 + receive(data); + } else if (layEvent === 'antiReception') { //反接收 + antiReception(data); + } + }); + + // 接收 + function receive(data) { + layer.confirm('确认要接收该车间任务吗？', { icon: 3, title: '接收任务操作' }, function (index) { + activitiUtil.startProcess(data.serviceClassName, null, function (approvalId) { + var params = { + id: data.id, + }; + AjaxPostUtil.request({url: sysMainMation.erpBasePath + "receiveMachinProcedureFarm", params: params, type: 'json', method: 'POST', callback: function (json) { + winui.window.msg("接收成功", {icon: 1, time: 2000}); + loadTable(); + }}); + }); + }); + } + + function antiReception(data) { + layer.confirm('确认要反接收该车间任务吗？', { icon: 3, title: '反接收任务操作' }, function (index) { + activitiUtil.startProcess(data.serviceClassName, null, function (approvalId) { + var params = { + id: data.id, + }; + AjaxPostUtil.request({url: sysMainMation.erpBasePath + "receptionReceiveMachinProcedureFarm", params: params, type: 'json', method: 'POST', callback: function (json) { + winui.window.msg("反接收成功", {icon: 1, time: 2000}); + loadTable(); + }}); + }); + }); + } + + + form.render(); + $("body").on("click", "#reloadTable", function() { + loadTable(); + }); + + function loadTable() { + table.reloadData("messageTable", {where: getTableParams()}); + } + + function getTableParams(){ + var params = { + type: 'farm', + objectId: workshopId + } + return $.extend(true, params, initTableSearchUtil.getSearchValue("messageTable")); + } + + exports('workshopTasksList', {}); +}); diff --git a/erp-produce/src/main/resources/template/tpl/erpPick/erpPatchPickToOut.html b/erp-produce/src/main/resources/template/tpl/erpPick/erpPatchPickToOut.html index 8ee33db4adcca9ae9c85445d945a4f06f4bee893..7effa2c2a6a0e1912d2b20afa02df4e5dae43160 100644 --- a/erp-produce/src/main/resources/template/tpl/erpPick/erpPatchPickToOut.html +++ b/erp-produce/src/main/resources/template/tpl/erpPick/erpPatchPickToOut.html @@ -1,29 +1,31 @@ - - - - + + + +
-
-
-
-
- - ` - -
-
-
+
+
+
+
+ + + +
+
+
\ No newline at end of file diff --git a/erp-produce/src/main/resources/template/tpl/erpPick/erpPickToOut.html b/erp-produce/src/main/resources/template/tpl/erpPick/erpPickToOut.html index c98e0d27d270f1db8c3ed26ab276b6f4bf8ab295..4b8bfeed6fbddc6badc5e8b6cbbefe9382ceb598 100644 --- a/erp-produce/src/main/resources/template/tpl/erpPick/erpPickToOut.html +++ b/erp-produce/src/main/resources/template/tpl/erpPick/erpPickToOut.html @@ -1,29 +1,31 @@ - - - - + + + +
-
-
-
-
- - ` - -
-
-
+
+
+
+
+ + + +
+
+
\ No newline at end of file diff --git a/erp-produce/src/main/resources/template/tpl/processAcceptance/processAcceptanceList.html b/erp-produce/src/main/resources/template/tpl/processAcceptance/processAcceptanceList.html new file mode 100644 index 0000000000000000000000000000000000000000..566549bdf8fae810809c1a81066000687cb338f6 --- /dev/null +++ b/erp-produce/src/main/resources/template/tpl/processAcceptance/processAcceptanceList.html @@ -0,0 +1,10 @@ + + + + + Title + + + + + \ No newline at end of file diff --git a/erp-produce/src/main/resources/template/tpl/workshopMaterialInventory/workshopMaterialInventoryList.html b/erp-produce/src/main/resources/template/tpl/workshopMaterialInventory/workshopMaterialInventoryList.html new file mode 100644 index 0000000000000000000000000000000000000000..1db76ce2aaabbd7dbe8d41b9c00a5c19da94afb8 --- /dev/null +++ b/erp-produce/src/main/resources/template/tpl/workshopMaterialInventory/workshopMaterialInventoryList.html @@ -0,0 +1,32 @@ + + + + + + + + + +
+
+
+ +
+ +
+
+
+
+ +
+ + + + + + \ No newline at end of file diff --git a/erp-produce/src/main/resources/template/tpl/workshopPersonnel/workshopPersonnelAllocation.html b/erp-produce/src/main/resources/template/tpl/workshopPersonnel/workshopPersonnelAllocation.html new file mode 100644 index 0000000000000000000000000000000000000000..6a500b325dc20a2f8716ed3ddbdbf571879b1095 --- /dev/null +++ b/erp-produce/src/main/resources/template/tpl/workshopPersonnel/workshopPersonnelAllocation.html @@ -0,0 +1,53 @@ + + + + + + + + + +
+
+
+
+
+
车间
+
+
+
+
+
+ +
+
+
员工
+
+
+
+ +
+
+
+
+ + +
+
+
+
+
+
+
+ + + + + + \ No newline at end of file diff --git a/erp-produce/src/main/resources/template/tpl/workshopTasks/workshopTasksList.html b/erp-produce/src/main/resources/template/tpl/workshopTasks/workshopTasksList.html new file mode 100644 index 0000000000000000000000000000000000000000..f6261f1667123860c5ed0380487a232b7b3b70b9 --- /dev/null +++ b/erp-produce/src/main/resources/template/tpl/workshopTasks/workshopTasksList.html @@ -0,0 +1,39 @@ + + + + + + + + + +
+
+
+ +
+ +
+
+
+
+ +
+ + + + + + \ No newline at end of file diff --git a/erp/src/main/resources/template/js/materialCode/batchCopy.js b/erp/src/main/resources/template/js/materialCode/batchCopy.js index 96bf39a2dd9f46c08da674cc2294df2116aa9c25..dcab79b1974e5f982c47b61be18f231fc571eedc 100644 --- a/erp/src/main/resources/template/js/materialCode/batchCopy.js +++ b/erp/src/main/resources/template/js/materialCode/batchCopy.js @@ -64,7 +64,7 @@ layui.config({ } AjaxPostUtil.request({url: sysMainMation.erpBasePath + "queryNormsBarCodeList", params: params, type: 'json', method: 'POST', callback: function (json) { $("#barCode").val(json.rows.join('\n')); - $("#tips").html("共计获取个" + json.total + "条形码"); + $("#tips").html("共计获取" + json.total + "个条形码"); }}); } return false; diff --git a/erp/src/main/resources/template/js/purchaseDeliveryNote/purchaseDeliveryNoteList.js b/erp/src/main/resources/template/js/purchaseDeliveryNote/purchaseDeliveryNoteList.js index f00d66b95a0995a821d64e85c2c6570dcbe72feb..14fafe933343407eba6bd03ff21151a378ad3000 100644 --- a/erp/src/main/resources/template/js/purchaseDeliveryNote/purchaseDeliveryNoteList.js +++ b/erp/src/main/resources/template/js/purchaseDeliveryNote/purchaseDeliveryNoteList.js @@ -41,7 +41,7 @@ layui.config({ return '' + getNotUndefinedVal(d.processInstanceId) + ''; }}, { field: 'state', title: '状态', rowspan: '2', width: 90, templet: function (d) { - return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("erpOrderStateEnum", 'id', d.state, 'name'); + return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("flowableStateEnum", 'id', d.state, 'name'); }}, { field: 'qualityInspection', title: '质检状态', rowspan: '2', width: 90, templet: function (d) { return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("orderQualityInspectionType", 'id', d.qualityInspection , 'name'); diff --git a/erp/src/main/resources/template/js/purchaseQualityInspection/purchaseQualityInspectionList.js b/erp/src/main/resources/template/js/purchaseQualityInspection/purchaseQualityInspectionList.js index 45f6e7b4ba8a06de7e8ed74f64a3000618dc52b8..71ee1e4d639e3b122ff8e40831278a8017f6481e 100644 --- a/erp/src/main/resources/template/js/purchaseQualityInspection/purchaseQualityInspectionList.js +++ b/erp/src/main/resources/template/js/purchaseQualityInspection/purchaseQualityInspectionList.js @@ -37,7 +37,7 @@ layui.config({ return '' + getNotUndefinedVal(d.processInstanceId) + ''; }}, { field: 'state', title: '状态', rowspan: '2', width: 90, templet: function (d) { - return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("erpOrderStateEnum", 'id', d.state, 'name'); + return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("flowableStateEnum", 'id', d.state, 'name'); }}, { field: 'returnState', title: '退货状态', rowspan: '2', width: 90, templet: function (d) { return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("qualityInspectionReturnState", 'id', d.returnState, 'name'); diff --git a/erp/src/main/resources/template/js/salesOutlet/salesOutletList.js b/erp/src/main/resources/template/js/salesOutlet/salesOutletList.js index a4d673d4a941f8c153218f9420e0c511eda62c54..69bcdf917085477b7f28af24f6788a53c4f34862 100644 --- a/erp/src/main/resources/template/js/salesOutlet/salesOutletList.js +++ b/erp/src/main/resources/template/js/salesOutlet/salesOutletList.js @@ -41,7 +41,7 @@ layui.config({ return '' + getNotUndefinedVal(d.processInstanceId) + ''; }}, { field: 'state', title: '状态', rowspan: '2', width: 90, templet: function (d) { - return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("erpOrderStateEnum", 'id', d.state, 'name'); + return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("flowableStateEnum", 'id', d.state, 'name'); }}, { field: 'createName', title: systemLanguage["com.skyeye.createName"][languageType], rowspan: '2', width: 120 }, { field: 'createTime', title: systemLanguage["com.skyeye.createTime"][languageType], rowspan: '2', align: 'center', width: 150 }, diff --git a/erp/src/main/resources/template/js/salesReturns/salesReturnsList.js b/erp/src/main/resources/template/js/salesReturns/salesReturnsList.js index 5589746d8d1ca02bfa1f800f1a560dc36a300818..ab04aaefba825572a17767d7d1ebffe90e9bf98e 100644 --- a/erp/src/main/resources/template/js/salesReturns/salesReturnsList.js +++ b/erp/src/main/resources/template/js/salesReturns/salesReturnsList.js @@ -41,7 +41,7 @@ layui.config({ return '' + getNotUndefinedVal(d.processInstanceId) + ''; }}, { field: 'state', title: '状态', rowspan: '2', width: 90, templet: function (d) { - return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("erpOrderStateEnum", 'id', d.state, 'name'); + return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("flowableStateEnum", 'id', d.state, 'name'); }}, { field: 'createName', title: systemLanguage["com.skyeye.createName"][languageType], rowspan: '2', width: 120 }, { field: 'createTime', title: systemLanguage["com.skyeye.createTime"][languageType], rowspan: '2', align: 'center', width: 150 }, diff --git a/erp/src/main/resources/template/js/turnIocatorManage/addWarehouseLevelValue.js b/erp/src/main/resources/template/js/turnIocatorManage/addWarehouseLevelValue.js index 22f863412f087aee9af902ad1365183337f04e43..48fd3bc1568c4ab6929038e2478dd6b052aeb0ea 100644 --- a/erp/src/main/resources/template/js/turnIocatorManage/addWarehouseLevelValue.js +++ b/erp/src/main/resources/template/js/turnIocatorManage/addWarehouseLevelValue.js @@ -17,33 +17,33 @@ layui.config({ // 根据仓库id获取仓库级别信息 AjaxPostUtil.request({url: sysMainMation.erpBasePath + "queryDepotLevelValById", params: {id: id}, type: 'json', method: 'GET', callback: function (json) { - let data = json.bean; - // 仓库级别的值的【编辑布局】 - dsFormUtil.initEditPageForStatic('content', 'FP2024071200008', data, { + let data = json.bean; + // 仓库级别的值的【编辑布局】 + dsFormUtil.initEditPageForStatic('content', 'FP2024071200008', data, { - savePreParams: function (params) { - params.parentId=data.parentId - params.depotId=data.depotId - }, + savePreParams: function (params) { + params.parentId=data.parentId + params.depotId=data.depotId + }, - saveData: function (params) { - // 保存数据 - AjaxPostUtil.request({url: sysMainMation.erpBasePath + "writeDepotLevelVal", params: params, type: 'json', method: "POST", callback: function(json) { - parent.layer.close(index); - parent.refreshCode = '0'; - }}); - }, - // loadComponentCallback: function () { - // // $("div[controlType='assetPurchasePutFromType']").remove(); - // }, - tableAddRowCallback: function (tableId) { - $("#addRow" + tableId).remove(); - // $("div[controlType='simpleTable']").find(".assetId").prop('disabled', true); - // $("div[controlType='simpleTable']").find(".fromId").prop('disabled', true); - // $("div[controlType='simpleTable']").find(".unitPrice").prop('disabled', true); - // $("div[controlType='simpleTable']").find(".chooseAssetBtn").prop('disabled', true); - } - }); - }}); + saveData: function (params) { + // 保存数据 + AjaxPostUtil.request({url: sysMainMation.erpBasePath + "writeDepotLevelVal", params: params, type: 'json', method: "POST", callback: function(json) { + parent.layer.close(index); + parent.refreshCode = '0'; + }}); + }, + // loadComponentCallback: function () { + // // $("div[controlType='assetPurchasePutFromType']").remove(); + // }, + tableAddRowCallback: function (tableId) { + $("#addRow" + tableId).remove(); + // $("div[controlType='simpleTable']").find(".assetId").prop('disabled', true); + // $("div[controlType='simpleTable']").find(".fromId").prop('disabled', true); + // $("div[controlType='simpleTable']").find(".unitPrice").prop('disabled', true); + // $("div[controlType='simpleTable']").find(".chooseAssetBtn").prop('disabled', true); + } + }); + }}); }); \ No newline at end of file diff --git a/erp/src/main/resources/template/js/turnIocatorManage/turnIocatorManage.js b/erp/src/main/resources/template/js/turnIocatorManage/turnIocatorManage.js index e3115f843c80761a8af3d522f2c057b90828f2c4..e3f0b254916c4cbbadda8e46106c0f7a76909079 100644 --- a/erp/src/main/resources/template/js/turnIocatorManage/turnIocatorManage.js +++ b/erp/src/main/resources/template/js/turnIocatorManage/turnIocatorManage.js @@ -10,7 +10,6 @@ layui.config({ fsTree = layui.fsTree, form = layui.form, table = layui.table; - // tableTree = layui.tableTreeDj; var ztree; var id = GetUrlParam("id"); var objectKey = GetUrlParam("objectKey") @@ -20,11 +19,11 @@ layui.config({ var dropdown = new Dropdown(); dropdown.render(); - //获取所有仓库queryAllStoreHouseList queryDepotLevelValList + //获取所有仓库 /********* tree 处理 start *************/ fsTree.render({ id: "treeDemo", - url: sysMainMation.erpBasePath + "queryDepotLevelById?id=" + id, + url: sysMainMation.erpBasePath + "queryDepotLevelByDepotId?depotId=" + id, checkEnable: false, showLine: false, showIcon: true, @@ -50,16 +49,6 @@ layui.config({ loadTable(); } - - // - // function loadTable(id) { - // AjaxPostUtil.request({url: admBasePath + "queryDepotLevelById", params: {id: id}, type: 'json', method: "GET", callback: function (json) { - // initLoadTable(); - // }}); - // }; - - - function initLoadTable() { table.render({ id: 'messageTable', @@ -103,14 +92,28 @@ layui.config({ // 添加 $("body").on("click", "#addBean", function() { _openNewWindows({ - url: systemCommonUtil.getUrl('FP2024071200007', null), - title: systemLanguage["com.skyeye.addPageTitle"][languageType], + url: "../../tpl/turnIocatorManage/addWarehouseLevelValue.html?id=" + id, + title: "新增仓库级别的值", pageId: "warehouseLevelValueAdd", area: ['90vw', '90vh'], callBack: function (refreshCode) { winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000}); loadTable(); }}); + + + + // _openNewWindows({ + // url: "../../tpl/turnIocatorManage/writeWarehouseLevel.html?id=" + id, + // title: "新增仓库级别", + // pageId: "addWarehouseLevel", + // area: ['90vw', '90vh'], + // callBack: function (refreshCode) { + // winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000}); + // // 刷新节点 + // var nownode = ztree.getNodesByParam("id", "0", null); + // ztree.reAsyncChildNodes(nownode[0], "refresh"); + // }}); }); // 编辑 @@ -160,18 +163,15 @@ layui.config({ name: treeNode.name }; $("#treeRight").html(getDataUseHandlebars($("#treeRightTemplate").html(), {bean: par})); - showRMenu('root', event.clientX, event.clientY); - // showRMenu(event.clientX, event.clientY); + showRMenu(folderId == 0 ? 'root' : '', event.clientX, event.clientY); } // 展示树节点右键菜单 function showRMenu(type, x, y) { $("#treeRight .is-file").show(); - if(type == 'root'){ - $("#treeRight .add").hide(); - $("#treeRight .edit").hide(); - $("#treeRight .remove").hide(); + if (type == 'root') { + $("#treeRight .treedeleteFolderAndChild").hide(); } $("#treeRight").show(); $("#treeRight").css({top: y + "px", left: x + "px", visibility: "visible", position: "absolute"}); @@ -222,15 +222,18 @@ layui.config({ // 树操作--新建 $("body").on("click", ".treecreateNewFolder", function (e) { hideRMenu(); + var parentId = $(this).attr("folderId"); // 打开一个新建布局 _openNewWindows({ - url: "../../tpl/turnIocatorManage/addWarehouseLevel.html?id=" + id, + url: "../../tpl/turnIocatorManage/writeWarehouseLevel.html?depotId=" + id + "&parentId=" + parentId, title: "新增仓库级别", - pageId: "addWarehouseLevel", + pageId: "writeWarehouseLevel", area: ['90vw', '90vh'], callBack: function (refreshCode) { winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000}); - loadTable(); + // 刷新节点 + var nownode = ztree.getNodesByParam("id", "0", null); + ztree.reAsyncChildNodes(nownode[0], "refresh"); }}); }); diff --git a/erp/src/main/resources/template/js/turnIocatorManage/addWarehouseLevel.js b/erp/src/main/resources/template/js/turnIocatorManage/writeWarehouseLevel.js similarity index 64% rename from erp/src/main/resources/template/js/turnIocatorManage/addWarehouseLevel.js rename to erp/src/main/resources/template/js/turnIocatorManage/writeWarehouseLevel.js index ebebf01709b45b23dbd8f76cdf164d433bc63eaf..f68d1ad239bc795529111d55fe517426373d9ad7 100644 --- a/erp/src/main/resources/template/js/turnIocatorManage/addWarehouseLevel.js +++ b/erp/src/main/resources/template/js/turnIocatorManage/writeWarehouseLevel.js @@ -14,16 +14,26 @@ layui.config({ var index = parent.layer.getFrameIndex(window.name); var $ = layui.$; var id = GetUrlParam("id"); + var parentId = GetUrlParam("parentId"); + var depotId = GetUrlParam("depotId"); - // 根据仓库id获取仓库级别信息 - AjaxPostUtil.request({url: sysMainMation.erpBasePath + "queryDepotLevelByDepotId", params: {depotId: id}, type: 'json', method: 'GET', callback: function (json) { + if (isNull(id)) { + dsFormUtil.initAddPageForStatic('content', 'FP2024071100005', { + savePreParams: function (params) { + params.parentId = isNull(parentId) ? '0' : parentId; + params.depotId = depotId; + } + }); + } else { + // 根据仓库id获取仓库级别信息 + AjaxPostUtil.request({url: sysMainMation.erpBasePath + "queryDepotLevelByDepotId", params: {id: id}, type: 'json', method: 'GET', callback: function (json) { let data = json.bean; - // 仓库级别的值的【编辑布局】 + // 仓库级别的【编辑布局】 dsFormUtil.initEditPageForStatic('content', 'FP2024071100006', data, { savePreParams: function (params) { - params.parentId = data.parentId - params.depotId = id + params.parentId = isNull(parentId) ? '0' : parentId; + params.depotId = depotId; }, saveData: function (params) { @@ -41,5 +51,6 @@ layui.config({ } }); }}); + } }); \ No newline at end of file diff --git a/erp/src/main/resources/template/tpl/salesOrder/salesOrderList.html b/erp/src/main/resources/template/tpl/salesOrder/salesOrderList.html index 49e24454221c384eff7dc06cd0c1506e2e9f04ab..ca29f3fb11b60bd01e913a2773e2e59b9f174a67 100644 --- a/erp/src/main/resources/template/tpl/salesOrder/salesOrderList.html +++ b/erp/src/main/resources/template/tpl/salesOrder/salesOrderList.html @@ -32,7 +32,7 @@ 撤销 {{# } }} {{# } }} - {{# if(d.state == 'pass') { }} + {{# if(d.state == 'pass' ) { }} {{# if(auth('1571813426889')){ }} 转销售出库 {{# } }} diff --git a/erp/src/main/resources/template/tpl/turnIocatorManage/turnIocatorManage.html b/erp/src/main/resources/template/tpl/turnIocatorManage/turnIocatorManage.html index f0102b6ab719757c74949db00e09ffc6625c91c7..c76af3a2e11ed5228dae4165ddadd12c5a2b4c18 100644 --- a/erp/src/main/resources/template/tpl/turnIocatorManage/turnIocatorManage.html +++ b/erp/src/main/resources/template/tpl/turnIocatorManage/turnIocatorManage.html @@ -21,7 +21,7 @@
    + treeIdKey="id" inputs="parentId" treePIdKey="parentId" clickCallbackInputs="parentId:$id" treeName="name">
    @@ -40,14 +40,14 @@ \ No newline at end of file diff --git a/web/src/main/resources/bootstrap.yml b/web/src/main/resources/bootstrap.yml index 62069aab240e463aad42295cba3af6c7462d1334..f789a75005b07acfc9b745d57e36447398fb25f2 100644 --- a/web/src/main/resources/bootstrap.yml +++ b/web/src/main/resources/bootstrap.yml @@ -12,6 +12,7 @@ spring: discovery: server-addr: 172.18.92.40:9000 # 配置服务注册nacos地址 namespace: ${spring.profiles.active} # 配置命名空间 + service: ${spring.application.name} # 配置服务名 config: # 指定nacos server的地址 server-addr: 172.18.92.40:9000 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 18c74a1419727002a42140506d6f1c01e50c7c54..25168dc95236a2a5c32980399e8e5426c62ef7dd 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 @@ -442,6 +442,7 @@ var dsFormUtil = { content = dsFormUtil.getContentLinkedData(content); } content.title = dsFormUtil.getLable(content); + content.maxLength = dsFormUtil.getMaxLength(content); if (isNull(content.attrDefinition)) { content.attrDefinition = {}; } @@ -598,6 +599,16 @@ var dsFormUtil = { return content.title; }, + getMaxLength: function (content) { + var attr = content.attrDefinition; + if (!isNull(attr) && !$.isEmptyObject(attr)) { + if (!isNull(attr.attrDefinitionCustom)) { + return attr.attrDefinitionCustom.maxLength; + } + } + return null; + }, + // 获取属性关联的数据值来源信息 getContentLinkedData: function (content) { if (isNull(content.attrDefinition) || isNull(content.attrDefinition.attrDefinitionCustom)) {