设计出图

src/views/design/drawing/DrawingTable.vue

@@ -1,7 +1,7 @@
 <template>
   <el-table v-loading="loading" :data="drawingList" @selection-change="handleSelectionChange">
     <el-table-column type="selection" width="55" align="center" />
-    <el-table-column label="版本号" align="center" prop="versionNumber" width="100" />
+    <!-- <el-table-column label="版本号" align="center" prop="versionNumber" width="100" />
     <el-table-column label="文件名称" align="center" prop="fileName">
       <template #default="scope">
         <span style="color: #409eff" @click="handleView(scope.row)">{{ scope.row.fileName }}</span>
@@ -26,7 +26,16 @@
         <dict-tag :options="wf_business_status" :value="scope.row.status"></dict-tag>
       </template>
     </el-table-column>
-    <el-table-column label="上传时间" align="center" prop="createTime" />
+    <el-table-column label="上传时间" align="center" prop="createTime" /> -->
+    <el-table-column label="子项名称" align="center" prop="designSubitem" />
+    <el-table-column label="专业" align="center" prop="specialty">
+      <template #default="scope">
+        <dict-tag :options="des_user_major" :value="scope.row.specialty" />
+      </template>
+    </el-table-column>
+    <el-table-column label="负责人" align="center" prop="principal" />
+    <el-table-column label="卷册号" align="center" prop="volumeNumber" />
+    <el-table-column label="资料名称" align="center" prop="fileName" />
     <el-table-column label="备注" align="center" prop="remark" />
     <el-table-column label="操作" align="center" class-name="small-padding " width="240">
       <template #default="scope">
@@ -55,6 +64,9 @@
 
 <script setup lang="ts">
 import { ref, defineProps, defineEmits } from 'vue';
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+
+const { design_state, wf_business_status, des_user_major } = toRefs(proxy?.useDict('design_state', 'wf_business_status', 'des_user_major'));
 
 const props = defineProps({
   drawingList: {

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();