From a81589744a108f8e619b65bfef44d259a7f9f613 Mon Sep 17 00:00:00 2001
From: wangjiuyun <1595161655@qq.com>
Date: Mon, 26 May 2025 16:25:01 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=90=8C=E6=B8=85=E5=8D=95=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/templates/manage/order/add.html | 14 ++++++++------
 .../resources/templates/manage/order/edit.html     | 12 +++++++-----
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/templates/manage/order/add.html b/ruoyi-admin/src/main/resources/templates/manage/order/add.html
index 7d8d943c..eba56013 100644
--- a/ruoyi-admin/src/main/resources/templates/manage/order/add.html
+++ b/ruoyi-admin/src/main/resources/templates/manage/order/add.html
@@ -184,6 +184,8 @@
     function submitHandler() {
         if ($.validate.form()) {
             $.operate.save(prefix + "/add", $('#form-order-add').serialize());
+        }else{
+            $.modal.alertWarning("请完善表单必填项");
         }
     }
 
@@ -218,7 +220,7 @@
                     align: 'center',
                     title: 'BOM编码',
                     formatter: function (value, row, index) {
-                        var html = $.common.sprintf("<input readonly class='form-control' type='text' name='orderListList[%s].productCode' value='%s'>", index, value);
+                        var html = $.common.sprintf("<input readonly class='form-control' type='text' name='orderListList[%s].productCode' value='%s' required>", index, value);
                         return html;
                     }
                 },
@@ -227,7 +229,7 @@
                     align: 'center',
                     title: '产品名称',
                     formatter: function (value, row, index) {
-                        var html = $.common.sprintf("<input readonly class='form-control' type='text' name='orderListList[%s].productName' value='%s'>", index, value);
+                        var html = $.common.sprintf("<input readonly class='form-control' type='text' name='orderListList[%s].productName' value='%s' required>", index, value);
                         return html;
                     }
                 },
@@ -236,7 +238,7 @@
                     align: 'center',
                     title: '数量',
                     formatter: function (value, row, index) {
-                        var html = $.common.sprintf("<input readonly class='form-control quantity' type='number' name='orderListList[%s].quantity' value='%s'>", index, value);
+                        var html = $.common.sprintf("<input readonly class='form-control quantity' type='number' name='orderListList[%s].quantity' value='%s' required>", index, value);
                         return html;
                     }
                 },
@@ -245,7 +247,7 @@
                     align: 'center',
                     title: '单价',
                     formatter: function (value, row, index) {
-                        var html = $.common.sprintf("<input readonly class='form-control price' type='number' name='orderListList[%s].price' value='%s'>", index, value);
+                        var html = $.common.sprintf("<input readonly class='form-control price' type='number' name='orderListList[%s].price' value='%s' required>", index, value);
                         return html;
                     }
                 },
@@ -255,7 +257,7 @@
                     title: '折扣',
                     width: 90,
                     formatter: function (value, row, index) {
-                        var html = $.common.sprintf("<input readonly class='form-control discount' type='number' name='orderListList[%s].discount' value='%s' step='0.0001' max='1' min='0'>", index, value);
+                        var html = $.common.sprintf("<input readonly class='form-control discount' type='number' name='orderListList[%s].discount' value='%s' step='0.0001' max='1' min='0' required>", index, value);
                         return html;
                     }
                 },
@@ -264,7 +266,7 @@
                     align: 'center',
                     title: '总价',
                     formatter: function (value, row, index) {
-                        var html = $.common.sprintf("<input readonly class='form-control amount' type='number' name='orderListList[%s].amount' value='%s'>", index, value);
+                        var html = $.common.sprintf("<input readonly class='form-control amount' type='number' name='orderListList[%s].amount' value='%s' required>", index, value);
                         return html;
                     }
                 },
diff --git a/ruoyi-admin/src/main/resources/templates/manage/order/edit.html b/ruoyi-admin/src/main/resources/templates/manage/order/edit.html
index 5f82f359..3f3558d3 100644
--- a/ruoyi-admin/src/main/resources/templates/manage/order/edit.html
+++ b/ruoyi-admin/src/main/resources/templates/manage/order/edit.html
@@ -192,6 +192,8 @@
     function submitHandler() {
         if ($.validate.form()) {
             $.operate.save(prefix + "/edit", $('#form-order-edit').serialize());
+        }else{
+            $.modal.alertWarning("请完善表单必填项");
         }
     }
 
@@ -272,7 +274,7 @@
             return;
         }
         $('[name="orderPartnerCode"]').val(rows[0].partnerCode);
-        $('[name="orderPartnerName"]').val(rows[0].partnerCode);
+        $('[name="orderPartnerName"]').val(rows[0].partnerName);
 
 
         $.modal.close(index);
@@ -408,7 +410,7 @@
                     align: 'center',
                     title: '数量',
                     formatter: function (value, row, index) {
-                        var html = $.common.sprintf("<input readonly class='form-control quantity' type='text' name='orderListList[%s].quantity' value='%s'>", index, value);
+                        var html = $.common.sprintf("<input readonly class='form-control quantity' type='text' name='orderListList[%s].quantity' value='%s' required>", index, value);
                         return html;
                     }
                 },
@@ -417,7 +419,7 @@
                     align: 'center',
                     title: '单价',
                     formatter: function (value, row, index) {
-                        var html = $.common.sprintf("<input readonly class='form-control price' type='text' name='orderListList[%s].price' value='%s'>", index, value);
+                        var html = $.common.sprintf("<input readonly class='form-control price' type='text' name='orderListList[%s].price' value='%s' required>", index, value);
                         return html;
                     }
                 },
@@ -427,7 +429,7 @@
                     title: '折扣',
                     width:90,
                     formatter: function (value, row, index) {
-                        var html = $.common.sprintf("<input readonly class='form-control discount' type='number' name='orderListList[%s].discount' value='%s' step='0.0001' max='1' min='0'>", index, value);
+                        var html = $.common.sprintf("<input readonly class='form-control discount' type='number' name='orderListList[%s].discount' value='%s' step='0.0001' max='1' min='0' required>", index, value);
                         return html;
                     }
                 },
@@ -437,7 +439,7 @@
                     align: 'center',
                     title: '总价',
                     formatter: function (value, row, index) {
-                        var html = $.common.sprintf("<input readonly class='form-control amount' type='text' name='orderListList[%s].amount' value='%s'>", index, value);
+                        var html = $.common.sprintf("<input readonly class='form-control amount' type='text' name='orderListList[%s].amount' value='%s' required>", index, value);
                         return html;
                     }
                 },