sale-client 3.6.149 → 3.6.151
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 +1 -1
- package/package.json +1 -1
- package/src/components/common/userinfo_detail/ic_detail/ChargeRecordQuery.vue +7 -7
- package/src/components/revenue/comprehen/StairPrice/GasPriceList.vue +4 -0
- package/src/filiale/gehua/NewPriceAdjustment.vue +964 -0
- package/src/filiale/gehua/NewPriceAdjustmentSell.vue +682 -0
- package/src/filiale/gehua/NewPriceAdjustmentWebmeter.vue +691 -0
- package/src/filiale/gehua/PriceChangeCompensation/CompensationManage.vue +26 -0
- package/src/filiale/gehua/PriceChangeCompensation/IotCompensation.vue +318 -0
- package/src/filiale/gehua/PriceChangeCompensation/JbCompensation.vue +343 -0
- package/src/filiale/gehua/PriceChangeCompensation/SurplusRecordDetail.vue +74 -0
- package/src/filiale/gehua/sale.js +6 -0
- package/src/filiale/lixianV3/components/charge/IOTMeterCenter.vue +11 -7
- package/src/filiale/wenxi/FilesManageNew/UserMeterInfoTest.vue +131 -0
- package/src/filiale/wenxi/sale.js +2 -0
- package/src/filiale/zhongyi/machineDown.vue +2 -2
- package/src/main.js +1 -1
package/build/dev-server.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
var path = require('path')
|
|
2
|
-
const [ serverRul, localUrl ] = ['
|
|
2
|
+
const [ serverRul, localUrl ] = ['http://192.168.50.4:8400/', 'http://localhost:8080/']
|
|
3
3
|
var merge = require('webpack-merge')
|
|
4
4
|
var baseConfig = require('./webpack.dev.conf')
|
|
5
5
|
var devConfig = {
|
package/package.json
CHANGED
|
@@ -80,13 +80,13 @@
|
|
|
80
80
|
resolveMsg: null
|
|
81
81
|
})
|
|
82
82
|
this.model.rows = record.data
|
|
83
|
-
this.hasCardCental = this.$appdata.getSingleValue('多收提示') ? this.$appdata.getSingleValue('多收提示') :
|
|
84
|
-
if(this.hasCardCental && this.model.rows.length>0 && (
|
|
85
|
-
let checkdata = this.model.rows[0].operate_date.substr(0,10)
|
|
86
|
-
let nowdate = new Date()
|
|
87
|
-
let pdate = nowdate.getFullYear()+'-'+(nowdate.getMonth()<10? '0'+nowdate.getMonth()+1 : nowdate.getMonth()+1) +'-'+(nowdate.getDate()<10? '0'+nowdate.getDate() : nowdate.getDate())
|
|
88
|
-
if(new Date(checkdata).getTime() == new Date(pdate).getTime()){
|
|
89
|
-
this.cardCental = true
|
|
83
|
+
this.hasCardCental = this.$appdata.getSingleValue('多收提示') ? this.$appdata.getSingleValue('多收提示') : false
|
|
84
|
+
if (this.hasCardCental && this.model.rows.length > 0 && (this.model.rows[0].type == '发卡售气' || this.model.rows[0].type == '卡表收费')) {
|
|
85
|
+
let checkdata = this.model.rows[0].operate_date.substr(0, 10)
|
|
86
|
+
let nowdate = new Date()
|
|
87
|
+
let pdate = nowdate.getFullYear() + '-' + (nowdate.getMonth() < 10 ? '0' + nowdate.getMonth() + 1 : nowdate.getMonth() + 1) + '-' + (nowdate.getDate() < 10 ? '0' + nowdate.getDate() : nowdate.getDate())
|
|
88
|
+
if (new Date(checkdata).getTime() == new Date(pdate).getTime()) {
|
|
89
|
+
this.cardCental = true
|
|
90
90
|
}
|
|
91
91
|
}
|
|
92
92
|
}
|
|
@@ -97,6 +97,9 @@
|
|
|
97
97
|
<th>
|
|
98
98
|
<nobr>气价编号</nobr>
|
|
99
99
|
</th>
|
|
100
|
+
<th>
|
|
101
|
+
<nobr>气价ID</nobr>
|
|
102
|
+
</th>
|
|
100
103
|
<th v-show="!$parent.$parent.$parent.$parent.usershow && !($parent.$parent.$parent.$parent.isdetail && !$parent.$parent.$parent.$parent.usershow)">
|
|
101
104
|
<nobr>气价名称</nobr>
|
|
102
105
|
</th>
|
|
@@ -136,6 +139,7 @@
|
|
|
136
139
|
<tr>
|
|
137
140
|
<td style="text-align:center">{{$index + 1}}</td>
|
|
138
141
|
<td style="text-align:center">{{row.f_price_id}}</td>
|
|
142
|
+
<td style="text-align:center">{{row.id}}</td>
|
|
139
143
|
<td style="text-align:center" v-show="!$parent.$parent.$parent.$parent.usershow && !($parent.$parent.$parent.$parent.isdetail && !$parent.$parent.$parent.$parent.usershow)"><nobr>{{row.f_price_name}}</nobr></td>
|
|
140
144
|
<td style="text-align:center" v-show="!$parent.$parent.$parent.$parent.usershow && !($parent.$parent.$parent.$parent.isdetail && !$parent.$parent.$parent.$parent.usershow)">{{row.f_user_type}}</td>
|
|
141
145
|
<td style="text-align:center" v-show="!$parent.$parent.$parent.$parent.usershow && !($parent.$parent.$parent.$parent.isdetail && !$parent.$parent.$parent.$parent.usershow)">{{row.f_gasproperties}}</td>
|