From 78f21aa1530750a192477a9af3f6c14b0788d81c Mon Sep 17 00:00:00 2001
From: xs <xins@mesnac.com>
Date: Tue, 7 Apr 2026 17:13:10 +0800
Subject: [PATCH] =?UTF-8?q?1.4.2=E5=89=8D=E7=AB=AF=EF=BC=9A=20=20=20=20fix?=
 =?UTF-8?q?(=E5=B8=82=E5=9C=BA=E9=A2=84=E7=AE=97&=E5=BC=80=E7=A5=A8):?=
 =?UTF-8?q?=E5=B8=82=E5=9C=BA=E9=A2=84=E7=AE=97=E7=94=B3=E8=AF=B7=E5=92=8C?=
 =?UTF-8?q?=E5=BC=80=E7=A5=A8=E7=94=B3=E8=AF=B7=E5=A2=9E=E5=8A=A0=E7=BC=96?=
 =?UTF-8?q?=E5=8F=B7=E7=9A=84=E4=BF=9D=E5=AD=98=EF=BC=8C=E5=B7=A5=E4=BD=9C?=
 =?UTF-8?q?=E6=B5=81=E7=9A=84=E4=B8=9A=E5=8A=A1=E7=BC=96=E7=A0=81=E6=8C=89?=
 =?UTF-8?q?=E7=85=A7=E6=AD=A4=E7=BC=96=E5=8F=B7=E4=BF=9D=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/router/index.ts                       |  5 +++++
 src/views/oa/erp/budgetInfo/edit.vue      |  2 --
 src/views/oa/erp/budgetInfo/index.vue     |  7 +++++++
 src/views/oa/erp/finInvoiceInfo/edit.vue  | 19 ++++++++++++-------
 src/views/oa/erp/finInvoiceInfo/index.vue |  2 ++
 5 files changed, 26 insertions(+), 9 deletions(-)

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 @@
             <dict-tag :options="project_category" :value="scope.row.projectCategory" />
           </template>
         </el-table-column>
+        <el-table-column label="预算编号" align="center" prop="budgetCode" width="140"/>
         <el-table-column label="项目号" align="center" prop="projectCode" v-if="columns[6].visible" />
         <el-table-column label="项目名称" align="center" prop="projectName" v-if="columns[7].visible" />
         <el-table-column label="版本" align="center" prop="budgetVersion" v-if="columns[34].visible" width="60"/>
@@ -178,6 +179,8 @@ const { project_category, budget_status, wf_business_status } = toRefs<any>(
   proxy?.useDict('project_category', 'budget_status', 'wf_business_status')
 );
 
+const route = useRoute();
+
 const budgetInfoList = ref<budgetInfoVO[]>([]);
 const userList = ref<UserVO[]>([]);
 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 @@
   </div>
 </template>
 
-<script setup lang="ts">
+<script setup lang="ts" name="InvoiceInfoEdit">
 import api from '@/api/system/user';
 import { ref, reactive, computed, onMounted } from 'vue';
 import { ElMessage, ElMessageBox, FormInstance } from 'element-plus';
@@ -329,7 +329,7 @@ const contractPaymentMethodVoList = ref<ContractPaymentMethodVO[]>([]);
 
 const route = useRoute();
 const router = useRouter();
-const routeParams = ref<Record<string, any>>({ ...(route.query as Record<string, any>) });
+const routeParams = ref<Record<string, any>>({});
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 
 const buttonLoading = ref(false);
@@ -553,7 +553,7 @@ const calculateReturnedRate = () => {
 const isInitialized = ref(false);
 onMounted(async () => {
   nextTick(async () => {
-    getUserList(); // 初始化部门数据
+    getUserList(); // 初始化用户数据
     // 获取路由参数
     routeParams.value = route.query;
     console.log(route.query);
@@ -765,14 +765,19 @@ const handleSave = async (status: string, mode: boolean) => {
           form.value.earlyReason = undefined;
         }
 
-        form.value.invoiceStatus = getInvoiceStatus(status);
-        form.value.flowStatus = getFlowStatus(status);
+        const invoiceForm = {
+          ...form.value,
+          // 设置状态
+          invoiceStatus: getInvoiceStatus(status),
+          flowStatus: getFlowStatus(status),
+        };
+
         // 调用保存接口
         if (form.value.invoiceId) {
           form.value.toDeletedInvoiceDetailIdList = toDeletedInvoiceDetailIdList.value;
-          await updateFinInvoiceInfo(form.value);
+          await updateFinInvoiceInfo(invoiceForm);
         } else {
-          await addFinInvoiceInfo(form.value);
+          await addFinInvoiceInfo(invoiceForm);
         }
 
         ElMessage.success('保存成功');
diff --git a/src/views/oa/erp/finInvoiceInfo/index.vue b/src/views/oa/erp/finInvoiceInfo/index.vue
index 62c2ef0..c1a1e49 100644
--- a/src/views/oa/erp/finInvoiceInfo/index.vue
+++ b/src/views/oa/erp/finInvoiceInfo/index.vue
@@ -67,6 +67,7 @@
 
       <el-table v-loading="loading" border :data="finInvoiceInfoList" @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55" align="center" />
+        <el-table-column label="申请编号" align="center" prop="invoiceCode" width="150" />
         <el-table-column label="项目号" align="center" prop="projectCode" v-if="columns[9].visible" />
         <el-table-column label="项目名称" align="center" prop="projectName" v-if="columns[10].visible" />
         <el-table-column label="项目类型" align="center" prop="invoiceCategory" v-if="columns[15].visible">
@@ -128,6 +129,7 @@
                 size="small"
                 type="primary"
                 icon="Edit"
+                v-if="scope.row.invoiceStatus === INVOICE_STATUS.DRAFT"
                 @click="handleUpdate(scope.row, 'update')"
                 v-hasPermi="['oa/erp:finInvoiceInfo:edit']"
               ></el-button>