manage-client 3.3.137 → 3.3.138

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.137",
3
+ "version": "3.3.138",
4
4
  "description": "经营管控模块前台组件",
5
5
  "main": "src/index.js",
6
6
  "directories": {
@@ -52,7 +52,7 @@
52
52
  <thead>
53
53
  <tr>
54
54
  <th colspan='6' style="font-weight: bold; text-align: left;">
55
- <h3 style="text-align: center">抄表气价统计报表</h3>
55
+ <h3 style="text-align: center">抄表分类统计报表</h3>
56
56
  </th>
57
57
  </tr>
58
58
  <tr>
@@ -1,54 +1,58 @@
1
- export default{
2
- //查询页面的字段名和中文对应
3
- ReportDataQuery:
4
- {
5
- "用户编号":"f_userinfo_code",
6
- "用户名称":"f_user_name",
7
- "表号":"f_meternumber",
8
- "本次抄表底数":"f_tablebase",
9
- "上次抄表底数":"f_last_tablebase",
10
- "表上余额":"f_jval",
11
- "抄表日期":"f_hand_date",
12
-
13
- "上次抄表日期":"f_last_hand_date",
14
- "开户日期":"f_gas_date",
15
- "软件版本号":"f_software_version",
16
- "表状态信息":"f_table_msg",
17
- "上次表状态信息":"f_last_meter_state_msg",
18
-
19
- "插入日期":"f_insert_date",
20
- "上次插入日期":"f_last_insertdate",
21
- "是否结算":"f_whether_clear",
22
- "超用气量":"f_super_gas",
23
- "电量等级":"f_electricity",
24
-
25
- "购气次数":"f_times",
26
- "单价":"f_price",
27
- "信号强度":"f_signal",
28
- "信噪比":"f_snr",
29
- "电压":"f_batterylevel",
30
-
31
- "阀门强制状态":"f_networkshutvalve",
32
- "阀门状态":"f_valvestate",
33
- "计量类型":"f_wmprepaytype",
34
- "上报类型":"f_upload_type",
35
- "金额状态":"f_moneystate",
36
-
37
- "增加工况瞬时":"operatingModeFlow",
38
- "标况瞬时":"standardConditionFlow",
39
- "开盖状态" :"f_SplitAlarm",
40
- "液晶状态" : "f_XTIpllStopFlag",
41
- "声速" :"soundVelocity",
42
-
43
- "外电低电":"f_lowlithiumbattery",
44
- "磁干扰异常":"f_magneticinterference",
45
- "表内剩余金额":"f_meterbalanceamt",
46
- "表内累计充值金额":"f_meterdebitamt",
47
- "补偿状态":"f_compensatestate",
48
- "气表品牌":"f_meter_brand",
49
- "气表型号":"f_meter_style",
50
- "分公司":"f_orgname"
51
-
52
- }
1
+ export default {
2
+ // 查询页面的字段名和中文对应
3
+ ReportDataQuery: {
4
+ '用户编号': 'f_userinfo_code',
5
+ '用户名称': 'f_user_name',
6
+ '用户地址': 'f_address',
7
+ '小区': 'f_residential_area',
8
+ '用户类型': 'f_user_type',
9
+ '用气类型': 'f_user_nature',
10
+ '用气性质': 'f_gasproperties',
11
+ '表号': 'f_meternumber',
12
+ '本次抄表底数': 'f_tablebase',
13
+ '上次抄表底数': 'f_last_tablebase',
14
+ '表上余额': 'f_jval',
15
+ '抄表日期': 'f_hand_date',
16
+
17
+ '上次抄表日期': 'f_last_hand_date',
18
+ '开户日期': 'f_gas_date',
19
+ '软件版本号': 'f_software_version',
20
+ '表状态信息': 'f_table_msg',
21
+ '上次表状态信息': 'f_last_meter_state_msg',
22
+
23
+ '插入日期': 'f_insert_date',
24
+ '上次插入日期': 'f_last_insertdate',
25
+ '是否结算': 'f_whether_clear',
26
+ '超用气量': 'f_super_gas',
27
+ '电量等级': 'f_electricity',
28
+
29
+ '购气次数': 'f_times',
30
+ '单价': 'f_price',
31
+ '信号强度': 'f_signal',
32
+ '信噪比': 'f_snr',
33
+ '电压': 'f_batterylevel',
34
+
35
+ '阀门强制状态': 'f_networkshutvalve',
36
+ '阀门状态': 'f_valvestate',
37
+ '计量类型': 'f_wmprepaytype',
38
+ '上报类型': 'f_upload_type',
39
+ '金额状态': 'f_moneystate',
40
+
41
+ '增加工况瞬时': 'operatingModeFlow',
42
+ '标况瞬时': 'standardConditionFlow',
43
+ '开盖状态': 'f_SplitAlarm',
44
+ '液晶状态': 'f_XTIpllStopFlag',
45
+ '声速': 'soundVelocity',
46
+
47
+ '外电低电': 'f_lowlithiumbattery',
48
+ '磁干扰异常': 'f_magneticinterference',
49
+ '表内剩余金额': 'f_meterbalanceamt',
50
+ '表内累计充值金额': 'f_meterdebitamt',
51
+ '补偿状态': 'f_compensatestate',
52
+ '气表品牌': 'f_meter_brand',
53
+ '气表型号': 'f_meter_style',
54
+ '分公司': 'f_orgname'
55
+
56
+ }
53
57
 
54
58
  }
@@ -16,6 +16,11 @@
16
16
  <input type="text" style="width:60%" class="input_search" v-model="model.f_user_name"
17
17
  condition=" f_user_name like '%{}%'" placeholder='客户名称'>
18
18
  </div>
19
+ <div class="col-sm-2 form-group">
20
+ <label class="font_normal_body">用户地址</label>
21
+ <input type="text" style="width:60%" class="input_search" v-model="model.f_address"
22
+ condition="f_address like '%{}%'" placeholder='客户地址'>
23
+ </div>
19
24
  <!-- <div class="col-sm-2">-->
20
25
  <!-- <label class="font_normal_body">组织机构</label>-->
21
26
  <!-- <res-select :initresid="$parent.$parent.org"-->
@@ -25,7 +30,7 @@
25
30
  <!-- </res-select>-->
26
31
 
27
32
  <!-- </div>-->
28
- <div class="col-sm-2">
33
+ <div class="col-sm-2 form-group">
29
34
  <label class="font_normal_body">&emsp;公司&emsp;</label>
30
35
  <right-tree @re-res="$parent.$parent.getorg"
31
36
  :initresid='$parent.$parent.org'></right-tree>
@@ -50,6 +55,11 @@
50
55
  <input type="text" style="width:60%" class="input_search" v-model="model.f_meternumber"
51
56
  condition="f_meternumber like '%{}%'" placeholder='表号'>
52
57
  </div>
58
+ <div class="col-sm-2 form-group">
59
+ <label class="font_normal_body">&nbsp;&nbsp;&nbsp;小区&nbsp;&nbsp;&nbsp;</label>
60
+ <input type="text" style="width:60%" class="input_search" v-model="model.f_residential_area"
61
+ condition="f_residential_area like '%{}%'" placeholder='小区'>
62
+ </div>
53
63
  <div class="col-sm-2 form-group">
54
64
  <label class="font_normal_body">气表品牌</label>
55
65
  <v-select
@@ -92,6 +102,28 @@
92
102
  condition="f_insert_date <= '{}'">
93
103
  </datepicker>
94
104
  </div>
105
+ <div class="col-sm-2 form-group">
106
+ <label class="font_normal_body">客户类型</label>
107
+ <v-select :value.sync="model.f_user_type"
108
+ @change="$parent.$parent.userTypeChange()"
109
+ :options='$parent.$parent.usertypes' placeholder='请选择' v-model="model.f_user_type"
110
+ condition="f_user_type = '{}'"
111
+ close-on-select></v-select>
112
+ </div>
113
+ <div class="col-sm-2 form-group">
114
+ <label class="font_normal_body">用气性质</label>
115
+ <v-select :value.sync="model.f_gasproperties" v-model="model.f_gasproperties"
116
+ :options='$parent.$parent.gasproperties' placeholder='请选择'
117
+ condition="f_gasproperties = '{}'"
118
+ close-on-select></v-select>
119
+ </div>
120
+ <div class="col-sm-2 form-group">
121
+ <label class="font_normal_body">用气类型</label>
122
+ <v-select :value.sync="model.f_user_nature" v-model="model.f_user_nature"
123
+ :options='$parent.$parent.usernatures' placeholder='请选择'
124
+ condition="f_user_nature = '{}'"
125
+ close-on-select></v-select>
126
+ </div>
95
127
  </div>
96
128
 
97
129
  </div>
@@ -157,6 +189,7 @@
157
189
  styles:false,
158
190
  headData: [],
159
191
  bodyData: [],
192
+ gasproperties:[],
160
193
  orgCondtionStr: " and f_filialeid in (" + this.$login.f.orgid+")",
161
194
  resshow:['company'],
162
195
  org:[this.$login.f.orgid],
@@ -188,6 +221,16 @@
188
221
  })
189
222
  },
190
223
  methods: {
224
+ userTypeChange () {
225
+ this.gasproperties=[]
226
+ if(this.$refs.paged.$refs.cri.model !==null) {
227
+ this.$refs.paged.$refs.cri.model.f_gasproperties=''
228
+ this.gasproperties = this.$appdata.getParam(this.$refs.paged.$refs.cri.model.f_user_type[0])
229
+ }
230
+ else{
231
+ this.gasproperties =[{label: '全部', value: ''}]
232
+ }
233
+ },
191
234
  initParams() {
192
235
  // 初始化气表品牌
193
236
  let brandArr = []
@@ -263,6 +306,12 @@
263
306
  metertypes() {
264
307
  return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('气表类型')]
265
308
  },
309
+ usernatures(){
310
+ return [{label: '全部', value: ''}, ...this.$appdata.getParam('用气类型')]
311
+ },
312
+ usertypes() {
313
+ return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('用户类型')]
314
+ },
266
315
  getCondition() {
267
316
  return {
268
317
  startDate: this.$refs.paged.$refs.cri.model.startDate,