From 1e519104ea84ffa004266f1ba305b265e224c5b0 Mon Sep 17 00:00:00 2001 From: dshclm <3321914460@qq.com> Date: Wed, 21 Aug 2024 16:54:08 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9B=BD=E5=AE=B6=E7=A7=98=E5=AF=86=E8=BD=BD?= =?UTF-8?q?=E4=BD=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../carrier/DestoryCarrierController.java | 2 +- .../carrier/MaintainCarrierController.java | 2 +- .../carrier/SaveCarrierController.java | 2 +- .../templates/system/carrier/carrier.html | 8 +- .../templates/system/carrier/detail.html | 223 +++++++++- .../templates/system/carrier/edit.html | 8 +- .../system/destoryCarrier/destoryCarrier.html | 162 +++++++ .../templates/system/destoryCarrier/edit.html | 407 ++++++++++++++++++ .../system/maintainCarrier/edit.html | 367 ++++++++++++++++ .../maintainCarrier/maintainCarrier.html | 162 +++++++ .../templates/system/recCarrier/edit.html | 173 +++++++- .../system/recCarrier/recCarrier.html | 113 +++-- .../templates/system/saveCarrier/edit.html | 330 ++++++++++++++ .../system/saveCarrier/saveCarrier.html | 162 +++++++ .../templates/system/useCarrier/edit.html | 254 ++++++++++- .../system/useCarrier/useCarrier.html | 87 +++- 16 files changed, 2391 insertions(+), 71 deletions(-) create mode 100644 ruoyi-admin/src/main/resources/templates/system/destoryCarrier/destoryCarrier.html create mode 100644 ruoyi-admin/src/main/resources/templates/system/destoryCarrier/edit.html create mode 100644 ruoyi-admin/src/main/resources/templates/system/maintainCarrier/edit.html create mode 100644 ruoyi-admin/src/main/resources/templates/system/maintainCarrier/maintainCarrier.html create mode 100644 ruoyi-admin/src/main/resources/templates/system/saveCarrier/edit.html create mode 100644 ruoyi-admin/src/main/resources/templates/system/saveCarrier/saveCarrier.html diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/carrier/DestoryCarrierController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/carrier/DestoryCarrierController.java index df0c2a4..0a3d49f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/carrier/DestoryCarrierController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/carrier/DestoryCarrierController.java @@ -21,7 +21,7 @@ import java.util.List; @Controller @RequestMapping("/system/destoryCarrier") public class DestoryCarrierController extends BaseController { - private String prefix = "system/carrier/destoryCarrier"; + private String prefix = "system/destoryCarrier"; @Resource private CarrierManager carrierManager; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/carrier/MaintainCarrierController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/carrier/MaintainCarrierController.java index c5a619f..f707da8 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/carrier/MaintainCarrierController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/carrier/MaintainCarrierController.java @@ -21,7 +21,7 @@ import java.util.List; @Controller @RequestMapping("/system/maintainCarrier") public class MaintainCarrierController extends BaseController { - private String prefix = "system/carrier/maintainCarrier"; + private String prefix = "system/maintainCarrier"; @Resource private CarrierManager carrierManager; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/carrier/SaveCarrierController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/carrier/SaveCarrierController.java index b6b33df..e6be92d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/carrier/SaveCarrierController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/carrier/SaveCarrierController.java @@ -22,7 +22,7 @@ import java.util.List; @Controller @RequestMapping("system/saveCarrier") public class SaveCarrierController extends BaseController { - private String prefix = "system/carrier/saveCarrier"; + private String prefix = "system/saveCarrier"; @Resource private CarrierManager carrierManager; diff --git a/ruoyi-admin/src/main/resources/templates/system/carrier/carrier.html b/ruoyi-admin/src/main/resources/templates/system/carrier/carrier.html index 1d5eeb9..d217243 100644 --- a/ruoyi-admin/src/main/resources/templates/system/carrier/carrier.html +++ b/ruoyi-admin/src/main/resources/templates/system/carrier/carrier.html @@ -152,13 +152,13 @@ var actions = []; if (row.status != '1') { actions.push('提交 '); - actions.push('详细 '); - actions.push('编辑 '); + actions.push('详细 '); + actions.push('编辑 '); actions.push('删除'); }else{ actions.push('提交 '); - actions.push('详细 '); - actions.push('编辑 '); + actions.push('详细 '); + actions.push('编辑 '); actions.push('删除'); } return actions.join(''); diff --git a/ruoyi-admin/src/main/resources/templates/system/carrier/detail.html b/ruoyi-admin/src/main/resources/templates/system/carrier/detail.html index aa5c614..fbe6fce 100644 --- a/ruoyi-admin/src/main/resources/templates/system/carrier/detail.html +++ b/ruoyi-admin/src/main/resources/templates/system/carrier/detail.html @@ -10,6 +10,8 @@