数据采集审核流程

src/views/GATHER/index.vue

@@ -127,69 +127,31 @@
       <el-table-column label="审核时间" align="center" prop="approveTime" width="100" />
       <el-table-column label="审核状态" align="center" prop="approveStatus">
         <template slot-scope="scope">
-          <span v-if="scope.row.audit == 0 && scope.row.auditTime == null">未提交审核</span>
-          <span v-if="scope.row.audit == 1 &&
-            (scope.row.approveStatus == 0 ||
-              scope.row.approveStatus == null) &&
-            scope.row.approveTime == null
-            ">未审核</span>
-
-          <span v-if="scope.row.approveStatus == 1">审核通过</span>
-          <span v-if="scope.row.approveStatus == 2">审核拒绝</span>
+          <span>{{ scope.row.approveStatus == 0 ? "未审核" : (scope.row.approveStatus == 1 ? "审核中" : (scope.row.approveStatus == 2 ? "审核通过" :"审核拒绝"))  }}</span>
         </template>
       </el-table-column>
       <el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width">
         <template slot-scope="scope">
-          <!-- <el-button
-            style="margin: 0 2px"
-            size="mini"
-            type="text"
-            @click="handleDownload(scope.row)"
-            >下载导入模板</el-button
-          > -->
-          <!--          todo不加 template 会造成浏览器渲染问题 导致无法弹出 el-popconfirm 组件-->
-
-          <template v-if="scope.row.collStatus == 0 && checkPermi(['gather:GATHER:add'])
-            ">
+          <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.audit == 0 || scope.row.audit == null) &&
-            checkPermi(['gather:GATHER:approve'])
-            ">
+
+          <template v-if="scope.row.collStatus == 1 && scope.row.approveStatus == 0 && checkPermi(['gather:GATHER:approve'])">
             <el-popconfirm title="确定提交审核吗？" @confirm="handleAudit(scope.row)">
               <el-button style="margin: 0 2px" size="mini" type="text" slot="reference">提交审核</el-button>
             </el-popconfirm>
           </template>
-          <!--              已采集，未上报，未提交审核 或 审核拒绝-->
-
-          <!-- collStatus = 1 , audit = 1 , -->
-          <!-- <template>
-            {{ scope.row.collStatus }} || {{ scope.row.audit }}||
-            {{ scope.row.approveStatus }} || {{ scope.row.reportStatus }} ||
-            {{ checkPermi(["gather:GATHER:check"]) }}普通 ---
-            {{ checkPermi(["gather:GATHER:approve"]) }}管理
-          </template> -->
-          <template v-if="scope.row.collStatus == 1 &&
-            scope.row.audit == 1 &&
-            (scope.row.approveStatus == 0 ||
-              scope.row.approveStatus == null ||
-              scope.row.approveStatus == 2) &&
-            checkPermi(['gather:GATHER:check'])
+       
+          <template v-if="scope.row.approveStatus == 1 && checkPermi(['gather:GATHER:check'])
             ">
-            <!-- <el-popconfirm
-              title="确定提交吗？"
-              @confirm="handleApprove(scope.row)"
-            > -->
             <el-button @click="handleApprove(scope.row)" 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 == 1 &&
+            scope.row.approveStatus == 2 &&
             checkPermi(['gather:GATHER:report'])
             ">
             <el-popconfirm title="确定上报吗？" @confirm="handleReport(scope.row)">
@@ -197,12 +159,11 @@
             </el-popconfirm>
           </template>
 
-          <el-button style="margin: 0 2px" v-if="scope.row.collStatus == 1" size="mini" type="text"
+          <el-button v-if="scope.row.collStatus == 1" style="margin: 0 2px"  size="mini" type="text"
             @click="handleDetail(scope.row, 0)">查看</el-button>
           <!-- {{scope.row.collStatus}}--{{scope.row.approveStatus}} -->
 
-          <el-button style="margin: 0 2px" v-if="scope.row.collStatus == 1 && // 已采集
-            scope.row.audit == 0 && // 未审核
+          <el-button style="margin: 0 2px" v-if="scope.row.approveStatus == 1 && 
             checkPermi(['gather:GATHER:edit']) // 编辑权限
             " size="mini" type="text" @click="handleDetail(scope.row, 1)">修改</el-button>
         </template>
@@ -455,8 +416,9 @@ export default {
       //审核状态(0=未审核,1审核中,2=审核通过,3=审核拒绝)
       approveStatus: [
         { label: "未审核", value: "0" },
-        { label: "审核通过", value: "1" },
-        { label: "审核拒绝", value: "2" },
+        { label: "审核中", value: "1" },
+        { label: "审核通过", value: "2" },
+        { label: "审核拒绝", value: "3" },
       ],
       // 根路径
       baseURL: process.env.VUE_APP_BASE_API,
@@ -795,7 +757,6 @@ export default {
           }
         });
       } else {
-        // console.log('aude',audit)
         bsqAudit(audit).then((res) => {
           if (res.code == 200) {
             this.$modal.msgSuccess("驳回成功");