diff --git a/src/router/index.ts b/src/router/index.ts index bd67bc8..7ffc493 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -146,6 +146,11 @@ export const constantRoutes: RouteRecordRaw[] = [ component: () => import('@/views/oa/erp/orderLedger/index.vue'), name: 'OrderLedger', meta: { title: '合同订单台账', activeMenu: '/contract/contractInfo/contractOrder' } + }, + { + path: 'budgetInfo/edit', + component: () => import('@/views/oa/erp/budgetInfo/edit.vue'), + name: 'BudgetInfoEdit' } ] }, diff --git a/src/views/oa/erp/budgetInfo/edit.vue b/src/views/oa/erp/budgetInfo/edit.vue index b72af5b..2150ff9 100644 --- a/src/views/oa/erp/budgetInfo/edit.vue +++ b/src/views/oa/erp/budgetInfo/edit.vue @@ -551,8 +551,6 @@ const handleSave = async (status: string, mode: boolean) => { } budgetForm.budgetVersion = searchForm.budgetVersion; budgetForm.remark = searchForm.remark; - console.log('----'); - console.log(budgetForm); // 统一保存逻辑 if (budgetForm.budgetId) { diff --git a/src/views/oa/erp/budgetInfo/index.vue b/src/views/oa/erp/budgetInfo/index.vue index 8f841d6..58a4caa 100644 --- a/src/views/oa/erp/budgetInfo/index.vue +++ b/src/views/oa/erp/budgetInfo/index.vue @@ -81,6 +81,7 @@ + @@ -178,6 +179,8 @@ const { project_category, budget_status, wf_business_status } = toRefs( proxy?.useDict('project_category', 'budget_status', 'wf_business_status') ); +const route = useRoute(); + const budgetInfoList = ref([]); const userList = ref([]); const buttonLoading = ref(false); @@ -375,6 +378,7 @@ const handleSelectionChange = (selection: budgetInfoVO[]) => { /** 新增市场项目预算按钮操作 */ const handleAdd = () => { + proxy.$tab.closePage(route); router.push({ path: '/budget/budgetInfo/edit', query: { @@ -392,6 +396,7 @@ const handleAdd = () => { /** 新增研发项目按钮操作 */ const handleAddRd = () => { + proxy.$tab.closePage(route); router.push({ path: '/budget/budgetInfo/edit', query: { @@ -404,6 +409,7 @@ const handleAddRd = () => { /** 查询、修改按钮操作 */ const handleUpdate = async (row?: budgetInfoVO, type?: string, changeFlag?: string) => { + proxy.$tab.closePage(route); router.push({ path: '/budget/budgetInfo/edit', query: { @@ -421,6 +427,7 @@ const handleUpdate = async (row?: budgetInfoVO, type?: string, changeFlag?: stri /** 变更按钮操作 */ const handleChange = async (row?: budgetInfoVO) => { + proxy.$tab.closePage(route); router.push({ path: '/budget/budgetInfo/change', query: { diff --git a/src/views/oa/erp/finInvoiceInfo/edit.vue b/src/views/oa/erp/finInvoiceInfo/edit.vue index c94af71..b94f687 100644 --- a/src/views/oa/erp/finInvoiceInfo/edit.vue +++ b/src/views/oa/erp/finInvoiceInfo/edit.vue @@ -295,7 +295,7 @@ -