diff --git a/wms_pro/qd/src/views/wms/flow_manage/act/execution/index.vue b/wms_pro/qd/src/views/wms/flow_manage/act/execution/index.vue index fdceb50e..e0cbf55a 100644 --- a/wms_pro/qd/src/views/wms/flow_manage/act/execution/index.vue +++ b/wms_pro/qd/src/views/wms/flow_manage/act/execution/index.vue @@ -138,20 +138,19 @@ placement="top" width="180" trigger="click" - :value="popoverVisible" - @hide="onPopoverHide" + style="z-index: 9999;" + :ref="`popover-${scope.$index}`" >

{{ popoverMessage }}

- 取消 - 确定 + 取消 + 确定
触发 - 预览 @@ -213,8 +212,6 @@ export default { permission: {}, modelJson: '', popoverMessage: "确定要触发流程吗?", - triggerLoading: false, - popoverVisible: false, statusList: [ { value: "30", @@ -244,23 +241,19 @@ export default { return true }, showPopover() { - this.popoverVisible = true; + // this.popoverVisible = true; }, - cancelFlow() { - this.popoverVisible = false; + cancelFlow(scope) { + scope._self.$refs[`popover-${scope.$index}`].doClose() }, - confirmFlow(proc_inst_id) { - this.triggerLoading = true; + confirmFlow(proc_inst_id, scope) { curdExecution.flowConfirm(proc_inst_id).then(res => { this.crud.notify("触发成功", CRUD.NOTIFICATION_TYPE.SUCCESS) - this.triggerLoading = false; - this.popoverVisible = false; + this.crud.toQuery() }) - this.crud.toQuery() - }, - onPopoverHide() { - this.triggerLoading = false; + scope._self.$refs[`popover-${scope.$index}`].doClose() }, + jsonFormat(row, index) { if (row.form_data != null) { return JSON.stringify(row.form_data)