Merge branch 'fix/package-behavior' into develop
Some checks failed
Spell Check / Spell Check with Typos (push) Failing after 6s
Some checks failed
Spell Check / Spell Check with Typos (push) Failing after 6s
This commit is contained in:
commit
b86c0a1e7a
1 changed files with 13 additions and 6 deletions
|
|
@ -1395,6 +1395,7 @@ function submitAddWorkProduct() {
|
||||||
if (!s.hasOwnProperty('productsId')) {
|
if (!s.hasOwnProperty('productsId')) {
|
||||||
s.productsId = [];
|
s.productsId = [];
|
||||||
}
|
}
|
||||||
|
if (s.productsId.length === 0) return;
|
||||||
s.productsId.push(i.id);
|
s.productsId.push(i.id);
|
||||||
},
|
},
|
||||||
);
|
);
|
||||||
|
|
@ -3550,7 +3551,7 @@ watch(
|
||||||
</div>
|
</div>
|
||||||
<div
|
<div
|
||||||
class="col-12 col-md-10"
|
class="col-12 col-md-10"
|
||||||
id="customer-form-content"
|
id="group-create"
|
||||||
:class="{
|
:class="{
|
||||||
'q-py-md q-pr-md ': $q.screen.gt.sm,
|
'q-py-md q-pr-md ': $q.screen.gt.sm,
|
||||||
'q-py-md q-px-lg': !$q.screen.gt.sm,
|
'q-py-md q-px-lg': !$q.screen.gt.sm,
|
||||||
|
|
@ -4069,7 +4070,7 @@ watch(
|
||||||
</div>
|
</div>
|
||||||
<div
|
<div
|
||||||
class="col-12 col-md-10"
|
class="col-12 col-md-10"
|
||||||
id="customer-form-content"
|
id="product-create"
|
||||||
:class="{
|
:class="{
|
||||||
'q-py-md q-pr-md ': $q.screen.gt.sm,
|
'q-py-md q-pr-md ': $q.screen.gt.sm,
|
||||||
'q-pa-sm': !$q.screen.gt.sm,
|
'q-pa-sm': !$q.screen.gt.sm,
|
||||||
|
|
@ -4295,7 +4296,7 @@ watch(
|
||||||
'q-py-md q-pr-md ': $q.screen.gt.sm,
|
'q-py-md q-pr-md ': $q.screen.gt.sm,
|
||||||
'q-pa-sm': !$q.screen.gt.sm,
|
'q-pa-sm': !$q.screen.gt.sm,
|
||||||
}"
|
}"
|
||||||
id="customer-form-content"
|
id="product-info"
|
||||||
style="height: 100%; max-height: 100%; overflow-y: auto"
|
style="height: 100%; max-height: 100%; overflow-y: auto"
|
||||||
>
|
>
|
||||||
<BasicInfoProduct
|
<BasicInfoProduct
|
||||||
|
|
@ -4476,6 +4477,11 @@ watch(
|
||||||
sub: true,
|
sub: true,
|
||||||
}))
|
}))
|
||||||
"
|
"
|
||||||
|
:active="{
|
||||||
|
background: 'hsla(var(--blue-6-hsl) / .2)',
|
||||||
|
foreground: 'var(--blue-6)',
|
||||||
|
}"
|
||||||
|
scroll-element="#service-create"
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
<span
|
<span
|
||||||
|
|
@ -4498,7 +4504,7 @@ watch(
|
||||||
</div>
|
</div>
|
||||||
<div
|
<div
|
||||||
class="col-12 col-md-10"
|
class="col-12 col-md-10"
|
||||||
id="customer-form-content"
|
id="service-create"
|
||||||
:class="{
|
:class="{
|
||||||
'q-py-md q-pr-md ': $q.screen.gt.sm,
|
'q-py-md q-pr-md ': $q.screen.gt.sm,
|
||||||
'q-pa-sm': !$q.screen.gt.sm,
|
'q-pa-sm': !$q.screen.gt.sm,
|
||||||
|
|
@ -4697,7 +4703,7 @@ watch(
|
||||||
</div>
|
</div>
|
||||||
</DialogForm>
|
</DialogForm>
|
||||||
|
|
||||||
<!-- edit service -->
|
<!-- edit service edit package-->
|
||||||
<!-- :edit="!(formDataProductService.status === 'INACTIVE')" -->
|
<!-- :edit="!(formDataProductService.status === 'INACTIVE')" -->
|
||||||
<DialogForm
|
<DialogForm
|
||||||
hide-footer
|
hide-footer
|
||||||
|
|
@ -4952,6 +4958,7 @@ watch(
|
||||||
background: 'hsla(var(--blue-6-hsl) / .2)',
|
background: 'hsla(var(--blue-6-hsl) / .2)',
|
||||||
foreground: 'var(--blue-6)',
|
foreground: 'var(--blue-6)',
|
||||||
}"
|
}"
|
||||||
|
scroll-element="#service-info"
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
<span
|
<span
|
||||||
|
|
@ -4974,7 +4981,7 @@ watch(
|
||||||
</div>
|
</div>
|
||||||
<div
|
<div
|
||||||
class="col-12 col-md-10"
|
class="col-12 col-md-10"
|
||||||
id="customer-form-content"
|
id="service-info"
|
||||||
:class="{
|
:class="{
|
||||||
'q-py-md q-pr-md ': $q.screen.gt.sm,
|
'q-py-md q-pr-md ': $q.screen.gt.sm,
|
||||||
'q-pa-sm': !$q.screen.gt.sm,
|
'q-pa-sm': !$q.screen.gt.sm,
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue