From ef7ea842e8bf60066f878c2746b3e19dacc1fd7b Mon Sep 17 00:00:00 2001 From: "LAPTOP-UV1MNL38\\18023" <1802330370@qq.com> Date: Mon, 22 Jul 2024 09:55:29 +0800 Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E4=BF=AE=E6=94=B9=E6=8F=90?= =?UTF-8?q?=E4=BA=A4=E6=88=90=E5=8A=9F=E5=92=8C=E5=88=A0=E9=99=A4=E5=A4=9A?= =?UTF-8?q?=E4=BD=99=E7=9A=84`?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../template/tpl/assetManagePurchase/turnAssetInventory.html | 2 +- .../tpl/assetManagePurchase/turnAssetProcurementReturn.html | 2 +- .../departmentMachining/processingToMaterialRequisition.html | 2 +- .../tpl/departmentMachining/processingToReturnMaterials.html | 2 +- .../departmentMachining/processingToSupplementMaterials.html | 2 +- .../resources/template/tpl/erpPick/erpReturnPickToPut.html | 2 +- .../template/tpl/erpPick/turnPatchMaterialToTurnOut.html | 2 +- .../template/tpl/erpPick/turnRequisitionMaterialToOut.html | 2 +- .../template/tpl/erpPick/turnReturnMaterialToPut.html | 2 +- .../erpPreProductionPlan/preProductionTurnToProduction.html | 2 +- .../tpl/materialReturnOrder/materialReturnOrderToPut.html | 2 +- .../resources/template/tpl/wholeOut/wholeOutToArrival.html | 2 +- .../main/resources/template/tpl/wholeOut/wholeOutToPut.html | 2 +- .../resources/template/tpl/wholeOut/wholeOutToReturn.html | 2 +- .../purchaseQualityInspectionList.js | 4 ++-- .../template/js/purchaseRequest/purchaseRequestList.js | 4 ++-- .../template/js/salesOrder/salesOrderToPreProductionPlan.js | 2 +- .../template/js/supplierContract/supplierContractList.js | 4 ++-- .../template/tpl/otherOutlets/otherOutletsToOut.html | 2 +- .../template/tpl/otherWarehous/otherWarehousToPut.html | 2 +- .../template/tpl/purchaseDeliveryNote/deliveryToPut.html | 2 +- .../tpl/purchaseDeliveryNote/deliveryToQualityInspection.html | 2 +- .../template/tpl/purchaseOrder/purchaseOrderToReturn.html | 2 +- .../template/tpl/purchaseOrder/purchaseToWarehouse.html | 2 +- .../template/tpl/purchaseOrder/purchaseToWaybill.html | 2 +- .../resources/template/tpl/purchasePut/purchasePutToPut.html | 2 +- .../tpl/purchaseQualityInspection/qualityInspectionToPut.html | 2 +- .../purchaseQualityInspection/qualityInspectionToReturns.html | 2 +- .../template/tpl/purchaseReturns/purchaseReturnToOut.html | 2 +- .../resources/template/tpl/retailOutlet/retailOutToOut.html | 2 +- .../template/tpl/retailReturns/retailReturnsToPut.html | 2 +- .../resources/template/tpl/salesOrder/salesOrderToOutlet.html | 2 +- .../tpl/salesOrder/salesOrderToPreProductionPlan.html | 2 +- .../template/tpl/salesOrder/salesOrderToReturns.html | 2 +- .../resources/template/tpl/salesOutlet/salesOutToOut.html | 2 +- .../template/tpl/salesReturns/salesReturnsToPut.html | 2 +- .../template/tpl/supplierContract/contractToOrder.html | 2 +- pro/src/main/resources/template/js/project/projectList.js | 2 +- .../src/main/resources/template/js/sealApply/sealApplyList.js | 2 +- .../template/assets/lib/layui/customer/erpOrderUtil.js | 4 ++-- 40 files changed, 44 insertions(+), 44 deletions(-) diff --git a/admin-assistant/src/main/resources/template/tpl/assetManagePurchase/turnAssetInventory.html b/admin-assistant/src/main/resources/template/tpl/assetManagePurchase/turnAssetInventory.html index 9d5600d0d..ab07ef333 100644 --- a/admin-assistant/src/main/resources/template/tpl/assetManagePurchase/turnAssetInventory.html +++ b/admin-assistant/src/main/resources/template/tpl/assetManagePurchase/turnAssetInventory.html @@ -13,7 +13,7 @@
- ` +
diff --git a/admin-assistant/src/main/resources/template/tpl/assetManagePurchase/turnAssetProcurementReturn.html b/admin-assistant/src/main/resources/template/tpl/assetManagePurchase/turnAssetProcurementReturn.html index ae8ecb7d4..bd8c49a73 100644 --- a/admin-assistant/src/main/resources/template/tpl/assetManagePurchase/turnAssetProcurementReturn.html +++ b/admin-assistant/src/main/resources/template/tpl/assetManagePurchase/turnAssetProcurementReturn.html @@ -13,7 +13,7 @@
- ` +
diff --git a/erp-produce/src/main/resources/template/tpl/departmentMachining/processingToMaterialRequisition.html b/erp-produce/src/main/resources/template/tpl/departmentMachining/processingToMaterialRequisition.html index 27b39dfab..e0fc0ea5a 100644 --- a/erp-produce/src/main/resources/template/tpl/departmentMachining/processingToMaterialRequisition.html +++ b/erp-produce/src/main/resources/template/tpl/departmentMachining/processingToMaterialRequisition.html @@ -13,7 +13,7 @@
- ` +
diff --git a/erp-produce/src/main/resources/template/tpl/departmentMachining/processingToReturnMaterials.html b/erp-produce/src/main/resources/template/tpl/departmentMachining/processingToReturnMaterials.html index a4bfbb11a..6e84c65c1 100644 --- a/erp-produce/src/main/resources/template/tpl/departmentMachining/processingToReturnMaterials.html +++ b/erp-produce/src/main/resources/template/tpl/departmentMachining/processingToReturnMaterials.html @@ -13,7 +13,7 @@
- ` +
diff --git a/erp-produce/src/main/resources/template/tpl/departmentMachining/processingToSupplementMaterials.html b/erp-produce/src/main/resources/template/tpl/departmentMachining/processingToSupplementMaterials.html index 356fafb02..e056ae255 100644 --- a/erp-produce/src/main/resources/template/tpl/departmentMachining/processingToSupplementMaterials.html +++ b/erp-produce/src/main/resources/template/tpl/departmentMachining/processingToSupplementMaterials.html @@ -13,7 +13,7 @@
- ` +
diff --git a/erp-produce/src/main/resources/template/tpl/erpPick/erpReturnPickToPut.html b/erp-produce/src/main/resources/template/tpl/erpPick/erpReturnPickToPut.html index dd7ff60c8..bcdf80b9b 100644 --- a/erp-produce/src/main/resources/template/tpl/erpPick/erpReturnPickToPut.html +++ b/erp-produce/src/main/resources/template/tpl/erpPick/erpReturnPickToPut.html @@ -13,7 +13,7 @@
- ` +
diff --git a/erp-produce/src/main/resources/template/tpl/erpPick/turnPatchMaterialToTurnOut.html b/erp-produce/src/main/resources/template/tpl/erpPick/turnPatchMaterialToTurnOut.html index 9e9a93dad..7eea1617b 100644 --- a/erp-produce/src/main/resources/template/tpl/erpPick/turnPatchMaterialToTurnOut.html +++ b/erp-produce/src/main/resources/template/tpl/erpPick/turnPatchMaterialToTurnOut.html @@ -13,7 +13,7 @@
- ` +
diff --git a/erp-produce/src/main/resources/template/tpl/erpPick/turnRequisitionMaterialToOut.html b/erp-produce/src/main/resources/template/tpl/erpPick/turnRequisitionMaterialToOut.html index 4ba001c0d..cbb50d90c 100644 --- a/erp-produce/src/main/resources/template/tpl/erpPick/turnRequisitionMaterialToOut.html +++ b/erp-produce/src/main/resources/template/tpl/erpPick/turnRequisitionMaterialToOut.html @@ -13,7 +13,7 @@
- ` +
diff --git a/erp-produce/src/main/resources/template/tpl/erpPick/turnReturnMaterialToPut.html b/erp-produce/src/main/resources/template/tpl/erpPick/turnReturnMaterialToPut.html index f4016b4d4..79bbffce9 100644 --- a/erp-produce/src/main/resources/template/tpl/erpPick/turnReturnMaterialToPut.html +++ b/erp-produce/src/main/resources/template/tpl/erpPick/turnReturnMaterialToPut.html @@ -13,7 +13,7 @@
- ` +
diff --git a/erp-produce/src/main/resources/template/tpl/erpPreProductionPlan/preProductionTurnToProduction.html b/erp-produce/src/main/resources/template/tpl/erpPreProductionPlan/preProductionTurnToProduction.html index 53ca5fd6a..57bc5312b 100644 --- a/erp-produce/src/main/resources/template/tpl/erpPreProductionPlan/preProductionTurnToProduction.html +++ b/erp-produce/src/main/resources/template/tpl/erpPreProductionPlan/preProductionTurnToProduction.html @@ -13,7 +13,7 @@
- ` +
diff --git a/erp-produce/src/main/resources/template/tpl/materialReturnOrder/materialReturnOrderToPut.html b/erp-produce/src/main/resources/template/tpl/materialReturnOrder/materialReturnOrderToPut.html index 98c6096d5..286467f14 100644 --- a/erp-produce/src/main/resources/template/tpl/materialReturnOrder/materialReturnOrderToPut.html +++ b/erp-produce/src/main/resources/template/tpl/materialReturnOrder/materialReturnOrderToPut.html @@ -13,7 +13,7 @@
- ` +
diff --git a/erp-produce/src/main/resources/template/tpl/wholeOut/wholeOutToArrival.html b/erp-produce/src/main/resources/template/tpl/wholeOut/wholeOutToArrival.html index dd9f3c983..b5c686b9a 100644 --- a/erp-produce/src/main/resources/template/tpl/wholeOut/wholeOutToArrival.html +++ b/erp-produce/src/main/resources/template/tpl/wholeOut/wholeOutToArrival.html @@ -13,7 +13,7 @@
- ` +
diff --git a/erp-produce/src/main/resources/template/tpl/wholeOut/wholeOutToPut.html b/erp-produce/src/main/resources/template/tpl/wholeOut/wholeOutToPut.html index 2e1807265..4050758e8 100644 --- a/erp-produce/src/main/resources/template/tpl/wholeOut/wholeOutToPut.html +++ b/erp-produce/src/main/resources/template/tpl/wholeOut/wholeOutToPut.html @@ -13,7 +13,7 @@
- ` +
diff --git a/erp-produce/src/main/resources/template/tpl/wholeOut/wholeOutToReturn.html b/erp-produce/src/main/resources/template/tpl/wholeOut/wholeOutToReturn.html index 4c716ab93..3512c3a80 100644 --- a/erp-produce/src/main/resources/template/tpl/wholeOut/wholeOutToReturn.html +++ b/erp-produce/src/main/resources/template/tpl/wholeOut/wholeOutToReturn.html @@ -13,7 +13,7 @@
- ` +
diff --git a/erp/src/main/resources/template/js/purchaseQualityInspection/purchaseQualityInspectionList.js b/erp/src/main/resources/template/js/purchaseQualityInspection/purchaseQualityInspectionList.js index 0106f3eab..71ee1e4d6 100644 --- a/erp/src/main/resources/template/js/purchaseQualityInspection/purchaseQualityInspectionList.js +++ b/erp/src/main/resources/template/js/purchaseQualityInspection/purchaseQualityInspectionList.js @@ -135,7 +135,7 @@ layui.config({ approvalId: approvalId }; AjaxPostUtil.request({url: sysMainMation.erpBasePath + "submitQualityInspectionToApproval", params: params, type: 'json', method: 'POST', callback: function (json) { - winui.window.msg("提交成功。", {icon: 1, time: 2000}); + winui.window.msg("提交成功", {icon: 1, time: 2000}); loadTable(); }}); }); @@ -158,7 +158,7 @@ layui.config({ layer.confirm('确认撤销该申请吗?', { icon: 3, title: '撤销操作' }, function (index) { layer.close(index); AjaxPostUtil.request({url: sysMainMation.erpBasePath + "revokeQualityInspection", params: {processInstanceId: data.processInstanceId}, type: 'json', method: "PUT", callback: function (json) { - winui.window.msg("撤销成功。", {icon: 1, time: 2000}); + winui.window.msg("提交成功", {icon: 1, time: 2000}); loadTable(); }}); }); diff --git a/erp/src/main/resources/template/js/purchaseRequest/purchaseRequestList.js b/erp/src/main/resources/template/js/purchaseRequest/purchaseRequestList.js index 216db4082..215f9b4d1 100644 --- a/erp/src/main/resources/template/js/purchaseRequest/purchaseRequestList.js +++ b/erp/src/main/resources/template/js/purchaseRequest/purchaseRequestList.js @@ -176,7 +176,7 @@ layui.config({ layer.confirm('确认撤销该申请吗?', { icon: 3, title: '撤销操作' }, function (index) { layer.close(index); AjaxPostUtil.request({url: sysMainMation.erpBasePath + "revokePurchaseRequest", params: {processInstanceId: data.processInstanceId}, type: 'json', method: "PUT", callback: function (json) { - winui.window.msg("撤销成功。", {icon: 1, time: 2000}); + winui.window.msg("提交成功", {icon: 1, time: 2000}); loadTable(); }}); }); @@ -192,7 +192,7 @@ layui.config({ approvalId: approvalId }; AjaxPostUtil.request({url: sysMainMation.erpBasePath + "submitPurchaseRequestToApproval", params: params, type: 'json', method: "POST", callback: function (json) { - winui.window.msg("提交成功。", {icon: 1, time: 2000}); + winui.window.msg("提交成功", {icon: 1, time: 2000}); loadTable(); }}); }); diff --git a/erp/src/main/resources/template/js/salesOrder/salesOrderToPreProductionPlan.js b/erp/src/main/resources/template/js/salesOrder/salesOrderToPreProductionPlan.js index d4b1d830e..deb10d69f 100644 --- a/erp/src/main/resources/template/js/salesOrder/salesOrderToPreProductionPlan.js +++ b/erp/src/main/resources/template/js/salesOrder/salesOrderToPreProductionPlan.js @@ -31,7 +31,7 @@ layui.config({ }}); }, loadComponentCallback: function () { - $("div[controlType='sealOutLetFromType']").remove(); + $("div[controlType='productionPlanFromType']").remove(); }, // 新增行的回调函数 diff --git a/erp/src/main/resources/template/js/supplierContract/supplierContractList.js b/erp/src/main/resources/template/js/supplierContract/supplierContractList.js index eb8e7cb07..6f04961a8 100644 --- a/erp/src/main/resources/template/js/supplierContract/supplierContractList.js +++ b/erp/src/main/resources/template/js/supplierContract/supplierContractList.js @@ -209,7 +209,7 @@ layui.config({ approvalId: approvalId }; AjaxPostUtil.request({url: sysMainMation.erpBasePath + "mysuppliercontract009", params: params, type: 'json', method: 'POST', callback: function (json) { - winui.window.msg("提交成功。", {icon: 1, time: 2000}); + winui.window.msg("提交成功", {icon: 1, time: 2000}); loadTable(); }}); }); @@ -293,7 +293,7 @@ layui.config({ layer.confirm(msg, { icon: 3, title: '撤销申请提交' }, function (index) { layer.close(index); AjaxPostUtil.request({url: sysMainMation.erpBasePath + "mysuppliercontract016", params: {processInstanceId: data.processInstanceId}, type: 'json', method: 'PUT', callback: function (json) { - winui.window.msg("撤销成功。", {icon: 1, time: 2000}); + winui.window.msg("提交成功", {icon: 1, time: 2000}); loadTable(); }}); }); diff --git a/erp/src/main/resources/template/tpl/otherOutlets/otherOutletsToOut.html b/erp/src/main/resources/template/tpl/otherOutlets/otherOutletsToOut.html index fd723bc30..302ef23b9 100644 --- a/erp/src/main/resources/template/tpl/otherOutlets/otherOutletsToOut.html +++ b/erp/src/main/resources/template/tpl/otherOutlets/otherOutletsToOut.html @@ -13,7 +13,7 @@
- ` +
diff --git a/erp/src/main/resources/template/tpl/otherWarehous/otherWarehousToPut.html b/erp/src/main/resources/template/tpl/otherWarehous/otherWarehousToPut.html index e7a3e49ef..795ae999c 100644 --- a/erp/src/main/resources/template/tpl/otherWarehous/otherWarehousToPut.html +++ b/erp/src/main/resources/template/tpl/otherWarehous/otherWarehousToPut.html @@ -13,7 +13,7 @@
- ` +
diff --git a/erp/src/main/resources/template/tpl/purchaseDeliveryNote/deliveryToPut.html b/erp/src/main/resources/template/tpl/purchaseDeliveryNote/deliveryToPut.html index 5d6b7644d..d20156c89 100644 --- a/erp/src/main/resources/template/tpl/purchaseDeliveryNote/deliveryToPut.html +++ b/erp/src/main/resources/template/tpl/purchaseDeliveryNote/deliveryToPut.html @@ -13,7 +13,7 @@
- ` +
diff --git a/erp/src/main/resources/template/tpl/purchaseDeliveryNote/deliveryToQualityInspection.html b/erp/src/main/resources/template/tpl/purchaseDeliveryNote/deliveryToQualityInspection.html index 027c531e2..72722823e 100644 --- a/erp/src/main/resources/template/tpl/purchaseDeliveryNote/deliveryToQualityInspection.html +++ b/erp/src/main/resources/template/tpl/purchaseDeliveryNote/deliveryToQualityInspection.html @@ -13,7 +13,7 @@
- ` +
diff --git a/erp/src/main/resources/template/tpl/purchaseOrder/purchaseOrderToReturn.html b/erp/src/main/resources/template/tpl/purchaseOrder/purchaseOrderToReturn.html index 1edc4be89..6eb8148af 100644 --- a/erp/src/main/resources/template/tpl/purchaseOrder/purchaseOrderToReturn.html +++ b/erp/src/main/resources/template/tpl/purchaseOrder/purchaseOrderToReturn.html @@ -13,7 +13,7 @@
- ` +
diff --git a/erp/src/main/resources/template/tpl/purchaseOrder/purchaseToWarehouse.html b/erp/src/main/resources/template/tpl/purchaseOrder/purchaseToWarehouse.html index 9cfa7d247..d9a58ef43 100644 --- a/erp/src/main/resources/template/tpl/purchaseOrder/purchaseToWarehouse.html +++ b/erp/src/main/resources/template/tpl/purchaseOrder/purchaseToWarehouse.html @@ -13,7 +13,7 @@
- ` +
diff --git a/erp/src/main/resources/template/tpl/purchaseOrder/purchaseToWaybill.html b/erp/src/main/resources/template/tpl/purchaseOrder/purchaseToWaybill.html index b8b4601e2..a3e546f1a 100644 --- a/erp/src/main/resources/template/tpl/purchaseOrder/purchaseToWaybill.html +++ b/erp/src/main/resources/template/tpl/purchaseOrder/purchaseToWaybill.html @@ -13,7 +13,7 @@
- ` +
diff --git a/erp/src/main/resources/template/tpl/purchasePut/purchasePutToPut.html b/erp/src/main/resources/template/tpl/purchasePut/purchasePutToPut.html index aefdc111a..530dc9691 100644 --- a/erp/src/main/resources/template/tpl/purchasePut/purchasePutToPut.html +++ b/erp/src/main/resources/template/tpl/purchasePut/purchasePutToPut.html @@ -13,7 +13,7 @@
- ` +
diff --git a/erp/src/main/resources/template/tpl/purchaseQualityInspection/qualityInspectionToPut.html b/erp/src/main/resources/template/tpl/purchaseQualityInspection/qualityInspectionToPut.html index 6ee438ddf..82277dac1 100644 --- a/erp/src/main/resources/template/tpl/purchaseQualityInspection/qualityInspectionToPut.html +++ b/erp/src/main/resources/template/tpl/purchaseQualityInspection/qualityInspectionToPut.html @@ -13,7 +13,7 @@
- ` +
diff --git a/erp/src/main/resources/template/tpl/purchaseQualityInspection/qualityInspectionToReturns.html b/erp/src/main/resources/template/tpl/purchaseQualityInspection/qualityInspectionToReturns.html index 39e542892..af5f199dd 100644 --- a/erp/src/main/resources/template/tpl/purchaseQualityInspection/qualityInspectionToReturns.html +++ b/erp/src/main/resources/template/tpl/purchaseQualityInspection/qualityInspectionToReturns.html @@ -13,7 +13,7 @@
- ` +
diff --git a/erp/src/main/resources/template/tpl/purchaseReturns/purchaseReturnToOut.html b/erp/src/main/resources/template/tpl/purchaseReturns/purchaseReturnToOut.html index 646a0dcd3..ab0c04ebc 100644 --- a/erp/src/main/resources/template/tpl/purchaseReturns/purchaseReturnToOut.html +++ b/erp/src/main/resources/template/tpl/purchaseReturns/purchaseReturnToOut.html @@ -13,7 +13,7 @@
- ` +
diff --git a/erp/src/main/resources/template/tpl/retailOutlet/retailOutToOut.html b/erp/src/main/resources/template/tpl/retailOutlet/retailOutToOut.html index 2958641ef..8edcd4168 100644 --- a/erp/src/main/resources/template/tpl/retailOutlet/retailOutToOut.html +++ b/erp/src/main/resources/template/tpl/retailOutlet/retailOutToOut.html @@ -13,7 +13,7 @@
- ` +
diff --git a/erp/src/main/resources/template/tpl/retailReturns/retailReturnsToPut.html b/erp/src/main/resources/template/tpl/retailReturns/retailReturnsToPut.html index a884e2068..cceb16bbf 100644 --- a/erp/src/main/resources/template/tpl/retailReturns/retailReturnsToPut.html +++ b/erp/src/main/resources/template/tpl/retailReturns/retailReturnsToPut.html @@ -13,7 +13,7 @@
- ` +
diff --git a/erp/src/main/resources/template/tpl/salesOrder/salesOrderToOutlet.html b/erp/src/main/resources/template/tpl/salesOrder/salesOrderToOutlet.html index 28a3e260a..95834bbff 100644 --- a/erp/src/main/resources/template/tpl/salesOrder/salesOrderToOutlet.html +++ b/erp/src/main/resources/template/tpl/salesOrder/salesOrderToOutlet.html @@ -13,7 +13,7 @@
- ` +
diff --git a/erp/src/main/resources/template/tpl/salesOrder/salesOrderToPreProductionPlan.html b/erp/src/main/resources/template/tpl/salesOrder/salesOrderToPreProductionPlan.html index 461b42f76..0529bf890 100644 --- a/erp/src/main/resources/template/tpl/salesOrder/salesOrderToPreProductionPlan.html +++ b/erp/src/main/resources/template/tpl/salesOrder/salesOrderToPreProductionPlan.html @@ -13,7 +13,7 @@
- ` +
diff --git a/erp/src/main/resources/template/tpl/salesOrder/salesOrderToReturns.html b/erp/src/main/resources/template/tpl/salesOrder/salesOrderToReturns.html index 469810845..3fb043f97 100644 --- a/erp/src/main/resources/template/tpl/salesOrder/salesOrderToReturns.html +++ b/erp/src/main/resources/template/tpl/salesOrder/salesOrderToReturns.html @@ -13,7 +13,7 @@
- ` +
diff --git a/erp/src/main/resources/template/tpl/salesOutlet/salesOutToOut.html b/erp/src/main/resources/template/tpl/salesOutlet/salesOutToOut.html index d8c9a4663..9d146eedb 100644 --- a/erp/src/main/resources/template/tpl/salesOutlet/salesOutToOut.html +++ b/erp/src/main/resources/template/tpl/salesOutlet/salesOutToOut.html @@ -13,7 +13,7 @@
- ` +
diff --git a/erp/src/main/resources/template/tpl/salesReturns/salesReturnsToPut.html b/erp/src/main/resources/template/tpl/salesReturns/salesReturnsToPut.html index 092b6d948..408ab51a0 100644 --- a/erp/src/main/resources/template/tpl/salesReturns/salesReturnsToPut.html +++ b/erp/src/main/resources/template/tpl/salesReturns/salesReturnsToPut.html @@ -13,7 +13,7 @@
- ` +
diff --git a/erp/src/main/resources/template/tpl/supplierContract/contractToOrder.html b/erp/src/main/resources/template/tpl/supplierContract/contractToOrder.html index 51bbce884..8cebbec1f 100644 --- a/erp/src/main/resources/template/tpl/supplierContract/contractToOrder.html +++ b/erp/src/main/resources/template/tpl/supplierContract/contractToOrder.html @@ -13,7 +13,7 @@
- ` +
diff --git a/pro/src/main/resources/template/js/project/projectList.js b/pro/src/main/resources/template/js/project/projectList.js index bfcd214b0..92cc953eb 100644 --- a/pro/src/main/resources/template/js/project/projectList.js +++ b/pro/src/main/resources/template/js/project/projectList.js @@ -158,7 +158,7 @@ layui.config({ layer.confirm("确定撤销申请吗?", {icon: 3, title: '撤销操作'}, function (index) { layer.close(index); AjaxPostUtil.request({url: sysMainMation.projectBasePath + "proproject010", params: {processInstanceId: data.processInstanceId}, type: 'json', method: "PUT", callback: function (json) { - winui.window.msg("撤销成功", {icon: 1, time: 2000}); + winui.window.msg("提交成功", {icon: 1, time: 2000}); loadTable(); }}); }); diff --git a/seal-service/src/main/resources/template/js/sealApply/sealApplyList.js b/seal-service/src/main/resources/template/js/sealApply/sealApplyList.js index 88727fcf4..b804b1993 100644 --- a/seal-service/src/main/resources/template/js/sealApply/sealApplyList.js +++ b/seal-service/src/main/resources/template/js/sealApply/sealApplyList.js @@ -125,7 +125,7 @@ layui.config({ layer.confirm("确定撤销申请吗?", {icon: 3, title: '撤销操作'}, function (index) { layer.close(index); AjaxPostUtil.request({url: sysMainMation.sealServiceBasePath + "revokeSealApply", params: {processInstanceId: data.processInstanceId}, type: 'json', method: "PUT", callback: function (json) { - winui.window.msg("撤销成功", {icon: 1, time: 2000}); + winui.window.msg("提交成功", {icon: 1, time: 2000}); loadTable(); }}); }); diff --git a/web/src/main/resources/template/assets/lib/layui/customer/erpOrderUtil.js b/web/src/main/resources/template/assets/lib/layui/customer/erpOrderUtil.js index c281d4983..330034fb8 100644 --- a/web/src/main/resources/template/assets/lib/layui/customer/erpOrderUtil.js +++ b/web/src/main/resources/template/assets/lib/layui/customer/erpOrderUtil.js @@ -36,7 +36,7 @@ var erpOrderUtil = { approvalId: approvalId }; AjaxPostUtil.request({url: sysMainMation.erpBasePath + "erpcommon006", params: params, method: "PUT", type: 'json', callback: function(json) { - winui.window.msg("提交成功。", {icon: 1, time: 2000}); + winui.window.msg("提交成功", {icon: 1, time: 2000}); if (typeof (callback) == "function") { callback(); } @@ -58,7 +58,7 @@ var erpOrderUtil = { serviceClassName: serviceClassName }; AjaxPostUtil.request({url: sysMainMation.erpBasePath + "erpcommon003", params: params, type: 'json', method: "PUT", callback: function(json) { - winui.window.msg("撤销成功。", {icon: 1, time: 2000}); + winui.window.msg("提交成功", {icon: 1, time: 2000}); if (typeof(callback) == "function") { callback(); } -- GitLab