From 89255130191db52ada160afb611e983ed87b9740 Mon Sep 17 00:00:00 2001
From: syruan <15555146157@163.com>
Date: Fri, 4 Jul 2025 17:04:50 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=86=E6=96=99=E5=AE=A1=E6=89=B9=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 js/accessory/accessory_apply_list.js         |  8 +++---
 js/accessory/accessory_out_bound_list.js     | 15 ++++++-----
 page/accessory/accessory_apply_list.html     | 27 +++++++++++++++-----
 page/accessory/accessory_out_bound_list.html | 16 ++++++++++--
 4 files changed, 48 insertions(+), 18 deletions(-)

diff --git a/js/accessory/accessory_apply_list.js b/js/accessory/accessory_apply_list.js
index 52feb59..8121dbe 100644
--- a/js/accessory/accessory_apply_list.js
+++ b/js/accessory/accessory_apply_list.js
@@ -45,9 +45,10 @@ function reloadTable(pageNum) {
         },
         where: {
             // encryptedData: JSON.stringify({
-                'keyWord': $('#keyWord').val(),
-                'startDay': $('#startDay').val(),
-                'endDay': $('#endDay').val()
+            'status': $('#status').val(),
+            'keyWord': $('#keyWord').val(),
+            'startDay': $('#startDay').val(),
+            'endDay': $('#endDay').val()
             // }),
         },
     },
@@ -66,6 +67,7 @@ function initTable() {
         url: dataUrl + "base/partApply/getPartApplyList",
         where: {
             encryptedData: JSON.stringify({
+                'status': $('#status').val(),
                 'keyWord': $('#keyWord').val(),
                 'startDay': $('#startDay').val(),
                 'endDay': $('#endDay').val()
diff --git a/js/accessory/accessory_out_bound_list.js b/js/accessory/accessory_out_bound_list.js
index 54f4ca1..b51bc72 100644
--- a/js/accessory/accessory_out_bound_list.js
+++ b/js/accessory/accessory_out_bound_list.js
@@ -45,6 +45,7 @@ function reloadTable(pageNum) {
         },
         where: {
             encryptedData: JSON.stringify({
+                'status': $('#status').val(),
                 'keyWord': $('#keyWord').val(),
                 'startDay': $('#startDay').val(),
                 'endDay': $('#endDay').val()
@@ -66,6 +67,7 @@ function initTable() {
         url: dataUrl + "backstage/partApply/findByPage",
         where: {
             encryptedData: JSON.stringify({
+                'status': $('#status').val(),
                 'keyWord': $('#keyWord').val(),
                 'startDay': $('#startDay').val(),
                 'endDay': $('#endDay').val()
@@ -89,7 +91,7 @@ function initTable() {
         cols: [
             [
                 {
-                    width: '9.9%',
+                    width: '4%',
                     title: "序号",
                     align: "center",
                     templet: function (d) {
@@ -131,16 +133,16 @@ function initTable() {
                 },
                 {
                     field: "phone",
-                    width: '10%',
-                    title: "联系电话",
+                    width: '6%',
+                    title: "电话",
                     unresize: true,
                     sort:true,
                     align: "center",
                 },
                 {
                     field: "applyNum",
-                    width: '10%',
-                    title: "领用数量",
+                    width: '8%',
+                    title: "领用数",
                     unresize: true,
                     sort:true,
                     align: "center",
@@ -169,7 +171,7 @@ function initTable() {
                 },
                 {
                     field: "remark",
-                    width: '10%',
+                    width: '21.8%',
                     title: "备注",
                     unresize: true,
                     align: "center",
@@ -231,6 +233,7 @@ function setCheckStatus(status) {
 // 导出
 function exportExcel() {
     let params = {
+        'status': $('#status').val(),
         'keyWord': $('#keyWord').val(),
         'startDay': $('#startDay').val(),
         'endDay': $('#endDay').val()
diff --git a/page/accessory/accessory_apply_list.html b/page/accessory/accessory_apply_list.html
index 953b9c6..c76793c 100644
--- a/page/accessory/accessory_apply_list.html
+++ b/page/accessory/accessory_apply_list.html
@@ -21,20 +21,32 @@
                 <form class="layui-form layui-form-pane" action="#" onsubmit="return false;">
                     <div class="layui-form-item">
                         <div class="layui-inline">
-                            <div class="layui-input-inline" style="width: 320px;">
+                            <div class="layui-input-inline" style="width: 240px;">
                                 <input type="text" name="keyWord" id="keyWord" autocomplete="off"
                                        class="layui-input" lay-affix="clear"
-                                       placeholder="请输入关键字（领料单号/领料人）" maxlength="30">
+                                       placeholder="请输入关键字（单号/领料人）" maxlength="30">
+                            </div>
+                        </div>
+                        <div class="layui-inline">
+                            <label class="layui-form-label required" style="width: 100px !important;">审批状态</label>
+                            <div class="layui-input-inline" style="width: 120px;">
+                                <select class="layui-select" name="status" id="status" lay-filter="creator">
+                                    <option value="">全部</option>
+                                    <option value="1">待审核</option>
+                                    <option value="2">待出库</option>
+                                    <option value="3">驳回</option>
+                                    <option value="4">已出库</option>
+                                </select>
                             </div>
                         </div>
                         <div class="layui-inline" style="margin-bottom: 0;">
                             <div class="layui-inline" id="ID-laydate-rangeLinked">
-                                <div class="layui-input-inline">
+                                <div class="layui-input-inline" style="width: 140px;">
                                     <input type="text" autocomplete="off" id="startDay" class="layui-input" readonly
                                            placeholder="开始日期">
                                 </div>
                                 <div class="layui-form-mid">-</div>
-                                <div class="layui-input-inline">
+                                <div class="layui-input-inline" style="width: 140px;">
                                     <input type="text" autocomplete="off" id="endDay" class="layui-input" readonly
                                            placeholder="结束日期">
                                 </div>
@@ -47,12 +59,13 @@
                             <button class="layui-btn layui-btn-primary" onclick="queryTable(2)"><i
                                     class="layui-icon layui-icon-refresh"></i> 重 置
                             </button>
-                        </div>
-                        <div>
-                            <button class="layui-btn layui-bg-blue" style="margin-top: 10px" onclick="addAccessoryApply({})"><i
+                            <button class="layui-btn layui-bg-blue" onclick="addAccessoryApply({})"><i
                                     class="layui-icon layui-icon-add-1"></i> 新 增
                             </button>
                         </div>
+                        <div>
+
+                        </div>
                     </div>
                 </form>
             </div>
diff --git a/page/accessory/accessory_out_bound_list.html b/page/accessory/accessory_out_bound_list.html
index d85f806..ef83b20 100644
--- a/page/accessory/accessory_out_bound_list.html
+++ b/page/accessory/accessory_out_bound_list.html
@@ -21,9 +21,21 @@
                     <form class="layui-form layui-form-pane" action="#" onsubmit="return false;">
                         <div class="layui-form-item">
                             <div class="layui-inline">
-                                <div class="layui-input-inline" style="width: 300px;">
+                                <div class="layui-input-inline" style="width: 240px;">
                                     <input type="text" name="keyWord" id="keyWord" autocomplete="off"
-                                        class="layui-input" lay-affix="clear" placeholder="请输入关键字（领料单编号/领用人）" maxlength="30">
+                                        class="layui-input" lay-affix="clear" placeholder="请输入关键字（编号/领用人）" maxlength="30">
+                                </div>
+                            </div>
+                            <div class="layui-inline">
+                                <label class="layui-form-label required" style="width: 100px !important;">审批状态</label>
+                                <div class="layui-input-inline" style="width: 100px;">
+                                    <select class="layui-select" name="status" id="status" lay-filter="creator">
+                                        <option value="">全部</option>
+                                        <option value="1">待审核</option>
+                                        <option value="2">待出库</option>
+                                        <option value="3">驳回</option>
+                                        <option value="4">已出库</option>
+                                    </select>
                                 </div>
                             </div>
                             <div class="layui-inline" style="margin-bottom: 0;">