manage-client 3.3.130 → 3.3.132

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
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "manage-client",
3
- "version": "3.3.130",
3
+ "version": "3.3.132",
4
4
  "description": "经营管控模块前台组件",
5
5
  "main": "src/index.js",
6
6
  "directories": {
@@ -354,7 +354,7 @@
354
354
  str = str.replace(/\[/g,``)
355
355
  str = str.replace(/\]/g,``)
356
356
  //查询多个抄表员时条件
357
- args.condition += ` and f_inputtor in ( ${str} )`
357
+ this.orgCondtionStr += ` and f_inputtor in ( ${str} )`
358
358
  }
359
359
 
360
360
  args.condition = `${args.condition} ` + this.orgCondtionStr
@@ -176,7 +176,7 @@ export default{
176
176
  'f_gasproperties': '用气性质', 'f_comments': '备注', 'c': '欠费期数', 'f_hand_date': '欠费区间', 'f_oughtamount': '用气量',
177
177
  'f_oughtfee': '用气金额', 'f_debt_money': '已交金额', 'f_oughtfee_new': '应交气费',
178
178
  'overdue': '违约金', 'f_garbage_fee': '附加费', 'f_last_tablebase': '上期抄表底数', 'f_tablebase': '本期抄表底数',
179
- 'f_oughtfee_all': '合计欠费金额','f_oughtfee_col': '实际欠费金额', 'f_cost_type': '缴费方式', 'f_meter_type': '气表类型'
179
+ 'f_oughtfee_all': '合计欠费金额', 'f_cost_type': '缴费方式', 'f_meter_type': '气表类型'
180
180
  },
181
181
  areaChargeQueryConfig: {
182
182
  'f_residential_area': '小区','f_price': '单价','f_gas': '购气方量','f_money': '购气金额'
@@ -450,11 +450,11 @@ export default{
450
450
  'f_userinfo_code': '客户编号', 'f_newuser_name': '客户名称', 'f_olduserinfo_code': '档案编号', 'f_address': '客户地址',
451
451
  'f_user_name': '原客户名称', 'f_newuser_phone': '新客户电话', 'f_newidnumber': '新客户身份证', 'f_user_phone': '原客户电话',
452
452
  'f_idnumber': '原客户身份证', 'f_transfer_fees': '过户费', 'f_contract_id': '合同编号', 'f_operate_date': '过户日期',
453
- 'f_operator': '操作员', 'f_depname': '部门', 'f_orgname': '公司', 'f_meternumber': '表号', 'f_comments': '备注'
453
+ 'f_operator': '操作员', 'f_depname': '部门', 'f_orgname': '公司', 'f_meternumber': '表号', 'f_comments': '备注', 'hushu': '户数'
454
454
  },
455
455
  transferRecordConfig: {
456
456
  'in_userinfo_code': '转入方编号', 'in_user_name': '转入方名称', 'out_userinfo_code': '转出方编号', 'out_user_name': '转出方名称',
457
- 'f_operate_date': '转移日期', 'f_operator': '操作员', 'f_depname': '部门', 'f_orgname': '公司'
457
+ 'f_operate_date': '转移日期', 'f_operator': '操作员', 'f_depname': '部门', 'f_orgname': '公司'
458
458
  },
459
459
  transferPrintConfig: {
460
460
  'f_userinfo_code': '客户编号', 'f_newuser_name': '客户名称', 'f_address': '客户地址',
@@ -464,7 +464,7 @@ export default{
464
464
  'f_userinfo_code': '客户编号', 'f_user_name': '客户名称', 'f_olduserinfo_code': '档案编号', 'f_user_type': '客户类型', 'f_user_phone': '客户电话', 'f_address': '客户地址',
465
465
  'f_card_id': '卡号', 'f_meter_brand': '气表品牌', 'f_type': '补气类型', 'f_comments': '补气原因',
466
466
  'f_pregas': '补气量', 'f_preamount': '补气金额', 'f_operate_date': '补气日期',
467
- 'f_operator': '操作员', 'f_depname': '部门', 'f_orgname': '公司', 'f_meternumber': '表号'
467
+ 'f_operator': '操作员', 'f_depname': '部门', 'f_orgname': '公司', 'f_meternumber': '表号', 'hushu': '户数'
468
468
  },
469
469
 
470
470
  fillcardConfig: {
@@ -304,7 +304,9 @@ export default {
304
304
  this.show = false
305
305
  },
306
306
  clearmsg() {
307
- this.$refs.paged.$refs.cri.model = {}
307
+ Object.keys(this.$refs.paged.$refs.cri.model).forEach((key) => {
308
+ this.$refs.paged.$refs.cri.model[key] = []
309
+ })
308
310
  },
309
311
  wai_search(obj) {
310
312
  console.log(obj)
@@ -272,8 +272,10 @@ export default {
272
272
  close() {
273
273
  this.show = false
274
274
  },
275
- clearmsg() {
276
- this.$refs.paged.$refs.cri.model = {}
275
+ clearmsg () {
276
+ Object.keys(this.$refs.paged.$refs.cri.model).forEach((key) => {
277
+ this.$refs.paged.$refs.cri.model[key] = []
278
+ })
277
279
  },
278
280
  search(args) {
279
281
  this.startDate = this.$refs.paged.$refs.cri.model.startDate
@@ -0,0 +1,316 @@
1
+ <template>
2
+ <div id="unit" class="flex-row">
3
+ <div class="basic-main">
4
+ <div class="flex" v-if="!show">
5
+ <criteria-paged :model="model" v-ref:paged>
6
+ <criteria partial='criteria' v-ref:criteria @condition-changed='$parent.search'>
7
+ <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
8
+ <div class="row" >
9
+ <div class="col-sm-2">
10
+ <label class="font_normal_body">组织机构</label>
11
+ <res-select :initresid="$parent.$parent.org"
12
+ style="width:60%"
13
+ @res-select="$parent.$parent.getorg"
14
+ :is-mul=false
15
+ restype='organization'>
16
+ </res-select>
17
+ </div>
18
+ <div class="col-sm-2">
19
+ <label class="font_normal_body">表&nbsp;钢&nbsp;号&nbsp;</label>
20
+ <input @keyup.enter="search" style="width:60%" type="text" class="input_search" v-model="model.f_meternumber" placeholder='表钢号'
21
+ condition="m.f_meternumber = '{}'" v-next-el='meternumber' v-el:meternumber
22
+ >
23
+ </div>
24
+ <div class="col-sm-2">
25
+ <label class="font_normal_body">客户编号</label>
26
+ <input @keyup.enter="search" style="width:60%" type="text" class="input_search" v-model="model.f_userinfo_code" placeholder='客户编号'
27
+ condition="ui.f_userinfo_code = '{}'" v-next-el='f_userinfo_code' v-el:meternumber
28
+ >
29
+ </div>
30
+ <div class="col-sm-2">
31
+ <label class="font_normal_body">客户名称</label>
32
+ <input @keyup.enter="search" style="width:60%" type="text" class="input_search" v-model="model.f_username" placeholder='客户名称'
33
+ condition="ui.f_user_name like '%{}%'" v-next-el='userid' v-el:username>
34
+ </div>
35
+
36
+ <div class="span" style="float:right;margin-top:10px">
37
+ <button class="button_search button_spacing" @click="search()">查询</button>
38
+ <button class="button_clear button_spacing" @click="$parent.$parent.clearmsg">清空</button>
39
+ <export-excel :data="$parent.$parent.getCondition" class="button_export button_spacing"
40
+ :field="$parent.$parent.getfield"
41
+ sqlurl="rs/logic/exportfile" sql-name="manage_getReportDetail" template-name='上报数据明细'
42
+ :choose-col="true"></export-excel>
43
+ <div style="float: right" class="button_spacing" :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}" @click="$parent.$parent.hidden()"></div>
44
+ </div>
45
+ </div>
46
+ <div class="row" v-show="$parent.$parent.criteriaShow">
47
+ <div class="col-sm-2">
48
+ <label class="font_normal_body">客户地址</label>
49
+ <input @keyup.enter="search" style="width:60%" type="text" class="input_search" v-model="model.f_address" placeholder='客户地址'
50
+ condition="ua.f_address like '%{}%'" v-next-el='userid' v-el:username>
51
+ </div>
52
+ <div class="col-sm-2 form-group">
53
+ <label class="font_normal_body">客户类型</label>
54
+ <v-select :value.sync="model.f_user_type"
55
+ @change="$parent.$parent.userTypeChange()"
56
+ :options='$parent.$parent.usertypes' placeholder='请选择' v-model="model.f_user_type"
57
+ condition="uf.f_user_type = '{}'"
58
+ close-on-select></v-select>
59
+ </div>
60
+ <div class="col-sm-2 form-group">
61
+ <label class="font_normal_body">用气性质</label>
62
+ <v-select :value.sync="model.f_gasproperties" v-model="model.f_gasproperties"
63
+ :options='$parent.$parent.gasproperties' placeholder='请选择'
64
+ condition="uf.f_gasproperties = '{}'"
65
+ closfe-on-select></v-select>
66
+ </div>
67
+
68
+ <div class="col-sm-2 form-group">
69
+ <label class="font_normal_body">气表品牌</label>
70
+ <v-select :value.sync="model.f_meter_brand"
71
+ v-model="model.f_meter_brand"
72
+ :options="$parent.$parent.meterbrands"
73
+ condition="br.f_meter_brand = '{}'"
74
+ close-on-select></v-select>
75
+ </div>
76
+ <div class="col-sm-2 form-group" >
77
+ <label class="font_normal_body" >开始时间</label>
78
+ <datepicker style="width: 60%" placeholder="大于等于"
79
+ :value.sync="model.f_start_date"
80
+ v-model="model.f_start_date"
81
+ :format="'yyyy-MM-dd HH:mm:ss'"
82
+ condition="m.f_hand_date >= '{}'"
83
+ ></datepicker>
84
+ </div>
85
+ <div class="col-sm-2 form-group" >
86
+ <label class="font_normal_body">结束时间</label>
87
+ <datepicker style="width: 60%" placeholder="小于等于"
88
+ :value.sync="model.f_end_date"
89
+ v-model="model.f_end_date"
90
+ :format="'yyyy-MM-dd HH:mm:ss'"
91
+ condition="m.f_hand_date <= '{}'"
92
+ ></datepicker>
93
+ </div>
94
+ </div>
95
+ </div>
96
+ </criteria>
97
+ <data-grid :model="model" partial='list' v-ref:grid class="list_area table_sy">
98
+ <template partial='head'>
99
+ <tr>
100
+ <th style="text-align: left;" v-for="(key,value) in $parent.$parent.$parent.ReportDetailListConfig"><nobr>{{value}}</nobr></th>
101
+ </tr>
102
+ </template>
103
+ <template partial='body' partial='list'>
104
+ <tr >
105
+ <td style="text-align: left;" v-for="(key,value) in $parent.$parent.$parent.ReportDetailListConfig"><nobr>{{row[key]}}</nobr></td>
106
+ </tr>
107
+ </template>
108
+ <template partial='foot'></template>
109
+ </data-grid>
110
+ </criteria-paged>
111
+ <table class="table-hover">
112
+ </table>
113
+ </div>
114
+ </div>
115
+
116
+ </div>
117
+ </template>
118
+
119
+ <script>
120
+ import {HttpResetClass, PagedList} from 'vue-client'
121
+ import plugins from '../../../plugins/GetLoginInfoService'
122
+ import * as Util from '../../../Util'
123
+
124
+ let readySomething = async function (self) {
125
+ await self.$MagLoadParams.loadParam()
126
+ self.initParams()
127
+ }
128
+ export default {
129
+ title: '上报数据明细',
130
+ data () {
131
+ return {
132
+ show:false,
133
+ detail24: false,
134
+ org:[this.$login.f.orgid],
135
+ orgcondition: ' and m.f_orgid = ' + this.$login.f.orgid,
136
+ detaillist: [],
137
+ meterbrands: [],
138
+ prices: [],
139
+ gasproperties:[],
140
+ condition:'',
141
+ rowdata:{},
142
+ sumsmodel: {},
143
+ ReportDetailListConfig: {
144
+ 'f_userinfo_code': '客户编号', 'f_meternumber': '表号', 'f_user_name': '客户姓名', 'f_user_phone': '客户电话', 'f_address': '客户地址',
145
+ 'f_hand_date': '上报日期', 'f_meter_brand': '气表品牌', 'f_readData1': '上传协议版本号', 'f_readData2': '通信信号值', 'f_readData3': '铭牌号',
146
+ 'f_readData4': '通信模式', 'f_readData5': 'IC卡编号', 'f_readData6': '购气次数','f_readData7': '剩余金额/量', 'f_readData8': '总累计用气量',
147
+ 'f_readData9': '总累计用气金额','f_readData10': '总累计购气金额/量', 'f_readData11': '计费周期累计用气量', 'f_readData12': '当前透支金额/量', 'f_readData13': '阀门状态',
148
+ 'f_readData14': '主电电压','f_readData15': '备电电压', 'f_readData16': '软件版本', 'f_readData17': '硬件版本', 'f_readData18': '当前RTC时钟'
149
+ },
150
+ orgid:[this.$login.f.orgid],
151
+ criteriaShow:false,
152
+ orgCondtionStr: '',
153
+ model: new PagedList('rs/sql/manage_getReportDetail', 50,{startDate: 'this.model.f_start_date', endDate: 'this.model.f_end_date'})
154
+ }
155
+ },
156
+ ready () {
157
+ // this.$refs.paged.$refs.criteria.search()
158
+ readySomething(this).then(() => {
159
+ this.$emit('ready')
160
+ }).catch((error) => {
161
+ this.$emit('error', error)
162
+ })
163
+ this.$refs.paged.$refs.criteria.model.f_start_date = Util.addDate(new Date(),-1).substring(0,10) + ' 00:00:00'
164
+ this.$refs.paged.$refs.criteria.model.f_end_date = Util.addDate(new Date(),-1).substring(0,10) + ' 23:59:59'
165
+ },
166
+ methods: {
167
+ initParams() {
168
+ // 初始化气表品牌
169
+ let brandArr = []
170
+ this.$MagGetSaleParam.getGasbrand().forEach((item) => {
171
+ let temp = {}
172
+ if(item.value.f_meter_type==='物联网表'){
173
+ temp.label = item.label
174
+ temp.value = item.value.f_meter_brand
175
+ brandArr.push(temp )
176
+ }
177
+
178
+ })
179
+ this.meterbrands = [{label: '全部', value: ''}, ...brandArr]
180
+ //初始化气表价格
181
+ this.prices = this.$MagGetSaleParam.getPrices();
182
+ },
183
+ async updateParams() {
184
+ await this.$MagLoadParams.loadParam(this.f_filialeid)
185
+ this.initParams()
186
+ },
187
+ getorg(obj) {
188
+ if(plugins.convertToIn(obj)!==null&&plugins.convertToIn(obj)!==''){
189
+ this.orgcondition = " and m.f_orgid in " + plugins.convertToIn(obj)
190
+ }else{
191
+ this.orgcondition = " and m.f_orgid = " + this.$login.f.orgid
192
+ }
193
+
194
+ },
195
+ userTypeChange () {
196
+ this.gasproperties=[]
197
+ if(this.$refs.paged.$refs.criteria.model !==null) {
198
+ this.$refs.paged.$refs.criteria.model.f_gasproperties=''
199
+ this.gasproperties = this.$appdata.getParam(this.$refs.paged.$refs.criteria.model.f_user_type[0])
200
+ }
201
+ else{
202
+ this.gasproperties =[{label: '全部', value: ''}]
203
+ }
204
+ },
205
+ hidden(){
206
+ this.criteriaShow = !this.criteriaShow
207
+ },
208
+ cancel() {
209
+ this.show = false
210
+ },
211
+ clearmsg () {
212
+ Object.keys(this.$refs.paged.$refs.criteria.model).forEach((key) => {
213
+ this.$refs.paged.$refs.criteria.model[key] = []
214
+ })
215
+ },
216
+ getRes (obj) {
217
+ this.orgCondtionStr = condition
218
+ this.orgname = obj.orgnames[0]
219
+ this.depname = obj.depnames[0]
220
+ },
221
+ showmsg(obj){
222
+ this.rowdata=obj
223
+ this.show=true
224
+ },
225
+
226
+ search (args) {
227
+ args.condition = `${args.condition}`+this.orgcondition
228
+ console.log(args.condition+"args.condition")
229
+ this.condition = args.condition
230
+ this.model.search(args.condition, args.model)
231
+ }
232
+ },
233
+ watch: {
234
+ 'orgCondtionStr'(val) {
235
+ let res = val.match(/'(.*?)'/)
236
+ console.log('正则提取:',res && res[1])
237
+ if (res) {
238
+ this.f_filialeid = res[1]
239
+ // this.updateParams()
240
+ }
241
+ }
242
+ },
243
+ computed: {
244
+ getPricenames() {
245
+ let f_user_type = this.$refs.paged.$refs.criteria.model.f_user_type;
246
+ let f_gasproperties = this.$refs.paged.$refs.criteria.model.f_gasproperties;
247
+ let pricetype = this.$refs.paged.$refs.criteria.model.pricetype;
248
+ console.log("打印一下:",f_user_type,f_gasproperties,pricetype,this.f_filialeid,this.prices)
249
+ console.log("查看f_orgid:",this.$login.f.f_orgid)
250
+ if(this.$refs.paged.$refs.criteria.model !==null) {
251
+ let rs = []
252
+ let priceArr = []
253
+ if ( pricetype.length >0) {
254
+ let params = {
255
+ f_price_type: pricetype[0],
256
+ filter: this.org[0],
257
+ prices: this.prices
258
+ }
259
+ console.log("打印一下params:",params)
260
+ this.$MagGetSaleParam.getPrice(params).forEach((item) => {
261
+ console.log("====================================》")
262
+ let temp = {}
263
+ temp.label = item.label
264
+ temp.value = item.value.f_price_name
265
+ priceArr.push(temp)
266
+ console.log("打印一下temp:",temp)
267
+ })
268
+
269
+ rs = [{label: '全部', value: ''}, ...priceArr]
270
+ }
271
+ if (rs.length === 0) {
272
+ console.log('rs读出来是空')
273
+ this.$refs.paged.$refs.criteria.model.f_price_name = ''
274
+ }
275
+ return rs
276
+ }
277
+ },
278
+ getfield () {
279
+ return this.ReportDetailListConfig
280
+ },
281
+ usertypes() {
282
+ return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('用户类型')]
283
+ },
284
+ pricetypes() {
285
+ return [{label: '全部', value: ''}, ...this.$appdata.getParam('气价类型')]
286
+ },
287
+ getCondition () {
288
+ var con = ""
289
+ if (this.orgCondtionStr) {
290
+ con = `${this.$refs.paged.$refs.criteria.condition} `+this.orgcondition
291
+ }
292
+ else {
293
+ con = `${this.$refs.paged.$refs.criteria.condition} `+this.orgcondition
294
+ }
295
+ return {
296
+ startDate: this.$refs.paged.$refs.criteria.model.f_start_date,
297
+ endDate: this.$refs.paged.$refs.criteria.model.f_end_date,
298
+ condition: con
299
+ }
300
+ }
301
+ }
302
+ }
303
+ </script>
304
+
305
+ <style>
306
+ .mystyle{
307
+ margin-left:80px;
308
+ }
309
+ .datapanel {
310
+ color: #333;
311
+ background-color: white;
312
+ box-shadow: darkgrey 0.5px 0.5px 0.5px 0.5px ;
313
+ padding: 10px 10px 10px 10px;
314
+ border-radius:15px;
315
+ }
316
+ </style>
@@ -52,23 +52,23 @@
52
52
  <input type="text" style="width:60%" class="input_search" v-model="model.f_user_name"
53
53
  condition="f_user_name = '{}'" placeholder="客户名称">
54
54
  </div>
55
- <div class="col-sm-2 form-group">
56
- <label class="font_normal_body">用户类型</label>
57
- <v-select :value.sync="model.f_user_type"
58
- @change="$parent.$parent.userTypeChange()"
59
- :options='$parent.$parent.usertypes' placeholder='请选择' v-model="model.f_user_type"
60
- condition="f_user_type = '{}'"
61
- close-on-select>
62
- </v-select>
63
- </div>
64
- <div class="col-sm-2 form-group">
65
- <label class="font_normal_body">用气性质</label>
66
- <v-select :value.sync="model.f_gasproperties"
67
- v-model="model.f_gasproperties"
68
- :options='$parent.$parent.gasproperties' placeholder='请选择'
69
- condition=" f_gasproperties = '{}'"
70
- close-on-select></v-select>
71
- </div>
55
+ <!-- <div class="col-sm-2 form-group">-->
56
+ <!-- <label class="font_normal_body">用户类型</label>-->
57
+ <!-- <v-select :value.sync="model.f_user_type"-->
58
+ <!-- @change="$parent.$parent.userTypeChange()"-->
59
+ <!-- :options='$parent.$parent.usertypes' placeholder='请选择' v-model="model.f_user_type"-->
60
+ <!-- condition="f_user_type = '{}'"-->
61
+ <!-- close-on-select>-->
62
+ <!-- </v-select>-->
63
+ <!-- </div>-->
64
+ <!-- <div class="col-sm-2 form-group">-->
65
+ <!-- <label class="font_normal_body">用气性质</label>-->
66
+ <!-- <v-select :value.sync="model.f_gasproperties"-->
67
+ <!-- v-model="model.f_gasproperties"-->
68
+ <!-- :options='$parent.$parent.gasproperties' placeholder='请选择'-->
69
+ <!-- condition=" f_gasproperties = '{}'"-->
70
+ <!-- close-on-select></v-select>-->
71
+ <!-- </div>-->
72
72
  <div class="col-sm-2 form-group">
73
73
  <label class="font_normal_body">气价类型</label>
74
74
  <v-select :value.sync="model.pricetype" v-model="model.pricetype"
@@ -253,8 +253,8 @@ export default{
253
253
 
254
254
  changemeterConfig: {
255
255
  'f_userinfo_code': '客户编号', 'f_olduserinfo_code': '档案编号', 'f_user_name': '客户名称', 'f_address': '客户地址',
256
- 'f_type': '换表类型', 'f_changemeter_fee': '换表费', 'f_meternumber_old': '旧表号', 'f_meternumber': '新表号',
257
- 'f_meter_brand_old': '旧气表品牌', 'f_meter_brand': '新气表品牌','f_factory_date':'表具生产日期','newinstall_date':'表具安装日期', 'f_remanent_gas': '补气量', 'f_remanent_money': '补气金额',
256
+ 'f_type': '换表类型', 'f_changemeter_fee': '换表费', 'f_meternumber_old': '旧表号', 'f_meternumber': '新表号', 'hushu': '户数',
257
+ 'f_meter_brand_old': '旧气表品牌', 'f_meter_brand': '新气表品牌','f_factory_date': '表具生产日期', 'newinstall_date': '表具安装日期', 'f_remanent_gas': '补气量', 'f_remanent_money': '补气金额',
258
258
  'f_comments': '备注', 'f_change_operator': '换表人', 'f_state': '状态', 'f_operate_date': '操作日期', 'f_payment': '付款方式', 'f_othereason': '换表原因',
259
259
  'f_operator': '人员', 'f_depname': '部门', 'f_orgname': '公司'
260
260
  },
@@ -35,7 +35,7 @@
35
35
  <div class="col-sm-2 form-group">
36
36
  <label class="font_normal_body">客户名称</label>
37
37
  <input type="text" style="width:60%" class="input_search" v-model="model.f_user_name"
38
- condition="f_user_name = '{}'" placeholder="客户名称">
38
+ condition="f_user_name like '%{}%'" placeholder="客户名称">
39
39
  </div>
40
40
  <div class="span" style="float:right;">
41
41
  <button class="button_search button_spacing" @click="search()">查询</button>
@@ -35,7 +35,7 @@
35
35
  <div class="col-sm-2 form-group">
36
36
  <label class="font_normal_body">客户名称</label>
37
37
  <input type="text" style="width:60%" class="input_search" v-model="model.f_user_name"
38
- condition="f_user_name = '{}'" placeholder="客户名称">
38
+ condition="f_user_name like '%{}%'" placeholder="客户名称">
39
39
  </div>
40
40
  <div class="span" style="float:right;">
41
41
  <button class="button_search button_spacing" @click="search()">查询</button>
@@ -52,7 +52,7 @@
52
52
  <div class="col-sm-2 form-group">
53
53
  <label class="font_normal_body">客户名称</label>
54
54
  <input type="text" style="width:60%" class="input_search" v-model="model.f_user_name"
55
- condition="f_user_name = '{}'" placeholder="客户名称">
55
+ condition="f_user_name like '%{}%'" placeholder="客户名称">
56
56
  </div>
57
57
  <div class="col-sm-2 form-group">
58
58
  <label class="font_normal_body">客户地址</label>
@@ -381,16 +381,11 @@
381
381
  let readySomething = async function (self) {
382
382
  self.$refs.paged.$refs.cri.model.startDate = self.data ? self.data.startDate : self.$login.toStandardDateString() + ' 00:00:00'
383
383
  self.$refs.paged.$refs.cri.model.endDate = self.data ? self.data.endDate : self.$login.toStandardDateString() + ' 23:59:59'
384
- // self.$refs.paged.$refs.cri.model.startDate = self.$login.toStandardDateString() + ' 00:00:00'
385
- // self.$refs.paged.$refs.cri.model.endDate = self.$login.toStandardDateString() + ' 23:59:59'
386
- // await self.$refs.paged.$refs.cri.search()
387
384
  await self.$getConfig(self, 'CardHandplanQuery')
388
385
  console.log('抄表查询获取默认配置', self.config)
389
386
  self.defaultfield = [...self.defaultfield, ...self.config.defaultPrint]
390
387
  console.log('开始初始化参数', self.defaultfield)
391
388
  await self.$MagLoadParams.loadParam()
392
- // await self.$MagLoadParams.loadParam()
393
- // self.initParams()
394
389
  console.log('开始查询')
395
390
  self.sumsmodel = self.$refs.paged.$refs.grid.model.sums
396
391
  }
@@ -449,8 +444,7 @@
449
444
  this.$refs.paged.$refs.cri.model.f_price_name = []
450
445
  },
451
446
  getotherfooter(){
452
- // this.$refs.paged.$refs.cri.$refs.exports.otherData=[];
453
- // this.$refs.paged.$refs.cri.$refs.exports.footerData=[];
447
+
454
448
  this.other=[];
455
449
  this.footer=[];
456
450
  let exportdata = this.getCondition;
@@ -485,9 +479,8 @@
485
479
  str = str.replace(/\[/g,``)
486
480
  str = str.replace(/\]/g,``)
487
481
  //查询多个抄表员时条件
488
- args.condition += ` and f_inputtor in ( ${str} )`
482
+ this.orgCondtionStr += ` and f_inputtor in ( ${str} )`
489
483
  }
490
-
491
484
  args.condition = `${args.condition} ` + this.orgCondtionStr
492
485
  this.model.search(args.condition, args.model)
493
486
  this.sumsmodel = this.$refs.paged.$refs.grid.model.sums
@@ -15,7 +15,7 @@
15
15
  <div class="col-sm-2 form-group" >
16
16
  <label class="font_normal_body">客户名称</label>
17
17
  <input type="text" style="width:60%" class="input_search" v-model="model.f_user_name"
18
- condition="f_user_name = '{}'" placeholder="客户名称">
18
+ condition="f_user_name like '%{}%'" placeholder="客户名称">
19
19
  </div>
20
20
  <div class="col-sm-2 form-group" >
21
21
  <label class="font_normal_body">客户电话</label>
@@ -35,7 +35,7 @@
35
35
  <div class="col-sm-2 form-group">
36
36
  <label class="font_normal_body">客户名称</label>
37
37
  <input type="text" style="width:60%" class="input_search" v-model="model.f_user_name"
38
- condition="f_user_name = '{}'" placeholder="客户名称">
38
+ condition="f_user_name like '%{}%'" placeholder="客户名称">
39
39
  </div>
40
40
 
41
41
  <div class="span" style="float:right;">
@@ -15,7 +15,7 @@
15
15
  <div class="col-sm-2 form-group">
16
16
  <label class="font_normal_body">客户名称</label>
17
17
  <input type="text" style="width:60%" class="input_search" v-model="model.f_user_name"
18
- condition="f_user_name = '{}'" placeholder="客户名称">
18
+ condition="f_user_name like '%{}%'" placeholder="客户名称">
19
19
  </div>
20
20
  <div class="col-sm-2 form-group">
21
21
  <label class="font_normal_body" title="旧客户编号">档案编号</label>
@@ -35,7 +35,7 @@
35
35
  <div class="col-sm-2 form-group">
36
36
  <label class="font_normal_body">客户名称</label>
37
37
  <input type="text" style="width:60%" class="input_search" v-model="model.f_user_name"
38
- condition="f_user_name = '{}'" placeholder="客户名称">
38
+ condition="f_user_name like '%{}%'" placeholder="客户名称">
39
39
  </div>
40
40
 
41
41
  <div class="span" style="float:right;">
@@ -15,7 +15,7 @@
15
15
  <div class="col-sm-2 form-group" >
16
16
  <label class="font_normal_body">客户名称</label>
17
17
  <input type="text" style="width:60%" class="input_search" v-model="model.f_user_name"
18
- condition="f_user_name = '{}'" placeholder="客户名称">
18
+ condition="f_user_name like '%{}%'" placeholder="客户名称">
19
19
  </div>
20
20
  <div class="col-sm-2 form-group" >
21
21
  <label class="font_normal_body" title="参数名称:用户状态">客户状态</label>
@@ -15,7 +15,7 @@
15
15
  <div class="col-sm-2 form-group">
16
16
  <label class="font_normal_body">客户名称</label>
17
17
  <input type="text" style="width:60%" class="input_search" v-model="model.f_user_name"
18
- condition="f_user_name = '{}'" placeholder="客户名称">
18
+ condition="f_user_name like '%{}%'" placeholder="客户名称">
19
19
  </div>
20
20
  <div class="col-sm-2 form-group">
21
21
  <label class="font_normal_body">客户电话</label>
@@ -34,7 +34,7 @@
34
34
  <div class="col-sm-2 form-group">
35
35
  <label class="font_normal_body">客户名称</label>
36
36
  <input type="text" style="width:60%" class="input_search" v-model="model.f_user_name"
37
- condition="u.f_user_name = '{}'" placeholder="客户名称">
37
+ condition="u.f_user_name like '%{}%'" placeholder="客户名称">
38
38
  </div>
39
39
 
40
40
  <div class="span" style="float:right;">
@@ -108,6 +108,14 @@
108
108
  condition="ss.f_gas_state = '{}'"
109
109
  close-on-select></v-select>
110
110
  </div>
111
+ <div class="col-sm-2 form-group">
112
+ <label class="font_normal_body">气表状态</label>
113
+ <v-select :value.sync="model.f_table_state"
114
+ v-model="model.f_table_state"
115
+ :options="$parent.$parent.tableState"
116
+ condition="f_table_state = '{}'"
117
+ close-on-select></v-select>
118
+ </div>
111
119
  <div class="col-sm-2 form-group flex-row" style="white-space: nowrap">
112
120
  <label class="font_normal_body">用气量区间</label>
113
121
  <div class="row">
@@ -177,15 +185,16 @@
177
185
  <th><nobr>地址</nobr></th>
178
186
  <th><nobr>电话</nobr></th>
179
187
 
188
+ <th><nobr>气表状态</nobr></th>
180
189
  <th><nobr>燃气证号</nobr></th>
181
190
  <th><nobr>表号</nobr></th>
182
191
  <th><nobr>表具类型</nobr></th>
183
192
  <th><nobr>表描述</nobr></th>
184
193
  <th><nobr>气价名称</nobr></th>
185
194
 
186
- <th><nobr>一阶气价</nobr></th>
187
- <th><nobr>二阶气价</nobr></th>
188
- <th><nobr>三阶气价</nobr></th>
195
+ <!-- <th><nobr>一阶气价</nobr></th>-->
196
+ <!-- <th><nobr>二阶气价</nobr></th>-->
197
+ <!-- <th><nobr>三阶气价</nobr></th>-->
189
198
 
190
199
  <th><nobr>用气性质</nobr></th>
191
200
  <th><nobr>期初余额</nobr></th>
@@ -209,15 +218,17 @@
209
218
  <td style="text-align: left;"><nobr>{{row.f_address}}</nobr></td>
210
219
  <td style="text-align: center;"><nobr>{{row.f_user_phone}}</nobr></td>
211
220
 
221
+ <td style="text-align:center"><nobr>{{row.f_table_state}}</nobr></td>
222
+
212
223
  <td style="text-align:center"><nobr>{{row.f_gascode}}</nobr></td>
213
224
  <th style="text-align:center"><nobr>{{row.f_meternumber}}</nobr></th>
214
225
  <th style="text-align:center"><nobr>{{row.f_meter_classify}}</nobr></th>
215
226
  <th style="text-align:center"><nobr>{{row.f_meter_title}}</nobr></th>
216
227
  <th style="text-align:center"><nobr>{{row.f_price_name}}</nobr></th>
217
228
 
218
- <th style="text-align:center"><nobr>{{row.f_stair1price}}</nobr></th>
219
- <th style="text-align:center"><nobr>{{row.f_stair2price}}</nobr></th>
220
- <th style="text-align:center"><nobr>{{row.f_stair3price}}</nobr></th>
229
+ <!-- <th style="text-align:center"><nobr>{{row.f_stair1price}}</nobr></th>-->
230
+ <!-- <th style="text-align:center"><nobr>{{row.f_stair2price}}</nobr></th>-->
231
+ <!-- <th style="text-align:center"><nobr>{{row.f_stair3price}}</nobr></th>-->
221
232
 
222
233
  <th style="text-align:center"><nobr>{{row.f_gasproperties}}</nobr></th>
223
234
 
@@ -489,6 +500,9 @@
489
500
  getfield () {
490
501
  return exportConfig.GasStatistics
491
502
  },
503
+ tableState() {
504
+ return [{label: '全部', value: ''}, ...this.$appdata.getParam('气表状态')]
505
+ },
492
506
  usertypes() {
493
507
  return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('用户类型')]
494
508
  },
@@ -108,6 +108,14 @@
108
108
  condition="ss.f_gas_state = '{}'"
109
109
  close-on-select></v-select>
110
110
  </div>
111
+ <div class="col-sm-2 form-group">
112
+ <label class="font_normal_body">气表状态</label>
113
+ <v-select :value.sync="model.f_table_state"
114
+ v-model="model.f_table_state"
115
+ :options="$parent.$parent.tableState"
116
+ condition="f_table_state = '{}'"
117
+ close-on-select></v-select>
118
+ </div>
111
119
  <div class="col-sm-2 form-group flex-row" style="white-space: nowrap">
112
120
  <label class="font_normal_body">用气量区间</label>
113
121
  <div class="row">
@@ -176,16 +184,16 @@
176
184
  <th><nobr>小区</nobr></th>
177
185
  <th><nobr>地址</nobr></th>
178
186
  <th><nobr>电话</nobr></th>
179
-
187
+ <th><nobr>气表状态</nobr></th>
180
188
  <th><nobr>燃气证号</nobr></th>
181
189
  <th><nobr>表号</nobr></th>
182
190
  <th><nobr>表具类型</nobr></th>
183
191
  <th><nobr>表描述</nobr></th>
184
192
  <th><nobr>气价名称</nobr></th>
185
193
 
186
- <th><nobr>一阶气价</nobr></th>
187
- <th><nobr>二阶气价</nobr></th>
188
- <th><nobr>三阶气价</nobr></th>
194
+ <!-- <th><nobr>一阶气价</nobr></th>-->
195
+ <!-- <th><nobr>二阶气价</nobr></th>-->
196
+ <!-- <th><nobr>三阶气价</nobr></th>-->
189
197
 
190
198
  <th><nobr>用气性质</nobr></th>
191
199
  <th><nobr>期初余额</nobr></th>
@@ -208,16 +216,16 @@
208
216
  <td style="text-align: left;"><nobr>{{row.f_residential_area}}</nobr></td>
209
217
  <td style="text-align: left;"><nobr>{{row.f_address}}</nobr></td>
210
218
  <td style="text-align: center;"><nobr>{{row.f_user_phone}}</nobr></td>
211
-
219
+ <td style="text-align:center"><nobr>{{row.f_table_state}}</nobr></td>
212
220
  <td style="text-align:center"><nobr>{{row.f_gascode}}</nobr></td>
213
221
  <th style="text-align:center"><nobr>{{row.f_meternumber}}</nobr></th>
214
222
  <th style="text-align:center"><nobr>{{row.f_meter_classify}}</nobr></th>
215
223
  <th style="text-align:center"><nobr>{{row.f_meter_title}}</nobr></th>
216
224
  <th style="text-align:center"><nobr>{{row.f_price_name}}</nobr></th>
217
225
 
218
- <th style="text-align:center"><nobr>{{row.f_stair1price}}</nobr></th>
219
- <th style="text-align:center"><nobr>{{row.f_stair2price}}</nobr></th>
220
- <th style="text-align:center"><nobr>{{row.f_stair3price}}</nobr></th>
226
+ <!-- <th style="text-align:center"><nobr>{{row.f_stair1price}}</nobr></th>-->
227
+ <!-- <th style="text-align:center"><nobr>{{row.f_stair2price}}</nobr></th>-->
228
+ <!-- <th style="text-align:center"><nobr>{{row.f_stair3price}}</nobr></th>-->
221
229
 
222
230
  <th style="text-align:center"><nobr>{{row.f_gasproperties}}</nobr></th>
223
231
 
@@ -483,6 +491,9 @@
483
491
  usertypes() {
484
492
  return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('用户类型')]
485
493
  },
494
+ tableState() {
495
+ return [{label: '全部', value: ''}, ...this.$appdata.getParam('气表状态')]
496
+ },
486
497
  pricetypes() {
487
498
  return [{label: '全部', value: ''}, ...this.$appdata.getParam('气价类型')]
488
499
  },
@@ -14,6 +14,11 @@ export default{
14
14
  'f_operat_type': '操作类型', 'f_describe': '操作详情', 'f_state': '状态', 'f_operate_date': '操作时间', 'f_orgname': '公司名称',
15
15
  'f_depname': '部门名称', 'f_operator': '操作人员'
16
16
  },
17
+ GasStatistics: {
18
+ 'f_userinfo_code': '客户编号', 'f_user_name': '客户姓名', 'f_residential_area': '小区', 'f_address': '地址', 'f_user_phone': '电话', 'f_table_state': '气表状态', 'f_gascode': '燃气证号', 'f_meternumber': '表号', 'f_meter_brand': '气表品牌',
19
+ 'f_meter_classify': '表具类型', 'f_meter_title': '表描述', 'f_price_name': '气价名称', 'f_user_nature': '用气类型','f_gasproperties': '用气性质', 'f_balance': '期初余额', 'f_last_tablebase': '起方', 'f_tablebase': '止方',
20
+ 'f_oughtamount': '期间用气量', 'f_oughtfee': '期间用气金额', 'f_collection': '期末充值金额', 'f_curbalance': '期末余额', 'f_gas_state': '用气状态', 'f_changetable_state': '是否换表', 'f_first_input_date': '首次抄表时间', 'f_input_date': '最后通讯日期'
21
+ },
17
22
  // 业务查询
18
23
  businesConfig: {
19
24
  'f_userinfo_code': '客户编号', 'f_user_name': '客户名称', 'f_meternumber': '表号', 'f_operat_type': '操作类型', 'f_describe': '操作描述',
@@ -89,6 +89,8 @@ export default function () {
89
89
  Vue.component('planned-security-inspection-analysis', (resolve) => { require(['./components/webmeter/DrillData/LargeScreenAnalysisEcharts'], resolve) })
90
90
  // 上报查询
91
91
  Vue.component('report-list', (resolve) => { require(['./components/webmeter/report/ReportList'], resolve) })
92
+ // 上报数据明细
93
+ Vue.component('report-detail-list', (resolve) => { require(['./components/webmeter/report/ReportDetailList'], resolve) })
92
94
  Vue.component('ckh-report-list', (resolve) => { require(['./components/webmeter/report/ckhReportList'], resolve) })
93
95
  // =========================================物联网表==========================================================
94
96
  // 表具查看