tMerge branch 'main' of http://123.132.248.154:10000/gitY/TianWangHuiYan

src/views/demo/usertask/DetailModal.vue

@@ -20,7 +20,7 @@
       </a-descriptions-item>
       <a-descriptions-item label="图斑数量" :span="2">{{taskInfo.tubanNum}}</a-descriptions-item>
       <a-descriptions-item label="任务进度" :span="2">
-        <a-tag color="green" v-if="taskInfo.isCompleted">已完成</a-tag>
+        <a-tag color="green" v-if="taskInfo.isComplate">已完成</a-tag>
         <a-tag color="red" v-else>未完成</a-tag>
       </a-descriptions-item>
       <a-descriptions-item label="备注/说明" :span="6">{{taskInfo.remark}}</a-descriptions-item>

src/views/demo/usertask/dept.data.ts

@@ -25,7 +25,7 @@ export const columns: BasicColumn[] = [
     dataIndex: 'status',
     width: 80,
     customRender: ({ record }) => {
-      const enable = record.isCompleted;
+      const enable = record.isComplate;
       const color = enable ? 'green' : 'red';
       const text = enable ? '已完成' : '未完成';
       return h(Tag, { color: color }, () => text);