sale-client 4.3.64 → 4.3.65
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/.gradle/5.2.1/fileChanges/last-build.bin +0 -0
- package/.gradle/5.2.1/fileHashes/fileHashes.lock +0 -0
- package/.gradle/5.2.1/gc.properties +0 -0
- package/.gradle/9.3.0/checksums/checksums.lock +0 -0
- package/.gradle/9.3.0/fileChanges/last-build.bin +0 -0
- package/.gradle/9.3.0/fileHashes/fileHashes.lock +0 -0
- package/.gradle/9.3.0/gc.properties +0 -0
- package/.gradle/buildOutputCleanup/buildOutputCleanup.lock +0 -0
- package/.gradle/buildOutputCleanup/cache.properties +2 -0
- package/.gradle/vcs-1/gc.properties +0 -0
- package/build/dev-server.js +6 -6
- package/package.json +1 -1
- package/src/filiale/liaoyuan/ChangeMeter.vue +15 -9
- package/src/main.js +1 -1
|
Binary file
|
|
Binary file
|
|
File without changes
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
File without changes
|
|
Binary file
|
|
File without changes
|
package/build/dev-server.js
CHANGED
|
@@ -50,12 +50,12 @@ var devConfig = {
|
|
|
50
50
|
'/rs/pay': {
|
|
51
51
|
target: 'http://localhost:8080'
|
|
52
52
|
},
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
53
|
+
'/api/af-revenue': {
|
|
54
|
+
pathRewrite: {
|
|
55
|
+
'/api/af-revenue': '/'
|
|
56
|
+
},
|
|
57
|
+
target: "http://localhost:9026"
|
|
58
|
+
},
|
|
59
59
|
'/api': {
|
|
60
60
|
target: serverRul
|
|
61
61
|
},
|
package/package.json
CHANGED
|
@@ -184,10 +184,10 @@
|
|
|
184
184
|
</div>
|
|
185
185
|
</div>
|
|
186
186
|
<div style="text-align:right;height:auto;">
|
|
187
|
-
<button class="button_search" type="button" v-if="!config.hasAudit" @click="confirmbefore(confirm)" :disabled="(!meterinfo&& !model.f_type.includes('清零'))||!$v.valid"
|
|
187
|
+
<button class="button_search" type="button" v-if="!config.hasAudit" @click="confirmbefore('confirm')" :disabled="(!meterinfo&& !model.f_type.includes('清零'))||!$v.valid"
|
|
188
188
|
>确认
|
|
189
189
|
</button>
|
|
190
|
-
<button class="button_search" type="button" v-if="config.hasAudit" @click="confirmbefore(audit)" :disabled="(!meterinfo&& !model.f_type.includes('清零'))||!$v.valid"
|
|
190
|
+
<button class="button_search" type="button" v-if="config.hasAudit" @click="confirmbefore('audit')" :disabled="(!meterinfo&& !model.f_type.includes('清零'))||!$v.valid"
|
|
191
191
|
>发起审核
|
|
192
192
|
</button>
|
|
193
193
|
<button class="button_clear" type="button" @click="clean()" >取消
|
|
@@ -355,7 +355,7 @@ export default {
|
|
|
355
355
|
return
|
|
356
356
|
}
|
|
357
357
|
}
|
|
358
|
-
if (this.model.metermessage.f_meter_type[0]
|
|
358
|
+
if (this.model.metermessage.f_meter_type[0] == '机表') {
|
|
359
359
|
console.log('进来了')
|
|
360
360
|
if (this.books.data.length > 0) {
|
|
361
361
|
console.log('进来了2')
|
|
@@ -410,7 +410,11 @@ export default {
|
|
|
410
410
|
if (this.model.metermessage.f_meter_type[0] != '机表') {
|
|
411
411
|
this.$dispatch('refresh')
|
|
412
412
|
} else {
|
|
413
|
-
|
|
413
|
+
if (type === 'confirm') {
|
|
414
|
+
this.saveobj()
|
|
415
|
+
} else {
|
|
416
|
+
this.auditData()
|
|
417
|
+
}
|
|
414
418
|
}
|
|
415
419
|
})
|
|
416
420
|
} else {
|
|
@@ -421,6 +425,7 @@ export default {
|
|
|
421
425
|
if (this.row.f_meter_type.includes('气量卡表') && (this.model.f_using_base_old > (this.row.f_total_gas + this.row.f_initial_base + this.row.f_remanent_gas))) {
|
|
422
426
|
await this.$showMessage(`该表可能存在超用,请确定是否继续进行换表操作!!!,或者取消进入超用收费!`, ['confirm', 'cancel']).then((res) => {
|
|
423
427
|
if (res === 'confirm') {
|
|
428
|
+
console.log(type)
|
|
424
429
|
if (type === 'confirm') {
|
|
425
430
|
this.saveobj()
|
|
426
431
|
} else {
|
|
@@ -526,6 +531,7 @@ export default {
|
|
|
526
531
|
for (let row of this.resid) {
|
|
527
532
|
param.push(row.id)
|
|
528
533
|
}
|
|
534
|
+
data.config.hasArrearsChange = true
|
|
529
535
|
this.model.files = param
|
|
530
536
|
this.$resetpost('api/af-revenue/logic/mobile_changeMeter', data, {
|
|
531
537
|
resolveMsg: null,
|
|
@@ -792,11 +798,11 @@ export default {
|
|
|
792
798
|
)
|
|
793
799
|
console.log('获取到的欠费记录', books)
|
|
794
800
|
this.books = books
|
|
795
|
-
// 如果是机表验证是否有欠费
|
|
796
|
-
if ((this.row.f_balance - 0) < 0 || this.books.data.length > 0) {
|
|
797
|
-
|
|
798
|
-
|
|
799
|
-
}
|
|
801
|
+
// // 如果是机表验证是否有欠费
|
|
802
|
+
// if ((this.row.f_balance - 0) < 0 || this.books.data.length > 0) {
|
|
803
|
+
// this.$showAlert('该表有欠费,请到机表缴费界面进行缴费', 'warning', 3000)
|
|
804
|
+
// this.$dispatch('button-specifies', {name: '机表收费', value: 'machine-charge'}, this.row)
|
|
805
|
+
// }
|
|
800
806
|
}
|
|
801
807
|
},
|
|
802
808
|
|
package/src/main.js
CHANGED
|
@@ -2,7 +2,7 @@ import Vue from 'vue'
|
|
|
2
2
|
import all from 'vue-client/src/all'
|
|
3
3
|
import App from './App'
|
|
4
4
|
import system from 'system-clients/src/system'
|
|
5
|
-
import FilialeSale from './filiale/
|
|
5
|
+
import FilialeSale from './filiale/liaoyuan/sale'
|
|
6
6
|
import sale from './sale'
|
|
7
7
|
import address from 'address-client/src/address'
|
|
8
8
|
import ldap from 'ldap-clients/src/ldap'
|