From 459396080bb0bb39bccefb992033e5bce33b0e8b Mon Sep 17 00:00:00 2001
From: Teo <2642673902@qq.com>
Date: Thu, 14 Aug 2025 16:40:32 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E8=81=94=E7=B3=BB=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.env.development | 2 +-
.../engineeringChangeApplicationForm.vue | 7 +-
src/views/design/prelimScheme/index.vue | 23 +-
src/views/design/scheme/index.vue | 24 +-
src/views/design/volumeCatalog/index.vue | 2 +-
.../materials/materialsInventory/index.vue | 3 +-
src/views/materials/orderMaterials/index.vue | 1 +
.../overallPlanMaterialSupply/index.vue | 16 +
src/views/materials/purchaseDoc/index.vue | 307 ++++++++++++------
9 files changed, 260 insertions(+), 125 deletions(-)
diff --git a/.env.development b/.env.development
index fe20df3..21892b7 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.159:8898'
+VITE_APP_BASE_API = 'http://192.168.110.180:8898'
# 无人机接口地址
diff --git a/src/views/cory/template/components/engineeringChangeApplicationForm.vue b/src/views/cory/template/components/engineeringChangeApplicationForm.vue
index db3a07f..90d12ff 100644
--- a/src/views/cory/template/components/engineeringChangeApplicationForm.vue
+++ b/src/views/cory/template/components/engineeringChangeApplicationForm.vue
@@ -71,8 +71,8 @@
{{ tableDetail.content }}
- {{
- tableDetail.attachmentsList.originalName
+ {{
+ tableDetail.attachmentsList?.originalName
}}
@@ -175,7 +175,8 @@ const props = defineProps({
}
});
-const tableDetail = ref({});
+const tableDetail = ref({ attachmentsImgList: [], attachmentsList: [] });
+
const exportRef = ref();
const radioList = ref([
{ value: 0, label: '设计漏项' },
diff --git a/src/views/design/prelimScheme/index.vue b/src/views/design/prelimScheme/index.vue
index a606b62..62c2065 100644
--- a/src/views/design/prelimScheme/index.vue
+++ b/src/views/design/prelimScheme/index.vue
@@ -42,6 +42,15 @@
+ 查看流程
{
};
/** 导出按钮操作 */
-const handleExport = () => {
- proxy?.download(
- 'design/scheme/export',
- {
- ...queryParams.value
- },
- `scheme_${new Date().getTime()}.xlsx`
- );
+const handleView = (row?: PrelimSchemeVO) => {
+ proxy.$tab.closePage(route);
+ proxy.$tab.openPage(`/design-management/prelimScheme/indexEdit`, '', {
+ id: row.id,
+ type: 'view'
+ });
};
onMounted(() => {
diff --git a/src/views/design/scheme/index.vue b/src/views/design/scheme/index.vue
index fb624ed..540830b 100644
--- a/src/views/design/scheme/index.vue
+++ b/src/views/design/scheme/index.vue
@@ -42,6 +42,15 @@
+ 查看流程
{
await getList();
};
-/** 导出按钮操作 */
-const handleExport = () => {
- proxy?.download(
- 'design/scheme/export',
- {
- ...queryParams.value
- },
- `scheme_${new Date().getTime()}.xlsx`
- );
+const handleView = (row?: SchemeVO) => {
+ proxy.$tab.closePage(route);
+ proxy.$tab.openPage(`/design-management/scheme/indexEdit`, '', {
+ id: row.id,
+ type: 'view'
+ });
};
onMounted(() => {
diff --git a/src/views/design/volumeCatalog/index.vue b/src/views/design/volumeCatalog/index.vue
index 6f7d36b..a47293c 100644
--- a/src/views/design/volumeCatalog/index.vue
+++ b/src/views/design/volumeCatalog/index.vue
@@ -107,7 +107,7 @@
link
type="primary"
icon="View"
- v-if="scope.row.auditStatus != 'draft' && scope.row.auditStatus != 'finish'"
+ v-if="scope.row.auditStatus != 'draft'"
@click="handleAuditView(scope.row)"
v-hasPermi="['out:monthPlan:remove']"
>查看流程
-
+
+
diff --git a/src/views/materials/orderMaterials/index.vue b/src/views/materials/orderMaterials/index.vue
index 9be221d..ef93076 100644
--- a/src/views/materials/orderMaterials/index.vue
+++ b/src/views/materials/orderMaterials/index.vue
@@ -441,6 +441,7 @@ const getSupplierList = async () => {
pageSize: 10000
});
supplierOptions.value = res.rows;
+ console.log('🚀 ~ getSupplierList ~ res.rows:', res.rows);
};
onMounted(() => {
diff --git a/src/views/materials/overallPlanMaterialSupply/index.vue b/src/views/materials/overallPlanMaterialSupply/index.vue
index e69de29..67bddd4 100644
--- a/src/views/materials/overallPlanMaterialSupply/index.vue
+++ b/src/views/materials/overallPlanMaterialSupply/index.vue
@@ -0,0 +1,16 @@
+
+ init
+
+
+
+
+
diff --git a/src/views/materials/purchaseDoc/index.vue b/src/views/materials/purchaseDoc/index.vue
index adcc234..56511d2 100644
--- a/src/views/materials/purchaseDoc/index.vue
+++ b/src/views/materials/purchaseDoc/index.vue
@@ -4,9 +4,6 @@
-
-
-
@@ -86,18 +83,13 @@
>删除
-
- 导出
-
-
-
-
+
@@ -106,40 +98,50 @@
{{ parseTime(scope.row.arrivalDate, '{y}-{m}-{d}') }}
-
-
+
+
-
-
+
+
+
{{ parseTime(scope.row.preparedDate, '{y}-{m}-{d}') }}
-
-
-
-
+
- {{ parseTime(scope.row.signingDate, '{y}-{m}-{d}') }}
+ 回单
-
-
+
+
-
-
-
-
-
-
+
+
+
+
+
+
@@ -147,62 +149,71 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 取消
+ 确定
+
+
+