合并

src/views/design/drawing/index.vue

@@ -38,7 +38,7 @@
           <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
       </template>
-      <el-tabs type="border-card" v-model="activeName" class="demo-tabs" @tab-click="handleClick">
+      <!-- <el-tabs type="border-card" v-model="activeName" class="demo-tabs" @tab-click="handleClick">
         <el-tab-pane label="过程图纸" name="1">
           <DrawingTable
             :drawingList="drawingList"
@@ -81,7 +81,19 @@
             @cancel-process-apply="handleCancelProcessApply"
           />
         </el-tab-pane>
-      </el-tabs>
+      </el-tabs> -->
+      <DrawingTable
+        :drawingList="drawingList"
+        :loading="loading"
+        :drawing_file_type="drawing_file_type"
+        :wf_business_status="wf_business_status"
+        @selection-change="handleSelectionChange"
+        @view="handleView"
+        @update="handleUpdate"
+        @delete="handleDelete"
+        @view-info="handleViewInfo"
+        @cancel-process-apply="handleCancelProcessApply"
+      />
       <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
     </el-card>
   </div>
@@ -118,7 +130,6 @@ const data = reactive({
     pageSize: 10,
     projectId: currentProject.value?.id,
     fileName: undefined,
-    fileType: 1,
     fileSuffix: undefined,
     fileStatus: undefined,
     originalName: undefined,
@@ -219,18 +230,12 @@ const handleCancelProcessApply = async (id: string) => {
   proxy?.$modal.msgSuccess('撤销成功');
 };
 
-const handleClick = (val) => {
-  queryParams.value.pageNum = 1;
-  queryParams.value.fileType = val.props.name;
-  getList();
-};
-
 onMounted(() => {
   getList();
 });
 //监听项目id刷新数据
 const listeningProject = watch(
-  () => currentProject.value.id,
+  () => currentProject.value?.id,
   (nid, oid) => {
     queryParams.value.projectId = nid;
     getList();