This commit is contained in:
2021-09-08 15:37:53 +00:00
parent f24bc9f716
commit 9582cbff48
2 changed files with 15 additions and 46 deletions

View File

@@ -18,6 +18,7 @@
CSR techs ui accept to wo etc CSR techs ui accept to wo etc
CSR V8Migrate CSR V8Migrate
GetLastReport is not implemented anywhere but is useful adn key
new testing cases new testing cases
Schedule form Schedule form
Dashboard / widgets Dashboard / widgets

View File

@@ -221,39 +221,6 @@
></v-col> ></v-col>
</v-row> </v-row>
</v-form> </v-form>
<v-row justify="center">
<v-dialog v-model="woSelectorDialog" persistent max-width="300px">
<v-card>
<v-card-title>
<span class="text-h5">{{
$ay.t("CustomerServiceRequestAcceptToExisting")
}}</span>
</v-card-title>
<v-card-text>
<!-- //MIGRATE_OUTSTANDING awaiting workorder pick list, also this should be json variant data -->
<gz-pick-list
:aya-type="ayaTypes().WorkOrder"
:variant="'customerid:' + obj.customerId"
:show-edit-icon="false"
v-model="selectedWOId"
:label="$ay.t('WorkOrder')"
></gz-pick-list>
</v-card-text>
<v-card-actions>
<v-spacer></v-spacer>
<v-btn
color="blue darken-1"
text
@click="woSelectorDialog = false"
>{{ $ay.t("Cancel") }}</v-btn
>
<v-btn color="blue darken-1" text @click="accept(selectedWOId)">{{
$ay.t("OK")
}}</v-btn>
</v-card-actions>
</v-card>
</v-dialog>
</v-row>
</div> </div>
<v-overlay :value="!formState.ready || formState.loading"> <v-overlay :value="!formState.ready || formState.loading">
<v-progress-circular indeterminate :size="64" /> <v-progress-circular indeterminate :size="64" />
@@ -420,12 +387,22 @@ export default {
FORM_KEY + ":duplicate" FORM_KEY + ":duplicate"
); );
window.$gz.eventBus.$emit("menu-enable-item", FORM_KEY + ":new"); window.$gz.eventBus.$emit("menu-enable-item", FORM_KEY + ":new");
window.$gz.eventBus.$emit(
"menu-enable-item",
FORM_KEY + ":acceptnew"
);
window.$gz.eventBus.$emit("menu-enable-item", FORM_KEY + ":reject");
} else { } else {
window.$gz.eventBus.$emit( window.$gz.eventBus.$emit(
"menu-disable-item", "menu-disable-item",
FORM_KEY + ":duplicate" FORM_KEY + ":duplicate"
); );
window.$gz.eventBus.$emit("menu-disable-item", FORM_KEY + ":new"); window.$gz.eventBus.$emit("menu-disable-item", FORM_KEY + ":new");
window.$gz.eventBus.$emit(
"menu-disable-item",
FORM_KEY + ":acceptnew"
);
window.$gz.eventBus.$emit("menu-disable-item", FORM_KEY + ":reject");
} }
}, },
deep: true deep: true
@@ -649,7 +626,9 @@ export default {
}); });
} }
}, },
async accept(toExistingId) { async accept() {
//generate work order from this csr
//flag this csr as accepted
let vm = this; let vm = this;
if (vm.obj.status != 0 || vm.$route.params.recordid == 0) { if (vm.obj.status != 0 || vm.$route.params.recordid == 0) {
return; return;
@@ -712,11 +691,8 @@ async function clickHandler(menuItem) {
case "reject": case "reject":
m.vm.reject(); m.vm.reject();
break; break;
case "acceptexisting":
m.vm.woSelectorDialog = true;
break;
case "acceptnew": case "acceptnew":
m.vm.accept(0); m.vm.accept();
break; break;
case "report": case "report":
if (m.id != null) { if (m.id != null) {
@@ -837,13 +813,6 @@ function generateMenu(vm) {
vm: vm vm: vm
}); });
menuOptions.menuItems.push({
title: "CustomerServiceRequestAcceptToExisting",
icon: null,
key: FORM_KEY + ":acceptexisting",
vm: vm
});
menuOptions.menuItems.push({ menuOptions.menuItems.push({
title: "CustomerServiceRequestReject", title: "CustomerServiceRequestReject",
icon: null, icon: null,
@@ -876,7 +845,6 @@ async function fetchTranslatedText() {
await window.$gz.translation.cacheTranslations([ await window.$gz.translation.cacheTranslations([
"CustomerServiceRequest", "CustomerServiceRequest",
"CustomerServiceRequestAcceptToNew", "CustomerServiceRequestAcceptToNew",
"CustomerServiceRequestAcceptToExisting",
"CustomerServiceRequestReject", "CustomerServiceRequestReject",
"CustomerServiceRequestTitle", "CustomerServiceRequestTitle",
"CustomerServiceRequestDetails", "CustomerServiceRequestDetails",