完善

src/views/activiti/task/MyStart.vue

@@ -44,7 +44,7 @@ import AssignForm from './modules/AssignForm'
 import DetailAuditScrap from '@/views/sb/scraps/modules/DetailAudit'
 import { getTaskPageStart } from '@/api/activiti/activiti'
 import { fetchSbScrapForm } from '@/api/sb/scraps'
-import { getCustomFieldTemplateDataPage } from '@/api/customize/fieldTemplateData'
+import { fetchCustomFieldTemplateVOData, getCustomFieldTemplateDataPage } from '@/api/customize/fieldTemplateData'
 
 export default {
   name: 'TaskList',
@@ -200,7 +200,9 @@ export default {
     handleView (record) {
       this.visible = false
       const templateData = JSON.parse(record.data)
-      this.$refs.detailAuditScrapModal.base(record, templateData)
+      fetchCustomFieldTemplateVOData({ id: record.id }).then(res => {
+        this.$refs.detailAuditScrapModal.base(res.data, templateData)
+      })
     },
     handleOk () {
       this.visible = true

src/views/activiti/task/MyTask.vue

@@ -46,7 +46,7 @@ import { STable, Ellipsis } from '@/components'
 import AssignForm from './modules/AssignForm'
 import DetailAuditScrap from '@/views/sb/scraps/modules/DetailAudit'
 import { getTaskPage } from '@/api/activiti/activiti'
-import { fetchCustomFieldTemplateData } from '@/api/customize/fieldTemplateData'
+import { fetchCustomFieldTemplateData, fetchCustomFieldTemplateVOData } from '@/api/customize/fieldTemplateData'
 
 export default {
   name: 'TaskList',
@@ -150,10 +150,13 @@ export default {
     },
     handleAudit (record) {
       this.visible = false
-      fetchCustomFieldTemplateData({ id: record.targetId }).then(res => {
+      fetchCustomFieldTemplateVOData({ id: record.targetId }).then(res => {
         const templateData = JSON.parse(res.data.data)
-        record.remark = res.data.remark
-        this.$refs.detailAuditScrapModal.base(record, templateData)
+        const recordTemp = res.data
+        recordTemp.taskId = record.taskId
+        this.$refs.detailAuditScrapModal.base(recordTemp, templateData)
+        /* record.remark = res.data.remark
+        this.$refs.detailAuditScrapModal.base(record, templateData) */
       })
     },
     handleChange (record) {
@@ -161,7 +164,6 @@ export default {
         record.remark = res.data.remark
         this.$refs.assignForm.base(record)
       })
-      //this.$refs.assignForm.base(record)
     },
     handleOk () {
       this.visible = true