3 Commits

15 changed files with 619 additions and 83 deletions

View File

@@ -70,3 +70,19 @@ export async function getListAttachment(params) {
export async function getDetailDataROAsset(params) {
return request("/getDetailDataROAsset", params)
}
export async function getRuangan(params) {
return request("/getRuangan", params)
}
export async function getAssetBelumSerahTerima(params) {
return request("/getAssetBelumSerahTerima", params)
}
export async function saveHandover(params) {
return request("/saveHandover", params)
}
export async function getBarcodes(params) {
return request("/getBarcodes", params)
}

View File

@@ -0,0 +1,160 @@
<template>
<v-dialog v-model="dialog_handover_asset" persistent width="50vw">
<v-card>
<v-card-title class="headline grey lighten-2" primary-title>
SERAH TERIMA BARANG ASSET
</v-card-title>
<v-card-text>
<p>Apakah Anda yakin ingin melakukan serah terima barang inventaris kepada user pemohon</p>
<v-form ref="formhandover" lazy-validation v-model="valid_formhandover">
<v-data-table :headers="headers" :items="list_item_not_handed" hide-actions class="elevation-1">
<template v-slot:items="props">
<tr>
<td class="text-xs-center">
<v-checkbox v-if="props.item.isHandoverDone == 'N'" v-model="props.item.checked"
hide-details @change="onChangeCheckbox(props.item)">
</v-checkbox>
</td>
<td class="text-xs-center">{{ props.item.M_ItemDesc }}</td>
<td class="text-xs-center">{{ props.item.originalQty }}</td>
<td class="text-xs-center">
<v-text-field v-if="props.item.checked" v-model="props.item.serahQty" type="number"
solo :rules="qtyRules(props.item.sisaQty)"></v-text-field>
<div v-else>
{{ props.item.serahQty }}
</div>
</td>
</tr>
</template>
</v-data-table>
<v-layout row mt-2>
<v-flex xs6 pr-1>
<v-autocomplete v-model="selected_ruangan" :items="list_lokasi" label="Lokasi Penerima*"
:rules="ruang_rules" outline item-value="M_RuanganID"
item-text="M_RuanganName"></v-autocomplete>
</v-flex>
<v-flex xs6 pl-1>
<v-autocomplete label="Staff Penerima*" outline :rules="rules_staff"
v-model="selected_staff" :items="list_staff" item-value="M_UserID"
item-text="M_UserUsername"></v-autocomplete>
</v-flex>
</v-layout>
</v-form>
</v-card-text>
<v-card-actions>
<v-spacer></v-spacer>
<v-btn color="red" flat outline @click="closeHandOver()">Batal</v-btn>
<v-btn color="green" flat outline @click="simpanHandOver()">Ya, Serahkan Barang</v-btn>
</v-card-actions>
</v-card>
</v-dialog>
</template>
<script>
module.exports = {
data() {
return {
selected_ruangan: 0,
selected_staff: 0,
valid_formhandover: true,
ruang_rules: [v => (v && Object.keys(v).length > 0) || 'Lokasi ruangan harus diisi'],
rules_staff: [v => (v && Object.keys(v).length > 0) || 'Staff harus diisi'],
headers: [
{
text: "", align: "center", sortable: false, value: "checked",
width: "10%", class: "pa-2 blue lighten-3 white--text",
},
{
text: "ITEM", align: "center", sortable: false, value: "itemname",
width: "50%", class: "pa-2 blue lighten-3 white--text",
},
{
text: "QTY DITERIMA", align: "center", sortable: false, value: "qtyitem",
width: "20%", class: "pa-2 blue lighten-3 white--text",
},
{
text: "QTY HANDOVER", align: "center", sortable: false, value: "qtysend",
width: "20%", class: "pa-2 blue lighten-3 white--text",
},
],
}
},
computed: {
dialog_handover_asset: {
get() {
return this.$store.state.roasset.dialog_handover_asset;
},
set(val) {
this.$store.commit("roasset/update_dialog_handover_asset", val)
}
},
selected_roasset: {
get() {
return this.$store.state.roasset.selected_roasset
},
set(val) {
this.$store.commit("roasset/update_selected_roasset", val)
}
},
list_item_not_handed: {
get() {
return this.$store.state.roasset.list_item_not_handed;
},
set(val) {
this.$store.commit("roasset/update_list_item_not_handed", val)
}
},
list_staff() {
return this.$store.state.orderAsset.list_staff;
},
list_lokasi() {
return this.$store.state.roasset.list_lokasi;
}
},
methods: {
onChangeCheckbox(item) {
if (item.checked) {
item.serahQty = item.sisaQty
} else {
item.serahQty = item.originalQty - item.sisaQty
}
},
qtyRules(originalQty) {
return [
v => Number(v) > 0 || "Jumlah harus diatas 0",
v => Number(v) <= Number(originalQty) || "Jumlah melebihi inventaris yang diterima"
];
},
closeHandOver() {
this.selected_roasset = {};
this.selected_staff = 0;
this.selected_ruangan = 0;
this.$refs.formhandover.resetValidation();
this.dialog_handover_asset = false;
},
async simpanHandOver() {
if (this.$refs.formhandover.validate()) {
let checked = this.list_item_not_handed.filter((ele) => ele.checked);
if (checked.length < 1) {
const snac = { color: 'error', msg: 'tidak ada item yg diterima', state: true };
this.$store.commit("roasset/update_snackbar", snac);
return;
}
let param = {
staffID: this.selected_staff,
receiveOrderPoID: this.selected_roasset.ReceiveOrderPoID,
ruanganID: this.selected_ruangan,
item: checked
}
await this.$store.dispatch("roasset/saveHandoverAsset", param);
this.selected_staff = 0;
this.selected_ruangan = 0;
this.$refs.formhandover.resetValidation();
}
}
},
watch: {}
}
</script>

View File

@@ -22,8 +22,7 @@
</v-flex>
<v-flex xs4 pa-1>
<v-text-field hide-details outline placeholder="Nomor Delivery / Supplier Invoice"
v-model="form_receive.reference" label="Referensi" :readonly="readonly_mode"
></v-text-field>
v-model="form_receive.reference" label="Referensi" :readonly="readonly_mode"></v-text-field>
</v-flex>
</v-layout>
@@ -33,20 +32,14 @@
v-model="form_receive.ponumber" readonly></v-text-field>
</v-flex>
<v-flex xs2 pa-1>
<v-autocomplete
:items="list_cabang" hide-details outline
v-model="form_receive.branchID" label="Cabang"
item-text="M_BranchName" item-value="M_BranchID"
@change="onChangeCabang" :readonly="readonly_mode"
></v-autocomplete>
<v-autocomplete :items="list_cabang" hide-details outline v-model="form_receive.branchID"
label="Cabang" item-text="M_BranchName" item-value="M_BranchID" @change="onChangeCabang"
:readonly="readonly_mode"></v-autocomplete>
</v-flex>
<v-flex xs2 pa-1>
<v-autocomplete
:items="list_gudang" hide-details outline
v-model="form_receive.gudangID" label="Gudang"
item-text="WarehouseName" item-value="WarehouseID"
:readonly="readonly_mode"
></v-autocomplete>
<v-autocomplete :items="list_gudang" hide-details outline v-model="form_receive.gudangID"
label="Gudang" item-text="WarehouseName" item-value="WarehouseID"
:readonly="readonly_mode"></v-autocomplete>
</v-flex>
<v-flex xs4 pa-1>
<v-text-field hide-details outline label="Biaya Pengiriman" placeholder="0"
@@ -60,17 +53,17 @@
v-model="form_receive.catatan" :readonly="readonly_mode"></v-textarea>
</v-flex>
<v-flex xs3 pa-1 mt-1>
<v-btn block color="info" @click="pickKontrakAset()"
:disabled="isFormEmpty()" v-show="!readonly_mode">
<v-btn block color="info" @click="pickKontrakAset()" :disabled="isFormEmpty()"
v-show="!readonly_mode">
PILIH ORDER ASSET
</v-btn>
</v-flex>
</v-layout>
<v-layout row wrap class="mt-3">
<v-flex xs12 v-if="order_received.length > 0">
<v-data-table :headers="headers" :items="order_received"
item-key="PODetailID" class="elevation-1" hide-actions>
<v-flex xs12 v-if="order_received.length > 0">
<v-data-table :headers="headers" :items="order_received" item-key="PODetailID"
class="elevation-1" hide-actions>
<template v-slot:items="props">
<tr>
<td class="text-xs-center pa-1">
@@ -101,10 +94,8 @@
<td class="text-xs-center pa-1">
<v-tooltip bottom pr-2>
<template v-slot:activator="{ on }">
<v-btn
color="green" dark @click="openInspeksi(props.item)"
style="min-width: 40px; margin: 0;" small v-on="on"
>
<v-btn color="green" dark @click="openInspeksi(props.item)"
style="min-width: 40px; margin: 0;" small v-on="on">
<v-icon small>note_add</v-icon>
</v-btn>
</template>
@@ -113,10 +104,8 @@
<v-tooltip bottom v-show="!readonly_mode">
<template v-slot:activator="{ on }">
<v-btn
color="warning" dark @click="cancelOrder(props.item)"
style="min-width: 40px; margin: 0;" small v-on="on"
>
<v-btn color="warning" dark @click="cancelOrder(props.item)"
style="min-width: 40px; margin: 0;" small v-on="on">
<v-icon small>cancel</v-icon>
</v-btn>
</template>
@@ -132,7 +121,8 @@
<v-card-actions>
<v-spacer></v-spacer>
<v-btn @click="batalReceiveOrder()" color="error" class="white--text">Batal</v-btn>
<v-btn :disabled="readonly_mode" @click="simpanReceivedOrder()" color="primary" class="white--text">Simpan</v-btn>
<v-btn :disabled="readonly_mode" @click="simpanReceivedOrder()" color="primary"
class="white--text">Simpan</v-btn>
</v-card-actions>
</v-card>
</v-dialog>
@@ -140,15 +130,15 @@
<style scoped>
.style-limit-heightcard {
max-height: 60vh;
display: flex;
flex-direction: column;
max-height: 60vh;
display: flex;
flex-direction: column;
}
.style-limit-heightcontent {
overflow-y: auto;
flex: 1 1 auto;
min-height: 0;
overflow-y: auto;
flex: 1 1 auto;
min-height: 0;
}
</style>
@@ -268,7 +258,7 @@ module.exports = {
pengirim: ""
};
this.$store.dispatch("orderAsset/listingStaff");
this.$store.dispatch("orderAsset/listingStaff", { ROID: "0", isSerahTerima: 'N' });
this.$store.commit("orderAsset/update_selected_item_received", selectedItem);
this.$store.commit("orderAsset/update_form_inspeksi", formInspeksi);
this.$store.commit("orderAsset/update_dialog_inspeksi", true);
@@ -280,7 +270,7 @@ module.exports = {
},
simpanReceivedOrder() {
if (this.order_received.length <= 0) {
let snac = {color: 'warning', msg: "item tidak boleh kosong", state: true}
let snac = { color: 'warning', msg: "item tidak boleh kosong", state: true }
this.$store.commit("roasset/update_snackbar", snac)
return;
}
@@ -292,7 +282,7 @@ module.exports = {
this.$store.dispatch("orderAsset/editReceiveOrder");
}
} else {
let snac = {color: 'warning', msg: "proses masih berjalan", state: true}
let snac = { color: 'warning', msg: "proses masih berjalan", state: true }
this.$store.commit("roasset/update_snackbar", snac)
}
},

View File

@@ -0,0 +1,141 @@
<template>
<v-dialog v-model="dialog_barcode" persistent max-width="50vw">
<v-card>
<v-card-title class="headline grey lighten-2" primary-title>
CETAK BARCODE ASSET
</v-card-title>
<v-card-text>
<v-layout pa-2 class="grey lighten-2" row>
<v-flex xs1>
<v-checkbox style="padding-top: 0; margin-top: 0" hide-details color="grey darken-1"
v-model="bar_chx_all" :indeterminate="indeterminatex" @change="changeCbxAll(bar_chx_all)">
</v-checkbox>
</v-flex>
<v-flex xs3> ITEM </v-flex>
<v-flex xs3> RUANGAN </v-flex>
<v-flex xs4> NUMBER BARCODE </v-flex>
<v-flex xs1> CETAK </v-flex>
</v-layout>
<v-layout align-center pa-2 v-for="(vs, idx) in list_barcode" :key="vs.id" class="grey lighten-4" row>
<v-flex xs1>
<v-checkbox style="padding-top: 0; margin-top: 0" color="grey darken-1" hide-details
v-model="vs.chex" @change="checkTop()"></v-checkbox>
</v-flex>
<v-flex xs3>{{ vs.M_ItemDesc }}</v-flex>
<v-flex xs3>{{ vs.M_RuanganName }}</v-flex>
<v-flex xs4>{{ vs.T_BarcodeBarangNumber }}</v-flex>
<v-flex xs1>
<span @click="printSingleBarcode(vs)"
class="icon-medium-fill-base-small xs1 white--text grey darken-1 ml-1 icon-print"></span>
</v-flex>
</v-layout>
</v-card-text>
<v-card-actions>
<v-spacer></v-spacer>
<v-btn color="error" @click="closeDialogBarcode()">Tutup</v-btn>
<v-btn dark color="grey darken-1" @click="printMultipleBarcode()">Cetak terpilih
[ {{ selected_barcode.length }} ]
</v-btn>
</v-card-actions>
</v-card>
</v-dialog>
</template>
<script>
module.exports = {
data() {
return {
bar_chx_all: false,
indeterminatex: false,
selected_barcode: []
}
},
computed: {
dialog_barcode: {
get() {
return this.$store.state.roasset.dialog_barcode
},
set(val) {
this.$store.commit("roasset/update_dialog_barcode", val)
}
},
selected_roasset: {
get() {
return this.$store.state.roasset.selected_roasset
},
set(val) {
this.$store.commit("roasset/update_selected_roasset", val)
}
},
list_barcode: {
get() {
return this.$store.state.roasset.list_barcode
},
set(val) {
this.$store.commit("roasset/update_list_barcode", val)
}
}
},
methods: {
changeCbxAll(value) {
let arr = this.list_barcode;
this.indeterminatex = false;
arr.forEach((el) => {
el.chex = value;
});
let selected = _.filter(arr, function (o) {
return o.chex;
});
this.selected_barcode = selected;
},
checkTop() {
let barcodes = this.list_barcode;
let selected = _.filter(barcodes, function (o) {
return o.chex;
});
this.bar_chx_all = false;
this.indeterminatex = false;
if (selected.length > 0 && barcodes.length === selected.length) {
this.bar_chx_all = true;
this.indeterminatex = false;
}
if (selected.length > 0 && barcodes.length > selected.length) {
this.bar_chx_all = false;
this.indeterminatex = true;
}
this.selected_barcode = selected;
},
printSingleBarcode(value) {
var inp = {
nama_item: value.M_ItemDesc,
no_inv: value.T_BarcodeBarangNumber,
lokasi: value.M_RuanganName,
cabang: value.M_BranchName
};
one_print_qrcode_inv(inp);
},
printMultipleBarcode() {
var barcodes = this.selected_barcode;
barcodes.forEach(value => {
var inp = {
nama_item: value.M_ItemDesc,
no_inv: value.T_BarcodeBarangNumber,
lokasi: value.M_RuanganName,
cabang: value.M_BranchName
};
one_print_qrcode_inv(inp);
});
},
closeDialogBarcode() {
this.bar_chx_all = false
this.indeterminatex = false
this.selected_barcode = []
this.dialog_barcode = false
}
},
watch: {}
}
</script>

View File

@@ -81,10 +81,8 @@
</v-tooltip>
<v-tooltip bottom pr-2>
<template v-slot:activator="{ on }">
<v-btn
color="warning" dark @click="confirmRO(props.item)"
style="min-width: 40px; margin: 0;" small v-on="on"
>
<v-btn color="warning" dark @click="confirmRO(props.item)"
style="min-width: 40px; margin: 0;" small v-on="on">
<v-icon small>send</v-icon>
</v-btn>
</template>
@@ -92,10 +90,8 @@
</v-tooltip>
<v-tooltip bottom pr-2>
<template v-slot:activator="{ on }">
<v-btn
color="info" dark @click="editRO(props.item)" v-on="on"
style="min-width: 40px; margin: 0;" small
>
<v-btn color="info" dark @click="editRO(props.item)" v-on="on"
style="min-width: 40px; margin: 0;" small>
<v-icon small>edit</v-icon>
</v-btn>
</template>
@@ -103,10 +99,8 @@
</v-tooltip>
<v-tooltip bottom>
<template v-slot:activator="{ on }">
<v-btn
color="red" dark @click="deleteRO(props.item)"
style="min-width: 40px; margin: 0;" small v-on="on"
>
<v-btn color="red" dark @click="deleteRO(props.item)"
style="min-width: 40px; margin: 0;" small v-on="on">
<v-icon small>delete</v-icon>
</v-btn>
</template>
@@ -114,6 +108,15 @@
</v-tooltip>
</div>
<div v-show="props.item.ReceiveOrderPoConfirmed == 'Y'">
<v-tooltip bottom pr-2>
<template v-slot:activator="{ on }">
<v-btn color="black lighten-2" dark @click="viewBarcode(props.item)"
style="min-width: 40px; margin: 0;" small v-on="on">
<v-icon small>print</v-icon>
</v-btn>
</template>
<span>View Barcode</span>
</v-tooltip>
<v-tooltip bottom pr-2>
<template v-slot:activator="{ on }">
<v-btn color="info" dark @click="viewDetail(props.item)"
@@ -125,14 +128,14 @@
</v-tooltip>
<v-tooltip bottom pr-2>
<template v-slot:activator="{ on }">
<v-btn color="green" dark @click="uploadAttachment(props.item)"
<v-btn color="orange" dark @click="uploadAttachment(props.item)"
style="min-width: 40px; margin: 0;" small v-on="on">
<v-icon small>attach_file</v-icon>
</v-btn>
</template>
<span>View Document</span>
</v-tooltip>
<v-tooltip bottom>
<v-tooltip bottom pr-2>
<template v-slot:activator="{ on }">
<v-btn color="primary" dark @click="printout(props.item)"
style="min-width: 40px; margin: 0;" small v-on="on">
@@ -141,6 +144,17 @@
</template>
<span>Cetak PDF</span>
</v-tooltip>
<span v-show="props.item.ReceiveOrderPoIsHandover == 'N'">
<v-tooltip bottom>
<template v-slot:activator="{ on }">
<v-btn color="green" dark @click="handOverRO(props.item)"
style="min-width: 40px; margin: 0;" small v-on="on">
<v-icon small>move_to_inbox</v-icon>
</v-btn>
</template>
<span>Serah Terima</span>
</v-tooltip>
</span>
</div>
</td>
</tr>
@@ -163,14 +177,10 @@
<dialog-confirm-order-asset></dialog-confirm-order-asset>
<dialog-pick-contract></dialog-pick-contract>
<dialog-inspeksi></dialog-inspeksi>
<one-dialog-print
:title="printtitle"
:width="printwidth"
:height="600"
:status="openprint"
:urlprint="urlprint"
@close-dialog-print="openprint = false"
></one-dialog-print>
<dialog-view-barcode></dialog-view-barcode>
<dialog-handover-asset></dialog-handover-asset>
<one-dialog-print :title="printtitle" :width="printwidth" :height="600" :status="openprint" :urlprint="urlprint"
@close-dialog-print="openprint = false"></one-dialog-print>
</div>
</template>
@@ -183,6 +193,8 @@ module.exports = {
'dialog-confirm-order-asset': httpVueLoader('./dialog-confirm-receive.vue'),
'dialog-pick-contract': httpVueLoader('./dialog-pick-contract.vue'),
'dialog-inspeksi': httpVueLoader('./dialog-inspeksi.vue'),
'dialog-view-barcode': httpVueLoader('./dialog-view-barcode.vue'),
'dialog-handover-asset': httpVueLoader('./dialog-handover-asset.vue'),
'one-dialog-print': httpVueLoader('../../common/oneDialogPrintX.vue'),
},
mounted() {
@@ -313,6 +325,18 @@ module.exports = {
let tm = Date.now();
this.urlprint = BASE_URL + "/one-api/report/rpt_receive_order_asset/pdf?id=" + val.ReceiveOrderPoID + "&username=" + username + "&tm=" + tm;
this.openprint = true;
},
viewBarcode(item) {
this.$store.dispatch("roasset/lookupBarcodes", item.ReceiveOrderPoID);
this.$store.commit("roasset/update_selected_roasset", item);
this.$store.commit("roasset/update_dialog_barcode", true);
},
handOverRO(item) {
this.$store.commit("roasset/update_selected_roasset", item);
this.$store.dispatch("roasset/lookupRuangan");
this.$store.dispatch("orderAsset/listingStaff", { ROID: item.ReceiveOrderPoID, isSerahTerima: 'Y' });
this.$store.dispatch("roasset/lookupAssetNotHanded", item.ReceiveOrderPoID);
this.$store.commit("roasset/update_dialog_handover_asset", true);
}
},
watch: {

View File

@@ -4,10 +4,10 @@
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta http-equiv="X-UA-Compatible" content="ie=edge">
<title>ACCONE | Receive Order Asset</title>
<link rel="stylesheet" href="../../../libs/vendor/css/google-fonts.css">
<link rel="stylesheet" href="../../../libs/vendor/css/icomoon-fonts.css">
<link rel="stylesheet" href="../../../libs/vendor/css/vuetify.min.css">
<title>One</title>
</head>
<body>
<div v-cloak id="app">
@@ -35,6 +35,8 @@
<script src="../../../libs/vendor/vuetify.js"></script>
<script src="../../../libs/vendor/httpVueLoader.js"></script>
<script src="../../../libs/one_global.js"></script>
<script src="../../../libs/one_print_barcode.js"></script>
<script src="../../../libs/vendor/sheetjs-master/xlsx.full.min.js"></script>
<!-- App Script -->
<script type="module">

View File

@@ -131,9 +131,9 @@ export default {
context.commit("roasset/update_snackbar", snac, { root: true });
}
},
async listingStaff(context) {
async listingStaff(context, params) {
try {
const params = { token: one_token() };
params.token = one_token();
const resp = await api.getListStaff(params);
if (resp.status != 'OK') {
throw new Error(resp.message);

View File

@@ -33,7 +33,14 @@ export default {
dialog_delete: false,
/* confirm */
dialog_confirm: false
dialog_confirm: false,
/* barcode */
dialog_barcode: false,
list_barcode: [],
dialog_handover_asset: false,
list_item_not_handed: [],
list_lokasi: []
},
mutations: {
/* common */
@@ -74,8 +81,26 @@ export default {
state.dialog_delete = val
},
/* delete */
update_dialog_confirm(state, val) {
state.dialog_confirm = val
},
/* barcode */
update_dialog_barcode(state, val) {
state.dialog_barcode = val
},
update_list_barcode(state, val) {
state.list_barcode = val
},
update_dialog_handover_asset(state, val) {
state.dialog_handover_asset = val
},
update_list_item_not_handed(state, val) {
state.list_item_not_handed = val
},
update_list_lokasi(state, val) {
state.list_lokasi = val
}
},
actions: {
@@ -209,6 +234,75 @@ export default {
const snac = { color: 'error', msg: e.message, state: false };
context.commit("update_snackbar", snac);
}
}
},
async lookupRuangan(context) {
try {
const params = {
token: one_token(),
search: ''
};
const resp = await api.getRuangan(params);
if (resp.status != 'OK') {
throw new Error(resp.message);
}
context.commit("update_list_lokasi", resp.data);
} catch (e) {
const snac = { color: 'error', msg: e.message, state: true };
context.commit("update_snackbar", snac);
}
},
async lookupAssetNotHanded(context, id) {
try {
const params = {
token: one_token(),
ROID: id
};
const resp = await api.getAssetBelumSerahTerima(params);
if (resp.status != 'OK') {
throw new Error(resp.message);
}
context.commit("update_list_item_not_handed", resp.data);
} catch (e) {
const snac = { color: 'error', msg: e.message, state: true };
context.commit("update_snackbar", snac);
}
},
async saveHandoverAsset(context, params) {
try {
params.token = one_token();
const resp = await api.saveHandover(params);
if (resp.status != 'OK') {
throw new Error(resp.message);
}
const snac = { color: 'success', msg: resp.data, state: true };
context.commit("update_snackbar", snac);
context.dispatch("lookupOrderAssetReceived");
context.commit("update_dialog_handover_asset", false);
} catch (e) {
const snac = { color: 'error', msg: e.message, state: true };
context.commit("update_snackbar", snac);
}
},
async lookupBarcodes(context, id) {
try {
const params = {
token: one_token(),
ROID: id
};
const resp = await api.getBarcodes(params);
if (resp.status != 'OK') {
throw new Error(resp.message);
}
context.commit('update_list_barcode', resp.data);
} catch (e) {
const snac = { color: 'error', msg: e.message, state: true };
context.commit("update_snackbar", snac);
}
},
}
}

View File

@@ -457,7 +457,13 @@
return `${year}-${month.padStart(2, '0')}-${day.padStart(2, '0')}`
},
isSelected(p) {
return p.SupplierInvoiceID == this.$store.state.bill.selected_bill.SupplierInvoiceID
const sel = this.$store.state.bill.selected_bill;
if (!sel || !sel.type) return false;
return p.type === sel.type && (
(sel.type === 'INVOICE' && p.SupplierInvoiceID == sel.SupplierInvoiceID) ||
(sel.type === 'DP' && p.DownpaymentID == sel.DownpaymentID) ||
(sel.type === 'INSTALLMENT' && p.InstallmentID == sel.InstallmentID)
);
},
closeDialogPaySuccess() {
this.$store.commit("bill/update_dialog_pay_success", false)

View File

@@ -1202,7 +1202,18 @@
tanggalbayar: this.xtanggalbayar,
type: this.$store.state.bill.selected_bill.type,
}
//console.log(prm.amount)
if (this.$store.state.bill.selected_bill.type == 'DP') {
prm.DownpaymentID = this.$store.state.bill.selected_bill.DownpaymentID
prm.dpkode = this.$store.state.bill.selected_bill.SupplierInvoiceNumber
} else if (this.$store.state.bill.selected_bill.type == "INSTALLMENT") {
prm.InstallmentID = this.$store.state.bill.selected_bill.InstallmentID
prm.installmentkode = this.$store.state.bill.selected_bill.SupplierInvoiceNumber
} else {
prm.SupplierInvoiceID = this.$store.state.bill.selected_bill.SupplierInvoiceID
prm.invoicekode = this.$store.state.bill.selected_bill.SupplierInvoiceNumber
}
this.$store.dispatch("paymentmanual/pay", prm)
},
deleteNote(note, idx) {
@@ -1249,8 +1260,14 @@
},
closeDialogDelete() {
let arrbill = this.$store.state.bill.bills
var idx = _.findIndex(arrbill, item => item.SupplierInvoiceID === this.$store.state.bill.selected_bill
.SupplierInvoiceID)
const sel = this.$store.state.bill.selected_bill;
var idx = _.findIndex(arrbill, item =>
item.type === sel.type && (
(sel.type === 'INVOICE' && item.SupplierInvoiceID == sel.SupplierInvoiceID) ||
(sel.type === 'DP' && item.DownpaymentID == sel.DownpaymentID) ||
(sel.type === 'INSTALLMENT' && item.InstallmentID == sel.InstallmentID)
)
);
this.$store.commit("paymentmanual/update_dialog_delete", false)
this.$store.commit("bill/update_selected_bill", {})
this.$store.dispatch("bill/search", {
@@ -1264,8 +1281,14 @@
},
closeDialogEdit() {
let arrbill = this.$store.state.bill.bills
var idx = _.findIndex(arrbill, item => item.SupplierInvoiceID === this.$store.state.bill.selected_bill
.SupplierInvoiceID)
const sel = this.$store.state.bill.selected_bill;
var idx = _.findIndex(arrbill, item =>
item.type === sel.type && (
(sel.type === 'INVOICE' && item.SupplierInvoiceID == sel.SupplierInvoiceID) ||
(sel.type === 'DP' && item.DownpaymentID == sel.DownpaymentID) ||
(sel.type === 'INSTALLMENT' && item.InstallmentID == sel.InstallmentID)
)
);
this.$store.commit("paymentmanual/update_dialog_edit", false)
this.$store.commit("bill/update_selected_bill", {})
this.$store.dispatch("bill/search", {

View File

@@ -1231,8 +1231,14 @@
},
closeDialogDelete() {
let arrbill = this.$store.state.bill.bills
var idx = _.findIndex(arrbill, item => item.SupplierInvoiceID === this.$store.state.bill.selected_bill
.SupplierInvoiceID)
const sel = this.$store.state.bill.selected_bill;
var idx = _.findIndex(arrbill, item =>
item.type === sel.type && (
(sel.type === 'INVOICE' && item.SupplierInvoiceID == sel.SupplierInvoiceID) ||
(sel.type === 'DP' && item.DownpaymentID == sel.DownpaymentID) ||
(sel.type === 'INSTALLMENT' && item.InstallmentID == sel.InstallmentID)
)
);
this.$store.commit("paymentmanual/update_dialog_delete", false)
this.$store.commit("bill/update_selected_bill", {})
this.$store.dispatch("bill/search", {
@@ -1246,8 +1252,14 @@
},
closeDialogEdit() {
let arrbill = this.$store.state.bill.bills
var idx = _.findIndex(arrbill, item => item.SupplierInvoiceID === this.$store.state.bill.selected_bill
.SupplierInvoiceID)
const sel = this.$store.state.bill.selected_bill;
var idx = _.findIndex(arrbill, item =>
item.type === sel.type && (
(sel.type === 'INVOICE' && item.SupplierInvoiceID == sel.SupplierInvoiceID) ||
(sel.type === 'DP' && item.DownpaymentID == sel.DownpaymentID) ||
(sel.type === 'INSTALLMENT' && item.InstallmentID == sel.InstallmentID)
)
);
this.$store.commit("paymentmanual/update_dialog_edit", false)
this.$store.commit("bill/update_selected_bill", {})
this.$store.dispatch("bill/search", {

View File

@@ -19,7 +19,6 @@ export async function lookup_type(token) {
}
}
export async function lookup_banks(token) {
try {
var resp = await axios.post(URL + 'payment/lookup_banks',{token:token});
@@ -39,7 +38,6 @@ export async function lookup_banks(token) {
}
}
export async function lookup_accounts(token) {
try {
var resp = await axios.post(URL + 'payment/lookup_accounts',{token:token});
@@ -59,7 +57,6 @@ export async function lookup_accounts(token) {
}
}
export async function searchcard(token,prm) {
try {
var resp = await axios.post(URL + 'payment/searchcard',{token:token,search:prm});
@@ -117,6 +114,25 @@ export async function payDownpayment(prm) {
}
}
export async function payInstallment(prm) {
try {
var resp = await axios.post(URL + 'payment/payInstallment',prm);
if (resp.status != 200) {
return {
status: "ERR",
message: resp.statusText
};
}
let data = resp.data;
return data;
} catch (e) {
return {
status: "ERR",
message: e.message
};
}
}
export async function editpay(prm) {
try {
var resp = await axios.post(URL + 'payment/editpaymanual',prm);

View File

@@ -5,14 +5,14 @@
<v-menu class="xs3 pr-2" v-model="menustartdate" :close-on-content-click="false" :nudge-right="40" lazy transition="scale-transition"
offset-y full-width max-width="290px" min-width="290px">
<template v-slot:activator="{ on }">
<v-text-field class="mt-1" v-model="startDateFormatted" label="Tgl. Awal" outline readonly v-on="on" @blur="date = deFormatedDate(startDateFormatted)"></v-text-field>
<v-text-field class="mt-1" v-model="startDateFormatted" label="Tgl. Awal" outline readonly v-on="on"></v-text-field>
</template>
<v-date-picker v-model="init_sdate" no-title @input="menustartdate = false"></v-date-picker>
</v-menu>
<v-menu class="xs3 pl-2" v-model="menuenddate" :close-on-content-click="false" :nudge-right="40" lazy transition="scale-transition"
offset-y full-width max-width="290px" min-width="290px">
<template v-slot:activator="{ on }">
<v-text-field class="mt-1" v-model="endDateFormatted" label="Tgl. Akhir" outline readonly v-on="on" @blur="date = deFormatedDate(endDateFormatted)"></v-text-field>
<v-text-field class="mt-1" v-model="endDateFormatted" label="Tgl. Akhir" outline readonly v-on="on"></v-text-field>
</template>
<v-date-picker v-model="init_edate" no-title @input="menuenddate = false"></v-date-picker>
</v-menu>
@@ -110,7 +110,13 @@
return `${year}-${month.padStart(2, '0')}-${day.padStart(2, '0')}`
},
isSelected(p) {
return p.SupplierInvoiceID == this.$store.state.bill.selected_bill.SupplierInvoiceID
const sel = this.$store.state.bill.selected_bill;
if (!sel || !sel.type) return false;
return p.type === sel.type && (
(sel.type === 'INVOICE' && p.SupplierInvoiceID == sel.SupplierInvoiceID) ||
(sel.type === 'DP' && p.DownpaymentID == sel.DownpaymentID) ||
(sel.type === 'INSTALLMENT' && p.InstallmentID == sel.InstallmentID)
);
},
convertMoney(money) {
return one_money(money)

View File

@@ -1167,11 +1167,15 @@
tanggalbayar: this.xtanggalbayar,
type: this.$store.state.bill.selected_bill.type
}
// console.log(prm)
if (this.$store.state.bill.selected_bill.type == 'DP') {
prm.orderid = this.$store.state.bill.selected_bill.DownpaymentID
this.$store.dispatch("paymentmanual/payDownpayment", prm)
} else if (this.$store.state.bill.selected_bill.type == 'INSTALLMENT') {
prm.orderid = this.$store.state.bill.selected_bill.InstallmentID
this.$store.dispatch("paymentmanual/payInstallment", prm)
} else {
prm.orderid = this.$store.state.bill.selected_bill.SupplierInvoiceID
this.$store.dispatch("paymentmanual/pay", prm)
}
},
@@ -1185,10 +1189,21 @@
orderid: this.$store.state.bill.selected_bill.SupplierInvoiceID,
headerid: this.$store.state.bill.selected_bill.SupplierPaymentID,
xnumber: this.$store.state.bill.selected_bill.SupplierPaymentNumber,
tanggalbayar : this.xtanggalbayar
tanggalbayar : this.xtanggalbayar,
type: this.$store.state.bill.selected_bill.type
}
//console.log(prm.amount)
this.$store.dispatch("paymentmanual/editpay", prm)
if (this.$store.state.bill.selected_bill.type == 'DP') {
prm.orderid = this.$store.state.bill.selected_bill.DownpaymentID
this.$store.dispatch("paymentmanual/editpay", prm)
} else if (this.$store.state.bill.selected_bill.type == 'INSTALLMENT') {
prm.orderid = this.$store.state.bill.selected_bill.InstallmentID
this.$store.dispatch("paymentmanual/editpay", prm)
} else {
prm.orderid = this.$store.state.bill.selected_bill.SupplierInvoiceID
this.$store.dispatch("paymentmanual/editpay", prm)
}
},
deleteNote(note, idx) {
this.$store.commit("paymentmanual/update_note_delete", "")

View File

@@ -348,6 +348,37 @@ export default {
}
},
async payInstallment(context, prm) {
context.commit("update_lookup_status", 1)
try {
prm.token = one_token()
let resp = await api.payInstallment(prm)
if (resp.status != "OK") {
context.commit("update_lookup_status", 3)
context.commit("update_lookup_error_message", resp.message)
} else {
context.commit("update_lookup_status", 2)
context.commit("update_lookup_error_message", "")
let data = {
records: resp.data.records.types,
total: resp.data.total
}
let xnumber = resp.data.records.data.numberx
let id = resp.data.records.data.idx
context.commit("update_disable_btn_pay", 'Y')
context.commit("update_idx", id)
context.commit("update_total_payment", 0)
context.commit("update_paynumber", "Payment Instruction nomor <span style='color:red'>" + xnumber + "</span> telah berhasil")
context.commit("update_dialog_pay_success", true)
context.commit("update_in_saving", false)
context.commit("update_xbayar", 0)
}
} catch (e) {
context.commit("update_lookup_status", 3)
context.commit("update_lookup_error_message", e.message)
}
},
async editpay(context, prm) {
context.commit("update_lookup_status", 1)
try {