Merge branch 'master' of http://116.204.116.5:3000/zzw/cbjsxt-front-master

src/components/task/taskInfo.vue

@@ -412,7 +412,7 @@
               </el-table-column>
               <el-table-column
                 prop="isRequired"
-                label="是否通过"
+                label="审核状态"
                 width="110"
                 align="center"
               >

src/views/EntDeclaration/auditTaskManagement/components/DataRequirementsTab.vue

@@ -80,7 +80,7 @@
       </el-table-column>
       <el-table-column
         prop="isRequired"
-        label="是否通过"
+        label="审核状态"
         width="110"
         align="center"
       >
@@ -106,6 +106,7 @@
           <template v-if="!scope.row.isCategoryHeader">
             <template v-if="scope.row.formatRequired !== '3'">
               <el-button
+                v-if="scope.row.isUploaded === true"
                 type="text"
                 size="small"
                 @click="$emit('handleFileView', scope.row)"
@@ -113,6 +114,7 @@
                 查看
               </el-button>
               <el-button
+                v-if="scope.row.isUploaded === true"
                 type="text"
                 size="small"
                 @click="$emit('handleFileDownload', scope.row)"
@@ -131,6 +133,7 @@
             </template>
             <template v-if="scope.row.formatRequired == '3'">
               <el-button
+                v-if="scope.row.isUploaded === true"
                 type="text"
                 size="small"
                 @click="$emit('handleTemplateDownload', scope.row)"

src/views/EntDeclaration/auditTaskManagement/taskFillIn.vue

@@ -159,6 +159,8 @@
         :visible.sync="materialDialogVisible"
         width="600px"
         :close-on-click-modal="false"
+        :modal="false"
+        append-to-body
       >
         <el-form
           ref="materialForm"