Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Q
quasar-web-base
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Nguyễn Hải Sơn
quasar-web-base
Commits
41f305d5
Commit
41f305d5
authored
Mar 29, 2023
by
Nguyễn Đức Thắng
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update
parent
c2d6d6ce
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
19 additions
and
7 deletions
+19
-7
type.ts
src/assets/type.ts
+1
-0
index.vue
...components/units-manager/add-update-unit-dialog/index.vue
+16
-6
index.vue
...components/units-manager/unit-add-update-artist/index.vue
+2
-1
No files found.
src/assets/type.ts
View file @
41f305d5
...
...
@@ -314,6 +314,7 @@ export type Contract = {
artistFullName
:
string
;
field
:
string
;
fieldId
:
number
;
id
:
number
};
export
type
ArtistOwnerAdd
=
{
...
...
src/components/units-manager/add-update-unit-dialog/index.vue
View file @
41f305d5
...
...
@@ -14,7 +14,7 @@
isUpdate
?
$t
(
'managingUnit.dialogLabel.title.add'
)
:
$t
(
'managingUnit.dialogLabel.title.update'
)
}}
}}
</q-item-label>
</q-item-section>
</q-item>
...
...
@@ -185,9 +185,9 @@
separator=
"cell"
:no-data-label=
"$t('emptyData')"
hide-pagination
:pagination=
"{
rowsPerPage: 0,
}"
:pagination=
"{
rowsPerPage: 0,
}"
>
<
template
v-slot:body-cell-action=
"item"
>
<q-td
style=
"padding: 0"
class=
"flex flex-center"
>
...
...
@@ -365,6 +365,7 @@
v-model:artistStatus=
"artistStatus"
v-model:contractTimeFrom=
"contractTimeFrom"
v-model:contractTimeTo=
"contractTimeTo"
v-model:contractId=
"contractId"
:artistOptions=
"artistOptions"
:fieldOptions=
"fieldsOptions"
:fieldsAddOptions=
"fieldsAddOptions"
...
...
@@ -591,6 +592,8 @@ export default defineComponent({
const
artistStatus
=
ref
(
1
);
const
contractTimeFrom
=
ref
(
''
);
const
contractTimeTo
=
ref
(
''
);
const
contractId
=
ref
(
0
);
const
selectedContract
:
Ref
<
{
artist
:
Contract
;
index
:
number
}
|
undefined
>
=
ref
(
undefined
);
...
...
@@ -676,6 +679,7 @@ export default defineComponent({
()
=>
contractTimeFrom
.
value
,
(
value
)
=>
{
if
(
value
)
{
console
.
log
(
value
,
'12312312'
);
const
fromDate
=
moment
(
value
,
'DD/MM/YYYY'
,
true
).
toDate
();
const
toDate
=
contractTimeTo
.
value
?
moment
(
contractTimeTo
.
value
,
'DD/MM/YYYY'
,
true
).
toDate
()
...
...
@@ -808,6 +812,8 @@ export default defineComponent({
const
openUpdateArtistDialog
=
(
artist
:
Contract
,
index
:
number
)
=>
{
selectedContract
.
value
=
{
artist
,
index
};
updateArtistDialogIsOpened
.
value
=
true
;
contractId
.
value
=
artist
.
id
;
artistField
.
value
=
{
id
:
artist
.
fieldId
,
name
:
artist
.
field
};
artistStatus
.
value
=
artist
.
status
;
contractTimeFrom
.
value
=
moment
(
...
...
@@ -822,6 +828,7 @@ export default defineComponent({
const
updateArtistContract
=
()
=>
{
const
newArtistList
=
[...
props
.
artistList
];
if
(
selectedContract
.
value
)
{
newArtistList
[
selectedContract
.
value
.
index
]
=
{
contractFrom
:
`
${
contractTimeFrom
.
value
}
00:00:00`
,
...
...
@@ -833,6 +840,8 @@ export default defineComponent({
artistFullName
:
artistName
.
value
?.
fullName
,
field
:
artistField
.
value
?.
name
,
fieldId
:
artistField
.
value
?.
id
,
id
:
contractId
.
value
};
context
.
emit
(
'update:artistList'
,
[...
newArtistList
]);
Notify
.
create
({
...
...
@@ -846,9 +855,9 @@ export default defineComponent({
};
const
addNewArtist
=
()
=>
{
console
.
log
(
artistField
.
value
,
'artistField.value'
);
const
newArtistList
=
[...
props
.
artistList
];
newArtistList
.
push
({
contractFrom
:
`
${
contractTimeFrom
.
value
}
00:00:00`
,
contractTo
:
`
${
contractTimeTo
.
value
}
00:00:00`
,
...
...
@@ -950,6 +959,7 @@ export default defineComponent({
taxCodeRules
,
passwordInputRules
,
isPwd
:
ref
(
true
),
contractId
,
};
},
emits
:
[
...
...
src/components/units-manager/unit-add-update-artist/index.vue
View file @
41f305d5
...
...
@@ -20,7 +20,7 @@
isUpdate
?
$t
(
'managingUnitAdd.dialogLabel.title.add'
)
:
$t
(
'managingUnitAdd.dialogLabel.title.update'
)
}}
}}
</q-item-label>
</q-item-section>
</q-item>
...
...
@@ -209,6 +209,7 @@ export default defineComponent({
artistStatus
:
{
type
:
Number
,
required
:
true
},
contractTimeFrom
:
{
type
:
String
,
required
:
true
},
contractTimeTo
:
{
type
:
String
,
required
:
true
},
contractId
:{
type
:
Number
,
required
:
true
}
// rowDataAccBank: {
// type: Object as PropType
<
BankAccountType
>
,
// required: true,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment