Merge branch 'yufei' of gitadmin/tuoheng_pilot_web into develop

src/views/task-manage/tools/table.js

@@ -134,7 +134,7 @@ const data = reactive({
                 text: true,
                 onClick: editHandle.bind(null, row, 'update')
               },
-              show: row.status > 10 || row.inspectionType !== 1,
+              show: row.status < 11 && row.inspectionType === 1,
               auth: 'task:all:edit'
             },
             {
@@ -145,7 +145,7 @@ const data = reactive({
                 onPositiveClick: deleteData.bind(null, row.id)
               },
               auth: 'task:all:delete',
-              show: row.status > 15 || row.inspectionType !== 1,
+              show: row.status < 16 && row.inspectionType === 1,
               ButtonProps: {
                 text: true,
                 type: 'primary'