From 62ab2a4672038753dd2be4bb01fbfea8ccb7c5e1 Mon Sep 17 00:00:00 2001 From: fengsen <2548667232@qq.com> Date: Fri, 29 Aug 2025 20:57:49 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 2 +- src/api/design/volumeCatalog/index.ts | 11 ++ .../biddingManagemen/appointment/index.vue | 2 +- src/views/design/appointment/index.vue | 10 +- src/views/design/volumeCatalog/index.vue | 49 +++--- .../materialIssue/index.vue | 8 +- .../materialReceive/index.vue | 161 +++++++++--------- 7 files changed, 131 insertions(+), 112 deletions(-) diff --git a/.env.development b/.env.development index faff5a9..9ab76bb 100644 --- a/.env.development +++ b/.env.development @@ -6,7 +6,7 @@ VITE_APP_ENV = 'development' # 开发环境 # 李陈杰 209 -VITE_APP_BASE_API = 'http://192.168.110.210:8899' +VITE_APP_BASE_API = 'http://192.168.110.180:8899' # 曾涛 # VITE_APP_BASE_API = 'http://192.168.110.180:8899' # 罗成 diff --git a/src/api/design/volumeCatalog/index.ts b/src/api/design/volumeCatalog/index.ts index c7c3a01..be533ae 100644 --- a/src/api/design/volumeCatalog/index.ts +++ b/src/api/design/volumeCatalog/index.ts @@ -116,6 +116,17 @@ export const getileDetail = (id) => { method: 'get' }); }; +/** + * 获取专业列表 + * @param query + */ +export const majorList = (params) => { + return request({ + url: '/design/volumeCatalog/majorList', + method: 'get', + params: params + }); +}; /** * 获取二维码信息 * @param query diff --git a/src/views/biddingManagemen/appointment/index.vue b/src/views/biddingManagemen/appointment/index.vue index 835b495..a76ea00 100644 --- a/src/views/biddingManagemen/appointment/index.vue +++ b/src/views/biddingManagemen/appointment/index.vue @@ -21,7 +21,7 @@
diff --git a/src/views/design/appointment/index.vue b/src/views/design/appointment/index.vue index 54d4f92..58cc90f 100644 --- a/src/views/design/appointment/index.vue +++ b/src/views/design/appointment/index.vue @@ -76,7 +76,7 @@ label-width="60px" label="专业" > - - - - - - + - - + + - + @@ -253,7 +253,7 @@ import { delVolumeCatalog, addVolumeCatalog, updateVolumeCatalog, - uploadVolumeFile, + uploadVolumeFile,majorList, getVolumeCatafileList, volumeFileList } from '@/api/design/volumeCatalog'; @@ -264,9 +264,10 @@ import TableContent from './comm/tableContent.vue'; const fileList = ref([]); import { designUserList } from '@/api/design/appointment'; const { proxy } = getCurrentInstance() as ComponentInternalInstance; -const { design_state, wf_business_status, des_user_major } = toRefs(proxy?.useDict('design_state', 'wf_business_status', 'des_user_major')); +const { design_state, wf_business_status, } = toRefs(proxy?.useDict('design_state', 'wf_business_status')); import { drawingreviewReceiptsDetail, drawingreviewReceiptsList } from '@/api/design/drawingreview'; const volumeCatalogList = ref([]); +const des_user_major= ref([]); const buttonLoading = ref(false); const loading = ref(true); const showSearch = ref(true); @@ -356,13 +357,28 @@ const data = reactive({ rules: { design: [{ required: true, message: '主键ID不能为空', trigger: 'blur' }], projectId: [{ required: true, message: '项目ID不能为空', trigger: 'blur' }], + designSubitem: [{ required: true, message: '子项不能为空', trigger: 'blur' }], volumeNumber: [{ required: true, message: '卷册号不能为空', trigger: 'blur' }], - documentName: [{ required: true, message: '资料名称不能为空', trigger: 'blur' }] + documentName: [{ required: true, message: '资料名称不能为空', trigger: 'blur' }], + plannedCompletion: [{ required: true, message: '计划出图事件不能为空', trigger: 'blur' }], + principal: [{ required: true, message: '设计人员不能为空', trigger: 'blur' }], + specialty: [{ required: true, message: '专业不能为空', trigger: 'blur' }], } }); const { queryParams, form, rules } = toRefs(data); - +const changeSpecialty=(val)=>{ + form.value.principal = ''; //清空 + getUserAppList(val); +} +// 获取专业列表 +const getSpecialtyList = async () => { + const res = await majorList({ projectId: currentProject.value?.id ,userType:2}); + console.log(res); + if (res.code === 200) { + des_user_major.value = res.data; + } +}; /** 查询卷册目录列表 */ const getList = async () => { loading.value = true; @@ -374,17 +390,10 @@ const getList = async () => { loading.value = false; } }; -const getUserAppList = async () => { - const res = await designUserList({ projectId: currentProject.value?.id }); +const getUserAppList = async (userMajor) => { + const res = await designUserList({ projectId: currentProject.value?.id ,userType:2,userMajor}); if (res.code === 200) { - console.log(res.rows); - - res.rows.forEach((item: any) => { - if (item.userType == 2) { - //设计人员 - userAppList.value.push(item); - } - }); + userAppList.value = res.rows; } }; const handleViewHistory = async (row) => { @@ -647,7 +656,7 @@ const handleAuditInfo = (row) => { // 审核图纸 }; onMounted(() => { - getUserAppList(); + getSpecialtyList(); getList(); }); @@ -657,7 +666,7 @@ const listeningProject = watch( (nid, oid) => { queryParams.value.projectId = nid; form.value.projectId = nid; - getUserAppList(); + getSpecialtyList(); getList(); } ); diff --git a/src/views/materials/materialsEquipment/materialIssue/index.vue b/src/views/materials/materialsEquipment/materialIssue/index.vue index 1a0e899..37efac6 100644 --- a/src/views/materials/materialsEquipment/materialIssue/index.vue +++ b/src/views/materials/materialsEquipment/materialIssue/index.vue @@ -7,9 +7,6 @@ - - - @@ -45,7 +42,6 @@ - @@ -82,7 +78,7 @@ - + @@ -295,7 +291,7 @@ const getInitFormData = () => { projectId: currentProject.value?.id, materialSource: '1', formCode: undefined, - projectName: undefined, + projectName: currentProject.value?.name, materialName: '', // 初始化为空字符串 orderingUnit: undefined, supplierUnit: undefined, diff --git a/src/views/materials/materialsEquipment/materialReceive/index.vue b/src/views/materials/materialsEquipment/materialReceive/index.vue index 78d9741..3f1d4c0 100644 --- a/src/views/materials/materialsEquipment/materialReceive/index.vue +++ b/src/views/materials/materialsEquipment/materialReceive/index.vue @@ -1,20 +1,23 @@