计划管理功能 12.15

ant-design-vue-jeecg/src/views/productplan/ZyProductPlanList.vue

@@ -136,20 +136,30 @@ export default {
           align: "center",
           dataIndex: 'productCode'
         },
+        // {
+        //   title: '车间编号',
+        //   align: "center",
+        //   dataIndex: 'workshopId'
+        // },
         {
-          title: '车间编号',
+          title: '车间名称',
           align: "center",
-          dataIndex: 'workshopId'
+          dataIndex: 'workshopId_dictText'
         },
         {
           title: '车间负责人',
           align: "center",
           dataIndex: 'responsiblePerson'
         },
+        // {
+        //   title: '班组编号',
+        //   align: "center",
+        //   dataIndex: 'teamId'
+        // },
         {
-          title: '班组编号',
+          title: '班组名称',
           align: "center",
-          dataIndex: 'teamId'
+          dataIndex: 'teamId_dictText'
         },
         {
           title: '组长',
@@ -186,14 +196,14 @@ export default {
           align: "center",
           dataIndex: 'auditBy'
         },
-        {
+        // {
-          title: '审核时间',
+        //   title: '审核时间',
-          align: "center",
+        //   align: "center",
-          dataIndex: 'auditTimr',
+        //   dataIndex: 'auditTimr',
-          customRender: function (text) {
+        //   customRender: function (text) {
-            return !text ? "" : (text.length > 10 ? text.substr(0, 10) : text)
+        //     return !text ? "" : (text.length > 10 ? text.substr(0, 10) : text)
-          }
+        //   }
-        },
+        // },
         {
           title: '操作',
           dataIndex: 'action',

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/entity/ZyProductPlan.java

@@ -71,6 +71,7 @@ public class ZyProductPlan implements Serializable {
      */
     @Excel(name = "车间id", width = 15)
     @ApiModelProperty(value = "车间id")
+    @Dict(dictTable = "sys_depart", dicText = "depart_name", dicCode = "id")
     private String workshopId;
     /**
      * 车间负责人
@@ -83,6 +84,7 @@ public class ZyProductPlan implements Serializable {
      */
     @Excel(name = "班组", width = 15)
     @ApiModelProperty(value = "班组")
+    @Dict(dictTable = "station", dicText = "station_name", dicCode = "id")
     private String teamId;
     /**
      * 组长