From d21444dac4c6f839a9eab4ed86dd2b084a73331c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E6=99=93=E8=BF=AA?= <2596750866@qq.com>
Date: Fri, 23 Aug 2024 16:07:17 +0800
Subject: [PATCH] =?UTF-8?q?[feat]=20=E5=93=81=E8=B4=A8=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=20=E9=80=80=E6=8D=A2=E8=B4=A7=E5=8D=95=20=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E9=80=80=E6=8D=A2=E8=B4=A7=E5=8D=95=E5=88=97=E8=A1=A8=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=EF=BC=8C=E8=B0=83=E6=95=B4=E8=A1=A8=E6=A0=BC=E5=88=97?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=EF=BC=8C=E6=96=B0=E5=A2=9E=E5=85=A5=E5=BA=93?=
 =?UTF-8?q?=E5=8D=95=E5=8F=B7=E5=88=97=EF=BC=8C=E5=8E=BB=E9=99=A4=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E6=8C=89=E9=92=AE=EF=BC=9B=20=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=80=80=E8=BF=98=E8=B4=A7=E5=8D=95=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E8=B7=B3=E8=BD=AC=E6=96=B9=E6=B3=95=EF=BC=9B=20?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=80=80=E6=8D=A2=E8=B4=A7=E7=89=A9=E6=96=99?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E9=A1=B5=E9=9D=A2=EF=BC=8C=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E5=88=97=E5=90=8D=E5=AD=97=E6=AE=B5=EF=BC=8C=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E5=AD=97=E5=85=B8=E7=B1=BB=E5=9E=8B=E6=95=B0=E6=8D=AE=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E6=A0=87=E7=AD=BE=E6=9F=A5=E8=AF=A2=E8=AF=AD=E5=8F=A5?=
 =?UTF-8?q?=EF=BC=9B=20=E4=BF=AE=E6=94=B9=E6=96=B0=E5=A2=9E=E9=80=80?=
 =?UTF-8?q?=E6=8D=A2=E8=B4=A7=E5=8D=95=E9=A1=B5=E9=9D=A2=EF=BC=8C=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=E8=A1=A8=E6=A0=BC=E5=88=97=E7=BB=93=E6=9E=84=EF=BC=8C?=
 =?UTF-8?q?=E8=A1=A5=E5=85=A8=E5=AD=97=E6=AE=B5=EF=BC=9B=20=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E5=93=81=E8=B4=A8=E6=8A=A5=E5=91=8A=E8=B7=B3=E8=BD=AC?=
 =?UTF-8?q?=E6=96=B9=E6=B3=95=EF=BC=8C=E6=96=B0=E5=A2=9E=E5=9B=9E=E8=B0=83?=
 =?UTF-8?q?=E5=87=BD=E6=95=B0=E5=AE=9A=E4=B9=89=EF=BC=9B=20=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E5=A4=84=E7=90=86=E5=93=81=E8=B4=A8=E6=8A=A5=E5=91=8A?=
 =?UTF-8?q?=E5=AD=90=E9=A1=B5=E9=9D=A2=E6=95=B0=E6=8D=AE=E5=9B=9E=E8=B0=83?=
 =?UTF-8?q?=E5=87=BD=E6=95=B0=EF=BC=9B=20=E6=96=B0=E5=A2=9E=E6=8C=89?=
 =?UTF-8?q?=E6=96=99=E5=8F=B7=E6=9F=A5=E6=89=BE=E6=9B=B4=E6=96=B0=E8=A1=A8?=
 =?UTF-8?q?=E6=A0=BC=E6=95=B0=E6=8D=AE=E6=96=B9=E6=B3=95=EF=BC=9B=20?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=80=BB=E8=BE=91=E5=88=A0=E9=99=A4=E5=89=8D?=
 =?UTF-8?q?=E7=AB=AF=E7=9A=84=E4=B8=80=E8=A1=8C=E6=95=B0=E6=8D=AE=E6=96=B9?=
 =?UTF-8?q?=E6=B3=95=EF=BC=8C=E5=88=A0=E9=99=A4=E8=A1=A8=E6=A0=BC=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=90=8C=E6=97=B6=E5=88=A0=E9=99=A4=E8=AF=A5=E6=96=99?=
 =?UTF-8?q?=E5=8F=B7=E5=AF=B9=E5=BA=94session=E5=AD=98=E5=82=A8=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=EF=BC=9B=20=E4=BF=AE=E6=94=B9=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E9=80=80=E6=8D=A2=E8=B4=A7=E9=A1=B5=E9=9D=A2=E6=8F=90=E4=BA=A4?=
 =?UTF-8?q?=E6=96=B9=E6=B3=95=EF=BC=8C=E5=BE=AA=E7=8E=AF=E5=AD=90=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E6=95=B0=E6=8D=AE=E9=99=84=E5=8A=A0=E5=88=B0=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E4=BF=A1=E6=81=AF=E4=B8=8A=EF=BC=9B=20=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E5=85=A5=E5=BA=93=E5=90=8E=E9=80=80=E6=8D=A2=E8=B4=A7?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2=EF=BC=8C=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E6=95=B0=E6=8D=AE=E7=BB=93=E6=9E=84=EF=BC=9B?=
 =?UTF-8?q?=20=E4=BF=AE=E6=94=B9=E6=B7=BB=E5=8A=A0=E5=93=81=E8=B4=A8?=
 =?UTF-8?q?=E6=8A=A5=E5=91=8A=E9=A1=B5=E9=9D=A2=E5=8A=A0=E8=BD=BD=E6=96=B9?=
 =?UTF-8?q?=E6=B3=95=EF=BC=8C=E8=AF=BB=E5=8F=96session=E4=B8=AD=E7=89=B9?=
 =?UTF-8?q?=E5=AE=9A=E6=96=99=E5=8F=B7key=E5=80=BC=E5=88=9D=E5=A7=8B?=
 =?UTF-8?q?=E5=8C=96=E9=A1=B5=E9=9D=A2=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../quality/refundsExchanges/add.html         | 125 ++++++++++++++++--
 .../refundsExchanges/materialSelect.html      |  24 +++-
 .../refundsExchanges/qualityOrderReport.html  |  60 ++++++---
 .../refundsExchanges/refundsExchanges.html    |  51 +++----
 .../returnAfterStorageDetail.html             |  44 +++++-
 5 files changed, 239 insertions(+), 65 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/templates/quality/refundsExchanges/add.html b/ruoyi-admin/src/main/resources/templates/quality/refundsExchanges/add.html
index 5cceb476..329cebf5 100644
--- a/ruoyi-admin/src/main/resources/templates/quality/refundsExchanges/add.html
+++ b/ruoyi-admin/src/main/resources/templates/quality/refundsExchanges/add.html
@@ -46,8 +46,9 @@
     <script th:inline="javascript">
         var prefix = ctx + "quality/refundsExchanges"
         var refundsExchangesCode  = /*[[${refundsExchangesCode}]]*/ '';
-
-
+        var processMethodDatas = [[${@dict.getType('processMethod')}]];
+        var materialTypeDatas = [[${@category.getChildByCode('materialType')}]];
+        var materialUnqualifiedList = [];
         $("#form-refundsExchanges-add").validate({
             focusCleanup: true
         });
@@ -85,6 +86,14 @@
                 };
             });
 
+            materialDataList.forEach(function (material){
+                var key = 'unqualifiedDataList' + material.materialNo;
+                var dataString = sessionStorage.getItem(key);
+                if(dataString){
+                    var refundsExchangesUnqualifieds = JSON.parse(dataString);
+                    material.refundsExchangesUnqualifieds = refundsExchangesUnqualifieds;
+                }
+            })
             // 将全局变量 refundsExchangesCode 添加到要提交的数据中
             const combinedData = Object.assign({}, refundsExchangesData, {
                 refundsExchangesDetails: materialDataList,
@@ -132,6 +141,9 @@
                     {
                         title: '图片',
                         field: 'materialPhotourl',
+                        formatter: function(value, row, index) {
+                            return $.table.imageView(value);
+                        }
                     },
                     {
                         title: '物料名称',
@@ -140,6 +152,9 @@
                     {
                         title: '物料类型',
                         field: 'materialType',
+                        formatter: function(value, row, index) {
+                            return $.table.selectCategoryLabel(materialTypeDatas, value);
+                        }
                     },
                     {
                         title: '描述',
@@ -156,6 +171,9 @@
                     {
                         title: '物料加工方式',
                         field: 'materialProcessMethod',
+                        formatter: function(value, row, index) {
+                            return $.table.selectDictLabel(processMethodDatas, value);
+                        }
                     },
                     {
                         title: '品质报告',
@@ -163,7 +181,7 @@
                         formatter: function(value, row, index) {
                             // 这里直接使用row对象获取refundsExchangesCode，假设它是存在的
                             var actions = [];
-                            actions.push('<a class="btn btn-success btn-xs" href="javascript:void(0)" onclick="qualityReport(\'' + row.materialNo + '\', \'' + refundsExchangesCode + '\')"><i class="fa fa-plus"></i>报告</a> ');
+                            actions.push('<a class="btn btn-success btn-xs" href="javascript:void(0)" onclick="qualityReport(\'' + row.materialNo + '\', \'' + refundsExchangesCode + '\', \'' + row.hasQualifiedReport + '\')"><i class="fa fa-plus"></i>报告</a> ');
                             return actions.join('');
                         }
                     },
@@ -171,6 +189,11 @@
                         title: '退换数',
                         field: 'refundsExchangesNum',
                     },
+                    {
+                        title: '是否含品质报告数据',
+                        field: 'hasQuolifiedReport',
+                        visible: false,
+                    },
                     {
                         title: '操作',
                         align: 'center',
@@ -209,11 +232,13 @@
                     materialPhotourl:rowData.materialPhotourl,
                     materialName: rowData.materialName,
                     materialType: rowData.materialType,
-                    materialDescribe: rowData.materialDescribe,
-                    materialBrand: rowData.materialBrand,
-                    materialUnit: rowData.materialUnit,
-                    materialProcessMethod: rowData.materialProcessMethod,
-                    makeTotal:rowData.makeTotal
+                    materialDescribe: rowData.describe,
+                    materialBrand: rowData.brand,
+                    materialUnit: rowData.unit,
+                    materialProcessMethod: rowData.processMethod,
+                    makeTotal:rowData.makeTotal,
+                    refundsExchangesNum: '',
+                    hasQualifiedReport: 0,
                 }
             })
             layer.close(index);
@@ -225,17 +250,97 @@
                 field: 'materialNo',
                 values: materialNo
             })
+            // 删除该物料品质报告数据
+            var key = 'unqualifiedDataList' + materialNo;
+            if (sessionStorage.getItem(key)) {
+                sessionStorage.removeItem(key);
+            }
+        }
+
+        // 按料号查找更新表格数据
+        function updateRowByMaterialNo(materialNo, newData) {
+            // 获取所有行的数据
+            var rows = $('#bootstrap-table').bootstrapTable('getData');
+            for (var i = 0; i < rows.length; i++) {
+                if (rows[i].materialNo === materialNo) {
+                    rows[i] = Object.assign({}, rows[i], newData); // 合并新旧数据
+                    console.log(rows[i]);
+                    $('#bootstrap-table').bootstrapTable('updateRow', {
+                        index: i,
+                        row: rows[i]
+                    });
+                }
+            }
         }
 
+        // 处理品质报告子页面数据
+        function handleQualityReportData(index, layero){
+            var iframeWin = window[layero.find('iframe')[0]['name']];
+            var materialNo = iframeWin.$('#materialNo').val();
+            var inspectionTime = iframeWin.$('input[name="inspectionTime"]').val();
+            var remark = iframeWin.$('#remark').val();
+            var refundsExchangesNum = 0;
+
+            var table = iframeWin.$('#bootstrap-unqualified-table').bootstrapTable('getData');
+            // 检查表格数据是否为空
+            if (table.length===0){
+                $.modal.alertWarning("请至少添加一条不合格数再保存!");
+                return;
+            }
+            // 将表数据转换成与qualityReportData格式一致的数组
+            var unqualifiedDataList = table.map(function(item) {
+                // 根据实际字段名调整
+                return {
+                    "qualityOrderReportId": item.qualityOrderReportId,
+                    "processBadClassification": item.processBadClassification,
+                    "processBadGrade": item.processBadGrade,
+                    "processBadNum": item.processBadNum,
+                    "unqualifiedReportUrl": item.unqualifiedReportUrl
+                    // ...其他字段
+                };
+            });
+            unqualifiedDataList.forEach(function (index){
+                index.inspectionTime = inspectionTime;
+                index.remark = remark;
+                processBadNum = Number(index.processBadNum);
+                if (!isNaN(processBadNum) ) {
+                    refundsExchangesNum += processBadNum;
+                }
+            })
+
+            var key = 'unqualifiedDataList' + materialNo;
+            if (sessionStorage.getItem(key)) {
+                sessionStorage.removeItem(key);
+            }
+            sessionStorage.setItem(key,JSON.stringify(unqualifiedDataList));
+            var newData = {
+                refundsExchangesNum: refundsExchangesNum,
+                hasQualifiedReport: '1'
+            };
+            updateRowByMaterialNo(materialNo,newData);
+            layer.close(index);
+        }
 
         /*品质报告*/
-        function qualityReport(materialNo, refundsExchangesCode) {
+        function qualityReport(materialNo, refundsExchangesCode, hasQualifiedReport) {
             var queryParams = new URLSearchParams();
             queryParams.append('materialNo', materialNo);
             queryParams.append('refundsExchangesCode', encodeURIComponent(refundsExchangesCode));
 
+            if(hasQualifiedReport === "0"){
+                // 删除该物料品质报告数据
+                var key = 'unqualifiedDataList' + materialNo;
+                if (sessionStorage.getItem(key)) {
+                    sessionStorage.removeItem(key);
+                }
+            }
             var url = ctx + 'quality/refundsExchanges/qualityReport?' + queryParams.toString();
-            $.modal.open("品质报告", url);
+            var options = {
+                title: '品质报告',
+                url: url,
+                callBack: handleQualityReportData
+            };
+            $.modal.openOptions(options);
         }
 
     </script>
diff --git a/ruoyi-admin/src/main/resources/templates/quality/refundsExchanges/materialSelect.html b/ruoyi-admin/src/main/resources/templates/quality/refundsExchanges/materialSelect.html
index f6fa0d67..b752dc7a 100644
--- a/ruoyi-admin/src/main/resources/templates/quality/refundsExchanges/materialSelect.html
+++ b/ruoyi-admin/src/main/resources/templates/quality/refundsExchanges/materialSelect.html
@@ -16,6 +16,11 @@
     var prefix = ctx + "quality/refundsExchanges";
     // 从后端拿到传入的makeNo
     var makeNo = /*[[${makeNo}]]*/ '';
+    var processMethodDatas = [[${@dict.getType('processMethod')}]];
+    var sysUnitClassDatas = [[${@dict.getType('sysUnitClassDatas')}]];
+    var warehouseDeptDatas = [[${@dict.getType('warehouseDept')}]];
+    var materialTypeDatas = [[${@category.getChildByCode('materialType')}]];
+
     $(function() {
         var options = {
             id: 'bootstrap-materialSelect-table',
@@ -38,6 +43,10 @@
                 {
                     title: '图片',
                     field: 'materialPhotourl',
+                    formatter: function(value, row, index) {
+                        return $.table.imageView(value);
+                    }
+
                 },
                 {
                     title: '物料名称',
@@ -46,18 +55,27 @@
                 {
                     title: '类型',
                     field: 'materialType',
+                    formatter: function(value, row, index) {
+                        return $.table.selectCategoryLabel(materialTypeDatas, value);
+                    }
                 },
                 {
                     title: '描述',
-                    field: 'materialDescribe',
+                    field: 'describe',
                 },
                 {
                     title: '品牌',
-                    field: 'materialBrand',
+                    field: 'brand',
                 },
                 {
                     title: '单位',
-                    field: 'materialUnit',
+                    field: 'unit',
+                },
+                {   title: '加工方式',
+                    field: 'processMethod',
+                    formatter: function(value, row, index) {
+                        return $.table.selectDictLabel(processMethodDatas, value);
+                    }
                 },
             ]
         };
diff --git a/ruoyi-admin/src/main/resources/templates/quality/refundsExchanges/qualityOrderReport.html b/ruoyi-admin/src/main/resources/templates/quality/refundsExchanges/qualityOrderReport.html
index b789d32e..1bb31d97 100644
--- a/ruoyi-admin/src/main/resources/templates/quality/refundsExchanges/qualityOrderReport.html
+++ b/ruoyi-admin/src/main/resources/templates/quality/refundsExchanges/qualityOrderReport.html
@@ -7,7 +7,7 @@
 <body class="white-bg">
 <div class="wrapper wrapper-content animated fadeInRight ibox-content">
     <form class="form-horizontal m" id="form-qualityOrderReport-add">
-        <input name="materialNo" th:field="*{materialNo}" type="hidden">
+        <input name="materialNo" id="materialNo" th:field="*{materialNo}" type="hidden">
         <div class="container">
         <!--不合格数-->
             <div class="col-sm-12">
@@ -41,7 +41,7 @@
         <div class="form-group">
             <label class="col-sm-4 control-label">备注：</label>
             <div class="col-sm-8">
-                <textarea name="remark" class="form-control" type="text"></textarea>
+                <textarea name="remark" id="remark" class="form-control" type="text"></textarea>
             </div>
         </div>
     </form>
@@ -52,7 +52,7 @@
 <script th:inline="javascript">
     var prefix = ctx + "quality/refundsExchanges";
 
-    var materialNo = /*[[${materialNo}]]*/'';
+    var materialNo = [[${materialNo}]];
     var refundsExchangesCode = /*[[${refundsExchangesCode}]]*/'';
 
 
@@ -77,7 +77,6 @@
             $.modal.alertWarning("请至少添加一条不合格数再保存!");
             return;
         }
-        console.log(JSON.stringify(table));
         // 将表数据转换成与qualityReportData格式一致的数组
         var unqualifiedDataList = table.map(function(item) {
             // 根据实际字段名调整
@@ -89,19 +88,25 @@
                 // ...其他字段
             };
         });
-
         const combinedData = Object.assign({}, qualityReportData, {
             refundsExchangesUnqualifieds: unqualifiedDataList ,
             materialNo:materialNo,
             refundsExchangesCode:refundsExchangesCode
         });
         // 合并表单数据和表格数据
-        // 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 + "/qualityReport", jsonData);
+        console.log(combinedData);
+
+        var key = 'unqualifiedDataList' + materialNo;
+        if (localStorage.getItem(key)) {
+            localStorage.removeItem(key);
+        }
+        localStorage.setItem(key,JSON.stringify(unqualifiedDataList));
+        $.modal.close();
+
+        // // 使用 JSON.stringify() 序列化数据
+        // const jsonData = JSON.stringify(combinedData);
+        // // 发送 AJAX 请求到后端接口
+        // $.operate.saveJson(prefix + "/qualityReport", jsonData);
     }
 
     $("input[name='inspectionTime']").datetimepicker({
@@ -131,31 +136,30 @@
     }
     //收款凭证table列表
     $(function() {
+        $('#materialNo').val(materialNo);
         var options = {
             id:"bootstrap-unqualified-table",
-            modalName: "收款凭证",
+            modalName: "品质报告单",
             showColumns: false,
             pagination: false,
             showToggle: false,
             showRefresh:false,
             showSearch:false,
             singleSelect:true,
-            columns: [{
-                checkbox: false
-            },
+            columns: [
                 {
                     title: '品质报告单id',
                     field: 'qualityOrderReportId',
                     visible: false
                 },
 
-                {title: '不良分类',field: 'processBadClassification',
+                {title: '不良分类',field: 'processBadClassification',align: 'center',
                     formatter:function (value, row, index) {
                         return processBadClassificationFormatter(value,row,index);
                     }
                 },
 
-                {title: '不良等级',field: 'processBadGrade',
+                {title: '不良等级',field: 'processBadGrade',align: 'center',
                     formatter:function (value, row, index) {
                         return processBadGradeFormatter(value,row,index);
                     }
@@ -163,6 +167,7 @@
                 {
                     title: '数量',
                     field: 'processBadNum',
+                    align: 'center',
                     editable:{
                         type: 'text',
                         mode:'inline',
@@ -177,10 +182,12 @@
                 {
                     title: '报告',
                     field: 'unqualifiedReportUrl',
-                    editable: {
-                        mode:'inline',
-                        type: 'text', // 表示该列可以被编辑为文本
-                    },
+                    align: 'center',
+                    formatter: function(value, row, index) {
+                        var actions = [];
+                        actions.push('<a class="btn btn-success btn-xs" href="javascript:void(0)" ><i class="fa fa-plus"></i>上传</a> ');
+                        return actions.join('');
+                    }
                 },
                 {
                     title: '操作',
@@ -193,6 +200,17 @@
                 }
             ]
         };
+        var key = 'unqualifiedDataList' + materialNo;
+
+        var dataString = sessionStorage.getItem(key);
+
+        if (dataString) {
+            var data = JSON.parse(dataString);
+            options.data = data;
+            $('input[name="inspectionTime"]').val(data[0].inspectionTime);
+            $('#remark').val(data[0].remark);
+        }
+
         $.table.init(options);
     });
 
diff --git a/ruoyi-admin/src/main/resources/templates/quality/refundsExchanges/refundsExchanges.html b/ruoyi-admin/src/main/resources/templates/quality/refundsExchanges/refundsExchanges.html
index 71880fcc..8adafdf9 100644
--- a/ruoyi-admin/src/main/resources/templates/quality/refundsExchanges/refundsExchanges.html
+++ b/ruoyi-admin/src/main/resources/templates/quality/refundsExchanges/refundsExchanges.html
@@ -137,13 +137,9 @@
                     }
                 },
                 {
-                    title: '关联订单号',
+                    title: '关联单号',
                     field: 'relatedOrderCode',
                 },
-                {
-                    title: '入库单号',
-                    field: 'inStorageCode',
-                },
                 {
                     title: '退货节点',
                     field: 'qualityReturnNode',
@@ -152,7 +148,7 @@
                     }
                 },
                 {
-                    title: '物料数合计',
+                    title: '物料合计',
                     field: 'materialTotal',
                 },
                 {
@@ -162,14 +158,7 @@
                 {
                     title: '交付质检时间',
                     field: 'deliveryInspectionTime',
-                },
-                {
-                    title: '品质备注',
-                    field: 'qualityRemark',
-                },
-                {
-                    title: '备注',
-                    field: 'remark',
+                    visible: false,
                 },
                 {
                     title: '录入人',
@@ -192,7 +181,7 @@
                     align: 'center',
                     formatter: function(value, row, index) {
                         var actions = [];
-                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.refundsExchangesId + '\')"><i class="fa fa-edit"></i>编辑</a> ');
+                        // actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.refundsExchangesId + '\')"><i class="fa fa-edit"></i>编辑</a> ');
                        if (row.refundsExchangesStatus == 0 && row.qualityPurchaseStatus == 4){
                            actions.push('<a class="btn btn-success btn-xs ' + closingProceduresFlag + '" href="javascript:void(0)" onclick="closingProcedures(\'' + row.refundsExchangesId + '\')"><i class="fa fa-edit"></i>结案</a> ');
                        }
@@ -247,21 +236,23 @@
 
        /*添加退货单*/
         function add() {
-           var rows = $("#bootstrap-table").bootstrapTable('getSelections');
-            console.log("rows" + rows);
-           if (rows.length == 1){
-               // var curQualityReturnNode = rows[0].qualityReturnNode;
-               // var curRefundsExchangesCode = rows[0].refundsExchangesCode;
-               if (rows[0].qualityReturnNode == 1){
-                   var url = ctx + 'quality/refundsExchanges/add/' +rows[0].refundsExchangesCode;
-                   $.modal.open("添加退换货",url);
-               }else {
-                   $.modal.msgWarning("请选择退货节点为入库后退货的数据！")
-               }
-               // $.modal.open("添加" + table.options.modalName, $.operate.addUrl(rows[0].id));
-           }else{
-               $.modal.msgWarning("只能选中一行作为添加对象！")
-           }
+            var url = ctx + 'quality/refundsExchanges/add';
+            $.modal.open("添加退换货",url);
+           // var rows = $("#bootstrap-table").bootstrapTable('getSelections');
+           //  console.log("rows" + rows);
+           // if (rows.length == 1){
+           //     // var curQualityReturnNode = rows[0].qualityReturnNode;
+           //     // var curRefundsExchangesCode = rows[0].refundsExchangesCode;
+           //     if (rows[0].qualityReturnNode == 1){
+           //         var url = ctx + 'quality/refundsExchanges/add/' +rows[0].refundsExchangesCode;
+           //         $.modal.open("添加退换货",url);
+           //     }else {
+           //         $.modal.msgWarning("请选择退货节点为入库后退货的数据！")
+           //     }
+           //     // $.modal.open("添加" + table.options.modalName, $.operate.addUrl(rows[0].id));
+           // }else{
+           //     $.modal.msgWarning("只能选中一行作为添加对象！")
+           // }
 
         };
 
diff --git a/ruoyi-admin/src/main/resources/templates/quality/refundsExchanges/returnAfterStorageDetail.html b/ruoyi-admin/src/main/resources/templates/quality/refundsExchanges/returnAfterStorageDetail.html
index 10fb5961..5da58095 100644
--- a/ruoyi-admin/src/main/resources/templates/quality/refundsExchanges/returnAfterStorageDetail.html
+++ b/ruoyi-admin/src/main/resources/templates/quality/refundsExchanges/returnAfterStorageDetail.html
@@ -48,6 +48,9 @@
     var refundsExchangesCode  = /*[[${refundsExchangesCode}]]*/ '';
 
     var qualityRefundsExchanges = [[${qualityRefundsExchanges}]];
+    var processMethodDatas = [[${@dict.getType('processMethod')}]];
+    var warehouseDeptDatas = [[${@dict.getType('warehouseDept')}]];
+    var materialTypeDatas = [[${@category.getChildByCode('materialType')}]];
 
     $("input[name='deliveryInspectionTime']").datetimepicker({
         format: "yyyy-mm-dd",
@@ -136,26 +139,38 @@
                 {
                     title: '物料名称',
                     field: 'materialName',
+                    align: 'center',
                 },
                 {
                     title: '物料类型',
                     field: 'materialType',
+                    align: 'center',
+                    formatter: function(value, row, index) {
+                        return $.table.selectCategoryLabel(materialTypeDatas, value);
+                    }
                 },
                 {
                     title: '描述',
                     field: 'materialDescribe',
+                    align: 'center',
                 },
                 {
                     title: '品牌',
                     field: 'materialBrand',
+                    align: 'center',
                 },
                 {
                     title: '单位',
                     field: 'materialUnit',
+                    align: 'center',
                 },
                 {
                     title: '加工方式',
                     field: 'materialProcessMethod',
+                    align: 'center',
+                    formatter: function(value, row, index) {
+                        return $.table.selectDictLabel(processMethodDatas, value);
+                    }
                 },
                 {
                     title: '品质报告',
@@ -163,13 +178,40 @@
                     formatter: function(value, row, index) {
                         // 这里直接使用row对象获取refundsExchangesCode，假设它是存在的
                         var actions = [];
-                        actions.push('<a class="btn btn-success btn-xs" href="javascript:void(0)" onclick="qualityReport(\'' + row.materialNo + '\', \'' + row.refundsExchangesCode + '\')"><i class="fa fa-plus"></i>报告</a> ');
+                        actions.push('<a class="btn btn-success btn-xs" href="javascript:void(0)" onclick="qualityReport(\'' + row.materialNo + '\', \'' + row.refundsExchangesCode + '\')">报告</a> ');
                         return actions.join('');
                     }
                 },
                 {
                     title: '退换数',
                     field: 'refundsExchangesNum',
+                    align: 'center',
+                },
+                {
+                    title: '供应商ID',
+                    field: 'supplierCode',
+                    align: 'center',
+                },
+                {
+                    title: '供应商名称',
+                    field: 'supplierName',
+                    align: 'center',
+
+                },
+                {
+                    title: '退货联系人',
+                    field: 'customerContact',
+                    align: 'center',
+                },
+                {
+                    title: '联系人电话',
+                    field: 'contactNumber',
+                    align: 'center',
+                },
+                {
+                    title: '退货地址',
+                    field: 'supplierAddress',
+                    align: 'center',
                 }
             ]
         };