Преглед изворни кода

Merge tag 'Hotfix-96' into develop

Finish Hotfix-96
chen пре 3 година
родитељ
комит
f7603f230c
1 измењених фајлова са 3 додато и 2 уклоњено
  1. 3 2
      src/views/finance/change_list.vue

+ 3 - 2
src/views/finance/change_list.vue

@@ -61,6 +61,7 @@
                 <el-tag size="mini" type="success" v-show="scope.row.examineStatus == 'OK'">复核通过</el-tag>
                 <el-tag size="mini" type="danger" v-show="scope.row.examineStatus == 'FALL'">不通过</el-tag>
                 <el-tag size="mini" type="info" v-show="scope.row.examineStatus == 'CLOSE'">已关闭</el-tag>
+                <el-tag size="mini" type="danger" v-show="scope.row.examineStatus == 'REJECT'">驳回</el-tag>
               </template>
             </el-table-column>
             <el-table-column align="left" label="返利转账单号" prop="id" min-width="200" show-overflow-tooltip>
@@ -139,7 +140,7 @@
                 <el-button @click="submitFn(scope.row.id)" v-if="
                     $checkBtnRole('apply', $route.meta.roles) &&
                     isCustomer &&
-                    scope.row.examineStatus == 'SAVE'
+                    (scope.row.examineStatus == 'SAVE' || scope.row.examineStatus == 'REJECT' )
                   " type="text" class="textColor" slot="reference">提审</el-button>
                 <!-- <el-button v-if="isCustomer && scope.row.examineStatus == 'WAIT'" type="text" class="textColor" slot="reference" @click="withdrawFn">撤回</el-button> -->
                 <el-button v-if="
@@ -148,7 +149,7 @@
                     $checkBtnRole('examine', $route.meta.roles)
                   " @click="examineFn(scope.row.id)" type="text" class="textColor" slot="reference">审核</el-button>
                 <el-button v-if="
-                    (scope.row.examineStatus == 'FAIL_ONE' ||
+                    (scope.row.examineStatus == 'FAIL_ONE' || scope.row.examineStatus == 'REJECT' ||
                       scope.row.examineStatus == 'SAVE') &&
                     $checkBtnRole('edit', $route.meta.roles)
                   " type="text" class="textColor" slot="reference" @click="editFn(scope.row.id)">修改</el-button>