sale-client 3.6.401 → 3.6.403
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/buildOutputCleanup/buildOutputCleanup.lock +0 -0
- package/.gradle/buildOutputCleanup/cache.properties +2 -0
- package/.gradle/vcs-1/gc.properties +0 -0
- package/package.json +1 -1
- package/src/components/FilesManage/MeterinfoTest.vue +7 -1
- package/src/filiale/gehua/WebMeterList.vue +1 -1
- package/src/filiale/tongchuan/plugins/FileManageService.js +1 -1
|
Binary file
|
|
Binary file
|
|
File without changes
|
|
Binary file
|
|
File without changes
|
package/package.json
CHANGED
|
@@ -651,7 +651,12 @@
|
|
|
651
651
|
try {
|
|
652
652
|
let result = yield http.load('GET', `rs/vue/MeterinfoTest.json`, {}, {resolveMsg: null, rejectMsg: null})
|
|
653
653
|
Object.assign(self.config, result.data)
|
|
654
|
-
if (!self.row.f_open_way)
|
|
654
|
+
if (!self.row.f_open_way) {
|
|
655
|
+
self.row.f_open_way = self.config.open_way
|
|
656
|
+
}
|
|
657
|
+
if (!self.row.f_usetype || self.row.f_usetype.length === 0) {
|
|
658
|
+
self.row.f_usetype = self.config.f_usetype
|
|
659
|
+
}
|
|
655
660
|
} catch (error) {
|
|
656
661
|
// 忽略704,文件找不到异常
|
|
657
662
|
if (error.status !== 704) {
|
|
@@ -700,6 +705,7 @@
|
|
|
700
705
|
stuckFlowmeterShow: false,
|
|
701
706
|
overduesetShow: true,
|
|
702
707
|
f_install_date: true,
|
|
708
|
+
f_usetype: '',
|
|
703
709
|
open_way: '指令开户'
|
|
704
710
|
},
|
|
705
711
|
mapShow: false,
|
|
@@ -401,7 +401,7 @@ export default {
|
|
|
401
401
|
|
|
402
402
|
var link = document.createElement('a')
|
|
403
403
|
let path = '表具导入异常信息.txt'
|
|
404
|
-
let pathName = 'http://' + location.host + '/webapps/revenue/excel' + path
|
|
404
|
+
let pathName = 'http://' + location.host + '/webapps/revenue/excel/' + path
|
|
405
405
|
link.href = pathName
|
|
406
406
|
link.download = path
|
|
407
407
|
link.dispatchEvent(new MouseEvent('click'))
|
|
@@ -190,7 +190,7 @@ let FileManageService = {
|
|
|
190
190
|
}
|
|
191
191
|
|
|
192
192
|
meter.f_gasproperties = meter.f_gasproperties.length > 0 ? meter.f_gasproperties[0] : ''
|
|
193
|
-
meter.f_gasproperties_second = meter.f_gasproperties_second.length > 0 ? meter.f_gasproperties_second[0] : ''
|
|
193
|
+
meter.f_gasproperties_second = meter.f_gasproperties_second && meter.f_gasproperties_second.length > 0 ? meter.f_gasproperties_second[0] : ''
|
|
194
194
|
meter.f_adjustable_id = meter.f_adjustable.length > 0 ? meter.f_adjustable[0].id : null
|
|
195
195
|
meter.f_userfiles_address = meter.f_userfiles_address.length > 0 ? meter.f_userfiles_address[0] : null
|
|
196
196
|
if (!meter.f_userfiles_id) {
|