Merge branch 'master' of http://git.hghweb.ir/ali.s/palizvani-front-vite

src/components/FormBuilderCustumComponents/ContentCategorySelector.vue

@@ -20,7 +20,8 @@
           </div>
           <q-select v-model="mainCategory"
                     :options="mainCategoryOptions"
-                    :loading="categories.laoding" />
+                    :loading="categories.laoding"
+                    clearable />
         </div>
         <div class="col-md-4 col-12">
           <div>
@@ -28,7 +29,8 @@
           </div>
           <q-select v-model="subCategory"
                     :options="subCategoryOptions"
-                    :loading="categories.laoding" />
+                    :loading="categories.laoding"
+                    clearable />
         </div>
         <div class="col-md-4 col-12">
           <div>
@@ -36,7 +38,8 @@
           </div>
           <q-select v-model="bakhshCategory"
                     :options="bakhshCategoryOptions"
-                    :loading="categories.laoding" />
+                    :loading="categories.laoding"
+                    clearable />
         </div>
       </div>
     </q-card-section>

src/components/FormBuilderCustumComponents/PostCategorySelector.vue

@@ -6,7 +6,8 @@
       </div>
       <q-select v-model="mainCategory"
                 :options="mainCategoryOptions"
-                :loading="postCategories.laoding" />
+                :loading="postCategories.laoding"
+                clearable />
     </div>
     <div class="col-md-4 col-12">
       <div>
@@ -14,7 +15,8 @@
       </div>
       <q-select v-model="subCategory"
                 :options="subCategoryOptions"
-                :loading="postCategories.laoding" />
+                :loading="postCategories.laoding"
+                clearable />
     </div>
     <div class="col-md-4 col-12">
       <div>
@@ -22,7 +24,8 @@
       </div>
       <q-select v-model="bakhshCategory"
                 :options="bakhshCategoryOptions"
-                :loading="postCategories.laoding" />
+                :loading="postCategories.laoding"
+                clearable />
     </div>
   </div>
 </template>

src/components/Widgets/Invoice/AdminInvoiceList/AdminInvoiceList.vue

@@ -145,10 +145,17 @@ export default {
           {
             name: 'creation_time',
             required: true,
-            label: 'زمان',
+            label: 'زمان ثبت',
             align: 'left',
             field: row => Assist.miladiToShamsi(row.creation_time)
           },
+          {
+            name: 'creation_time',
+            required: true,
+            label: 'زمان آخرین به روزرسانی',
+            align: 'left',
+            field: row => Assist.miladiToShamsi(row.last_modification_time)
+          },
           {
             name: 'action',
             required: true,

src/components/Widgets/Invoice/InvoiceList/InvoiceList.vue

@@ -131,10 +131,17 @@ export default {
           {
             name: 'creation_time',
             required: true,
-            label: 'زمان',
+            label: 'زمان ثبت',
             align: 'left',
             field: row => Assist.miladiToShamsi(row.creation_time)
           },
+          {
+            name: 'creation_time',
+            required: true,
+            label: 'زمان آخرین به روزرسانی',
+            align: 'left',
+            field: row => Assist.miladiToShamsi(row.last_modification_time)
+          },
           {
             name: 'action',
             required: true,