manage-client 3.2.229 → 3.2.231

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.
Files changed (9) hide show
  1. package/package.json +1 -1
  2. package/src/components/SellReport/shangyenum.vue +221 -0
  3. package/src/components/sale/businessquery/ChargeQuery.vue +16 -2
  4. package/src/filiale/WEINAN/MeterQuery.vue +172 -170
  5. package/src/filiale/WEINAN/UserQuery.vue +963 -0
  6. package/src/filiale/WEINAN/sale.js +2 -0
  7. package/src/filiale/wuhai/ReportList.vue +6 -6
  8. package/src/main.js +66 -66
  9. package/src/reportManage.js +4 -0
package/src/filiale/WEINAN/MeterQuery.vue CHANGED
@@ -46,17 +46,21 @@
46
46
  </div>
47
47
  </div>
48
48
  <div class="row" v-show="$parent.$parent.criteriaShow">
49
- <res-select-group :initres="$parent.$parent.initres" @re-res="$parent.$parent.getRes"></res-select-group>
49
+ <res-select-group
50
+ :initres="$parent.$parent.initres"
51
+ @re-res="$parent.$parent.getRes"
52
+ :show-component=['slicearea']
53
+ ></res-select-group>
50
54
  <div class="col-sm-2 form-group">
51
55
  <label class="font_normal_body">客户地址</label>
52
56
  <input type="text" style="width:60%" class="input_search" v-model="model.f_address"
53
57
  condition="f_address like '%{}%'" placeholder='客户地址'>
54
58
  </div>
55
- <div class="col-sm-2 form-group" v-if="!$filialeInfo || $filialeInfo!=='rongcheng'">
56
- <label class="font_normal_body">用气点</label>
57
- <input type="text" style="width:60%" class="input_search" v-model="model.f_userfiles_address"
58
- condition="f_userfiles_address like '%{}%'" placeholder='用气点'>
59
- </div>
59
+ <!-- <div class="col-sm-2 form-group" v-if="!$filialeInfo || $filialeInfo!=='rongcheng'">-->
60
+ <!-- <label class="font_normal_body">用气点</label>-->
61
+ <!-- <input type="text" style="width:60%" class="input_search" v-model="model.f_userfiles_address"-->
62
+ <!-- condition="f_userfiles_address like '%{}%'" placeholder='用气点'>-->
63
+ <!-- </div>-->
60
64
  <div class="col-sm-2 form-group">
61
65
  <label class="font_normal_body">&nbsp;&nbsp;&nbsp;表号&nbsp;&nbsp;&nbsp;</label>
62
66
  <input type="text" style="width:60%" class="input_search" v-model="model.f_meternumber"
@@ -78,13 +82,13 @@
78
82
  condition="f_user_type = '{}'"
79
83
  close-on-select></v-select>
80
84
  </div>
81
- <div class="col-sm-2 form-group" >
82
- <label for="f_usetype" class="font_normal_body">二次挂表</label>
83
- <v-select :value.sync="model.issecondtype" v-model="model.issecondtype"
84
- condition="f_usetype {}"
85
- :options='$parent.$parent.issecond' placeholder='请选择'
86
- close-on-select></v-select>
87
- </div>
85
+ <!-- <div class="col-sm-2 form-group" >-->
86
+ <!-- <label for="f_usetype" class="font_normal_body">二次挂表</label>-->
87
+ <!-- <v-select :value.sync="model.issecondtype" v-model="model.issecondtype"-->
88
+ <!-- condition="f_usetype {}"-->
89
+ <!-- :options='$parent.$parent.issecond' placeholder='请选择'-->
90
+ <!-- close-on-select></v-select>-->
91
+ <!-- </div>-->
88
92
  <div class="col-sm-2 form-group" >
89
93
  <label for="f_usetype" class="font_normal_body" title="参数:使用类型">使用类型</label>
90
94
  <v-select :value.sync="model.f_usetype" v-model="model.f_usetype"
@@ -132,14 +136,14 @@
132
136
  condition="f_meter_brand = '{}'"
133
137
  close-on-select></v-select>
134
138
  </div>
135
- <div class="col-sm-2 form-group">
136
- <label class="font_normal_body">气表型号</label>
137
- <v-select :value.sync="model.f_meter_style"
138
- v-model="model.f_meter_style"
139
- :options='$parent.$parent.meterstyle[model.f_meter_brand]' placeholder='请选择'
140
- condition="f_meter_style = '{}'"
141
- close-on-select></v-select>
142
- </div>
139
+ <!-- <div class="col-sm-2 form-group">-->
140
+ <!-- <label class="font_normal_body">气表型号</label>-->
141
+ <!-- <v-select :value.sync="model.f_meter_style"-->
142
+ <!-- v-model="model.f_meter_style"-->
143
+ <!-- :options='$parent.$parent.meterstyle[model.f_meter_brand]' placeholder='请选择'-->
144
+ <!-- condition="f_meter_style = '{}'"-->
145
+ <!-- close-on-select></v-select>-->
146
+ <!-- </div>-->
143
147
  <div class="col-sm-2 form-group">
144
148
  <label class="font_normal_body">气表状态</label>
145
149
  <v-select :value.sync="model.f_table_state"
@@ -148,54 +152,54 @@
148
152
  condition="f_table_state = '{}'"
149
153
  close-on-select></v-select>
150
154
  </div>
151
- <div class="col-sm-2 form-group">
152
- <label class="font_normal_body">使用状态</label>
153
- <v-select :value.sync="model.f_usestate"
154
- v-model="model.f_usestate"
155
- :options='$parent.$parent.usestate' placeholder='请选择'
156
- condition="f_usestate = '{}'"
157
- close-on-select></v-select>
158
- </div>
159
- <div class="col-sm-2 form-group">
160
- <label for="startDate" class="font_normal_body">建表日期</label>
161
- <datepicker id="startDate" placeholder="开始日期" style="width:60%"
162
- v-model="model.startDate"
163
- :value.sync="model.startDate"
164
- :format="'yyyy-MM-dd'"
165
- :show-reset-button="true"
166
- condition="f_input_date >= '{} 00:00:00'">
167
- </datepicker>
168
- </div>
169
- <div class="col-sm-2 form-group">
170
- <label for="endDate" class="font_normal_body">建表日期</label>
171
- <datepicker id="endDate" placeholder="结束日期" style="width:60%"
172
- v-model="model.endDate"
173
- :value.sync="model.endDate"
174
- :format="'yyyy-MM-dd'"
175
- :show-reset-button="true"
176
- condition="f_input_date <= '{} 23:59:59'">
177
- </datepicker>
178
- </div>
179
- <div class="col-sm-2 form-group">
180
- <label for="startDate" class="font_normal_body">通气日期</label>
181
- <datepicker id="startDate" placeholder="开始日期" style="width:60%"
182
- v-model="model.startTQDate"
183
- :value.sync="model.startTQDate"
184
- :format="'yyyy-MM-dd'"
185
- :show-reset-button="true"
186
- condition="f_gas_date >= '{} 00:00:00'">
187
- </datepicker>
188
- </div>
189
- <div class="col-sm-2 form-group">
190
- <label for="endDate" class="font_normal_body">通气日期</label>
191
- <datepicker id="endDate" placeholder="结束日期" style="width:60%"
192
- v-model="model.endTQDate"
193
- :value.sync="model.endTQDate"
194
- :format="'yyyy-MM-dd'"
195
- :show-reset-button="true"
196
- condition="f_gas_date <= '{} 23:59:59'">
197
- </datepicker>
198
- </div>
155
+ <!-- <div class="col-sm-2 form-group">-->
156
+ <!-- <label class="font_normal_body">使用状态</label>-->
157
+ <!-- <v-select :value.sync="model.f_usestate"-->
158
+ <!-- v-model="model.f_usestate"-->
159
+ <!-- :options='$parent.$parent.usestate' placeholder='请选择'-->
160
+ <!-- condition="f_usestate = '{}'"-->
161
+ <!-- close-on-select></v-select>-->
162
+ <!-- </div>-->
163
+ <!-- <div class="col-sm-2 form-group">-->
164
+ <!-- <label for="startDate" class="font_normal_body">建表日期</label>-->
165
+ <!-- <datepicker id="startDate" placeholder="开始日期" style="width:60%"-->
166
+ <!-- v-model="model.startDate"-->
167
+ <!-- :value.sync="model.startDate"-->
168
+ <!-- :format="'yyyy-MM-dd'"-->
169
+ <!-- :show-reset-button="true"-->
170
+ <!-- condition="f_input_date >= '{} 00:00:00'">-->
171
+ <!-- </datepicker>-->
172
+ <!-- </div>-->
173
+ <!-- <div class="col-sm-2 form-group">-->
174
+ <!-- <label for="endDate" class="font_normal_body">建表日期</label>-->
175
+ <!-- <datepicker id="endDate" placeholder="结束日期" style="width:60%"-->
176
+ <!-- v-model="model.endDate"-->
177
+ <!-- :value.sync="model.endDate"-->
178
+ <!-- :format="'yyyy-MM-dd'"-->
179
+ <!-- :show-reset-button="true"-->
180
+ <!-- condition="f_input_date <= '{} 23:59:59'">-->
181
+ <!-- </datepicker>-->
182
+ <!-- </div>-->
183
+ <!-- <div class="col-sm-2 form-group">-->
184
+ <!-- <label for="startDate" class="font_normal_body">通气日期</label>-->
185
+ <!-- <datepicker id="startDate" placeholder="开始日期" style="width:60%"-->
186
+ <!-- v-model="model.startTQDate"-->
187
+ <!-- :value.sync="model.startTQDate"-->
188
+ <!-- :format="'yyyy-MM-dd'"-->
189
+ <!-- :show-reset-button="true"-->
190
+ <!-- condition="f_gas_date >= '{} 00:00:00'">-->
191
+ <!-- </datepicker>-->
192
+ <!-- </div>-->
193
+ <!-- <div class="col-sm-2 form-group">-->
194
+ <!-- <label for="endDate" class="font_normal_body">通气日期</label>-->
195
+ <!-- <datepicker id="endDate" placeholder="结束日期" style="width:60%"-->
196
+ <!-- v-model="model.endTQDate"-->
197
+ <!-- :value.sync="model.endTQDate"-->
198
+ <!-- :format="'yyyy-MM-dd'"-->
199
+ <!-- :show-reset-button="true"-->
200
+ <!-- condition="f_gas_date <= '{} 23:59:59'">-->
201
+ <!-- </datepicker>-->
202
+ <!-- </div>-->
199
203
  <div class="col-sm-2 form-group">
200
204
  <label class="font_normal_body">&nbsp;&nbsp;&nbsp;壁挂炉</label>
201
205
  <v-select :value.sync="model.isbgl" v-model="model.isbgl"
@@ -203,53 +207,53 @@
203
207
  condition="isbgl = '{}'"
204
208
  close-on-select></v-select>
205
209
  </div>
206
- <div class="col-sm-2 form-group" v-if="!$filialeInfo || $filialeInfo!=='rongcheng'">
207
- <label class="font_normal_body">用户等级</label>
208
- <v-select :value.sync="model.f_user_grade"
209
- v-model="model.f_user_grade"
210
- :options='$parent.$parent.usergrade' placeholder='请选择'
211
- condition="f_user_grade = '{}'"
212
- close-on-select></v-select>
213
- </div>
210
+ <!-- <div class="col-sm-2 form-group" v-if="!$filialeInfo || $filialeInfo!=='rongcheng'">-->
211
+ <!-- <label class="font_normal_body">用户等级</label>-->
212
+ <!-- <v-select :value.sync="model.f_user_grade"-->
213
+ <!-- v-model="model.f_user_grade"-->
214
+ <!-- :options='$parent.$parent.usergrade' placeholder='请选择'-->
215
+ <!-- condition="f_user_grade = '{}'"-->
216
+ <!-- close-on-select></v-select>-->
217
+ <!-- </div>-->
214
218
  <!--表册片区-->
215
- <div class="col-sm-2 form-group">
216
- <label class="font_normal_body">表册片区</label>
217
- <v-select :value.sync="model.f_book_slice_area" v-model="model.f_book_slice_area"
218
- :options='$parent.$parent.bookSlice' placeholder='片区/表册'
219
- style="width:60%"
220
- close-on-select
221
- condition="f_book_slice_area = '{}'"></v-select>
222
- </div>
223
- <div class="col-sm-2 form-group">
224
- <label class="font_normal_body" >抄&nbsp;&nbsp;表&nbsp;员</label>
225
- <v-select :value.sync="model.f_inputtor"
226
- v-model="model.f_inputtor"
227
- :options='$parent.$parent.inputtores' placeholder='请选择'
228
- condition="f_inputtor = '{}'"
229
- close-on-select :value-single="true" :search="false">
230
- </v-select>
231
- </div>
232
- <div class="col-sm-2 form-group">
233
- <label class="font_normal_body">抄&ensp;表&ensp;册</label>
234
- <v-select :value.sync="model.f_meter_book" v-model="model.f_meter_book"
235
- :options='$parent.$parent.meterbooks' placeholder='抄表册'
236
- style="width:60%"
237
- close-on-select
238
- condition="f_meter_book_num = '{}'"></v-select>
239
- </div>
219
+ <!-- <div class="col-sm-2 form-group">-->
220
+ <!-- <label class="font_normal_body">表册片区</label>-->
221
+ <!-- <v-select :value.sync="model.f_book_slice_area" v-model="model.f_book_slice_area"-->
222
+ <!-- :options='$parent.$parent.bookSlice' placeholder='片区/表册'-->
223
+ <!-- style="width:60%"-->
224
+ <!-- close-on-select-->
225
+ <!-- condition="f_book_slice_area = '{}'"></v-select>-->
226
+ <!-- </div>-->
227
+ <!-- <div class="col-sm-2 form-group">-->
228
+ <!-- <label class="font_normal_body" >抄&nbsp;&nbsp;表&nbsp;员</label>-->
229
+ <!-- <v-select :value.sync="model.f_inputtor"-->
230
+ <!-- v-model="model.f_inputtor"-->
231
+ <!-- :options='$parent.$parent.inputtores' placeholder='请选择'-->
232
+ <!-- condition="f_inputtor = '{}'"-->
233
+ <!-- close-on-select :value-single="true" :search="false">-->
234
+ <!-- </v-select>-->
235
+ <!-- </div>-->
236
+ <!-- <div class="col-sm-2 form-group">-->
237
+ <!-- <label class="font_normal_body">抄&ensp;表&ensp;册</label>-->
238
+ <!-- <v-select :value.sync="model.f_meter_book" v-model="model.f_meter_book"-->
239
+ <!-- :options='$parent.$parent.meterbooks' placeholder='抄表册'-->
240
+ <!-- style="width:60%"-->
241
+ <!-- close-on-select-->
242
+ <!-- condition="f_meter_book_num = '{}'"></v-select>-->
243
+ <!-- </div>-->
240
244
 
241
- <div class="col-sm-2 form-group" >
242
- <label class="font_normal_body" title="参数:表具大小">表具大小</label>
243
- <v-select :value.sync="model.f_meter_size" v-model="model.f_meter_size"
244
- :options='$parent.$parent.metersize' placeholder='表具大小'
245
- style="width:60%" condition="f_meter_size = '{}'"
246
- close-on-select></v-select>
247
- </div>
248
- <div class="col-sm-2 form-group">
249
- <label class="font_normal_body">表&ensp;流&ensp;量</label>
250
- <input type="number" class="input_search" style="width: 26%;" condition="f_meter_flow >= '{}'" placeholder="表流量" v-model="model.minSize">&ensp;-&ensp;
251
- <input type="number" class="input_search" style="width: 26%;" condition="f_meter_flow <= '{}'" placeholder="表流量" v-model="model.maxSize">
252
- </div>
245
+ <!-- <div class="col-sm-2 form-group" >-->
246
+ <!-- <label class="font_normal_body" title="参数:表具大小">表具大小</label>-->
247
+ <!-- <v-select :value.sync="model.f_meter_size" v-model="model.f_meter_size"-->
248
+ <!-- :options='$parent.$parent.metersize' placeholder='表具大小'-->
249
+ <!-- style="width:60%" condition="f_meter_size = '{}'"-->
250
+ <!-- close-on-select></v-select>-->
251
+ <!-- </div>-->
252
+ <!-- <div class="col-sm-2 form-group">-->
253
+ <!-- <label class="font_normal_body">表&ensp;流&ensp;量</label>-->
254
+ <!-- <input type="number" class="input_search" style="width: 26%;" condition="f_meter_flow >= '{}'" placeholder="表流量" v-model="model.minSize">&ensp;-&ensp;-->
255
+ <!-- <input type="number" class="input_search" style="width: 26%;" condition="f_meter_flow <= '{}'" placeholder="表流量" v-model="model.maxSize">-->
256
+ <!-- </div>-->
253
257
 
254
258
  </div>
255
259
  </div>
@@ -275,67 +279,65 @@
275
279
  <!--<nobr>客户地址</nobr>-->
276
280
  <data-order field="f_address" name="客户地址" :order.sync="$parent.$parent.$parent.orderFields.f_address"></data-order>
277
281
  </th>
278
- <th>
279
- <nobr>表册片区</nobr>
280
- </th>
282
+ <!-- <th>-->
283
+ <!-- <nobr>表册片区</nobr>-->
284
+ <!-- </th>-->
281
285
  <th>
282
286
  <nobr>表上余额</nobr>
283
287
  </th>
284
288
  <th>
285
289
  <nobr>客户类型</nobr>
286
290
  </th>
287
- <th>
288
- <nobr>使用类型</nobr>
289
- </th>
290
- <th>
291
- <nobr>用气性质</nobr>
292
- </th>
291
+ <!-- <th>-->
292
+ <!-- <nobr>使用类型</nobr>-->
293
+ <!-- </th>-->
294
+ <!-- <th>-->
295
+ <!-- <nobr>用气性质</nobr>-->
296
+ <!-- </th>-->
293
297
  <th>
294
298
  <nobr>表号</nobr>
295
299
  </th>
296
- <th>
297
- <nobr>卡号</nobr>
298
- </th>
299
-
300
-
301
- <th>
302
- <nobr>气价名称</nobr>
303
- </th>
300
+ <!-- <th>-->
301
+ <!-- <nobr>卡号</nobr>-->
302
+ <!-- </th>-->
303
+ <!-- <th>-->
304
+ <!-- <nobr>气价名称</nobr>-->
305
+ <!-- </th>-->
304
306
  <th>
305
307
  <nobr>气价详情</nobr>
306
308
  </th>
307
309
  <th>
308
310
  <nobr>气表品牌</nobr>
309
311
  </th>
310
- <th>
311
- <nobr>气表型号</nobr>
312
- </th>
313
- <th>
314
- <nobr>户管员</nobr>
315
- </th>
316
- <th>
317
- <nobr>通气人</nobr>
318
- </th>
319
- <th>
312
+ <!-- <th>-->
313
+ <!-- <nobr>气表型号</nobr>-->
314
+ <!-- </th>-->
315
+ <!-- <th>-->
316
+ <!-- <nobr>户管员</nobr>-->
317
+ <!-- </th>-->
318
+ <!-- <th>-->
319
+ <!-- <nobr>通气人</nobr>-->
320
+ <!-- </th>-->
321
+ <!-- <th>-->
320
322
  <!--<nobr>通气时间</nobr>-->
321
- <data-order field="f_gas_date" name="通气时间" :order.sync="$parent.$parent.$parent.orderFields.f_gas_date"></data-order>
322
- </th>
323
- <th>
324
- <!--<nobr>建表时间</nobr>-->
325
- <data-order field="f_input_date" name="建表时间" :order.sync="$parent.$parent.$parent.orderFields.f_input_date"></data-order>
326
- </th>
327
- <th>
328
- <nobr>气表状态</nobr>
329
- </th>
323
+ <!-- <data-order field="f_gas_date" name="通气时间" :order.sync="$parent.$parent.$parent.orderFields.f_gas_date"></data-order>-->
324
+ <!-- </th>-->
330
325
  <th>
331
- <nobr>表具大小</nobr>
332
- </th>
333
- <th>
334
- <nobr>表流量</nobr>
335
- </th>
336
- <th>
337
- <nobr>是否壁挂炉</nobr>
326
+ <!-- <nobr>当前表启用时间</nobr>-->
327
+ <data-order field="f_input_date" name="当前表启用时间" :order.sync="$parent.$parent.$parent.orderFields.f_input_date"></data-order>
338
328
  </th>
329
+ <!-- <th>-->
330
+ <!-- <nobr>气表状态</nobr>-->
331
+ <!-- </th>-->
332
+ <!-- <th>-->
333
+ <!-- <nobr>表具大小</nobr>-->
334
+ <!-- </th>-->
335
+ <!-- <th>-->
336
+ <!-- <nobr>表流量</nobr>-->
337
+ <!-- </th>-->
338
+ <!-- <th>-->
339
+ <!-- <nobr>是否壁挂炉</nobr>-->
340
+ <!-- </th>-->
339
341
  </tr>
340
342
  </template>
341
343
  <template partial='body'>
@@ -540,7 +542,7 @@
540
542
  rowdata:{},
541
543
  meterbrands: [],
542
544
  // 气表型号
543
- meterstyle: {},
545
+ // meterstyle: {},
544
546
  //默认打印列
545
547
  defaultfield: [],
546
548
  config: {
@@ -561,7 +563,7 @@
561
563
  allorgid:[],
562
564
  tempfalg :false,
563
565
  lastorgstr:'',
564
- issecond: [{label:'是',value:" = '二次挂表'"},{label:'否',value:" <> '二次挂表'"}],
566
+ // issecond: [{label:'是',value:" = '二次挂表'"},{label:'否',value:" <> '二次挂表'"}],
565
567
  usetype:this.$appdata.getParam('使用类型')
566
568
  }
567
569
  },
@@ -727,11 +729,11 @@
727
729
  temp.value = item.value.f_meter_brand
728
730
  brandArr.push(temp)
729
731
  // 取出对应气表型号
730
- let styleArr = []
731
- for (let row of item.value.gasmodel) {
732
- styleArr.push({label: row.label,value: row.value.f_meter_style})
733
- }
734
- this.meterstyle[temp.value] = styleArr
732
+ // let styleArr = []
733
+ // for (let row of item.value.gasmodel) {
734
+ // styleArr.push({label: row.label,value: row.value.f_meter_style})
735
+ // }
736
+ // this.meterstyle[temp.value] = styleArr
735
737
  })
736
738
  this.meterbrands = [{label: '全部', value: ''}, ...brandArr]
737
739
  //初始化气表价格
@@ -954,12 +956,12 @@
954
956
  bgl(){
955
957
  return [{label: '全部', value: ''}, {label: '是', value: '是'}, {label: '否', value: '否'}]
956
958
  },
957
- usergrade(){
958
- return [{label: '全部', value: ''}, ...this.$appdata.getParam('用户等级')]
959
- },
960
- usestate(){
961
- return [{label: '全部', value: ''}, ...this.$appdata.getParam('使用状态')]
962
- }
959
+ // usergrade(){
960
+ // return [{label: '全部', value: ''}, ...this.$appdata.getParam('用户等级')]
961
+ // },
962
+ // usestate(){
963
+ // return [{label: '全部', value: ''}, ...this.$appdata.getParam('使用状态')]
964
+ // }
963
965
  }
964
966
  }
965
967
  </script>