From 61a21a62505fc46421930ad509a5c7c8e64c77ae Mon Sep 17 00:00:00 2001 From: ljx <15723110242@139.com> Date: Thu, 11 Sep 2025 16:49:24 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 2 +- src/views/contract/bidCost/index.vue | 3 +- src/views/contract/division/index.vue | 6 +- .../formalitiesAreConsolidated/index.vue | 11 +- .../materialOutbound/component/outbound.vue | 24 ++- .../materials/materialsUseRecord/index.vue | 70 ++++++- src/views/tender/bidd/index.vue | 3 +- src/views/tender/plan/index.vue | 178 ++++++++++++------ src/views/workflows/task/myDocument.vue | 2 +- src/views/workflows/task/taskCopyList.vue | 2 +- src/views/workflows/task/taskFinish.vue | 2 +- src/views/workflows/task/taskWaiting.vue | 2 +- 12 files changed, 223 insertions(+), 82 deletions(-) diff --git a/.env.development b/.env.development index b07c546..26d8c8a 100644 --- a/.env.development +++ b/.env.development @@ -8,7 +8,7 @@ VITE_APP_ENV = 'development' # VITE_APP_BASE_API = 'http://192.168.110.209:8899' # 李陈杰 209 -VITE_APP_BASE_API = 'http://192.168.110.209:8899' +VITE_APP_BASE_API = 'http://192.168.110.149:8899' # 曾涛 # VITE_APP_BASE_API = 'http://192.168.110.149:8899' # 罗成 diff --git a/src/views/contract/bidCost/index.vue b/src/views/contract/bidCost/index.vue index 8df9d45..9bd4682 100644 --- a/src/views/contract/bidCost/index.vue +++ b/src/views/contract/bidCost/index.vue @@ -66,7 +66,7 @@ {{ scope.row.children.length > 0 ? '' : scope.row.quantity }} - + diff --git a/src/views/contract/division/index.vue b/src/views/contract/division/index.vue index 23c50f5..5c991c6 100644 --- a/src/views/contract/division/index.vue +++ b/src/views/contract/division/index.vue @@ -30,7 +30,7 @@ {{ proxy.formatPrice(scope.row.price) }} - + @@ -126,7 +127,7 @@ - + diff --git a/src/views/formalities/formalitiesAreConsolidated/index.vue b/src/views/formalities/formalitiesAreConsolidated/index.vue index 2e693de..fad4d4a 100644 --- a/src/views/formalities/formalitiesAreConsolidated/index.vue +++ b/src/views/formalities/formalitiesAreConsolidated/index.vue @@ -82,18 +82,11 @@ - + diff --git a/src/views/materials/materialOutbound/component/outbound.vue b/src/views/materials/materialOutbound/component/outbound.vue index c182cee..4d396e5 100644 --- a/src/views/materials/materialOutbound/component/outbound.vue +++ b/src/views/materials/materialOutbound/component/outbound.vue @@ -8,27 +8,35 @@ {{ scope.row.residue }} - + - + - + - + diff --git a/src/views/materials/materialsUseRecord/index.vue b/src/views/materials/materialsUseRecord/index.vue index b982c00..d364ee4 100644 --- a/src/views/materials/materialsUseRecord/index.vue +++ b/src/views/materials/materialsUseRecord/index.vue @@ -3,7 +3,25 @@ - + + + + @@ -473,3 +491,53 @@ onMounted(() => { getMaterialsListData(); }); + diff --git a/src/views/tender/bidd/index.vue b/src/views/tender/bidd/index.vue index 5228cf2..20f5dba 100644 --- a/src/views/tender/bidd/index.vue +++ b/src/views/tender/bidd/index.vue @@ -71,7 +71,7 @@ {{ scope.row.children.length > 0 ? '' : scope.row.quantity }} - + diff --git a/src/views/tender/plan/index.vue b/src/views/tender/plan/index.vue index 3b0c2de..1e1869c 100644 --- a/src/views/tender/plan/index.vue +++ b/src/views/tender/plan/index.vue @@ -13,8 +13,7 @@ 搜索 重置 - 新增 + 新增 @@ -34,8 +33,9 @@ @@ -47,57 +47,104 @@ - + - + - + @@ -119,8 +166,7 @@ - + @@ -133,8 +179,16 @@ - + @@ -148,27 +202,34 @@ (scope.row.quantity ? Number(scope.row.quantity) : 0) - (scope.row.useQuantity ? Number(scope.row.useQuantity) : 0) - (scope.row.selectNum ? Number(scope.row.selectNum) : 0) == - 0 + 0 ? activeTab == 2 ? 0 : '' : ( - (scope.row.quantity ? Number(scope.row.quantity) : 0) - - (scope.row.selectNum ? Number(scope.row.selectNum) : 0) - - (scope.row.useQuantity ? Number(scope.row.useQuantity) : 0) - ).toFixed(2) + (scope.row.quantity ? Number(scope.row.quantity) : 0) - + (scope.row.selectNum ? Number(scope.row.selectNum) : 0) - + (scope.row.useQuantity ? Number(scope.row.useQuantity) : 0) + ).toFixed(2) }} @@ -187,9 +248,9 @@ 0 ? '' : ((scope.row.quantity ? Number(scope.row.quantity) : 0) - - (scope.row.useQuantity ? Number(scope.row.useQuantity) : 0) - - (scope.row.selectNum ? Number(scope.row.selectNum) : 0)) * - Number(scope.row.unitPrice), + (scope.row.useQuantity ? Number(scope.row.useQuantity) : 0) - + (scope.row.selectNum ? Number(scope.row.selectNum) : 0)) * + Number(scope.row.unitPrice), false ) }} @@ -228,8 +289,15 @@ @@ -662,7 +730,7 @@ const delHandlebidd = (row: any) => { }); biddView(biddViewRow.value); } - getList() + getList(); }); }; //修改状态 diff --git a/src/views/workflows/task/myDocument.vue b/src/views/workflows/task/myDocument.vue index 51e0f19..f376274 100644 --- a/src/views/workflows/task/myDocument.vue +++ b/src/views/workflows/task/myDocument.vue @@ -28,7 +28,7 @@ - + diff --git a/src/views/workflows/task/taskCopyList.vue b/src/views/workflows/task/taskCopyList.vue index 10ca35d..fd5f26d 100644 --- a/src/views/workflows/task/taskCopyList.vue +++ b/src/views/workflows/task/taskCopyList.vue @@ -11,7 +11,7 @@ - + diff --git a/src/views/workflows/task/taskFinish.vue b/src/views/workflows/task/taskFinish.vue index f667764..2d5a13f 100644 --- a/src/views/workflows/task/taskFinish.vue +++ b/src/views/workflows/task/taskFinish.vue @@ -16,7 +16,7 @@ - + diff --git a/src/views/workflows/task/taskWaiting.vue b/src/views/workflows/task/taskWaiting.vue index 6d5d29c..4a3579d 100644 --- a/src/views/workflows/task/taskWaiting.vue +++ b/src/views/workflows/task/taskWaiting.vue @@ -16,7 +16,7 @@ - +