apply-clients 5.0.35-ezhou-16 → 5.0.35-ezhou-17
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json
CHANGED
|
@@ -24,7 +24,15 @@
|
|
|
24
24
|
:show-reset-button="reset">
|
|
25
25
|
</datepicker>
|
|
26
26
|
</div>
|
|
27
|
-
|
|
27
|
+
<div class="form-group col-sm-2">
|
|
28
|
+
<label class="col-sm-4 control-label linehhh">组织机构</label>
|
|
29
|
+
<div class="col-sm-8">
|
|
30
|
+
<right-tree :userid.sync='$parent.$parent.userid' :source.sync='$parent.$parent.source'
|
|
31
|
+
@re-res="$parent.$parent.getRes"
|
|
32
|
+
v-model="filiale"
|
|
33
|
+
></right-tree>
|
|
34
|
+
</div>
|
|
35
|
+
</div>
|
|
28
36
|
</div>
|
|
29
37
|
<div class="span" style = "float:right;">
|
|
30
38
|
<button class="button_search" @click="$parent.$parent.searchData()">查询</button>
|
|
@@ -42,7 +50,7 @@
|
|
|
42
50
|
</th>
|
|
43
51
|
</tr>
|
|
44
52
|
<tr>
|
|
45
|
-
<th :colspan='$parent.spans' style="font-weight: normal; text-align: center;">
|
|
53
|
+
<th :colspan='$parent. spans' style="font-weight: normal; text-align: center;">
|
|
46
54
|
开始时间：{{model.model.startDate}}
|
|
47
55
|
结束时间：{{ model.model.endDate }}
|
|
48
56
|
+ </th>
|
|
@@ -82,6 +90,8 @@ export default {
|
|
|
82
90
|
props: ['data'],
|
|
83
91
|
data () {
|
|
84
92
|
return {
|
|
93
|
+
filialeNameStr: null,
|
|
94
|
+
filialeCodeStr: this.$login.f.f_orgids,
|
|
85
95
|
printTime: this.$login.toStandardTimeString(),
|
|
86
96
|
depresid: [],
|
|
87
97
|
userresid: [],
|
|
@@ -96,9 +106,11 @@ export default {
|
|
|
96
106
|
f_inputtor: [],
|
|
97
107
|
f_user_type: '',
|
|
98
108
|
orgCondtionStr: '1=1',
|
|
99
|
-
model: new DataModel('rs/report/aonstruction_fee', {startDate: 'this.model.startDate', endDate: 'this.model.endDate'}),
|
|
109
|
+
model: new DataModel('rs/report/aonstruction_fee', {startDate: 'this.model.startDate', endDate: 'this.model.endDate', filiale: 'this.model.filiale'}),
|
|
100
110
|
reportStr: null,
|
|
101
|
-
spans: 0
|
|
111
|
+
spans: 0,
|
|
112
|
+
userid: this.$login.f.id,
|
|
113
|
+
source: `tool.getFullTree(this.getRights().where(row.getType() != $zone$).where(row.getType() != $role$))`
|
|
102
114
|
}
|
|
103
115
|
},
|
|
104
116
|
ready () {
|
|
@@ -106,6 +118,13 @@ export default {
|
|
|
106
118
|
this.$refs.paged.$refs.criteria.model.endDate = this.$login.toStandardDateString() + ' 23:59:59'
|
|
107
119
|
},
|
|
108
120
|
methods: {
|
|
121
|
+
getRes (obj) {
|
|
122
|
+
this.filialeNameStr = obj.res
|
|
123
|
+
this.filialeCodeStr = obj.resids
|
|
124
|
+
this.$refs.paged.$refs.criteria.model.filiale = obj.res
|
|
125
|
+
console.log(this.filialeNameStr)
|
|
126
|
+
console.log(this.filialeCodeStr)
|
|
127
|
+
},
|
|
109
128
|
searchData () {
|
|
110
129
|
this.$refs.paged.$refs.criteria.search()
|
|
111
130
|
},
|
|
@@ -113,11 +132,6 @@ export default {
|
|
|
113
132
|
let orgcondition = 'f_orgid in (' + this.f_orgid + ')'
|
|
114
133
|
this.$refs.paged.$refs.criteria.model.f_orgid = orgcondition
|
|
115
134
|
this.$refs.paged.search(args)
|
|
116
|
-
},
|
|
117
|
-
getRes (obj) {
|
|
118
|
-
this.orgname = obj.res[0]
|
|
119
|
-
// this.depresid = obj.resids
|
|
120
|
-
this.f_orgid = obj.resids
|
|
121
135
|
}
|
|
122
136
|
},
|
|
123
137
|
watch: {
|