From 870a9499eb65de0031ef8e8f70607e5dfb64b806 Mon Sep 17 00:00:00 2001 From: cy <1664593601@qq.com> Date: 星期四, 30 十一月 2023 09:30:18 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- admin-web/src/views/departmentitem/itemdis/distribution/index.vue | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/admin-web/src/views/departmentitem/itemdis/distribution/index.vue b/admin-web/src/views/departmentitem/itemdis/distribution/index.vue index 681e679..8be3bbe 100644 --- a/admin-web/src/views/departmentitem/itemdis/distribution/index.vue +++ b/admin-web/src/views/departmentitem/itemdis/distribution/index.vue @@ -91,8 +91,7 @@ import myImport from '@/views/components/myImport'; import edit from './edit'; import detail from './detail'; -import {getBaseUrl} from '@/utils/base'; -import listPage from '../../../mixins/listPage'; +import listPage from '@/views/mixins/listPage'; import {getUserDetail} from "@/utils/auth"; export default { @@ -115,7 +114,7 @@ }, { type: 'select', - dataIndex: 'inWarehouseId', + dataIndex: 'inAgencyId', label: '鍒嗗彂閮ㄩ棬', placeholder: '璇烽�夋嫨', optionsConfig: { -- Gitblit v1.9.1