diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSalesOrderServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSalesOrderServiceImpl.java
index cb8fa326..6e3f5847 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSalesOrderServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSalesOrderServiceImpl.java
@@ -170,6 +170,9 @@ public class SysSalesOrderServiceImpl implements ISysSalesOrderService
     public int insertSysSalesOrder(SysSalesOrder sysSalesOrder){
         String loginName = ShiroUtils.getLoginName();
         sysSalesOrder.setCreateBy(loginName);
+        sysSalesOrder.setCreateTime(DateUtils.getNowDate());
+        sysSalesOrder.setApplyUser(loginName);
+        sysSalesOrder.setApplyTime(DateUtils.getNowDate());
         int result = sysSalesOrderMapper.insertSysSalesOrder(sysSalesOrder);
         sysSalesOrder.getSalesOrderId();
         int s = sysSalesOrder.getSysSalesOrderChildList().size();
@@ -195,23 +198,7 @@ public class SysSalesOrderServiceImpl implements ISysSalesOrderService
     @Override
     public int updateSysSalesOrder(SysSalesOrder sysSalesOrder)
     {
-        sysSalesOrder.setAuditStatus("0");
-        SysUser user = ShiroUtils.getSysUser();
-        // 启动流程
-        String applyTitle = user.getUserName()+"发起了修改销售订单审批-"+ DateUtils.dateTimeNow();
-        String instanceType = "cancel";
-        ProcessInstance processInstance = startProcessInstance(applyTitle,instanceType,sysSalesOrder, user);
-        String processInstanceId = processInstance.getProcessInstanceId();
-        // 作废实例id
-        sysSalesOrder.setCancelInstanceId(processInstanceId);
         // 存在提交完就流程结束的情况
-        boolean processIsFinish = processService.judgeProcessIsFinish(processInstanceId);
-        if(processIsFinish){
-            // 审核状态-审核通过
-            sysSalesOrder.setAuditStatus("1");
-            // 使用状态-已作废
-            sysSalesOrder.setUseStatus("2");
-        };
         List<SysSalesOrderChild> sysSalesOrderChildList = sysSalesOrder.getSysSalesOrderChildList();
         for (SysSalesOrderChild sysSalesOrderChild:sysSalesOrderChildList) {
             if (sysSalesOrderChild.getId() != null && sysSalesOrderChild.getId() != 0){
@@ -224,7 +211,6 @@ public class SysSalesOrderServiceImpl implements ISysSalesOrderService
         int result = sysSalesOrderMapper.updateSysSalesOrder(sysSalesOrder);
         return result;
     }
-
     /**
      * 删除销售订单对象
      * 
@@ -364,7 +350,7 @@ public class SysSalesOrderServiceImpl implements ISysSalesOrderService
     private void buildAuthority(SysUser user, Map<String, Object> variables) {
         Set<String> roleKeys = roleService.selectRoleKeys(user.getUserId());
         // 角色不同审核人不同
-       if(roleKeys.contains("ywzgRole")){
+        if(roleKeys.contains("ywzgRole")){
             variables.put("authority",3);
         }else if(roleKeys.contains("ywjlRole")){
             variables.put("authority",2);
diff --git a/ruoyi-admin/src/main/resources/mapper/system/SysSalesOrderMapper.xml b/ruoyi-admin/src/main/resources/mapper/system/SysSalesOrderMapper.xml
index 26141660..6643e75c 100644
--- a/ruoyi-admin/src/main/resources/mapper/system/SysSalesOrderMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/system/SysSalesOrderMapper.xml
@@ -195,7 +195,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="applyUser != null">apply_user,</if>
             <if test="applyTime != null">apply_time,</if>
             <if test="applyTitle != null">apply_title,</if>
-            first_add_time,create_time
+            <if test="createTime!= null and createTime != ''">create_time,</if>
+            first_add_time,
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="salesOrderCode != null">#{salesOrderCode},</if>
@@ -254,7 +255,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="applyUser != null">#{applyUser},</if>
             <if test="applyTime != null">#{applyTime},</if>
             <if test="applyTitle != null">#{applyTitle},</if>
-            now(),now()
+            <if test="createTime!= null and createTime != ''">#{createTime},</if>
+            now()
          </trim>
     </insert>
     <update id="updateSysSalesOrder" parameterType="SysSalesOrderVo">
diff --git a/ruoyi-admin/src/main/resources/templates/system/salesOrder/detail.html b/ruoyi-admin/src/main/resources/templates/system/salesOrder/detail.html
index 573eef0c..11959ce3 100644
--- a/ruoyi-admin/src/main/resources/templates/system/salesOrder/detail.html
+++ b/ruoyi-admin/src/main/resources/templates/system/salesOrder/detail.html
@@ -156,7 +156,6 @@
             <div class="col-sm-8">
                 <select name="salesOrderType" class="form-control"
                         th:with="dictList=${@dict.getType('sys_order_type')}" th:field="*{salesOrderType}" required disabled>
-                    <option value="">请选择</option>
                     <option th:each="dict : ${dictList}" th:value="${dict.dictValue}" th:text="${dict.dictLabel}"></option>
                 </select>
             </div>
@@ -241,8 +240,8 @@
             <label class="col-sm-3 control-label">计划交付时间：</label>
             <div class="col-sm-8">
                 <div class="input-group date">
-                    <input name="deliveryTime" class="form-control" placeholder="yyyy-mm-dd" type="text" th:field="*{deliveryTime}" />
-                    <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                    <input name="deliveryTime" class="form-control" placeholder="yyyy-mm-dd" type="text" disabled/>
+                    <span class="input-group-addon" th:value="${#dates.format(sysSalesOrder.deliveryTime, 'yyyy-MM-dd HH:mm')}" disabled><i class="fa fa-calendar"></i></span>
                 </div>
             </div>
         </div>
diff --git a/ruoyi-admin/src/main/resources/templates/system/salesOrder/edit.html b/ruoyi-admin/src/main/resources/templates/system/salesOrder/edit.html
index 4386946c..ab32ce3b 100644
--- a/ruoyi-admin/src/main/resources/templates/system/salesOrder/edit.html
+++ b/ruoyi-admin/src/main/resources/templates/system/salesOrder/edit.html
@@ -237,8 +237,8 @@
             <label class="col-sm-3 control-label">计划交付时间：</label>
             <div class="col-sm-8">
                 <div class="input-group date">
-                    <input name="deliveryTime" class="form-control" placeholder="yyyy-mm-dd" type="text" th:field="*{deliveryTime}" />
-                    <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                    <input name="deliveryTime" class="form-control" placeholder="yyyy-mm-dd" type="text" />
+                    <span class="input-group-addon" th:value="${#dates.format(sysSalesOrder.deliveryTime, 'yyyy-MM-dd HH:mm')}><i class="fa fa-calendar"></i></span>
                 </div>
             </div>
         </div>
@@ -246,8 +246,8 @@
             <label class="col-sm-3 control-label">客户验收时间：</label>
             <div class="col-sm-8">
                 <div class="input-group date">
-                    <input name="modificationTime" th:field="*{modificationTime}" class="form-control" placeholder="yyyy-mm-dd" type="text" />
-                    <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                    <input name="modificationTime"  class="form-control" placeholder="yyyy-mm-dd" type="text" />
+                    <span class="input-group-addon" th:value="${#dates.format(sysSalesOrder.modedification, 'yyyy-MM-dd HH:mm')}"><i class="fa fa-calendar"></i></span>
                 </div>
             </div>
         </div>
diff --git a/ruoyi-admin/src/main/resources/templates/system/salesOrder/taskModifyApply.html b/ruoyi-admin/src/main/resources/templates/system/salesOrder/taskModifyApply.html
index 41e8935b..20f58eb1 100644
--- a/ruoyi-admin/src/main/resources/templates/system/salesOrder/taskModifyApply.html
+++ b/ruoyi-admin/src/main/resources/templates/system/salesOrder/taskModifyApply.html
@@ -4,6 +4,11 @@
     <th:block th:include="include :: header('驳回调整')" />
     <th:block th:include="include :: select2-css" />
     <link th:href="@{/ajax/libs/element-ui/element-ui.css}" rel="stylesheet"/>
+    <link th:href="@{/ajax/libs/select2/select2.css}" rel="stylesheet">
+    <link th:href="@{/ajax/libs/select2/select2-bootstrap.css}" rel="stylesheet">
+    <th:block th:include="include :: bootstrap-editable-css"/>
+    <th:block th:include="include :: bootstrap-fileinput-css"/>
+
 </head>
 <body class="white-bg">
 <div id="app" class="wrapper wrapper-content animated fadeInRight ibox-content">
@@ -48,9 +53,7 @@
         <div class="form-group">
             <label class="col-sm-3 control-label is-required">客户ID：</label>
             <div class="col-sm-8">
-                <select id="enterpriseCode" name="enterpriseCode" class="form-control m-b" th:field="*{enterpriseCode}" required>
-                    <option value="">请选择</option>
-                </select>
+                <input id="enterpriseCode" name="enterpriseCode" class="form-control m-b" th:field="*{enterpriseCode}" required />
             </div>
         </div>
         <div class="form-group">
@@ -68,8 +71,8 @@
         <div class="form-group">
             <label class="col-sm-3 control-label is-required">客户联系人：</label>
             <div class="col-sm-8">
-                <select id="customerContact" name="customerContact" th:field="*{customerContact}" class="form-control m-b" required>
-                </select>
+                <input id="customerContact" name="customerContact" th:field="*{customerContact}" class="form-control m-b" required />
+
             </div>
         </div>
         <div class="form-group">
@@ -119,7 +122,6 @@
             <label class="col-sm-3 control-label is-required">订单类型：</label>
             <div class="col-sm-8">
                 <select name="salesOrderType" class="form-control" type="text" th:with="dictList=${@dict.getType('sys_order_type')}" required>
-                    <option value="">请选择</option>
                     <option th:each="dict : ${dictList}" th:value="${dict.dictValue}" th:text="${dict.dictLabel}"></option>
                 </select>
             </div>
@@ -151,7 +153,7 @@
         <div class="form-group">
             <label class="col-sm-3 control-label is-required">美元汇率：</label>
             <div class="col-sm-8">
-                <input name="udsTax" class="form-control" th:field="*{udsTax}" type="text" required />
+                <input name="usdTax" class="form-control" th:field="*{udsTax}" type="text" required />
             </div>
         </div>
         <div class="form-group">
@@ -211,8 +213,8 @@
             <label class="col-sm-3 control-label">客户验收时间：</label>
             <div class="col-sm-8">
                 <div class="input-group date">
-                    <input name="" class="form-control" placeholder="yyyy-mm-dd" type="text">
-                    <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                    <input name="modificationTime"  class="form-control" placeholder="yyyy-mm-dd" type="text">
+                    <span class="input-group-addon" th:value="*{modificationTime}"><i class="fa fa-calendar"></i></span>
                 </div>
             </div>
         </div>
@@ -256,6 +258,17 @@
             </div>
         </div>
     </form>
+    <div class="container">
+        <div class="form-group">
+            <label class="col-sm-3 control-label" for="reApply">是否继续申请：</label>
+            <div class="col-sm-8">
+                <select id="reApply" name="p_B_reApply" class="form-control m-b">
+                    <option value="true">重新申请</option>
+                    <option value="false">结束流程</option>
+                </select>
+            </div>
+        </div>
+    </div>
     <div class="other-container">
         <div class="form-row">
             <div class="btn-group-sm" id="toolbars" role="group">
@@ -271,18 +284,10 @@
             </div>
         </div>
     </div>
-    <div class="form-group">
-        <label class="col-sm-3 control-label" for="reApply">是否继续申请：</label>
-        <div class="col-sm-8">
-            <select id="reApply" name="p_B_reApply" class="form-control m-b">
-                <option value="true">重新申请</option>
-                <option value="false">结束流程</option>
-            </select>
-        </div>
-    </div>
 </div>
 <th:block th:include="include :: footer" />
 <th:block th:include="include :: select2-js" />
+<th:block th:include="include :: datetimepicker-js"/>
 <script th:src="@{/js/activiti.js}"></script>
 <script th:src="@{/ajax/libs/vue/vue.js}"></script>
 <script th:src="@{/ajax/libs/element-ui/element-ui.js}"></script>
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 ac8026ba..a9f541df 100644
--- a/ruoyi-admin/src/main/resources/templates/system/salesOrder/taskYwjlVerify.html
+++ b/ruoyi-admin/src/main/resources/templates/system/salesOrder/taskYwjlVerify.html
@@ -4,6 +4,11 @@
     <th:block th:include="include :: header('业务经理审核')" />
     <th:block th:include="include :: select2-css" />
     <link th:href="@{/ajax/libs/element-ui/element-ui.css}" rel="stylesheet"/>
+    <link th:href="@{/ajax/libs/select2/select2.css}" rel="stylesheet">
+    <link th:href="@{/ajax/libs/select2/select2-bootstrap.css}" rel="stylesheet">
+    <th:block th:include="include :: bootstrap-editable-css"/>
+    <th:block th:include="include :: bootstrap-fileinput-css"/>
+
 </head>
 <body class="white-bg">
 <div id="app" class="wrapper wrapper-content animated fadeInRight ibox-content">
@@ -14,7 +19,7 @@
         <div class="form-group">
             <label class="col-sm-3 control-label">申请人：</label>
             <div class="col-sm-8">
-                <input name="applyUserName" th:field="*{applyUserName}" class="form-control" type="text" readonly>
+                <input name="applyUser" th:field="*{applyUser}" class="form-control" type="text" readonly>
             </div>
         </div>
         <div class="form-group">
@@ -22,14 +27,14 @@
             <div class="col-sm-8">
                 <div class="input-group date">
                     <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
-                    <input name="applyTime" th:value="${#dates.format(formData.applyTime, 'yyyy-MM-dd HH:mm')}"  class="form-control" type="text" disabled>
+                    <input name="applyTime" th:value="${#dates.format(formData.applyTime, 'yyyy-MM-dd HH:mm')}" class="form-control" type="text" disabled>
                 </div>
             </div>
         </div>
         <div class="form-group">
             <label class="col-sm-3 control-label">标题：</label>
             <div class="col-sm-8">
-                <input name="title" th:field="*{applyTitle}" class="form-control" type="text" readonly>
+                <input name="title" th:field="*{applyTitle}" class="form-control" type="text" disabled>
             </div>
         </div>
         <div class="form-group" hidden="hidden">
@@ -47,9 +52,7 @@
         <div class="form-group">
             <label class="col-sm-3 control-label is-required">客户ID：</label>
             <div class="col-sm-8">
-                <select id="enterpriseCode" name="enterpriseCode" class="form-control m-b" th:field="*{enterpriseCode}" required disabled>
-                    <option value="">请选择</option>
-                </select>
+                <input id="enterpriseCode" name="enterpriseCode" class="form-control m-b" th:field="*{enterpriseCode}" required disabled />
             </div>
         </div>
         <div class="form-group">
@@ -67,8 +70,7 @@
         <div class="form-group">
             <label class="col-sm-3 control-label is-required">客户联系人：</label>
             <div class="col-sm-8">
-                <select id="customerContact" name="customerContact" th:field="*{customerContact}" class="form-control m-b" required>
-                </select>
+                <input id="customerContact" name="customerContact" th:field="*{customerContact}" class="form-control m-b" required />
             </div>
         </div>
         <div class="form-group">
@@ -92,8 +94,7 @@
         <div class="form-group">
             <label class="col-sm-3 control-label is-required">客户收货人：</label>
             <div class="col-sm-8">
-                <select  name="customerDelivery"  th:field="*{customerDelivery}" class="form-control m-b" required>
-                </select>
+                <input name="customerDelivery"  th:field="*{customerDelivery}" class="form-control m-b" required>
             </div>
         </div>
         <div class="form-group">
@@ -118,7 +119,6 @@
             <label class="col-sm-3 control-label is-required">订单类型：</label>
             <div class="col-sm-8">
                 <select name="salesOrderType" class="form-control" type="text" th:with="dictList=${@dict.getType('sys_order_type')}" required>
-                    <option value="">请选择</option>
                     <option th:each="dict : ${dictList}" th:value="${dict.dictValue}" th:text="${dict.dictLabel}"></option>
                 </select>
             </div>
@@ -142,7 +142,7 @@
             <label class="col-sm-3 control-label">报价币种：</label>
             <div class="col-sm-8">
                 <select class="form-control" id="commonCurrency_add" name="commonCurrency"  disabled
-                        th:with="dictList=${@dict.getType('sys_common_currency')}" th:field="*{commonCurrency}" required>
+                        th:with="dictList=${@dict.getType('sys_common_currency')}" required>
                     <option th:each="dict : ${dictList}" th:value="${dict.dictValue}" th:text="${dict.dictLabel}"></option>
                 </select>
             </div>
@@ -150,7 +150,7 @@
         <div class="form-group">
             <label class="col-sm-3 control-label is-required">美元汇率：</label>
             <div class="col-sm-8">
-                <input name="udsTax" class="form-control" th:field="*{udsTax}" type="number" required disabled/>
+                <input name="usdTax" class="form-control" th:field="*{usdTax}" type="number" required disabled/>
             </div>
         </div>
         <div class="form-group">
@@ -210,8 +210,8 @@
             <label class="col-sm-3 control-label">客户验收时间：</label>
             <div class="col-sm-8">
                 <div class="input-group date">
-                    <input name="" class="form-control" placeholder="yyyy-mm-dd" type="text" disabled>
-                    <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                    <input name="modificationTime" class="form-control" placeholder="yyyy-mm-dd" type="text" disabled>
+                    <span class="input-group-addon" th:value="*{modificationTime}"><i class="fa fa-calendar"></i></span>
                 </div>
             </div>
         </div>
@@ -259,6 +259,24 @@
             </div>
         </div>
     </form>
+    <div class="container">
+        <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 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>
+    </div>
     <div class="other-container">
         <div class="form-row">
             <div class="btn-group-sm" id="toolbars" role="group">
@@ -270,23 +288,15 @@
         </div>
         <div class="row">
             <div class="col-sm-12 select-table table-striped">
-                <table id="bootstrap-sub-table-quoteChild"></table>
+                <table id="bootstrap-sub-table-editOrder"></table>
             </div>
         </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>
 <th:block th:include="include :: footer" />
 <th:block th:include="include :: select2-js" />
+<th:block th:include="include :: datetimepicker-js"/>
 <script th:src="@{/js/activiti.js}"></script>
 <script th:src="@{/ajax/libs/vue/vue.js}"></script>
 <script th:src="@{/ajax/libs/element-ui/element-ui.js}"></script>
@@ -684,15 +694,6 @@
             var taskId = [[${taskId}]];
             formData.push({"name": "sysSalesOrderChildList", "value": tableData});
             var jsonData = $.common.formDataToJson(formData);
-            $.operate.save(prefix + "/complete/" + taskId, jsonData);
-        }
-    }
-    function submitHandler() {
-        if ($.validate.form()) {
-            if ($('textarea[name="comment"]').val()) {
-                $('input[name="p_COM_comment"]').val($('textarea[name="comment"]').val());
-            }
-            var taskId = [[${taskId}]];
             $.operate.save(prefix + "/complete/" + taskId, $('#form-ywjl-audit').serialize());
         }
     }
diff --git a/ruoyi-admin/src/main/resources/templates/system/salesOrder/taskYwzgVerify.html b/ruoyi-admin/src/main/resources/templates/system/salesOrder/taskYwzgVerify.html
index f6a8972d..9067595a 100644
--- a/ruoyi-admin/src/main/resources/templates/system/salesOrder/taskYwzgVerify.html
+++ b/ruoyi-admin/src/main/resources/templates/system/salesOrder/taskYwzgVerify.html
@@ -4,6 +4,11 @@
     <th:block th:include="include :: header('业务主管审核')" />
     <th:block th:include="include :: select2-css" />
     <link th:href="@{/ajax/libs/element-ui/element-ui.css}" rel="stylesheet"/>
+    <link th:href="@{/ajax/libs/select2/select2.css}" rel="stylesheet">
+    <link th:href="@{/ajax/libs/select2/select2-bootstrap.css}" rel="stylesheet">
+    <th:block th:include="include :: bootstrap-editable-css"/>
+    <th:block th:include="include :: bootstrap-fileinput-css"/>
+
 </head>
 <body class="white-bg">
 <div id="app" class="wrapper wrapper-content animated fadeInRight ibox-content">
@@ -150,7 +155,7 @@
         <div class="form-group">
             <label class="col-sm-3 control-label is-required">美元汇率：</label>
             <div class="col-sm-8">
-                <input name="udsTax" class="form-control" th:field="*{udsTax}" type="text" required />
+                <input name="usdTax" class="form-control" th:field="*{usdTax}" type="text" required />
             </div>
         </div>
         <div class="form-group">
@@ -210,7 +215,7 @@
             <label class="col-sm-3 control-label">客户验收时间：</label>
             <div class="col-sm-8">
                 <div class="input-group date">
-                    <input name="" class="form-control" placeholder="yyyy-mm-dd" type="text">
+                    <input name="modificationTime" class="form-control" placeholder="yyyy-mm-dd" type="text">
                     <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
                 </div>
             </div>
@@ -259,6 +264,24 @@
             </div>
         </div>
     </form>
+    <div class="container">
+        <div class="form-group">
+            <label class="col-sm-3 control-label" for="ywzgVerifyApproved"><span style="color: red; ">*</span>审批意见：</label>
+            <div class="col-sm-8">
+                <select name="p_B_ywzgVerifyApproved" id="ywzgVerifyApproved" 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>
     <div class="other-container">
         <div class="form-row">
             <div class="btn-group-sm" id="toolbars" role="group">
@@ -274,25 +297,10 @@
             </div>
         </div>
     </div>
-    <div class="form-group">
-        <label class="col-sm-3 control-label" for="ywzgVerifyApproved"><span style="color: red; ">*</span>审批意见：</label>
-        <div class="col-sm-8">
-            <select name="p_B_ywzgVerifyApproved" id="ywzgVerifyApproved" 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>
 <th:block th:include="include :: footer" />
 <th:block th:include="include :: select2-js" />
+<th:block th:include="include :: datetimepicker-js"/>
 <script th:src="@{/js/activiti.js}"></script>
 <script th:src="@{/ajax/libs/vue/vue.js}"></script>
 <script th:src="@{/ajax/libs/element-ui/element-ui.js}"></script>
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 9801a6e0..0e2d3ff0 100644
--- a/ruoyi-admin/src/main/resources/templates/system/salesOrder/taskZozjVerify.html
+++ b/ruoyi-admin/src/main/resources/templates/system/salesOrder/taskZozjVerify.html
@@ -4,6 +4,11 @@
     <th:block th:include="include :: header('总经理/总助审核')" />
     <th:block th:include="include :: select2-css" />
     <link th:href="@{/ajax/libs/element-ui/element-ui.css}" rel="stylesheet"/>
+    <link th:href="@{/ajax/libs/select2/select2.css}" rel="stylesheet">
+    <link th:href="@{/ajax/libs/select2/select2-bootstrap.css}" rel="stylesheet">
+    <th:block th:include="include :: bootstrap-editable-css"/>
+    <th:block th:include="include :: bootstrap-fileinput-css"/>
+
 </head>
 <body class="white-bg">
 <div id="app" class="wrapper wrapper-content animated fadeInRight ibox-content">
@@ -231,6 +236,24 @@
                 <input name="businessMembers" class="form-control m-b" th:field="*{businessMembers}"  required disabled />
             </div>
         </div>
+        <div class="container">
+            <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>
         <div class="container">
             <h4 class="form-header h4">计算</h4>
             <div class="col-xs-12 form-row">
@@ -281,25 +304,11 @@
             </div>
         </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>
 <th:block th:include="include :: footer" />
 <th:block th:include="include :: select2-js" />
+<th:block th:include="include :: datetimepicker-js"/>
 <script th:src="@{/js/activiti.js}"></script>
 <script th:src="@{/ajax/libs/vue/vue.js}"></script>
 <script th:src="@{/ajax/libs/element-ui/element-ui.js}"></script>