From 44dab0e035157198fe42ca91fc6ddc5f4b44257d 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, 14 Jan 2025 17:48:24 +0800
Subject: [PATCH] =?UTF-8?q?[fix]=20=E9=94=80=E5=94=AE=E7=AE=A1=E7=90=86=20?=
 =?UTF-8?q?=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95=20=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E7=BB=8F=E7=90=86=E3=80=81=E6=80=BB=E7=BB=8F?=
 =?UTF-8?q?=E7=90=86=E5=AE=A1=E6=89=B9=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=EF=BC=8C=E8=B0=83=E6=95=B4=E8=A1=A8=E5=8D=95?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E6=95=88=E6=9E=9C=EF=BC=8C=E5=AE=A1=E6=89=B9?=
 =?UTF-8?q?=E6=84=8F=E8=A7=81=E5=92=8C=E6=89=B9=E6=B3=A8=E7=A7=BB=E5=88=B0?=
 =?UTF-8?q?=E4=B8=8A=E9=83=A8=E5=92=8C=E8=AE=A2=E5=8D=95=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E5=88=86=E9=9A=94=E5=BC=80=E6=9D=A5=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/salesOrder/taskYwjlVerify.html     | 46 ++++++++++-------
 .../system/salesOrder/taskZozjVerify.html     | 51 +++++++++++--------
 2 files changed, 57 insertions(+), 40 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/templates/system/salesOrder/taskYwjlVerify.html b/ruoyi-admin/src/main/resources/templates/system/salesOrder/taskYwjlVerify.html
index 0661183f..ce77551f 100644
--- a/ruoyi-admin/src/main/resources/templates/system/salesOrder/taskYwjlVerify.html
+++ b/ruoyi-admin/src/main/resources/templates/system/salesOrder/taskYwjlVerify.html
@@ -19,6 +19,12 @@
         <input name="instanceId" th:field="*{instanceId}" type="hidden">
         <input name="instanceType" th:field="*{instanceType}" type="hidden">
         <input type="hidden" name="p_COM_comment" />
+        <div class="form-group">
+            <label class="col-sm-3 control-label is-required">销售订单编号：</label>
+            <div class="col-sm-8">
+                <input name="salesOrderCode" class="form-control" th:field="*{salesOrderCode}" type="text" required readonly>
+            </div>
+        </div>
         <div class="form-group">
             <label class="col-sm-3 control-label">申请人：</label>
             <div class="col-sm-8">
@@ -46,12 +52,29 @@
                 <input name="salesOrderID" class="form-control" th:field="*{salesOrderId}" type="number" required >
             </div>
         </div>
-        <div class="form-group" hidden="hidden">
-            <label class="col-sm-3 control-label is-required">销售订单编号：</label>
+
+        <div class="form-group">
+            <label class="col-sm-3 control-label" for="ywjlVerifyApproved"><span style="color: red; ">*</span>审批意见：</label>
             <div class="col-sm-8">
-                <input name="salesOrderCode" class="form-control" th:field="*{salesOrderCode}" type="text" required readonly>
+                <select name="p_B_ywjlVerifyApproved" id="ywjlVerifyApproved" class="form-control m-b" required>
+                    <option value=""></option>
+                    <option value="true">同意</option>
+                    <option value="false">拒绝</option>
+                </select>
             </div>
         </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">批注：</label>
+            <div class="col-sm-8">
+                <textarea name="comment" class="form-control"></textarea>
+            </div>
+        </div>
+
+        <div class="col-xs-11" style="margin-left: 20px;">
+            <hr style="border-top: 1px dashed blue;border-bottom: 1px dashed blue;margin-top: 0px;">
+            <h3 style="margin-top: 0px;">订单信息</h3>
+        </div>
+
         <div class="form-group">
             <label class="col-sm-3 control-label is-required">客户ID：</label>
             <div class="col-sm-8">
@@ -251,22 +274,7 @@
                 <textarea name="cancelRemark" th:text="*{cancelRemark}" class="form-control" readonly></textarea>
             </div>
         </div>
-        <div class="form-group">
-            <label class="col-sm-3 control-label" for="ywjlVerifyApproved"><span style="color: red; ">*</span>审批意见：</label>
-            <div class="col-sm-8">
-                <select name="p_B_ywjlVerifyApproved" id="ywjlVerifyApproved" class="form-control m-b" required>
-                    <option value=""></option>
-                    <option value="true">同意</option>
-                    <option value="false">拒绝</option>
-                </select>
-            </div>
-        </div>
-        <div class="form-group">
-            <label class="col-sm-3 control-label">批注：</label>
-            <div class="col-sm-8">
-                <textarea name="comment" class="form-control"></textarea>
-            </div>
-        </div>
+
         <div class="container" style="display: none;">
             <h4 class="form-header h4">计算</h4>
             <div class="col-xs-12 form-row">
diff --git a/ruoyi-admin/src/main/resources/templates/system/salesOrder/taskZozjVerify.html b/ruoyi-admin/src/main/resources/templates/system/salesOrder/taskZozjVerify.html
index da82eff4..52cbfa57 100644
--- a/ruoyi-admin/src/main/resources/templates/system/salesOrder/taskZozjVerify.html
+++ b/ruoyi-admin/src/main/resources/templates/system/salesOrder/taskZozjVerify.html
@@ -19,6 +19,12 @@
         <input name="instanceId" th:field="*{instanceId}" type="hidden">
         <input name="instanceType" th:field="*{instanceType}" type="hidden">
         <input type="hidden" name="p_COM_comment" />
+        <div class="form-group">
+            <label class="col-sm-3 control-label is-required">销售订单编号：</label>
+            <div class="col-sm-8">
+                <input name="salesOrderCode" class="form-control" th:field="*{salesOrderCode}" type="text" required readonly>
+            </div>
+        </div>
         <div class="form-group">
             <label class="col-sm-3 control-label">申请人：</label>
             <div class="col-sm-8">
@@ -40,18 +46,36 @@
                 <input name="title" th:field="*{applyTitle}" class="form-control" type="text" disabled>
             </div>
         </div>
-        <div class="form-group" hidden="hidden">
-            <label class="col-sm-3 control-label is-required">订单索引号：</label>
+
+        <div class="form-group">
+            <label class="col-sm-3 control-label" for="zozjVerifyApproved"><span style="color: red; ">*</span>审批意见：</label>
             <div class="col-sm-8">
-                <input name="salesOrderID" class="form-control" th:field="*{salesOrderId}" type="number" required >
+                <select name="p_B_zozjVerifyApproved" id="zozjVerifyApproved" class="form-control m-b" required>
+                    <option value=""></option>
+                    <option value="true">同意</option>
+                    <option value="false">拒绝</option>
+                </select>
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">批注：</label>
+            <div class="col-sm-8">
+                <textarea name="comment" class="form-control"></textarea>
             </div>
         </div>
+
+        <div class="col-xs-11" style="margin-left: 20px;">
+            <hr style="border-top: 1px dashed blue;border-bottom: 1px dashed blue;margin-top: 0px;">
+            <h3 style="margin-top: 0px;">订单信息</h3>
+        </div>
+
         <div class="form-group" hidden="hidden">
-            <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="salesOrderCode" class="form-control" th:field="*{salesOrderCode}" type="text" required readonly>
+                <input name="salesOrderID" class="form-control" th:field="*{salesOrderId}" type="number" required >
             </div>
         </div>
+
         <div class="form-group">
             <label class="col-sm-3 control-label is-required">客户ID：</label>
             <div class="col-sm-8">
@@ -250,22 +274,7 @@
                 <textarea name="cancelRemark" th:text="*{cancelRemark}" class="form-control" readonly></textarea>
             </div>
         </div>
-        <div class="form-group">
-            <label class="col-sm-3 control-label" for="zozjVerifyApproved"><span style="color: red; ">*</span>审批意见：</label>
-            <div class="col-sm-8">
-                <select name="p_B_zozjVerifyApproved" id="zozjVerifyApproved" class="form-control m-b" required>
-                    <option value=""></option>
-                    <option value="true">同意</option>
-                    <option value="false">拒绝</option>
-                </select>
-            </div>
-        </div>
-        <div class="form-group">
-            <label class="col-sm-3 control-label">批注：</label>
-            <div class="col-sm-8">
-                <textarea name="comment" class="form-control"></textarea>
-            </div>
-        </div>
+
         <div class="container" style="display: none;">
             <h4 class="form-header h4">计算</h4>
             <div class="col-xs-12 form-row">