From 3f009eacfd8e1366d702dea83fbbc930fb76e5a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E6=99=93=E8=BF=AA?= <2596750866@qq.com>
Date: Tue, 27 Aug 2024 09:12:35 +0800
Subject: [PATCH] =?UTF-8?q?[feat]=20=E5=93=81=E8=B4=A8=E7=AE=A1=E7=90=86?=
=?UTF-8?q?=20=E5=85=A5=E5=BA=93=E5=89=8D=E9=80=80=E6=8D=A2=E8=B4=A7=20?=
=?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=85=A5=E5=BA=93=E5=89=8D=E9=80=80=E6=8D=A2?=
=?UTF-8?q?=E8=B4=A7=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2=EF=BC=8C=E8=A1=A8?=
=?UTF-8?q?=E5=8D=95=E5=85=83=E7=B4=A0=E8=AE=BE=E4=B8=BA=E5=8F=AF=E8=AF=BB?=
=?UTF-8?q?=EF=BC=8C=E4=BF=AE=E6=94=B9=E8=A1=A8=E6=A0=BC=E5=88=97=E6=98=BE?=
=?UTF-8?q?=E7=A4=BA=E7=BB=93=E6=9E=84=EF=BC=9B=20=E4=BF=AE=E6=94=B9?=
=?UTF-8?q?=E5=93=81=E8=B4=A8=E6=8A=A5=E5=91=8A=E6=8C=89=E9=92=AE=E8=B7=B3?=
=?UTF-8?q?=E8=BD=AC=E6=96=B9=E6=B3=95=EF=BC=9B=20=E4=BF=AE=E6=94=B9?=
=?UTF-8?q?=E5=85=A5=E5=BA=93=E5=89=8D=E5=93=81=E8=B4=A8=E6=8A=A5=E5=91=8A?=
=?UTF-8?q?=E9=A1=B5=E9=9D=A2=EF=BC=8C=E8=A1=A8=E5=8D=95=E5=85=83=E7=B4=A0?=
=?UTF-8?q?=E8=AE=BE=E4=B8=BA=E5=8F=AF=E8=AF=BB=EF=BC=8C=E4=BF=AE=E6=94=B9?=
=?UTF-8?q?=E8=A1=A8=E6=A0=BC=E5=88=97=E6=98=BE=E7=A4=BA=E7=BB=93=E6=9E=84?=
=?UTF-8?q?=EF=BC=9B=20=E4=BF=AE=E6=94=B9=E5=93=81=E8=B4=A8=E6=8A=A5?=
=?UTF-8?q?=E5=91=8A=E6=8C=89=E9=92=AE=E8=B7=B3=E8=BD=AC=E6=96=B9=E6=B3=95?=
=?UTF-8?q?=EF=BC=8C=E5=8E=BB=E9=99=A4=E5=A4=9A=E4=BD=99=E6=96=B9=E6=B3=95?=
=?UTF-8?q?=EF=BC=9B=20=E4=BF=AE=E6=94=B9=E5=85=A5=E5=BA=93=E5=90=8E?=
=?UTF-8?q?=E5=93=81=E8=B4=A8=E6=8A=A5=E5=91=8A=E9=A1=B5=E9=9D=A2=EF=BC=8C?=
=?UTF-8?q?=E5=8E=BB=E9=99=A4=E7=BC=96=E8=BE=91=E5=8A=9F=E8=83=BD=EF=BC=9B?=
=?UTF-8?q?=20=E4=BF=AE=E6=94=B9=E5=85=A5=E5=BA=93=E5=89=8D=E7=A1=AE?=
=?UTF-8?q?=E8=AE=A4=E4=BE=9B=E5=BA=94=E5=95=86=E9=A1=B5=E9=9D=A2=EF=BC=8C?=
=?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=A1=A8=E6=A0=BC=E5=88=97=E6=98=BE=E7=A4=BA?=
=?UTF-8?q?=E7=BB=93=E6=9E=84=EF=BC=8C=E4=BF=AE=E6=94=B9=E5=93=81=E8=B4=A8?=
=?UTF-8?q?=E6=8A=A5=E5=91=8A=E6=8C=89=E9=92=AE=E8=B7=B3=E8=BD=AC=E6=96=B9?=
=?UTF-8?q?=E6=B3=95=EF=BC=9B=20=E4=BF=AE=E6=94=B9=E5=85=A5=E5=BA=93?=
=?UTF-8?q?=E5=89=8D=E7=A1=AE=E8=AE=A4=E6=94=B6=E8=B4=A7=E9=A1=B5=E9=9D=A2?=
=?UTF-8?q?=EF=BC=8C=E4=BF=AE=E6=94=B9=E8=A1=A8=E6=A0=BC=E5=88=97=E6=98=BE?=
=?UTF-8?q?=E7=A4=BA=E7=BB=93=E6=9E=84=EF=BC=8C=E4=BF=AE=E6=94=B9=E5=93=81?=
=?UTF-8?q?=E8=B4=A8=E6=8A=A5=E5=91=8A=E6=8C=89=E9=92=AE=E8=B7=B3=E8=BD=AC?=
=?UTF-8?q?=E6=96=B9=E6=B3=95=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../afterQualityReportDetail.html | 8 +-
.../beforeConfirmDelivery.html | 34 +--
.../beforeHasConfirmSupplier.html | 40 +--
.../beforeQualityReportDetail.html | 262 +++++-------------
.../returnBeforeStorageDetail.html | 54 ++--
5 files changed, 139 insertions(+), 259 deletions(-)
diff --git a/ruoyi-admin/src/main/resources/templates/quality/refundsExchanges/afterQualityReportDetail.html b/ruoyi-admin/src/main/resources/templates/quality/refundsExchanges/afterQualityReportDetail.html
index e517000a..857d3875 100644
--- a/ruoyi-admin/src/main/resources/templates/quality/refundsExchanges/afterQualityReportDetail.html
+++ b/ruoyi-admin/src/main/resources/templates/quality/refundsExchanges/afterQualityReportDetail.html
@@ -58,12 +58,6 @@
var $table = $("#bootstrap-afterUnqualifiedDetail-table");
- $("input[name='inspectionTime']").datetimepicker({
- format: "yyyy-mm-dd",
- minView: "month",
- autoclose: true
- });
-
$("#form-afterQualityReportDetail-edit").validate({
focusCleanup: true
@@ -81,7 +75,7 @@
var options = {
id:"bootstrap-afterUnqualifiedDetail-table",
url: ctx + "quality/refundsExchanges/getAfterQualityReportDetail",
- modalName: "收款凭证",
+ modalName: "不合格分类",
showColumns: false,
pagination: false,
showToggle: false,
diff --git a/ruoyi-admin/src/main/resources/templates/quality/refundsExchanges/beforeConfirmDelivery.html b/ruoyi-admin/src/main/resources/templates/quality/refundsExchanges/beforeConfirmDelivery.html
index beb720a7..e9fa65d1 100644
--- a/ruoyi-admin/src/main/resources/templates/quality/refundsExchanges/beforeConfirmDelivery.html
+++ b/ruoyi-admin/src/main/resources/templates/quality/refundsExchanges/beforeConfirmDelivery.html
@@ -50,7 +50,11 @@
diff --git a/ruoyi-admin/src/main/resources/templates/quality/refundsExchanges/beforeQualityReportDetail.html b/ruoyi-admin/src/main/resources/templates/quality/refundsExchanges/beforeQualityReportDetail.html
index 4a5339d1..57f71a96 100644
--- a/ruoyi-admin/src/main/resources/templates/quality/refundsExchanges/beforeQualityReportDetail.html
+++ b/ruoyi-admin/src/main/resources/templates/quality/refundsExchanges/beforeQualityReportDetail.html
@@ -4,32 +4,38 @@