ZQ/laws-sinotruk-mobile
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix 80651

Browse Source
This commit is contained in:
赵霄
2024-01-15 14:07:19 +08:00
parent 9d32e62eb0
commit ed9370d320
3 changed files with 34 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/views/workCenter/noMatchTrackingProcess/NoMatchTrackingProcess.vue
+13 -4
View File
@@ -242,9 +242,18 @@ export default {
}
queryNoMatchTrackingProcess(params).then(res => {
if (res.success) {
const { result = {} } = res
this.processInfo = Object.assign({}, result.basicProcessInfoDTO || {})
this.dataSource = result.businessInfoDTO.processProjectNotMetLinks || []
if (res.result.infoJsonStr) {
const result = JSON.parse(res.result.infoJsonStr)
this.processInfo = Object.assign({}, result.processInfo || {})
this.dataSource = result.dataSource
this.approvalInfo = Object.assign({}, result.approvalInfo || {})
} else {
const { result = {} } = res
this.processInfo = Object.assign({}, result.basicProcessInfoDTO || {})
this.dataSource = result.businessInfoDTO.processProjectNotMetLinks || []
}
console.log(result)
}
}).finally(() => {
this.loading = false
@@ -368,7 +377,7 @@ export default {
next({ path: '/noMobile' })
}
next()
},
}
}
</script>
src/views/workCenter/projectComplianceEvaluationProcess/ProjectComplianceEvaluationProcess.vue
+18 -9
View File
@@ -414,15 +414,24 @@ export default {
this.loading = true
queryProjectComplianceEvaluation(params).then(res => {
if (res.success) {
const { result = {} } = res
this.processInfo = Object.assign({}, result.basicProcessInfoDTO || {})
this.approvalInfo = Object.assign({}, result.basicTaskInfoDTO || {})
// 处理车型项目信息
this.projectInfo = Object.assign({}, result.businessInfoDTO.processProjectAssess || {})
// 处理标准信息
this.standardList = result.businessInfoDTO.processProjectAssessLinkList || []
this.dataSource = result.businessInfoDTO.processProjectAssessTermList || []
this.businessId = result.businessId
if (res.result.infoJsonStr) {
const result = JSON.parse(res.result.infoJsonStr)
this.processInfo = Object.assign({}, result.basicProcessInfoDTO || {})
this.approvalInfo = Object.assign({}, result.approvalInfo || {})
this.projectInfo = result.projectList[0] || {}
this.standardList = result.standardList || []
this.dataSource = result.dispatchList || []
} else {
const { result = {} } = res
this.processInfo = Object.assign({}, result.basicProcessInfoDTO || {})
this.approvalInfo = Object.assign({}, result.basicTaskInfoDTO || {})
// 处理车型项目信息
this.projectInfo = Object.assign({}, result.businessInfoDTO.processProjectAssess || {})
// 处理标准信息
this.standardList = result.businessInfoDTO.processProjectAssessLinkList || []
this.dataSource = result.businessInfoDTO.processProjectAssessTermList || []
}
this.businessId = res.result.businessId
} else {
this.$message(res.message)
}
src/views/workCenter/standardConsultation/StandardConsultationProcess.vue
+3
View File
@@ -108,12 +108,14 @@
:rules="rules.userType" />
<!--模块负责人-->
<select-user-field v-model="dispatchInfo.moduleOwnerId"
:checked-names="dispatchInfo.moduleOwnerId_dictText"
type="checkbox"
:label="$t('standardConsultation.moduleOwner')"
v-if="isDepartLeaderDistribute && dispatchInfo.userType === SenderType.moduleOwner.value"
:rules="rules.moduleOwnerId" />
<!--设计工程师-->
<select-user-field v-model="dispatchInfo.designEngineerId"
:checked-names="dispatchInfo.designEngineerId_dictText"
type="checkbox"
:label="$t('standardConsultation.designEngineer')"
v-if="(isDepartLeaderDistribute && dispatchInfo.userType === SenderType.designEngineer.value) || isModuleOwnerDistribute"
@@ -586,6 +588,7 @@ export default {
if (!formData) {
return
}
formData.infoJsonStr = JSON.stringify(formData)
this.loading = true
saveConsultationProcess(formData).then(res => {
this.$message(res.message)