班次详情增加排班描述

src/views/system/dashboard/components/util.js

@@ -10,6 +10,8 @@ import Bus from '@/utils/EventBus'
 import newPng from '@/assets/images/homepage/new.png'
 import { BASE_URL } from '@/constant'
 import dayjs from 'dayjs'
+import { scheduleType } from '@/views/constants/schedule'
+
 /**
  * 创建组件
  */
@@ -163,6 +165,7 @@ export function buildComponent (name, column, preview, vm) {
                 this.$nextTick(async () => {
                     this.fetchData()
                     this.scheduleData = await this.getScheduleData()
+
                 })
             },
             methods: {
@@ -586,14 +589,17 @@ export function buildComponent (name, column, preview, vm) {
                     return Math.ceil((new Date(end) - new Date(start)) / (1000 * 60 * 60 * 24))
                 },
                 getScheduleData () {
-                    const sql = `select a.*, b.title_, b.start_date_, b.end_date_, b.config_, b.overview_ from t_schedule_detail a, t_schedule b where a.parent_id_ = b.id_ and a.user_id_ = '${this.userId}'`
+                    const sql = `select a.*, b.title_,b.type_, b.start_date_, b.end_date_, b.config_, b.overview_ from t_schedule_detail a, t_schedule b where a.parent_id_ = b.id_ and a.user_id_ = '${this.userId}'`
                     return new Promise((resolve, reject) => {
                         this.$common.request('sql', sql).then(res => {
                             const { data = [] } = res.variables || {}
                             const eventList = []
+                            const self = this
                             data.forEach(item => {
                                 const days = this.getDays(item.start_date_, item.end_date_)
                                 const config = item.config_ ? JSON.parse(item.config_) : {}
+                                const scheduleTypeLabel = scheduleType.filter(obj => obj.value === item.type_)[0]?.label || ''
+                                const scheduleCreateBy = self.userList.filter(obj => obj.userId === item.create_by_)[0]?.userName || ''
                                 const { scheduleShift } = config
                                 this.scheduleShift = scheduleShift
                                 for (let i = 1; i <= days; i++) {
@@ -604,6 +610,9 @@ export function buildComponent (name, column, preview, vm) {
                                         shiftList.forEach(s => {
                                             const t = scheduleShift.find(i => i.alias === s)
                                             eventList.push({
+                                                scheduleName: item.title_ ? item.title_ : '', // 排班表名字
+                                                scheduleTypeLabel: scheduleTypeLabel, // 排班类型
+                                                scheduleCreateBy: scheduleCreateBy, // 排班创建人
                                                 color: t ? t.color : '',
                                                 content: t.dateRange.map(d => {
                                                     return d.type === 'allday' ? '全天' : (`当天 ${d.startTime}` + ' 至 ' + `${d.isSecondDay === 'Y' ? '第二天' : '当天'} ${d.endTime}`)
@@ -632,7 +641,7 @@ export function buildComponent (name, column, preview, vm) {
                     this.$emit(
                         'open',
                         'banci',
-                        [param.event.startStr, param.event._def.extendedProps.jieShuShiJian],
+                        param.event._def.extendedProps,
                         this.scheduleShift,
                         param.event._def.title
                     )

src/views/system/homepage/components/banciDialog.vue

@@ -10,6 +10,15 @@
             @close="closeDialog"
         >
             <div class="containerDiv">
+                <div>
+                    <strong class="label">所属排班：</strong>{{ banci.scheduleName }}
+                </div>
+                <div>
+                    <strong class="label">排班类型：</strong>{{ banci.scheduleTypeLabel }}
+                </div>
+                <div>
+                    <strong class="label">排班创建人：</strong>{{ banci.scheduleCreateBy }}
+                </div>
                 <div>
                     <strong class="label">班次名称：</strong>{{ banci.name }}
                 </div>

src/views/system/homepage/index.vue

@@ -672,6 +672,9 @@ export default {
                 {
                     const filterObj = events.filter(item => item.alias === clickId)
                     this.banciInfo = filterObj[0]
+                    this.banciInfo.scheduleCreateBy = dateArr.scheduleCreateBy
+                    this.banciInfo.scheduleName = dateArr.scheduleName
+                    this.banciInfo.scheduleTypeLabel = dateArr.scheduleTypeLabel
                     this.banciDialogVisible = true
                     break
                 }