cssd-doc/cssd-back
1
0
Fork 0
mirror of https://git.meshkee.com/cssd/cssd-back.git synced 2026-10-13 11:31:05 +03:30
Code Issues Packages Projects Releases Wiki Activity

new changes

Browse Source
This commit is contained in:
f.shokouhi
2019-11-03 11:34:10 +03:30
parent da3dd22ec5
commit 6ece7b720d
5 changed files with 76 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/js/vue/components/modal/cycle/Show.vue
+29 -4
View File
@@ -51,10 +51,10 @@
<v-flex xs12> <v-flex xs12>
<hr class="v-divider theme--light"> <hr class="v-divider theme--light">
</v-flex> </v-flex>
<v-layout row wrap class="ml-4"> <v-layout row wrap style="margin-left: 20px !important;">
<template> <template>
<v-expansion-panel v-for="(label, key) in data.labels" :key="key"> <v-expansion-panel class="WM-Panel" v-for="(label, key) in data.labels" :key="key">
<v-expansion-panel-content> <v-expansion-panel-content>
<template v-slot:header> <template v-slot:header>
<div>{{ label.name }}</div> <div>{{ label.name }}</div>
@@ -63,7 +63,7 @@
<v-card-text>count : {{ label.pivot.count }}</v-card-text> <v-card-text>count : {{ label.pivot.count }}</v-card-text>
<v-card-text>note : {{ label.note }}</v-card-text> <v-card-text>note : {{ label.note }}</v-card-text>
<v-card-text> Package : <v-card-text> Package :
<v-expansion-panel> <v-expansion-panel class="WM-Panel">
<v-expansion-panel-content> <v-expansion-panel-content>
<template v-slot:header> <template v-slot:header>
<div>{{ label.package.name }}</div> <div>{{ label.package.name }}</div>
@@ -72,7 +72,7 @@
<v-card-text>note : {{ label.package.note }}</v-card-text> <v-card-text>note : {{ label.package.note }}</v-card-text>
<v-card-text> <v-card-text>
Items : Items :
<v-expansion-panel v-for="item in label.package.items" :key="item.key"> <v-expansion-panel class="WM-Panel" v-for="item in label.package.items" :key="item.key">
<v-expansion-panel-content> <v-expansion-panel-content>
<template v-slot:header> <template v-slot:header>
<div>{{ item.name }}</div> <div>{{ item.name }}</div>
@@ -126,3 +126,28 @@ export default {
} }
}; };
</script> </script>
<style media="screen">
.v-expansion-panel.WM-Panel {
box-shadow: none;
border-top: 1px solid #aaa;
border-right: 1px solid #aaa;
border-bottom: 1px solid #aaa;
border-left: 4px solid #e91e63;
padding: 5px 10px;
margin: 10px 0;
}
.v-expansion-panel.WM-Panel .v-expansion-panel__header {
font-weight:300;
font-size: 24px;
padding: 5px 10px;
margin: 7px 0;
}
.v-expansion-panel.WM-Panel .v-card__text {
padding: 0 0 0 30px;
font-weight: 600;
font-size: 18px;
}
.v-expansion-panel.WM-Panel .v-expansion-panel__body>.v-card {
margin: 5px 0 8px 0 !important;
}
</style>
resources/js/vue/components/modal/label/Show.vue
+2 -2
View File
@@ -65,7 +65,7 @@
</v-flex> </v-flex>
<v-layout row wrap class="ml-4"> <v-layout row wrap class="ml-4">
<template> <template>
<v-expansion-panel> <v-expansion-panel class="WM-Panel">
<v-expansion-panel-content> <v-expansion-panel-content>
<template v-slot:header> <template v-slot:header>
<div>{{ data.package.name }}</div> <div>{{ data.package.name }}</div>
@@ -73,7 +73,7 @@
<v-card> <v-card>
<v-card-text>note : {{ data.package.note }}</v-card-text> <v-card-text>note : {{ data.package.note }}</v-card-text>
<v-card-text> Items : <v-card-text> Items :
<v-expansion-panel v-for="item in data.package.items" :key="item.key"> <v-expansion-panel class="WM-Panel" v-for="item in data.package.items" :key="item.key">
<v-expansion-panel-content> <v-expansion-panel-content>
<template v-slot:header> <template v-slot:header>
<div>{{ item.name }}</div> <div>{{ item.name }}</div>
resources/js/vue/components/modal/package/Show.vue
+1 -1
View File
@@ -47,7 +47,7 @@
</v-flex> </v-flex>
<v-layout row wrap class="ml-4"> <v-layout row wrap class="ml-4">
<template> <template>
<v-expansion-panel> <v-expansion-panel class="WM-Panel">
<v-expansion-panel-content <v-expansion-panel-content
v-for="(item, key) in data.items" :key="key" v-for="(item, key) in data.items" :key="key"
> >
resources/js/vue/views/Cycle/AddEdit.vue
+22 -8
View File
@@ -2,7 +2,7 @@
<v-form ref="form"> <v-form ref="form">
<v-container grid-list-xs fluid> <v-container grid-list-xs fluid>
<material-card color="black" title="Add Cycle"> <material-card color="black" title="Add Cycle">
<v-layout align-center justify-center wrap class="px-5 my-3"> <v-layout wrap class="px-5 my-3">
<v-flex xs12 sm6 md4 class="WM-FlexCenter"> <v-flex xs12 sm6 md4 class="WM-FlexCenter">
<v-icon class="fa fa-align-left mr-2 WM-Margin-B-8"></v-icon> <v-icon class="fa fa-align-left mr-2 WM-Margin-B-8"></v-icon>
<v-text-field <v-text-field
@@ -59,7 +59,9 @@
></v-date-picker> ></v-date-picker>
</v-menu> </v-menu>
</v-flex> </v-flex>
<v-flex xs12 sm6 md4 class="WM-FlexCenter pl-3" style="position: relative" v-for="(label, key) in formData.labels" :key="key"> <v-flex xs12></v-flex>
<v-flex xs12 sm6 md4 class="WM-FlexCenter WM-DuplicateInput" style="position: relative" v-for="(label, key) in formData.labels" :key="key">
<div class="Inner">
<v-icon class="fa fa-check mr-2 WM-Margin-B-8"></v-icon> <v-icon class="fa fa-check mr-2 WM-Margin-B-8"></v-icon>
<v-autocomplete <v-autocomplete
color="black" color="black"
@@ -78,20 +80,23 @@
@click="duplicateForm(key)" @click="duplicateForm(key)"
> >
<v-icon class="white--text mr-2 caption">fas fa-plus</v-icon>ADD <v-icon class="white--text mr-2 caption">fas fa-plus</v-icon>ADD
</v-btn> </v-btn>
<v-btn v-if="key > 0" <v-btn v-if="key > 0"
absolute absolute
small small
left right
bottom top
color="red" color="pink"
@click="removeForm(key)" @click="removeForm(key)"
> >
<v-icon class="white--text mr-2 caption">fas fa-remove</v-icon>REMOVE <v-icon class="white--text mr-2 caption">fas fa-remove</v-icon>REMOVE
</v-btn> </v-btn>
</div>
</v-flex> </v-flex>
<v-spacer></v-spacer> <v-spacer></v-spacer>
<v-flex xs12>
<hr class="v-divider theme--light" style="margin:30px 0 0 0 !important">
</v-flex>
<v-flex xs12 sm12 md12 class="WM-FlexCenter"> <v-flex xs12 sm12 md12 class="WM-FlexCenter">
<!-- <v-icon class="fa fa-sort-amount-desc mr-2"></v-icon> --> <!-- <v-icon class="fa fa-sort-amount-desc mr-2"></v-icon> -->
<v-textarea color="black" v-model="formData.note" class="py-3 pr-3" name="address"> <v-textarea color="black" v-model="formData.note" class="py-3 pr-3" name="address">
@@ -213,4 +218,13 @@ export default {
.v-btn--floating, .v-btn--icon:before { .v-btn--floating, .v-btn--icon:before {
border-radius: 50%!important; border-radius: 50%!important;
} }
.WM-DuplicateInput {
margin: 15px 0;
}
.WM-DuplicateInput .Inner {
padding: 15px 20px !important;
margin: 0 10px 0 0;
width: 100%;
border: 1px solid rgba(0,0,0,.2);
}
</style> </style>
resources/js/vue/views/Package/AddEdit.vue
+22 -6
View File
@@ -14,8 +14,10 @@
class="py-3 pr-3" class="py-3 pr-3"
></v-text-field> ></v-text-field>
</v-flex> </v-flex>
<v-flex xs12 md12 sm12></v-flex>
<!-- <v-row style="position: relative" v-for="(item, key) in formData.items" :key="key"> --> <!-- <v-row style="position: relative" v-for="(item, key) in formData.items" :key="key"> -->
<v-flex xs12 md3 sm3 class="WM-FlexCenter pl-3" style="position: relative" v-for="(item, key) in formData.items" :key="key"> <v-flex xs12 md3 sm3 class="WM-FlexCenter WM-DuplicateInput" style="position: relative" v-for="(item, key) in formData.items" :key="key">
<div class="Inner">
<v-icon class="fas fa-check mr-2 WM-Margin-B-8"></v-icon> <v-icon class="fas fa-check mr-2 WM-Margin-B-8"></v-icon>
<v-autocomplete <v-autocomplete
@@ -41,17 +43,20 @@
<v-btn v-if="key > 0" <v-btn v-if="key > 0"
absolute absolute
small small
left right
bottom top
color="red" color="pink"
@click="removeForm(key)" @click="removeForm(key)"
> >
<v-icon class="white--text mr-2 caption">fas fa-remove</v-icon>REMOVE <v-icon class="white--text mr-2 caption">fas fa-remove</v-icon>REMOVE
</v-btn> </v-btn>
</div>
</v-flex> </v-flex>
<!-- </v-row> --> <!-- </v-row> -->
<v-spacer></v-spacer>
<v-flex xs12>
<hr class="v-divider theme--light" style="margin-top:30px !important">
</v-flex>
</v-layout> </v-layout>
<v-layout align-center justify-center wrap class="px-5 mb-3"> <v-layout align-center justify-center wrap class="px-5 mb-3">
<v-flex xs12 sm12 md12> <v-flex xs12 sm12 md12>
@@ -162,3 +167,14 @@ export default {
} }
}; };
</script> </script>
<style media="screen">
.WM-DuplicateInput {
margin: 15px 0;
}
.WM-DuplicateInput .Inner {
padding: 15px 20px !important;
margin: 0 10px 0 0;
width: 100%;
border: 1px solid rgba(0,0,0,.2);
}
</style>