[fix]

品质管理 品质单
修改来料品质单列表页面搜索栏，添加导出方法；
修改生产品质单列表页面搜索栏，添加导出方法；
修改品质报告单列表页面按钮样式，合并表格操作栏按钮；

ruoyi-admin/src/main/resources/templates/quality/iqcQualityOrder/iqcQualityOrder.html

@@ -10,10 +10,6 @@
             <form id="formId">
                 <div class="select-list">
                     <ul>
-                        <li>
-                            <label>品质报告单号：</label>
-                            <input type="text" name="qualityOrderReportCode"/>
-                        </li>
                         <li>
                             <label>品质单号：</label>
                             <input type="text" name="qualityOrderCode"/>
@@ -31,18 +27,19 @@
                             <input type="text" name="materialName"/>
                         </li>
                         <li>
-                            <label>品质单订单类型：</label>
+                            <label>品质状态：</label>
-                            <select name="qualityOrderType" th:with="type=${@dict.getType('quality_order_type')}">
+                            <select name="qualityStatus" th:with="type=${@dict.getType('qualityStatus')}">
                                 <option value="">所有</option>
                                 <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
                             </select>
                         </li>
                         <li>
-                            <label>品质单入库类型：</label>
+                            <label>关联订单号：</label>
-                            <select name="qualityStorageStatus" th:with="type=${@dict.getType('quality_storage_status')}">
+                            <input type="text" name="relatedOrderCode"/>
-                                <option value="">所有</option>
+                        </li>
-                                <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                        <li>
-                            </select>
+                            <label>品质员：</label>
+                            <input type="text" name="qualityEmployee"/>
                         </li>
                         <li class="select-time">
                             <label>录入时间：</label>
@@ -50,17 +47,6 @@
                             <span>-</span>
                             <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endCreateTime]"/>
                         </li>
-                        <li>
-                            <label>审批状态：</label>
-                            <select name="auditStatus" th:with="type=${@dict.getType('auditStatus')}">
-                                <option value="">所有</option>
-                                <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
-                            </select>
-                        </li>
-                        <li>
-                            <label>申请人：</label>
-                            <input type="text" name="applyUser"/>
-                        </li>
                         <li>
                             <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
                             <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
@@ -71,7 +57,7 @@
         </div>
 
         <div class="btn-group-sm" id="toolbar" role="group">
-            <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="quality:qualityReport:export">
+            <a class="btn btn-success" onclick="exportExcel()" shiro:hasPermission="quality:qualityReport:export">
                 <i class="fa fa-download"></i> 导出
             </a>
         </div>
@@ -90,6 +76,8 @@
 
     var prefix = ctx + "quality/qualityOrder";
 
+    var iqcPrefix = ctx + "quality/iqcQualityOrder";
+
     $(function() {
         var options = {
             url: prefix + "/iqcOrderList",
@@ -210,7 +198,8 @@
                         if (row.qualityStorageStatus == 2 ){
                             actions.push('<a class="btn btn-success btn-xs " href="javascript:void(0)" onclick="makeOutStartingQualityDetail(\'' + row.qualityOrderId + '\')"><i class="fa fa-edit"></i>详情</a> ');
                         }
-                        return actions.join('');
+                        var actionLinks = actions.join('');
+                        return $.table.dropdownToggle(actionLinks);
                     }
                 }]
         };
@@ -240,6 +229,29 @@
         $.modal.open("品质单详情",url);
     }
 
+    // 导出
+    function exportExcel() {
+        var ids = $.table.selectColumns("qualityOrderCode");
+        var dataParam = $("#formId").serializeArray();
+
+        let tipMsg = "确定导出当前所有数据吗?";
+        if ($.common.isNotEmpty(ids)) {
+            tipMsg = `确定导出 ${ids} 数据吗?`;
+            dataParam.push({ "name": "ids", "value": ids });
+        }
+        $.modal.confirm(tipMsg, function () {
+            $.modal.loading("正在导出数据，请稍后...");
+            $.post( iqcPrefix + "/export", dataParam, function (result) {
+                if (result.code === web_status.SUCCESS) {
+                    window.location.href = ctx + "common/download?fileName="+ encodeURI(result.msg) + "&delete=" + true;
+                } else {
+                    $.modal.alertError(result.msg);
+                }
+                $.modal.closeLoading();
+            });
+        });
+    }
+
 </script>
 </body>
 </html>

ruoyi-admin/src/main/resources/templates/quality/qualityOrder/qualityOrder.html

@@ -14,10 +14,6 @@
                                 <label>品质单号：</label>
                                 <input type="text" name="qualityOrderCode"/>
                             </li>
-                            <li>
-                                <label>入库单号：</label>
-                                <input type="text" name="inStorageCode"/>
-                            </li>
                             <li>
                                 <label>料号：</label>
                                 <input type="text" name="materialNo"/>
@@ -56,6 +52,12 @@
                 </form>
             </div>
 
+            <div class="btn-group-sm" id="toolbar" role="group">
+                <a class="btn btn-success" onclick="exportExcel()" shiro:hasPermission="quality:qualityReport:export">
+                    <i class="fa fa-download"></i> 导出
+                </a>
+            </div>
+
             <div class="col-sm-12 select-table table-striped">
                 <table id="bootstrap-table"></table>
             </div>
@@ -198,8 +200,8 @@
                         if (row.qualityStorageStatus == 4 ){
                             actions.push('<a class="btn btn-success btn-xs ' + makeStartingQualityDetailFlag + '" href="javascript:void(0)" onclick="makeStartingQualityDetail(\'' + row.qualityOrderId + '\')"><i class="fa fa-edit"></i>详情</a> ');
                         }
-
+                        var actionLinks = actions.join('');
-                        return actions.join('');
+                        return $.table.dropdownToggle(actionLinks);
                     }
                 }]
             };
@@ -250,7 +252,28 @@
             $.modal.open("生产入库品质详情",url)
         }
 
+        // 导出
+        function exportExcel() {
+            var ids = $.table.selectColumns("qualityOrderCode");
+            var dataParam = $("#formId").serializeArray();
 
+            let tipMsg = "确定导出当前所有数据吗?";
+            if ($.common.isNotEmpty(ids)) {
+                tipMsg = `确定导出 ${ids} 数据吗?`;
+                dataParam.push({ "name": "ids", "value": ids });
+            }
+            $.modal.confirm(tipMsg, function () {
+                $.modal.loading("正在导出数据，请稍后...");
+                $.post( prefix + "/export", dataParam, function (result) {
+                    if (result.code === web_status.SUCCESS) {
+                        window.location.href = ctx + "common/download?fileName="+ encodeURI(result.msg) + "&delete=" + true;
+                    } else {
+                        $.modal.alertError(result.msg);
+                    }
+                    $.modal.closeLoading();
+                });
+            });
+        }
     </script>
 </body>
 </html>

ruoyi-admin/src/main/resources/templates/quality/qualityReport/qualityReport.html

@@ -71,7 +71,7 @@
             </div>
 
             <div class="btn-group-sm" id="toolbar" role="group">
-                <a class="btn btn-warning" onclick="exportExcel()" shiro:hasPermission="quality:qualityReport:export">
+                <a class="btn btn-success" onclick="exportExcel()" shiro:hasPermission="quality:qualityReport:export">
                     <i class="fa fa-download"></i> 导出
                 </a>
             </div>
@@ -94,7 +94,7 @@
             var options = {
                 url: prefix + "/list",
                 detailUrl: prefix + "/detail/{id}",
-                modalName: "品质管理品质单报告",
+                modalName: "品质报告单",
                 fixedColumns: true, // 启用冻结列
                 fixedRightNumber: 1, // 冻结右列个数
                 columns: [{
@@ -263,12 +263,13 @@
                                 }
                             }
                             // 审批历史
-                            actions.push('<a class="btn btn-success btn-xs" href="javascript:void(0)" onclick="showHistoryDialog(\'' + row.instanceId + '\')"><i class="fa fa-list"></i> 审批历史</a> ');
+                            actions.push('<a class="btn btn-success btn-xs" href="javascript:void(0)" onclick="showHistoryDialog(\'' + row.instanceId + '\')"> 审批历史</a> ');
                             // 进度查看
-                            actions.push('<a class="btn btn-success btn-xs" href="javascript:void(0)" onclick="showProcessImgDialog(\'' + row.instanceId + '\')"><i class="fa fa-image"></i> 进度查看</a> ');
+                            actions.push('<a class="btn btn-success btn-xs" href="javascript:void(0)" onclick="showProcessImgDialog(\'' + row.instanceId + '\')"> 进度查看</a> ');
                         }
                         actions.push('<a class="btn btn-success btn-xs" href="javascript:void(0)" onclick="$.operate.detail(\'' + row.qualityOrderReportId + '\')"><i class="fa fa-search"></i>详情</a> ');
-                        return actions.join('');
+                        var actionLinks = actions.join('');
+                        return $.table.dropdownToggle(actionLinks);
                     }
                 }],
                 rowStyle: function (row, index) {