diff --git a/src/views/workCenter/noMatchTrackingProcess/NoMatchTrackingProcess.vue b/src/views/workCenter/noMatchTrackingProcess/NoMatchTrackingProcess.vue
index d269504..9ab10ef 100644
--- a/src/views/workCenter/noMatchTrackingProcess/NoMatchTrackingProcess.vue
+++ b/src/views/workCenter/noMatchTrackingProcess/NoMatchTrackingProcess.vue
@@ -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()
- },
+ }
}
diff --git a/src/views/workCenter/projectComplianceEvaluationProcess/ProjectComplianceEvaluationProcess.vue b/src/views/workCenter/projectComplianceEvaluationProcess/ProjectComplianceEvaluationProcess.vue
index 18337c6..5b0897e 100644
--- a/src/views/workCenter/projectComplianceEvaluationProcess/ProjectComplianceEvaluationProcess.vue
+++ b/src/views/workCenter/projectComplianceEvaluationProcess/ProjectComplianceEvaluationProcess.vue
@@ -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)
}
diff --git a/src/views/workCenter/standardConsultation/StandardConsultationProcess.vue b/src/views/workCenter/standardConsultation/StandardConsultationProcess.vue
index a4e346b..7cf665c 100644
--- a/src/views/workCenter/standardConsultation/StandardConsultationProcess.vue
+++ b/src/views/workCenter/standardConsultation/StandardConsultationProcess.vue
@@ -108,12 +108,14 @@
:rules="rules.userType" />
{
this.$message(res.message)