Merge branch 'master' of http://192.168.1.89:3000/wilson/krd-srm-vue

src/views/modules/workFlow/flowInstanceList.vue

@@ -407,6 +407,7 @@ export default {
         case 'APPROVED': return '#67C23A'
         case 'REJECTED': return '#F56C6C'
         case 'SKIPPED': return '#909399'
+        case 'CANCELLED': return '#909399' // rqrq 驳回后关闭的待办
         default: return '#909399'
       }
     },
@@ -416,6 +417,7 @@ export default {
         case 'APPROVED': return '已通过'
         case 'REJECTED': return '已驳回'
         case 'SKIPPED': return '已跳过'
+        case 'CANCELLED': return '已关闭' // rqrq
         default: return status
       }
     },