diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/carrier/ReceiveCarrierController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/carrier/ReceiveCarrierController.java index 6b4cb39..bda64cb 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/carrier/ReceiveCarrierController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/carrier/ReceiveCarrierController.java @@ -21,7 +21,7 @@ import java.util.List; @Controller @RequestMapping("/system/recCarrier") public class ReceiveCarrierController extends BaseController { - private String prefix = "system/carrier/receiveCarrier"; + private String prefix = "system/recCarrier"; @Resource private CarrierManager carrierManager; @@ -29,7 +29,7 @@ public class ReceiveCarrierController extends BaseController { @RequiresPermissions("system:recCarrier:view") @GetMapping() public String carrier() { - return prefix + "/receiveCarrier"; + return prefix + "/recCarrier"; } /** diff --git a/ruoyi-admin/src/main/resources/templates/system/carrier/add.html b/ruoyi-admin/src/main/resources/templates/system/carrier/add.html index 3f29d12..af10a3a 100644 --- a/ruoyi-admin/src/main/resources/templates/system/carrier/add.html +++ b/ruoyi-admin/src/main/resources/templates/system/carrier/add.html @@ -9,6 +9,7 @@
+
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 e69ac41..1d5eeb9 100644 --- a/ruoyi-admin/src/main/resources/templates/system/carrier/carrier.html +++ b/ruoyi-admin/src/main/resources/templates/system/carrier/carrier.html @@ -150,7 +150,7 @@ align: 'center', formatter: function(value, row, index) { var actions = []; - if (row.status == '1') { + if (row.status != '1') { actions.push('提交 '); actions.push('详细 '); actions.push('编辑 '); @@ -170,11 +170,12 @@ function openSubmit(id){ $.modal.confirm("确定要执行此操作吗？", function() { $.ajax({ - url: ctx + "system/carrier/updateStatus/" + id +'/' + '1', + url: ctx + "system/carrier/updateStatus/" + id +'/' + '2', type: "GET", dataType: "json", success: function(result) { $.modal.msgSuccess(result.msg) + $.table.refresh(); } }) }, function() { diff --git a/ruoyi-admin/src/main/resources/templates/system/recCarrier/edit.html b/ruoyi-admin/src/main/resources/templates/system/recCarrier/edit.html new file mode 100644 index 0000000..c4d9089 --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/system/recCarrier/edit.html @@ -0,0 +1,120 @@ + + + + + + + + + +
+ + + +
+
+
+ +
+ +
+
+
+
+
+ +
+
+ + +
+
+
+
+
+
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+
+
+
+
+ +
+
+ + +
+
+
+
+
+
+ +
+ +
+
+
+
+
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+
+ +
+ + + + + + + diff --git a/ruoyi-admin/src/main/resources/templates/system/recCarrier/recCarrier.html b/ruoyi-admin/src/main/resources/templates/system/recCarrier/recCarrier.html new file mode 100644 index 0000000..ced72cc --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/system/recCarrier/recCarrier.html @@ -0,0 +1,139 @@ + + + + + + +
+
+
+
+
+
    + +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • +  搜索 +  重置 +
    • +
+
+
+
+
+
+
+
+
+ + + +