From 32530c083ab7d75556165d8185425a6e618f0469 Mon Sep 17 00:00:00 2001
From: wangcl <clwangz@qq.com>
Date: Wed, 29 Dec 2021 16:49:56 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E9=A1=B5=E9=9D=A2=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=EF=BC=8C=E5=8E=BB=E6=8E=89=E8=BD=AC=E6=8D=A2=E6=AF=94?=
 =?UTF-8?q?=E4=BE=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/templates/busi/order/add.html   | 14 +++++++-------
 .../main/resources/templates/busi/order/edit.html  | 14 +++++++-------
 .../main/resources/templates/busi/order/order.html |  6 +-----
 3 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/templates/busi/order/add.html b/ruoyi-admin/src/main/resources/templates/busi/order/add.html
index 3b84f0bec..e80d11039 100644
--- a/ruoyi-admin/src/main/resources/templates/busi/order/add.html
+++ b/ruoyi-admin/src/main/resources/templates/busi/order/add.html
@@ -28,7 +28,7 @@
                 </div>
             </div>
             <div class="form-group">    
-                <label class="col-sm-3 control-label is-required ">订单价格：</label>
+                <label class="col-sm-3 control-label is-required ">单价：</label>
                 <div class="col-sm-8">
                     <input name="price" class="form-control number" type="text" required>
                 </div>
@@ -41,12 +41,12 @@
                     </select>
                 </div>
             </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label is-required" title="分料时，布匹长度由米转换为件时使用">转换比例(米/件)：<i class="fa fa-question-circle-o"></i></label>
-                <div class="col-sm-8">
-                    <input name="ratio" class="form-control number" type="text" required>
-                </div>
-            </div>
+<!--            <div class="form-group">    -->
+<!--                <label class="col-sm-3 control-label is-required" title="分料时，布匹长度由米转换为件时使用">转换比例(米/件)：<i class="fa fa-question-circle-o"></i></label>-->
+<!--                <div class="col-sm-8">-->
+<!--                    <input name="ratio" class="form-control number" type="text" required>-->
+<!--                </div>-->
+<!--            </div>-->
           <div class="form-group hidden">
                 <label class="col-sm-3 control-label">状态：</label>
                 <div class="col-sm-8">
diff --git a/ruoyi-admin/src/main/resources/templates/busi/order/edit.html b/ruoyi-admin/src/main/resources/templates/busi/order/edit.html
index 64ce005a6..712c54c70 100644
--- a/ruoyi-admin/src/main/resources/templates/busi/order/edit.html
+++ b/ruoyi-admin/src/main/resources/templates/busi/order/edit.html
@@ -28,7 +28,7 @@
                 </div>
             </div>
             <div class="form-group">    
-                <label class="col-sm-3 control-label is-required">订单价格：</label>
+                <label class="col-sm-3 control-label is-required">单价：</label>
                 <div class="col-sm-8">
                     <input name="price" th:field="*{price}" class="form-control" type="text" required>
                 </div>
@@ -41,12 +41,12 @@
                     </select>
                 </div>
             </div>
-            <div class="form-group">
-                <label class="col-sm-3 control-label is-required" title="分料时，布匹长度由米转换为件时使用">转换比例(米/件)：<i class="fa fa-question-circle-o"></i></label>
-                <div class="col-sm-8">
-                    <input name="ratio" th:field="*{ratio}" class="form-control" type="text" required>
-                </div>
-            </div>
+<!--            <div class="form-group">-->
+<!--                <label class="col-sm-3 control-label is-required" title="分料时，布匹长度由米转换为件时使用">转换比例(米/件)：<i class="fa fa-question-circle-o"></i></label>-->
+<!--                <div class="col-sm-8">-->
+<!--                    <input name="ratio" th:field="*{ratio}" class="form-control" type="text" required>-->
+<!--                </div>-->
+<!--            </div>-->
             <!--<div class="form-group">
                 <label class="col-sm-3 control-label">状态：</label>
                 <div class="col-sm-8">
diff --git a/ruoyi-admin/src/main/resources/templates/busi/order/order.html b/ruoyi-admin/src/main/resources/templates/busi/order/order.html
index 14cba8c1c..7fd60ac9c 100644
--- a/ruoyi-admin/src/main/resources/templates/busi/order/order.html
+++ b/ruoyi-admin/src/main/resources/templates/busi/order/order.html
@@ -103,7 +103,7 @@
                 },
                 {
                     field: 'price',
-                    title: '订单价格'
+                    title: '单价'
                 },
                 {
                     field: 'classify',
@@ -112,10 +112,6 @@
                        return $.table.selectDictLabel(classifyDatas, value);
                     }
                 },
-                {
-                    field: 'ratio',
-                    title: '转换比例(米/件)'
-                },
                 {
                     field: 'status',
                     title: '状态',