manage-client 3.3.99 → 3.3.100

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.99",
3
+ "version": "3.3.100",
4
4
  "description": "经营管控模块前台组件",
5
5
  "main": "src/index.js",
6
6
  "directories": {
@@ -6,8 +6,8 @@
6
6
  <div class="form-group" v-if="!$parent.$parent.data.f_files_path"></div>
7
7
  <div novalidate class="form-horizontal select-overspread container-fluid auto" partial >
8
8
  <div class="row">
9
- <div class="col-sm-4" >
10
- <label class="font_normal_body" for="startDate">开始日期:</label>
9
+ <div class="col-sm-2 form-group" >
10
+ <label class="font_normal_body" for="startDate">开始日期</label>
11
11
  <datepicker id="startDate" placeholder="开始日期" style="width: 60%"
12
12
  v-model="model.startDate"
13
13
  :value.sync="model.startDate"
@@ -16,8 +16,8 @@
16
16
  :show-reset-button="reset">
17
17
  </datepicker>
18
18
  </div>
19
- <div class="col-sm-4" >
20
- <label class="font_normal_body" for="endDate">结束日期:</label>
19
+ <div class="col-sm-2 form-group" >
20
+ <label class="font_normal_body" for="endDate">结束日期</label>
21
21
  <datepicker id="endDate" placeholder="结束日期" style="width: 60%"
22
22
  v-model="model.endDate"
23
23
  :value.sync="model.endDate"
@@ -26,12 +26,12 @@
26
26
  :show-reset-button="reset">
27
27
  </datepicker>
28
28
  </div>
29
- <div class="col-sm-4">
30
- <label class="font_normal_body">&nbsp;&nbsp;&nbsp;公司&nbsp;&nbsp;&nbsp; </label>
29
+ <div class="col-sm-2 form-group">
30
+ <label class="font_normal_body">&nbsp;&nbsp;公&nbsp;&nbsp;&nbsp;司&nbsp;&nbsp; </label>
31
31
  <right-tree @re-res="$parent.$parent.getRes"></right-tree>
32
32
  </div>
33
- <div class="col-sm-4">
34
- <label class="font_normal_body">&nbsp;&nbsp;&nbsp;部门&nbsp;&nbsp;&nbsp; </label>
33
+ <div class="col-sm-2 form-group">
34
+ <label class="font_normal_body">&nbsp;&nbsp;部&nbsp;&nbsp;&nbsp;门&nbsp;&nbsp; </label>
35
35
  <res-select restype='department'
36
36
  is-mul="false"
37
37
  @res-select="$parent.$parent.getdep"
@@ -40,8 +40,8 @@
40
40
  </res-select>
41
41
 
42
42
  </div>
43
- <div class="col-sm-4">
44
- <label class="font_normal_body">&nbsp;&nbsp;&nbsp;人员&nbsp;&nbsp;&nbsp; </label>
43
+ <div class="col-sm-2 form-group">
44
+ <label class="font_normal_body">&nbsp;&nbsp;人&nbsp;&nbsp;&nbsp;员&nbsp;&nbsp; </label>
45
45
  <res-select restype='user'
46
46
  is-mul="false"
47
47
  @res-select="$parent.$parent.getuser"
@@ -49,7 +49,7 @@
49
49
  :initresid='$parent.$parent.operatorid'>
50
50
  </res-select>
51
51
  </div>
52
- <div class="col-sm-4">
52
+ <div class="col-sm-2 form-group">
53
53
  <label class="font_normal_body" title="参数名称:气表品牌">气表品牌</label>
54
54
  <v-select :value.sync="model.f_meter_brand"
55
55
  :options='$parent.$parent.meterBrands' placeholder='请选择' v-model="model.f_meter_brand"
@@ -6,7 +6,7 @@
6
6
  <div class="form-group" v-if="!$parent.$parent.data.f_files_path"></div>
7
7
  <div novalidate class="form-horizontal select-overspread container-fluid auto" partial >
8
8
  <div class="row">
9
- <div class="col-sm-4" >
9
+ <div class="col-sm-2 form-group" >
10
10
  <label class="font_normal_body" for="startDate">开始日期:</label>
11
11
  <datepicker id="startDate" placeholder="开始日期" style="width: 60%"
12
12
  v-model="model.startDate"
@@ -16,7 +16,7 @@
16
16
  :show-reset-button="reset">
17
17
  </datepicker>
18
18
  </div>
19
- <div class="col-sm-4" >
19
+ <div class="col-sm-2 form-group" >
20
20
  <label class="font_normal_body" for="endDate">结束日期:</label>
21
21
  <datepicker id="endDate" placeholder="结束日期" style="width: 60%"
22
22
  v-model="model.endDate"
@@ -26,12 +26,12 @@
26
26
  :show-reset-button="reset">
27
27
  </datepicker>
28
28
  </div>
29
- <div class="col-sm-4">
30
- <label class="font_normal_body">&nbsp;&nbsp;&nbsp;公司&nbsp;&nbsp;&nbsp; </label>
29
+ <div class="col-sm-2 form-group">
30
+ <label class="font_normal_body">&nbsp;&nbsp;公&nbsp;&nbsp;&nbsp;司&nbsp;&nbsp; </label>
31
31
  <right-tree @re-res="$parent.$parent.getRes"></right-tree>
32
32
  </div>
33
- <div class="col-sm-4">
34
- <label class="font_normal_body">&nbsp;&nbsp;&nbsp;部门&nbsp;&nbsp;&nbsp; </label>
33
+ <div class="col-sm-2 form-group">
34
+ <label class="font_normal_body">&nbsp;&nbsp;部&nbsp;&nbsp;&nbsp;门&nbsp;&nbsp; </label>
35
35
  <res-select restype='department'
36
36
  is-mul="false"
37
37
  @res-select="$parent.$parent.getdep"
@@ -40,8 +40,8 @@
40
40
  </res-select>
41
41
 
42
42
  </div>
43
- <div class="col-sm-4">
44
- <label class="font_normal_body">&nbsp;&nbsp;&nbsp;人员&nbsp;&nbsp;&nbsp; </label>
43
+ <div class="col-sm-2 form-group">
44
+ <label class="font_normal_body">&nbsp;&nbsp;人&nbsp;&nbsp;&nbsp;员&nbsp;&nbsp; </label>
45
45
  <res-select restype='user'
46
46
  is-mul="false"
47
47
  @res-select="$parent.$parent.getuser"
@@ -49,7 +49,7 @@
49
49
  :initresid='$parent.$parent.operatorid'>
50
50
  </res-select>
51
51
  </div>
52
- <div class="col-sm-4">
52
+ <div class="col-sm-2 form-group">
53
53
  <label class="font_normal_body" title="参数名称:气表类型">气表类型</label>
54
54
  <v-select :value.sync="model.f_meter_type"
55
55
  :options='$parent.$parent.metertypes' placeholder='请选择' v-model="model.f_meter_type"
@@ -57,7 +57,7 @@
57
57
  close-on-select></v-select>
58
58
  </div>
59
59
 
60
- <div class="col-sm-4">
60
+ <div class="col-sm-2 form-group">
61
61
  <label class="font_normal_body">收费类型</label>
62
62
  <v-select :value.sync="model.f_type" multiple
63
63
  :options='$parent.$parent.chargetype' placeholder='请选择'
@@ -6,8 +6,8 @@
6
6
  <div class="form-group" v-if="!$parent.$parent.data.f_files_path"></div>
7
7
  <div novalidate class="form-horizontal select-overspread container-fluid auto" partial >
8
8
  <div class="row">
9
- <div class="col-sm-4" >
10
- <label class="font_normal_body" for="startDate">开始日期:</label>
9
+ <div class="col-sm-2 form-group" >
10
+ <label class="font_normal_body" for="startDate">开始日期</label>
11
11
  <datepicker id="startDate" placeholder="开始日期" style="width: 60%"
12
12
  v-model="model.startDate"
13
13
  :value.sync="model.startDate"
@@ -16,8 +16,8 @@
16
16
  :show-reset-button="reset">
17
17
  </datepicker>
18
18
  </div>
19
- <div class="col-sm-4" >
20
- <label class="font_normal_body" for="endDate">结束日期:</label>
19
+ <div class="col-sm-2 form-group" >
20
+ <label class="font_normal_body" for="endDate">结束日期</label>
21
21
  <datepicker id="endDate" placeholder="结束日期" style="width: 60%"
22
22
  v-model="model.endDate"
23
23
  :value.sync="model.endDate"
@@ -26,12 +26,12 @@
26
26
  :show-reset-button="reset">
27
27
  </datepicker>
28
28
  </div>
29
- <div class="col-sm-4">
30
- <label class="font_normal_body">&nbsp;&nbsp;&nbsp;公司&nbsp;&nbsp;&nbsp; </label>
29
+ <div class="col-sm-2 form-group">
30
+ <label class="font_normal_body">&nbsp;&nbsp;公&nbsp;&nbsp;&nbsp;司&nbsp;&nbsp; </label>
31
31
  <right-tree @re-res="$parent.$parent.getRes"></right-tree>
32
32
  </div>
33
- <div class="col-sm-4">
34
- <label class="font_normal_body">&nbsp;&nbsp;&nbsp;部门&nbsp;&nbsp;&nbsp; </label>
33
+ <div class="col-sm-2 form-group">
34
+ <label class="font_normal_body">&nbsp;&nbsp;部&nbsp;&nbsp;&nbsp;门&nbsp;&nbsp; </label>
35
35
  <res-select restype='department'
36
36
  is-mul="false"
37
37
  @res-select="$parent.$parent.getdep"
@@ -40,8 +40,8 @@
40
40
  </res-select>
41
41
 
42
42
  </div>
43
- <div class="col-sm-4">
44
- <label class="font_normal_body">&nbsp;&nbsp;&nbsp;人员&nbsp;&nbsp;&nbsp; </label>
43
+ <div class="col-sm-2 form-group">
44
+ <label class="font_normal_body">&nbsp;&nbsp;人&nbsp;&nbsp;&nbsp;员&nbsp;&nbsp; </label>
45
45
  <res-select restype='user'
46
46
  is-mul="false"
47
47
  @res-select="$parent.$parent.getuser"
@@ -49,7 +49,7 @@
49
49
  :initresid='$parent.$parent.operatorid'>
50
50
  </res-select>
51
51
  </div>
52
- <div class="col-sm-4">
52
+ <div class="col-sm-2 form-group">
53
53
  <label class="font_normal_body" title="参数名称:气表类型">气表类型</label>
54
54
  <v-select :value.sync="model.f_meter_type"
55
55
  :options='$parent.$parent.metertypes' placeholder='请选择' v-model="model.f_meter_type"
@@ -57,8 +57,8 @@
57
57
  close-on-select></v-select>
58
58
  </div>
59
59
 
60
- <div class="col-sm-4">
61
- <label class="font_normal_body">收费方式/label>
60
+ <div class="col-sm-2 form-group">
61
+ <label class="font_normal_body">收费方式</label>
62
62
  <v-select :value.sync="model.f_payment" multiple
63
63
  :options='$parent.$parent.chargetype' placeholder='请选择'
64
64
  close-on-select clear-button
@@ -6,8 +6,8 @@
6
6
  <div class="form-group" v-if="!$parent.$parent.data.f_files_path"></div>
7
7
  <div novalidate class="form-horizontal select-overspread container-fluid auto" partial >
8
8
  <div class="row">
9
- <div class="col-sm-4" >
10
- <label class="font_normal_body" for="startDate">统计日期:</label>
9
+ <div class="col-sm-2 form-group" >
10
+ <label class="font_normal_body" for="startDate">统计日期</label>
11
11
  <datepicker id="startDate" placeholder="统计日期" style="width: 60%"
12
12
  v-model="model.selectDate"
13
13
  :value.sync="model.selectDate"
@@ -16,12 +16,12 @@
16
16
  :show-reset-button="reset">
17
17
  </datepicker>
18
18
  </div>
19
- <div class="col-sm-4">
20
- <label class="font_normal_body">&nbsp;&nbsp;&nbsp;公司&nbsp;&nbsp;&nbsp; </label>
19
+ <div class="col-sm-2 form-group">
20
+ <label class="font_normal_body">&nbsp;&nbsp;公&nbsp;&nbsp;&nbsp;司&nbsp;&nbsp; </label>
21
21
  <right-tree @re-res="$parent.$parent.getRes"></right-tree>
22
22
  </div>
23
- <div class="col-sm-4">
24
- <label class="font_normal_body">&nbsp;&nbsp;&nbsp;部门&nbsp;&nbsp;&nbsp; </label>
23
+ <div class="col-sm-2 form-group">
24
+ <label class="font_normal_body">&nbsp;&nbsp;部&nbsp;&nbsp;&nbsp;门&nbsp;&nbsp; </label>
25
25
  <res-select restype='department'
26
26
  is-mul="false"
27
27
  @res-select="$parent.$parent.getdep"
@@ -30,8 +30,8 @@
30
30
  </res-select>
31
31
 
32
32
  </div>
33
- <div class="col-sm-4">
34
- <label class="font_normal_body">&nbsp;&nbsp;&nbsp;人员&nbsp;&nbsp;&nbsp; </label>
33
+ <div class="col-sm-2 form-group">
34
+ <label class="font_normal_body">&nbsp;&nbsp;人&nbsp;&nbsp;&nbsp;员&nbsp;&nbsp; </label>
35
35
  <res-select restype='user'
36
36
  is-mul="false"
37
37
  @res-select="$parent.$parent.getuser"
@@ -39,7 +39,7 @@
39
39
  :initresid='$parent.$parent.operatorid'>
40
40
  </res-select>
41
41
  </div>
42
- <div class="col-sm-4">
42
+ <div class="col-sm-2 form-group">
43
43
  <label class="font_normal_body" title="参数名称:气表类型">气表类型</label>
44
44
  <v-select :value.sync="model.f_meter_type"
45
45
  :options='$parent.$parent.metertypes' placeholder='请选择' v-model="model.f_meter_type"
@@ -47,7 +47,7 @@
47
47
  close-on-select></v-select>
48
48
  </div>
49
49
 
50
- <div class="col-sm-4">
50
+ <div class="col-sm-2 form-group">
51
51
  <label class="font_normal_body">收费方式</label>
52
52
  <v-select :value.sync="model.f_payment" multiple
53
53
  :options='$parent.$parent.chargetype' placeholder='请选择'
@@ -394,7 +394,6 @@
394
394
  criteriaShow:false,
395
395
  outlets: [],
396
396
  gasproperties:[{label: '全部', value: ''}],
397
- addressState:[{label: '全部', value: ''}, {label: '已通气', value: '已通气'}, {label: '已通气', value: '已通气'}],
398
397
  operator: [],
399
398
  WarningType: [
400
399
  {label: '全部', value: ''}
@@ -606,6 +605,9 @@
606
605
  },
607
606
  userstate() {
608
607
  return [{label: '全部', value: ''}, ...this.$appdata.getParam('用户状态')]
608
+ },
609
+ addressState() {
610
+ return [{label: '全部', value: ''}, ...this.$appdata.getParam('是否通气')]
609
611
  }
610
612
  }
611
613
  }
@@ -589,6 +589,7 @@
589
589
  <th><nobr>通气人</nobr></th>
590
590
  <!-- <th><nobr>点火状态</nobr></th>-->
591
591
  <th><nobr>抄表册编号</nobr></th>
592
+ <th><nobr>抄表册名称</nobr></th>
592
593
 
593
594
  <th><nobr>抄表册顺序</nobr></th>
594
595
  <th><nobr>表剩余金额</nobr></th>
@@ -724,7 +725,8 @@
724
725
  <td style="text-align: center;"><nobr>{{row.f_install_person}}</nobr></td>
725
726
  <td style="text-align: center;"><nobr>{{row.f_gas_person}}</nobr></td>
726
727
  <!-- <td style="text-align: center;"><nobr>{{row.f_fire_state}}</nobr></td>-->
727
- <td style="text-align: center;"><nobr>{{row.f_meter_book_num}}</nobr></td>
728
+ <td style="text-align: center;"><nobr>{{row.f_book_code}}</nobr></td>
729
+ <td style="text-align: center;"><nobr>{{row.f_book_name}}</nobr></td>
728
730
 
729
731
  <td style="text-align: center;"><nobr>{{row.f_meter_book_sort}}</nobr></td>
730
732
  <td style="text-align: center;"><nobr>{{row.f_balance_amount}}</nobr></td>
@@ -33,7 +33,7 @@ export default{
33
33
  'f_total_usegas_amount': '累计用气金额', 'f_total_gas': '表累购气量', 'f_total_fee': '表累购金额', 'f_inputtor': '档案抄表员',
34
34
  'f_book_inputtor': '表册抄表员',
35
35
  'f_userfiles_address': '安装地址', 'f_install_person': '安装人', 'f_gas_person': '通气人',
36
- 'f_meter_book_num': '抄表册编号', 'f_meter_book_sort': '抄表册顺序',
36
+ 'f_book_code': '抄表册编号', 'f_book_name': '抄表册名称','f_meter_book_sort': '抄表册顺序',
37
37
  'f_balance_amount': '表剩余金额', 'f_times': '写卡次数', 'f_defendcard': '防盗卡号1', 'f_defendcard_two': '防盗卡号2',
38
38
  'f_fillcard_times': '补卡次数', 'f_sendsuccess': '表同步状态', 'f_isband': '微信绑定', 'f_cost_type': '缴费类型'
39
39
  , 'f_bank_accopen': '银行户名', 'f_bank_name': '银行名称', 'f_bank_account': '银行账号',
@@ -605,6 +605,7 @@
605
605
 
606
606
  let readySomething = async function (self) {
607
607
  self.$MagGetSaleParam.initinputtor();
608
+ await self.$MagLoadParams.loadParam()
608
609
  self.getinputtores();
609
610
  self.initParams()
610
611
  // 获取区县
@@ -418,6 +418,7 @@
418
418
  config: {
419
419
  defaultPrint: ['f_userinfo_code','f_user_id']
420
420
  },
421
+ f_filialeid: this.$login.f.orgid,
421
422
  show:false,
422
423
  rowdata:{},
423
424
  initres: {