From 9da9c9e940ca6d1b67e9825fee2bec8c54dc0d12 Mon Sep 17 00:00:00 2001
From: chenbo <709206448@qq.com>
Date: Tue, 27 Feb 2024 14:15:06 +0800
Subject: [PATCH] update

---
 src/views/task_detail/edit.vue  | 9 ---------
 src/views/task_detail/index.vue | 5 ++---
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/src/views/task_detail/edit.vue b/src/views/task_detail/edit.vue
index 2cf9c24..44d4a73 100644
--- a/src/views/task_detail/edit.vue
+++ b/src/views/task_detail/edit.vue
@@ -2,15 +2,6 @@
   <div class="edit-popup">
     <popup ref="popupRef" :title="popupTitle" :async="true" width="60%" @confirm="handleSubmit" @close="handleClose">
       <el-form ref="formRef" :inline="true" :model="formData" label-width="120px" :rules="formRules">
-        <el-form-item label="主表标识" prop="task_allocation_dataid">
-          <el-input v-model="formData.task_allocation_dataid" clearable placeholder="请输入主表标识" />
-        </el-form-item>
-        <el-form-item label="任务名称" prop="task_name">
-          <el-input v-model="formData.task_name" clearable placeholder="请输入任务名称" />
-        </el-form-item>
-        <el-form-item label="任务名称id" prop="task_name_id">
-          <el-input v-model="formData.task_name_id" clearable placeholder="请输入任务名称id" />
-        </el-form-item>
         <el-form-item label="工序" prop="process">
           <el-input v-model="formData.process" clearable placeholder="请输入工序" />
         </el-form-item>
diff --git a/src/views/task_detail/index.vue b/src/views/task_detail/index.vue
index 305c1c4..53f3434 100644
--- a/src/views/task_detail/index.vue
+++ b/src/views/task_detail/index.vue
@@ -30,9 +30,8 @@
       <div class="mt-4">
         <el-table :data="pager.lists" @selection-change="handleSelectionChange">
           <el-table-column type="selection" width="55" />
-          <el-table-column label="主表标识" prop="task_allocation_dataid" show-overflow-tooltip />
-          <el-table-column label="任务名称" prop="task_name" show-overflow-tooltip />
-          <el-table-column label="任务名称id" prop="task_name_id" show-overflow-tooltip />
+          <el-table-column label="主表标识" prop="taskAllocation.dataid" show-overflow-tooltip />
+          <el-table-column label="任务名称" prop="taskTypeInfo.name" show-overflow-tooltip />
           <el-table-column label="工序" prop="process" show-overflow-tooltip />
           <el-table-column label="任务类型" prop="task_type_id">
             <template #default="{ row }">