diff --git a/ruoyi-admin/src/main/resources/templates/system/empRequisiteOrder/add.html b/ruoyi-admin/src/main/resources/templates/system/empRequisiteOrder/add.html
index aac80f42..71570720 100644
--- a/ruoyi-admin/src/main/resources/templates/system/empRequisiteOrder/add.html
+++ b/ruoyi-admin/src/main/resources/templates/system/empRequisiteOrder/add.html
@@ -81,6 +81,7 @@
                 id:'bootstrap-sub-table-empRequisitionChild',
                 pagination: false,
                 sidePagination: "client",
+                showSearch:false,
                 model: "物料信息",
                 columns: [
                     {checkbox: true},
diff --git a/ruoyi-admin/src/main/resources/templates/system/empRequisiteOrder/empRequisiteOrder.html b/ruoyi-admin/src/main/resources/templates/system/empRequisiteOrder/empRequisiteOrder.html
index 4fa21085..848c533c 100644
--- a/ruoyi-admin/src/main/resources/templates/system/empRequisiteOrder/empRequisiteOrder.html
+++ b/ruoyi-admin/src/main/resources/templates/system/empRequisiteOrder/empRequisiteOrder.html
@@ -11,11 +11,11 @@
                     <div class="select-list">
                         <ul>
                             <li>
-                                <label>领料单单号：</label>
+                                <label>领料单号：</label>
                                 <input type="text" name="requisitieCode"/>
                             </li>
                             <li>
-                                <label>关联单号：</label>
+                                <label>关联订单号：</label>
                                 <input type="text" name="correlationCode"/>
                             </li>
                             <li>
@@ -41,7 +41,7 @@
                 <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="system:empRequisiteOrder:add">
                     <i class="fa fa-plus"></i> 添加
                 </a>
-                <a class="btn btn-warning" onclick="exportExcel()" shiro:hasPermission="system:empRequisiteOrder:export">
+                <a class="btn btn-success" onclick="exportExcel()" shiro:hasPermission="system:empRequisiteOrder:export">
                     <i class="fa fa-download"></i> 导出
                 </a>
             </div>
@@ -110,6 +110,16 @@
                         title: '流程实例类型',
                         visible: false
                     },
+                    {
+                        field: 'taskId',
+                        title: '当前任务ID',
+                        visible: false
+                    },
+                    {
+                        field: 'todoUserId',
+                        title: '待办用户ID',
+                        visible: false
+                    },
                     {
                         field: 'applyUser',
                         title: '申请人ID',
@@ -120,6 +130,9 @@
                         title: '当前任务名称',
                         visible: false
                     },
+                    {title: '审核状态',field: 'auditStatus',visible: false,
+                        formatter: function(value, row, index) {return $.table.selectDictLabel(auditStatusDatas, value);}
+                    },
                     {
                         field: 'taskStatus',
                         title: '当前状态',
@@ -167,19 +180,6 @@
                         title: '申请时间',
                         align: 'center',
                     },
-                    {
-                        field: 'taskId',
-                        title: '当前任务ID',
-                        visible: false
-                    },
-                    {
-                        field: 'todoUserId',
-                        title: '待办用户ID',
-                        visible: false
-                    },
-                    {title: '审核状态',field: 'auditStatus',visible: false,
-                        formatter: function(value, row, index) {return $.table.selectDictLabel(auditStatusDatas, value);}
-                    },
                     {title: '领料员',field: 'createBy',align: 'center',},
                     {title: '不含税总价(RMB)',field: 'noRmbSum',visible: false},
                     {title: '含税总价(RMB)',field: 'rmbSum',visible: false},
@@ -203,19 +203,20 @@
                                     var todoUserIdList = row.todoUserId.split(",");
                                     if(todoUserIdList.includes(loginName) || loginName == 'admin'){
                                         var nodeName = row.taskName=='驳回调整'?' 调整申请':' 审批';
-                                        actions.push('<a class="btn btn-success btn-xs" href="javascript:void(0)" onclick="showVerifyDialog(\'' + prefix + '\',\'' + row.taskId + '\', \'' + row.taskName+"-"+"申请" + '\')"><i class="fa fa-edit"></i> '+nodeName+'</a> ');
+                                        actions.push('<a href="javascript:void(0)" onclick="showVerifyDialog(\'' + prefix + '\',\'' + row.taskId + '\', \'' + row.taskName+"-"+"申请" + '\')"><i class="fa fa-edit"></i> '+nodeName+'</a> ');
                                     }
                                 }
                                 // 审批历史
-                                actions.push('<a class="btn btn-warning btn-xs" href="javascript:void(0)" onclick="showHistoryDialog(\'' + row.instanceId + '\')"><i class="fa fa-list"></i> 审批历史</a> ');
+                                actions.push('<a href="javascript:void(0)" onclick="showHistoryDialog(\'' + row.instanceId + '\')"><i class="fa fa-list"></i> 审批历史</a> ');
                                 // 进度查看
-                                actions.push('<a class="btn btn-info btn-xs" href="javascript:void(0)" onclick="showProcessImgDialog(\'' + row.instanceId + '\')"><i class="fa fa-image"></i> 进度查看</a> ');
-                            }
-                            else if(row.auditStatus === "2"){
-                                actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.requisiteId + '\')"><i class="fa fa-edit"></i>编辑</a> ');
+                                actions.push('<a href="javascript:void(0)" onclick="showProcessImgDialog(\'' + row.instanceId + '\')"><i class="fa fa-image"></i> 进度查看</a> ');
                             }
-                            actions.push('<a class="btn btn-primary btn-xs ' + detailFlag + '" href="javascript:void(0)" onclick="$.operate.detail(\'' + row.requisiteId + '\')"><i class="fa fa-search"></i>详情</a> ');
-                            return actions.join('');
+                            // else if(row.auditStatus === "2"){
+                            //     actions.push('<a class="' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.requisiteId + '\')"><i class="fa fa-edit"></i>编辑</a> ');
+                            // }
+                            actions.push('<a href="javascript:void(0)" onclick="$.operate.detail(\'' + row.requisiteId + '\')"><i class="fa fa-search"></i>详情</a> ');
+                            var actionLinks = actions.join('');
+                            return $.table.dropdownToggle(actionLinks);
                         }
                     }
                 ],