diff --git a/public/index.html b/public/index.html index 3c3df95..040da3b 100644 --- a/public/index.html +++ b/public/index.html @@ -46,6 +46,15 @@ @@ -54,5 +63,25 @@
+ + diff --git a/src/api/engin.js b/src/api/engin.js index 7b027d8..dd8f760 100644 --- a/src/api/engin.js +++ b/src/api/engin.js @@ -108,7 +108,8 @@ const committeeSumGroupByType=(data)=>{ let tmps=d.data||[]; let sum=0; tmps.forEach(it=>{ - sum+=it.id||0; + sum+=(it.id||0)/10000.0; + it.id=(it.id||0)/10000.0; }) resolve({ total:sum, diff --git a/src/pages/engin/auditingPage.vue b/src/pages/engin/auditingPage.vue index 7bfc71c..0360d18 100644 --- a/src/pages/engin/auditingPage.vue +++ b/src/pages/engin/auditingPage.vue @@ -33,12 +33,7 @@ -
- -
+
@@ -106,10 +101,16 @@ -
+
付款明细
+
+ +
@@ -292,6 +294,9 @@ export default { }, mounted() { + let dt1 = this.$dt((+new Date()) - 30 * 24 * 3600 * 1000); + let dt2 = this.$dt(new Date()); + this.selDate = [dt1, dt2]; this.$bus.$on("projectChange", debounce(res => { this.project = res; this.dept = this.$root.dept ||this.dept|| {}; @@ -305,7 +310,7 @@ export default { methods: { dtChange(init) { - this.loadSumCost(); + //this.loadSumCost(); this.loadCostList(); }, doStateDlg(it) { @@ -485,13 +490,13 @@ export default { } else { postData.id = this.dept.id; } - /* + if (this.selDate.length > 0) { postData.createTime = +this.$dt(this.selDate[0]).$d; } if (this.selDate.length > 1) { postData.updateTime = +this.$dt(this.selDate[1]).$d; - }*/ + } this.$api.costOut.selectForBigEnginList(postData).then(d => { this.sumList = d; }); diff --git a/src/pages/projectEngin.vue b/src/pages/projectEngin.vue index 48d8614..a2b7717 100644 --- a/src/pages/projectEngin.vue +++ b/src/pages/projectEngin.vue @@ -145,11 +145,11 @@
-
+
付款明细 -
+
@@ -224,10 +224,11 @@ export default { workTypeList:[], selType:'', commDetailList:[], + }; }, - mounted() { + mounted() { this.$bus.$on("projectChange", debounce(res => { this.project = res; this.prjs=this.$root.projects ||this.prjs||[]; diff --git a/src/pages/projectProgress.vue b/src/pages/projectProgress.vue index 038aaf0..7ec00f8 100644 --- a/src/pages/projectProgress.vue +++ b/src/pages/projectProgress.vue @@ -177,7 +177,7 @@ - +