Browse Source

see also #23

ali 3 years ago
parent
commit
106073e0dc

+ 2 - 2
src/pages/Admin/Classroom/index.vue

@@ -148,14 +148,14 @@ export default {
             required: true,
             label: 'استاد مربوطه',
             align: 'left',
-            field: row => row.professor
+            field: row => row.professor_info?.firstname + ' ' + row.professor_info?.lastname
           },
           {
             name: 'title',
             required: true,
             label: 'تاریخ و زمان ثبت نام',
             align: 'left',
-            field: row => ShamsiDate.getDateTime(row.beginning_registration_period)
+            field: row => row.beginning_registration_period ? ShamsiDate.getDateTime(row.beginning_registration_period) : '-'
           },
           {
             name: 'title',

+ 2 - 2
src/pages/Admin/DiscussionCirclesClassroom/index.vue

@@ -132,14 +132,14 @@ export default {
             required: true,
             label: 'استاد مربوطه',
             align: 'left',
-            field: row => row.professor
+            field: row => row.professor_info?.firstname + ' ' + row.professor_info?.lastname
           },
           {
             name: 'title',
             required: true,
             label: 'تاریخ و زمان ثبت نام',
             align: 'left',
-            field: row => ShamsiDate.getDateTime(row.beginning_registration_period)
+            field: row => row.beginning_registration_period ? ShamsiDate.getDateTime(row.beginning_registration_period) : '-'
           },
           {
             name: 'title',