sale-client 3.6.157 → 3.6.158
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/chargeBatch/ReissueBillBatch.vue +4 -8
- package/src/components/common/userinfo_detail/ic_detail/ChangeMeterQueryUser.vue +1 -2
- package/src/components/revenue/comprehen/gasbrand/GasBrandUser.vue +5 -4
- package/src/filiale/qianneng/revenue/common/ic_detail/ChargeQueryUser.vue +1 -1
package/package.json
CHANGED
|
@@ -62,14 +62,10 @@
|
|
|
62
62
|
for (let row of this.sellingData) {
|
|
63
63
|
let bill = await this.$resetpost(this.data.billUrl, {data: {condition: row.id, operator: `'${this.data.f_operator}'`}}, {resolveMsg: null})
|
|
64
64
|
this.bill.data = bill.data
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
this.asyncPrint(select)
|
|
70
|
-
resolve()
|
|
71
|
-
}, parseInt(this.timeOut)) // 延迟1秒钟打印下一张票据，可以根据需要调整延迟时间
|
|
72
|
-
})
|
|
65
|
+
this.$nextTick(function () {
|
|
66
|
+
setTimeout(function () {
|
|
67
|
+
this.asyncPrint(select)
|
|
68
|
+
}, parseInt(this.timeOut)) // 延迟时间从this.timeOut中获取，需要确保timeOut是一个数字值
|
|
73
69
|
})
|
|
74
70
|
this.printControl = null
|
|
75
71
|
}
|
|
@@ -115,7 +115,6 @@
|
|
|
115
115
|
}, ...this.$appdata.getParam('是否有效')] : [],
|
|
116
116
|
// row数据
|
|
117
117
|
rowsdata: [],
|
|
118
|
-
searchValue: this.$appdata.getSingleValue('综合条件查询') ? this.$appdata.getSingleValue('综合条件查询') : 'f_userfiles_id',
|
|
119
118
|
fields: {'f_userinfo_code': '客户编号', 'f_user_name': '客户姓名', 'f_type': '换表类型', 'f_meter_base': '旧表底数', 'f_newmeter_base': '新表底数', 'f_changemeter_fee': '换表费', 'f_operator': '操作员', 'f_changemeter_date': '换表日期'},
|
|
120
119
|
defaultfield: [
|
|
121
120
|
'f_userinfo_code', 'f_user_name', 'f_type', 'f_meter_base', 'f_newmeter_base', 'f_changemeter_fee', 'f_operator', 'f_changemeter_date'
|
|
@@ -131,7 +130,7 @@
|
|
|
131
130
|
},
|
|
132
131
|
methods: {
|
|
133
132
|
async search () {
|
|
134
|
-
this.condition = `${this.$refs.paged.$refs.criteria.condition} and
|
|
133
|
+
this.condition = `${this.$refs.paged.$refs.criteria.condition} and f_user_id = '${this.row.f_user_id}'`
|
|
135
134
|
this.model.search(this.condition, this.model)
|
|
136
135
|
let http = new HttpResetClass()
|
|
137
136
|
let res = await http.load('POST', 'rs/sql/sale_ChangeMeterQuery', {
|
|
@@ -19,7 +19,7 @@
|
|
|
19
19
|
<export-excel
|
|
20
20
|
:data="{condition: $parent.$parent.condition}"
|
|
21
21
|
:field="$parent.$parent.getfield"
|
|
22
|
-
sqlurl="rs/logic/
|
|
22
|
+
sqlurl="rs/logic/saleExport" sql-name="getGasBrandsUser" :template-name="$parent.$parent.meterbrand+'气价使用人'"
|
|
23
23
|
:choose-col="true"></export-excel>
|
|
24
24
|
<div style="float: right" class="button_spacing"
|
|
25
25
|
:class="{'button_shrink_top': $parent.$parent.criteriaShow2,'button_shrink_bottom': !$parent.$parent.criteriaShow2}"
|
|
@@ -93,11 +93,12 @@
|
|
|
93
93
|
pricetypes: this.$appdata.getParam('气价类型') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('气价类型')] : [],
|
|
94
94
|
config: {
|
|
95
95
|
excelHeaders: {
|
|
96
|
-
'f_price_name': '气价名称',
|
|
97
96
|
'f_userinfo_code': '客户编号',
|
|
97
|
+
'f_meternumber': '表号',
|
|
98
|
+
'f_meter_brand': '气表品牌',
|
|
99
|
+
'f_meter_type': '气表类型',
|
|
98
100
|
'f_user_name': '客户姓名',
|
|
99
|
-
'f_address': '客户地址'
|
|
100
|
-
'f_orgname': '组织机构'
|
|
101
|
+
'f_address': '客户地址'
|
|
101
102
|
}
|
|
102
103
|
},
|
|
103
104
|
checked1: true,
|
|
@@ -67,7 +67,7 @@
|
|
|
67
67
|
<th><nobr>违约金</nobr></th>
|
|
68
68
|
<th><nobr>减免金额</nobr></th>
|
|
69
69
|
<th><nobr>上期结余</nobr></th>
|
|
70
|
-
<th
|
|
70
|
+
<th v-if="!$parent.$parent.$parent.isIot"><nobr >应交金额</nobr></th>
|
|
71
71
|
<th><nobr>实收金额</nobr></th>
|
|
72
72
|
<th><nobr>本期结余</nobr></th>
|
|
73
73
|
<th><nobr>付款方式</nobr></th>
|