From c20495785dc65513a0393e927271cc4c0910109a Mon Sep 17 00:00:00 2001 From: taoge1020 Date: Fri, 15 Aug 2025 16:34:59 +0800 Subject: [PATCH 1/4] =?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/materials/purchaseDoc/index.ts | 10 + src/layout/components/notice/index.vue | 2 - src/utils/sse.ts | 1 - src/views/cory/template/indexEdit.vue | 2 +- src/views/design/appointment/index.vue | 177 ++++++++----- .../design/billofQuantities/indexEdit.vue | 2 +- src/views/design/condition/indexEdit.vue | 2 +- src/views/design/designChange/indexEdit.vue | 9 +- src/views/design/drawing/indexEdit.vue | 9 +- src/views/design/drawingreview/indexEdit.vue | 31 +-- src/views/design/prelimScheme/indexEdit.vue | 2 +- src/views/design/scheme/indexEdit.vue | 2 +- src/views/design/specialScheme/indexEdit.vue | 2 +- .../design/technicalStandard/indexEdit.vue | 2 +- .../materialReceive/word/index.vue | 34 +-- .../materials/materialsEquipment/partyA.rar | Bin 17074 -> 0 bytes .../overallPlanMaterialSupply/index.vue | 1 + .../overallPlanMaterialSupply/indexEdit.vue | 41 ++- .../purchaseDoc/comm/logisticsDetail.vue | 245 ++++++++++++++++++ src/views/materials/purchaseDoc/index.vue | 30 ++- src/views/out/constructionValue/indexEdit.vue | 2 +- src/views/out/designCompletion/indexEdit.vue | 2 +- src/views/out/monthPlan/indexEdit.vue | 2 +- src/views/workflows/leave/leaveEdit.vue | 11 +- 25 files changed, 491 insertions(+), 132 deletions(-) delete mode 100644 src/views/materials/materialsEquipment/partyA.rar create mode 100644 src/views/materials/purchaseDoc/comm/logisticsDetail.vue diff --git a/.env.development b/.env.development index 21892b7..1c549fa 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.180:8898' +VITE_APP_BASE_API = 'http://192.168.110.180:8899' # 无人机接口地址 diff --git a/src/api/materials/purchaseDoc/index.ts b/src/api/materials/purchaseDoc/index.ts index bcaaf4a..699f240 100644 --- a/src/api/materials/purchaseDoc/index.ts +++ b/src/api/materials/purchaseDoc/index.ts @@ -111,3 +111,13 @@ export const purchaseDocPlanList = (id) => { method: 'get' }); }; +/** + * 通过物流单号 物流详情 + * @param id + */ +export const logisticsDetial = (id) => { + return request({ + url: '/cailiaoshebei/ltn/logistics/' + id, + method: 'get' + }); +}; diff --git a/src/layout/components/notice/index.vue b/src/layout/components/notice/index.vue index 2aa716c..78ca0c8 100644 --- a/src/layout/components/notice/index.vue +++ b/src/layout/components/notice/index.vue @@ -54,8 +54,6 @@ const onNewsClick = (item: any) => { //并且写入pinia noticeStore.state.value.notices = newsList.value; //如果有formPath,就前往 - console.log(1111111111111111); - console.log(newsList.value[item]); if (newsList.value[item].route) { proxy?.$tab.openPage('/' + newsList.value[item].route, '', { id: newsList.value[item].detailId, type: 'view' }); } diff --git a/src/utils/sse.ts b/src/utils/sse.ts index 452ff85..464727c 100644 --- a/src/utils/sse.ts +++ b/src/utils/sse.ts @@ -25,7 +25,6 @@ export const initSSE = (url: any) => { }); watch(data, () => { - console.log(data.value); let label = ''; let route1 = ''; let detailId = ''; diff --git a/src/views/cory/template/indexEdit.vue b/src/views/cory/template/indexEdit.vue index 6dcdad1..91e3fe6 100644 --- a/src/views/cory/template/indexEdit.vue +++ b/src/views/cory/template/indexEdit.vue @@ -23,7 +23,7 @@ 点击编辑 - @@ -46,15 +45,23 @@ class="flex-1 mr-3" >
+ - + +
@@ -97,15 +104,23 @@ class="flex-1 mr-3" >
+ - + +
@@ -146,7 +161,7 @@ + + diff --git a/src/views/materials/purchaseDoc/index.vue b/src/views/materials/purchaseDoc/index.vue index 01a7cb4..7bbddd5 100644 --- a/src/views/materials/purchaseDoc/index.vue +++ b/src/views/materials/purchaseDoc/index.vue @@ -31,8 +31,8 @@ - - + + - + + + +
暂无文件
+ From 1b4b1c0128ccbc86349860e8710780b979a0403f Mon Sep 17 00:00:00 2001 From: taoge1020 Date: Fri, 15 Aug 2025 16:54:37 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/store/modules/app.ts | 2 +- src/views/materials/purchaseDoc/comm/logisticsDetail.vue | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/store/modules/app.ts b/src/store/modules/app.ts index 5ccaf75..0205fab 100644 --- a/src/store/modules/app.ts +++ b/src/store/modules/app.ts @@ -6,7 +6,7 @@ export const useAppStore = defineStore('app', () => { const sidebar = reactive({ opened: sidebarStatus.value ? !!+sidebarStatus.value : true, withoutAnimation: false, - hide: true + hide: false }); const device = ref('desktop'); const size = useStorage<'large' | 'default' | 'small'>('size', 'default'); diff --git a/src/views/materials/purchaseDoc/comm/logisticsDetail.vue b/src/views/materials/purchaseDoc/comm/logisticsDetail.vue index 95bc96a..a2b80ce 100644 --- a/src/views/materials/purchaseDoc/comm/logisticsDetail.vue +++ b/src/views/materials/purchaseDoc/comm/logisticsDetail.vue @@ -3,7 +3,6 @@ -