From 16caf69649af4981f0d52aded2e6ecbbf752dd55 Mon Sep 17 00:00:00 2001 From: huangdeliang Date: Tue, 10 Nov 2020 20:29:38 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=89=8B=E6=9C=BA?= =?UTF-8?q?=E5=8F=B7=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-ui/src/views/custom/signContract/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ruoyi-ui/src/views/custom/signContract/index.vue b/ruoyi-ui/src/views/custom/signContract/index.vue index dbcc75634..5a336415f 100644 --- a/ruoyi-ui/src/views/custom/signContract/index.vue +++ b/ruoyi-ui/src/views/custom/signContract/index.vue @@ -124,7 +124,7 @@ } const checkPhone = (rule, value, callback) => { - const phoneReg = /^1[3|4|5|7|8][0-9]{9}$/ + const phoneReg = /^1[3|4|5|6|7|8|9][0-9]{9}$/ if (!value) { return callback(new Error('电话号码不能为空')) } From 3a75e562804e350f709e9c6cf8fb760888495f97 Mon Sep 17 00:00:00 2001 From: huangdeliang Date: Tue, 10 Nov 2020 20:37:57 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/controller/custom/SysContractController.java | 2 +- ruoyi-ui/src/views/custom/contract/index.vue | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/custom/SysContractController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/custom/SysContractController.java index 1c5422107..6afdff608 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/custom/SysContractController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/custom/SysContractController.java @@ -38,7 +38,7 @@ public class SysContractController extends BaseController { startPage(); List list = sysContractService.selectSysContractList(sysContract); for (SysContract contract : list) { - if (contract.getSignName() != null && !contract.getSignName().equals("") && !contract.getName().equals(contract.getSignName())) { + if (contract.getSignName() != null && !contract.getSignName().equals("") && !contract.getName().trim().equals(contract.getSignName())) { contract.setName(contract.getName() + "（" + contract.getSignName() + "）"); } } diff --git a/ruoyi-ui/src/views/custom/contract/index.vue b/ruoyi-ui/src/views/custom/contract/index.vue index 3ea20267b..d9ec18aaa 100644 --- a/ruoyi-ui/src/views/custom/contract/index.vue +++ b/ruoyi-ui/src/views/custom/contract/index.vue @@ -97,7 +97,7 @@ - + - + @@ -116,17 +116,17 @@ {{scope.row.servePromise ? `${scope.row.servePromise}斤`: ''}} - + - + - - + +