数据采集流程状态修改

src/views/GATHER/index.vue

@@ -132,24 +132,22 @@
             @click="handleDownload(scope.row)"
             >下载导入模板</el-button
           > -->
-
+          <!--          todo不加 template 会造成浏览器渲染问题 导致无法弹出 el-popconfirm 组件-->
           <template v-if="scope.row.collStatus == 0 && checkPermi(['gather:GATHER:add'])">
             <el-button style="margin: 0 2px" size="mini" type="text" @click="handleUpdate(scope.row)">录入</el-button>
           </template>
           <!--              已采集，未上报，未提交审核 或 审核拒绝-->
-          <template v-if="scope.row.collStatus == 1 && scope.row.reportStatus == 0 && scope.row.approveStatus == 0 && checkPermi(['gather:GATHER:report'])  || scope.row.collStatus == 1 && scope.row.reportStatus == 0 && scope.row.approveStatus == 3 && checkPermi(['gather:GATHER:report']) ">
-            <el-popconfirm title="确定上报吗？" @confirm="handleReport(scope.row)">
-              <el-button style="margin: 0 2px" size="mini" slot="reference" type="text">上报</el-button>
-            </el-popconfirm>
-          </template>
-<!--          todo不加 template 会造成浏览器渲染问题 导致无法弹出 el-popconfirm 组件-->
-          <!--              已采集，已上报，未提交审核-->
-          <template v-if="scope.row.collStatus == 1 && scope.row.reportStatus == 1 && scope.row.approveStatus == 0 && checkPermi(['gather:GATHER:approve'])">
-<!--          <template v-if="scope.row.approveStatus == 0 && scope.row.collStatus == 1 && checkPermi(['gather:GATHER:approve'])">-->
+          <template v-if="scope.row.collStatus == 1 && scope.row.reportStatus == 0 && scope.row.approveStatus == 0 && checkPermi(['gather:GATHER:approve']) || scope.row.collStatus == 1 && scope.row.reportStatus == 0 && scope.row.approveStatus == 3 && checkPermi(['gather:GATHER:approve'])">
             <el-popconfirm title="确定提交吗？" @confirm="handleApprove(scope.row)">
               <el-button style="margin: 0 2px"  size="mini" type="text" slot="reference">审核</el-button>
             </el-popconfirm>
           </template>
+          <!--              已采集，未上报，审核通过 -->
+          <template v-if="scope.row.collStatus == 1 && scope.row.reportStatus == 0 && scope.row.approveStatus == 2 && checkPermi(['gather:GATHER:report'])   ">
+            <el-popconfirm title="确定上报吗？" @confirm="handleReport(scope.row)">
+              <el-button style="margin: 0 2px" size="mini" slot="reference" type="text">上报</el-button>
+            </el-popconfirm>
+          </template>
 
           <el-button style="margin: 0 2px" v-if="scope.row.collStatus == 1" size="mini" type="text" @click="handleDetail(scope.row, 0)">查看</el-button>
           <el-button style="margin: 0 2px" v-if="scope.row.collStatus == 1 && scope.row.reportStatus == 0 && scope.row.approveStatus == 0 && checkPermi(['gather:GATHER:edit'])" size="mini" type="text" @click="handleDetail(scope.row, 1)">修改</el-button>