From da3a46189eae7951405f21b4c9328dc5218959ca Mon Sep 17 00:00:00 2001 From: Teo <2642673902@qq.com> Date: Tue, 19 Aug 2025 19:29:14 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 2 +- src/api/materials/purchaseDoc/index.ts | 7 ++ src/api/project/project/index.ts | 12 +++ src/api/project/project/types.ts | 9 ++- src/components/FileUpload/index.vue | 17 ++--- src/views/cory/template/index.vue | 13 ++++ src/views/materials/batchPlan/index.vue | 2 +- src/views/materials/purchaseDoc/index.vue | 31 +++++++- src/views/project/project/index.vue | 89 +++++++++++------------ 9 files changed, 116 insertions(+), 66 deletions(-) diff --git a/.env.development b/.env.development index 6e07116..d905b86 100644 --- a/.env.development +++ b/.env.development @@ -5,7 +5,7 @@ VITE_APP_TITLE = 煤科建管平台 VITE_APP_ENV = 'development' # 开发环境 -VITE_APP_BASE_API = 'http://192.168.110.149:8899' +VITE_APP_BASE_API = 'http://192.168.110.209:8899' # 无人机接口地址 diff --git a/src/api/materials/purchaseDoc/index.ts b/src/api/materials/purchaseDoc/index.ts index 699f240..64ec1ab 100644 --- a/src/api/materials/purchaseDoc/index.ts +++ b/src/api/materials/purchaseDoc/index.ts @@ -121,3 +121,10 @@ export const logisticsDetial = (id) => { method: 'get' }); }; + +export const getDetailBASE = (id) => { + return request({ + url: '/cailiaoshebei/purchaseDoc/pic/' + id, + method: 'get' + }); +}; diff --git a/src/api/project/project/index.ts b/src/api/project/project/index.ts index 61dcb29..5b76894 100644 --- a/src/api/project/project/index.ts +++ b/src/api/project/project/index.ts @@ -174,3 +174,15 @@ export const getChildProject = (id: string | number): AxiosPromise { + return request({ + url: '/project/project/save/tender/file', + method: 'put', + data: data + }); +}; diff --git a/src/api/project/project/types.ts b/src/api/project/project/types.ts index 4ccb37d..2e21007 100644 --- a/src/api/project/project/types.ts +++ b/src/api/project/project/types.ts @@ -8,6 +8,7 @@ export interface ProjectVO { * 项目名称 */ projectName: string; + tenderFiles: string; /** * 项目简称 @@ -128,10 +129,10 @@ export interface locationType { projectSite: string; } -export interface childProjectQuery{ - projectName:string; - pid:string; - id?:string +export interface childProjectQuery { + projectName: string; + pid: string; + id?: string; } export interface ProjectForm extends BaseEntity { diff --git a/src/components/FileUpload/index.vue b/src/components/FileUpload/index.vue index a871113..d872c0c 100644 --- a/src/components/FileUpload/index.vue +++ b/src/components/FileUpload/index.vue @@ -48,12 +48,7 @@ tag="ul" @click.stop > -
  • +
  • {{ getFileName(file.name) }} @@ -314,11 +309,11 @@ const uploadedSuccessfully = (res: any) => { emit('update:modelValue', listToString(fileList.value)); proxy?.$modal.closeLoading(); } - if (props.autoUpload && props.limit === fileList.value.length) { - fileUploadRef.value?.clearFiles(); - fileList.value = []; - emit('update:modelValue', ''); // 同步到外部 v-model - } + // if (props.autoUpload && props.limit === fileList.value.length) { + // fileUploadRef.value?.clearFiles(); + // fileList.value = []; + // emit('update:modelValue', ''); // 同步到外部 v-model + // } props.onUploadSuccess?.(fileList.value, res); }; diff --git a/src/views/cory/template/index.vue b/src/views/cory/template/index.vue index 1d4f331..c872665 100644 --- a/src/views/cory/template/index.vue +++ b/src/views/cory/template/index.vue @@ -293,4 +293,17 @@ const handleAddApp = (row) => { onMounted(() => { getList(); }); + +//监听项目id刷新数据 +const listeningProject = watch( + () => currentProject.value?.id, + (nid, oid) => { + queryParams.value.projectId = nid; + getList(); + } +); + +onUnmounted(() => { + listeningProject(); +}); diff --git a/src/views/materials/batchPlan/index.vue b/src/views/materials/batchPlan/index.vue index 8877d8f..75cd25d 100644 --- a/src/views/materials/batchPlan/index.vue +++ b/src/views/materials/batchPlan/index.vue @@ -68,7 +68,7 @@ 修改 - 审核 + 审核 diff --git a/src/views/materials/purchaseDoc/index.vue b/src/views/materials/purchaseDoc/index.vue index 8927128..341b30c 100644 --- a/src/views/materials/purchaseDoc/index.vue +++ b/src/views/materials/purchaseDoc/index.vue @@ -117,6 +117,9 @@ v-hasPermi="['cailiaoshebei:purchaseDoc:remove']" >物流单分享 + 详情 @@ -238,13 +241,27 @@ + +
    + +
    +
    +