diff --git a/src/components/form/SubjectTreeChooser.vue b/src/components/form/SubjectTreeChooser.vue index 8b6ea639..d5b322a0 100644 --- a/src/components/form/SubjectTreeChooser.vue +++ b/src/components/form/SubjectTreeChooser.vue @@ -23,7 +23,7 @@ export default { name: "SubjectTreeChooser", components: {SubjectTreeChooserNodeItem}, props: [ - 'value', 'visible', 'height', 'canSelectNonLeaf', + 'year','value', 'visible', 'height', 'canSelectNonLeaf', ], watch: { value: function (newVal, oldVal) { @@ -33,6 +33,14 @@ export default { this.syncIndex(); } }, + year: function (newVal, oldVal) { + console.log(newVal) + if(newVal != this.yearNews) + { + this.yearNews = newVal; + this.getSubjects(); + } + }, visible: function(newVal, oldVal) { if(this.popupVisible !== newVal) { @@ -53,6 +61,7 @@ export default { return { popupVisible: false, internalValue: this.value, + yearNews: this.year, searchValue: '', active: '1', subjects: [], @@ -76,7 +85,7 @@ export default { map[x.dictValue] = item; return item; }); - let url = '/finance/subject/listAll'; // '/open/villageAffairs/public/subjects/153' + let url = '/finance/subject/listAll?year='+this.yearNews; // '/open/villageAffairs/public/subjects/153' request(url).then((resp) => { let list = this.makeTree(resp.rows || resp.data); for(let v of list) diff --git a/src/views/sunVillage_info/detailed_ledger.vue b/src/views/sunVillage_info/detailed_ledger.vue index 539202ba..85ba90ec 100644 --- a/src/views/sunVillage_info/detailed_ledger.vue +++ b/src/views/sunVillage_info/detailed_ledger.vue @@ -26,71 +26,55 @@ -
-
-
- - -
{{queryParams.startDate.substr(0,4)}}
-
-
-
-
-
- 凭证字 -
- - 摘要 - 借方 - 贷方 - 方向 - 余额 - - -
-
-
- -
- - {{item.month}} - {{item.day}} - -
{{item.voucherWordNum}}
-
-
-
-
- - - {{item.voucherSummary}} - - {{item.jieAmount}} - {{item.daiAmount}} - {{item.balanceDirection}} - {{item.balance}} - - - - -
-
+
+ + + + + +
+
+
+
{{queryParams.startDate.substr(0,4)}}
+
凭证字
+
摘要
+
借方
+
贷方
+
方向
+
余额
+
+ + + + + + + + + + +
+
    +
  • +
    月:{{item.month}}日:{{item.day==null?'无':item.day}}
    +
    {{item.voucherWordNum}}
    +
    {{item.voucherSummary}}
    +
    {{item.jieAmount}}
    +
    {{item.daiAmount}}
    +
    {{item.balanceDirection}}
    +
    {{item.balance}}
    +
  • +
+
+
-
+