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

Merge pull request 'fix uid' (#2) from fix-bugs into master

Browse Source 
Reviewed-on: https://git.willaspace.com/external-projects/cssd-back/pulls/2
This commit is contained in:
sajjad.talkhabi
2023-09-23 09:03:07 +00:00
parent 3682d30ccb 012fe97e15
commit b389ea5306
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/js/vue/views/Item/AddEdit.vue
+1 -1
View File
@@ -32,7 +32,7 @@
<v-layout class="px-5 mb-3"> <v-layout class="px-5 mb-3">
<v-flex xs12 md4 sm4 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 name="UDI" label="UDI" color="black" v-model="formData.udi" :rules="[rules.required]" <v-text-field name="UID" label="UID" color="black" v-model="formData.uid" :rules="[rules.required]"
class="py-3 pr-3"></v-text-field> class="py-3 pr-3"></v-text-field>
</v-flex> </v-flex>
<v-flex xs12 md8 sm8 class="WM-FlexCenter" v-if="galleryDataLoaded"> <v-flex xs12 md8 sm8 class="WM-FlexCenter" v-if="galleryDataLoaded">
resources/js/vue/views/Item/List.vue
+4 -4
View File
@@ -53,7 +53,7 @@
<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 && item.user.medical_center) ? <td class="title font-weight-light">{{ (item.user && item.user.medical_center) ?
item.user.medical_center.name : '' }}</td> item.user.medical_center.name : '' }}</td>
<td class="title font-weight-light">{{ item.udi }}</td> <td class="title font-weight-light">{{ item.uid }}</td>
<td class="title font-weight-light">{{ item.size }}</td> <td class="title font-weight-light">{{ item.size }}</td>
<td class="text-xs-right FlexBtn Height-MD-60"> <td class="text-xs-right FlexBtn Height-MD-60">
<v-tooltip bottom open-on-hover v-if="$hasRole('Supervisor|Admin')"> <v-tooltip bottom open-on-hover v-if="$hasRole('Supervisor|Admin')">
@@ -162,8 +162,8 @@ export default {
}, },
{ {
sortable: false, sortable: false,
text: "UDI", text: "UID",
value: "udi" value: "uid"
}, },
{ {
sortable: false, sortable: false,
@@ -213,7 +213,7 @@ export default {
this.loadMedicalCenters(); this.loadMedicalCenters();
}, },
async generateBarcode(item, type = null) { async generateBarcode(item, type = null) {
let code = item.udi ? item.udi : item.id; let code = item.uid ? item.uid : item.id;
const result = await ApiService.post(urls.Barcode(code, type)); const result = await ApiService.post(urls.Barcode(code, type));
if (result && result.status == 200) { if (result && result.status == 200) {
this.changeCurrentModal({ this.changeCurrentModal({
resources/js/vue/views/Package/AddEdit.vue
+1 -1
View File
@@ -10,7 +10,7 @@
</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 name="UDI" label="UDI" color="black" v-model="formData.udi" :rules="[rules.required]" <v-text-field name="UID" label="UID" color="black" v-model="formData.uid" :rules="[rules.required]"
class="py-3 pr-3"></v-text-field> class="py-3 pr-3"></v-text-field>
</v-flex> </v-flex>
<!-- <v-flex xs12 md3 sm3 class="WM-FlexCenter"> <!-- <v-flex xs12 md3 sm3 class="WM-FlexCenter">
resources/js/vue/views/Package/List.vue
+3 -3
View File
@@ -61,7 +61,7 @@
<td class="title font-weight-light">{{ (item.user && item.user.medical_center) ? <td class="title font-weight-light">{{ (item.user && item.user.medical_center) ?
item.user.medical_center.name : '' }}</td> item.user.medical_center.name : '' }}</td>
<td class="title font-weight-light">{{ item.user ? item.user.name : '' }}</td> <td class="title font-weight-light">{{ item.user ? item.user.name : '' }}</td>
<td class="title font-weight-light">{{ item.udi }}</td> <td class="title font-weight-light">{{ item.uid }}</td>
<td class="title font-weight-light">{{ item.description }}</td> <td class="title font-weight-light">{{ item.description }}</td>
<td class="text-xs-right FlexBtn Height-MD-60"> <td class="text-xs-right FlexBtn Height-MD-60">
<v-tooltip bottom open-on-hover> <v-tooltip bottom open-on-hover>
@@ -163,8 +163,8 @@ export default {
value: "User" value: "User"
}, },
{ {
text: "UDI", text: "UID",
value: "udi" value: "uid"
}, },
{ {
sortable: true, sortable: true,