sale-client 4.0.32-preview → 4.0.34-preview
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
CHANGED
package/package.json
CHANGED
|
@@ -173,13 +173,30 @@
|
|
|
173
173
|
type="text"
|
|
174
174
|
v-model="model.f_user_phone">
|
|
175
175
|
</div>
|
|
176
|
+
<!-- <div-->
|
|
177
|
+
<!-- :class="{'col-sm-2':!$parent.$parent.createFile,'col-sm-4':$parent.$parent.createFile}"-->
|
|
178
|
+
<!-- class="form-group">-->
|
|
179
|
+
<!-- <label class="font_normal_body">小  区</label>-->
|
|
180
|
+
<!-- <input class="input_search" condition="f_residential_area like '%{}%'" placeholder='小区' style="width:60%"-->
|
|
181
|
+
<!-- type="text" v-model="model.f_residential_area">-->
|
|
182
|
+
<!-- </div>-->
|
|
183
|
+
|
|
176
184
|
<div
|
|
177
185
|
:class="{'col-sm-2':!$parent.$parent.createFile,'col-sm-4':$parent.$parent.createFile}"
|
|
178
186
|
class="form-group">
|
|
179
187
|
<label class="font_normal_body">小  区</label>
|
|
180
|
-
<
|
|
181
|
-
|
|
188
|
+
<v-select :value.sync="model.f_residential_area"
|
|
189
|
+
class="select_list select"
|
|
190
|
+
v-model="model.f_residential_area"
|
|
191
|
+
style="width: 60%"
|
|
192
|
+
multiple
|
|
193
|
+
condition="f_residential_area in {}"
|
|
194
|
+
:options='$parent.$parent.residentialArea' placeholder='选择小区'
|
|
195
|
+
close-on-select>
|
|
196
|
+
|
|
197
|
+
</v-select>
|
|
182
198
|
</div>
|
|
199
|
+
|
|
183
200
|
<div
|
|
184
201
|
:class="{'col-sm-2':!$parent.$parent.createFile,'col-sm-4':$parent.$parent.createFile}"
|
|
185
202
|
class="form-group">
|
|
@@ -586,7 +603,8 @@ let loadParamGem = async function (self) {
|
|
|
586
603
|
},
|
|
587
604
|
orgcondition: `and f_orgid = '${this.$login.f.orgid}'`,
|
|
588
605
|
createFile: false,
|
|
589
|
-
|
|
606
|
+
// 小区
|
|
607
|
+
residentialArea: [],
|
|
590
608
|
curorgid: [this.$login.f.orgid],
|
|
591
609
|
f_filialeid: this.$login.f.orgid,
|
|
592
610
|
|
|
@@ -644,7 +662,7 @@ let loadParamGem = async function (self) {
|
|
|
644
662
|
resdata: '',
|
|
645
663
|
resshow: false,
|
|
646
664
|
batchpinshow: false, // 导入销户
|
|
647
|
-
titleShow: true,
|
|
665
|
+
titleShow: true, // 是否显示部分档案信息类的筛选框
|
|
648
666
|
useoptions: this.$appdata.getParam('使用类型'),
|
|
649
667
|
|
|
650
668
|
userlevel: this.$appdata.getParam('用户等级') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('用户等级')] : [],
|
|
@@ -655,7 +673,8 @@ let loadParamGem = async function (self) {
|
|
|
655
673
|
},
|
|
656
674
|
ready () {
|
|
657
675
|
loadParamGem(this)
|
|
658
|
-
this.
|
|
676
|
+
this.getaddress()
|
|
677
|
+
this.titleShow = this.$appdata.getSingleValue('是否显示筛选框') == null ? true : this.$appdata.getSingleValue('是否显示筛选框')
|
|
659
678
|
this.getAuthority()
|
|
660
679
|
},
|
|
661
680
|
compiled () {
|
|
@@ -672,18 +691,31 @@ let loadParamGem = async function (self) {
|
|
|
672
691
|
}
|
|
673
692
|
},
|
|
674
693
|
getRes (obj) {
|
|
675
|
-
console.log(
|
|
694
|
+
console.log('-----------------')
|
|
676
695
|
this.orgcondition = obj
|
|
677
|
-
if(this.$refs.paged.$refs.criteria.$refs.sel.depresid.length>0){
|
|
678
|
-
this.f_filialeid=this.$refs.paged.$refs.criteria.$refs.sel.depresid[0]
|
|
679
|
-
}else{
|
|
680
|
-
this.f_filialeid=this.$login.f.orgid
|
|
696
|
+
if (this.$refs.paged.$refs.criteria.$refs.sel.depresid.length > 0) {
|
|
697
|
+
this.f_filialeid = this.$refs.paged.$refs.criteria.$refs.sel.depresid[0]
|
|
698
|
+
} else {
|
|
699
|
+
this.f_filialeid = this.$login.f.orgid
|
|
681
700
|
}
|
|
682
|
-
|
|
683
701
|
},
|
|
684
|
-
|
|
685
|
-
let
|
|
686
|
-
|
|
702
|
+
async getaddress () {
|
|
703
|
+
let HttpReset = new HttpResetClass()
|
|
704
|
+
var data = await HttpReset.load('POST', 'api/af-revenue/sql/manage_getarealist', {
|
|
705
|
+
data: {
|
|
706
|
+
condition: `1=1 and s.f_orgid = '${this.$login.f.orgid}'`
|
|
707
|
+
}
|
|
708
|
+
}, {resolveMsg: null, rejectMsg: '获取小区失败!'})
|
|
709
|
+
console.log('小区', data)
|
|
710
|
+
let house = [{label: '全部', value: ''}]
|
|
711
|
+
for (let row of data.data) {
|
|
712
|
+
house.push({label: row.f_residential_area, value: row.f_residential_area})
|
|
713
|
+
}
|
|
714
|
+
this.residentialArea = house
|
|
715
|
+
},
|
|
716
|
+
downloadFiles () {
|
|
717
|
+
let downurl = 'api/af-revenue/downloadfile/file?filename=批量建档导出Excel模板'
|
|
718
|
+
this.$downFile(downurl, '批量建档导出Excel模板.xlsx')
|
|
687
719
|
},
|
|
688
720
|
/**
|
|
689
721
|
* 退出用户详细信息页面
|
|
@@ -706,7 +738,7 @@ let loadParamGem = async function (self) {
|
|
|
706
738
|
} catch (e) {
|
|
707
739
|
}
|
|
708
740
|
try {
|
|
709
|
-
window.parent.dispatchEvent(new CustomEvent('gotoChargeManage', {detail: 'Hello from iframe'}))
|
|
741
|
+
window.parent.dispatchEvent(new CustomEvent('gotoChargeManage', {detail: 'Hello from iframe'}))
|
|
710
742
|
} catch (e) {
|
|
711
743
|
}
|
|
712
744
|
},
|
|
@@ -815,8 +847,8 @@ let loadParamGem = async function (self) {
|
|
|
815
847
|
count++
|
|
816
848
|
})
|
|
817
849
|
await this.$resetpost('api/af-revenue/logic/saveCancellation', {infoIds: infoIds}, {resolveMsg: null, rejectMsg: '批量销户失败'}).then((res) => {
|
|
818
|
-
if(res && res.data){
|
|
819
|
-
this.$showMessage(`本次批量销户总计: ${res.data.allnum}户 ,成功: ${res.data.successnum}户 ,失败(已经销户): ${res.data.errornum2} 户,失败(待审核): ${res.data.errornum1}户 `)
|
|
850
|
+
if (res && res.data) {
|
|
851
|
+
this.$showMessage(`本次批量销户总计: ${res.data.allnum}户 ,成功: ${res.data.successnum}户 ,失败(已经销户): ${res.data.errornum2} 户,失败(待审核): ${res.data.errornum1}户 `)
|
|
820
852
|
}
|
|
821
853
|
this.xiaohushow = false
|
|
822
854
|
this.close()
|
|
@@ -76,7 +76,7 @@
|
|
|
76
76
|
<div class="col-sm-2 form-group">
|
|
77
77
|
<label class="font_normal_body">用户编号:</label>
|
|
78
78
|
<input type="text" class="input_search" style="width:60%" v-model="model.f_userinfo_code"
|
|
79
|
-
condition="f_userinfo_code = '{}'" placeholder='用户编号'>
|
|
79
|
+
condition="s.f_userinfo_code = '{}'" placeholder='用户编号'>
|
|
80
80
|
</div>
|
|
81
81
|
<div class="col-sm-2 form-group">
|
|
82
82
|
<label class="font_normal_body"> 订单号:</label>
|
|
@@ -232,7 +232,7 @@
|
|
|
232
232
|
this.f_orgid = this.$login.convertToIn(val)
|
|
233
233
|
this.f_filialeid = val[0]
|
|
234
234
|
},
|
|
235
|
-
//
|
|
235
|
+
// 银行单方账单，系统可缴费
|
|
236
236
|
async charge (row) {
|
|
237
237
|
console.log('单边账补缴：', row)
|
|
238
238
|
row.f_operator = Vue.$login.f.name
|
|
@@ -267,13 +267,13 @@
|
|
|
267
267
|
let gasAmountApproved = 0
|
|
268
268
|
|
|
269
269
|
if (chargeLength === 1) {
|
|
270
|
-
gasFee = pricingRes.data.chargeprice[0].f_money
|
|
270
|
+
gasFee = Number(pricingRes.data.chargeprice[0].f_money)
|
|
271
271
|
gasAmountApproved = pricingRes.data.chargeprice[0].f_gas
|
|
272
272
|
} else if (chargeLength === 2) {
|
|
273
|
-
gasFee = pricingRes.data.f_stair1fee + pricingRes.data.f_stair2fee
|
|
273
|
+
gasFee = Number(pricingRes.data.f_stair1fee) + Number(pricingRes.data.f_stair2fee)
|
|
274
274
|
gasAmountApproved = pricingRes.data.oughtamount
|
|
275
275
|
} else if (chargeLength === 3) {
|
|
276
|
-
gasFee = pricingRes.data.f_stair1fee + pricingRes.data.f_stair2fee + pricingRes.data.f_stair3fee
|
|
276
|
+
gasFee = Number(pricingRes.data.f_stair1fee) + Number(pricingRes.data.f_stair2fee) + Number(pricingRes.data.f_stair3fee)
|
|
277
277
|
gasAmountApproved = pricingRes.data.oughtamount
|
|
278
278
|
}
|
|
279
279
|
// 缴费
|