ali 3 år sedan
förälder
incheckning
927b203a6e

+ 0 - 1
src/components/Widgets/Invoice/AdminInvoiceList/AdminInvoiceList.vue

@@ -71,7 +71,6 @@ export default {
           col: 'col-md-3 col-12'
         },
         { type: 'select', name: 'category', options: [], label: 'وضعیت تراکنش', placeholder: ' ', col: 'col-md-2 col-12' },
-        { type: 'hidden', name: 'per_page', value: 5 },
         { type: 'input', name: 'category', label: 'نوع صورتحساب', placeholder: ' ', col: 'col-md-2 col-12' },
         { type: BtnControlComp, name: 'btn', responseKey: 'btn', label: 'جستجو', placeholder: ' ', atClick: () => {}, col: 'col-md-2 col-12' }
       ],

+ 36 - 3
src/components/Widgets/Ticket/AdminTicketList/AdminTicketList.vue

@@ -56,12 +56,45 @@ export default {
         pageKey: 'page'
       },
       inputs: [
-        { type: 'hidden', name: 'category__type', value: null },
-        { type: 'select', name: 'category', responseKey: 'category', placeholder: ' ', options: [], label: 'دسته', col: 'col-md-4 col-12' },
+        {
+          type: 'dateTime',
+          name: 'creation_time__gte',
+          label: 'از تاریخ',
+          placeholder: ' ',
+          col: 'col-md-3 col-12'
+        },
+        {
+          type: 'dateTime',
+          name: 'creation_time__lt',
+          label: 'تا تاریخ',
+          placeholder: ' ',
+          col: 'col-md-3 col-12'
+        },
+        { type: 'input', name: 'owner__national_code', label: 'کدملی', placeholder: ' ', col: 'col-md-3 col-12' },
+
+        {
+          type: 'select',
+          name: 'source_type',
+          responseKey: 'source_type',
+          placeholder: ' ',
+          options: [
+            { label: ' ', value: null },
+            { label: 'مالی', value: 'INVOICE' },
+            { label: 'آموزش', value: 'TRAINING_CLASSROOM' },
+            { label: 'حلقه های مباحثاتی', value: 'DISCUSSION_CIRCLE_CLASSROOM' },
+            { label: 'محتوا', value: 'CONTENT' },
+            { label: 'SESSION', value: 'SESSION' }
+          ],
+          label: 'مرجع',
+          value: null,
+          col: 'col-md-3 col-12'
+        },
+        { type: 'select', name: 'category', responseKey: 'category', placeholder: ' ', options: [], label: 'دسته', col: 'col-md-3 col-12' },
+        { type: 'select', name: 'status', responseKey: 'status', placeholder: ' ', options: (new Ticket()).statusEnums, label: 'وضعیت', col: 'col-md-3 col-12' },
         { type: BtnControlComp, name: 'btn', responseKey: 'btn', label: 'جستجو', placeholder: ' ', atClick: () => {}, col: 'col-md-2 col-12' },
         { type: 'hidden', name: 'source_type', value: null },
         // { type: 'space', name: 'space', value: null, col: 'col-12' },
-        { type: 'space', name: 'space', value: null, col: 'col-md-4 col-12' },
+        { type: 'space', name: 'space', value: null, col: 'col-md-2 col-12' },
         { type: 'select', name: 'per_page', responseKey: 'per_page', placeholder: ' ', options: [10, 25, 50], value: 10, label: 'تعداد در صفحه', col: 'col-md-2 col-12' }
       ],
       table: {

+ 6 - 1
src/models/Ticket.js

@@ -49,10 +49,15 @@ class Ticket extends Model {
         color: '#2FA84A'
       },
       {
-        label: 'پاسخ داده شده',
+        label: 'ادمین پاسخ داده',
         value: 'ADMIN_REPLIED',
         color: '#0B6AB1'
       },
+      {
+        label: 'کاربر پاسخ داده',
+        value: 'USER_REPLIED',
+        color: '#0B6AB1'
+      },
       // {
       //   label: 'در حال انتظار',
       //   value: 'PENDING',

+ 27 - 1
src/pages/Admin/Ticket/List.vue

@@ -13,7 +13,33 @@ export default {
   mixins: [mixinPageOptions],
   data: () => {
     return {
-      sections: [{ data: { rows: [{ cols: [{ widgets: [{ name: 'AdminTicketList', options: { 0: { label: 'قابل انتخاب', value: null }, 1: { label: 'مالی', value: 'INVOICE' }, 2: { label: 'آموزش', value: 'TRAINING_CLASSROOM' }, 3: { label: 'حلقه های مباحثاتی', value: 'DISCUSSION_CIRCLE_CLASSROOM' }, 4: { label: 'محتوا', value: 'CONTENT' }, 5: { label: 'SESSION', value: 'SESSION' }, style: {}, defaultCategoryType: 'EDUCATIONAL' } }], options: { style: { paddingTop: '', marginBottom: '124px' } } }], options: {} }] } }]
+      sections: [{
+        data: {
+          rows: [{
+            cols: [{
+              widgets: [{
+                name: 'AdminTicketList',
+                options: {
+                  defaultSourceType: null,
+                  defaultCategoryType: null
+                }
+              }],
+              options: { style: { paddingTop: '', marginBottom: '124px' } }
+            }],
+            options: {
+              className: '',
+              height: 'auto',
+              boxed: true,
+              boxedWidth: 1200,
+              gutterXSize: 'md',
+              gutterYSize: 'md',
+              absolute: 'none',
+              paddingOfBoxedInFullWidth: '30px',
+              style: { maxWidth: '1200px', width: '1200px' }
+            }
+          }]
+        }
+      }]
     }
   },
   created() {

+ 1 - 1
src/router/routes.js

@@ -34,7 +34,7 @@ const routes = [
     },
     component: () => import('layouts/MainLayout.vue'),
     meta: {
-      hasDynamicSetting: false
+      hasDynamicSetting: true
     },
     children: [
       {