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

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

@@ -13,14 +13,19 @@
           <div>序号</div>
         </div>
       </a-col>
-      <a-col :span="10" class="bg-gray" style="text-align: center;">
+      <a-col :span="8" class="bg-gray" style="text-align: center;">
         <div class="special-middle">
           <div>文件名</div>
         </div>
       </a-col>
+      <a-col :span="2" class="bg-gray" style="text-align: center;">
+        <div class="special-middle">
+          <div>是否必备材料</div>
+        </div>
+      </a-col>
       <a-col :span="10" class="bg-gray" style="text-align: center;">
         <div class="special-middle">
-          <div>附件说明</div>
+          <div>附件名称</div>
         </div>
       </a-col>
       <a-col :span="2" class="bg-gray" style="text-align: center;">
@@ -35,7 +40,7 @@
           <div>{{index + 1}}</div>
         </div>
       </a-col>
-      <a-col :span="10" style="text-align: center;">
+      <a-col :span="8" style="text-align: center;">
         <div class="special-middle">
           <div v-if="item.fileName" style="text-align: left;">
             <!--  {{item.fileName}}  -->
@@ -44,9 +49,14 @@
           <div v-else>无</div>
         </div>
       </a-col>
+      <a-col :span="2" style="text-align: center;">
+        <div class="special-middle">
+          <div>{{ item.isRequired == true ? "是" : "否" }}</div>
+        </div>
+      </a-col>
       <a-col :span="10" style="text-align: center;">
         <div class="special-middle">
-          <div>{{item.fileExplain}}<span v-if="item.required" style="color:red;">*</span></div>
+          <div>{{item.fileExplain}}<span v-if="item.isRequired" style="color:red;">*</span></div>
         </div>
       </a-col>
       <a-col :span="2" style="text-align: center;">

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

@@ -674,7 +674,7 @@ import unitPaymentInfo from '@/views/report/project/components/unitPaymentInfo.v
 import projectKpi from '@/views/report/project/components/projectKPI.vue'
 import projectSubInfo from '@/views/report/project/components/projectSubInfo'
 import managementRuleInfo from '@/views/report/project/components/managementRuleInfo'
-import fileInfo from "@/views/report/project/components/keyProject/fileInfo";
+import fileInfo from "@/views/report/project/components/fileInfo";
 import documentView from '@/views/components/common/documentView'
 import AuditList from '@/views/audit/components/auditInfo'
 import { toTextarea } from '@/views/utils/common'