diff --git a/package.json b/package.json index b4af519..e59fc17 100644 --- a/package.json +++ b/package.json @@ -38,6 +38,7 @@ "apexcharts": "^3.35.0", "jw-vue-pagination": "^1.0.3", "laravel-echo": "^1.11.4", + "npm-watch": "^0.11.0", "pusher-js": "^7.0.6", "table2excel": "^1.0.4", "vue-apexcharts": "^1.6.2", diff --git a/resources/js/WTD/Rekod.vue b/resources/js/WTD/Rekod.vue index 9601da7..91ddb7c 100644 --- a/resources/js/WTD/Rekod.vue +++ b/resources/js/WTD/Rekod.vue @@ -1,46 +1,94 @@ diff --git a/resources/js/WTD/SelectWTD.vue b/resources/js/WTD/SelectWTD.vue index 1fb3b8c..928b1ff 100644 --- a/resources/js/WTD/SelectWTD.vue +++ b/resources/js/WTD/SelectWTD.vue @@ -1,12 +1,16 @@ diff --git a/resources/js/WTD/SenaraiBakiLelong.vue b/resources/js/WTD/SenaraiBakiLelong.vue index 545cce1..3c5a36e 100644 --- a/resources/js/WTD/SenaraiBakiLelong.vue +++ b/resources/js/WTD/SenaraiBakiLelong.vue @@ -65,10 +65,10 @@ {{ bl.t_lelong }} - {{ bl.pinjaman }} + {{ formattext(bl.pinjaman) }} - {{ bl.baki }} + {{ formattext(bl.baki) }} @@ -98,6 +98,9 @@ export default { }, props: ['bakilelong', 'bulanmula', 'bulanhingga'], methods: { + formattext: function (value) { + return formatter.format(value); + }, async associate() { this.arraybakilelong = this.$props.bakilelong; }, @@ -211,7 +214,7 @@ export default { }).then((result) => { if (result.isConfirmed) { this.blockwtd(); - blockseterusnya = true; + this.blockseterusnya = true; } }) diff --git a/resources/js/WTD/wtd.vue b/resources/js/WTD/wtd.vue index b57c800..49e42b5 100644 --- a/resources/js/WTD/wtd.vue +++ b/resources/js/WTD/wtd.vue @@ -1,13 +1,12 @@ @@ -44,22 +41,22 @@ export default { mula: null, hingga: null, loadbakilelong: null, - bakilelong:[], + bakilelong: [], config: { wrap: false, // set wrap to true only when using 'input-group' maxDate: 'today', plugins: [ new monthSelectPlugin({ - shorthand: true, //defaults to false - dateFormat: "m-Y", //defaults to "F Y" - altFormat: "F Y", //defaults to "F Y" + shorthand: true, //defaults to false + dateFormat: "m-Y", //defaults to "F Y" + altFormat: "F Y", //defaults to "F Y" }) - ] + ] }, } }, methods: { - async generatebakilelong () { + async generatebakilelong() { let cawangan = this.$kodcaw; this.loadbakilelong = 'process'; @@ -76,22 +73,21 @@ export default { this.bakilelong = response.data; this.loadbakilelong = 'success'; - if(this.bakilelong.length <= 0) - { + if (this.bakilelong.length <= 0) { this.loadbakilelong = null; this.$swal( - 'Amaran', - 'Baki lelong tiada dalam senarai', - 'error' + 'Amaran', + 'Baki lelong tiada dalam senarai', + 'error' ) } }); - + await this.$refs.senaraibaki.associate(); } }, - updateLoad: function(){ + updateLoad: function () { this.loadbakilelong = null; this.bakilelong = null; this.mula = null; diff --git a/resources/js/app.js b/resources/js/app.js index b89c723..c58a9a2 100644 --- a/resources/js/app.js +++ b/resources/js/app.js @@ -126,18 +126,18 @@ Vue.use(require('vue-pusher'), { } }); -Vue.prototype.$api1 = 'http://localhost:8000/' +Vue.prototype.$api1 = 'http://api.arrahn' Vue.prototype.$username = document.querySelector("meta[name='user_name']").getAttribute('content'); Vue.prototype.$userroles = document.querySelector("meta[name='user_roles']").getAttribute('content'); let initial = 'KB2'; -let initialhostname = 'http://localhost:8000/'; +let initialhostname = 'http://api.arrahn'; const store = new Vuex.Store({ state: { $kodcaw: 'KB2', - $hostname: 'http://localhost:8000/' + $hostname: 'http://api.arrahn' }, plugins: [createPersistedState()], mutations: { diff --git a/resources/js/components/Analisa/Aging.vue b/resources/js/components/Analisa/Aging.vue index 0910d95..4c054ba 100644 --- a/resources/js/components/Analisa/Aging.vue +++ b/resources/js/components/Analisa/Aging.vue @@ -1,203 +1,225 @@ \ No newline at end of file + +
+ + + + +
+ +
+

Data Lelong

+ +
+ + + + + + + + + + + + + + + + + + + + + + +
+ Tempoh + + Bil + + RM +
+ {{ (n == 13) ? '12 > ' : n }} Bulan + + {{ collectionlelong.count[index].toFixed(0) }} + + {{ formatterfunction(collectionlelong.sum[index]) }} +
Keseluruhan{{ collectionlelong.count[13].toFixed(0) }}{{ formatterfunction(collectionlelong.sum[13]) }}
+
+ +
+ +
+ + + + +
+
+

Data Filter

+ +
+ + + + + + + + + + + + + + + + + + + + + + +
+ Tempoh + + Bil + + RM +
+ {{ (n == 13) ? '12 > ' : n }} Bulan + + {{ collectionfilter.count[index].toFixed(0) }} + + {{ formatterfunction(collectionfilter.sum[index]) }} +
Keseluruhan{{ collectionfilter.count[13].toFixed(0) }}{{ formatterfunction(collectionfilter.sum[13]) }}
+
+ +
+ + + + + diff --git a/resources/js/components/Cawangan.vue b/resources/js/components/Cawangan.vue index e401083..bd55359 100644 --- a/resources/js/components/Cawangan.vue +++ b/resources/js/components/Cawangan.vue @@ -84,7 +84,7 @@ case 'JLI': case 'ARP': case '020303':{ - this.sethostname('http://localhost:8000/') + this.sethostname('http://api.arrahn') break; } case '010621': @@ -114,7 +114,7 @@ this.sethostname('http://api3.arrahn') break; } - default: this.sethostname('http://localhost:8000') + default: this.sethostname('http://api.arrahn') break; } } diff --git a/resources/js/components/pagination.vue b/resources/js/components/pagination.vue index aeb4026..b419ed2 100644 --- a/resources/js/components/pagination.vue +++ b/resources/js/components/pagination.vue @@ -16,19 +16,19 @@