Merge remote-tracking branch 'origin/demo_' into demo_

src/views/activiti/task/MyTaskFinish.vue

@@ -43,8 +43,7 @@ import { STable, Ellipsis } from '@/components'
 import AssignForm from './modules/AssignForm'
 import DetailAuditScrap from '@/views/sb/scraps/modules/DetailAudit'
 import { getTaskPageFinish } from '@/api/activiti/activiti'
-import { fetchSbScrapForm } from '@/api/sb/scraps'
-import { fetchCustomFieldTemplateData } from '@/api/customize/fieldTemplateData'
+import { fetchCustomFieldTemplateData, fetchCustomFieldTemplateVOData } from '@/api/customize/fieldTemplateData'
 
 export default {
   name: 'TaskList',
@@ -148,15 +147,16 @@ export default {
     },
     handleView (record) {
       this.visible = false
-      /*if (record.targetCode === 'sb_info_scrap') {
-        fetchSbScrapForm({ id: record.targetId }).then(res => {
-          this.$refs.detailAuditScrapModal.base(record, res.data)
-        })
-      }*/
-      fetchCustomFieldTemplateData({ id: record.targetId }).then(res => {
+      fetchCustomFieldTemplateVOData({ id: record.targetId }).then(res => {
         const templateData = JSON.parse(res.data.data)
-        this.$refs.detailAuditScrapModal.base(record, templateData)
+        const recordTemp = res.data
+        recordTemp.taskId = record.taskId
+        this.$refs.detailAuditScrapModal.base(recordTemp, templateData)
       })
+      /* fetchCustomFieldTemplateData({ id: record.targetId }).then(res => {
+        const templateData = JSON.parse(res.data.data)
+        this.$refs.detailAuditScrapModal.base(record, templateData)
+      }) */
     },
     handleOk () {
       this.visible = true