修改bug

src/views/design/volumeCatalog/index.vue

@@ -40,7 +40,7 @@
           </el-col>
           <el-col :span="1.5">
             <file-upload
-              v-model="filePath"
+              v-model="form.file"
               isImportInfo
               :isShowTip="false"
               uploadUrl="/design/volumeCatalog/importData"
@@ -67,11 +67,14 @@
             <dict-tag :options="design_state" :value="scope.row.designState" />
           </template>
         </el-table-column>
-        <el-table-column label="专业" align="center" prop="specialty" />
+        <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="documentName" />
-        <el-table-column label="上传时间" align="center" prop="createTime" />
         <el-table-column label="计划出图时间" align="center" prop="plannedCompletion" />
         <el-table-column label="审核状态" align="center" prop="auditStatus">
           <template #default="scope">
@@ -79,7 +82,7 @@
           </template>
         </el-table-column>
 
-        <el-table-column label="文件" align="center" prop="fileVoList" width="180">
+        <!-- <el-table-column label="文件" align="center" prop="fileVoList" width="180">
           <template #default="scope">
             <el-link
               v-for="item in scope.row.fileVoList"
@@ -93,7 +96,7 @@
               {{ item.fileName }}
             </el-link>
           </template>
-        </el-table-column>
+        </el-table-column> -->
         <el-table-column label="上传说明" align="center" prop="explainText">
           <template #default="scope">
             {{ scope.row.fileVoList[0]?.explainText }}
@@ -102,6 +105,7 @@
         <el-table-column label="备注" align="center" prop="remark" />
         <el-table-column label="操作" align="center" width="220">
           <template #default="scope">
+            <el-button link type="primary" icon="View" @click="handleView(scope.row)" v-hasPermi="['out:monthPlan:remove']">查看文件</el-button>
             <el-button link type="primary" icon="Finished" @click="handleAudit(scope.row)" v-hasPermi="['out:monthPlan:remove']">审核</el-button>
             <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['design:volumeCatalog:edit']">修改</el-button>
             <el-button link type="primary" icon="Upload" @click="handleUpload(scope.row)">上传</el-button>
@@ -121,7 +125,9 @@
           <el-input v-model="form.designSubitem" placeholder="请输入设计子项" />
         </el-form-item>
         <el-form-item label="专业" prop="specialty">
-          <el-input v-model="form.specialty" placeholder="请输入专业" />
+          <el-select v-model="form.specialty" placeholder="请选择专业">
+            <el-option :value="item.value" v-for="item in des_user_major" :key="item.value" :label="item.label" />
+          </el-select>
         </el-form-item>
         <el-form-item label="负责人" prop="principal">
           <el-input v-model="form.principal" placeholder="请输入负责人" />
@@ -176,6 +182,41 @@
         </el-form-item>
       </el-form>
     </el-dialog>
+    <!-- 查看文件列表 -->
+    <el-dialog title="文件列表" v-model="viewVisible" width="45%">
+      <el-table v-if="fileList.length > 0" :data="fileList" style="width: 100%" border>
+        <el-table-column prop="fileName" label="文件" align="center">
+          <template #default="scope">
+            <el-link
+              :key="scope.row.fileId"
+              :href="scope.row.fileUrl"
+              target="_blank"
+              :type="scope.row.status == '1' ? 'primary' : 'info'"
+              :underline="false"
+            >
+              {{ scope.row.fileName }}
+            </el-link>
+          </template>
+        </el-table-column>
+        <el-table-column prop="size" label="状态" width="170" align="center">
+          <template #default="scope">
+            <el-tag :type="scope.row.status == 1 ? 'success' : 'info'">{{ scope.row.status == 1 ? '使用中' : '已作废' }}</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" width="170" align="center">
+          <template #default="scope">
+            <el-button type="danger" link icon="Download" @click="handleDownload(scope.row)"> 下载 </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <div v-else class="empty-list text-center">暂无文件</div>
+      <template #footer>
+        <span>
+          <el-button type="primary" @click="viewVisible = false">关闭</el-button>
+        </span>
+      </template>
+    </el-dialog>
   </div>
 </template>
 
@@ -192,9 +233,9 @@ import {
 } from '@/api/design/volumeCatalog';
 import { VolumeCatalogVO, VolumeCatalogQuery, VolumeCatalogForm } from '@/api/design/volumeCatalog/types';
 import { useUserStoreHook } from '@/store/modules/user';
-
+const fileList = ref([]);
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-const { design_state, wf_business_status } = toRefs(proxy?.useDict('design_state', 'wf_business_status'));
+const { design_state, wf_business_status, des_user_major } = toRefs(proxy?.useDict('design_state', 'wf_business_status', 'des_user_major'));
 
 const volumeCatalogList = ref<VolumeCatalogVO[]>([]);
 const buttonLoading = ref(false);
@@ -228,16 +269,17 @@ const uploadForm = reactive({
 
 const userList = ref([]);
 
-const initFormData: VolumeCatalogForm = {
+const initFormData: any = {
   design: undefined,
   projectId: currentProject.value?.id || '',
   designSubitemId: undefined,
   volumeNumber: undefined,
   documentName: undefined,
+  designState: '2',
 
   remark: undefined
 };
-const data = reactive<PageData<VolumeCatalogForm, VolumeCatalogQuery>>({
+const data = reactive({
   form: { ...initFormData },
   queryParams: {
     pageNum: 1,
@@ -305,7 +347,7 @@ const handleSelectionChange = (selection: VolumeCatalogVO[]) => {
 const handleAdd = () => {
   reset();
   dialog.visible = true;
-  dialog.title = '添加卷册目录';
+  dialog.title = '添加设计出图计划';
 };
 
 /** 修改按钮操作 */
@@ -315,11 +357,18 @@ const handleUpdate = async (row?: VolumeCatalogVO) => {
   const res = await getVolumeCatalog(_id);
   Object.assign(form.value, res.data);
   dialog.visible = true;
-  dialog.title = '修改卷册目录';
+  dialog.title = '修改设计出图计划';
+};
+
+const handleView = (row?: any) => {
+  fileList.value = row.fileVoList;
+
+  viewVisible.value = true;
 };
 
 /** 上传文件按钮操作 */
 const uploadVisible = ref(false);
+const viewVisible = ref(false);
 const handleUpload = async (row?: any) => {
   resetUploadForm();
   uploadForm.volumeCatalogId = row.design;
@@ -331,7 +380,7 @@ const handleUpload = async (row?: any) => {
 
 /** 查看文件 */
 const lookFile = (fileId: string) => {
-  lookViewerFile(fileId);
+  // lookViewerFile(fileId);
 };
 
 /** 重置上传表单 */
@@ -361,6 +410,10 @@ const submitForm = () => {
   });
 };
 
+const handleDownload = (row: any) => {
+  proxy?.$download.oss(row.fileId);
+};
+
 /** 上传文件提交 */
 const onSubmit = async () => {
   buttonLoading.value = true;