mirror of
https://gitlab.com/Chill-Projet/chill-bundles.git
synced 2025-06-13 13:54:23 +00:00
Merge branch 'fix-vue-warnings' into bootstrap5_replacing_scratch
This commit is contained in:
commit
ca43933163
@ -81,13 +81,13 @@ export default {
|
|||||||
showModal: false,
|
showModal: false,
|
||||||
modalDialogClass: "modal-dialog-scrollable modal-xl"
|
modalDialogClass: "modal-dialog-scrollable modal-xl"
|
||||||
},
|
},
|
||||||
action: this.action
|
//action: this.action
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
computed: {
|
computed: {
|
||||||
action() {
|
//action() {
|
||||||
return this.$data.action;
|
// return this.$data.action;
|
||||||
},
|
//},
|
||||||
classAction() {
|
classAction() {
|
||||||
switch (this.action) {
|
switch (this.action) {
|
||||||
case 'show':
|
case 'show':
|
||||||
|
@ -6,7 +6,7 @@
|
|||||||
<div v-if="accompanyingCourse.requestor" class="flex-table">
|
<div v-if="accompanyingCourse.requestor" class="flex-table">
|
||||||
|
|
||||||
<label>
|
<label>
|
||||||
<input type="checkbox" v-model="isAnonymous" :value="value" />
|
<input type="checkbox" v-model="isAnonymous" /><!-- :value="value" -->
|
||||||
{{ $t('requestor.is_anonymous') }}
|
{{ $t('requestor.is_anonymous') }}
|
||||||
</label>
|
</label>
|
||||||
|
|
||||||
@ -112,7 +112,7 @@ export default {
|
|||||||
},
|
},
|
||||||
isAnonymous: {
|
isAnonymous: {
|
||||||
set(value) {
|
set(value) {
|
||||||
console.log('requestorIsAnonymous value',value);
|
//console.log('requestorIsAnonymous value',value);
|
||||||
this.$store.dispatch('requestorIsAnonymous', value);
|
this.$store.dispatch('requestorIsAnonymous', value);
|
||||||
},
|
},
|
||||||
get() {
|
get() {
|
||||||
@ -122,11 +122,11 @@ export default {
|
|||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
removeRequestor() {
|
removeRequestor() {
|
||||||
console.log('@@ CLICK remove requestor: item');
|
//console.log('@@ CLICK remove requestor: item');
|
||||||
this.$store.dispatch('removeRequestor');
|
this.$store.dispatch('removeRequestor');
|
||||||
},
|
},
|
||||||
addNewPersons({ selected, modal }) {
|
addNewPersons({ selected, modal }) {
|
||||||
console.log('@@@ CLICK button addNewPersons', selected);
|
//console.log('@@@ CLICK button addNewPersons', selected);
|
||||||
this.$store.dispatch('addRequestor', selected.shift());
|
this.$store.dispatch('addRequestor', selected.shift());
|
||||||
this.$refs.addPersons.resetSearch(); // to cast child method
|
this.$refs.addPersons.resetSearch(); // to cast child method
|
||||||
modal.showModal = false;
|
modal.showModal = false;
|
||||||
|
@ -53,7 +53,7 @@ export default {
|
|||||||
this.ready();
|
this.ready();
|
||||||
window.addEventListener('scroll', this.handleScroll);
|
window.addEventListener('scroll', this.handleScroll);
|
||||||
},
|
},
|
||||||
destroyed() {
|
unmounted() {
|
||||||
window.removeEventListener('scroll', this.handleScroll);
|
window.removeEventListener('scroll', this.handleScroll);
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
|
@ -155,9 +155,9 @@ export default {
|
|||||||
])];
|
])];
|
||||||
return uniqBy(union, k => k.key);
|
return uniqBy(union, k => k.key);
|
||||||
},
|
},
|
||||||
options() {
|
//options() {
|
||||||
return this.options;
|
// return this.options;
|
||||||
},
|
//},
|
||||||
checkUniq() {
|
checkUniq() {
|
||||||
if (this.options.uniq === true) {
|
if (this.options.uniq === true) {
|
||||||
return 'radio';
|
return 'radio';
|
||||||
|
@ -162,7 +162,7 @@ export default {
|
|||||||
getPerson(this.id)
|
getPerson(this.id)
|
||||||
.then(person => new Promise((resolve, reject) => {
|
.then(person => new Promise((resolve, reject) => {
|
||||||
this.person = person;
|
this.person = person;
|
||||||
console.log('get person', this.person);
|
//console.log('get person', this.person);
|
||||||
resolve();
|
resolve();
|
||||||
}));
|
}));
|
||||||
},
|
},
|
||||||
@ -170,7 +170,7 @@ export default {
|
|||||||
postPerson(this.person)
|
postPerson(this.person)
|
||||||
.then(person => new Promise((resolve, reject) => {
|
.then(person => new Promise((resolve, reject) => {
|
||||||
this.person = person;
|
this.person = person;
|
||||||
console.log('post person', person);
|
//console.log('post person', person);
|
||||||
resolve();
|
resolve();
|
||||||
}));
|
}));
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user