|
|
@@ -136,13 +136,16 @@
|
|
|
<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.reportStatus == 0 && scope.row.collStatus == 1 && checkPermi(['gather:GATHER:report'])">
|
|
|
+ <!-- 已采集，未上报，未提交审核 或 审核拒绝-->
|
|
|
+ <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.approveStatus == 0 && scope.row.collStatus == 1 && checkPermi(['gather:GATHER:approve'])">
|
|
|
+ <!-- 已采集，已上报，未提交审核-->
|
|
|
+ <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'])">-->
|
|
|
<el-popconfirm title="确定提交吗？" @confirm="handleApprove(scope.row)">
|
|
|
<el-button style="margin: 0 2px" size="mini" type="text" slot="reference">审核</el-button>
|
|
|
</el-popconfirm>
|
|
|
@@ -380,7 +383,8 @@ export default {
|
|
|
methods: {
|
|
|
checkPermi,
|
|
|
checkRole,
|
|
|
- validatorNum(rule, value, callback) {},
|
|
|
+ // 下面这个validatorNum写重复了吗？
|
|
|
+ // validatorNum(rule, value, callback) {},
|
|
|
validatorFloatNum(rule, value, callback) {
|
|
|
let reg = /^[+-]?(0|([1-9]\d*))(\.\d+)?$/g;
|
|
|
if (!reg.test(value)) {
|
lcmxs