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

newchanges

Browse Source
This commit is contained in:
f.shokouhi
2019-09-18 11:55:29 +04:30
parent 64e510c1fe
commit b2b252752a
11 changed files with 15885 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files
package-lock.json
Generated
+15609
View File
File diff suppressed because it is too large Load Diff
resources/js/vue/components/core/Drawer.vue
+5 -5
View File
@@ -120,23 +120,23 @@ export default {
}, },
{ {
to: {name: 'AllItem'}, to: {name: 'AllItem'},
icon: 'done', icon: 'far fa-clone',
text: 'Items' text: 'Items'
}, },
{ {
to: {name: 'AllPackage'}, to: {name: 'AllPackage'},
icon: 'done', icon: 'fas fa-archive',
text: 'Packages', text: 'Packages',
role: 'Admin' role: 'Admin'
}, },
{ {
to: {name: 'AllPack'}, to: {name: 'AllPack'},
icon: 'done', icon: 'fas fa-inbox',
text: 'Packs' text: 'Packs'
}, },
{ {
to: {name: 'AllCycle'}, to: {name: 'AllCycle'},
icon: 'done', icon: 'cached',
text: 'Cycles' text: 'Cycles'
}, },
{ {
@@ -146,7 +146,7 @@ export default {
}, },
{ {
to: {name: 'Tickets'}, to: {name: 'Tickets'},
icon: 'fas fa-chart-bar', icon: 'style',
text: 'Tickets', text: 'Tickets',
}, },
], ],
resources/js/vue/views/Cycle/AddEdit.vue
+12 -2
View File
@@ -31,7 +31,7 @@
class="pa-2" class="pa-2"
></v-text-field> ></v-text-field>
</v-flex> </v-flex>
<v-flex xs12 sm6 md4> <v-flex xs12 sm6 md1>
<v-menu <v-menu
lazy lazy
:close-on-content-click="true" :close-on-content-click="true"
@@ -39,7 +39,15 @@
offset-y offset-y
v-model="fromMenuDate" v-model="fromMenuDate"
> >
<v-text-field required slot="activator" label="Date" v-model="formData.date"></v-text-field> <v-text-field
prepend-inner-icon="far fa-calendar-alt"
required
slot="activator"
label="Date"
color="black"
class="pr-3"
v-model="formData.date">
</v-text-field>
<v-date-picker <v-date-picker
color="pink" color="pink"
no-title no-title
@@ -51,6 +59,7 @@
<v-flex xs12 sm6 md8> <v-flex xs12 sm6 md8>
<v-autocomplete <v-autocomplete
multiple multiple
color="black"
:items="packs" :items="packs"
item-text="name" item-text="name"
item-value="id" item-value="id"
@@ -58,6 +67,7 @@
label="Select Packs For Cycle" label="Select Packs For Cycle"
></v-autocomplete> ></v-autocomplete>
</v-flex> </v-flex>
<v-spacer></v-spacer>
<v-flex xs12 sm12 md12> <v-flex xs12 sm12 md12>
<v-textarea color="black" v-model="formData.note" class="pa-2" name="address"> <v-textarea color="black" v-model="formData.note" class="pa-2" name="address">
<template v-slot:label> <template v-slot:label>
resources/js/vue/views/Cycle/List.vue
+18 -10
View File
@@ -3,31 +3,31 @@
<v-container fluid> <v-container fluid>
<material-card class color="black" title="All Cycles" text> <material-card class color="black" title="All Cycles" text>
<v-layout align-center wrap class="my-3"> <v-layout align-center wrap class="my-3">
<v-flex xs12 md3 sm3> <v-flex xs12 md2 sm3>
<v-text-field <v-text-field
class="pa-2" class="pa-3"
v-model="filter.name" v-model="filter.name"
label="Name" label="Name"
color="black" color="black"
></v-text-field> ></v-text-field>
</v-flex> </v-flex>
<v-flex xs12 md3 sm3> <v-flex xs12 md2 sm3>
<v-text-field <v-text-field
class="pa-2" class="pa-3"
v-model="filter.sterilizer_id" v-model="filter.sterilizer_id"
label="Sterilizer ID" label="Sterilizer ID"
color="black" color="black"
></v-text-field> ></v-text-field>
</v-flex> </v-flex>
<v-flex xs12 md3 sm3> <v-flex xs12 md2 sm3>
<v-text-field <v-text-field
class="pa-2" class="pa-3"
v-model="filter.cycle_number" v-model="filter.cycle_number"
label="Cycle Number" label="Cycle Number"
color="black" color="black"
></v-text-field> ></v-text-field>
</v-flex> </v-flex>
<v-flex xs12 sm6 md3> <v-flex xs12 sm2 md2>
<v-menu <v-menu
lazy lazy
:close-on-content-click="true" :close-on-content-click="true"
@@ -35,7 +35,15 @@
offset-y offset-y
v-model="Menu" v-model="Menu"
> >
<v-text-field required slot="activator" label="Date" v-model="filter.date"></v-text-field> <v-text-field style="padding-top:0 !important"
required
prepend-inner-icon="far fa-calendar-alt"
slot="activator"
label="Date"
color="black"
class="pl-3"
v-model="filter.date">
</v-text-field>
<v-date-picker <v-date-picker
color="pink" color="pink"
no-title no-title
@@ -44,14 +52,14 @@
></v-date-picker> ></v-date-picker>
</v-menu> </v-menu>
</v-flex> </v-flex>
<v-flex class xs12 md2 sm3> <v-flex class xs12 md1 sm3>
<v-btn class="WM-CyanBlueGradient-BG" style="padding:10px 60px" @click="load()"> <v-btn class="WM-CyanBlueGradient-BG" style="padding:10px 60px" @click="load()">
<v-icon class="white--text mr-2 caption">fas fa-search</v-icon> <v-icon class="white--text mr-2 caption">fas fa-search</v-icon>
<span class="white--text">Filter</span> <span class="white--text">Filter</span>
</v-btn> </v-btn>
</v-flex> </v-flex>
<v-spacer></v-spacer> <v-spacer></v-spacer>
<v-flex xs12 md2 sm2 class="text-xs-right"> <v-flex xs12 md1 sm2 class="text-xs-right">
<router-link :to="{name: 'AddCycle'}"> <router-link :to="{name: 'AddCycle'}">
<v-btn class="WM-NoShadow WM-Outline-Btn WM-Border WM-Border-Black"> <v-btn class="WM-NoShadow WM-Outline-Btn WM-Border WM-Border-Black">
<v-icon class="black--text mr-2 caption">fas fa-plus</v-icon> <v-icon class="black--text mr-2 caption">fas fa-plus</v-icon>
resources/js/vue/views/Pack/AddEdit.vue
+25 -6
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 Label on Set "> <material-card color="black" title="Add Label on Set ">
<v-layout align-center justify-center wrap class="px-5 my-3"> <v-layout wrap class="px-5 my-3">
<v-flex xs12 sm6 md3> <v-flex xs12 sm6 md3>
<v-text-field <v-text-field
name="name" name="name"
@@ -40,14 +40,17 @@
class="pa-2" class="pa-2"
></v-text-field> ></v-text-field>
</v-flex> </v-flex>
<v-spacer></v-spacer>
<v-flex xs12 sm6 md3> <v-flex xs12 sm6 md3>
<v-autocomplete <v-autocomplete
multiple multiple
color="black"
:items="items" :items="items"
item-text="name" item-text="name"
v-model="formData.packages" v-model="formData.packages"
item-value="id" item-value="id"
label="Select Package For Pack" label="Select Package For Pack"
class="pr-3"
></v-autocomplete> ></v-autocomplete>
</v-flex> </v-flex>
<v-flex xs12 sm6 md3> <v-flex xs12 sm6 md3>
@@ -56,10 +59,10 @@
label="Department" label="Department"
color="black" color="black"
v-model="formData.department" v-model="formData.department"
class="pa-2" class="px-3"
></v-text-field> ></v-text-field>
</v-flex> </v-flex>
<v-flex xs12 sm6 md3> <v-flex xs12 sm6 md2>
<v-menu <v-menu
lazy lazy
:close-on-content-click="true" :close-on-content-click="true"
@@ -67,7 +70,15 @@
offset-y offset-y
v-model="fromMenuSterile" v-model="fromMenuSterile"
> >
<v-text-field required slot="activator" label="Sterile Date" v-model="formData.sterile_date"></v-text-field> <v-text-field
required
prepend-inner-icon="far fa-calendar-alt"
slot="activator"
label="Sterile Date"
color="black"
class="px-3"
v-model="formData.sterile_date">
</v-text-field>
<v-date-picker <v-date-picker
color="pink" color="pink"
no-title no-title
@@ -76,7 +87,7 @@
></v-date-picker> ></v-date-picker>
</v-menu> </v-menu>
</v-flex> </v-flex>
<v-flex xs12 sm6 md3> <v-flex xs12 sm6 md2>
<v-menu <v-menu
lazy lazy
:close-on-content-click="true" :close-on-content-click="true"
@@ -84,7 +95,15 @@
offset-y offset-y
v-model="fromMenuExpire" v-model="fromMenuExpire"
> >
<v-text-field required slot="activator" label="Expire Date" v-model="formData.expire_date"></v-text-field> <v-text-field
required
prepend-inner-icon="far fa-calendar-alt"
slot="activator"
label="Expire Date"
color="black"
class="px-3"
v-model="formData.expire_date">
</v-text-field>
<v-date-picker <v-date-picker
color="pink" color="pink"
no-title no-title
resources/js/vue/views/Statistics/Chart.vue
+20 -5
View File
@@ -22,7 +22,7 @@
<v-flex xs12 sm4 md4> <v-flex xs12 sm4 md4>
<v-autocomplete :items="type" v-model="form.type" label="Type" color="black" class="pa-2"></v-autocomplete> <v-autocomplete :items="type" v-model="form.type" label="Type" color="black" class="pa-2"></v-autocomplete>
</v-flex> </v-flex>
<v-flex xs12 sm6 md5> <v-flex xs12 sm6 md2>
<v-menu <v-menu
lazy lazy
:close-on-content-click="true" :close-on-content-click="true"
@@ -30,7 +30,14 @@
offset-y offset-y
v-model="fromMenu" v-model="fromMenu"
> >
<v-text-field required slot="activator" label="FromDate" v-model="form.fromPicker"></v-text-field> <v-text-field
required
prepend-inner-icon="far fa-calendar-alt"
slot="activator"
label="FromDate"
color="black"
v-model="form.fromPicker">
</v-text-field>
<v-date-picker <v-date-picker
color="pink" color="pink"
no-title no-title
@@ -39,7 +46,7 @@
></v-date-picker> ></v-date-picker>
</v-menu> </v-menu>
</v-flex> </v-flex>
<v-flex xs12 sm6 md5> <v-flex xs12 sm6 md2>
<v-menu <v-menu
lazy lazy
:close-on-content-click="true" :close-on-content-click="true"
@@ -47,7 +54,14 @@
offset-y offset-y
v-model="upToMenu" v-model="upToMenu"
> >
<v-text-field required slot="activator" label="UpToDate" v-model="form.upToPicker"></v-text-field> <v-text-field
required
prepend-inner-icon="far fa-calendar-alt"
slot="activator"
label="UpToDate"
color="black"
v-model="form.upToPicker">
</v-text-field>
<v-date-picker <v-date-picker
color="pink" color="pink"
no-title no-title
@@ -56,7 +70,8 @@
></v-date-picker> ></v-date-picker>
</v-menu> </v-menu>
</v-flex> </v-flex>
<v-flex xs12 md2 sm2 class="text-xs-center text-sm-center text-md-center"> <v-spacer></v-spacer>
<v-flex xs12 md2 sm2 class="text-xs-center text-sm-center text-md-right">
<v-btn <v-btn
class="WM-NoShadow WM-Outline-Btn WM-Border WM-Border-Black" class="WM-NoShadow WM-Outline-Btn WM-Border WM-Border-Black"
style="padding:10px 60px;" style="padding:10px 60px;"
resources/js/vue/views/TestResult/AddEdit.vue
+46 -18
View File
@@ -2,7 +2,7 @@
<v-form ref="form"> <v-form ref="form">
<v-container grid-list-xs> <v-container grid-list-xs>
<material-card color="black" title="Submit Test Result"> <material-card color="black" title="Submit Test Result">
<v-layout align-center justify-center wrap class="px-5 my-3" v-if="!$route.params.testResult"> <v-layout wrap class="px-5 my-3" v-if="!$route.params.testResult">
<v-flex xs12 sm4 md4> <v-flex xs12 sm4 md4>
<v-autocomplete <v-autocomplete
:search-input.sync="searchInput" :search-input.sync="searchInput"
@@ -13,7 +13,7 @@
class="pa-2" class="pa-2"
></v-autocomplete> ></v-autocomplete>
</v-flex> </v-flex>
<v-flex xs12 sm3 md3> <v-flex xs12 sm3 md3 class="mr-5">
<v-text-field <v-text-field
name="testcode" name="testcode"
v-model="filter.unique_code" v-model="filter.unique_code"
@@ -22,6 +22,7 @@
class="pa-2" class="pa-2"
></v-text-field> ></v-text-field>
</v-flex> </v-flex>
<!-- <v-spacer></v-spacer> -->
<v-flex xs12 md2 sm2 class="text-xs-center text-sm-center text-md-center"> <v-flex xs12 md2 sm2 class="text-xs-center text-sm-center text-md-center">
<v-btn <v-btn
class="WM-NoShadow WM-Outline-Btn WM-Border WM-Border-Black" class="WM-NoShadow WM-Outline-Btn WM-Border WM-Border-Black"
@@ -40,7 +41,7 @@
<v-flex xs12 sm12 md12> <v-flex xs12 sm12 md12>
<h3>{{testTypeNameSelected}}</h3> <h3>{{testTypeNameSelected}}</h3>
</v-flex> </v-flex>
<v-flex xs12 sm4 md4> <v-flex xs12 sm3 md3>
<v-text-field <v-text-field
name="id" name="id"
v-model="formData.device_id" v-model="formData.device_id"
@@ -49,20 +50,22 @@
class="pa-2" class="pa-2"
></v-text-field> ></v-text-field>
</v-flex> </v-flex>
<v-flex xs12 sm4 md4> <v-flex xs12 sm2 md2>
<v-menu <v-menu
lazy lazy
:close-on-content-click="true" :close-on-content-click="true"
transition="v-scale-transition" transition="v-scale-transition"
offset-y offset-y
v-model="menu" v-model="menu"
class="pa-2"
> >
<v-text-field <v-text-field style="padding-top:0 !important"
prepend-icon="far fa-clock" prepend-inner-icon="far fa-clock"
required required
slot="activator" slot="activator"
label="Date" label="Date"
v-model="formData.date" v-model="formData.date"
color="black"
></v-text-field> ></v-text-field>
<v-date-picker <v-date-picker
color="pink" color="pink"
@@ -72,30 +75,36 @@
></v-date-picker> ></v-date-picker>
</v-menu> </v-menu>
</v-flex> </v-flex>
<v-flex xs12 sm4 md4> <v-flex xs12 sm2 md2>
<v-switch color="green" v-model="result" :label="'Result: ' + formData.result"></v-switch> <v-switch color="green" v-model="result" :label="'Result: ' + formData.result"></v-switch>
</v-flex> </v-flex>
<v-flex xs12 sm12 md12> <v-spacer></v-spacer>
<div> <v-flex xs12 sm2 md2>
<div class="WM-Align-R">
<input type="file" class="inputfile" @change="onFileChange" multiple /> <input type="file" class="inputfile" @change="onFileChange" multiple />
<label for="file"> <label for="file">
<v-icon class="v-icon greylighten-3--text mr-2 caption IconHover">fas fa-chevron-right</v-icon>Choose a file <v-icon class="v-icon greylighten-3--text mr-2 caption IconHover">fas fa-chevron-right</v-icon>Choose a file
</label> </label>
</div> </div>
<v-layout> </v-flex>
<v-flex v-for="(img, key) in images" :key="key" xs12 sm6 md3> <v-flex xs12 sm12 md12>
<v-layout class="mt-4">
<v-flex v-for="(img, key) in images" :key="key" xs12 sm6 md1>
<img :src="img" style="width:100%;" /> <img :src="img" style="width:100%;" />
<v-btn class="black" @click.native.stop="removeImage(key)">Remove image</v-btn> <!-- <v-btn fab class="black" @click.native.stop="removeImage(key)"></v-btn> -->
<v-btn class="mx-2" fab dark small color="primary">
<v-icon dark>mdi-minus</v-icon>
</v-btn>
</v-flex> </v-flex>
</v-layout> </v-layout>
</v-flex> </v-flex>
</v-layout>
<!-- start dynamic component -->
<v-layout align-center justify-center wrap class="px-5 my-3">
<v-flex :class="['pa-2', item.size]" v-for="(item, key) in form" :key="key"> <v-flex :class="['pa-2', item.size]" v-for="(item, key) in form" :key="key">
<v-text-field
v-if="item.type == 'Text'"
v-model="formData[item.name+'_'+item.id]"
:label="item.name"
color="black"
></v-text-field>
<v-container fluid v-if="item.type == 'Temperature'"> <v-container fluid v-if="item.type == 'Temperature'">
<p>{{ item.name }}</p> <p>{{ item.name }}</p>
<v-flex xs12> <v-flex xs12>
@@ -109,6 +118,25 @@
></v-slider> ></v-slider>
</v-flex> </v-flex>
</v-container> </v-container>
<v-text-field
v-if="item.type == 'Text'"
v-model="formData[item.name+'_'+item.id]"
:label="item.name"
color="black"
></v-text-field>
<!-- <v-container fluid v-if="item.type == 'Temperature'">
<p>{{ item.name }}</p>
<v-flex xs12>
<v-slider
step="0.1"
prepend-icon="fas fa-temperature-high"
v-model="formData[item.name+'_'+item.id]"
min="0"
max="200"
thumb-label="always"
></v-slider>
</v-flex>
</v-container> -->
<v-container fluid v-if="item.type == 'Pressure'"> <v-container fluid v-if="item.type == 'Pressure'">
<p>{{ item.name }}</p> <p>{{ item.name }}</p>
<v-flex xs12> <v-flex xs12>
resources/js/vue/views/TestResult/List.vue
+25 -16
View File
@@ -2,8 +2,8 @@
<div class> <div class>
<v-container fluid> <v-container fluid>
<material-card class color="black" title="All Test Resualt" text> <material-card class color="black" title="All Test Resualt" text>
<v-layout align-center wrap class="my-3"> <v-layout align-center wrap class="px-5 mb-3 my-3">
<v-flex xs12 md3 sm3> <v-flex xs12 md2 sm3>
<v-text-field <v-text-field
class="pa-2" class="pa-2"
v-model="filter.device_id" v-model="filter.device_id"
@@ -22,7 +22,7 @@
item-value="id" item-value="id"
></v-autocomplete> ></v-autocomplete>
</v-flex> </v-flex>
<v-flex xs12 md3 sm3> <v-flex xs12 md2 sm3>
<v-autocomplete <v-autocomplete
class="pa-2" class="pa-2"
v-model="filter.medicalCenter_id" v-model="filter.medicalCenter_id"
@@ -41,7 +41,19 @@
color="black" color="black"
></v-text-field> ></v-text-field>
</v-flex> </v-flex>
<v-flex xs12 sm6 md3> <v-spacer></v-spacer>
<v-flex wrap xs12 md2 sm2 class="WM-Align-R">
<router-link :to="{name: 'SubmitTestResult'}">
<v-btn class="WM-NoShadow WM-Outline-Btn WM-Border WM-Border-Black">
<v-icon class="black--text mr-2 caption">fas fa-plus</v-icon>
<span class="black--text">Add</span>
</v-btn>
</router-link>
</v-flex>
</v-layout>
<v-layout wrap class="px-5 mb-3 my-3">
<v-flex xs12 sm6 md2 style="display: flex;align-items: center;">
<v-icon class="far fa-calendar-alt mr-2"></v-icon>
<v-menu <v-menu
lazy lazy
:close-on-content-click="true" :close-on-content-click="true"
@@ -54,6 +66,7 @@
slot="activator" slot="activator"
label="FromDate" label="FromDate"
v-model="filter.fromPicker" v-model="filter.fromPicker"
color="black"
></v-text-field> ></v-text-field>
<v-date-picker <v-date-picker
color="pink" color="pink"
@@ -63,7 +76,8 @@
></v-date-picker> ></v-date-picker>
</v-menu> </v-menu>
</v-flex> </v-flex>
<v-flex xs12 sm6 md3> <v-flex xs12 sm6 md2 style="display: flex;align-items: center;">
<v-icon class="far fa-calendar-alt mr-2"></v-icon>
<v-menu <v-menu
lazy lazy
:close-on-content-click="true" :close-on-content-click="true"
@@ -75,6 +89,7 @@
required required
slot="activator" slot="activator"
label="UpToDate" label="UpToDate"
color="black"
v-model="filter.upToPicker" v-model="filter.upToPicker"
></v-text-field> ></v-text-field>
<v-date-picker <v-date-picker
@@ -85,24 +100,18 @@
></v-date-picker> ></v-date-picker>
</v-menu> </v-menu>
</v-flex> </v-flex>
<v-flex class xs12 md2 sm3> <v-spacer></v-spacer>
<v-flex class xs12 md2 sm2 class="WM-Align-R">
<v-btn class="WM-CyanBlueGradient-BG" style="padding:10px 60px" @click="load(null, null)"> <v-btn class="WM-CyanBlueGradient-BG" style="padding:10px 60px" @click="load(null, null)">
<v-icon class="white--text mr-2 caption">fas fa-search</v-icon> <v-icon class="white--text mr-2 caption">fas fa-search</v-icon>
<span class="white--text">Filter</span> <span class="white--text">Filter</span>
</v-btn> </v-btn>
</v-flex> </v-flex>
<v-spacer></v-spacer>
<v-flex xs12 md2 sm2 class="text-xs-right">
<router-link :to="{name: 'SubmitTestResult'}">
<v-btn class="WM-NoShadow WM-Outline-Btn WM-Border WM-Border-Black">
<v-icon class="black--text mr-2 caption">fas fa-plus</v-icon>
<span class="black--text">Add</span>
</v-btn>
</router-link>
</v-flex>
</v-layout> </v-layout>
<v-layout class="px-4 my-3">
<v-divider></v-divider> <v-divider></v-divider>
<v-layout align-center wrap class="my-3"> </v-layout>
<v-layout align-center wrap class="px-5 my-2">
<v-flex md12> <v-flex md12>
<v-data-table :headers="headers" :items="items" hide-actions> <v-data-table :headers="headers" :items="items" hide-actions>
<template slot="headerCell" slot-scope="{ header }"> <template slot="headerCell" slot-scope="{ header }">
resources/js/vue/views/TestType/List.vue
+64 -57
View File
@@ -2,69 +2,15 @@
<v-container fluid> <v-container fluid>
<material-card class color="black" title="TestType List" text> <material-card class color="black" title="TestType List" text>
<v-layout wrap class="px-5 mb-3"> <v-layout wrap class="px-5 mb-3">
<v-flex xs12 md4 sm3 class="pr-3"> <v-flex xs12 md3 sm3 class="pr-4">
<v-text-field label="Name" v-model="filter.name" color="black"></v-text-field> <v-text-field label="Name" v-model="filter.name" color="black"></v-text-field>
</v-flex> </v-flex>
<v-flex xs12 md4 sm3 class="pr-3"> <v-flex xs12 md3 sm3 class="pr-4">
<v-text-field label="UniqueId" v-model="filter.unique_id" color="black"></v-text-field> <v-text-field label="UniqueId" v-model="filter.unique_id" color="black"></v-text-field>
</v-flex> </v-flex>
<v-flex xs12 md4 sm3 class="pr-3"> <v-flex xs12 md36 sm3 class="pr-4">
<v-text-field label="UserName" v-model="filter.user_name" color="black"></v-text-field> <v-text-field label="UserName" v-model="filter.user_name" color="black"></v-text-field>
</v-flex> </v-flex>
<v-flex xs12 sm6 md3>
<v-menu
lazy
:close-on-content-click="true"
transition="v-scale-transition"
offset-y
v-model="fromMenu"
>
<v-text-field
required
slot="activator"
label="FromDate"
v-model="filter.fromPicker"
></v-text-field>
<v-date-picker
color="pink"
no-title
v-model="filter.fromPicker"
:date-format="date => new Date(date).toDateString()"
></v-date-picker>
</v-menu>
</v-flex>
<v-flex xs12 sm6 md3>
<v-menu
lazy
:close-on-content-click="true"
transition="v-scale-transition"
offset-y
v-model="upToMenu"
>
<v-text-field
required
slot="activator"
label="UpToDate"
v-model="filter.upToPicker"
></v-text-field>
<v-date-picker
color="pink"
no-title
v-model="filter.upToPicker"
:date-format="date => new Date(date).toDateString()"
></v-date-picker>
</v-menu>
</v-flex>
<v-flex xs12 md2 sm2 class="text-xs-right">
<v-btn
class="WM-CyanBlueGradient-BG"
style="padding:10px 60px"
@click="load(undefined)"
>
<v-icon class="white--text mr-2 caption">fas fa-search</v-icon>
<span class="white--text">Filter</span>
</v-btn>
</v-flex>
<v-spacer></v-spacer> <v-spacer></v-spacer>
<v-flex xs12 md2 sm2 class="text-xs-right"> <v-flex xs12 md2 sm2 class="text-xs-right">
<router-link :to="{name: 'AddTestType'}"> <router-link :to="{name: 'AddTestType'}">
@@ -75,6 +21,67 @@
</router-link> </router-link>
</v-flex> </v-flex>
</v-layout> </v-layout>
<v-layout wrap class="px-5 mb-3">
<v-flex xs12 sm6 md2>
<v-menu
lazy
:close-on-content-click="true"
transition="v-scale-transition"
offset-y
v-model="fromMenu"
>
<v-text-field
prepend-inner-icon="far fa-calendar-alt"
required
slot="activator"
label="FromDate"
v-model="filter.fromPicker"
color="black"
></v-text-field>
<v-date-picker
color="pink"
no-title
v-model="filter.fromPicker"
:date-format="date => new Date(date).toDateString()"
></v-date-picker>
</v-menu>
</v-flex>
<v-flex xs12 sm6 md2>
<v-menu
lazy
:close-on-content-click="true"
transition="v-scale-transition"
offset-y
v-model="upToMenu"
>
<v-text-field
required
prepend-inner-icon="far fa-calendar-alt"
slot="activator"
label="UpToDate"
v-model="filter.upToPicker"
color="black"
></v-text-field>
<v-date-picker
color="pink"
no-title
v-model="filter.upToPicker"
:date-format="date => new Date(date).toDateString()"
></v-date-picker>
</v-menu>
</v-flex>
<v-spacer></v-spacer>
<v-flex xs12 md2 sm2 class="text-xs-right">
<v-btn
class="WM-CyanBlueGradient-BG"
style="padding:10px 60px"
@click="load(undefined)"
>
<v-icon class="white--text mr-2 caption">fas fa-search</v-icon>
<span class="white--text">Filter</span>
</v-btn>
</v-flex>
</v-layout>
<v-layout class="px-4 my-3"> <v-layout class="px-4 my-3">
<v-divider></v-divider> <v-divider></v-divider>
</v-layout> </v-layout>
resources/js/vue/views/User/List.vue
+12 -3
View File
@@ -41,18 +41,23 @@
v-model="filter.role" v-model="filter.role"
></v-select> ></v-select>
</v-flex> </v-flex>
<v-flex xs12 sm6 md3> </v-layout>
<v-layout class="px-5 mb-3">
<v-flex xs12 sm12 md2 style="display: flex;align-items: center;">
<v-menu <v-menu
lazy lazy
:close-on-content-click="true" :close-on-content-click="true"
transition="v-scale-transition" transition="v-scale-transition"
offset-y offset-y
v-model="fromMenu" v-model="fromMenu"
> >
<v-text-field <v-text-field
required required
prepend-inner-icon="far fa-calendar-alt"
slot="activator" slot="activator"
label="FromDate" label="FromDate"
color="black"
v-model="filter.fromPicker" v-model="filter.fromPicker"
></v-text-field> ></v-text-field>
<v-date-picker <v-date-picker
@@ -63,7 +68,8 @@
></v-date-picker> ></v-date-picker>
</v-menu> </v-menu>
</v-flex> </v-flex>
<v-flex xs12 sm6 md3> <v-flex xs12 sm12 md2 style="display: flex;align-items: center;">
<v-icon class="far fa-calendar-alt mr-2"></v-icon>
<v-menu <v-menu
lazy lazy
:close-on-content-click="true" :close-on-content-click="true"
@@ -75,6 +81,7 @@
required required
slot="activator" slot="activator"
label="UpToDate" label="UpToDate"
color="black"
v-model="filter.upToPicker" v-model="filter.upToPicker"
></v-text-field> ></v-text-field>
<v-date-picker <v-date-picker
@@ -85,7 +92,8 @@
></v-date-picker> ></v-date-picker>
</v-menu> </v-menu>
</v-flex> </v-flex>
<v-flex xs12 md3 sm3> <v-spacer></v-spacer>
<v-flex wrap xs12 md2 sm12 class="WM-Align-R">
<v-btn <v-btn
class="WM-CyanBlueGradient-BG" class="WM-CyanBlueGradient-BG"
style="padding:10px 60px" style="padding:10px 60px"
@@ -95,6 +103,7 @@
<span class="white--text">Filter</span> <span class="white--text">Filter</span>
</v-btn> </v-btn>
</v-flex> </v-flex>
</v-layout> </v-layout>
<v-layout class="px-4 my-3"> <v-layout class="px-4 my-3">
<v-divider></v-divider> <v-divider></v-divider>
resources/js/vue/views/User/MyInfo.vue
+1 -1
View File
@@ -71,7 +71,7 @@
</v-flex> </v-flex>
<v-flex xs12 md2 sm2 class="text-md-center text-sm-center text-xs-center"> <v-flex xs12 md2 sm2 class="text-md-center text-sm-center text-xs-center">
<v-btn class="WM-NoShadow WM-Outline-Btn WM-Border WM-Border-Black" @click="changePassword"> <v-btn class="WM-NoShadow WM-Outline-Btn WM-Border WM-Border-Black" @click="changePassword">
<v-icon class="black--text">fas fa-refresh</v-icon> <v-icon class="black--text mr-1">fas fa-refresh</v-icon>
<span class="black--text"> Change Password </span> <span class="black--text"> Change Password </span>
</v-btn> </v-btn>
</v-flex> </v-flex>