sale-client 3.5.293 → 3.5.296

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 (8) hide show
  1. package/package.json +1 -1
  2. package/src/components/revenue/base/rightview/carddetail/BlacklistDetail.vue +2 -2
  3. package/src/filiale/shanxian/components/UserFiles/UserPriceChangeManage.vue +25 -21
  4. package/src/filiale/shanxian/components/webMeter/WebMeterBatchOperationValve.vue +785 -0
  5. package/src/filiale/shanxian/components/webMeter/meterinfo/NewMeterList.vue +569 -0
  6. package/src/filiale/shanxian/sale.js +2 -0
  7. package/src/filiale/xiangyun/machineChargeQuery.vue +1 -1
  8. package/src/filiale/xiangyun/machineChargeQuery1.vue +1 -1
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "sale-client",
3
- "version": "3.5.293",
3
+ "version": "3.5.296",
4
4
  "description": "收费模块前台组件",
5
5
  "main": "src/index.js",
6
6
  "scripts": {
package/src/components/revenue/base/rightview/carddetail/BlacklistDetail.vue CHANGED
@@ -23,11 +23,11 @@
23
23
  </div>
24
24
  <div class="row">
25
25
  <label class = "col-sm-4 ">操作时间:</label>
26
- <span class = "col-sm-8 " style="text-align:left">{{data.f_operate_date}}</span>
26
+ <span class = "col-sm-8 " style="text-align:left">{{model.f_operate_date}}</span>
27
27
  </div>
28
28
  <div class="row">
29
29
  <label class = "col-sm-4 ">原因:</label>
30
- <span class = "col-sm-8 " style="text-align:left">{{data.f_comments}}</span>
30
+ <span class = "col-sm-8 " style="text-align:left">{{model.f_comments}}</span>
31
31
  </div>
32
32
  </partial-view>
33
33
  </div>
package/src/filiale/shanxian/components/UserFiles/UserPriceChangeManage.vue CHANGED
@@ -7,6 +7,17 @@
7
7
  <criteria partial='criteria' v-ref:criteria @condition-changed="$parent.selfSearch">
8
8
  <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
9
9
  <div class="row">
10
+ <div class="form-group col-sm-2">
11
+ <label class="font_normal_body">{{$parent.$parent.usertitle}}名称</label>
12
+ <input type="text" class="input_search" style="width:60%" v-model="model.f_user_name"
13
+ @keyup.enter="search()" condition="f_user_name like '%{}%'" placeholder='用户姓名'>
14
+ </div>
15
+ <div class="form-group col-sm-2">
16
+ <label class="font_normal_body">{{$parent.$parent.usertitle}}地址</label>
17
+ <input type="text" class="input_search" style="width:60%" v-model="model.f_address"
18
+ condition="f_address like '%{}%'" placeholder='用户地址'>
19
+ </div>
20
+
10
21
  <div class="form-group col-sm-2">
11
22
  <label class="font_normal_body">组织机构</label>
12
23
  <res-select
@@ -18,16 +29,12 @@
18
29
  </res-select>
19
30
  </div>
20
31
  <div class="form-group col-sm-2">
21
- <label class="font_normal_body">客户编号</label>
32
+ <label class="font_normal_body">{{$parent.$parent.usertitle}}编号</label>
22
33
  <input type="text" class="input_search" style="width:60%" v-model="model.f_userinfo_code"
23
- @keyup.enter="search()" condition="f_userinfo_code = '{}'" placeholder='客户编号'>
24
- </div>
25
- <div class="form-group col-sm-2">
26
- <label class="font_normal_body">客户名称</label>
27
- <input type="text" class="input_search" style="width:60%" v-model="model.f_user_name"
28
- @keyup.enter="search()" condition="f_user_name like '%{}%'" placeholder='客户姓名'>
34
+ @keyup.enter="search()" condition="f_userinfo_code = '{}'" placeholder={{$parent.$parent.usertitle}}编号>
29
35
  </div>
30
36
 
37
+
31
38
  <div style="float:right">
32
39
  <button class="button_search" @click="search(), $parent.$parent.clean()">查询</button>
33
40
  <button class="button_clear" @click="$parent.$parent.clear()">清空</button>
@@ -36,8 +43,8 @@
36
43
  </div>
37
44
  <div class="row" v-if="$parent.$parent.criteriaShow">
38
45
  <div class="form-group col-sm-2" >
39
- <label class="font_normal_body">旧客户号</label>
40
- <input type="text" class="input_search" style="width:60%" v-model="model.f_olduserinfo_code" placeholder='客户编号'
46
+ <label class="font_normal_body">旧{{$parent.$parent.usertitle}}号</label>
47
+ <input type="text" class="input_search" style="width:60%" v-model="model.f_olduserinfo_code" placeholder='用户编号'
41
48
  condition="f_olduserinfo_code = '{}'">
42
49
  </div>
43
50
  <div class="form-group col-sm-2">
@@ -57,15 +64,11 @@
57
64
  close-on-select condition="f_gasproperties='{}'"></v-select>
58
65
  </div>
59
66
  <div class="form-group col-sm-2">
60
- <label class="font_normal_body">客户电话</label>
61
- <input type="text" class="input_search" style="width:60%" v-model="model.f_user_phone" placeholder='客户电话'
67
+ <label class="font_normal_body">{{$parent.$parent.usertitle}}电话</label>
68
+ <input type="text" class="input_search" style="width:60%" v-model="model.f_user_phone" placeholder={{$parent.$parent.usertitle}}电话
62
69
  condition="f_user_phone = '{}'">
63
70
  </div>
64
- <div class="form-group col-sm-2">
65
- <label class="font_normal_body">客户地址</label>
66
- <input type="text" class="input_search" style="width:60%" v-model="model.f_address"
67
- condition="f_address like '%{}%'" placeholder='客户地址'>
68
- </div>
71
+
69
72
  </div>
70
73
  </div>
71
74
  </criteria>
@@ -76,10 +79,10 @@
76
79
  <nobr>序号</nobr>
77
80
  </th>
78
81
  <th>
79
- <nobr>客户编号</nobr>
82
+ <nobr>{{$parent.$parent.$parent.usertitle}}编号</nobr>
80
83
  </th>
81
84
  <th>
82
- <nobr>客户信息</nobr>
85
+ <nobr>{{$parent.$parent.$parent.usertitle}}姓名</nobr>
83
86
  </th>
84
87
  <th>
85
88
  <nobr>表号</nobr>
@@ -88,7 +91,7 @@
88
91
  <nobr>卡号</nobr>
89
92
  </th>
90
93
  <th>
91
- <nobr>客户地址</nobr>
94
+ <nobr>{{$parent.$parent.usertitle}}地址</nobr>
92
95
  </th>
93
96
  <th>
94
97
  <nobr>气价名称</nobr>
@@ -176,7 +179,7 @@
176
179
  </div>
177
180
  <div class="row" style="margin-top: 2%">
178
181
  <div class="col-sm-3 flex-row ">
179
- <label class="control-label">客户类型</label>
182
+ <label class="control-label">{{usertitle}}类型</label>
180
183
  <p class="form-control-static">{{row.f_user_type}}</p>
181
184
  </div>
182
185
  <div class="col-sm-3 flex-row ">
@@ -263,7 +266,7 @@
263
266
  </div>
264
267
  <div class="row" style="margin-top: 2%" v-if="model.type ==='系统气价'">
265
268
  <div class="col-sm-4 flex-row" >
266
- <label class="control-label">用户类型</label>
269
+ <label class="control-label">{{usertitle}}类型</label>
267
270
  <v-select :value.sync="newinfo.f_user_type"
268
271
  :options='usertypes' placeholder='用户类型'
269
272
  @change="userTypeChange()"
@@ -386,6 +389,7 @@
386
389
  pricetype: [{label: '固定气价', value: '固定气价'}, {label: '阶梯气价', value: '阶梯气价'}],
387
390
  gasproperties: [],
388
391
  gasproperties2: this.$appdata.getParam('用气性质') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('用气性质')] : [],
392
+ usertitle: this.$appdata.getSingleValue('用户名称前缀') ? this.$appdata.getSingleValue('用户名称前缀') : '客户',
389
393
  usertypes: this.$appdata.getParam('用户类型') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('用户类型')] : [],
390
394
  pricetypes: this.$appdata.getParam('气价类型') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('气价类型')] : []
391
395
  // userstates: [{label: '全部', value: ''}, ...this.$appdata.getParam('客户状态')]