From cb8e87264a5d855e20627ebf719121616671ca3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=99=93=E8=BF=AA?= <2596750866@qq.com> Date: Wed, 27 Nov 2024 17:56:42 +0800 Subject: [PATCH] =?UTF-8?q?[fix]=20=E5=93=81=E8=B4=A8=E7=AE=A1=E7=90=86=20?= =?UTF-8?q?=E5=93=81=E8=B4=A8=E5=8D=95=20=E4=BF=AE=E6=94=B9=E6=9D=A5?= =?UTF-8?q?=E6=96=99=E5=93=81=E8=B4=A8=E5=8D=95=E5=88=97=E8=A1=A8=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E6=90=9C=E7=B4=A2=E6=A0=8F=EF=BC=8C=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=96=B9=E6=B3=95=EF=BC=9B=20=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E7=94=9F=E4=BA=A7=E5=93=81=E8=B4=A8=E5=8D=95=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E9=A1=B5=E9=9D=A2=E6=90=9C=E7=B4=A2=E6=A0=8F=EF=BC=8C?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AF=BC=E5=87=BA=E6=96=B9=E6=B3=95=EF=BC=9B?= =?UTF-8?q?=20=E4=BF=AE=E6=94=B9=E5=93=81=E8=B4=A8=E6=8A=A5=E5=91=8A?= =?UTF-8?q?=E5=8D=95=E5=88=97=E8=A1=A8=E9=A1=B5=E9=9D=A2=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F=EF=BC=8C=E5=90=88=E5=B9=B6=E8=A1=A8=E6=A0=BC?= =?UTF-8?q?=E6=93=8D=E4=BD=9C=E6=A0=8F=E6=8C=89=E9=92=AE=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iqcQualityOrder/iqcQualityOrder.html | 60 +++++++++++-------- .../quality/qualityOrder/qualityOrder.html | 35 +++++++++-- .../quality/qualityReport/qualityReport.html | 11 ++-- 3 files changed, 71 insertions(+), 35 deletions(-) diff --git a/ruoyi-admin/src/main/resources/templates/quality/iqcQualityOrder/iqcQualityOrder.html b/ruoyi-admin/src/main/resources/templates/quality/iqcQualityOrder/iqcQualityOrder.html index 410ca2d8..1e10ade9 100644 --- a/ruoyi-admin/src/main/resources/templates/quality/iqcQualityOrder/iqcQualityOrder.html +++ b/ruoyi-admin/src/main/resources/templates/quality/iqcQualityOrder/iqcQualityOrder.html @@ -10,10 +10,6 @@
- + 导出
@@ -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('详情 '); } - 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(); + }); + }); + } + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/quality/qualityOrder/qualityOrder.html b/ruoyi-admin/src/main/resources/templates/quality/qualityOrder/qualityOrder.html index f6da0538..aa45dc3a 100644 --- a/ruoyi-admin/src/main/resources/templates/quality/qualityOrder/qualityOrder.html +++ b/ruoyi-admin/src/main/resources/templates/quality/qualityOrder/qualityOrder.html @@ -14,10 +14,6 @@ -
  • - - -
  • @@ -56,6 +52,12 @@
    • +
    + + 导出 + +
    +
    @@ -198,8 +200,8 @@ if (row.qualityStorageStatus == 4 ){ actions.push('详情 '); } - - return actions.join(''); + var actionLinks = 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(); + }); + }); + } \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/quality/qualityReport/qualityReport.html b/ruoyi-admin/src/main/resources/templates/quality/qualityReport/qualityReport.html index 510691b1..224f4219 100644 --- a/ruoyi-admin/src/main/resources/templates/quality/qualityReport/qualityReport.html +++ b/ruoyi-admin/src/main/resources/templates/quality/qualityReport/qualityReport.html @@ -71,7 +71,7 @@
    - + 导出
    @@ -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(' 审批历史 '); + actions.push(' 审批历史 '); // 进度查看 - actions.push(' 进度查看 '); + actions.push(' 进度查看 '); } actions.push('详情 '); - return actions.join(''); + var actionLinks = actions.join(''); + return $.table.dropdownToggle(actionLinks); } }], rowStyle: function (row, index) {