Merge branch 'master' of http://gitlab.yiboshi.com/XuJun/yn-science-front

src/views/audit/project/Index.vue

@@ -38,6 +38,9 @@
           {{ record }}
         </span>
       </template>
+      <template slot="projClassInfo" slot-scope="record">
+        {{ record.projClass == 1 ? "一般项目" : "重点项目" }}
+      </template>
       <template slot="option" slot-scope="record">
         <a-button type="link" size="small" @click="recordClick(record, 'view')">查看</a-button>
         <a-button type="link" size="small" v-if="record.auditResult == 1" @click="recordClick(record, 'audit')">审核</a-button>
@@ -104,12 +107,13 @@ export default {
       itemCount: [0, 0, 0, 0, 0],
       tableData: [],
       columns: [
-        { title: "项目名称", scopedSlots: { customRender: 'projName' } },
+        { title: "项目名称", scopedSlots: { customRender: 'projName' }, ellipsis: true, width: 300, },
         //{ title: "项目编号", dataIndex: "projNo", align: 'center' },
         { title: '申请编号', dataIndex: 'appNo', align: 'center' },
         { title: "开始时间", dataIndex: "startDate", align: 'center' },
         { title: "结束时间", dataIndex: "endDate", align: 'center' },
         { title: "申报年度", dataIndex: "reportYear", align: 'center' },
+        { title: "项目类别", scopedSlots: { customRender: 'projClassInfo' }, align: 'center', width: 80 },
         { title: '申报单位', dataIndex: 'appUnitName', align: 'center' },
         { title: '申报学科', dataIndex: 'knowledgeName', align: 'center' },
         { title: '申报人', dataIndex: 'appPersonName', align: 'center' },

src/views/report/project/components/fileEdit.vue

@@ -19,7 +19,7 @@
           <a href="/downloadFile/202412130903.docx" download="项目资金预算编制说明.docx" style="margin-right: 20px;">
             <a-icon type="download"></a-icon>&nbsp;<span style="color:green;text-decoration:underline;">项目资金预算编制说明</span>
           </a>
-          <a href="/downloadFile/202412241748.docx" download="项目资金预算编制说明.docx" style="margin-right: 20px;">
+          <a href="/downloadFile/202412241748.docx" download="申请人个人简历.docx" style="margin-right: 20px;">
             <a-icon type="download"></a-icon>&nbsp;<span style="color:green;text-decoration:underline;">申请人个人简历</span>
           </a>
         </div>