From 6b617f0b2650a7f90a741d0cc91ae6dc4f94651d Mon Sep 17 00:00:00 2001
From: wangjiuyun <1595161655@qq.com>
Date: Tue, 27 May 2025 15:57:17 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=90=8C=E6=A1=A3=E6=A1=88=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/templates/manage/order/add.html | 41 ++++++++++++-------
 .../templates/manage/order/edit.html          | 34 ++++++++++-----
 2 files changed, 50 insertions(+), 25 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 eba56013..7a46608e 100644
--- a/ruoyi-admin/src/main/resources/templates/manage/order/add.html
+++ b/ruoyi-admin/src/main/resources/templates/manage/order/add.html
@@ -5,14 +5,14 @@
     <th:block th:include="include :: datetimepicker-css"/>
 </head>
 <style>
-    .customerBox {
-        display: flex;
-        flex-direction: column;
+    input[name="versionCode"]::-webkit-inner-spin-button,
+    input[name="versionCode"]::-webkit-outer-spin-button {
+        transform: scale(1.2);
+    }
+    label[for="versionCode"]{
+        margin-right: 20px;
     }
 
-    .customerBox div {
-        padding-left: 25px !important;
-    }
 </style>
 <body class="white-bg">
 <div class="wrapper wrapper-content animated fadeInRight ibox-content">
@@ -38,7 +38,7 @@
             <div class="form-group">
                 <label class="col-sm-4 control-label is-required">版本号：</label>
                 <div class="col-sm-8">
-                    <input name="versionCode" class="form-control" type="number" max="100" required>
+                    <input name="versionCode" class="form-control" type="number" max="100" min="0" required>
                 </div>
             </div>
         </div>
@@ -55,7 +55,8 @@
                 <label class="col-sm-4 control-label is-required">合同类型：</label>
                 <div class="col-sm-8">
                     <select name="orderType" class="form-control" th:with="type=${@dict.getType('order_type')}"
-                            required>
+                           onchange="changeOrderType()" required>
+                        <option value="">请选择合同类型</option>
                         <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
                                 th:value="${dict.dictValue}"></option>
                     </select>
@@ -124,13 +125,13 @@
             <div class="form-group">
                 <label class="col-sm-4 control-label is-required">客户联系人：</label>
                 <div class="col-sm-8">
-                    <input name="customerContact" class="form-control" type="text">
+                    <input name="customerContact" class="form-control" type="text" required>
                 </div>
             </div>
         </div>
         <div class="col-sm-6">
             <div class="form-group">
-                <label class="col-sm-4 control-label is-required">客户邮箱：</label>
+                <label class="col-sm-4 control-label">客户邮箱：</label>
                 <div class="col-sm-8">
                     <input name="customerEmail" class="form-control" type="text">
                 </div>
@@ -141,7 +142,7 @@
             <div class="form-group">
                 <label class="col-sm-4 control-label is-required">客户电话：</label>
                 <div class="col-sm-8">
-                    <input name="customerPhone" class="form-control" type="text">
+                    <input name="customerPhone" class="form-control" type="text" required>
                 </div>
             </div>
         </div>
@@ -296,6 +297,10 @@
             top: '30px',
             left: '300px'
         });
+
+        $('[name="versionCode"]').on('focus',function (){
+            $(this).blur()
+        })
     });
 
     function addRow(row) {
@@ -461,9 +466,17 @@
         let res = Number((price * quantity * discount).toFixed(2))
         $(ele).parent().parent().find('.amount').val(res)
     }
-    $('[name="versionCode"]').on('focus',function (){
-        $(this).blur()
-    })
+    function changeOrderType(){
+    let orderType=$('[name="orderType"]').val()
+        if(orderType=='zq'){
+            $('[name="orderPartnerName"]').removeAttr('required')
+            $('[name="orderPartnerName"]').parent().parent().parent().find('label').removeClass('is-required')
+        }else{
+            $('[name="orderPartnerName"]').attr('required',true)
+            $('[name="orderPartnerName"]').parent().parent().parent().find('label').addClass('is-required')
+        }
+    }
+
 </script>
 </body>
 </html>
\ No newline at end of file
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 3f3558d3..4a2cd06d 100644
--- a/ruoyi-admin/src/main/resources/templates/manage/order/edit.html
+++ b/ruoyi-admin/src/main/resources/templates/manage/order/edit.html
@@ -7,9 +7,8 @@
         .hideTd {
             display: none;
         }
-
-        .customerBox div {
-            padding-left: 25px !important;
+        label[for="versionCode"]{
+            margin-right: 20px;
         }
     </style>
 </head>
@@ -38,7 +37,7 @@
             <div class="form-group">
                 <label class="col-sm-4 control-label is-required">版本号：</label>
                 <div class="col-sm-8">
-                    <input name="versionCode" th:field="*{versionCode}" class="form-control" type="text" max="100" required>
+                    <input name="versionCode" th:field="*{versionCode}" class="form-control" type="text" max="100" min="0" required>
                 </div>
             </div>
         </div>
@@ -55,7 +54,7 @@
                 <label class="col-sm-4 control-label is-required">合同类型：</label>
                 <div class="col-sm-8">
                     <select name="orderType" class="form-control" th:with="type=${@dict.getType('order_type')}"
-                            required>
+                         onchange="changeOrderType()"   required>
                         <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
                                 th:field="*{orderType}"></option>
                     </select>
@@ -131,14 +130,14 @@
                 <label class="col-sm-4 control-label is-required">客户联系人：</label>
                 <div class="col-sm-8">
                     <input name="customerContact" th:field="*{customerContact}" class="form-control"
-                           type="text">
+                           type="text" required>
                 </div>
             </div>
 
         </div>
         <div class="col-sm-6">
             <div class="form-group">
-                <label class="col-sm-4 control-label is-required">客户邮箱：</label>
+                <label class="col-sm-4 control-label">客户邮箱：</label>
                 <div class="col-sm-8">
                     <input name="customerEmail" th:field="*{customerEmail}" class="form-control" type="text">
                 </div>
@@ -148,7 +147,7 @@
             <div class="form-group">
                 <label class="col-sm-4 control-label is-required">客户电话：</label>
                 <div class="col-sm-8">
-                    <input name="customerPhone" th:field="*{customerPhone}" class="form-control" type="text">
+                    <input name="customerPhone" th:field="*{customerPhone}" class="form-control" type="text" required>
                 </div>
             </div>
 
@@ -329,6 +328,10 @@
             top: '30px',
             left: '300px'
         });
+        $('[name="versionCode"]').on('focus',function (){
+            $(this).blur()
+        })
+        changeOrderType()
     });
 
     function downloadTem() {
@@ -462,9 +465,18 @@
             $(this).blur()
         })
     }
-    $('[name="versionCode"]').on('focus',function (){
-        $(this).blur()
-    })
+
+    function changeOrderType(){
+        let orderType=$('[name="orderType"]').val()
+        if(orderType=='zq'){
+            $('[name="orderPartnerName"]').removeAttr('required')
+            $('[name="orderPartnerName"]').parent().parent().parent().find('label').removeClass('is-required')
+        }else{
+            $('[name="orderPartnerName"]').attr('required',true)
+            $('[name="orderPartnerName"]').parent().parent().parent().find('label').addClass('is-required')
+        }
+    }
+
 </script>
 </body>
 </html>
\ No newline at end of file
