From 3218ebb96a5a19807571e55e68e168aeaeeb5ade Mon Sep 17 00:00:00 2001
From: liuxiaoxu <1793812695@qq.com>
Date: Wed, 27 Nov 2024 19:15:09 +0800
Subject: [PATCH 1/2] =?UTF-8?q?[fix]=20=E4=BF=AE=E6=94=B9=E5=85=B6?=
=?UTF-8?q?=E4=BB=96=E8=81=94=E7=B3=BB=E4=BA=BA=E5=89=8D=E7=AB=AF=E9=A1=B5?=
=?UTF-8?q?=E9=9D=A2=EF=BC=9A=E8=A1=A8=E5=A4=B4=E6=8C=89=E9=92=AE=E8=B0=83?=
=?UTF-8?q?=E6=95=B4=E4=B8=BA=E7=BB=9F=E4=B8=80=E6=A0=B7=E5=BC=8F=EF=BC=9B?=
=?UTF-8?q?=E6=93=8D=E4=BD=9C=E6=A0=8F=E6=8C=89=E9=92=AE=EF=BC=8C=E5=BC=95?=
=?UTF-8?q?=E7=94=A8$.table.dropdownToggle=E6=96=B9=E6=B3=95=EF=BC=9B?=
=?UTF-8?q?=E9=9A=90=E8=97=8F=E8=81=94=E7=B3=BB=E4=BA=BAid=E5=AD=97?=
=?UTF-8?q?=E6=AE=B5=EF=BC=9B=20=E4=BF=AE=E6=94=B9=E5=85=B6=E4=BB=96?=
=?UTF-8?q?=E6=94=B6=E8=B4=A7=E5=9C=B0=E5=9D=80=E5=89=8D=E7=AB=AF=E9=A1=B5?=
=?UTF-8?q?=E9=9D=A2=EF=BC=9A=E8=A1=A8=E5=A4=B4=E6=8C=89=E9=92=AE=E8=B0=83?=
=?UTF-8?q?=E6=95=B4=E4=B8=BA=E7=BB=9F=E4=B8=80=E6=A0=B7=E5=BC=8F=EF=BC=9B?=
=?UTF-8?q?=E6=93=8D=E4=BD=9C=E6=A0=8F=E6=8C=89=E9=92=AE=EF=BC=8C=E5=BC=95?=
=?UTF-8?q?=E7=94=A8$.table.dropdownToggle=E6=96=B9=E6=B3=95=EF=BC=9B?=
=?UTF-8?q?=E9=9A=90=E8=97=8F=E6=94=B6=E8=B4=A7=E4=BA=BAid=E5=AD=97?=
=?UTF-8?q?=E6=AE=B5=EF=BC=9B=20=E4=BF=AE=E6=94=B9=E5=85=B6=E4=BB=96?=
=?UTF-8?q?=E5=BC=80=E7=A5=A8=E4=BF=A1=E6=81=AF=E5=89=8D=E7=AB=AF=E9=A1=B5?=
=?UTF-8?q?=E9=9D=A2=EF=BC=9A=E8=A1=A8=E5=A4=B4=E6=8C=89=E9=92=AE=E8=B0=83?=
=?UTF-8?q?=E6=95=B4=E4=B8=BA=E7=BB=9F=E4=B8=80=E6=A0=B7=E5=BC=8F=EF=BC=9B?=
=?UTF-8?q?=E6=93=8D=E4=BD=9C=E6=A0=8F=E6=8C=89=E9=92=AE=EF=BC=8C=E5=BC=95?=
=?UTF-8?q?=E7=94=A8$.table.dropdownToggle=E6=96=B9=E6=B3=95=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../resources/templates/system/contacts/contacts.html | 10 ++++++----
.../resources/templates/system/invoice/invoice.html | 9 +++++----
.../system/shippingaddress/shippingaddress.html | 11 ++++++-----
3 files changed, 17 insertions(+), 13 deletions(-)
diff --git a/ruoyi-admin/src/main/resources/templates/system/contacts/contacts.html b/ruoyi-admin/src/main/resources/templates/system/contacts/contacts.html
index 521e71be..8de56471 100644
--- a/ruoyi-admin/src/main/resources/templates/system/contacts/contacts.html
+++ b/ruoyi-admin/src/main/resources/templates/system/contacts/contacts.html
@@ -40,7 +40,7 @@
添加
-
@@ -67,6 +67,7 @@
{
field: 'contactid',
title: '联系人id',
+ visible: false
},
{
field: 'enterpriseCode',
@@ -133,9 +134,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/system/invoice/invoice.html b/ruoyi-admin/src/main/resources/templates/system/invoice/invoice.html
index ef2ae43b..90af3f30 100644
--- a/ruoyi-admin/src/main/resources/templates/system/invoice/invoice.html
+++ b/ruoyi-admin/src/main/resources/templates/system/invoice/invoice.html
@@ -110,10 +110,11 @@
align: 'center',
formatter: function(value, row, index) {
var actions = [];
- actions.push('编辑 ');
- actions.push('删除 ');
- actions.push('详情 ');
- return actions.join('');
+ actions.push('编辑 ');
+ actions.push('删除 ');
+ actions.push('详情 ');
+ var actionLinks = actions.join('');
+ return $.table.dropdownToggle(actionLinks);
}
}]
};
diff --git a/ruoyi-admin/src/main/resources/templates/system/shippingaddress/shippingaddress.html b/ruoyi-admin/src/main/resources/templates/system/shippingaddress/shippingaddress.html
index 94af2df0..26171e8c 100644
--- a/ruoyi-admin/src/main/resources/templates/system/shippingaddress/shippingaddress.html
+++ b/ruoyi-admin/src/main/resources/templates/system/shippingaddress/shippingaddress.html
@@ -47,7 +47,7 @@
@@ -70,7 +70,7 @@
modalName: "送货地址",
columns: [
{checkbox: true},
- {title: '送货id',field: 'deliveryId'},
+ {title: '送货id',field: 'deliveryId', visible: false},
{title: '客户/企业代码',field: 'enterpriseCode'},
{title: '客户/企业名称',field: 'enterpriseName'},
{title: '联系人电话',field: 'customerPhone'},
@@ -90,9 +90,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);
}
}
]
From da769542ae4cd3426e060254fa4653ebefffd2a1 Mon Sep 17 00:00:00 2001
From: liuxiaoxu <1793812695@qq.com>
Date: Wed, 27 Nov 2024 19:23:07 +0800
Subject: [PATCH 2/2] =?UTF-8?q?[fix]=20=E4=BF=AE=E6=94=B9=E5=87=BA?=
=?UTF-8?q?=E5=B7=AE=E5=8D=95=E5=AE=A1=E6=A0=B8=E6=8C=89=E9=92=AE=E7=9A=84?=
=?UTF-8?q?=E6=A0=B7=E5=BC=8F=EF=BC=8C=E9=87=87=E7=94=A8=E7=BB=9F=E4=B8=80?=
=?UTF-8?q?=E6=A0=B7=E5=BC=8F=20=E4=BF=AE=E6=94=B9=E5=85=AC=E5=8F=B8?=
=?UTF-8?q?=E4=BF=A1=E6=81=AF=E7=BC=96=E8=BE=91=E6=8C=89=E9=92=AE=E7=9A=84?=
=?UTF-8?q?=E6=A0=B7=E5=BC=8F=EF=BC=8C=E9=87=87=E7=94=A8=E7=BB=9F=E4=B8=80?=
=?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../templates/system/baseEvectionForm/baseEvectionForm.html | 2 +-
.../templates/system/companyInformation/companyInformation.html | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ruoyi-admin/src/main/resources/templates/system/baseEvectionForm/baseEvectionForm.html b/ruoyi-admin/src/main/resources/templates/system/baseEvectionForm/baseEvectionForm.html
index 5fdb6869..005b1b85 100644
--- a/ruoyi-admin/src/main/resources/templates/system/baseEvectionForm/baseEvectionForm.html
+++ b/ruoyi-admin/src/main/resources/templates/system/baseEvectionForm/baseEvectionForm.html
@@ -200,7 +200,7 @@
var todoUserIdList = row.todoUserId.split(",");
if(todoUserIdList.includes(loginName) || loginName == 'admin'){
var nodeName = row.taskName=='驳回调整'?' 调整申请':' 审批';
- actions.push(' '+nodeName+' ');
+ actions.push(' '+nodeName+' ');
}
}
// 审批历史
diff --git a/ruoyi-admin/src/main/resources/templates/system/companyInformation/companyInformation.html b/ruoyi-admin/src/main/resources/templates/system/companyInformation/companyInformation.html
index 1b28a25c..1e0a7350 100644
--- a/ruoyi-admin/src/main/resources/templates/system/companyInformation/companyInformation.html
+++ b/ruoyi-admin/src/main/resources/templates/system/companyInformation/companyInformation.html
@@ -225,7 +225,7 @@
align: 'center',
formatter: function(value, row, index) {
var actions = [];
- actions.push('编辑 ');
+ actions.push('编辑 ');
var actionLinks = actions.join('');
return $.table.dropdownToggle(actionLinks);
}