Просмотр исходного кода

fix:调整日历组件日程的显示

liujiayin 2 лет назад
Родитель
Сommit
7ecc65b575

+ 2 - 2
src/views/system/dashboard/components/util.js

@@ -317,7 +317,8 @@ export function buildComponent (name, column, preview) {
                         'open',
                         'calendar',
                         [param.event.startStr, param.event._def.extendedProps.jieShuShiJian],
-                        this.data
+                        this.data,
+                        param.event.id
                     )
                 },
                 refreshData () {
@@ -514,7 +515,6 @@ export function buildComponent (name, column, preview) {
                 handleOpen (state, dateArr, events) {
                     const status = ['急', '重', '轻', '缓']
                     const eventTrees = []
-                    console.log('517 events',events)
                     switch (state) {
                         case 'calendar':
                             this.calendarDialogVisible = true

+ 7 - 9
src/views/system/dashboard/templates/scheduleAdd.vue

@@ -184,16 +184,14 @@ export default {
         form: {
             handler: function (val, oldVal) {
                 if (!UtilUtils.isEmptyObject(val)) {
-                    if (val.eventTrees.length) {
+                    const obj = val.eventTrees.find(fid=>{return fid.id == val.clickId})
+                    if (val.eventTrees.length && !UtilUtils.isEmptyObject(obj) && obj !== undefined) {
                         this.calendarForm = {
-                            id: val.eventTrees[0].id,
-                            biaoTi: val.eventTrees[0].title,
-                            neiRong: val.eventTrees[0].content,
-                            formDate: [
-                                val.eventTrees[0].start,
-                                val.eventTrees[0].jieShuShiJian
-                            ],
-                            zhuangTai: val.eventTrees[0].zhuangTai
+                            id: obj.id,
+                            biaoTi: obj.title,
+                            neiRong: obj.content,
+                            formDate: [obj.start, obj.jieShuShiJian],
+                            zhuangTai: obj.zhuangTai
                         }
                     } else {
                         this.calendarForm = {

+ 2 - 2
src/views/system/homepage/index.vue

@@ -588,10 +588,9 @@ export default {
             }
         },
         // 打开指定弹框
-        handleOpen (state, dateArr, events) {
+        handleOpen (state, dateArr, events,clickId) {
             const status = ['急', '重', '轻', '缓']
             const eventTrees = []
-            console.log('594 events',events)
             switch (state) {
                 case 'calendar':
                     this.calendarDialogVisible = true
@@ -612,6 +611,7 @@ export default {
                         }
                     }
                     this.calendarDialogForm.clickedDate = dateArr[0]
+                    this.calendarDialogForm.clickId = clickId
                     break
                 default:
                     break