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

change item and package

Browse Source
This commit is contained in:
Fayyazi
2019-12-18 12:59:14 +03:30
parent dc357b0507
commit e098af7bb3
7 changed files with 23 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/ItemController.php
-1
View File
@@ -24,7 +24,6 @@ class ItemController extends Controller
$query->where('user_id', $user->id); $query->where('user_id', $user->id);
} }
}) })
->when($request->has('name') && $request->name != '', function($query) use($request){ ->when($request->has('name') && $request->name != '', function($query) use($request){
$query->where('name', 'LIKE', '%'.$request->name.'%'); $query->where('name', 'LIKE', '%'.$request->name.'%');
}) })
app/Http/Requests/StoreItemRequest.php
+2 -2
View File
@@ -26,7 +26,7 @@ class StoreItemRequest extends FormRequest
case 'POST': { case 'POST': {
return [ return [
'name' => 'required|max:100|unique:items', 'name' => 'required|max:100|unique:items',
'unique_id' => 'required|max:100|unique:items', 'unique_id' => 'nullable|max:100|unique:items',
'size' => 'required', 'size' => 'required',
'specific' => 'required', 'specific' => 'required',
'note' => 'nullable', 'note' => 'nullable',
@@ -38,7 +38,7 @@ class StoreItemRequest extends FormRequest
$Item = $this->route('Item'); $Item = $this->route('Item');
return [ return [
'name' => 'required|max:100|unique:items,name,'.$Item->id, 'name' => 'required|max:100|unique:items,name,'.$Item->id,
'unique_id' => 'required|max:100|unique:items,unique_id,'.$Item->id, 'unique_id' => 'nullable|max:100|unique:items,unique_id,'.$Item->id,
'size' => 'required', 'size' => 'required',
'specific' => 'required', 'specific' => 'required',
'note' => 'nullable', 'note' => 'nullable',
app/Http/Requests/StorePackageRequest.php
+2 -2
View File
@@ -26,7 +26,7 @@ class StorePackageRequest extends FormRequest
case 'POST': { case 'POST': {
return [ return [
'name' => 'required|max:250|unique:packages', 'name' => 'required|max:250|unique:packages',
'unique_id' => 'required|max:250|unique:packages', 'unique_id' => 'nullable|max:250|unique:packages',
'note' => 'nullable', 'note' => 'nullable',
'items' => 'required', 'items' => 'required',
]; ];
@@ -37,7 +37,7 @@ class StorePackageRequest extends FormRequest
$Package = $this->route('Package'); $Package = $this->route('Package');
return [ return [
'name' => 'required|max:250|unique:packages,name,'.$Package->id, 'name' => 'required|max:250|unique:packages,name,'.$Package->id,
'unique_id' => 'required|max:250|unique:packages,unique_id,'.$Package->id, 'unique_id' => 'nullable|max:250|unique:packages,unique_id,'.$Package->id,
'note' => 'nullable', 'note' => 'nullable',
'items' => 'required', 'items' => 'required',
]; ];
resources/js/vue/views/Item/AddEdit.vue
+5 -5
View File
@@ -3,7 +3,7 @@
<v-container grid-list-xs fluid> <v-container grid-list-xs fluid>
<material-card color="black" title="Add Instrument"> <material-card color="black" title="Add Instrument">
<v-layout align-center justify-center wrap class="px-5 my-3"> <v-layout align-center justify-center wrap class="px-5 my-3">
<v-flex xs12 md3 sm3 class="WM-FlexCenter"> <v-flex xs12 md4 sm4 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
name="name" name="name"
@@ -14,7 +14,7 @@
class="py-3 pr-3" class="py-3 pr-3"
></v-text-field> ></v-text-field>
</v-flex> </v-flex>
<v-flex xs12 md3 sm3 class="WM-FlexCenter pl-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-icon class="fas fa-sort-numeric-up mr-2 WM-Margin-B-8"></v-icon>
<v-text-field <v-text-field
name="unique_id" name="unique_id"
@@ -24,8 +24,8 @@
:rules="[rules.required]" :rules="[rules.required]"
class="py-3 pr-3" class="py-3 pr-3"
></v-text-field> ></v-text-field>
</v-flex> </v-flex> -->
<v-flex xs12 md3 sm3 class="WM-FlexCenter pl-3"> <v-flex xs12 md4 sm4 class="WM-FlexCenter pl-3">
<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-text-field <v-text-field
name="size" name="size"
@@ -35,7 +35,7 @@
class="py-3 pr-3" class="py-3 pr-3"
></v-text-field> ></v-text-field>
</v-flex> </v-flex>
<v-flex xs12 md3 sm3 class="WM-FlexCenter pl-3"> <v-flex xs12 md4 sm4 class="WM-FlexCenter pl-3">
<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-text-field <v-text-field
name="specific" name="specific"
resources/js/vue/views/Item/List.vue
+6 -6
View File
@@ -58,7 +58,7 @@
</template> </template>
<template slot="items" slot-scope="{ item }"> <template slot="items" slot-scope="{ item }">
<td class="title font-weight-light">{{ item.id }}</td> <td class="title font-weight-light">{{ item.id }}</td>
<td class="title font-weight-light">{{ item.unique_id }}</td> <!-- <td class="title font-weight-light">{{ item.unique_id }}</td> -->
<td class="title font-weight-light">{{ item.name }}</td> <td class="title font-weight-light">{{ item.name }}</td>
<td class="title font-weight-light">{{ item.size }}</td> <td class="title font-weight-light">{{ item.size }}</td>
<td class="text-xs-right"> <td class="text-xs-right">
@@ -117,11 +117,11 @@ import { mapMutations, mapGetters } from "vuex";
export default { export default {
data: () => ({ data: () => ({
headers: [ headers: [
{ // {
sortable: true, // sortable: true,
text: "ID", // text: "ID",
value: "id" // value: "id"
}, // },
{ {
sortable: true, sortable: true,
text: "Item ID", text: "Item ID",
resources/js/vue/views/Package/AddEdit.vue
+2 -2
View File
@@ -14,7 +14,7 @@
class="py-3 pr-3" class="py-3 pr-3"
></v-text-field> ></v-text-field>
</v-flex> </v-flex>
<v-flex xs12 md3 sm3 class="WM-FlexCenter"> <!-- <v-flex xs12 md3 sm3 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
name="unique_id" name="unique_id"
@@ -24,7 +24,7 @@
:rules="[rules.required, rules.counter]" :rules="[rules.required, rules.counter]"
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-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 WM-DuplicateInput" 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">
resources/js/vue/views/Package/List.vue
+6 -6
View File
@@ -58,7 +58,7 @@
</template> </template>
<template slot="items" slot-scope="{ item }"> <template slot="items" slot-scope="{ item }">
<td class="title font-weight-light">{{ item.id }}</td> <td class="title font-weight-light">{{ item.id }}</td>
<td class="title font-weight-light">{{ item.unique_id }}</td> <!-- <td class="title font-weight-light">{{ item.unique_id }}</td> -->
<td class="title font-weight-light">{{ item.name }}</td> <td class="title font-weight-light">{{ item.name }}</td>
<td class="title font-weight-light">{{ item.user.name }}</td> <td class="title font-weight-light">{{ item.user.name }}</td>
<td class="title font-weight-light">{{ item.description }}</td> <td class="title font-weight-light">{{ item.description }}</td>
@@ -118,11 +118,11 @@ import { mapMutations, mapGetters } from "vuex";
export default { export default {
data: () => ({ data: () => ({
headers: [ headers: [
{ // {
sortable: true, // sortable: true,
text: " ID", // text: " ID",
value: " ID" // value: " ID"
}, // },
{ {
sortable: true, sortable: true,
text: "Package ID", text: "Package ID",