manage-client-xy 3.1.87 → 3.1.88
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/build/dev-server.js +2 -2
- package/package.json +1 -1
- package/src/components/SellReport/FinancialStatement.vue +54 -2
- package/src/components/SellReport/XianYangCharge.vue +51 -0
- package/src/components/sale/config/exportConfig.js +1 -0
- package/src/components/sale/filesquery/MeterQuery.vue +6 -0
package/build/dev-server.js
CHANGED
|
@@ -11,8 +11,8 @@ var compiler = webpack(config)
|
|
|
11
11
|
// Define HTTP proxies to your custom API backend
|
|
12
12
|
// https://github.com/chimurai/http-proxy-middleware
|
|
13
13
|
// var bendi = 'http://127.0.0.1:8089/manage', fuwu = 'http://36.103.224.217:6300/'
|
|
14
|
-
var bendi = 'http://172.16.16.
|
|
15
|
-
,fuwu ='http://172.16.16.
|
|
14
|
+
var bendi = 'http://172.16.16.162:8300/'
|
|
15
|
+
,fuwu ='http://172.16.16.162:8300/'
|
|
16
16
|
// ,fuwu = 'http://172.16.16.163:8300/'
|
|
17
17
|
var proxyTable = {
|
|
18
18
|
|
package/package.json
CHANGED
|
@@ -56,6 +56,29 @@
|
|
|
56
56
|
:initresid="$parent.$parent.curorgid">
|
|
57
57
|
</res-select>
|
|
58
58
|
</div>
|
|
59
|
+
<div class="col-sm-4 ">
|
|
60
|
+
<label class="font_normal_body">用户分类</label>
|
|
61
|
+
<v-select :value.sync="model.f_user_type"
|
|
62
|
+
@change="$parent.$parent.userTypeChange"
|
|
63
|
+
:options='$parent.$parent.usertypes' placeholder='请选择' v-model="model.f_user_type"
|
|
64
|
+
condition="uf.f_user_type = '{}'"
|
|
65
|
+
close-on-select></v-select>
|
|
66
|
+
</div>
|
|
67
|
+
<div class="col-sm-4">
|
|
68
|
+
<label class="font_normal_body">用户类型</label>
|
|
69
|
+
<v-select :value.sync="model.f_user_mold"
|
|
70
|
+
@change="$parent.$parent.userMoldChange"
|
|
71
|
+
:options='$parent.$parent.usermold' placeholder='请选择' v-model="model.f_user_mold"
|
|
72
|
+
condition="uf.f_user_mold = '{}'"
|
|
73
|
+
close-on-select></v-select>
|
|
74
|
+
</div>
|
|
75
|
+
<div class="col-sm-4">
|
|
76
|
+
<label class="font_normal_body">用气性质</label>
|
|
77
|
+
<v-select :value.sync="model.f_gasproperties" v-model="model.f_gasproperties"
|
|
78
|
+
:options='$parent.$parent.gasproperties' placeholder='请选择'
|
|
79
|
+
condition="uf.f_gasproperties = '{}'"
|
|
80
|
+
close-on-select></v-select>
|
|
81
|
+
</div>
|
|
59
82
|
<div class="col-sm-4" style="float:right;">
|
|
60
83
|
<label class="font_normal_body">    </label>
|
|
61
84
|
<button class="button_search" @click="$parent.$parent.searchData()">查询</button>
|
|
@@ -169,6 +192,8 @@
|
|
|
169
192
|
curorgid: [this.$login.f.orgid],
|
|
170
193
|
operatorid: [],
|
|
171
194
|
depid: [],
|
|
195
|
+
gasproperties:[],
|
|
196
|
+
usermold:[],
|
|
172
197
|
orgname: '',
|
|
173
198
|
depname: '',
|
|
174
199
|
operatorname: '',
|
|
@@ -189,7 +214,32 @@
|
|
|
189
214
|
this.$refs.paged.$refs.criteria.search()
|
|
190
215
|
console.log(this.$login.f)
|
|
191
216
|
},
|
|
192
|
-
methods: {
|
|
217
|
+
methods: { userTypeChange () {
|
|
218
|
+
this.usermold=[]
|
|
219
|
+
this.f_gasproperties=[]
|
|
220
|
+
if(this.$refs.paged.$refs.criteria.model !== null) {
|
|
221
|
+
this.$refs.paged.$refs.criteria.model.f_gasproperties=''
|
|
222
|
+
this.$refs.paged.$refs.criteria.model.f_user_mold=''
|
|
223
|
+
this.usermold = this.$appdata.getParam(this.$refs.paged.$refs.criteria.model.f_user_type[0])
|
|
224
|
+
}
|
|
225
|
+
else{
|
|
226
|
+
this.usermold =[{label: '全部', value: ''}]
|
|
227
|
+
}
|
|
228
|
+
},
|
|
229
|
+
userMoldChange () {
|
|
230
|
+
this.gasproperties=[]
|
|
231
|
+
if(this.$refs.paged.$refs.criteria.model !==null) {
|
|
232
|
+
this.$refs.paged.$refs.criteria.model.f_gasproperties=''
|
|
233
|
+
if (this.$refs.paged.$refs.criteria.model.f_user_mold[0] ==='居民'){
|
|
234
|
+
this.gasproperties = this.$appdata.getParam(this.$refs.paged.$refs.criteria.model.f_user_type[0] + this.$refs.paged.$refs.criteria.model.f_user_mold[0])
|
|
235
|
+
return
|
|
236
|
+
}
|
|
237
|
+
this.gasproperties = this.$appdata.getParam(this.$refs.paged.$refs.criteria.model.f_user_mold[0])
|
|
238
|
+
}
|
|
239
|
+
else{
|
|
240
|
+
this.gasproperties =[{label: '全部', value: ''}]
|
|
241
|
+
}
|
|
242
|
+
},
|
|
193
243
|
getRess(obj){
|
|
194
244
|
if (obj.length > 0){
|
|
195
245
|
this.userCondition = ` info.f_orgid in ${Util.convertToIn(obj)} `
|
|
@@ -277,7 +327,9 @@
|
|
|
277
327
|
}
|
|
278
328
|
},
|
|
279
329
|
computed: {
|
|
280
|
-
|
|
330
|
+
usertypes() {
|
|
331
|
+
return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('用户类型')]
|
|
332
|
+
},
|
|
281
333
|
}
|
|
282
334
|
}
|
|
283
335
|
</script>
|
|
@@ -37,6 +37,29 @@
|
|
|
37
37
|
:initresid="$parent.$parent.curorgid">
|
|
38
38
|
</res-select>
|
|
39
39
|
</div>
|
|
40
|
+
<div class="col-sm-3 ">
|
|
41
|
+
<label class="font_normal_body">用户分类</label>
|
|
42
|
+
<v-select :value.sync="model.f_user_type"
|
|
43
|
+
@change="$parent.$parent.userTypeChange"
|
|
44
|
+
:options='$parent.$parent.usertypes' placeholder='请选择' v-model="model.f_user_type"
|
|
45
|
+
condition="uf.f_user_type = '{}'"
|
|
46
|
+
close-on-select></v-select>
|
|
47
|
+
</div>
|
|
48
|
+
<div class="col-sm-3 ">
|
|
49
|
+
<label class="font_normal_body">用户类型</label>
|
|
50
|
+
<v-select :value.sync="model.f_user_mold"
|
|
51
|
+
@change="$parent.$parent.userMoldChange"
|
|
52
|
+
:options='$parent.$parent.usermold' placeholder='请选择' v-model="model.f_user_mold"
|
|
53
|
+
condition="uf.f_user_mold = '{}'"
|
|
54
|
+
close-on-select></v-select>
|
|
55
|
+
</div>
|
|
56
|
+
<div class="col-sm-3 ">
|
|
57
|
+
<label class="font_normal_body">用气性质</label>
|
|
58
|
+
<v-select :value.sync="model.f_gasproperties" v-model="model.f_gasproperties"
|
|
59
|
+
:options='$parent.$parent.gasproperties' placeholder='请选择'
|
|
60
|
+
condition="uf.f_gasproperties = '{}'"
|
|
61
|
+
close-on-select></v-select>
|
|
62
|
+
</div>
|
|
40
63
|
</div>
|
|
41
64
|
<div class="row" style="text-align: right">
|
|
42
65
|
<div class="span col-sm-3"></div>
|
|
@@ -149,6 +172,8 @@
|
|
|
149
172
|
printTime: this.$login.toStandardTimeString(),
|
|
150
173
|
depresid: [],
|
|
151
174
|
userresid: [],
|
|
175
|
+
gasproperties:[],
|
|
176
|
+
usermold:[],
|
|
152
177
|
curorgid: [this.$login.f.orgid],
|
|
153
178
|
f_orgid: this.$login.f.orgid,
|
|
154
179
|
f_depid: this.$login.f.depids,
|
|
@@ -179,6 +204,32 @@
|
|
|
179
204
|
console.log(this.$login.f)
|
|
180
205
|
},
|
|
181
206
|
methods: {
|
|
207
|
+
userTypeChange () {
|
|
208
|
+
this.usermold=[]
|
|
209
|
+
this.f_gasproperties=[]
|
|
210
|
+
if(this.$refs.paged.$refs.criteria.model !== null) {
|
|
211
|
+
this.$refs.paged.$refs.criteria.model.f_gasproperties=''
|
|
212
|
+
this.$refs.paged.$refs.criteria.model.f_user_mold=''
|
|
213
|
+
this.usermold = this.$appdata.getParam(this.$refs.paged.$refs.criteria.model.f_user_type[0])
|
|
214
|
+
}
|
|
215
|
+
else{
|
|
216
|
+
this.usermold =[{label: '全部', value: ''}]
|
|
217
|
+
}
|
|
218
|
+
},
|
|
219
|
+
userMoldChange () {
|
|
220
|
+
this.gasproperties=[]
|
|
221
|
+
if(this.$refs.paged.$refs.criteria.model !==null) {
|
|
222
|
+
this.$refs.paged.$refs.criteria.model.f_gasproperties=''
|
|
223
|
+
if (this.$refs.paged.$refs.criteria.model.f_user_mold[0] ==='居民'){
|
|
224
|
+
this.gasproperties = this.$appdata.getParam(this.$refs.paged.$refs.criteria.model.f_user_type[0] + this.$refs.paged.$refs.criteria.model.f_user_mold[0])
|
|
225
|
+
return
|
|
226
|
+
}
|
|
227
|
+
this.gasproperties = this.$appdata.getParam(this.$refs.paged.$refs.criteria.model.f_user_mold[0])
|
|
228
|
+
}
|
|
229
|
+
else{
|
|
230
|
+
this.gasproperties =[{label: '全部', value: ''}]
|
|
231
|
+
}
|
|
232
|
+
},
|
|
182
233
|
getRes(obj) {
|
|
183
234
|
this.orgname = obj.res[0]
|
|
184
235
|
this.depresid = obj.resids
|
|
@@ -249,6 +249,9 @@
|
|
|
249
249
|
<th>
|
|
250
250
|
<nobr>累购气量</nobr>
|
|
251
251
|
</th>
|
|
252
|
+
<th>
|
|
253
|
+
<nobr>规模量</nobr>
|
|
254
|
+
</th>
|
|
252
255
|
<th>
|
|
253
256
|
<nobr>客户类型</nobr>
|
|
254
257
|
</th>
|
|
@@ -317,6 +320,9 @@
|
|
|
317
320
|
<td style="text-align: center;">
|
|
318
321
|
<nobr>{{row.f_total_gas}}</nobr>
|
|
319
322
|
</td>
|
|
323
|
+
<td style="text-align: center;">
|
|
324
|
+
<nobr>{{row.guimo}}</nobr>
|
|
325
|
+
</td>
|
|
320
326
|
<td style="text-align: center;">
|
|
321
327
|
<nobr>{{row.f_user_type}}</nobr>
|
|
322
328
|
</td>
|