admin/raven-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
John Cardinal
2021-03-07 16:36:10 +00:00
parent 5eecfb3e97
commit 6a3aa46f50
2 changed files with 115 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ayanova/devdocs/todo.txt
View File

@@ -35,9 +35,6 @@ MISC ITEMS THAT CAME UP
todo: BUGBUG delete all tags from customer, go back in and zone2 appears for some reason
todo: v8migrate tax codes convert to pct currently wrongly using fractional value (i.e. multiply by 100)
todo: NOT import PO's unless they are current, active and unreceived
todo: erase database should reset all id values if they aren't reset already so that future data doesn't result in a new PO starting at 29000 due to huge db trial seed prior
@@ -198,12 +195,7 @@ CURRENTLY DOING: Contract form
dupe the tagged part adjustments for service and travel then on to the limited rates, also need restrict to rates checkbox, then help docs and then done
(might want to put more fields in the datalist, it's very sparse adn the old v7 had pretty much all the fields as well)
todo: change percentage values to be actual percentages in db and end to end
rather than .05 for 5% tax just let people enter 5, store as 5 and then divide by 100 for calcs as required
150.345
todo: need pctg control now, I'm unable to enter more than 2 digits to the right of decimal point but that's required, also the above stuff about pct
todo: confirm Unit contract fields are ok and datalist is ok

166
ayanova/src/views/svc-contract.vue
View File

@@ -161,64 +161,128 @@
>
</v-col>
<!-- ################################ TAGGED PARTS TABLE ############################### -->
<v-col cols="12">
<v-col cols="12" sm="6" lg="4" xl="3">
<span class="text-h6"> {{ $ay.t("PartList") }}</span
><v-btn icon @click="addContractPartOverrideItem()">
<v-icon color="primary">$ayiPlus</v-icon>
</v-btn>
<!-- </v-col>
<v-col cols="12" sm="6" lg="4" xl="3"> -->
<v-simple-table>
<template v-slot:default>
<thead>
<tr>
<th class="text-right">
{{ $ay.t("ContractAdjustment") }}
</th>
<th class="text-left">
{{ $ay.t("ContractOverrideType") }}
</th>
<th class="text-left">
{{ $ay.t("Tags") }}
</th>
<th class="text-right">
<!-- CONTROL PANEL -->
</th>
</tr>
</thead>
<tbody>
<tr
v-for="item in obj.contractPartOverrideItems"
:key="item.Id"
>
<td class="text-right">{{ item.overridePct }}%</td>
<td class="text-left">
{{
selectLists.overrideTypes.find(
z => z.id == item.overrideType
).name
}}
</td>
<td class="text-left">
{{ $ay.util().formatTags(item.tags) }}
</td>
<td class="text-right">
<v-btn
icon
@click="editContractPartOverrideItem(item)"
class="ml-4"
>
<v-icon>
$ayiEdit
</v-icon>
</v-btn>
</td>
</tr>
</tbody>
</template>
</v-simple-table>
</v-col>
<v-simple-table>
<template v-slot:default>
<thead>
<tr>
<th class="text-right">
{{ $ay.t("ContractAdjustment") }}
</th>
<th class="text-left">
{{ $ay.t("ContractOverrideType") }}
</th>
<th class="text-left">
{{ $ay.t("Tags") }}
</th>
<th class="text-right">
<!-- CONTROL PANEL -->
</th>
</tr>
</thead>
<tbody>
<tr
v-for="item in obj.contractPartOverrideItems"
:key="item.Id"
>
<td class="text-right">{{ item.overridePct }}%</td>
<td class="text-left">
{{
selectLists.overrideTypes.find(
z => z.id == item.overrideType
).name
}}
</td>
<td class="text-left">
{{ $ay.util().formatTags(item.tags) }}
</td>
<td class="text-right">
<v-btn
icon
@click="editContractPartOverrideItem(item)"
class="ml-4"
>
<v-icon>
$ayiEdit
</v-icon>
</v-btn>
</td>
</tr>
</tbody>
</template>
</v-simple-table>
<!-- tagged service rate items table here
<!-- ################################ TAGGED SERVICE RATES TABLE ############################### -->
<v-col cols="12" sm="6" lg="4" xl="3">
<span class="text-h6"> {{ $ay.t("ServiceRateList") }}</span
><v-btn icon @click="addContractServiceRateOverrideItem()">
<v-icon color="primary">$ayiPlus</v-icon>
</v-btn>
<!-- </v-col>
<v-col cols="12" sm="6" lg="4" xl="3"> -->
<v-simple-table>
<template v-slot:default>
<thead>
<tr>
<th class="text-right">
{{ $ay.t("ContractAdjustment") }}
</th>
<th class="text-left">
{{ $ay.t("ContractOverrideType") }}
</th>
<th class="text-left">
{{ $ay.t("Tags") }}
</th>
<th class="text-right">
<!-- CONTROL PANEL -->
</th>
</tr>
</thead>
<tbody>
<tr
v-for="item in obj.contractServiceRateOverrideItems"
:key="item.Id"
>
<td class="text-right">{{ item.overridePct }}%</td>
<td class="text-left">
{{
selectLists.overrideTypes.find(
z => z.id == item.overrideType
).name
}}
</td>
<td class="text-left">
{{ $ay.util().formatTags(item.tags) }}
</td>
<td class="text-right">
<v-btn
icon
@click="editContractServiceRateOverrideItem(item)"
class="ml-4"
>
<v-icon>
$ayiEdit
</v-icon>
</v-btn>
</td>
</tr>
</tbody>
</template>
</v-simple-table>
</v-col>
<!--
tagged travel rate items table here -->
<v-col cols="12" class="mt-5">