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

new update

Browse Source
This commit is contained in:
Fayyazi
2019-12-17 11:42:56 +03:30
parent 9526ec80fd
commit 8cfb213b81
29 changed files with 373 additions and 205 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/js/vue/views/Cycle/AddEdit.vue
+6 -6
View File
@@ -3,7 +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 pl-3">
<v-icon class="fas fa-sort-numeric-up mr-2 WM-Margin-B-8"></v-icon>
<v-text-field
@@ -53,21 +53,21 @@
<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-autocomplete
<v-autocomplete
color="black"
:items="labels"
item-text="name"
item-text="id"
item-value="id"
v-model="label.id"
label="Select Label For Cycle"
></v-autocomplete> -->
<v-text-field
></v-autocomplete>
<!-- <v-text-field
name="labels"
label="Label ID"
color="black"
v-model="label.id"
class="py-3 pr-3"
></v-text-field>
></v-text-field> -->
<v-btn
absolute
resources/js/vue/views/Cycle/List.vue
+1 -1
View File
@@ -109,7 +109,7 @@
<v-icon class="white--text mr-2 caption">fas fa-times</v-icon>
<span>Remove</span>
</v-btn>
<v-btn color="orange darken-1" @click="generateBarcode(item.unique_id, 'Cycle')">
<v-btn color="orange darken-1" @click="generateBarcode(item.id, 'Cycle')">
<v-icon class="white--text mr-1 caption">fas fa-barcode</v-icon>
<span>Generate Barcode</span>
</v-btn>
resources/js/vue/views/Item/AddEdit.vue
+1 -1
View File
@@ -18,7 +18,7 @@
<v-icon class="fas fa-sort-numeric-up mr-2 WM-Margin-B-8"></v-icon>
<v-text-field
name="unique_id"
label="ID"
label="Item ID"
color="black"
v-model="formData.unique_id"
:rules="[rules.required]"
resources/js/vue/views/Item/List.vue
+6 -1
View File
@@ -58,6 +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.name }}</td>
<td class="title font-weight-light">{{ item.size }}</td>
<td class="text-xs-right">
@@ -116,6 +117,11 @@ import { mapMutations, mapGetters } from "vuex";
export default {
data: () => ({
headers: [
{
sortable: true,
text: "ID",
value: "id"
},
{
sortable: true,
text: "Item ID",
@@ -176,7 +182,6 @@ export default {
this.changeCurrentModal({
modal: "modal-barcode-barcode",
properties: { result },
// link : 'Show/Item/'+code
});
}
},
resources/js/vue/views/Label/AddEdit.vue
+1 -1
View File
@@ -191,7 +191,7 @@ export default {
}
if (result && result.status == 200) {
this.$router.push({ name: "AllLabels" });
window.location.href = "/Show/Label/" + result.data.data.id;
}
}
}
resources/js/vue/views/Label/List.vue
+1 -1
View File
@@ -204,7 +204,7 @@ export default {
if (result && result.status == 200) {
this.changeCurrentModal({
modal: "modal-label-show",
properties: { result }
properties: { result, width :40 }
});
}
},
resources/js/vue/views/MedicalCenter/AddEdit.vue
+2 -2
View File
@@ -13,13 +13,13 @@
></v-text-field>
</v-flex>
<v-flex xs12 md3 xs3>
<v-combobox
<v-select
:items="cities"
item-text="name_en"
item-value="id"
v-model="medicalCenter.city_id"
label="Select City"
></v-combobox>
></v-select>
</v-flex>
<v-flex xs12 md3 xs3>
<v-text-field
resources/js/vue/views/Package/AddEdit.vue
+11
View File
@@ -14,6 +14,17 @@
class="py-3 pr-3"
></v-text-field>
</v-flex>
<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"
label="Package ID"
color="black"
v-model="formData.unique_id"
:rules="[rules.required, rules.counter]"
class="py-3 pr-3"
></v-text-field>
</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">
resources/js/vue/views/Package/List.vue
+6 -6
View File
@@ -85,7 +85,7 @@
<v-icon class="white--text mr-2 caption">fas fa-times</v-icon>
<span>Remove</span>
</v-btn>
<v-btn color="orange darken-1" @click="generateBarcode(item.unique_id, 'Package')">
<v-btn color="orange darken-1" @click="generateBarcode(item.id, 'Package')">
<v-icon class="white--text mr-1 caption">fas fa-barcode</v-icon>
<span>Generate Barcode</span>
</v-btn>
@@ -120,13 +120,13 @@ export default {
headers: [
{
sortable: true,
text: "Package ID",
value: "Package ID"
text: " ID",
value: " ID"
},
{
sortable: true,
text: "Unique ID",
value: "Unique ID"
text: "Package ID",
value: "Package ID"
},
{
sortable: true,
@@ -209,7 +209,7 @@ export default {
}
},
async generateBarcode(code, type) {
const result = await ApiService.post(urls.packageBarcode(code, type));
const result = await ApiService.post(urls.Barcode(code, type));
if (result && result.status == 200) {
this.changeCurrentModal({
modal: "modal-barcode-barcode",
resources/js/vue/views/TestResult/AddEdit.vue
+5 -2
View File
@@ -68,9 +68,11 @@
slot="activator"
label="Date"
v-model="formData.date"
color="black"
></v-text-field>
<v-date-picker
min="2020-01-01"
color="pink"
no-title
v-model="formData.date"
@@ -407,7 +409,7 @@
<v-icon class="white--text mr-2 caption">fas fa-check</v-icon>
<span class="white--text">SAVE</span>
</v-btn>
<router-link :to="{name: 'Dashboard'}">
<router-link :to="{name: 'AllResultTest'}">
<v-btn class="WM-NoShadow WM-Outline-Btn WM-Border WM-Border-Black ml-5">
<v-icon class="black--text mr-2 caption">fas fa-chevron-left</v-icon>
<span class="black--text">Back</span>
@@ -438,7 +440,8 @@ export default {
device_label: "ID",
result: "Reject",
img: null,
test_type_id: ""
test_type_id: "",
date : "2020-01-01"
},
images: [],
menu: "",
resources/js/vue/views/TestType/AddEdit.vue
+1 -1
View File
@@ -364,7 +364,7 @@
<v-icon class="white--text mr-2 caption">fas fa-check</v-icon>
<span class="white--text">Generate Form</span>
</v-btn>
<router-link to="/dashboard">
<router-link :to="{name : 'ListTestType'}">
<v-btn class="WM-NoShadow WM-Outline-Btn WM-Border WM-Border-Black ml-5">
<v-icon class="black--text mr-2 caption">fas fa-chevron-left</v-icon>
<span class="black--text">Back</span>