change label show

resources/js/vue/views/Cycle/AddEdit.vue

@@ -3,17 +3,7 @@
         <v-container grid-list-xs fluid>
             <material-card color="black" title="Add Cycle">
                 <v-layout wrap class="px-5 my-3">
-                    <v-flex xs12 sm6 md4 class="WM-FlexCenter">
-                        <v-icon class="fa fa-align-left mr-2 WM-Margin-B-8"></v-icon>
-                        <v-text-field
-                            name="name"
-                            label="Name"
-                            color="black"
-                            v-model="formData.name"
-                            :rules="[rules.required, rules.counter]"
-                            class="py-3 pr-3"
-                        ></v-text-field>
-                    </v-flex>
+            
                     <v-flex xs12 sm6 md4 class="WM-FlexCenter pl-3">
                         <v-icon class="fas fa-sort-numeric-up mr-2 WM-Margin-B-8"></v-icon>
                         <v-text-field
@@ -148,7 +138,6 @@ export default {
         return {
             fromMenuDate: false,
             formData: {
-                name: "",
                 note: "",
                 labels: [
 					{

resources/js/vue/views/Cycle/List.vue

@@ -7,8 +7,8 @@
                         <v-icon class="fa fa-align-left mr-2 WM-Margin-B-8"></v-icon>
                         <v-text-field
                             class="py-3 pr-3"
-                            v-model="filter.name"
-                            label="Name"
+                            v-model="filter.cycle_id"
+                            label="Cycle ID"
                             color="black"
                         ></v-text-field>
                     </v-flex>
@@ -82,7 +82,7 @@
                                 />
                             </template>
                             <template slot="items" slot-scope="{ item }">
-                                <td class="headline font-weight-light">{{ item.name }}</td>
+                                <td class="headline font-weight-light">{{ item.id }}</td>
                                 <td class="title font-weight-light">{{ item.sterilizer_id }}</td>
                                 <td class="title font-weight-light">{{ item.cycle_number }}</td>
                                 <td class="title font-weight-light">{{ item.date }}</td>
@@ -144,8 +144,8 @@ export default {
         headers: [
             {
                 sortable: true,
-                text: "Name",
-                value: "Name"
+                text: "Cycle ID",
+                value: "Cycle ID"
             },
             {
                 sortable: true,

resources/js/vue/views/Label/AddEdit.vue

@@ -3,7 +3,7 @@
 		<v-container grid-list-xs fluid>
 			<material-card color="black" title="Add Label on Set ">
 				<v-layout  wrap class="px-5 my-3">
-			
+
 					<v-flex xs12 md3 sm3 class="WM-FlexCenter pl-3">
 						<v-icon class="fas fa-sort-numeric-up mr-2 WM-Margin-B-8"></v-icon>
 						<v-text-field
@@ -31,6 +31,7 @@
 							label="Lot Number"
 							color="black"
 							v-model="formData.lot_number"
+
 							class="py-3 pr-3"
 						></v-text-field>
 					</v-flex>
@@ -90,6 +91,8 @@
 								v-model="formData.expire_date">
 							</v-text-field>
 							<v-date-picker
+								:show-current="showCurrent"
+								min="2020-01-01"
 								color="pink"
 								no-title
 								v-model="formData.expire_date"
@@ -127,11 +130,13 @@ import { mapMutations } from "vuex";
 export default {
 	data() {
 		return {
+			showCurrent : false,
 			fromMenuSterile: false ,
 			fromMenuExpire: false,
 			formData: {
 				result: "",
-				package_id: ""
+				package_id: "",
+				expire_date : "2020-01-01"
 			},
 			items: [],
 			rules: {

resources/js/vue/views/Label/List.vue

@@ -3,6 +3,10 @@
 		<v-container fluid>
 			<material-card class color="black" title="All Labels" text>
 				<v-layout align-center wrap class="my-3">
+					<v-flex xs12 md3 sm3 class="WM-FlexCenter pl-3">
+						<v-icon class="fas fa-sort-numeric-up mr-2 WM-Margin-B-8"></v-icon>
+						<v-text-field class="py-3" v-model="filter.label_id" label="Label ID" color="black"></v-text-field>
+					</v-flex>
 					<v-flex xs12 md3 sm3 class="WM-FlexCenter pl-3">
 						<v-icon class="fa fa-hospital-o mr-2 WM-Margin-B-8"></v-icon>
 						<v-autocomplete