diff --git a/sgzb-ui/src/views/claimAndreturn/picking/outbound/index.vue b/sgzb-ui/src/views/claimAndreturn/picking/outbound/index.vue index 271fb738..250b795e 100644 --- a/sgzb-ui/src/views/claimAndreturn/picking/outbound/index.vue +++ b/sgzb-ui/src/views/claimAndreturn/picking/outbound/index.vue @@ -309,7 +309,7 @@ v-if="scope.row.status != 2" @click="manualOperation(scope.row)" > - 出库结单 + 完成出库 @@ -752,14 +752,14 @@ export default { // 手动操作 manualOperation(row) { // 弹框确认 - this.$confirm('是否确认出库结单?', '提示', { + this.$confirm('是否确认完成出库?', '提示', { confirmButtonText: '确定', cancelButtonText: '取消', type: 'warning', }) .then(() => { outboundCompleted({ id: this.dialogQuery.id, typeId: row.typeId }).then((response) => { - this.$modal.msgSuccess('出库结单成功') + this.$modal.msgSuccess('完成出库成功') this.handleDialogQuery() this.handleQuery() }) @@ -767,7 +767,7 @@ export default { .catch(() => { this.$message({ type: 'info', - message: '已取消出库结单', + message: '已取消完成出库', }) }) }, diff --git a/sgzb-ui/src/views/warehouseManage/warehousing/newTools/index.vue b/sgzb-ui/src/views/warehouseManage/warehousing/newTools/index.vue index c776234a..24dc26de 100644 --- a/sgzb-ui/src/views/warehouseManage/warehousing/newTools/index.vue +++ b/sgzb-ui/src/views/warehouseManage/warehousing/newTools/index.vue @@ -363,14 +363,14 @@ 通过 不通过 @@ -605,6 +605,7 @@ export default { }, ], }, + userId: sessionStorage.getItem('userId'), } }, created() { diff --git a/sgzb-ui/src/views/warehouseManage/warehousing/repair/index.vue b/sgzb-ui/src/views/warehouseManage/warehousing/repair/index.vue index c84c023b..c54d7dea 100644 --- a/sgzb-ui/src/views/warehouseManage/warehousing/repair/index.vue +++ b/sgzb-ui/src/views/warehouseManage/warehousing/repair/index.vue @@ -410,13 +410,13 @@ size="mini" type="text" @click="pass(scope.row)" - v-if="scope.row.status == '进行中'" + v-if="scope.row.status == '进行中' && scope.row.userIds.includes(userId)" >通过 不通过 @@ -534,6 +534,7 @@ export default { ], }, equipmentTypeList: [], + userId: sessionStorage.getItem('userId'), } }, created() {