Merge remote-tracking branch 'origin/dev_2nd_LCYH' into dev_2nd_LCYH
This commit is contained in:
@@ -575,7 +575,7 @@
|
||||
}
|
||||
let paramscm = {
|
||||
paramsManifestId: paramsManifestid,
|
||||
moduleFlag:'上报库管理'
|
||||
moduleFlag:'上报库详情'
|
||||
}
|
||||
var jsonHead = []
|
||||
getAction(url, paramscm).then((res) => {
|
||||
|
||||
@@ -1504,8 +1504,8 @@
|
||||
getAction(this.url.AndUserId, query).then((res) => {
|
||||
if (res.success) {
|
||||
// this.isDisplay = true
|
||||
if (this.$route.query.roleOpen && this.$route.query.roleOpen == 'fggcs'){
|
||||
this.formInlineRoleSwitching.roleSwitchingCode = '1'
|
||||
if (this.$route.query.roleOpen){
|
||||
this.formInlineRoleSwitching.roleSwitchingCode = this.$route.query.roleOpen
|
||||
}else{
|
||||
this.formInlineRoleSwitching.roleSwitchingCode = res.result.roleCode
|
||||
}
|
||||
|
||||
@@ -267,7 +267,7 @@
|
||||
targetMarket: row.targetMarket,
|
||||
studioEngineer: row.studioEngineer,
|
||||
type: '102',
|
||||
roleOpen:'fggcs',
|
||||
roleOpen:'1',
|
||||
}
|
||||
})
|
||||
window.open(newUrl.href, '_blank')
|
||||
|
||||
Reference in New Issue
Block a user