Merge branch 'dev' into 'master'

Dev

See merge request !21

src/views/taskManage/index.vue

@@ -548,7 +548,10 @@ export default {
         },
         {
           label: '描述',
-          key: 'evaluations',
+          key: 'content',
+          render: (item) => {
+            return <div domPropsInnerHTML={item.content}></div>
+          },
         },
         {
           label: '创建时间',
@@ -824,7 +827,7 @@ export default {
     },
     async complete(item) {
       try {
-        await this.$confirm('确定开始吗?', '提示', {
+        await this.$confirm('确定完成吗?', '提示', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
           type: 'warning',