|
@@ -28,7 +28,7 @@
|
|
<el-button type="danger" @click="changeApprove('reject')"
|
|
<el-button type="danger" @click="changeApprove('reject')"
|
|
v-if="formType==='approve'&&approveInfo.isCurrentApprover&&permissionBtn.isShowBtn('approvePermission','reportApprove_reject')">驳回</el-button>
|
|
v-if="formType==='approve'&&approveInfo.isCurrentApprover&&permissionBtn.isShowBtn('approvePermission','reportApprove_reject')">驳回</el-button>
|
|
<el-button type="primary" @click="changeApprove('pass')"
|
|
<el-button type="primary" @click="changeApprove('pass')"
|
|
- v-if="formType==='approve'&&approveInfo.isCurrentApprover&&permissionBtn.isShowBtn('approvePermission','reportApprove_agree')">通过</el-button>
|
|
|
|
|
|
+ v-if="formType==='approve'&&approveInfo.isCurrentApprover&&permissionBtn.isShowBtn('approvePermission','reportApprove_agree')">同意</el-button>
|
|
<el-button type="primary" @click="changeApprove('return')"
|
|
<el-button type="primary" @click="changeApprove('return')"
|
|
v-if="formType==='myself'&&approveInfo.state!==4&&permissionBtn.isShowBtn('approvePermission','reportApprove_repeal')">撤销</el-button>
|
|
v-if="formType==='myself'&&approveInfo.state!==4&&permissionBtn.isShowBtn('approvePermission','reportApprove_repeal')">撤销</el-button>
|
|
<el-button type="primary" plain @click="$router.replace(`/approveList?formType=${formType}`)">返回</el-button>
|
|
<el-button type="primary" plain @click="$router.replace(`/approveList?formType=${formType}`)">返回</el-button>
|
|
@@ -66,7 +66,7 @@ import {approveInterence} from '@/api/modules/approve.js';
|
|
import reportApproveConfig from "@/mixins/reportApproveConfig.js"
|
|
import reportApproveConfig from "@/mixins/reportApproveConfig.js"
|
|
|
|
|
|
const ApproveType = ['','依次审批','会签','或签']
|
|
const ApproveType = ['','依次审批','会签','或签']
|
|
-const ApproveState = ['','待审批','已通过','已驳回']
|
|
|
|
|
|
+const ApproveState = ['','待审批','已同意','已驳回']
|
|
export default {
|
|
export default {
|
|
mixins:[reportApproveConfig],
|
|
mixins:[reportApproveConfig],
|
|
components: { RejectDialog },
|
|
components: { RejectDialog },
|