sale-client 3.6.475 → 3.6.477
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 +1 -1
- package/src/components/FilesManageNew/UserEssentialInfoTest.vue +5 -2
- package/src/components/revenue/base/rightview/CardList.vue +1 -1
- package/src/components/webMeter/MeterManage/WebMeterBatchOperate.vue +4 -1
- package/src/filiale/liaoyuan/CardList.vue +1 -1
- package/src/filiale/qianneng/OtherChargeNew.vue +7 -1
- package/src/filiale/xinkang/base/rightview/CardList.vue +1 -1
- package/src/filiale/yangchun/BlackList/BlackList.vue +3 -6
- package/src/filiale/yangchun/BlackList/BlackListList.vue +1 -1
- package/src/filiale/yangchun/BlackList/BlackRecordQuery.vue +1 -1
- package/src/filiale/yangchun/CardList.vue +1 -1
- package/src/filiale/yangchun/HandplanQuery.vue +2 -1
- package/src/filiale/yuansheng/CardList.vue +1 -1
- package/src/filiale/yuncheng/CardList.vue +1 -1
- package/src/plugins/GetSaleParams.js +3 -2
package/package.json
CHANGED
|
@@ -74,9 +74,12 @@
|
|
|
74
74
|
v-validate:f_used_name=getConfigValidate("f_used_name",false)
|
|
75
75
|
:placeholder="getConfigPlaceholder('f_used_name','曾用名')">
|
|
76
76
|
</div>
|
|
77
|
-
<div style="" class="col-sm-4 form-group"
|
|
77
|
+
<div style="" class="col-sm-4 form-group"
|
|
78
|
+
v-show="(formconfig && formconfig.f_rent_phone && formconfig.f_rent_phone.required) || !onlyshowmust"
|
|
79
|
+
:class="[$v.f_rent_phone.required ? 'has-error' : '']" v-if="getConfigShowItem('f_rent_phone')">
|
|
78
80
|
<label for="f_rent_phone" class="font_normal_body"> 备用电话</label>
|
|
79
81
|
<input type="text" v-model="baseinfo.base.f_rent_phone" class="input_search" style="width:60%"
|
|
82
|
+
v-validate:f_rent_phone=getConfigValidate("f_rent_phone",false)
|
|
80
83
|
placeholder="备用电话">
|
|
81
84
|
</div>
|
|
82
85
|
<div class="col-sm-4 form-group"
|
|
@@ -340,7 +343,7 @@
|
|
|
340
343
|
}
|
|
341
344
|
return {}
|
|
342
345
|
},
|
|
343
|
-
getConfigShowItem (name,defaultVal = true) {
|
|
346
|
+
getConfigShowItem (name, defaultVal = true) {
|
|
344
347
|
if (this.formconfig && this.formconfig[name] && this.formconfig[name].hasOwnProperty('showItem')) {
|
|
345
348
|
return this.formconfig[name].showItem
|
|
346
349
|
} else {
|
|
@@ -136,7 +136,10 @@ export default {
|
|
|
136
136
|
},
|
|
137
137
|
async zdfk () {
|
|
138
138
|
let data = {
|
|
139
|
-
|
|
139
|
+
inputtor: Vue.$login.f.name,
|
|
140
|
+
inputtorid: Vue.$login.f.id,
|
|
141
|
+
f_userfiles_id: this.row.f_userfiles_id,
|
|
142
|
+
meterBrandName: this.row.f_alias
|
|
140
143
|
}
|
|
141
144
|
if (this.row.f_network_valve === '关闭') {
|
|
142
145
|
await this.$resetpost('rs/logic/openzdfk', data, {resolveMsg: '开启自动阀控成功。', rejectMsg: '开启自动阀控失败!!!'})
|
|
@@ -470,6 +470,10 @@
|
|
|
470
470
|
this.validateOk = !val.isOk
|
|
471
471
|
this.billData.bill = val.bill
|
|
472
472
|
},
|
|
473
|
+
roundToDecimalPlace (number, decimalPlaces) {
|
|
474
|
+
const factor = Math.pow(10, decimalPlaces)
|
|
475
|
+
return Math.round(number * factor) / factor
|
|
476
|
+
},
|
|
473
477
|
getcollection () {
|
|
474
478
|
let money = 0
|
|
475
479
|
let flag = true
|
|
@@ -479,8 +483,10 @@
|
|
|
479
483
|
money += ((item.f_unitprice - 0) * (item.f_number - 0)) - 0
|
|
480
484
|
}
|
|
481
485
|
})
|
|
486
|
+
console.log(money)
|
|
482
487
|
if (money != 0) {
|
|
483
|
-
this.model.f_collection =
|
|
488
|
+
this.model.f_collection = this.roundToDecimalPlace(money, 2)
|
|
489
|
+
console.log(this.model.f_collection)
|
|
484
490
|
}
|
|
485
491
|
if (!flag) this.model.f_collection = ''
|
|
486
492
|
},
|
|
@@ -253,8 +253,8 @@
|
|
|
253
253
|
noLimitGas: '',
|
|
254
254
|
f_opr_state: '移入',
|
|
255
255
|
f_final_opr_state: '移出',
|
|
256
|
-
f_function: [],
|
|
257
|
-
f_level: '',
|
|
256
|
+
f_function: ['限制购气'],
|
|
257
|
+
f_level: '高',
|
|
258
258
|
f_userinfo_code: '',
|
|
259
259
|
f_userinfo_id: '',
|
|
260
260
|
f_user_name: '',
|
|
@@ -281,10 +281,7 @@
|
|
|
281
281
|
limites: [{label: '限购气量', value: '限购气量'}, {label: '限购金额', value: '限购金额'}],
|
|
282
282
|
fstate: [{label: '移入', value: '移入'}, {label: '移出', value: '移出'}],
|
|
283
283
|
flevel: [{label: '高', value: '高'}, {label: '中', value: '中'}, {label: '低', value: '低'}],
|
|
284
|
-
fFunction: this.$appdata.getParam('限制功能') ? [
|
|
285
|
-
label: '全部',
|
|
286
|
-
value: ''
|
|
287
|
-
}, ...this.$appdata.getParam('限制功能')] : [],
|
|
284
|
+
fFunction: this.$appdata.getParam('限制功能') ? [...this.$appdata.getParam('限制功能')] : [],
|
|
288
285
|
nolimitGas: [{label: '是', value: '0'}, {label: '否', value: '1'}],
|
|
289
286
|
fcomments: this.$appdata.getParam('移入原因') ? [...this.$appdata.getParam('移入原因')] : [],
|
|
290
287
|
yccomments: this.$appdata.getParam('移出重点用户原因') ? [...this.$appdata.getParam('移出重点用户原因')] : []
|
|
@@ -128,7 +128,7 @@
|
|
|
128
128
|
</div>
|
|
129
129
|
<div class="col-sm-2 form-group" :class="{'col-sm-2':!$parent.$parent.$parent.isdetail, 'col-sm-3':$parent.$parent.$parent.isdetail}" >
|
|
130
130
|
<label class=" font_normal_body">移入原因</label>
|
|
131
|
-
<v-select
|
|
131
|
+
<v-select search min-width="260px"
|
|
132
132
|
:value.sync="model.f_comments"
|
|
133
133
|
v-model="model.f_comments"
|
|
134
134
|
:options="$parent.$parent.fcomments"
|
|
@@ -107,7 +107,7 @@
|
|
|
107
107
|
</div>
|
|
108
108
|
<div class="col-sm-2 form-group" :class="{'col-sm-2':!$parent.$parent.$parent.isdetail, 'col-sm-3':$parent.$parent.$parent.isdetail}" >
|
|
109
109
|
<label class=" font_normal_body">移入原因</label>
|
|
110
|
-
<v-select
|
|
110
|
+
<v-select search min-width="260px"
|
|
111
111
|
:value.sync="model.f_black_comments"
|
|
112
112
|
v-model="model.f_black_comments"
|
|
113
113
|
:options="$parent.$parent.fcomments"
|
|
@@ -20,7 +20,7 @@ let GetSaleParam = {
|
|
|
20
20
|
bookcodes:[],
|
|
21
21
|
inputtors: [],
|
|
22
22
|
async initinputtor () {
|
|
23
|
-
let res = await Vue.resetpost('rs/sql/sale_getAlluserRes', {data: {
|
|
23
|
+
let res = await Vue.resetpost('rs/sql/sale_getAlluserRes?pageNo=1&pageSize=999999', {data: {
|
|
24
24
|
condition: ' 1=1'
|
|
25
25
|
}}, {resolveMsg: null, rejectMsg: '获取用户出错！！！'})
|
|
26
26
|
console.log('resdata:', res.data)
|
|
@@ -38,11 +38,12 @@ let GetSaleParam = {
|
|
|
38
38
|
return res.rolestr.indexOf('抄表员') > -1 && res.f_orgid == orgid
|
|
39
39
|
}
|
|
40
40
|
})
|
|
41
|
-
|
|
41
|
+
console.log(arr)
|
|
42
42
|
arr.forEach((res) => {
|
|
43
43
|
inputtors.push({label: res.name, value: res.name})
|
|
44
44
|
})
|
|
45
45
|
}
|
|
46
|
+
console.log(inputtors)
|
|
46
47
|
return inputtors
|
|
47
48
|
},
|
|
48
49
|
getGasstyle (key) {
|