diff --git a/src/views/oa/crm/businessTripApply/index.vue b/src/views/oa/crm/businessTripApply/index.vue
index 6559aba..f20c09b 100644
--- a/src/views/oa/crm/businessTripApply/index.vue
+++ b/src/views/oa/crm/businessTripApply/index.vue
@@ -200,7 +200,7 @@ import { listBusinessTripApply, delBusinessTripApply, updateBusinessTripApply }
import { BusinessTripApplyVO, BusinessTripApplyQuery } from '@/api/oa/crm/businessTripApply/types';
import { getUserList, listUser } from '@/api/system/user';
import { UserQuery, UserVO } from '@/api/system/user/types';
-import { listDept } from '@/api/system/dept';
+import { allListDept, listDept } from '@/api/system/dept';
import { DeptVO } from '@/api/system/dept/types';
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
@@ -357,7 +357,7 @@ onMounted(async () => {
const userRes = await getUserList(userQuery.value);
userList.value = userRes.data;
// 加载部门列表
- const deptRes = await listDept();
+ const deptRes = await allListDept({ deptCategory: '03' } as any);
deptList.value = deptRes.data;
// 加载数据列表
getList();
diff --git a/src/views/oa/erp/timesheetInfo/edit.vue b/src/views/oa/erp/timesheetInfo/edit.vue
index e235397..111eede 100644
--- a/src/views/oa/erp/timesheetInfo/edit.vue
+++ b/src/views/oa/erp/timesheetInfo/edit.vue
@@ -41,6 +41,14 @@
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
-
+
-
-
-
-
-
@@ -240,7 +247,7 @@ import { ElMessage } from 'element-plus';
// API
import { getTimesheetInfo, addTimesheetInfo, updateTimesheetInfo, submitTimesheetAndFlowStart } from '@/api/oa/erp/timesheetInfo';
-import { listProjectInfo } from '@/api/oa/erp/projectInfo';
+import { getErpProjectInfoList, listProjectInfo } from '@/api/oa/erp/projectInfo';
import { getRuleGenerateCode } from '@/api/system/codeRule';
// Components & Store & Enums
@@ -250,8 +257,8 @@ import ApprovalButton from '@/components/Process/approvalButton.vue';
import { useUserStore } from '@/store/modules/user';
import { CodeRuleEnum, FlowCodeEnum } from '@/enums/OAEnum';
import { getInfo } from '@/api/login';
-import { listDept } from '@/api/system/dept';
-import { listUser } from '@/api/system/user';
+import { allListDept, listDept } from '@/api/system/dept';
+import { getUserList, listUser } from '@/api/system/user';
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
const route = useRoute();
@@ -296,7 +303,8 @@ const data = reactive({
rules: {
// timesheetCode: [{ required: true, message: '编号不能为空', trigger: 'blur' }],
startTime: [{ required: true, message: '请选择起始日期', trigger: 'change' }],
- endTime: [{ required: true, message: '请选择结束日期', trigger: 'change' }]
+ endTime: [{ required: true, message: '请选择结束日期', trigger: 'change' }],
+ deptId: [{ required: true, message: '部门不能为空', trigger: 'change' }],
}
});
@@ -367,13 +375,13 @@ const handleStartTimeChange = (val: any) => {
// 加载基础下拉数据
function loadBaseOptions() {
- listProjectInfo({ pageNum: 1, pageSize: 1000 }).then((res: any) => {
- projectOptions.value = res.rows;
+ getErpProjectInfoList({} as any).then((res: any) => {
+ projectOptions.value = res.data;
});
- listUser({ pageNum: 1, pageSize: 1000 }).then((res: any) => {
- userList.value = res.rows;
+ getUserList({} as any).then((res: any) => {
+ userList.value = res.data;
});
- listDept({ pageNum: 1, pageSize: 1000 }).then((res: any) => {
+ allListDept({ deptCategory: '03' } as any).then((res: any) => {
deptOptions.value = res.data;
});
}
diff --git a/src/views/oa/erp/timesheetInfo/index.vue b/src/views/oa/erp/timesheetInfo/index.vue
index 42d9f87..e95a71c 100644
--- a/src/views/oa/erp/timesheetInfo/index.vue
+++ b/src/views/oa/erp/timesheetInfo/index.vue
@@ -14,12 +14,12 @@
-
-
-
-
-
-
+
+
+
+
+
+
@@ -60,9 +60,9 @@
+
-
@@ -109,9 +109,9 @@