WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev_2nd_LCYH' into dev_2nd_LCYH

Browse Source 
# Conflicts:
#	jero-web/src/common/lang/en-us.js
#	jero-web/src/common/lang/zh-cn.js
This commit is contained in:
zyx.net
2023-03-17 17:59:47 +08:00
parent 631e9993ff 57d8bbd147
commit e528dd438d
136 changed files with 12623 additions and 3342 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-web/src/components/ImportFile/index.vue
+7
View File
@@ -57,6 +57,10 @@
projectLibraryId: {
type: String,
default: ''
},
authDummyInventoryBaseId: {
type: String,
default: ''
}
},
data() {
@@ -76,7 +80,10 @@
return window._CONFIG['domianURL'] + '/' + this.url.importZipUrl + '?cut=' + this.cut + '&paramsTemplateId=' + this.paramsTemplateId
} else if (this.projectLibraryId) {
return window._CONFIG['domianURL'] + '/' + this.url.importZipUrl + '?cut=' + this.cut + '&projectLibraryId=' + this.projectLibraryId
} else if (this.authDummyInventoryBaseId) {
return window._CONFIG['domianURL'] + '/' + this.url.importZipUrl + '?cut=' + this.cut + '&authDummyInventoryBaseId=' + this.authDummyInventoryBaseId
}
return window._CONFIG['domianURL'] + '/' + this.url.importZipUrl + '?cut=' + this.cut
}
},