manage-client 4.0.86 → 4.0.87-linshi

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 (10) hide show
  1. package/.gradle/6.1.1/fileContent/fileContent.lock +0 -0
  2. package/.gradle/file-system.probe +0 -0
  3. package/build/dev-server.js +2 -2
  4. package/package.json +1 -1
  5. package/src/components/sale/report/aode/DayReportList.vue +1 -1
  6. package/src/filiale/lixianV3/RecordInfoQuery.vue +8 -6
  7. package/src/filiale/rongcheng/businessquery/ChangeMeterQuery.vue +31 -19
  8. package/src/filiale/shimen/ChargeQuery.vue +1435 -0
  9. package/src/filiale/shimen/sale.js +10 -0
  10. package/src/main.js +1 -1
package/.gradle/file-system.probe ADDED
Binary file
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:9001/'
20
20
  // var bendi = 'http://121.36.106.17:8400/'
21
21
  // var fuwu = 'http://203.57.101.233:9001'
22
- var bendi = 'http://203.57.101.233:9001/'
22
+ var bendi = 'http://192.168.50.67:31467/'
23
23
  // var bendi = 'http://119.187.112.234:8400/'
24
- var wode = 'http://203.57.101.233:9001/'
24
+ var wode = 'http://192.168.50.67:31467/'
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
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "manage-client",
3
- "version": "4.0.86",
3
+ "version": "4.0.87-linshi",
4
4
  "description": "经营管控模块前台组件",
5
5
  "main": "src/index.js",
6
6
  "directories": {
package/src/components/sale/report/aode/DayReportList.vue CHANGED
@@ -4,7 +4,7 @@
4
4
  <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri>
5
5
  <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
6
6
  <div class="row">
7
- <res-select-group :style="$parent.$parent.style" :initres="$parent.$parent.initres" @re-res="$parent.$parent.getRes" :mul="false" :style="$parent.$parent.style" v-ref:sel></res-select-group>
7
+ <res-select-group :style="$parent.$parent.style" :initres="$parent.$parent.initres" @re-res="$parent.$parent.getRes" :mul="true" :style="$parent.$parent.style" v-ref:sel></res-select-group>
8
8
  <div :class="$parent.$parent.style" >
9
9
  <label for="startDate" class="font_normal_body">开始日期</label>
10
10
  <datepicker placeholder="开始日期" style="width:60%"
package/src/filiale/lixianV3/RecordInfoQuery.vue CHANGED
@@ -539,7 +539,7 @@
539
539
  <th colspan="5">
540
540
  <nobr>建档信息</nobr>
541
541
  </th>
542
- <th colspan="6">
542
+ <th colspan="8">
543
543
  <nobr>燃气表</nobr>
544
544
  </th>
545
545
  <th colspan="63">
@@ -584,6 +584,9 @@
584
584
  <th>
585
585
  <nobr>铅封编号</nobr>
586
586
  </th>
587
+ <th>
588
+ <nobr>有无铅封</nobr>
589
+ </th>
587
590
  <th>
588
591
  <nobr>品牌</nobr>
589
592
  </th>
@@ -737,9 +740,6 @@
737
740
  <!--<nobr>换表时间</nobr>-->
738
741
  <data-order field="f_maxdate" name="换表时间" :order.sync="$parent.$parent.$parent.orderFields.f_maxdate"></data-order>
739
742
  </th>
740
- <th>
741
- <nobr>有无铅封</nobr>
742
- </th>
743
743
  <th>
744
744
  <nobr>灶具信息</nobr>
745
745
  </th>
@@ -763,7 +763,7 @@
763
763
  <td style="text-align: center;"><nobr>{{row.f_defendcard}}</nobr></td>
764
764
 
765
765
  <td style="text-align: center;"><nobr>{{row.f_seal_number}}</nobr></td>
766
-
766
+ <td style="text-align: center;"><nobr>{{row.f_hasseal}}</nobr></td>
767
767
  <td style="text-align: center;"><nobr>{{row.f_meter_brand}}</nobr></td>
768
768
  <td style="text-align: center;"><nobr>{{row.f_meternumber}}</nobr></td>
769
769
  <td style="text-align: center;"><nobr>{{row.f_meter_type}}</nobr></td>
@@ -877,7 +877,6 @@
877
877
  </td>
878
878
  <td style="text-align: center;"><nobr>{{row.f_alarm_code}}</nobr></td>
879
879
  <td style="text-align: center;"><nobr>{{row.f_maxdate}}</nobr></td>
880
- <td style="text-align: center;"><nobr>{{row.f_hasseal}}</nobr></td>
881
880
  <td style="text-align: center;"><nobr>{{row.f_devices_type}}</nobr></td>
882
881
  <td style="text-align: center;"><nobr>{{row.f_comments}}</nobr></td>
883
882
  </template>
@@ -1205,6 +1204,9 @@
1205
1204
  if(this.IdCardInfo!=''){
1206
1205
  args.condition+=` and f_idnumber='${this.IdCardInfo}'`
1207
1206
  }
1207
+ if(this.f_hasseal!=''){
1208
+ args.condition +=` and f_hasseal='${this.f_hasseal}'`
1209
+ }
1208
1210
  this.conditon2 = args.condition
1209
1211
  this.model.search(args.condition, args.model)
1210
1212
  this.sumsmodel = this.$refs.paged.$refs.grid.model.sums;
package/src/filiale/rongcheng/businessquery/ChangeMeterQuery.vue CHANGED
@@ -209,7 +209,6 @@
209
209
  <data-grid :model="model" partial='list' class="list_area table_sy" v-ref:grid @dblclick="$parent.$parent.toBusiness">
210
210
  <template partial='head'>
211
211
  <tr>
212
- <th><nobr>审核状态</nobr></th>
213
212
  <th>
214
213
  <!--<nobr>客户编号</nobr>-->
215
214
  <data-order field="f_userinfo_code" name="客户编号"
@@ -221,11 +220,17 @@
221
220
  <th>
222
221
  <nobr>档案编号</nobr>
223
222
  </th>
223
+ <th>
224
+ <nobr>用户电话</nobr>
225
+ </th>
224
226
  <th>
225
227
  <nobr>付款方式</nobr>
226
228
  </th>
227
229
  <th>
228
- <nobr>气表底数</nobr>
230
+ <nobr>上期底数</nobr>
231
+ </th>
232
+ <th>
233
+ <nobr>本期底数</nobr>
229
234
  </th>
230
235
  <th>
231
236
  <nobr>表上余额</nobr>
@@ -256,9 +261,9 @@
256
261
  <th>
257
262
  <nobr>新表号</nobr>
258
263
  </th>
259
- <th>
260
- <nobr>表封号</nobr>
261
- </th>
264
+ <!-- <th>-->
265
+ <!-- <nobr>表封号</nobr>-->
266
+ <!-- </th>-->
262
267
  <th>
263
268
  <nobr>旧气表品牌</nobr>
264
269
  </th>
@@ -271,9 +276,9 @@
271
276
  <th>
272
277
  <nobr>补气金额</nobr>
273
278
  </th>
274
- <th>
275
- <nobr>订单编号</nobr>
276
- </th>
279
+ <!-- <th>-->
280
+ <!-- <nobr>订单编号</nobr>-->
281
+ <!-- </th>-->
277
282
  <th>
278
283
  <nobr>备注</nobr>
279
284
  </th>
@@ -300,17 +305,14 @@
300
305
  <th><nobr>旧表类型</nobr></th>
301
306
  <th><nobr>新表类型</nobr></th>
302
307
  <th><nobr>用户类型</nobr></th>
303
- <th><nobr>附件</nobr></th>
308
+ <th><nobr>查看</nobr></th>
309
+ <th><nobr>审核状态</nobr></th>
304
310
  <th><nobr>审核时间</nobr></th>
305
311
  <th><nobr>审核人</nobr></th>
306
312
  <th><nobr>审核原因</nobr></th>
307
313
  </tr>
308
314
  </template>
309
315
  <template partial='body'>
310
- <td style="text-align: center;"><nobr>
311
- <button v-if="!row.f_changetables_check_state && $login.r.includes('换表审核')" class="button_search button_spacing width-60" @click.stop="$parent.$parent.$parent.checkData(row)">审核</button>
312
- <span v-if="row.f_changetables_check_state">{{row.f_changetables_check_state}}</span>
313
- </nobr></td>
314
316
  <td style="text-align: center;"><nobr>
315
317
  <span @click="$parent.$parent.$parent.showmsg(row)"><a>{{row.f_userinfo_code}}</a></span>
316
318
  </nobr> </td>
@@ -320,12 +322,18 @@
320
322
  <td style="text-align: center;">
321
323
  <nobr>{{row.f_olduserinfo_code}}</nobr>
322
324
  </td>
325
+ <td style="text-align: center;">
326
+ <nobr>{{row.f_user_phone}}</nobr>
327
+ </td>
323
328
  <td style="text-align: center;">
324
329
  <nobr>{{row.f_payment}}</nobr>
325
330
  </td>
326
331
  <td style="text-align: center;">
327
332
  <nobr>{{row.f_meter_base}}</nobr>
328
333
  </td>
334
+ <td style="text-align: center;">
335
+ <nobr>{{row.f_using_base_old}}</nobr>
336
+ </td>
329
337
  <td style="text-align: center;">
330
338
  <nobr>{{row.f_balance_amount}}</nobr>
331
339
  </td>
@@ -354,9 +362,9 @@
354
362
  <td style="text-align: center;">
355
363
  <nobr>{{row.f_meternumber}}</nobr>
356
364
  </td>
357
- <td style="text-align: center;">
358
- <nobr>{{row.f_metertitles}}</nobr>
359
- </td>
365
+ <!-- <td style="text-align: center;">-->
366
+ <!-- <nobr>{{row.f_metertitles}}</nobr>-->
367
+ <!-- </td>-->
360
368
  <td style="text-align: center;">
361
369
  <nobr>{{row.f_meter_brand_old}}</nobr>
362
370
  </td>
@@ -369,9 +377,9 @@
369
377
  <td style="text-align: center;">
370
378
  <nobr>{{row.f_remanent_money}}</nobr>
371
379
  </td>
372
- <td style="text-align: center;">
373
- <nobr>{{row.f_serial_number}}</nobr>
374
- </td>
380
+ <!-- <td style="text-align: center;">-->
381
+ <!-- <nobr>{{row.f_serial_number}}</nobr>-->
382
+ <!-- </td>-->
375
383
  <td style="text-align: center;">
376
384
  <nobr>{{row.f_comments}}</nobr>
377
385
  </td>
@@ -405,6 +413,10 @@
405
413
  <td style="text-align: center;"><nobr>
406
414
  <button class="button_search button_spacing width-60" @click.stop="$parent.$parent.$parent.view(row)">查看</button>
407
415
  </nobr></td>
416
+ <td style="text-align: center;"><nobr>
417
+ <button v-if="!row.f_changetables_check_state && $login.r.includes('换表审核')" class="button_search button_spacing width-60" @click.stop="$parent.$parent.$parent.checkData(row)">审核</button>
418
+ <span v-if="row.f_changetables_check_state">{{row.f_changetables_check_state}}</span>
419
+ </nobr></td>
408
420
  <td style="text-align: center;">
409
421
  <nobr>{{row.f_changetables_check_date}}</nobr>
410
422
  </td>