Merge remote-tracking branch 'origin/main'

src/module/uyeler/components/form/FormUyeBilgileri.vue

@@ -13,7 +13,7 @@
           @click="OpenPreviewPanel"
           v-if="
             (route.name === 'Profil' && !usersStore.isPanelUser) ||
-            route.name === 'UyeYetkiliDetay' && loaded
+            (route.name === 'UyeYetkiliDetay'|| usersStore.selectedUserApproveId === 3) && loaded
           ">
           Önizleme
         </button>
@@ -21,9 +21,8 @@
     </div>
     <div class="form-part-content" v-if="loaded">
       <user-approve-states v-if="!isPreview && route.name !== 'UyeYetkiliYeni'" />
-
       <form-select
-        v-if="route.name === 'UyeYetkiliYeni'"
+        v-if="route.name === 'UyeYetkiliYeni' || usersStore.selectedUserApproveId === 3"
         label="Kullanıcı Tipi"
         :listData="yetkiliTipList"
         listText="baslik"
@@ -36,7 +35,6 @@
       <div class="form-item back-grad back-grad-grey" v-else>
         {{ uyeBilgileriStore.formData.basvuruTipi }}
       </div>
-
       <form-input
         type="email"
         half
@@ -430,8 +428,8 @@
   const SetYetkiliTipList = () => {
     Object.assign(yetkiliTipList.value, globalDataStore.customerTips)
 
-    let araciInd = yetkiliTipList.value.findIndex((p) => p.id === 23)
+    // let araciInd = yetkiliTipList.value.findIndex((p) => p.id === 23)
-    yetkiliTipList.value.splice(araciInd, 1)
+    // yetkiliTipList.value.splice(araciInd, 1)
   }
 
   const ilceDisabled = computed<boolean>(() => {

src/module/uyeler/components/form/FormUyeOnayaGonder.vue

@@ -1,21 +1,26 @@
 <template>
-  <div class="form-part form-title">
+  <div class='form-part form-title'>
-    <div class="form-title-buttons">
+    <div class='form-title-buttons'>
-      <div class="button-c button-save" @click="SendForApprove">Onaya Gönder</div>
+      <div class='button-c button-save' @click='SendForApprove'>Onaya Gönder</div>
     </div>
   </div>
 </template>
-<script setup lang="ts">
+<script setup lang='ts'>
   import { ref, reactive, onBeforeMount, computed } from 'vue'
   import { useRoute } from 'vue-router'
+
   const route = useRoute()
   import { useDataStore } from '@/stores/dataStore'
+
   const dataStore = useDataStore()
   import { useGlobalStore } from '@/stores/globalStore'
+
   const globalStore = useGlobalStore()
   import { useUsersStore } from '@/stores/usersStore'
+
   const usersStore = useUsersStore()
   import { useCustomerStore } from '../../stores/customerStore'
+
   const customerStore = useCustomerStore()
 
   const formData = reactive<Record<string, any>>({
@@ -39,9 +44,9 @@
     })
 
     if (form !== 'errorfalse') {
-      if (route.name === 'UyeDetay')
+      if (route.name === 'UyeDetay' || route.name === 'Profil') {
         usersStore.userApproveId = formData.onayDurumuIslemTipiId
-      else usersStore.userSubApproveId = formData.onayDurumuIslemTipiId
+      } else usersStore.userSubApproveId = formData.onayDurumuIslemTipiId
     }
   }
 </script>

src/module/uyeler/components/form/FormUyePicture.vue

@@ -1,30 +1,30 @@
 <template>
-  <div class="form-part">
+  <div class='form-part'>
-    <div class="form-part-title">
+    <div class='form-part-title'>
       <h4>Profil Resmi</h4>
     </div>
-    <div class="form-part-content">
+    <div class='form-part-content'>
       <template v-if="file.filePath !== '' && file.filePath !== null">
         <file-list-item
-          :data="file"
+          :data='file'
-          @click="ReplaceImage"
+          @click='ReplaceImage'
           onlyPreview
-          :filePath="file.filePath" />
+          :filePath='file.filePath' />
       </template>
       <template v-else>
         <template v-if="route.name === 'Profil' || (route.name === 'Profil' && !usersStore.isPanelUser)">
-          <div class="form-item form-item-picture clickable" @click="picturePanel = true">
+          <div class='form-item form-item-picture clickable' @click='picturePanel = true'>
-            <div class="image-c">
+            <div class='image-c'>
-              <i class="ico-c">
+              <i class='ico-c'>
                 <svg>
-                  <use href="@/assets/images/icons.svg#plus"></use>
+                  <use href='@/assets/images/icons.svg#plus'></use>
                 </svg>
               </i>
             </div>
           </div>
         </template>
         <template v-else>
-          <div class="form-inner-comment">
+          <div class='form-inner-comment'>
             Eklenmiş resim bulunamadı.
           </div>
         </template>
@@ -32,39 +32,45 @@
     </div>
   </div>
   <panel-wrapper
-    v-if="picturePanel"
+    v-if='picturePanel'
-    v-model="picturePanel"
+    v-model='picturePanel'
-    panel-title="Profil Resmi Ekle">
+    panel-title='Profil Resmi Ekle'>
     <template #panelContent>
       <panel-user-picture />
     </template>
     <template #footerButton>
-      <div class="button-c button-save" @click="FileUpload">Ekle</div>
+      <div class='button-c button-save' @click='FileUpload'>Ekle</div>
     </template>
   </panel-wrapper>
 </template>
-<script setup lang="ts">
+<script setup lang='ts'>
   import { ref, reactive, onBeforeMount } from 'vue'
   import PanelUserPicture from '../panel/PanelUserPicture.vue'
   import PanelWrapper from '@/components/PanelWrapper.vue'
 
   import { useRoute } from 'vue-router'
+
   const route = useRoute()
   import { useDataStore } from '@/stores/dataStore'
+
   const dataStore = useDataStore()
   import { useGlobalStore } from '@/stores/globalStore'
+
   const globalStore = useGlobalStore()
   import { useValidationStore } from '@/stores/validationStore'
+
   const validationStore = useValidationStore()
   import { useUsersStore } from '@/stores/usersStore'
+
   const usersStore = useUsersStore()
   import { useCustomerStore } from '@/module/uyeler/stores/customerStore'
+
   const customerStore = useCustomerStore()
 
   const picturePanel = ref<boolean>(false)
   const isUpdate = ref<boolean>(false)
 
-  const file = reactive<Record<string,any>>({
+  const file = reactive<Record<string, any>>({
     title: '',
     filePath: ''
   })
@@ -75,7 +81,7 @@
     picturePanel.value = true
   }
 
-  const GetData = async () => {    
+  const GetData = async () => {
     let dt = await dataStore.dataGet('AppUserResim/AppUserId/' + usersStore.selectedUserId())
     if (dt !== 'errorfalse') {
       Object.assign(file, dt)

src/module/uyeler/stores/UyeBilgileriStore.ts

@@ -119,6 +119,7 @@ export const useUyeBilgileriStore = defineStore('uyeBilgileriStore', () => {
         delete formData[key]
       })
     }*/
+    ResetFormItems();
     formChanged.value = true
   }