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
This commit is contained in:
wangzhijiang
2023-04-07 13:47:33 +08:00
parent 7143ffb00b 89d65ddfe2
commit ad1cc761c6
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-web/src/components/tableCollection/index1.vue
+1 -1
View File
@@ -575,7 +575,7 @@
} }
let paramscm = { let paramscm = {
paramsManifestId: paramsManifestid, paramsManifestId: paramsManifestid,
moduleFlag:'上报库管理' moduleFlag:'上报库详情'
} }
var jsonHead = [] var jsonHead = []
getAction(url, paramscm).then((res) => { getAction(url, paramscm).then((res) => {
jero-web/src/views/projectManagement/components/listOfRegulations.vue
+2 -2
View File
@@ -1504,8 +1504,8 @@
getAction(this.url.AndUserId, query).then((res) => { getAction(this.url.AndUserId, query).then((res) => {
if (res.success) { if (res.success) {
// this.isDisplay = true // this.isDisplay = true
if (this.$route.query.roleOpen && this.$route.query.roleOpen == 'fggcs'){ if (this.$route.query.roleOpen){
this.formInlineRoleSwitching.roleSwitchingCode = '1' this.formInlineRoleSwitching.roleSwitchingCode = this.$route.query.roleOpen
}else{ }else{
this.formInlineRoleSwitching.roleSwitchingCode = res.result.roleCode this.formInlineRoleSwitching.roleSwitchingCode = res.result.roleCode
} }
jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue
+1 -1
View File
@@ -267,7 +267,7 @@
targetMarket: row.targetMarket, targetMarket: row.targetMarket,
studioEngineer: row.studioEngineer, studioEngineer: row.studioEngineer,
type: '102', type: '102',
roleOpen:'fggcs', roleOpen:'1',
} }
}) })
window.open(newUrl.href, '_blank') window.open(newUrl.href, '_blank')