diff --git a/src/components/ApprovalFlow/index.vue b/src/components/ApprovalFlow/index.vue index c203d327..7482d7a7 100644 --- a/src/components/ApprovalFlow/index.vue +++ b/src/components/ApprovalFlow/index.vue @@ -123,7 +123,7 @@ export default { }); }, approvalFlowUpdate(row) { - if (row.approvalStatus == 2){ + if (row.approvalStatus == 2 && this.isChang){ this.approvalFlow.id = row.id this.approvalFlowUpdateShow = !this.approvalFlowUpdateShow } @@ -138,7 +138,7 @@ export default { }, getList() { this.loading = true; - this.idQuery.approvalFlowId + console.log(this.idQuery.approvalFlowId) getDetailList(this.idQuery.approvalFlowId) .then((response) => { this.activities = response.data || []; diff --git a/src/views/inout/receive/DialogNewReceive.vue b/src/views/inout/receive/DialogNewReceive.vue index d5a4b634..1693434b 100644 --- a/src/views/inout/receive/DialogNewReceive.vue +++ b/src/views/inout/receive/DialogNewReceive.vue @@ -254,9 +254,10 @@ export default { deleteLoading: false, orderNo: null, statusMap: { - 1: "草稿", - 2: "未审核", - 3: "已审核", + 0: "草稿", + 1: "未审核", + 2: "已审核", + 3: "已拒绝" }, orderEditor: true, iCount: 0, diff --git a/src/views/inout/receive/receiveAdd.vue b/src/views/inout/receive/receiveAdd.vue index 3784eefe..9b0812e7 100644 --- a/src/views/inout/receive/receiveAdd.vue +++ b/src/views/inout/receive/receiveAdd.vue @@ -417,10 +417,10 @@ export default { update: "编辑领用单据", }, statusMap: { - 1: "草稿", - 2: "未审核", - 3: "已审核", - 4: "已拒绝" + 0: "草稿", + 1: "未审核", + 2: "已审核", + 3: "已拒绝" }, idQuery: {}, corpList: [], diff --git a/src/views/inout/receive/receiveAudit.vue b/src/views/inout/receive/receiveAudit.vue index cc3184df..365c8c76 100644 --- a/src/views/inout/receive/receiveAudit.vue +++ b/src/views/inout/receive/receiveAudit.vue @@ -354,6 +354,7 @@ v-if="newSpDistributionVisible" :close-on-click-modal="false" :close-on-press-escape="false" + :before-close="handleClose" > + + + + + + + + + + + + + + 审核通过 - - 审核拒绝 - + @click.native="showApprovalFlowDetail()" + >审核过程 + + @@ -80,10 +86,30 @@ + + + + + +