guarantee-lsq 2 жил өмнө
parent
commit
ef99040f10

+ 12 - 1
src/views/activiti/task/MyTaskFinish.vue

@@ -43,7 +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 { fetchCustomFieldTemplateData, fetchCustomFieldTemplateVOData } from '@/api/customize/fieldTemplateData'
+import { fetchCustomFieldTemplateVOData } from '@/api/customize/fieldTemplateData'
 
 export default {
   name: 'TaskList',
@@ -56,6 +56,7 @@ export default {
   data () {
     return {
       mdl: {},
+      statusMap: {},
       // 查询参数
       queryParam: {
       },
@@ -87,6 +88,15 @@ export default {
           title: '创建时间',
           dataIndex: 'applyTime'
         },
+        {
+          title: '状态',
+          dataIndex: 'status',
+          customRender: (text, record, index) => {
+            return this.BaseTool.Table.statusCustomRenderDict(this, text, record,
+              this.DictCache.COLOR.SB_ALLOCATE_APPLY_STATUS, this.statusMap)
+          }
+
+        },
         {
           title: '操作',
           key: 'action',
@@ -119,6 +129,7 @@ export default {
   },
   created () {
     this.tableOption()
+    this.statusMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.ACTIVITI_FORM_STATUS)
   },
   methods: {
     tableOption () {

+ 6 - 2
src/views/sb/scraps/SbAuditUnifyForm.vue

@@ -192,8 +192,10 @@ export default {
           title: '状态',
           dataIndex: 'status',
           customRender: (text, record, index) => {
-            return this.BaseTool.Table.getMapText(this.statusMap, text)
+            return this.BaseTool.Table.statusCustomRenderDict(this, text, record,
+              this.DictCache.COLOR.SB_ALLOCATE_APPLY_STATUS, this.statusMap)
           }
+
         },
         {
           title: '申请人',
@@ -254,8 +256,10 @@ export default {
           title: '状态',
           dataIndex: 'status',
           customRender: (text, record, index) => {
-            return this.BaseTool.Table.getMapText(this.statusMap, text)
+            return this.BaseTool.Table.statusCustomRenderDict(this, text, record,
+              this.DictCache.COLOR.SB_ALLOCATE_APPLY_STATUS, this.statusMap)
           }
+
         },
         {
           title: '备注',