From b604b3f84d5ac6ab4d3d7654272f9c7a567372e6 Mon Sep 17 00:00:00 2001 From: "LAPTOP-UV1MNL38\\18023" <1802330370@qq.com> Date: Sat, 15 Jun 2024 19:37:45 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E6=96=B0=E5=A2=9E=E8=B4=A8=E6=A3=80?= =?UTF-8?q?=E5=8D=95=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../deliveryToQualityInspection.js | 53 +++++++ .../purchaseQualityInspectionList.js | 148 ++++++++++++++++++ .../deliveryToQualityInspection.html | 23 ++- .../purchaseQualityInspectionList.html | 40 ++++- .../template/js/common/sysusersel.js | 2 +- .../template/json/skyeyeClassEnum.json | 4 +- .../template/json/sysServiceMation.json | 1 + 7 files changed, 264 insertions(+), 7 deletions(-) diff --git a/erp/src/main/resources/template/js/purchaseDeliveryNote/deliveryToQualityInspection.js b/erp/src/main/resources/template/js/purchaseDeliveryNote/deliveryToQualityInspection.js index e69de29bb..3b1188890 100644 --- a/erp/src/main/resources/template/js/purchaseDeliveryNote/deliveryToQualityInspection.js +++ b/erp/src/main/resources/template/js/purchaseDeliveryNote/deliveryToQualityInspection.js @@ -0,0 +1,53 @@ + +// 以下两个参数开启团队权限时有值 +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 + "queryPurchaseDeliveryTransById", params: {id: id}, type: 'json', method: 'GET', callback: function (json) { + let data = json.bean; + // 采购质检的【编辑布局】 + data.qualityInspectionItemList = data.erpOrderItemList + + dsFormUtil.initEditPageForStatic('content', 'FP2024061300002', data, { + savePreParams: function (params) { + + }, + saveData: function (params) { + // 保存数据 + AjaxPostUtil.request({url: sysMainMation.erpBasePath + "deliveryToQualityInspection", params: params, type: 'json', method: "POST", callback: function(json) { + parent.layer.close(index); + parent.refreshCode = '0'; + }}); + }, + loadComponentCallback: function () { + $("div[controlType='supplier']").remove(); + $("div[controlType='purchaseOrderFromType']").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); + } + }); + }}); + +}); \ No newline at end of file diff --git a/erp/src/main/resources/template/js/purchaseQualityInspection/purchaseQualityInspectionList.js b/erp/src/main/resources/template/js/purchaseQualityInspection/purchaseQualityInspectionList.js index e69de29bb..f9a8a3cc5 100644 --- a/erp/src/main/resources/template/js/purchaseQualityInspection/purchaseQualityInspectionList.js +++ b/erp/src/main/resources/template/js/purchaseQualityInspection/purchaseQualityInspectionList.js @@ -0,0 +1,148 @@ + +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 serviceClassName = sysServiceMation["purchaseQualityInspection"]["key"]; + authBtn('1718282987406');//新增 + + table.render({ + id: 'messageTable', + elem: '#messageTable', + method: 'post', + url: sysMainMation.erpBasePath + 'queryQualityInspectionList', + 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) { + return '' + d.oddNumber + ''; + if (!isNull(d.fromId)) { + str += '[转]'; + } + return str; + }}, + { field: 'holderMation', title: '供应商', rowspan: '2', align: 'left', width: 150, templet: function (d) { + return getNotUndefinedVal(d.holderMation?.name); + }}, + { field: 'totalPrice', title: '合计金额', rowspan: '2', align: 'left', width: 120 }, + { 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: 'returnState', title: '退货状态', rowspan: '2', width: 90, templet: function (d) { + return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("qualityInspectionReturnState", 'id', d.returnState, 'name'); + }}, + { field: 'putState', title: '入库状态', rowspan: '2', width: 150, templet: function (d) { + return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("qualityInspectionPutState", 'id', d.putState, '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("purchaseOrderFromType", '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 === 'delete') { //删除 + erpOrderUtil.deleteOrderMation(data.id, serviceClassName, function() { + loadTable(); + }); + } else if (layEvent === 'details') { //详情 + details(data); + } else if (layEvent === 'edit') { //编辑 + edit(data); + } else if (layEvent === 'subApproval') { //提交审核 + erpOrderUtil.submitOrderMation(data.id, serviceClassName, function() { + loadTable(); + }); + } else if (layEvent === 'processDetails') { // 工作流流程详情查看 + activitiUtil.activitiDetails(data); + } else if (layEvent === 'revoke') { //撤销 + erpOrderUtil.revokeOrderMation(data.processInstanceId, serviceClassName, function() { + loadTable(); + }); + } + }); + + // 添加 + $("body").on("click", "#addBean", function() { + _openNewWindows({ + url: systemCommonUtil.getUrl('FP2024061300001', null), + title: systemLanguage["com.skyeye.addPageTitle"][languageType], + pageId: "purchaseQualityInspectionAdd", + area: ['90vw', '90vh'], + callBack: function (refreshCode) { + winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000}); + loadTable(); + }}); + }); + + // 编辑 + function edit(data) { + _openNewWindows({ + url: systemCommonUtil.getUrl('FP2024061300002&id=' + data.id, null), + title: systemLanguage["com.skyeye.editPageTitle"][languageType], + pageId: "purchaseQualityInspectionEdit", + area: ['90vw', '90vh'], + callBack: function (refreshCode) { + winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000}); + loadTable(); + }}); + } + + // 详情 + function details(data) { + _openNewWindows({ + url: systemCommonUtil.getUrl('FP2024061300003&id=' + data.id, null), + title: systemLanguage["com.skyeye.detailsPageTitle"][languageType], + pageId: "purchaseQualityInspectionDetails", + area: ['90vw', '90vh'], + callBack: function (refreshCode) { + }}); + } + + + form.render(); + $("body").on("click", "#reloadTable", function() { + loadTable(); + }); + function loadTable() { + table.reloadData("messageTable", {where: getTableParams()}); + } + + function getTableParams() { + return $.extend(true, {}, initTableSearchUtil.getSearchValue("messageTable")); + } + + exports('queryQualityInspectionList', {}); +}); diff --git a/erp/src/main/resources/template/tpl/purchaseDeliveryNote/deliveryToQualityInspection.html b/erp/src/main/resources/template/tpl/purchaseDeliveryNote/deliveryToQualityInspection.html index 566549bdf..027c531e2 100644 --- a/erp/src/main/resources/template/tpl/purchaseDeliveryNote/deliveryToQualityInspection.html +++ b/erp/src/main/resources/template/tpl/purchaseDeliveryNote/deliveryToQualityInspection.html @@ -1,10 +1,29 @@ - + - Title + + + +
+
+
+
+
+ + ` + +
+
+
+
+ + + \ No newline at end of file diff --git a/erp/src/main/resources/template/tpl/purchaseQualityInspection/purchaseQualityInspectionList.html b/erp/src/main/resources/template/tpl/purchaseQualityInspection/purchaseQualityInspectionList.html index 566549bdf..c14363ebc 100644 --- a/erp/src/main/resources/template/tpl/purchaseQualityInspection/purchaseQualityInspectionList.html +++ b/erp/src/main/resources/template/tpl/purchaseQualityInspection/purchaseQualityInspectionList.html @@ -1,10 +1,44 @@ - + - - Title + + + + +
+
+ + +
+
+
+
+ +
+ + + \ No newline at end of file diff --git a/web/src/main/resources/template/js/common/sysusersel.js b/web/src/main/resources/template/js/common/sysusersel.js index 0b19be48c..e1aed8506 100644 --- a/web/src/main/resources/template/js/common/sysusersel.js +++ b/web/src/main/resources/template/js/common/sysusersel.js @@ -69,7 +69,7 @@ layui.config({ $("#showInfo").html(s); //树节点类型赋值 - if(checkType === "1"){ + if(checkType == "1"){ ztreeCheckType = "checkbox"; } else { ztreeCheckType = "radio"; diff --git a/web/src/main/resources/template/json/skyeyeClassEnum.json b/web/src/main/resources/template/json/skyeyeClassEnum.json index ba3c18ea6..585beb504 100644 --- a/web/src/main/resources/template/json/skyeyeClassEnum.json +++ b/web/src/main/resources/template/json/skyeyeClassEnum.json @@ -199,5 +199,7 @@ "supplierContractChildStateEnum": {"name": "ERP-采购合同是否转采购订单状态", "className": "skyeye-erp#com.skyeye.contract.classenum.SupplierContractChildStateEnum"}, "orderQualityInspectionType": {"name": "ERP-采购订单质检状态", "className": "skyeye-erp#com.skyeye.business.classenum.OrderQualityInspectionType"}, - "deliveryPutState": {"name": "ERP-采购到货单免检商品入库状态", "className": "skyeye-erp#com.skyeye.purchase.classenum.DeliveryPutState"} + "deliveryPutState": {"name": "ERP-采购到货单免检商品入库状态", "className": "skyeye-erp#com.skyeye.purchase.classenum.DeliveryPutState"}, + "qualityInspectionPutState": {"name": "ERP-采购质检单商品入库状态", "className": "skyeye-erp#com.skyeye.inspection.classenum.QualityInspectionPutState"}, + "qualityInspectionReturnState": {"name": "ERP-采购质检单商品退货状态", "className": "skyeye-erp#com.skyeye.inspection.classenum.QualityInspectionReturnState"} } \ No newline at end of file diff --git a/web/src/main/resources/template/json/sysServiceMation.json b/web/src/main/resources/template/json/sysServiceMation.json index 3665df122..560f47ff7 100644 --- a/web/src/main/resources/template/json/sysServiceMation.json +++ b/web/src/main/resources/template/json/sysServiceMation.json @@ -9,6 +9,7 @@ "purchaseOrder": {"name": "采购订单申请", "key": "com.skyeye.purchase.service.impl.PurchaseOrderServiceImpl"}, "purchaseRequest": {"name": "采购申请", "key": "com.skyeye.request.service.impl.PurchaseRequestServiceImpl"}, "puchaseDeliveryNoteList": {"name": "采购到货单", "key": "com.skyeye.purchase.service.impl.PurchaseDeliveryServiceImpl"}, + "purchaseQualityInspection": {"name": "采购质检单", "key": "com.skyeye.inspection.service.impl.QualityInspectionServiceImpl"}, "putIsOthers": {"name": "其他入库单申请", "key": "com.skyeye.other.service.impl.OtherWareHousServiceImpl"}, "outIsOthers": {"name": "其他出库单申请", "key": "com.skyeye.other.service.impl.OtherOutLetsServiceImpl"}, "splitListOrder": {"name": "拆分订单", "key": "com.skyeye.other.service.impl.SplitListServiceImpl"}, -- GitLab