From 2096ac6f7379d75001b610c2de1fa380abd09519 Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期二, 12 十二月 2023 16:13:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin-web/src/views/departmentitem/itemdis/distribution/index.vue | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/admin-web/src/views/departmentitem/itemdis/distribution/index.vue b/admin-web/src/views/departmentitem/itemdis/distribution/index.vue
index 0f13fd5..bda50a4 100644
--- a/admin-web/src/views/departmentitem/itemdis/distribution/index.vue
+++ b/admin-web/src/views/departmentitem/itemdis/distribution/index.vue
@@ -30,7 +30,7 @@
</div>
<div class="one-hed">
<div class="box"><span class="span-two">閮ㄩ棬锛�</span>{{ item.inWarehouseName }}</div>
- <div class="box"><span class="span-two">鍒嗗彂浜猴細</span>{{ item.inOperatorName }}</div>
+ <div class="box"><span class="span-two">鍒嗗彂浜猴細</span>{{ item.outOperatorName }}</div>
<div class="box">
<span class="span-two">鍒嗗彂鏃堕棿锛�</span>{{ item.createTime | formatTime }}
</div>
@@ -172,7 +172,7 @@
qryType: 1,
pageNum: this.pageNum,
pageSize: this.pageSize,
- departmentId: this.userInfo.tenantId,
+ outAgencyId: this.userInfo.tenantId,
...this.filterFrom,
}).then((res) => {
this.list = res.datas;
--
Gitblit v1.9.1