From f5595d2c3b95ec0f693cbf35b730ed234552fb7f Mon Sep 17 00:00:00 2001 From: "WJ-202301081617\\Wlos" <1762697860@qq.com> Date: Tue, 23 Jul 2024 09:29:39 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E9=94=80=E5=94=AE=E7=94=B3=E9=A2=86?= =?UTF-8?q?=E5=8D=95=E8=BD=AC=E4=BB=93=E5=BA=93=E5=87=BA=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../template/js/depotOut/transList.js | 6 ++ .../complateInventoryChild.js | 6 +- .../inventoryTaskList/myTaskInventoryList.js | 2 +- .../warehousePersonnel/warehousePersonnel.js | 3 +- .../template/js/sealApply/sealApplyToOut.js | 55 +++++++++++++++++++ .../tpl/sealApply/sealApplyToOut.html | 29 ++++++++++ 6 files changed, 94 insertions(+), 7 deletions(-) create mode 100644 seal-service/src/main/resources/template/js/sealApply/sealApplyToOut.js create mode 100644 seal-service/src/main/resources/template/tpl/sealApply/sealApplyToOut.html diff --git a/erp/src/main/resources/template/js/depotOut/transList.js b/erp/src/main/resources/template/js/depotOut/transList.js index 8039d68ff..8bc574e2e 100644 --- a/erp/src/main/resources/template/js/depotOut/transList.js +++ b/erp/src/main/resources/template/js/depotOut/transList.js @@ -95,6 +95,9 @@ layui.config({ } else if (type == 6) { // 补料出库单 pageUrl = 'FP2024070100002'; + } else if (type == 7) { + // 补料出库单 + pageUrl = 'FP2023091000003'; } _openNewWindows({ url: systemCommonUtil.getUrl(pageUrl +'&id=' + data.id, null), @@ -127,6 +130,9 @@ layui.config({ } else if (type == 6) { // 补料出库单 pageUrl = '../../tpl/erpPick/erpPatchPickToOut.html'; + } else if (type == 7) { + // 配件申领出库单 + pageUrl = '../../tpl/sealApply/sealApplyToOut.html'; } _openNewWindows({ url: pageUrl + '?id=' + data.id, diff --git a/erp/src/main/resources/template/js/inventoryTaskList/complateInventoryChild.js b/erp/src/main/resources/template/js/inventoryTaskList/complateInventoryChild.js index eabe2c51f..347f0af6f 100644 --- a/erp/src/main/resources/template/js/inventoryTaskList/complateInventoryChild.js +++ b/erp/src/main/resources/template/js/inventoryTaskList/complateInventoryChild.js @@ -25,7 +25,7 @@ layui.config({ } }); - + //获取的条形码是入库状态的 tableSelect.render({ elem: '#code', //定义输入框input对象 checkedKey: 'id', //表格的唯一键值，非常重要，影响到选中状态 必填 @@ -43,10 +43,6 @@ layui.config({ { field: 'codeNum', title: '条形码', width: 250, templet: function (d) { return '' + d.codeNum + ''; }}, - // { field: 'userName', title: '员工姓名', width: 100 }, - // { field: 'userSex', title: '性别', width: 60, rowspan: '2', templet: function (d) { - // return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("sexEnum", 'id', d.userSex, 'name'); - // }}, ]] }, done: function (elem, data) { diff --git a/erp/src/main/resources/template/js/inventoryTaskList/myTaskInventoryList.js b/erp/src/main/resources/template/js/inventoryTaskList/myTaskInventoryList.js index daa57bd7a..f43034383 100644 --- a/erp/src/main/resources/template/js/inventoryTaskList/myTaskInventoryList.js +++ b/erp/src/main/resources/template/js/inventoryTaskList/myTaskInventoryList.js @@ -40,7 +40,7 @@ layui.config({ { field: 'realNumber', title: '实际盘点数量', rowspan: '2', align: 'center', width: 140 }, { field: 'profitNum', title: '盘盈数量', rowspan: '2', align: 'center', width: 140 }, { field: 'planNumber', title: '盘点总数量', rowspan: '2', align: 'center', width: 140 }, - { field: 'state', title: '状态', width: 90, align: 'center', templet: function (d) { + { field: 'state', title: '状态', width: 150, align: 'center', templet: function (d) { return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("inventoryChildState", 'id', d.state, 'name'); }}, { field: 'type', title: '类型', width: 90, align: 'center', templet: function (d) { diff --git a/erp/src/main/resources/template/js/warehousePersonnel/warehousePersonnel.js b/erp/src/main/resources/template/js/warehousePersonnel/warehousePersonnel.js index 126830a06..34b9baf1d 100644 --- a/erp/src/main/resources/template/js/warehousePersonnel/warehousePersonnel.js +++ b/erp/src/main/resources/template/js/warehousePersonnel/warehousePersonnel.js @@ -14,13 +14,14 @@ layui.config({ loadWareshop(); + //获取当前登录用户管理的仓库列表 form.render(); function loadWareshop() { table.render({ id: 'warehouseTable', elem: '#warehouseTable', method: 'get', - url: sysMainMation.erpBasePath + 'queryStaffBelongDepotList', + url: sysMainMation.erpBasePath + 'storehouse009', even: false, page: false, limits: getLimits(), diff --git a/seal-service/src/main/resources/template/js/sealApply/sealApplyToOut.js b/seal-service/src/main/resources/template/js/sealApply/sealApplyToOut.js new file mode 100644 index 000000000..cd4816a89 --- /dev/null +++ b/seal-service/src/main/resources/template/js/sealApply/sealApplyToOut.js @@ -0,0 +1,55 @@ + +// 以下两个参数开启团队权限时有值 +var objectId = '', objectKey = ''; +// 根据以下两个参数判断：工作流的判断是否要根据serviceClassName的判断 +var serviceClassName; + +layui.config({ + base: basePath, + version: skyeyeVersion +}).extend({ + window: 'js/winui.window' +}).define(['window', 'table', 'jquery'], function (exports) { + winui.renderColor(); + var index = parent.layer.getFrameIndex(window.name); + var $ = layui.$; + var id = GetUrlParam("id"); + + // 销售出库转仓库出库 + AjaxPostUtil.request({url: sysMainMation.erpBasePath + "queryOtherWiseOrderTransById", params: {id: id}, type: 'json', method: 'GET', callback: function (json) { + let data = json.bean; + // 仓库出库的【编辑布局】 + console.log(data) + dsFormUtil.initEditPageForStatic('content', 'FP2024070100006', data, { + savePreParams: function (params) { + params.farmId=data.farmId + params.departmentId=data.departmentId + params.salesman=data.salesman + }, + saveData: function (params) { + // 保存数据 + AjaxPostUtil.request({url: sysMainMation.erpBasePath + "insertOtherWiseOrderToDepotOut", params: params, type: 'json', method: "POST", callback: function(json) { + parent.layer.close(index); + parent.refreshCode = '0'; + }}); + }, + loadComponentCallback: function () { + $("div[controlType='correspondentAllEnter']").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/seal-service/src/main/resources/template/tpl/sealApply/sealApplyToOut.html b/seal-service/src/main/resources/template/tpl/sealApply/sealApplyToOut.html new file mode 100644 index 000000000..078054942 --- /dev/null +++ b/seal-service/src/main/resources/template/tpl/sealApply/sealApplyToOut.html @@ -0,0 +1,29 @@ + + + + + + + + + +
+
+
+
+
+ + ` + +
+
+
+
+ + + + + + \ No newline at end of file -- GitLab