sale-client 3.5.94 → 3.5.95
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/build/dev-server.js +8 -5
- package/package.json +1 -1
- package/src/components/revenue/comprehen/StairPrice/GasPriceList.vue +14 -4
- package/src/filiale/chengtou/components/FilesManage/HighMeter.vue +1938 -0
- package/src/filiale/chengtou/components/FilesManage/UploadIdCard.vue +543 -0
- package/src/filiale/chengtou/components/FilesManage/UserGeneralInfoTest.vue +6 -4
- package/src/filiale/chengtou/sale.js +8 -0
- package/src/filiale/gehua/CancelService.js +296 -0
- package/src/filiale/gehua/CardMeterChargeCancel.vue +399 -0
- package/src/filiale/gehua/sale.js +3 -0
- package/src/filiale/zhongsheng/charge/UserBaseInfoNew.vue +440 -0
- package/src/filiale/zhongsheng/sale.js +2 -0
package/build/dev-server.js
CHANGED
|
@@ -12,7 +12,7 @@ var compiler = webpack(config)
|
|
|
12
12
|
// https://github.com/chimurai/http-proxy-middleware
|
|
13
13
|
var bendi = 'http://127.0.0.1:8080', bendi1 = 'http://121.36.106.17:8400/'
|
|
14
14
|
// 公司测试服务
|
|
15
|
-
var fuwu = 'http://
|
|
15
|
+
var fuwu = 'http://192.168.50.4:8400'
|
|
16
16
|
// var fuwu = 'http://121.36.106.17:8400/'
|
|
17
17
|
// 铜川正式
|
|
18
18
|
// var fuwu = 'http://61.134.55.234:9999/'
|
|
@@ -36,9 +36,9 @@ var proxyTable = {
|
|
|
36
36
|
'/rs/logic/saleGetExportProgress': {
|
|
37
37
|
target: fuwu
|
|
38
38
|
},
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
39
|
+
'/rs/logic/getWarningMsg': {
|
|
40
|
+
target: 'http://localhost:8080/'
|
|
41
|
+
},
|
|
42
42
|
'/rs/file': {
|
|
43
43
|
target: fuwu
|
|
44
44
|
},
|
|
@@ -88,6 +88,9 @@ var proxyTable = {
|
|
|
88
88
|
'/rs/sql/getLicenseById': {
|
|
89
89
|
target: fuwu
|
|
90
90
|
},
|
|
91
|
+
'/rs/sql/getGasPriceInfo': {
|
|
92
|
+
target: 'http://127.0.0.1:8080'
|
|
93
|
+
},
|
|
91
94
|
'/rs/sql/manage_getarealist': {
|
|
92
95
|
target: fuwu
|
|
93
96
|
},
|
|
@@ -101,7 +104,7 @@ var proxyTable = {
|
|
|
101
104
|
target: fuwu
|
|
102
105
|
},
|
|
103
106
|
'/webmeter': {
|
|
104
|
-
target: 'http://
|
|
107
|
+
target: 'http://192.168.50.4:8450'
|
|
105
108
|
},
|
|
106
109
|
'/rs': {
|
|
107
110
|
// target: 'http://192.168.30.63:8081/'
|
package/package.json
CHANGED
|
@@ -76,6 +76,14 @@
|
|
|
76
76
|
close-on-select v-ref:type>
|
|
77
77
|
</v-select>
|
|
78
78
|
</div>
|
|
79
|
+
<div :class="{'col-sm-2 form-group':!$parent.$parent.$parent.isdetail,'col-sm-3 form-group':$parent.$parent.$parent.isdetail}">
|
|
80
|
+
<label class="font_normal_body">气价状态</label>
|
|
81
|
+
<v-select :value.sync="model.f_price_state" v-model="model.f_price_state"
|
|
82
|
+
placeholder='气价状态' :options="$parent.$parent.price_states"
|
|
83
|
+
condition="f_price_state = '{}'"
|
|
84
|
+
close-on-select v-ref:type>
|
|
85
|
+
</v-select>
|
|
86
|
+
</div>
|
|
79
87
|
</div>
|
|
80
88
|
</div>
|
|
81
89
|
|
|
@@ -198,6 +206,7 @@
|
|
|
198
206
|
f_orgid: '',
|
|
199
207
|
gasproperties: [],
|
|
200
208
|
custom: [{label: '全部', value: ''}, {label: '正常气价', value: '正常气价'}, {label: '自定义气价', value: '自定义气价'}],
|
|
209
|
+
price_states: [{label: '全部', value: ''}, {label: '使用中', value: '使用中'}, {label: '删除', value: '删除'}, {label: '已作废', value: '已作废'}],
|
|
201
210
|
usertypes: this.$appdata.getParam('用户类型') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('用户类型')] : []
|
|
202
211
|
}
|
|
203
212
|
},
|
|
@@ -215,13 +224,14 @@
|
|
|
215
224
|
},
|
|
216
225
|
ready () {
|
|
217
226
|
this.$refs.paged.$refs.cri.model.performDate = this.$login.toStandardDateString()
|
|
227
|
+
this.$refs.paged.$refs.cri.model.f_price_state = '使用中'
|
|
218
228
|
this.search()
|
|
219
229
|
},
|
|
220
230
|
methods: {
|
|
221
|
-
batchAdjust(){
|
|
222
|
-
this.$parent.usershow=true
|
|
223
|
-
this.$parent.priceid=null
|
|
224
|
-
this.$parent.priceorgid=null
|
|
231
|
+
batchAdjust () {
|
|
232
|
+
this.$parent.usershow = true
|
|
233
|
+
this.$parent.priceid = null
|
|
234
|
+
this.$parent.priceorgid = null
|
|
225
235
|
},
|
|
226
236
|
showhistory (row) {
|
|
227
237
|
this.show = true
|