manage-client 3.2.266 → 3.2.268
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/sale/filesquery/RecordInfoQuery.vue +40 -1
- package/src/filiale/rongcheng/MeterQuery.vue +42 -0
- package/src/filiale/wenxi/WebHandQuery.vue +11 -3
- package/src/filiale/wenxi/config/exportConfig.js +2 -2
- package/src/filiale/yuansheng/DayReportList.vue +2 -0
package/build/dev-server.js
CHANGED
|
@@ -19,9 +19,9 @@ var qtx= 'http://36.103.222.144:6300/'
|
|
|
19
19
|
// var bendi = 'http://203.57.101.233:8400/'
|
|
20
20
|
// var bendi = 'http://121.36.106.17:8400/'
|
|
21
21
|
// var fuwu = 'http://203.57.101.233:9001'
|
|
22
|
-
var bendi = 'http://
|
|
22
|
+
var bendi = 'http://61.240.138.248:8400'
|
|
23
23
|
// var bendi = 'http://119.187.112.234:8400/'
|
|
24
|
-
var wode = 'http://
|
|
24
|
+
var wode = 'http://61.240.138.248:8400'
|
|
25
25
|
// 192.168.
|
|
26
26
|
// var str = 'http://127.0.0.1:8080/manage', str2 = 'http://192.168.50.199:8300'
|
|
27
27
|
// var str = 'http://192.168.10.233:8300', str2 = 'http://192.168.10.14:8300'
|
package/package.json
CHANGED
|
@@ -142,9 +142,19 @@
|
|
|
142
142
|
<label class="font_normal_body">气表品牌</label>
|
|
143
143
|
<v-select :value.sync="model.f_meter_brand"
|
|
144
144
|
v-model="model.f_meter_brand" multiple
|
|
145
|
+
@change="$parent.$parent.getMeterStyle"
|
|
145
146
|
:options='$parent.$parent.meterbrands' placeholder='请选择'
|
|
146
147
|
condition="f_meter_brand in {}"
|
|
147
|
-
|
|
148
|
+
></v-select>
|
|
149
|
+
</div>
|
|
150
|
+
|
|
151
|
+
<div class="col-sm-2 form-group">
|
|
152
|
+
<label class="font_normal_body">气表型号</label>
|
|
153
|
+
<v-select :value.sync="model.f_meter_style"
|
|
154
|
+
v-model="model.f_meter_style" multiple
|
|
155
|
+
:options='$parent.$parent.meterStyle' placeholder='请选择'
|
|
156
|
+
condition="f_meter_style in {}"
|
|
157
|
+
></v-select>
|
|
148
158
|
</div>
|
|
149
159
|
<div class="col-sm-2 form-group">
|
|
150
160
|
<label class="font_normal_body">表  号</label>
|
|
@@ -931,6 +941,7 @@
|
|
|
931
941
|
sumsmodel: {},
|
|
932
942
|
//表册片区
|
|
933
943
|
bookSlice:[{label: '全部',value: ''}],
|
|
944
|
+
meterStyle:[{label: '全部',value: ''}],
|
|
934
945
|
pricenames:[],
|
|
935
946
|
dypayment:[{label:"全部",value:""},{label:"银行代扣",value:"银行代扣",},{label:"现金缴费",value:"现金缴费",}],
|
|
936
947
|
networkvalves: this.$appdata.getParam('自动阀控') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('自动阀控')] : [],
|
|
@@ -946,6 +957,34 @@
|
|
|
946
957
|
})
|
|
947
958
|
},
|
|
948
959
|
methods: {
|
|
960
|
+
recombine (param) {
|
|
961
|
+
// 条件拼接数据，多用于in （）。将数组转成字符串时加上单引号处理
|
|
962
|
+
let str = ''
|
|
963
|
+
if (param && param.length > 0) {
|
|
964
|
+
param.forEach((p) => {
|
|
965
|
+
str += `'${p}',`
|
|
966
|
+
})
|
|
967
|
+
}
|
|
968
|
+
return `(${str.substring(0, str.length - 1)})`
|
|
969
|
+
},
|
|
970
|
+
async getMeterStyle(val){
|
|
971
|
+
if (val.length > 0){
|
|
972
|
+
// 获取气表型号下拉框
|
|
973
|
+
let HttpReset = new HttpResetClass()
|
|
974
|
+
let param = {
|
|
975
|
+
items: 'distinct f_meter_style',
|
|
976
|
+
tablename: 't_gasmodel gm left join t_gasbrand tg on gm.f_gasbrand_id = tg.id',
|
|
977
|
+
condition: `tg.f_meter_brand in ${this.recombine(val)}`,
|
|
978
|
+
orderitem: 'f_meter_style'
|
|
979
|
+
}
|
|
980
|
+
let data = await HttpReset.load('POST', 'rs/sql/manage_singleTable', {data: param}, {resolveMsg: null, rejectMsg: '获取设备列表失败!'})
|
|
981
|
+
for (let row of data.data) {
|
|
982
|
+
this.meterStyle.push({label: row.f_meter_style, value: row.f_meter_style})
|
|
983
|
+
}
|
|
984
|
+
} else {
|
|
985
|
+
this.meterStyle = [{label: '全部',value: ''}]
|
|
986
|
+
}
|
|
987
|
+
},
|
|
949
988
|
ReadIDCard(){
|
|
950
989
|
this.$refs.highcard.sendMsg(this.$refs.highcard.CLT_MSG.READ_IDCARD, (msg) => {
|
|
951
990
|
console.log('======',msg)
|
|
@@ -221,6 +221,27 @@
|
|
|
221
221
|
condition="f_networkvalve='{}'">
|
|
222
222
|
</v-select>
|
|
223
223
|
</div>
|
|
224
|
+
<div class="col-sm-2 form-group">
|
|
225
|
+
<label class="font_normal_body">流量计品牌</label>
|
|
226
|
+
<v-select placeholder='流量计品牌' :value.sync="model.f_llj_brand" style="width:60%"
|
|
227
|
+
v-model="model.f_llj_brand" :options='$parent.$parent.lljbrand' close-on-select
|
|
228
|
+
condition="f_llj_brand='{}'">
|
|
229
|
+
</v-select>
|
|
230
|
+
</div>
|
|
231
|
+
<div class="col-sm-2 form-group">
|
|
232
|
+
<label class="font_normal_body">流量计类型</label>
|
|
233
|
+
<v-select placeholder='流量计类型' :value.sync="model.f_llj_type" style="width:60%"
|
|
234
|
+
v-model="model.f_llj_type" :options='$parent.$parent.lljtype' close-on-select
|
|
235
|
+
condition="f_llj_type='{}'">
|
|
236
|
+
</v-select>
|
|
237
|
+
</div>
|
|
238
|
+
<div class="col-sm-2 form-group">
|
|
239
|
+
<label class="font_normal_body">气表流量</label>
|
|
240
|
+
<v-select placeholder='气表流量' :value.sync="model.f_meter_flow" style="width:60%"
|
|
241
|
+
v-model="model.f_meter_flow" :options='$parent.$parent.meterflow' close-on-select
|
|
242
|
+
condition="f_meter_flow='{}'">
|
|
243
|
+
</v-select>
|
|
244
|
+
</div>
|
|
224
245
|
</div>
|
|
225
246
|
</div>
|
|
226
247
|
</criteria>
|
|
@@ -292,6 +313,15 @@
|
|
|
292
313
|
<th>
|
|
293
314
|
<nobr>气表型号</nobr>
|
|
294
315
|
</th>
|
|
316
|
+
<th>
|
|
317
|
+
<nobr>流量计品牌</nobr>
|
|
318
|
+
</th>
|
|
319
|
+
<th>
|
|
320
|
+
<nobr>流量计类型</nobr>
|
|
321
|
+
</th>
|
|
322
|
+
<th>
|
|
323
|
+
<nobr>气表流量</nobr>
|
|
324
|
+
</th>
|
|
295
325
|
<th>
|
|
296
326
|
<nobr>用气类型</nobr>
|
|
297
327
|
</th>
|
|
@@ -386,6 +416,15 @@
|
|
|
386
416
|
<td :class="row.f_table_state !== '正常' ? 'back-red' : 'back-blue'" style="text-align: center;">
|
|
387
417
|
<nobr>{{ row.f_meter_style }}</nobr>
|
|
388
418
|
</td>
|
|
419
|
+
<td :class="row.f_table_state !== '正常' ? 'back-red' : 'back-blue'" style="text-align: center;">
|
|
420
|
+
<nobr>{{ row.f_llj_brand }}</nobr>
|
|
421
|
+
</td>
|
|
422
|
+
<td :class="row.f_table_state !== '正常' ? 'back-red' : 'back-blue'" style="text-align: center;">
|
|
423
|
+
<nobr>{{ row.f_llj_type }}</nobr>
|
|
424
|
+
</td>
|
|
425
|
+
<td :class="row.f_table_state !== '正常' ? 'back-red' : 'back-blue'" style="text-align: center;">
|
|
426
|
+
<nobr>{{ row.f_meter_flow }}</nobr>
|
|
427
|
+
</td>
|
|
389
428
|
<td :class="row.f_table_state !== '正常' ? 'back-red' : 'back-blue'" style="text-align: center;">
|
|
390
429
|
<nobr>{{ row.f_gongye_type }}</nobr>
|
|
391
430
|
</td>
|
|
@@ -567,6 +606,9 @@ export default {
|
|
|
567
606
|
label: '全部',
|
|
568
607
|
value: ''
|
|
569
608
|
}, ...this.$appdata.getParam('自动阀控')] : [],
|
|
609
|
+
lljbrand: this.$appdata.getParam('流量计品牌'),
|
|
610
|
+
lljtype: this.$appdata.getParam('流量计类型'),
|
|
611
|
+
meterflow: this.$appdata.getParam('气表流量')
|
|
570
612
|
}
|
|
571
613
|
},
|
|
572
614
|
ready() {
|
|
@@ -60,6 +60,14 @@
|
|
|
60
60
|
close-on-select>
|
|
61
61
|
</v-select>
|
|
62
62
|
</div>
|
|
63
|
+
<div class="col-sm-2 form-group">
|
|
64
|
+
<label class="font_normal_body">客户类型</label>
|
|
65
|
+
<v-select :value.sync="model.f_user_type"
|
|
66
|
+
:options='$parent.$parent.usertypes' placeholder='请选择' v-model="model.f_user_type"
|
|
67
|
+
condition="f_user_type = '{}'"
|
|
68
|
+
close-on-select></v-select>
|
|
69
|
+
</div>
|
|
70
|
+
|
|
63
71
|
<div class="col-sm-2 form-group">
|
|
64
72
|
<label class="font_normal_body">气价名称</label>
|
|
65
73
|
<v-select :value.sync="model.f_price_name"
|
|
@@ -194,10 +202,10 @@
|
|
|
194
202
|
<th style="text-align:center"><nobr>{{row.f_hand_date}}</nobr></th>
|
|
195
203
|
<th style="text-align:center"><nobr>{{row.f_total_fee}}</nobr></th>
|
|
196
204
|
<th style="text-align:center"><nobr>{{row.f_total_gas}}</nobr></th>
|
|
197
|
-
<th style="text-align:center"><nobr>{{row.
|
|
205
|
+
<th style="text-align:center"><nobr>{{row.f_curbalance}}</nobr></th>
|
|
198
206
|
<th style="text-align:center"><nobr>{{row.f_jval}}</nobr></th>
|
|
199
|
-
<th style="text-align:center"><nobr>{{row.
|
|
200
|
-
<th style="text-align:center"><nobr>{{row.
|
|
207
|
+
<th style="text-align:center"><nobr>{{row.cyclegas}}</nobr></th>
|
|
208
|
+
<th style="text-align:center"><nobr>{{row.cyclefee}}</nobr></th>
|
|
201
209
|
<th style="text-align:center"><nobr>{{row.f_oughtamount}}</nobr></th>
|
|
202
210
|
<th style="text-align:center"><nobr>{{row.f_oughtfee}}</nobr></th>
|
|
203
211
|
|
|
@@ -834,8 +834,8 @@ monthGasConfig: {
|
|
|
834
834
|
'f_total_fee': '累计购气金额',
|
|
835
835
|
'f_total_gas': '累计使用量',
|
|
836
836
|
'f_balance_amount': '系统余额',
|
|
837
|
-
'
|
|
838
|
-
'
|
|
837
|
+
'cyclegas': '当前周期已用气量',
|
|
838
|
+
'cyclefee': '当前周期消费金额',
|
|
839
839
|
'f_stair1price': '一阶气价',
|
|
840
840
|
'f_stairamount1': '一阶气量',
|
|
841
841
|
'f_stair1fee': '一阶金额',
|
|
@@ -40,6 +40,7 @@
|
|
|
40
40
|
<label class="font_normal_body">操作类型</label>
|
|
41
41
|
<v-select :value.sync="model.f_type" v-model="model.f_type"
|
|
42
42
|
:options='$parent.$parent.operates' placeholder='请选择'
|
|
43
|
+
condition="f_type = '{}'"
|
|
43
44
|
close-on-select></v-select>
|
|
44
45
|
</div>
|
|
45
46
|
<div :class="$parent.$parent.style">
|
|
@@ -294,6 +295,7 @@ export default {
|
|
|
294
295
|
readyGen(this)
|
|
295
296
|
this.$refs.paged.$refs.cri.condition += this.orgCondtionStr
|
|
296
297
|
this.$refs.paged.$refs.cri.model.f_hasapp = [`!= '悦生活'`]
|
|
298
|
+
this.$refs.paged.$refs.cri.model.f_type = ['卡表收费']
|
|
297
299
|
this.$refs.paged.$refs.cri.model.f_startDate = this.$login.toStandardDateString()
|
|
298
300
|
this.$refs.paged.$refs.cri.model.f_endDate = this.$login.toStandardDateString()
|
|
299
301
|
// this.search()
|