diff --git a/js/accessory/accessory_out_bound_list.js b/js/accessory/accessory_out_bound_list.js
index e9a89c4..6217f7e 100644
--- a/js/accessory/accessory_out_bound_list.js
+++ b/js/accessory/accessory_out_bound_list.js
@@ -203,10 +203,11 @@ function setCheckStatus(status) {
 // 导出
 function exportExcel() {
     let params = {
-        'proName': $('#proName').val(),
-        'status': $('#status').val()
+        'keyWord': $('#keyWord').val(),
+        'startDay': $('#startDay').val(),
+        'endDay': $('#endDay').val()
     }
-    let url = dataUrl + "backstage/export/exportFhList";
+    let url = dataUrl + "backstage/partApply/export";
     exportExcelUtil(url, '配件入库数据', JSON.stringify(params));
 }
 
diff --git a/js/accessory/accessory_store_list.js b/js/accessory/accessory_store_list.js
index 40c5548..cd3ac4d 100644
--- a/js/accessory/accessory_store_list.js
+++ b/js/accessory/accessory_store_list.js
@@ -19,8 +19,8 @@ function queryTable(type) {
         reloadTable(1);
     } else if (type === 2) {
         $('#keyWord').val('');
-        $('#startDate').val('');
-        $('#endDate').val('');
+        $('#startDay').val('');
+        $('#endDay').val('');
         layui.form.render();
         reloadTable(1);
     }
@@ -40,8 +40,8 @@ function reloadTable(pageNum) {
         where: {
             encryptedData: JSON.stringify({
                 'keyWord': $('#keyWord').val(),
-                'startDate': $('#startDate').val(),
-                'endDate': $('#endDate').val()
+                'startDay': $('#startDay').val(),
+                'endDay': $('#endDay').val()
             }),
         },
     },
@@ -61,8 +61,8 @@ function initTable() {
         where: {
             encryptedData: JSON.stringify({
                 'keyWord': $('#keyWord').val(),
-                'startDate': $('#startDate').val(),
-                'endDate': $('#endDate').val()
+                'startDay': $('#startDay').val(),
+                'endDay': $('#endDay').val()
             }),
         },
         request: {
@@ -180,11 +180,12 @@ function setStatusColor(value) {
 // 导出
 function exportExcel() {
     let params = {
-        'proName': $('#proName').val(),
-        'status': $('#status').val()
+        'keyWord': $('#keyWord').val(),
+        'startDay': $('#startDay').val(),
+        'endDay': $('#endDay').val()
     }
-    let url = dataUrl + "backstage/export/exportFhList";
-    exportExcelUtil(url, '配件入库数据', JSON.stringify(params));
+    let url = dataUrl + "backstage/partInput/export";
+    exportExcelUtil(url, '配件入库', JSON.stringify(params));
 }
 
 // 配件入库
diff --git a/js/accessory/child/inventory_count_detail.js b/js/accessory/child/inventory_count_detail.js
index 85d3e65..f8ee228 100644
--- a/js/accessory/child/inventory_count_detail.js
+++ b/js/accessory/child/inventory_count_detail.js
@@ -42,6 +42,7 @@ function getDetailsById() {
         $('#startTime').html(obj.startTime);
         $('#endTime').html(obj.endTime);
         $('#remark').html(obj.remark);
+        $('#userName').html(obj.userName);
         setFileTable(obj.fileList);
     }
 }
diff --git a/js/demandPlan/child/apply_plan_detail.js b/js/demandPlan/child/apply_plan_detail.js
index 5f1c890..1441182 100644
--- a/js/demandPlan/child/apply_plan_detail.js
+++ b/js/demandPlan/child/apply_plan_detail.js
@@ -1,6 +1,6 @@
 let idParam, objParam;
 let details;
-let form, layer, laydate;
+let form, layer, table;
 function setParams(obj) {
     objParam = JSON.parse(obj);
     console.log(objParam.checkType);
@@ -8,13 +8,14 @@ function setParams(obj) {
         $('#print').before('<button type="button" class="layui-btn layui-bg-orange" onclick="check()">审核</button>');
     }
     idParam = objParam.id;
-    layui.use(['form', 'layer', 'laydate'], function () {
+    layui.use(['form', 'layer', 'table'], function () {
         form = layui.form;
         layer = layui.layer;
-        laydate = layui.laydate;
+        table = layui.table;
+        setCheckStatus();
+        getDetailById();
+        initTable();
     });
-    setCheckStatus();
-    getDetailById();
 }
 
 // 基本信息
@@ -26,68 +27,152 @@ function setPlanBasicTableInfo(obj) {
     $('#remark').html(obj.remark);
 }
 
-// 查询
-function search() {
-    let keyWord = $('#keyWord').val();
-    let keyWord2 = $('#keyWord2').val();
-    if (!keyWord && !keyWord2) {
-        getbaseList(details);
-    } else if (keyWord && !keyWord2) {
-        let dataList = details.filter(item => {
-            console.log(item.type.indexOf(keyWord));
-            return item.type.indexOf(keyWord) > -1;
-        })
-        getbaseList(dataList);
-    } else if (!keyWord && keyWord2) {
-        let dataList = details.filter(item => {
-            console.log(item.module.indexOf(keyWord2));
-            return item.module.indexOf(keyWord2) > -1;
-        })
-        getbaseList(dataList);
-    } else if (keyWord && keyWord2) {
-        let dataList = details.filter(item => {
-            console.log(item.module.indexOf(keyWord2));
-            console.log(item.type.indexOf(keyWord));
-            return item.type.indexOf(keyWord) > -1 && item.module.indexOf(keyWord2) > -1;;
-        })
-        getbaseList(dataList);
+
+// 查询/重置
+function queryTable(type) {
+    if (type === 1) {
+        reloadTable(1);
+    } else if (type === 2) {
+        $('#type').val('');
+        $('#model').val('');
+        layui.form.render();
+        reloadTable(1);
     }
 }
 
-// 重置
-function resetSearch() {
-    $('#keyWord').val('');
-    $('#keyWord2').val('');
-    getbaseList(details);
+// 刷新页面数据
+function reloadData() {
+    reloadTable(1);
 }
 
-function getbaseList(results) {
-    var html = "";
-    if (results && results.length > 0) {
-        for (var i = 0; i < results.length; i++) {
-            var l = results[i];
-            html += "<tr>";
-            html += "<td style='vertical-align:middle;' class='center hidden-480'>"
-                + (i + 1) + "</td>";
-            html += "<td style='vertical-align:middle;' class='center'>" + l.typeName + "</td>";
-            html += "<td style='vertical-align:middle;' class='center'>" + l.type + "</td>";
-            html += "<td style='vertical-align:middle;' class='center'>" + l.module + "</td>";
-            html += "<td style='vertical-align:middle;' class='center'>" + setNullValue(l.unit) + "</td>";
-            html += "<td style='vertical-align:middle;color:#409EFF;' class='center'>" + l.needNum + "</td>";
-            html += "<td style='vertical-align:middle;color:#409EFF;' class='center'>" + l.times + "</td>";
-            html += "<td style='vertical-align:middle;' class='center'>" + setNullValue(l.remarks) + "</td>";
-            html += "</tr>";
-        }
-    } else {
-        html += "<tr><td colspan='8' class='center'>没有相关数据</td></tr>";
-    }
-    $("#baseTable tbody").empty().append(html);
+// 重载表格
+function reloadTable(pageNum) {
+    table.reload("currentTableId", {
+        page: {
+            curr: pageNum ? pageNum : 1,
+        },
+        where: {
+            encryptedData: JSON.stringify({
+                'type': $('#type').val(),
+                'model': $('#model').val(),
+                'id': objParam.id
+            }),
+        },
+    },
+    );
+}
+
+// 初始化表格
+function initTable() {
+    tableIns = table.render({
+        elem: "#currentTableId",
+        id: 'currentTableId',
+        headers: {
+            authorization: sessionStorage.getItem("gz-token"),
+        },
+        height: "full-170",
+        url: dataUrl + "backstage/planApplication/getPlanDetailsList",
+        where: {
+            encryptedData: JSON.stringify({
+                'type': $('#type').val(),
+                'model': $('#model').val(),
+                'id': objParam.id
+            }),
+        },
+        request: {
+            pageName: 'pageNum',
+            limitName: 'pageSize'
+        },
+        parseData: function (res) { // res 即为原始返回的数据
+            return {
+                "code": 0, // 解析接口状态
+                "msg": '获取成功', // 解析提示文本
+                "count": res.total, // 解析数据长度
+                "data": res.list // 解析数据列表
+            };
+        },
+        cols: [
+            [
+                {
+                    width: '9.9%',
+                    title: "序号",
+                    align: "center",
+                    templet: function (d) {
+                        return d.LAY_NUM;
+                    },
+                },
+                {
+                    field: "typeName",
+                    width: '15%',
+                    title: "物机类型",
+                    unresize: true,
+                    align: "center",
+                },
+                {
+                    field: "type",
+                    width: '15%',
+                    title: "物机名称",
+                    unresize: true,
+                    align: "center",
+                },
+                {
+                    field: "module",
+                    width: '15%',
+                    title: "规格",
+                    unresize: true,
+                    align: "center",
+                },
+                {
+                    field: "unit",
+                    width: '10%',
+                    title: "单位",
+                    unresize: true,
+                    align: "center",
+                    templet: function (d) {
+                        return setNullValue(d.unit);
+                    },
+                },
+                {
+                    field: "needNum",
+                    width: '10%',
+                    title: "需用量",
+                    unresize: true,
+                    align: "center",
+                },
+                {
+                    field: "times",
+                    width: '10%',
+                    title: "需用天数",
+                    unresize: true,
+                    align: "center",
+
+                },
+                {
+                    field: "remarks",
+                    width: '15%',
+                    title: "备注",
+                    unresize: true,
+                    align: "center",
+                },
+            ],
+        ],
+        limits: [10, 15, 20, 25, 50, 100],
+        limit: 10,
+        page: true,
+        done: function (res, curr, count) {
+            pageNum = tableIns.config.page.curr;
+            table.resize("currentTableId");
+        },
+    });
 }
 
 // 导出
 function exportData() {
     let params = {
-        "id": idParam
+        "id": objParam.id,
+        'type': $('#type').val(),
+        'model': $('#model').val(),
+
     }
     let url = dataUrl + "backstage/export/exportDetail";
     exportExcelUtil(url, '机具明细', JSON.stringify(params));
@@ -206,7 +291,6 @@ function getDetailById() {
         console.log(result);
         if (result.code === 200) {
             setPlanBasicTableInfo(result.data);
-            getbaseList(result.data.details);
             setOperRecordInfo(result.data.auditList, result.data);
             details = result.data.details;
         }
diff --git a/page/demandPlan/child/apply_plan_detail.html b/page/demandPlan/child/apply_plan_detail.html
index 95ca09a..a772adf 100644
--- a/page/demandPlan/child/apply_plan_detail.html
+++ b/page/demandPlan/child/apply_plan_detail.html
@@ -68,41 +68,29 @@
 					<div class="layui-form-item">
 						<div class="layui-inline">
 							<div class="layui-input-inline" style="width: 300px;">
-								<input type="text" name="keyWord" id="keyWord" autocomplete="off" class="layui-input"
+								<input type="text" name="type" id="type" autocomplete="off" class="layui-input"
 									lay-affix="clear" placeholder="输入物机名称" maxlength="30">
 							</div>
 						</div>
 						<div class="layui-inline">
 							<div class="layui-input-inline" style="width: 300px;">
-								<input type="text" name="keyWord2" id="keyWord2" autocomplete="off" class="layui-input"
+								<input type="text" name="model" id="model" autocomplete="off" class="layui-input"
 									lay-affix="clear" placeholder="输入规格" maxlength="30">
 							</div>
 						</div>
 						<div class="layui-inline">
-							<button class="layui-btn layui-bg-blue" onclick="search()"><i class="layui-icon"></i> 搜
+							<button class="layui-btn layui-bg-blue" onclick="queryTable(1)"><i class="layui-icon"></i> 搜
 								索</button>
-							<button class="layui-btn layui-btn-primary" onclick="resetSearch()"><i
+							<button class="layui-btn layui-btn-primary" onclick="queryTable(2)"><i
 									class="layui-icon layui-icon-refresh"></i> 重 置</button>
 							<button class="layui-btn layui-btn-primary" onclick="exportData()"><i
 									class="layui-icon layui-icon-download-circle"></i> 下 载</button>
 						</div>
 					</div>
 				</form>
-				<table id="baseTable" class="classTable table-hover">
-					<thead>
-						<tr>
-							<th style="width: 10%" class="center">序号</th>
-							<th style="width: 15%" class="center">物机类型</th>
-							<th style="width: 20%" class="center">物机名称</th>
-							<th style="width: 10%" class="center">规格</th>
-							<th style="width: 10%" class="center">单位</th>
-							<th style="width: 10%" class="center">需用量</th>
-							<th style="width: 10%" class="center">需用天数</th>
-							<th style="width: 15%" class="center">备注</th>
-						</tr>
-					</thead>
-					<tbody></tbody>
-				</table>
+				<div class="table-box" table-responsive style="z-index: 1;">
+					<table class="layui-hide" id="currentTableId" lay-filter="currentTableId2"></table>
+				</div>
 			</div>
 		</div>
 		<!-- 操作记录 -->