diff --git a/src/components/contract/flowAudit.vue b/src/components/contract/flowAudit.vue index 650f01689..97e373c80 100644 --- a/src/components/contract/flowAudit.vue +++ b/src/components/contract/flowAudit.vue @@ -2,10 +2,10 @@ -
-
{{ $t('flowAudit.auditInfo') }}
+
+ {{ $t('flowAudit.auditInfo') }}
-
+
@@ -40,7 +40,7 @@
- + @@ -53,16 +53,6 @@ export default { components: { SelectStaff }, - props: { - callBackListener: { - type: String, - default: '' - }, - callBackFunction: { - type: String, - default: '' - } - }, data() { return { flowAuditInfo: { @@ -90,6 +80,10 @@ export default { } }, methods: { + handleSelectStaff(staff) { + this.flowAuditInfo.staffId = staff.userId + this.flowAuditInfo.staffName = staff.userName + }, open(auditOrder) { Object.assign(this.flowAuditInfo, auditOrder) this.flowAuditInfo.state = '' @@ -117,17 +111,17 @@ export default { return } - if (this.callBackListener) { - const _flowAuditInfo = { - state: this.flowAuditInfo.state, - remark: this.flowAuditInfo.state === '1200' - ? `${this.$t('flowAudit.reject')}:${this.flowAuditInfo.remark}` - : this.flowAuditInfo.remark, - nextUserId: this.flowAuditInfo.staffId - } - this.$emit(this.callBackFunction, _flowAuditInfo) - this.clearAddBasePrivilegeInfo() + + const _flowAuditInfo = { + state: this.flowAuditInfo.state, + remark: this.flowAuditInfo.state === '1200' + ? `${this.$t('flowAudit.reject')}:${this.flowAuditInfo.remark}` + : this.flowAuditInfo.remark, + nextUserId: this.flowAuditInfo.staffId } + this.$emit('auditSubmit', _flowAuditInfo) + this.clearAddBasePrivilegeInfo() + }, clearAddBasePrivilegeInfo() { this.flowAuditInfo = { @@ -160,7 +154,7 @@ export default { this.$refs.selectStaff.open(this.flowAuditInfo) }, _goBack() { - this.$emit(this.callBackListener, 'list', {}) + this.$emit('goBack', {}) } } } diff --git a/src/views/contract/contractApplyAuditOrdersList.vue b/src/views/contract/contractApplyAuditOrdersList.vue index 69adab9b9..737201c90 100644 --- a/src/views/contract/contractApplyAuditOrdersList.vue +++ b/src/views/contract/contractApplyAuditOrdersList.vue @@ -38,8 +38,7 @@ - +
@@ -85,6 +84,13 @@ export default { this._loadStepStaff() }, methods: { + handleGoBack() { + this.contractApplyAuditOrdersInfo.audit = '1' + this._listAuditOrders(this.page.current, this.page.size) + }, + handleAuditSubmit(auditInfo) { + this._auditOrderInfo(auditInfo) + }, async _listAuditOrders(page, rows) { try { this.contractApplyAuditOrdersInfo.audit = '1'