班组

src/views/group/monitoring/groupTeamView/components/groupTeamViewDetail.vue

@@ -7,6 +7,10 @@
             <p class="boldTitle">工单名称</p>
             <p class="lightText">{{ queryParams.workOrderName ? queryParams.workOrderName : '-' }}</p>
           </el-col>
+          <el-col :span="6">
+            <p class="boldTitle">车间名称</p>
+            <p class="lightText">{{ (queryParams.roomNameDict || queryParams.roomNameDict === 0) ? getDictDataLabel('workshop',queryParams.roomNameDict) : '-' }}</p>
+          </el-col>
           <el-col :span="6">
             <p class="boldTitle">班组名称</p>
             <p class="lightText">{{ queryParams.teamName ? queryParams.teamName : '-' }}</p>

src/views/group/monitoring/groupTeamView/index.vue

@@ -31,7 +31,15 @@
 import { getByWorkOrder } from '@/api/monitoring/groupTeamView'
 import { workOrderList } from '@/api/base/workOrder'
 import GroupTeamViewDetail from './components/groupTeamViewDetail.vue'
+import { publicFormatter } from '@/utils/dict'
 const tableProps = [
+  {
+    prop: 'roomNameDict',
+    label: '车间名称',
+    filter: publicFormatter('workshop'),
+    showOverflowtooltip: true,
+    minWidth: 100
+  },
   {
     prop: 'name',
     label: '班组名称'
@@ -134,6 +142,7 @@ export default {
       })
       params.workOrderId = this.queryParams.workOrderId
       params.workOrderName = this.workOrderName
+      params.roomNameDict = val.data.roomNameDict
       this.$nextTick(() => {
         this.$refs.groupTeamViewDetail.init(params)
       })

src/views/group/monitoring/teamProduction/index.vue

@@ -37,13 +37,21 @@
 import { groupTeamSchedulingPage, groupClassesListAll } from '@/api/monitoring/teamProduction'
 import { parseTime } from '@/utils/ruoyi'
 import TeamProductionDetail from './components/teamProductionDetail'
+import { publicFormatter } from '@/utils/dict'
 const tableProps = [
   {
-    prop: 'createTime',
-    label: '排班创建时间',
-    filter: parseTime,
-    minWidth: 160
+    prop: 'roomNameDict',
+    label: '车间名称',
+    filter: publicFormatter('workshop'),
+    showOverflowtooltip: true,
+    minWidth: 100
   },
+  // {
+  //   prop: 'createTime',
+  //   label: '排班创建时间',
+  //   filter: parseTime,
+  //   minWidth: 160
+  // },
   {
     prop: 'startDay',
     label: '上班日期',