From 50c37446bfab25577022bc147c877f9a8e8625be Mon Sep 17 00:00:00 2001 From: yinq Date: Wed, 8 Apr 2026 08:46:28 +0800 Subject: [PATCH] =?UTF-8?q?1.1.19=20=E9=A1=B9=E7=9B=AE=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=A3=80=E7=B4=A2=E6=9D=A1=E4=BB=B6=EF=BC=8C?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E9=A1=B5=E9=9D=A2=E9=A1=B9=E7=9B=AE=E9=98=B6?= =?UTF-8?q?=E6=AE=B5=E5=88=97=E6=98=BE=E7=A4=BA=E4=BC=98=E5=8C=96=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/oa/erp/erpProjectPlan/types.ts | 5 + src/views/oa/erp/erpProjectChange/index.vue | 38 +- src/views/oa/erp/erpProjectPlan/edit.vue | 159 +++--- src/views/oa/erp/erpProjectPlan/edit.vue.back | 484 ------------------ src/views/oa/erp/erpProjectPlan/index.vue | 16 +- .../oa/erp/erpProjectPlan/index.vue.backup | 402 --------------- 6 files changed, 111 insertions(+), 993 deletions(-) delete mode 100644 src/views/oa/erp/erpProjectPlan/edit.vue.back delete mode 100644 src/views/oa/erp/erpProjectPlan/index.vue.backup diff --git a/src/api/oa/erp/erpProjectPlan/types.ts b/src/api/oa/erp/erpProjectPlan/types.ts index 4f8cf05..615c719 100644 --- a/src/api/oa/erp/erpProjectPlan/types.ts +++ b/src/api/oa/erp/erpProjectPlan/types.ts @@ -226,6 +226,11 @@ export interface ErpProjectPlanQuery extends PageQuery { */ projectPlanCode?: string; + /** + * 项目编号(关联项目信息检索) + */ + projectCode?: string; + /** * 项目经理 */ diff --git a/src/views/oa/erp/erpProjectChange/index.vue b/src/views/oa/erp/erpProjectChange/index.vue index bbe872f..7637e5c 100644 --- a/src/views/oa/erp/erpProjectChange/index.vue +++ b/src/views/oa/erp/erpProjectChange/index.vue @@ -155,11 +155,11 @@ {{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }} - + diff --git a/src/views/oa/erp/erpProjectPlan/edit.vue b/src/views/oa/erp/erpProjectPlan/edit.vue index 67f2354..e5dd74f 100644 --- a/src/views/oa/erp/erpProjectPlan/edit.vue +++ b/src/views/oa/erp/erpProjectPlan/edit.vue @@ -65,11 +65,6 @@ - - - - - @@ -113,7 +108,7 @@ - + - + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + diff --git a/src/views/oa/erp/erpProjectPlan/edit.vue.back b/src/views/oa/erp/erpProjectPlan/edit.vue.back deleted file mode 100644 index 5f248ad..0000000 --- a/src/views/oa/erp/erpProjectPlan/edit.vue.back +++ /dev/null @@ -1,484 +0,0 @@ - - - - - diff --git a/src/views/oa/erp/erpProjectPlan/index.vue b/src/views/oa/erp/erpProjectPlan/index.vue index 0263e7d..132ec4e 100644 --- a/src/views/oa/erp/erpProjectPlan/index.vue +++ b/src/views/oa/erp/erpProjectPlan/index.vue @@ -4,14 +4,17 @@
+ + + + + + - @@ -122,9 +125,9 @@ v-hasPermi="['oa/erp:erpProjectChange:add']" > - - - + + + @@ -289,6 +292,7 @@ const data = reactive>({ pageSize: 10, projectId: undefined, projectPlanCode: undefined, + projectCode: undefined, managerId: undefined, chargeId: undefined, paymentMethod: undefined, diff --git a/src/views/oa/erp/erpProjectPlan/index.vue.backup b/src/views/oa/erp/erpProjectPlan/index.vue.backup deleted file mode 100644 index 7416f93..0000000 --- a/src/views/oa/erp/erpProjectPlan/index.vue.backup +++ /dev/null @@ -1,402 +0,0 @@ - - -