From 18a008b0c040145f92a95ae875cc5c811ca79619 Mon Sep 17 00:00:00 2001
From: liuxiaoxu <1793812695@qq.com>
Date: Mon, 23 Dec 2024 19:45:59 +0800
Subject: [PATCH] =?UTF-8?q?[fix]=20=E5=93=81=E8=B4=A8=E7=AE=A1=E7=90=86=20?=
=?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9D=A5=E6=96=99=E5=93=81=E8=B4=A8=E5=8D=95?=
=?UTF-8?q?=E3=80=81=E7=94=9F=E4=BA=A7=E5=93=81=E8=B4=A8=E5=8D=95=E3=80=81?=
=?UTF-8?q?=E9=80=80=E6=96=99=E5=93=81=E8=B4=A8=E5=8D=95=E3=80=81=E5=93=81?=
=?UTF-8?q?=E8=B4=A8=E6=8A=A5=E5=91=8A=E5=8D=95=E3=80=81=E5=93=81=E8=B4=A8?=
=?UTF-8?q?=E7=AE=A1=E7=90=86=E5=88=B6=E7=A8=8B=E5=B7=A5=E5=BA=8F=E3=80=81?=
=?UTF-8?q?=E5=93=81=E8=B4=A8=E7=AE=A1=E7=90=86=E5=88=B6=E7=A8=8B=E6=A3=80?=
=?UTF-8?q?=E9=AA=8C=E3=80=81=E9=80=80=E6=A3=80=E7=AE=A1=E7=90=86=E3=80=81?=
=?UTF-8?q?=E5=93=81=E8=B4=A8=E7=AE=A1=E7=90=86=E9=80=80=E6=8D=A2=E8=B4=A7?=
=?UTF-8?q?=E5=8D=95=E3=80=81=E5=93=81=E8=B4=A8=E7=AE=A1=E7=90=86=E5=AE=A2?=
=?UTF-8?q?=E8=AF=89=E9=80=9A=E7=9F=A5=E5=8D=95=E7=9A=84=E5=89=8D=E7=AB=AF?=
=?UTF-8?q?=E5=88=97=E8=A1=A8=E9=A1=B5=E9=9D=A2=EF=BC=8C=E6=93=8D=E4=BD=9C?=
=?UTF-8?q?=E6=A0=8F=E6=8C=89=E7=85=A7=E5=85=A8=E5=B1=80=E7=BB=9F=E4=B8=80?=
=?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../complaintNotice/complaintNotice.html | 9 +++++----
.../iqcQualityOrder/iqcQualityOrder.html | 8 ++++----
.../manufacturingCheckout.html | 8 ++++----
.../manufacturingProcess.html | 7 ++++---
.../quality/qualityOrder/qualityOrder.html | 6 +++---
.../quality/qualityReport/qualityReport.html | 8 ++++----
.../refundsExchanges/refundsExchanges.html | 20 +++++++++----------
.../returnInspection/returnInspection.html | 9 +++++----
.../returnQualityOrder.html | 4 ++--
9 files changed, 41 insertions(+), 38 deletions(-)
diff --git a/ruoyi-admin/src/main/resources/templates/quality/complaintNotice/complaintNotice.html b/ruoyi-admin/src/main/resources/templates/quality/complaintNotice/complaintNotice.html
index cfe86020..0fd70c14 100644
--- a/ruoyi-admin/src/main/resources/templates/quality/complaintNotice/complaintNotice.html
+++ b/ruoyi-admin/src/main/resources/templates/quality/complaintNotice/complaintNotice.html
@@ -56,7 +56,7 @@
@@ -144,10 +144,11 @@
formatter: function(value, row, index) {
var actions = [];
if (row.closingProcedures !== '0') {
- actions.push('客诉处理 ');
+ actions.push('客诉处理 ');
}
- actions.push('详情 ');
- return actions.join('');
+ actions.push('详情 ');
+ var actionLinks = actions.join('');
+ return $.table.dropdownToggle(actionLinks);
}
}]
};
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 1e10ade9..2a390a16 100644
--- a/ruoyi-admin/src/main/resources/templates/quality/iqcQualityOrder/iqcQualityOrder.html
+++ b/ruoyi-admin/src/main/resources/templates/quality/iqcQualityOrder/iqcQualityOrder.html
@@ -183,20 +183,20 @@
var actions = [];
//采购订单品质
if (row.qualityStatus != 2 && row.qualityStorageStatus == 0 ){
- actions.push('品质 ');
+ actions.push('品质 ');
}
//采购订单品质详情
if (row.qualityStorageStatus == 0 ){
- actions.push('详情 ');
+ actions.push('详情 ');
}
//委外入库品质
if (row.qualityStatus != 2 && row.qualityStorageStatus == 2 ){
- actions.push('品质 ');
+ actions.push('品质 ');
}
//委外入库品质详情
if (row.qualityStorageStatus == 2 ){
- actions.push('详情 ');
+ actions.push('详情 ');
}
var actionLinks = actions.join('');
return $.table.dropdownToggle(actionLinks);
diff --git a/ruoyi-admin/src/main/resources/templates/quality/manufacturingCheckout/manufacturingCheckout.html b/ruoyi-admin/src/main/resources/templates/quality/manufacturingCheckout/manufacturingCheckout.html
index cc924a32..9ac90226 100644
--- a/ruoyi-admin/src/main/resources/templates/quality/manufacturingCheckout/manufacturingCheckout.html
+++ b/ruoyi-admin/src/main/resources/templates/quality/manufacturingCheckout/manufacturingCheckout.html
@@ -226,15 +226,15 @@
var todoUserIdList = row.todoUserId.split(",");
if(todoUserIdList.includes(loginName)){
var nodeName = row.taskName=='驳回调整'?' 调整申请':' 审批';
- actions.push(' '+nodeName+' ');
+ actions.push(' '+nodeName+' ');
}
}
// 审批历史
- actions.push(' 审批历史 ');
+ actions.push(' 审批历史 ');
// 进度查看
- actions.push(' 进度查看 ');
+ actions.push(' 进度查看 ');
}
- actions.push('详情 ');
+ actions.push('详情 ');
var actionLinks = actions.join('');
return $.table.dropdownToggle(actionLinks);
}
diff --git a/ruoyi-admin/src/main/resources/templates/quality/manufacturingProcess/manufacturingProcess.html b/ruoyi-admin/src/main/resources/templates/quality/manufacturingProcess/manufacturingProcess.html
index 4f9be6e3..534921ff 100644
--- a/ruoyi-admin/src/main/resources/templates/quality/manufacturingProcess/manufacturingProcess.html
+++ b/ruoyi-admin/src/main/resources/templates/quality/manufacturingProcess/manufacturingProcess.html
@@ -142,9 +142,10 @@
align: 'center',
formatter: function(value, row, index) {
var actions = [];
- actions.push('编辑 ');
- actions.push('详情 ');
- return actions.join('');
+ actions.push('编辑 ');
+ actions.push('详情 ');
+ var actionLinks = actions.join('');
+ return $.table.dropdownToggle(actionLinks);
}
}]
};
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 aa45dc3a..3e5554c9 100644
--- a/ruoyi-admin/src/main/resources/templates/quality/qualityOrder/qualityOrder.html
+++ b/ruoyi-admin/src/main/resources/templates/quality/qualityOrder/qualityOrder.html
@@ -190,15 +190,15 @@
//生产订单成品品质
if (row.qualityStatus != 2 && row.qualityStorageStatus == 4 && (row.materialNo!=null && row.materialNo.startsWith("8"))){
- actions.push('品质 ');
+ actions.push('品质 ');
}
//生产订单其他物料品质
if (row.qualityStatus != 2 && row.qualityStorageStatus == 4 && !(row.materialNo!=null && row.materialNo.startsWith("8"))){
- actions.push('品质 ');
+ actions.push('品质 ');
}
//生产订单品质详情
if (row.qualityStorageStatus == 4 ){
- actions.push('详情 ');
+ actions.push('详情 ');
}
var actionLinks = actions.join('');
return $.table.dropdownToggle(actionLinks);
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 224f4219..8c12e75d 100644
--- a/ruoyi-admin/src/main/resources/templates/quality/qualityReport/qualityReport.html
+++ b/ruoyi-admin/src/main/resources/templates/quality/qualityReport/qualityReport.html
@@ -259,15 +259,15 @@
var todoUserIdList = row.todoUserId.split(",");
if(todoUserIdList.includes(loginName)){
var nodeName = row.taskName=='驳回调整'?' 调整申请':' 审批';
- actions.push(' '+nodeName+' ');
+ actions.push(' '+nodeName+' ');
}
}
// 审批历史
- actions.push(' 审批历史 ');
+ actions.push(' 审批历史 ');
// 进度查看
- actions.push(' 进度查看 ');
+ actions.push(' 进度查看 ');
}
- actions.push('详情 ');
+ actions.push('详情 ');
var actionLinks = actions.join('');
return $.table.dropdownToggle(actionLinks);
}
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 29e60b6b..06204a13 100644
--- a/ruoyi-admin/src/main/resources/templates/quality/refundsExchanges/refundsExchanges.html
+++ b/ruoyi-admin/src/main/resources/templates/quality/refundsExchanges/refundsExchanges.html
@@ -69,7 +69,7 @@
添加退货单
-
+
导出
@@ -200,36 +200,36 @@
var actions = [];
// actions.push('编辑 ');
if (row.refundsExchangesStatus == 0 && row.qualityPurchaseStatus >= 3){
- actions.push('结案 ');
+ actions.push('结案 ');
}
/*入库前退货详情*/
if (row.qualityReturnNode == 0){
- actions.push('详情 ');
+ actions.push('详情 ');
}
/*入库后退货详情*/
if (row.qualityReturnNode == 1){
- actions.push('详情 ');
+ actions.push('详情 ');
}
/*入库前退换货-确认供应商-已有供应商*/
if (row.qualityReturnNode == 0 && row.qualityPurchaseStatus == 0 && row.qualityWarehouseStatus == 1){
- actions.push('确认供应商 ');
+ actions.push('确认供应商 ');
}
/*入库前退换货-确认收货-已有供应商*/
if (row.qualityReturnNode == 0 && row.qualityPurchaseStatus != 0 && row.qualityWarehouseStatus > 2 ){
- actions.push('确认收货 ');
+ actions.push('确认收货 ');
}
/*入库后退货-确认供应商-没有供应商*/
if (row.qualityReturnNode == 1 && row.qualityPurchaseStatus == 0 && row.qualityWarehouseStatus == 0){
- actions.push('确认供应商 ');
+ actions.push('确认供应商 ');
}
/*入库前退换货-确认收货-已有供应商*/
if (row.qualityReturnNode == 1 && row.qualityPurchaseStatus != 0 && row.qualityWarehouseStatus > 2 ){
- actions.push('确认收货 ');
+ actions.push('确认收货 ');
}
-
- return actions.join('');
+ var actionLinks = actions.join('');
+ return $.table.dropdownToggle(actionLinks);
}
}]
};
diff --git a/ruoyi-admin/src/main/resources/templates/quality/returnInspection/returnInspection.html b/ruoyi-admin/src/main/resources/templates/quality/returnInspection/returnInspection.html
index bde6e7f5..fcc02fd7 100644
--- a/ruoyi-admin/src/main/resources/templates/quality/returnInspection/returnInspection.html
+++ b/ruoyi-admin/src/main/resources/templates/quality/returnInspection/returnInspection.html
@@ -53,7 +53,7 @@
@@ -117,9 +117,10 @@
align: 'center',
formatter: function(value, row, index) {
var actions = [];
- actions.push('退检处理 ');
- actions.push('详情 ');
- return actions.join('');
+ actions.push('退检处理 ');
+ actions.push('详情 ');
+ var actionLinks = actions.join('');
+ return $.table.dropdownToggle(actionLinks);
}
}]
};
diff --git a/ruoyi-admin/src/main/resources/templates/quality/returnQualityOrder/returnQualityOrder.html b/ruoyi-admin/src/main/resources/templates/quality/returnQualityOrder/returnQualityOrder.html
index ac89d3f0..0a3f1d7c 100644
--- a/ruoyi-admin/src/main/resources/templates/quality/returnQualityOrder/returnQualityOrder.html
+++ b/ruoyi-admin/src/main/resources/templates/quality/returnQualityOrder/returnQualityOrder.html
@@ -195,9 +195,9 @@
formatter: function(value, row, index) {
var actions = [];
if (row.qualityStatus != 2){
- actions.push('品质 ');
+ actions.push('品质 ');
}
- actions.push('详情 ');
+ actions.push('详情 ');
var actionLinks = actions.join('');
return $.table.dropdownToggle(actionLinks);