diff --git a/src/views/oa/crm/crmMailingApply/edit.vue b/src/views/oa/crm/crmMailingApply/edit.vue
index faba00a..917bbcb 100644
--- a/src/views/oa/crm/crmMailingApply/edit.vue
+++ b/src/views/oa/crm/crmMailingApply/edit.vue
@@ -55,7 +55,7 @@
-
+
@@ -213,7 +213,8 @@ import {
updateCrmMailingApplySignTime
} from '@/api/oa/crm/crmMailingApply';
import { CrmMailingApplyForm } from '@/api/oa/crm/crmMailingApply/types';
-import { getUserList } from '@/api/system/user';
+import { listUser } from '@/api/system/user';
+import { UserQuery } from '@/api/system/user/types';
import ProjectSelect from '@/components/ProjectSelect/index.vue';
import { getRuleGenerateCode } from '@/api/system/codeRule';
import { CodeRuleEnum, FlowCodeEnum } from '@/enums/OAEnum';
@@ -317,8 +318,9 @@ const { form, rules } = toRefs(data);
/** 加载用户列表 */
const loadUserList = async () => {
try {
- const res = await getUserList({} as any);
- userList.value = res.data;
+ const params: UserQuery = { pageNum: 1, pageSize: 9999 };
+ const res = await listUser(params);
+ userList.value = res.rows;
} catch (e) {
userList.value = [];
}
diff --git a/src/views/wms/wmsShippingBill/index.vue b/src/views/wms/wmsShippingBill/index.vue
index 38747b7..82cae0e 100644
--- a/src/views/wms/wmsShippingBill/index.vue
+++ b/src/views/wms/wmsShippingBill/index.vue
@@ -275,14 +275,14 @@ const columns = ref([
{ key: 0, label: '发货单号', visible: true },
{ key: 1, label: 'SAP订单号', visible: true },
{ key: 2, label: '发货方式', visible: true },
- { key: 3, label: '项目名称', visible: true },
+ { key: 3, label: '项目名称', visible: false },
{ key: 4, label: '客户名称', visible: true },
{ key: 5, label: '供应商', visible: true },
{ key: 6, label: '发货单状态', visible: true },
{ key: 7, label: '发货状态', visible: true },
{ key: 8, label: '计划到货时间', visible: true },
{ key: 9, label: '实际发货时间', visible: true },
- { key: 10, label: '创建时间', visible: true }
+ { key: 10, label: '创建时间', visible: false }
]);
const initFormData: WmsShippingBillForm = {