diff --git a/.env.development b/.env.development index 9ab76bb..eb8185a 100644 --- a/.env.development +++ b/.env.development @@ -6,7 +6,7 @@ VITE_APP_ENV = 'development' # 开发环境 # 李陈杰 209 -VITE_APP_BASE_API = 'http://192.168.110.180:8899' +VITE_APP_BASE_API = 'http://192.168.110.188:8899' # 曾涛 # VITE_APP_BASE_API = 'http://192.168.110.180:8899' # 罗成 diff --git a/src/components/Process/submitVerify.vue b/src/components/Process/submitVerify.vue index f678b11..3fefa25 100644 --- a/src/components/Process/submitVerify.vue +++ b/src/components/Process/submitVerify.vue @@ -546,7 +546,7 @@ const handleTerminationTask = async () => { if (isDrawing.value) { isShowTermination.value = true; nextTick(() => { - detailFormTeRef.value.getInfo(props.businessId); + detailFormTeRef.value.getInfo(props.businessId1); }); return; } diff --git a/src/views/cory/template/indexEdit.vue b/src/views/cory/template/indexEdit.vue index 91e3fe6..8c689fe 100644 --- a/src/views/cory/template/indexEdit.vue +++ b/src/views/cory/template/indexEdit.vue @@ -36,7 +36,7 @@ - + @@ -45,12 +45,42 @@ + + + + + + + + + + + + + + + + + - + @@ -62,27 +92,11 @@ - - - - - - - - - - - 上传附件 - - - - - - - - + + + 上传附件 + - @@ -177,6 +191,7 @@ import { useUserStoreHook } from '@/store/modules/user'; import { listByIds } from '@/api/system/oss'; import { addContactnotice, getContactnotice, updateContactnotice } from '@/api/cory/contactnotice'; const { des_user_major } = toRefs(proxy?.useDict('des_user_major')); +import { catalogList } from '@/api/design/designChange'; // 获取用户 store const userStore = useUserStoreHook(); @@ -221,7 +236,7 @@ const initFormData = { id: undefined, projectId: currentProject.value?.id, projectType: '', - projectName: '', + projectName: currentProject.value?.name, serialNumber: '', to: '', subject: '', @@ -275,13 +290,27 @@ const handleClose = () => { buttonLoading.value = false; }; const { form, rules } = toRefs(data); - +const volumeCatalogList = ref([]); +let volumeMap = new Map(); /** 表单重置 */ const reset = () => { form.value = { ...initFormData }; leaveFormRef.value?.resetFields(); }; - +// 获取卷册号列表 +const getJuance = async () => { + const res = await catalogList(currentProject.value?.id); + volumeCatalogList.value = res.data; + volumeCatalogList.value.forEach((e) => { + volumeMap.set(e.volumeNumber, e); + }); +}; +const handleSelect = (val) => { + let obj = volumeMap.get(val); + console.log(obj); + form.value.volumeName = obj.documentName; + form.value.specialty = obj.specialty; +}; /** 获取详情 */ const getInfo = () => { loading.value = true; @@ -402,6 +431,7 @@ onMounted(() => { routeParams.value = proxy.$route.query; thumbnailUrl.value = proxy.$route.query.thumbnailUrl; reset(); + getJuance(); loading.value = false; if (routeParams.value.type === 'update' || routeParams.value.type === 'view' || routeParams.value.type === 'approval') { getInfo(); diff --git a/src/views/design/designChange/indexEdit.vue b/src/views/design/designChange/indexEdit.vue index 428be39..90718bc 100644 --- a/src/views/design/designChange/indexEdit.vue +++ b/src/views/design/designChange/indexEdit.vue @@ -381,8 +381,11 @@ const submitForm = (status1: string) => { if (valid) { buttonLoading.value = true; var res; + delete form.value.id; res = await addDesignChange({ ...form.value, changeReason, saveFile }).finally(() => (buttonLoading.value = false)); if (res.code == 200) { + routeParams.value.type = 'update'; + form.value = res.data; if (form.value.costEstimation == '0') { ElMessage.success('通知成功'); goBack(); diff --git a/src/views/design/volumeCatalog/index.vue b/src/views/design/volumeCatalog/index.vue index e3dcf79..f7d77df 100644 --- a/src/views/design/volumeCatalog/index.vue +++ b/src/views/design/volumeCatalog/index.vue @@ -109,7 +109,12 @@ - + @@ -146,13 +151,7 @@ /> - + @@ -253,7 +252,8 @@ import { delVolumeCatalog, addVolumeCatalog, updateVolumeCatalog, - uploadVolumeFile,majorList, + uploadVolumeFile, + majorList, getVolumeCatafileList, volumeFileList } from '@/api/design/volumeCatalog'; @@ -264,10 +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, } = toRefs(proxy?.useDict('design_state', 'wf_business_status')); +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 des_user_major = ref([]); const buttonLoading = ref(false); const loading = ref(true); const showSearch = ref(true); @@ -362,21 +362,21 @@ const data = reactive({ documentName: [{ required: true, message: '资料名称不能为空', trigger: 'blur' }], plannedCompletion: [{ required: true, message: '计划出图事件不能为空', trigger: 'blur' }], principal: [{ required: true, message: '设计人员不能为空', trigger: 'blur' }], - specialty: [{ required: true, message: '专业不能为空', trigger: 'blur' }], + specialty: [{ required: true, message: '专业不能为空', trigger: 'blur' }] } }); const { queryParams, form, rules } = toRefs(data); -const changeSpecialty=(val)=>{ +const changeSpecialty = (val) => { form.value.principal = ''; //清空 getUserAppList(val); -} +}; // 获取专业列表 const getSpecialtyList = async () => { - const res = await majorList({ projectId: currentProject.value?.id ,userType:2}); + const res = await majorList({ projectId: currentProject.value?.id, userType: 2 }); console.log(res); if (res.code === 200) { - des_user_major.value = res.data; + des_user_major.value = res.data; } }; /** 查询卷册目录列表 */ @@ -391,7 +391,7 @@ const getList = async () => { } }; const getUserAppList = async (userMajor) => { - const res = await designUserList({ projectId: currentProject.value?.id ,userType:2,userMajor}); + const res = await designUserList({ projectId: currentProject.value?.id, userType: 2, userMajor }); if (res.code === 200) { userAppList.value = res.rows; } @@ -656,7 +656,7 @@ const handleAuditInfo = (row) => { // 审核图纸 }; onMounted(() => { - getSpecialtyList(); + getSpecialtyList(); getList(); }); diff --git a/src/views/materials/usageMaterials/purchase/index.vue b/src/views/materials/usageMaterials/purchase/index.vue index 8377948..4078def 100644 --- a/src/views/materials/usageMaterials/purchase/index.vue +++ b/src/views/materials/usageMaterials/purchase/index.vue @@ -8,6 +8,7 @@ +
- - + +