diff --git a/src/components/CFinder/CFinder.ts b/src/components/CFinder/CFinder.ts index 466b12ac..7c7a848a 100755 --- a/src/components/CFinder/CFinder.ts +++ b/src/components/CFinder/CFinder.ts @@ -98,7 +98,7 @@ export default defineComponent({ arrvalue: [], type: costanti.FieldType.select, filter: null, - addall: false, + addall: true, notinsearch: true, useinput: false, }, diff --git a/src/components/CFinder/CFinder.vue b/src/components/CFinder/CFinder.vue index bebd0787..1bc5f93a 100755 --- a/src/components/CFinder/CFinder.vue +++ b/src/components/CFinder/CFinder.vue @@ -2,7 +2,7 @@
-
+
diff --git a/src/components/CGridTableRec/CGridTableRec.ts b/src/components/CGridTableRec/CGridTableRec.ts index 97038b4a..44aacf37 100755 --- a/src/components/CGridTableRec/CGridTableRec.ts +++ b/src/components/CGridTableRec/CGridTableRec.ts @@ -459,15 +459,19 @@ export default defineComponent({ } else { if ((item.table === 'skills') && item.value === costanti.FILTER_TUTTI) { let obj2: any = {} - // idSector - obj2['sector._id'] = idSector - filtersearch2.push(obj2) + if (idSector > 0) { + // idSector + obj2['sector._id'] = idSector + filtersearch2.push(obj2) + } } if ((item.table === 'subskills') && item.value === costanti.FILTER_TUTTI) { let obj2: any = {} // idSector - obj2['myskill._id'] = idSkill - filtersearch2.push(obj2) + if (idSkill > 0) { + obj2['myskill._id'] = idSkill + filtersearch2.push(obj2) + } } } @@ -493,7 +497,8 @@ export default defineComponent({ }) } } - if ((false && nosearch && props.finder) || (props.finder_noNull && nosearch)) { + // if ((false && nosearch && props.finder) || (props.finder_noNull && nosearch)) { + if (props.finder_noNull && nosearch) { returnedData.value = [] returnedCount = 0 return true diff --git a/src/rootgen/admin/importdata/importdata.ts b/src/rootgen/admin/importdata/importdata.ts index 4086e398..ba78b6f2 100755 --- a/src/rootgen/admin/importdata/importdata.ts +++ b/src/rootgen/admin/importdata/importdata.ts @@ -178,11 +178,13 @@ export default defineComponent({ strskills += '}, \n' } - // subskills - strsubskills += '{ \n' - strsubskills += ' idSkill: ' + idSkill + ',' - strsubskills += ' descr:\'' + sotto_cat + '\',' - strsubskills += '}, \n' + if (sotto_cat !== '') { + // subskills + strsubskills += '{ \n' + strsubskills += ' idSkill: ' + idSkill + ',' + strsubskills += ' descr:\'' + sotto_cat + '\',' + strsubskills += '}, \n' + } indrecsub++ } diff --git a/src/views/admin/dbop/dbop.vue b/src/views/admin/dbop/dbop.vue index b896153d..5c5baa25 100755 --- a/src/views/admin/dbop/dbop.vue +++ b/src/views/admin/dbop/dbop.vue @@ -213,6 +213,12 @@ @click="EseguiFunz('setVerifiedByAportadorToALL')">
+
+ +
+