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 @@ - - -