manage-client 3.3.249 → 3.3.251

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.249",
3
+ "version": "3.3.251",
4
4
  "description": "经营管控模块前台组件",
5
5
  "main": "src/index.js",
6
6
  "directories": {
@@ -109,22 +109,22 @@
109
109
  <label class="font_normal_body">时间区间</label>
110
110
  <datepicker :disabled-days-of-Week="[]" :format="'yyyy-MM-dd'"
111
111
  :show-reset-button="reset"
112
- :value.sync="$parent.$parent.startDate1"
112
+ :value.sync="$parent.$parent.startDate"
113
113
  id="startDate"
114
114
  style="width:60%"
115
115
  placeholder="开始时间"
116
- v-model="$parent.$parent.startDate1">
116
+ v-model="$parent.$parent.startDate">
117
117
  </datepicker>
118
118
  </div>
119
119
  <div class="col-sm-2 form-group">
120
120
  <label class="font_normal_body" style="word-break:keep-all;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;至&nbsp;&nbsp;&nbsp;</label>
121
121
  <datepicker :disabled-days-of-Week="[]" :format="'yyyy-MM-dd'"
122
122
  :show-reset-button="reset"
123
- :value.sync="$parent.$parent.endDate1"
123
+ :value.sync="$parent.$parent.endDate"
124
124
  style="width:60%"
125
125
  id="endDate"
126
126
  placeholder="结束日期"
127
- v-model="$parent.$parent.endDate1">
127
+ v-model="$parent.$parent.endDate">
128
128
  </datepicker>
129
129
  </div>
130
130
  <div class="col-sm-2 form-group flex-row" style="white-space: nowrap">
@@ -167,13 +167,6 @@
167
167
  close-on-select
168
168
  condition="f_house_type = '{}'"></v-select>
169
169
  </div>
170
- <div class="col-sm-2 form-group">
171
- <label class="font_normal_body">安装位置</label>
172
- <v-select :value.sync="model.f_position" v-model="model.f_position"
173
- :options='$parent.$parent.positions' placeholder='请选择'
174
- condition="f_position = '{}'"
175
- close-on-select></v-select>
176
- </div>
177
170
  <div class="col-sm-2 form-group flex-row" style="white-space: nowrap">
178
171
  <label class="font_normal_body">期末结余</label>
179
172
  <div class="row">
@@ -249,6 +242,9 @@
249
242
  <th style="text-align:center">
250
243
  <nobr>表号</nobr>
251
244
  </th>
245
+ <th style="text-align:center">
246
+ <nobr>用气类型</nobr>
247
+ </th>
252
248
  <th style="text-align:center">
253
249
  <nobr>用气性质</nobr>
254
250
  </th>
@@ -303,6 +299,9 @@
303
299
  <template partial='body'>
304
300
  <td>{{row.f_userinfo_code}}</td>
305
301
  <td style="text-align:center">{{row.f_meternumber}}</td>
302
+ <td>
303
+ <nobr>{{row.f_user_usetype}}</nobr>
304
+ </td>
306
305
  <td style="text-align:center">{{row.f_gasproperties}}</td>
307
306
  <td style="text-align:center">{{row.f_user_phone}}</td>
308
307
  <!--<td style="text-align:center">{{row.f_gasproperties2}}</td>-->
@@ -407,13 +406,11 @@ import {HttpResetClass, PagedList} from 'vue-client'
407
406
  operator: [],
408
407
  filename: '',
409
408
  searchshow: true,
410
- startDate1:'',
411
- endDate1:'',
412
409
  userusetypes: [],
413
410
  useinstitutions: [],
414
411
  userusenatures: [],
415
- // startDate: '',
416
- // endDate: '',
412
+ startDate: '',
413
+ endDate: '',
417
414
  echarts: false,
418
415
  isActiveTotalForm: false,
419
416
  condition: '1=1',
@@ -424,6 +421,7 @@ import {HttpResetClass, PagedList} from 'vue-client'
424
421
  'f_user_type':'客户类型',
425
422
  'f_gasproperties': '用气性质',
426
423
  'f_user_name': '客户名称',
424
+ 'f_user_usetype': '用气类型',
427
425
  'f_user_phone':'客户电话',
428
426
  'f_residential_area': '小区',
429
427
  'f_price':'用气单价',
@@ -456,14 +454,10 @@ import {HttpResetClass, PagedList} from 'vue-client'
456
454
  }
457
455
  },
458
456
  ready() {
459
- readyGen(this)
460
- console.log('444444444', Util.addDate(new Date(),-6).substring(0,10))
461
- this.$refs.paged.$refs.cri.model.startDate = Util.addDate(new Date(),-4).substring(0,10) + ' 00:00:00'
462
- this.$refs.paged.$refs.cri.model.endDate = Util.toStandardDateString() + ' 23:59:59'
463
- this.startDate1 = Util.addDate(new Date(),-4).substring(0,10)
464
- this.endDate1 = Util.toStandardDateString()
465
- // this.$refs.paged.$refs.cri.search()
466
- this.getfield = this.config.excelHeaders
457
+ readyGen(this)
458
+ this.getfield = this.config.excelHeaders
459
+ this.startDate = Util.addDate(new Date(),-4).substring(0,10) + ' 00:00:00'
460
+ this.endDate = Util.toStandardDateString() + ' 23:59:59'
467
461
  },
468
462
  methods: {
469
463
  userUseTypeChange () {
@@ -536,8 +530,8 @@ import {HttpResetClass, PagedList} from 'vue-client'
536
530
  search(args) {
537
531
  // this.startDate = this.$refs.paged.$refs.cri.model.startDate
538
532
  // this.endDate = this.$refs.paged.$refs.cri.model.endDate
539
- this.$refs.paged.$refs.cri.model.startDate = this.startDate1 + ' 00:00:00'
540
- this.$refs.paged.$refs.cri.model.endDate = this.endDate1 + ' 23:59:59'
533
+ this.$refs.paged.$refs.cri.model.startDate = this.startDate
534
+ this.$refs.paged.$refs.cri.model.endDate = this.endDate
541
535
  console.log('--------------------', args)
542
536
  console.log('--------------------', this)
543
537
  if (this.endDate1 == '' || this.startDate1 == '') {
@@ -603,12 +597,6 @@ import {HttpResetClass, PagedList} from 'vue-client'
603
597
  }
604
598
  },
605
599
  computed: {
606
- startDate(){
607
- return this.startDate1 + ' 00:00:00'
608
- },
609
- endDate(){
610
- return this.endDate1 + ' 23:59:59'
611
- },
612
600
  houseTypes() {
613
601
  return [{label: '全部', value: ''}, ...this.$appdata.getParam('房屋类型')]
614
602
  },
@@ -47,7 +47,7 @@
47
47
  <button class="button_clear button_spacing" @click="$parent.$parent.clearmsg">清空</button>
48
48
  <export-excel :data="$parent.$parent.getCondition" class="button_export button_spacing"
49
49
  :field="$parent.$parent.getfield"
50
- sqlurl="api/af-revenue/logic/openapi/exportfile" sql-name="DrillErrorByUserinfo" template-name='异常分析'
50
+ sqlurl="api/af-revenue/logic/openapi/exportfile" sql-name="getExceptionList" template-name='异常分析'
51
51
  :choose-col="true"></export-excel>
52
52
  <!--<button class="button_export button_spacing" style="width: max-content" @click="$parent.$parent.showTotalForm()">显示汇总</button>-->
53
53
  <!-- <button class="button_search button_spacing" @click="$parent.$parent.showEcharts()">显示图表</button>-->
@@ -190,6 +190,14 @@
190
190
  <input type="text" style="width:60%" class="input_search" v-model="model.f_bill_number_end"
191
191
  condition="f_bill_number <= '{}'" placeholder="收据终止编号">
192
192
  </div>
193
+ <div class="col-sm-2 form-group">
194
+ <label class="font_normal_body">审核状态</label>
195
+ <v-select :value.sync="model.f_audit_state"
196
+ v-model="model.f_audit_state"
197
+ :options='$parent.$parent.auditState' placeholder='请选择'
198
+ condition="f_audit_state in {}"
199
+ ></v-select>
200
+ </div>
193
201
  </div>
194
202
  </div>
195
203
  </criteria>
@@ -297,7 +305,11 @@
297
305
  <th>
298
306
  <nobr>公司</nobr>
299
307
  </th>
308
+ <th>
309
+ <nobr>审核状态</nobr>
310
+ </th>
300
311
  <th><nobr>附件</nobr></th>
312
+ <th><nobr>操作</nobr></th>
301
313
  <!--<th><nobr>查看详情</nobr></th>-->
302
314
  </tr>
303
315
  </template>
@@ -397,9 +409,15 @@
397
409
  <td style="text-align: center;">
398
410
  <nobr>{{row.f_orgname}}</nobr>
399
411
  </td>
412
+ <td style="text-align: center;">
413
+ <nobr>{{row.f_audit_state}}</nobr>
414
+ </td>
400
415
  <td style="text-align: center;"><nobr>
401
416
  <button class="button_search button_spacing width-60" @click.stop="$parent.$parent.$parent.view(row)">查看</button>
402
417
  </nobr></td>
418
+ <td style="text-align: center;"><nobr>
419
+ <button class="button_search button_spacing width-60" @click.stop="$parent.$parent.$parent.confirmPay(row)">确认收款</button>
420
+ </nobr></td>
403
421
  <!--<td style="text-align: center;">-->
404
422
  <!--<button class="btn btn-link" @click.stop="$parent.$parent.$parent.showchargedetail(row)">查看</button>-->
405
423
  <!--</td>-->
@@ -528,6 +546,20 @@
528
546
  })
529
547
  },
530
548
  methods: {
549
+ confirmPay(row){
550
+ console.log('---------',row)
551
+ this.otherchargeid = row.f_othercharge_id
552
+ this.$showMessage('是否确认收款?', ['confirm', 'cancel']).then(
553
+ (response) => {
554
+ if (response === 'confirm') {
555
+ let sql = `update t_othercharge set f_audit_state = '审核通过' where id = '${row.id}'`
556
+ let updateData = this.$resetpost('api/af-revenue/logic/runSQL', {data: {sql: sql}}, {resolveMsg: '已确认', rejectMsg: '审核失败!!!'})
557
+ this.search()
558
+ } else if (response === 'cancel') {
559
+ this.$dispatch('cancel')
560
+ }
561
+ })
562
+ },
531
563
  view(row){
532
564
  this.showupload = true
533
565
  this.selected= row
@@ -749,7 +781,10 @@
749
781
  },
750
782
  payments() {
751
783
  return [{label: '全部', value: ''}, ...this.$appdata.getParam('付款方式')]
784
+ },
785
+ auditState() {
786
+ return [{label: '全部', value: ''}, {label: '未审核', value: '未审核'}, {label: '审核通过', value: '审核通过'}]
787
+ }
752
788
  }
753
- }
754
789
  }
755
790
  </script>