sale-client 3.5.208 → 3.5.209

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": "sale-client",
3
- "version": "3.5.208",
3
+ "version": "3.5.209",
4
4
  "description": "收费模块前台组件",
5
5
  "main": "src/index.js",
6
6
  "scripts": {
@@ -281,7 +281,7 @@
281
281
  class="form-group">
282
282
  <label class="font_normal_body">表&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;号</label>
283
283
  <input class="input_search" condition="f_meternumber ='{}'" placeholder='表号' style="width:60%"
284
- type="text" v-model.trim="model.f_meternumber">
284
+ type="text" v-model="model.f_meternumber">
285
285
  </div>
286
286
  </div>
287
287
  </div>
@@ -24,13 +24,13 @@
24
24
 
25
25
  <div class="col-sm-4 form-group" v-if="isiot" :class="[$m.f_meternumber.required ? 'has-error' : '']">
26
26
  <label for="f_meternumber" class="font_normal_body">&ensp;表&emsp;&emsp;号</label>
27
- <input type="text" class="input_search" style="width:60%" v-model.trim="row.f_meternumber"
27
+ <input type="text" class="input_search" style="width:60%" v-model="row.f_meternumber"
28
28
  @blur="meternumberValidate()" placeholder='表号' v-validate:f_meternumber='{required: true }'
29
29
  v-next-el="{id: 'metertitles'}">
30
30
  </div>
31
31
  <div class="col-sm-4 form-group" v-else>
32
32
  <label for="f_meternumber" class="font_normal_body">&ensp;表&emsp;&emsp;号</label>
33
- <input type="text" class="input_search" style="width:60%" v-model.trim="row.f_meternumber"
33
+ <input type="text" class="input_search" style="width:60%" v-model="row.f_meternumber"
34
34
  @blur="meternumberValidate()" placeholder='表号'
35
35
  v-next-el="{id: 'metertitles'}">
36
36
  </div>
@@ -16,6 +16,13 @@
16
16
  placeholder="客户电话" v-el:phone v-next-el="area">
17
17
  <button type="button" class="glyphicon glyphicon-plus" @click.stop="phoneManage()"></button>
18
18
  </div>
19
+
20
+ <div style="" class="col-sm-4 form-group">
21
+ <label for="f_rent_phone" class="font_normal_body">&ensp;曾用电话</label>
22
+ <input type="text" v-model="baseinfo.base.f_rent_phone" class="input_search" style="width:60%"
23
+ placeholder="曾用电话">
24
+ </div>
25
+
19
26
  <div class="col-sm-4 form-group" style="" v-if="true">
20
27
  <label for="f_user_state" class="font_normal_body">&ensp;客户状态</label>
21
28
  <v-select :value.sync="baseinfo.base.f_user_state"
@@ -67,11 +74,6 @@
67
74
  <input type="text" v-model="baseinfo.base.f_used_name" class="input_search" style="width:60%"
68
75
  placeholder="曾用名">
69
76
  </div>
70
- <div style="" class="col-sm-4 form-group">
71
- <label for="f_rent_phone" class="font_normal_body">&ensp;备用电话</label>
72
- <input type="text" v-model="baseinfo.base.f_rent_phone" class="input_search" style="width:60%"
73
- placeholder="备用电话">
74
- </div>
75
77
  <div class="col-sm-4 form-group" :class="[$v.f_people_num.dctest ? 'has-error' : '']">
76
78
  <label for="f_people_num" class="font_normal_body">&ensp;人&ensp;口&ensp;数</label>
77
79
  <input type="number" v-model="baseinfo.base.f_people_num" v-validate:f_people_num='{dctest: [0, ">=" ]}'
@@ -203,7 +205,7 @@
203
205
  </div>
204
206
  </form>
205
207
  </validator>
206
- <modal v-if="showselectaddress" :show.sync="showselectaddress" width="80%" title="地址信息" v-ref:modal large backdrop="false">
208
+ <modal v-if="showselectaddress" :show.sync="showselectaddress" width="50%" height="80%" title="地址信息" v-ref:modal large backdrop="false">
207
209
  <article slot="modal-body" class="modal-body" style="height: 700px;padding: 0!important;">
208
210
  <file-address-manage :is-select="isSelect" :fileinfo="addressinfo"
209
211
  @address-valid="doNothing" :showselectaddress.sync="showselectaddress" v-ref:fileaddress ></file-address-manage>
@@ -26,7 +26,7 @@
26
26
  </div>
27
27
  <div class="col-sm-3 form-group" >
28
28
  <label class="font_normal_body">&emsp;&emsp;&emsp;表&emsp;&emsp;号</label>
29
- <input type="text" class="input-underline" style="width:60%" v-model.trim="meter.f_meternumber" readonly
29
+ <input type="text" class="input-underline" style="width:60%" v-model="meter.f_meternumber" readonly
30
30
  placeholder='表号' >
31
31
  </div>
32
32
  <div class="col-sm-3 form-group" >
@@ -5,7 +5,7 @@
5
5
  <div class="row">
6
6
  <div class="col-sm-4 form-group" :class="[$m.meternumber.required ? 'has-error' : '']">
7
7
  <label for="f_meternumber" class="font_normal_body">&ensp;表&emsp;&emsp;号</label>
8
- <input type="text" class="input_search" style="width:60%" v-model.trim="row.f_meternumber"
8
+ <input type="text" class="input_search" style="width:60%" v-model="row.f_meternumber"
9
9
  @blur="meternumberValidate()" placeholder='表号'
10
10
  v-next-el="{id: 'metertitles'}">
11
11
  </div>
@@ -8,7 +8,7 @@
8
8
  <div class="row auto">
9
9
  <div class="col-sm-3" :class="[$m.meternumber.required ? 'has-error' : '']">
10
10
  <label for="f_meternumber" class="font_normal_body">&nbsp;&nbsp;&nbsp;表号&nbsp;&nbsp;&nbsp;</label>
11
- <input type="text" class="input_search" style="width:60%" v-model.trim="row.f_meternumber"
11
+ <input type="text" class="input_search" style="width:60%" v-model="row.f_meternumber"
12
12
  v-validate:meternumber='{required: true }' @blur="meternumberValidate()" placeholder='表号'
13
13
  v-next-el="{id: 'metertitles'}">
14
14
  </div>
@@ -42,7 +42,7 @@
42
42
  </div>
43
43
  <div class="form-group col-sm-2">
44
44
  <label class="font_normal_body">表&emsp;&emsp;号</label>
45
- <input type="text" class="input_search" style="width:60%" v-model.trim="model.f_meternumber" placeholder='表号'
45
+ <input type="text" class="input_search" style="width:60%" v-model="model.f_meternumber" placeholder='表号'
46
46
  condition="f_meternumber = '{}'">
47
47
  </div>
48
48
  <div class="form-group col-sm-2">
@@ -44,7 +44,7 @@
44
44
  </div>
45
45
  <div class="form-group col-sm-3">
46
46
  <label class="font_normal_body">表&emsp;&emsp;号</label>
47
- <input type="text" class="input_search" style="width:60%" style="width:60%" v-model.trim="model.f_meternumber" placeholder='表号'
47
+ <input type="text" class="input_search" style="width:60%" style="width:60%" v-model="model.f_meternumber" placeholder='表号'
48
48
  condition="u.f_meternumber like '%{}%'">
49
49
  </div>
50
50
 
@@ -43,7 +43,7 @@
43
43
  <div class="form-group col-sm-4">
44
44
  <label class="font_normal_body">表&emsp;&emsp;号</label>
45
45
  <input type="text" class="input_search" style="width:60%" style="width:60%"
46
- v-model.trim="model.f_meternumber" placeholder='表号'
46
+ v-model="model.f_meternumber" placeholder='表号'
47
47
  condition="f_meternumber like '%{}%'">
48
48
  </div>
49
49
 
@@ -177,6 +177,9 @@
177
177
  <!-- <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">-->
178
178
  <!-- 应交合计:&emsp;{{model.sums.f_oughtfee}}-->
179
179
  <!-- </td>-->
180
+ <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">
181
+ 气量合计:&emsp;{{model.sums.f_pregas}}
182
+ </td>
180
183
  <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">
181
184
  实收合计:&emsp;{{ model.sums.f_collection }}
182
185
  </td>
@@ -224,7 +227,8 @@ export default {
224
227
  reissue_data: null,
225
228
  condition: '1=1',
226
229
  model: new PagedList(`${this.row.f_meter_type === '物联网表' ? 'rs/sql/sale_WebChargeQuery' : 'rs/sql/sale_ChargeQuery'}`, 20, {f_user_id: this.row.f_user_id}, {
227
- f_collection: 0
230
+ f_collection: 0,
231
+ f_pregas:0
228
232
  }),
229
233
  isIot: this.row.f_meter_type === '物联网表',
230
234
  show: false,
@@ -246,8 +250,9 @@ export default {
246
250
  fields: {
247
251
  'f_userinfo_code': '客户编号',
248
252
  'f_user_name': '客户姓名',
249
- 'f_preamount': '购气金额',
250
253
  'f_pregas': '购气量',
254
+ 'f_price': '单价',
255
+ 'f_preamount': '购气金额',
251
256
  'f_hand_date': '收费区间',
252
257
  'f_operate_date': '缴费时间',
253
258
  'f_operator': '操作员',
@@ -258,8 +263,9 @@ export default {
258
263
  iotFields: {
259
264
  'f_userinfo_code': '客户编号',
260
265
  'f_user_name': '客户姓名',
261
- 'f_preamount': '购气金额',
262
266
  'f_pregas': '购气量',
267
+ 'f_price': '单价',
268
+ 'f_preamount': '购气金额',
263
269
  'f_operate_date': '缴费时间',
264
270
  'f_operator': '操作员',
265
271
  'f_comments': '备注'
@@ -54,6 +54,7 @@
54
54
  <th><nobr>住址</nobr></th>
55
55
  <th><nobr>卡号</nobr></th>
56
56
  <th><nobr>气量</nobr></th>
57
+ <th><nobr>单价</nobr></th>
57
58
  <th><nobr>应交</nobr></th>
58
59
  <th><nobr>上期结余</nobr></th>
59
60
  <th><nobr>收款</nobr></th>
@@ -72,6 +73,7 @@
72
73
  <td style="text-align:center">{{row.f_address}}</td>
73
74
  <td style="text-align:center">{{row.f_card_id}}</td>
74
75
  <td style="text-align:center">{{row.gas}}</td>
76
+ <td style="text-align:center">{{row.price}}</td>
75
77
  <td style="text-align:center">{{row.fee}}</td>
76
78
  <td style="text-align:center;white-space:nowrap;">{{row.f_balance}}</td>
77
79
  <td style="text-align:center">{{row.f_collection}}</td>
@@ -126,7 +128,7 @@
126
128
  all: [],
127
129
  // row数据
128
130
  rowsdata: [],
129
- fields: {'f_userinfo_code': '客户编号', 'f_user_name': '客户姓名', 'f_address': '地址', 'f_card_id': '卡号', 'fee': '金额', 'gas': '气量', 'type': '类型', 'f_operator': '操作员', 'f_operate_date': '操作时间'},
131
+ fields: {'f_userinfo_code': '客户编号', 'f_user_name': '客户姓名', 'f_address': '地址', 'f_card_id': '卡号', 'fee': '金额', 'gas': '气量','price': '单价', 'type': '类型', 'f_operator': '操作员', 'f_operate_date': '操作时间'},
130
132
  defaultfield: [
131
133
  'f_userinfo_code', 'f_user_name', 'fee', 'gas', 'type', 'f_operate_date'
132
134
  ],
@@ -36,7 +36,7 @@
36
36
  </div>
37
37
  <div class="form-group col-sm-3">
38
38
  <label class="font_normal_body">表&emsp;&emsp;号</label>
39
- <input type="text" class="input_search" style="width:60%" style="width:60%" v-model.trim="model.f_meternumber" placeholder='表号'
39
+ <input type="text" class="input_search" style="width:60%" style="width:60%" v-model="model.f_meternumber" placeholder='表号'
40
40
  condition="f_meternumber like '%{}%'">
41
41
  </div>
42
42
  <div class="form-group col-sm-3">
@@ -79,7 +79,7 @@
79
79
  </div>
80
80
  <div class="col-sm-2 form-group">
81
81
  <label class="font_normal_body">表&emsp;&emsp;号</label>
82
- <input type="text" style="width:60%" class="input_search" v-model.trim="model.f_meternumber"
82
+ <input type="text" style="width:60%" class="input_search" v-model="model.f_meternumber"
83
83
  condition="f_meternumber like '%{}%'" placeholder='表号'>
84
84
  </div>
85
85
  <div class="col-sm-2 form-group">
@@ -89,7 +89,7 @@
89
89
  </div>
90
90
  <div class="col-sm-2 form-group">
91
91
  <label class="font_normal_body">表&emsp;&emsp;号</label>
92
- <input type="text" style="width:60%" class="input_search" v-model.trim="model.f_meternumber"
92
+ <input type="text" style="width:60%" class="input_search" v-model="model.f_meternumber"
93
93
  condition="f_meternumber like '%{}%'" placeholder='表号'>
94
94
  </div>
95
95
  <div class="col-sm-2 form-group">
@@ -8,13 +8,13 @@
8
8
  <div class="row">
9
9
  <div class="col-sm-4 form-group" v-if="isiot" :class="[$m.f_meternumber.required ? 'has-error' : '']">
10
10
  <label for="f_meternumber" class="font_normal_body">&ensp;表&emsp;&emsp;号</label>
11
- <input type="text" class="input_search" style="width:60%" v-model.trim="row.f_meternumber"
11
+ <input type="text" class="input_search" style="width:60%" v-model="row.f_meternumber"
12
12
  @blur="meternumberValidate()" placeholder='表号' v-validate:f_meternumber='{required: true }'
13
13
  v-next-el="{id: 'metertitles'}">
14
14
  </div>
15
15
  <div class="col-sm-4 form-group" v-else>
16
16
  <label for="f_meternumber" class="font_normal_body">&ensp;表&emsp;&emsp;号</label>
17
- <input type="text" class="input_search" style="width:60%" v-model.trim="row.f_meternumber"
17
+ <input type="text" class="input_search" style="width:60%" v-model="row.f_meternumber"
18
18
  @blur="meternumberValidate()" placeholder='表号'
19
19
  v-next-el="{id: 'metertitles'}">
20
20
  </div>
@@ -53,7 +53,7 @@
53
53
  <label class="font_normal_body">表&emsp;&emsp;号</label>
54
54
  <input :size="model.f_meternumber ? model.f_meternumber.length * 2 : 4" class="input_search" condition="f_meternumber = '{}'" placeholder='表号' style="width:60%"
55
55
  type="text"
56
- v-model.trim="model.f_meternumber">
56
+ v-model="model.f_meternumber">
57
57
  </div>
58
58
  <div class="form-group" :class="{'col-sm-2':!$parent.$parent.$parent.isdetail, 'col-sm-3':$parent.$parent.$parent.isdetail}"
59
59
  v-if="!$parent.$parent.downshow&&!$parent.$parent.$parent.isdetail">
@@ -87,7 +87,7 @@
87
87
  </div>
88
88
  <div class="col-sm-2 form-group">
89
89
  <label class="font_normal_body">表&emsp;&emsp;号</label>
90
- <input type="text" style="width:60%" class="input_search" v-model.trim="model.f_meternumber"
90
+ <input type="text" style="width:60%" class="input_search" v-model="model.f_meternumber"
91
91
  condition="f_meternumber like '%{}%'" placeholder='表号'>
92
92
  </div>
93
93
  <div class="col-sm-2 form-group">
@@ -774,9 +774,9 @@ let cardBtnGen = async function (self, val) {
774
774
  this.specialCondition = false
775
775
 
776
776
  await this.model.search(args.condition, args.model)
777
- if (this.model.rows.length == 1) {
778
- this.$parent.toBusiness(this.model.rows[0])
779
- }
777
+ // if (this.model.rows.length == 1) {
778
+ // this.$parent.toBusiness(this.model.rows[0])
779
+ // }
780
780
  },
781
781
  cardBtn (val) {
782
782
  this.clear()
@@ -279,7 +279,7 @@
279
279
  class="form-group">
280
280
  <label class="font_normal_body">表&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;号</label>
281
281
  <input class="input_search" condition="f_meternumber ='{}'" placeholder='表号' style="width:60%"
282
- type="text" v-model.trim="model.f_meternumber">
282
+ type="text" v-model="model.f_meternumber">
283
283
  </div>
284
284
  <div :class="{'col-sm-2':!$parent.$parent.createFile,'col-sm-4':$parent.$parent.createFile}"
285
285
  class="form-group">
@@ -8,13 +8,13 @@
8
8
  <div class="row">
9
9
  <div class="col-sm-4 form-group" v-if="isiot" :class="[$m.f_meternumber.required ? 'has-error' : '']">
10
10
  <label for="f_meternumber" class="font_normal_body">&ensp;表&emsp;&emsp;号</label>
11
- <input type="text" class="input_search" style="width:60%" v-model.trim="row.f_meternumber"
11
+ <input type="text" class="input_search" style="width:60%" v-model="row.f_meternumber"
12
12
  @blur="meternumberValidate()" placeholder='表号' v-validate:f_meternumber='{required: true }'
13
13
  v-next-el="{id: 'metertitles'}">
14
14
  </div>
15
15
  <div class="col-sm-4 form-group" v-else :class="[$m.f_meternumber.required ? 'has-error' : '']">
16
16
  <label for="f_meternumber" class="font_normal_body">&ensp;表&emsp;&emsp;号</label>
17
- <input type="text" class="input_search" style="width:60%" v-model.trim="row.f_meternumber"
17
+ <input type="text" class="input_search" style="width:60%" v-model="row.f_meternumber"
18
18
  @blur="meternumberValidate()" placeholder='表号' v-validate:f_meternumber='{required: true }'
19
19
  v-next-el="{id: 'metertitles'}">
20
20
  </div>
@@ -95,10 +95,6 @@
95
95
  <input class="input-underline" style="width:60%" :value="row.total_fee" readonly>
96
96
  </div>
97
97
  <div v-if="row.f_collection_type == '按气量'">
98
- <div class="col-sm-4">
99
- <label class="font_normal_body_new">累购气量</label>
100
- <input class="input-underline" style="width:60%" :value="row.f_total_gas" readonly>
101
- </div>
102
98
  <div class="col-sm-4">
103
99
  <label class="font_normal_body_new">最后结算时间</label>
104
100
  <input class="input-underline" style="width:45%" :value="row.f_hand_date ? row.f_hand_date :'暂无'" readonly>
@@ -148,6 +144,10 @@
148
144
  <label class="font_normal_body_new">抄表册册序号</label>
149
145
  <input class="input-underline" style="width:45%" :value="row.f_meter_book_sort" readonly>
150
146
  </div>
147
+ <div class="col-sm-4">
148
+ <label class="font_normal_body_new">户累购</label>
149
+ <input class="input-underline" style="width:60%" :value="row.f_total_gas" readonly>
150
+ </div>
151
151
  </div>
152
152
  <div class="auto" style="float: right;">
153
153
  <button class="button_clear " @click="cancelmain()" >返回</button>
@@ -281,7 +281,7 @@
281
281
  class="form-group">
282
282
  <label class="font_normal_body">表&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;号</label>
283
283
  <input class="input_search" condition="f_meternumber ='{}'" placeholder='表号' style="width:60%"
284
- type="text" v-model.trim="model.f_meternumber">
284
+ type="text" v-model="model.f_meternumber">
285
285
  </div>
286
286
  </div>
287
287
  </div>
@@ -5,13 +5,13 @@
5
5
  <div class="row">
6
6
  <div class="col-sm-4 form-group" v-if="isiot" :class="[$m.f_meternumber.required ? 'has-error' : '']">
7
7
  <label for="f_meternumber" class="font_normal_body">*表&emsp;&emsp;号</label>
8
- <input type="text" class="input_search" style="width:60%" v-model.trim="row.f_meternumber"
8
+ <input type="text" class="input_search" style="width:60%" v-model="row.f_meternumber"
9
9
  @blur="meternumberValidate()" placeholder='表号' v-validate:f_meternumber='{required: true }'
10
10
  v-next-el="{id: 'metertitles'}">
11
11
  </div>
12
12
  <div class="col-sm-4 form-group" v-else>
13
13
  <label for="f_meternumber" class="font_normal_body">&ensp;表&emsp;&emsp;号</label>
14
- <input type="text" class="input_search" style="width:60%" v-model.trim="row.f_meternumber"
14
+ <input type="text" class="input_search" style="width:60%" v-model="row.f_meternumber"
15
15
  @blur="meternumberValidate()" placeholder='表号'
16
16
  v-next-el="{id: 'metertitles'}">
17
17
  </div>