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

src/components/task/taskInfo.vue

@@ -428,6 +428,69 @@
                   </span>
                 </template>
               </el-table-column>
+              <el-table-column
+                prop="operation"
+                label="操作"
+                width="220"
+                align="center"
+              >
+                <template slot-scope="scope">
+                  <template v-if="!scope.row.isCategoryHeader">
+                    <template v-if="scope.row.formatRequired !== '3'">
+                      <el-button
+                        v-if="
+                          scope.row.isUpload === 1 || scope.row.isUpload === '1'
+                        "
+                        type="text"
+                        size="small"
+                        @click="$emit('handleFileView', scope.row)"
+                      >
+                        查看
+                      </el-button>
+                      <el-button
+                        v-if="
+                          scope.row.isUpload === 1 || scope.row.isUpload === '1'
+                        "
+                        type="text"
+                        size="small"
+                        @click="$emit('handleFileDownload', scope.row)"
+                      >
+                        下载
+                      </el-button>
+                      <!-- <el-button
+                v-if="scope.row.isUpload === 0 || scope.row.isUpload === '0'"
+                type="text"
+                size="small"
+                :disabled="isViewMode"
+                @click="$emit('handleFileUpload', scope.row)"
+              >
+                上传
+              </el-button> -->
+                    </template>
+                    <template v-if="scope.row.formatRequired == '3'">
+                      <el-button
+                        v-if="
+                          scope.row.isUpload === 1 || scope.row.isUpload === '1'
+                        "
+                        type="text"
+                        size="small"
+                        @click="$emit('handleTemplateDownload', scope.row)"
+                      >
+                        模版下载
+                      </el-button>
+                      <!-- <el-button
+                v-if="scope.row.isUpload === 0 || scope.row.isUpload === '0'"
+                type="text"
+                size="small"
+                :disabled="isViewMode"
+                @click="$emit('handleDataUpload', scope.row)"
+              >
+                数据上传
+              </el-button> -->
+                    </template>
+                  </template>
+                </template>
+              </el-table-column>
             </el-table>
           </div>
         </el-tab-pane>

src/views/EntDeclaration/auditTaskManagement/taskFillIn.vue

@@ -1098,6 +1098,8 @@
                 if (res && res.code === 200) {
                   Message.success('提交成功')
                   this.handleBack()
+                  // 通知父组件刷新列表
+                  this.$emit('refresh')
                 } else {
                   Message.error('提交失败')
                 }