mirror of
https://git.meshkee.com/cssd/cssd-back.git
synced 2026-10-10 23:11:06 +03:30
change item and package
This commit is contained in:
Fayyazi
@@ -24,7 +24,6 @@ class ItemController extends Controller
|
||||
$query->where('user_id', $user->id);
|
||||
}
|
||||
})
|
||||
|
||||
->when($request->has('name') && $request->name != '', function($query) use($request){
|
||||
$query->where('name', 'LIKE', '%'.$request->name.'%');
|
||||
})
|
||||
|
||||
@@ -26,7 +26,7 @@ class StoreItemRequest extends FormRequest
|
||||
case 'POST': {
|
||||
return [
|
||||
'name' => 'required|max:100|unique:items',
|
||||
'unique_id' => 'required|max:100|unique:items',
|
||||
'unique_id' => 'nullable|max:100|unique:items',
|
||||
'size' => 'required',
|
||||
'specific' => 'required',
|
||||
'note' => 'nullable',
|
||||
@@ -38,7 +38,7 @@ class StoreItemRequest extends FormRequest
|
||||
$Item = $this->route('Item');
|
||||
return [
|
||||
'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',
|
||||
'specific' => 'required',
|
||||
'note' => 'nullable',
|
||||
|
||||
@@ -26,7 +26,7 @@ class StorePackageRequest extends FormRequest
|
||||
case 'POST': {
|
||||
return [
|
||||
'name' => 'required|max:250|unique:packages',
|
||||
'unique_id' => 'required|max:250|unique:packages',
|
||||
'unique_id' => 'nullable|max:250|unique:packages',
|
||||
'note' => 'nullable',
|
||||
'items' => 'required',
|
||||
];
|
||||
@@ -37,7 +37,7 @@ class StorePackageRequest extends FormRequest
|
||||
$Package = $this->route('Package');
|
||||
return [
|
||||
'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',
|
||||
'items' => 'required',
|
||||
];
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
<v-container grid-list-xs fluid>
|
||||
<material-card color="black" title="Add Instrument">
|
||||
<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-text-field
|
||||
name="name"
|
||||
@@ -14,7 +14,7 @@
|
||||
class="py-3 pr-3"
|
||||
></v-text-field>
|
||||
</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-text-field
|
||||
name="unique_id"
|
||||
@@ -24,8 +24,8 @@
|
||||
:rules="[rules.required]"
|
||||
class="py-3 pr-3"
|
||||
></v-text-field>
|
||||
</v-flex>
|
||||
<v-flex xs12 md3 sm3 class="WM-FlexCenter pl-3">
|
||||
</v-flex> -->
|
||||
<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-text-field
|
||||
name="size"
|
||||
@@ -35,7 +35,7 @@
|
||||
class="py-3 pr-3"
|
||||
></v-text-field>
|
||||
</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-text-field
|
||||
name="specific"
|
||||
|
||||
@@ -58,7 +58,7 @@
|
||||
</template>
|
||||
<template slot="items" slot-scope="{ item }">
|
||||
<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.size }}</td>
|
||||
<td class="text-xs-right">
|
||||
@@ -117,11 +117,11 @@ import { mapMutations, mapGetters } from "vuex";
|
||||
export default {
|
||||
data: () => ({
|
||||
headers: [
|
||||
{
|
||||
sortable: true,
|
||||
text: "ID",
|
||||
value: "id"
|
||||
},
|
||||
// {
|
||||
// sortable: true,
|
||||
// text: "ID",
|
||||
// value: "id"
|
||||
// },
|
||||
{
|
||||
sortable: true,
|
||||
text: "Item ID",
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
class="py-3 pr-3"
|
||||
></v-text-field>
|
||||
</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-text-field
|
||||
name="unique_id"
|
||||
@@ -24,7 +24,7 @@
|
||||
:rules="[rules.required, rules.counter]"
|
||||
class="py-3 pr-3"
|
||||
></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-flex xs12 md3 sm3 class="WM-FlexCenter WM-DuplicateInput" style="position: relative" v-for="(item, key) in formData.items" :key="key">
|
||||
|
||||
@@ -58,7 +58,7 @@
|
||||
</template>
|
||||
<template slot="items" slot-scope="{ item }">
|
||||
<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.user.name }}</td>
|
||||
<td class="title font-weight-light">{{ item.description }}</td>
|
||||
@@ -118,11 +118,11 @@ import { mapMutations, mapGetters } from "vuex";
|
||||
export default {
|
||||
data: () => ({
|
||||
headers: [
|
||||
{
|
||||
sortable: true,
|
||||
text: " ID",
|
||||
value: " ID"
|
||||
},
|
||||
// {
|
||||
// sortable: true,
|
||||
// text: " ID",
|
||||
// value: " ID"
|
||||
// },
|
||||
{
|
||||
sortable: true,
|
||||
text: "Package ID",
|
||||
|
||||
Reference in New Issue
Block a user