|
|
@@ -80,7 +80,8 @@
|
|
|
:id="edit_form.id"
|
|
|
:type="
|
|
|
edit_visible &&
|
|
|
- ((edit_form.status === '2' && duty === '9') ||
|
|
|
+ (((edit_form.status === '1' || edit_form.status === '2') &&
|
|
|
+ duty === '9') ||
|
|
|
edit_form.status === '0')
|
|
|
? 'edit'
|
|
|
: 'view'
|
|
|
@@ -99,6 +100,7 @@
|
|
|
:visible="approve_visible"
|
|
|
:reload="reload"
|
|
|
width="500px"
|
|
|
+ class="approve"
|
|
|
@cancel="handleCancel('approve_visible')"
|
|
|
>
|
|
|
<el-form :model="approveForm" ref="approveForm"
|
|
|
@@ -852,6 +854,7 @@ export default {
|
|
|
});
|
|
|
} else if (desc === "存在未提交,是否还要审核") {
|
|
|
this.$confirm(desc, {
|
|
|
+ distinguishCancelAndClose: false,
|
|
|
confirmButtonText: "确定",
|
|
|
cancelButtonText: "取消",
|
|
|
type: "warning",
|
|
|
@@ -881,7 +884,13 @@ export default {
|
|
|
});
|
|
|
})
|
|
|
.catch((error) => {
|
|
|
- console.log(error);
|
|
|
+ this.handleCancel("visible");
|
|
|
+ this.handleCancel("approve_visible");
|
|
|
+ this.handleInit({
|
|
|
+ ...this.table_search,
|
|
|
+ page: this.page,
|
|
|
+ pageSize: this.rows,
|
|
|
+ });
|
|
|
});
|
|
|
}
|
|
|
});
|
|
|
@@ -1023,5 +1032,10 @@ export default {
|
|
|
};
|
|
|
</script>
|
|
|
|
|
|
-<style c>
|
|
|
+<style lang="scss" scope>
|
|
|
+.approve {
|
|
|
+ .v-modal {
|
|
|
+ display: none !important;
|
|
|
+ }
|
|
|
+}
|
|
|
</style>
|
