diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/OutsourcePlanController.java b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/OutsourcePlanController.java index 79fdf8ce..98bba0e9 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/OutsourcePlanController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/OutsourcePlanController.java @@ -122,7 +122,7 @@ public class OutsourcePlanController extends BaseController return prefix + "/edit"; } /** - * 修改委外计划 + * 委外计划详情 */ @RequiresPermissions("system:outsource_plan:detail") @GetMapping("/detail/{outsourcePlanId}") diff --git a/ruoyi-admin/src/main/resources/mapper/system/OutsourcePlanMapper.xml b/ruoyi-admin/src/main/resources/mapper/system/OutsourcePlanMapper.xml index e527d24e..cb38b07a 100644 --- a/ruoyi-admin/src/main/resources/mapper/system/OutsourcePlanMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/system/OutsourcePlanMapper.xml @@ -48,12 +48,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" diff --git a/ruoyi-admin/src/main/resources/templates/system/outsource_plan/detail.html b/ruoyi-admin/src/main/resources/templates/system/outsource_plan/detail.html index 233a610c..843b4981 100644 --- a/ruoyi-admin/src/main/resources/templates/system/outsource_plan/detail.html +++ b/ruoyi-admin/src/main/resources/templates/system/outsource_plan/detail.html @@ -1,70 +1,58 @@ - +
-

委外计划信息

-
-
- -
-
-
+
+ +
+
-
-
- -
-
-
+
+ +
+
-
-
- -
-
-
+
+ +
+
-
-
- -
-
-
+
+ +
+
-
-
- -
-
-
+
+ +
+
-
-
- -
-
-
+
+ +
+
-
-
- -
-
-
+
+ +
+
-

委外计划详情信息

+
+ +
+

委外计划详情信息

diff --git a/ruoyi-admin/src/main/resources/templates/system/outsource_plan/outsource_plan.html b/ruoyi-admin/src/main/resources/templates/system/outsource_plan/outsource_plan.html index bb01fe96..7b4dde4f 100644 --- a/ruoyi-admin/src/main/resources/templates/system/outsource_plan/outsource_plan.html +++ b/ruoyi-admin/src/main/resources/templates/system/outsource_plan/outsource_plan.html @@ -23,20 +23,22 @@
  • - -
    • -
  • - - -
  • - + + - +
    • + + + +
  •  搜索  重置 @@ -61,6 +63,8 @@ var detailFlag = [[${@permission.hasPermi('system:outsource_plan:detail')}]]; var processMethodDatas = [[${@dict.getType('processMethod')}]]; var materialTypeDatas = [[${@category.getChildByCode('materialType')}]]; + var sourceTypeDatas = [[${@dict.getType('purchase_plan_source')}]]; + var planStatusDatas = [[${@dict.getType('purchase_plan_status')}]]; var prefix = ctx + "system/outsource_plan"; @@ -82,7 +86,10 @@ }, { field: 'status', - title: '状态' + title: '状态', + formatter: function(value, row, index) { + return $.table.selectDictLabel(planStatusDatas, value); + } }, { @@ -117,7 +124,10 @@ { field: 'source', - title: '来源' + title: '来源', + formatter: function(value, row, index) { + return $.table.selectDictLabel(sourceTypeDatas, value); + } }, { field: 'applicant',