|
@@ -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
|