diff --git a/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/temporaryPurchase.html b/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/temporaryPurchase.html
index 1aa977f5..f97f8118 100644
--- a/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/temporaryPurchase.html
+++ b/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/temporaryPurchase.html
@@ -274,7 +274,6 @@
                 {
                     title: '暂收已合格数',
                     field: 'temporaryHasQualifiedNum',
-                    visible: false,
                 },
                 {
                     title: '已入库数',
diff --git a/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/temporaryPurchaseDetail.html b/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/temporaryPurchaseDetail.html
index a160d61b..e4362055 100644
--- a/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/temporaryPurchaseDetail.html
+++ b/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/temporaryPurchaseDetail.html
@@ -3,6 +3,7 @@
 <head>
     <th:block th:include="include :: header('暂收-采购单(采购入库)详情')" />
     <th:block th:include="include :: datetimepicker-css" />
+    <th:block th:include="include :: bootstrap-editable-css"/>
     <style>
 
         .supplier-value span {
@@ -35,6 +36,39 @@
                 </select>
             </div>
         </div>
+
+        <div class="form-group">
+            <label class="col-sm-4 control-label">供应商ID：</label>
+            <div class="col-sm-8">
+                <input name="supplierCode" th:field="*{supplierCode}" class="form-control" type="text" readonly>
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-4 control-label">供应商名称：</label>
+            <div class="col-sm-8">
+                <input name="supplierName" th:field="*{supplierName}" class="form-control" type="text" readonly>
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-4 control-label">联系人：</label>
+            <div class="col-sm-8">
+                <input name="customerContact" th:field="*{customerContact}" class="form-control" type="text" readonly>
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-4 control-label">联系人电话：</label>
+            <div class="col-sm-8">
+                <input name="contactNumber" th:field="*{contactNumber}" class="form-control" type="text" readonly>
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-4 control-label">联系人地址：</label>
+            <div class="col-sm-8">
+                <input name="supplierAddress" th:field="*{supplierAddress}" class="form-control" type="text" readonly>
+            </div>
+        </div>
+
+
         <div class="form-group">
             <label class="col-sm-4 control-label">到货时间：</label>
             <div class="col-sm-8">
@@ -74,11 +108,11 @@
             </div>
         </div>
 
+        <!--物料信息-->
         <div class="container">
-            <!--供应商物料相关-->
             <div class="row">
-                <div class="col-sm-12" id="tablesContainer">
-                    <!-- 表格将在这里动态生成 -->
+                <div class="col-sm-12 select-table table-striped">
+                    <table id="bootstrap-table"></table>
                 </div>
             </div>
         </div>
@@ -100,61 +134,61 @@
         focusCleanup: true
     });
 
-    //生成的不同table的id集合
-    var tableDatas = [];
 
     function submitHandler() {
-        const storageOrderData = $("#form-temporaryPurchaseWarehouse-edit").serializeArray().reduce((obj, item) => {
-            obj[item.name] = item.value;
-            return obj;
-        }, {});
-        // 初始化一个数组用于存放所有表格的数据
-        let allMaterialDataList = [];
-        for(let i in tableDatas){
-            $('#' + tableDatas[i]).each(function() {
-                const tableData = $(this).bootstrapTable('getData');
-                console.log(JSON.stringify(tableData));
-                // 将表数据转换成与qualityReportData格式一致的数组
-                var materialDataList = tableData.map(function (item) {
-                    // 根据实际字段名调整
-                    return {
-                        "supplierCode": item.supplierCode,
-                        "materialNo": item.materialNo,
-                        "materialName": item.materialName,
-                        "materialType": item.materialType,
-                        "materialPhotourl": item.materialPhotourl,
-                        "materialDescribe": item.materialDescribe,
-                        "materialBrand": item.materialBrand,
-                        "materialUnit": item.materialUnit,
-                        "materialProcessMethod": item.materialProcessMethod,
-                        "notifyHasArrivedNum": item.notifyHasArrivedNum,
-                        "actualHasArrivedNum": item.actualHasArrivedNum,
-                        "temporaryHasQualifiedNum": item.temporaryHasQualifiedNum,
-                        "hasStorageNum": item.hasStorageNum,
-                        "notifyArriveNum": item.notifyArriveNum,
-                        "actualArriveNum": item.actualArriveNum,
-                        "temporaryQualifiedNum": item.temporaryQualifiedNum,
-                        "temporaryRemark": item.temporaryRemark,
-                        "temporaryReportUrl": item.temporaryReportUrl,
-                        // ...其他字段
-                    };
-                });
-                allMaterialDataList = allMaterialDataList.concat(materialDataList);
+        if ($.validate.form()) {
+
+
+            const storageOrderData = $("#form-temporaryPurchaseWarehouse-edit").serializeArray().reduce((obj, item) => {
+                obj[item.name] = item.value;
+                return obj;
+            }, {});
+
+
+            var table = $('#bootstrap-table').bootstrapTable("getData");
+
+            var materialDataList = table.map(function(item) {
+                // 根据实际字段名调整
+                return {
+                    "supplierCode": item.supplierCode,
+                    "supplierName":item.supplierName,
+                    "customerContact":item.customerContact,
+                    "contactNumber":item.contactNumber,
+                    "supplierAddress":item.supplierAddress,
+                    "materialNo": item.materialNo,
+                    "materialName": item.materialName,
+                    "materialType": item.materialType,
+                    "materialPhotourl": item.materialPhotourl,
+                    "materialDescribe": item.materialDescribe,
+                    "materialBrand": item.materialBrand,
+                    "materialUnit": item.materialUnit,
+                    "materialProcessMethod": item.materialProcessMethod,
+                    "notifyHasArrivedNum": item.notifyHasArrivedNum,
+                    "actualHasArrivedNum": item.actualHasArrivedNum,
+                    "temporaryHasQualifiedNum": item.temporaryHasQualifiedNum,
+                    "hasStorageNum": item.hasStorageNum,
+                    "notifyArriveNum": item.notifyArriveNum,
+                    "actualArriveNum": item.actualArriveNum,
+                    "temporaryQualifiedNum": item.temporaryQualifiedNum,
+                    "temporaryRemark": item.temporaryRemark,
+                    "temporaryReportUrl": item.temporaryReportUrl,
+                    // ...其他字段
+                };
             });
-        }
 
-        const combinedData = Object.assign({}, storageOrderData, {
-            warehouseStorageOrderDetailList: allMaterialDataList
-        });
-        // 合并表单数据和表格数据
-        // const combinedData = Object.assign({}, ...complaintNoticeData.array(item => ({ [item.name]: item.value })), ...materialData);
-        console.log(combinedData)
-        // 使用 JSON.stringify() 序列化数据
-        const jsonData = JSON.stringify(combinedData);
-        // 发送 AJAX 请求到后端接口
-        $.operate.saveJson(prefix + "/temporaryPurchaseWarehouse", jsonData);
+            const combinedData = Object.assign({}, storageOrderData, {
+                warehouseStorageOrderDetailList: materialDataList,
+            });
+            // 合并表单数据和表格数据
+            console.log(combinedData)
+            // 使用 JSON.stringify() 序列化数据
+            const jsonData = JSON.stringify(combinedData);
+            // 发送 AJAX 请求到后端接口
+            $.operate.saveJson(prefix + "/temporaryPurchase", jsonData);
+        }
     }
 
+
     $("input[name='arrivedTime']").datetimepicker({
         format: "yyyy-mm-dd",
         minView: "month",
@@ -167,38 +201,17 @@
         autoclose: true
     });
 
+    //物料信息展示列表
     $(function() {
-        // 假设qualityOrderCode已经定义或者可以通过某种方式获取到
-        var warehouseStorageCode = [[${warehouseStorageOrder.warehouseStorageCode}]]; // 这里需要实际赋值，比如从前端某个地方读取
-
-        $.getJSON(prefix + "/temporaryPurchaseDetailList?warehouseStorageCode=" + warehouseStorageCode, function(data) {
-            for (var supplierCode in data) {
-                if (data.hasOwnProperty(supplierCode)) {
-                    var supplierData = data[supplierCode];
-                    createTableForSupplier(supplierCode, supplierData);
-                }
-            }
-        });
-    });
-    function createTableForSupplier(supplierCode, supplierData) {
-        var tableId = 'bootstrap-table-' + supplierCode.replace(/[^a-z0-9]/gi, '_').toLowerCase();
-        tableDatas.push(tableId);
-        var $tableWrapper = $('<div class="table-responsive mt-3"></div>');
-
-        // 确保supplierData至少有一条记录，并从中提取供应商详细信息
-        var supplierInfo = supplierData.length > 0 ? supplierData[0] : {}; // 默认为空对象，以防数据不存在
-
-        // 构建含有额外供应商信息的标题字符串
-        var headerTitle ='供应商'+'</br>'+supplierCode + ' -  ' + (supplierInfo.supplierName || 'N/A') +
-            ' </br> ' + (supplierInfo.customerContact || 'N/A') +
-            ' - ' + (supplierInfo.contactNumber || 'N/A') +
-            ' - ' + (supplierInfo.supplierAddress || 'N/A');
-
-        var $header = $('<h4>' + headerTitle + '</h4>');
-        var $table = $('<table id="' + tableId + '" class="table table-striped table-bordered"></table>');
-
-        $table.bootstrapTable({
-            data: supplierData,
+        var options = {
+            modalName: "选择物料",
+            url: prefix + "/temporaryPurchaseDetailList",
+            queryParams: queryParams,
+            showSearch: false,
+            showRefresh: false,
+            showToggle: false,
+            showColumns: false,
+            pagination: false, // 设置不分页
             columns: [{
                 checkbox: true
             },
@@ -241,6 +254,7 @@
                         return $.table.selectDictLabel(processMethodDatas, value);
                     }
                 },
+
                 {
                     title: '入库部门',
                     field: 'materialDeptType',
@@ -259,7 +273,6 @@
                 {
                     title: '暂收已合格数',
                     field: 'temporaryHasQualifiedNum',
-                    visible: false,
                 },
                 {
                     title: '已入库数',
@@ -276,12 +289,13 @@
                 },
 
                 {
-                    title: '暂收数量',
+                    title: '暂收合格数量',
                     field: 'temporaryQualifiedNum',
                 },
                 {
                     title: '暂收备注',
                     field: 'temporaryRemark',
+                    editable: true,
                     visible: false,
                 },
                 {
@@ -289,14 +303,21 @@
                     field: 'temporaryReportUrl',
                     visible: false,
                 }]
-        });
+        };
+        $.table.init(options);
+    })
 
-        $tableWrapper.append($header).append($table);
-        $('#tablesContainer').append($tableWrapper);
+    function queryParams(params) {
+        var curParams = {
+            // 传递参数查询参数
+            warehouseStorageCode:  warehouseStorageCode
+        };
+        return curParams;
     }
 
 
 
+
     //根据仓库ID查询仓库名称
     $(document).ready(function() {
         // 初始化时默认加载仓库ID列表
