cief/exchange-2.0
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0.git synced 2026-08-21 13:33:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'manual-po-segment-update' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development

Browse Source
This commit is contained in:
Jia Sheng
2024-08-06 23:11:14 +08:00
parent 966c5522ae 53950459e2
commit 9f72823932
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/assets/vue/components/bookings/forms/PurchaseOrderFormComponent.vue
+11 -2
View File
@@ -1,5 +1,5 @@
<template>
<div class="row">
<div class="row" :class="{'bg-danger-lighter': $store.getters.isAdmin && companySegmentIds.includes(24)}">
<div class="col">
<div class="row no-margin">
<div class="col p-b-15 p-l-0 p-r-0">
@@ -12,9 +12,12 @@
</div>
<div class="row" v-if="!submitted">
<div class="col-auto">
<div class="bg-danger p-l-15 p-r-15 p-t-5 p-b-5">
<div class="bg-danger p-l-15 p-r-15 p-t-5 p-b-5 m-b-10">
<p class="m-b-0 text-white fs-12" >Any Purchase Orders that aren't submitted within 60 days will be closed for editing.</p>
</div>
<div class="bg-danger p-l-15 p-r-15 p-t-5 p-b-5" v-if="$store.getters.isAdmin && companySegmentIds.includes(24)">
<p class="m-b-0 text-white fs-12" >Please note that this customer request to manual fill up the PO.</p>
</div>
</div>
</div>
<div class="row">
@@ -203,6 +206,12 @@
import { required, requiredIf } from "vuelidate/lib/validators";
export default {
props:{
companySegmentIds: {
type: Array,
required: true
}
},
data(){
return {
interval:false,
resources/assets/vue/components/bookings/sections/BookingDetailsSectionComponent.vue
+1 -1
View File
@@ -284,7 +284,7 @@
</div>
</div>
</div>
<purchase-order-form-component v-if="!oneSixEightEightServiceIds.includes(booking.service.id) || $store.getters.isAdmin || [199, 510].includes($store.getters.getCompanyId) || companySegmentIds.includes(24)" :data="booking" :section="section"></purchase-order-form-component>
<purchase-order-form-component v-if="!oneSixEightEightServiceIds.includes(booking.service.id) || $store.getters.isAdmin || [199, 510].includes($store.getters.getCompanyId) || companySegmentIds.includes(24) || companySegmentIds.includes(35)" :data="booking" :section="section" :companySegmentIds="companySegmentIds"></purchase-order-form-component>
</div>
</div>
<div class="row m-t-15" v-if="booking.status === 3 && $store.getters.isSuperAdmin || ($store.getters.isCustomer && $store.getters.getCompanyId === 199)">