From b4af4629fe235f65f5229a76f5c865d21d746f48 Mon Sep 17 00:00:00 2001
From: Yangk <yangk@menace.com>
Date: Thu, 4 Dec 2025 09:27:37 +0800
Subject: [PATCH 1/6] =?UTF-8?q?add=E9=A1=B9=E7=9B=AE=E5=94=AE=E5=90=8E?=
 =?UTF-8?q?=E5=AE=A1=E6=89=B9=E6=B5=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/oa/erp/afterSales/index.ts    |  12 +
 src/enums/OAEnum.ts                   |   6 +-
 src/views/oa/erp/afterSales/edit.vue  | 904 ++++++++++++--------------
 src/views/oa/erp/afterSales/index.vue |  30 +-
 4 files changed, 462 insertions(+), 490 deletions(-)

diff --git a/src/api/oa/erp/afterSales/index.ts b/src/api/oa/erp/afterSales/index.ts
index 0d46c05..5081e87 100644
--- a/src/api/oa/erp/afterSales/index.ts
+++ b/src/api/oa/erp/afterSales/index.ts
@@ -74,3 +74,15 @@ export function getErpAfterSalesList (query) {
         params: query
     });
 };
+
+/**
+ * 项目售后信息提交并发起流程
+ * @param data 表单数据
+ */
+export const submitAfterSalesAndFlowStart = (data: any) => {
+  return request({
+    url: '/oa/erp/afterSales/submitAndFlowStart',
+    method: 'post',
+    data: data
+  });
+};
diff --git a/src/enums/OAEnum.ts b/src/enums/OAEnum.ts
index b8d2326..fc9b638 100644
--- a/src/enums/OAEnum.ts
+++ b/src/enums/OAEnum.ts
@@ -97,6 +97,10 @@ export enum FlowCodeEnum {
   PROJECT_ACCEPTANCE_CODE = 'OAPA',
   /**
    * 项目周报确认标识KEY
-   */ 
+   */
   PROJECT_REPRORT_CODE = 'XMZB'
+  /**
+   * 售后项目标识KEY
+   */
+  AFTER_SALES_KEY = 'OAAS',
 }
diff --git a/src/views/oa/erp/afterSales/edit.vue b/src/views/oa/erp/afterSales/edit.vue
index 27956e1..0c7ee51 100644
--- a/src/views/oa/erp/afterSales/edit.vue
+++ b/src/views/oa/erp/afterSales/edit.vue
@@ -38,26 +38,40 @@
             <el-form-item label="售后编号" prop="afterSalesCode">
               <el-input v-model="form.afterSalesCode" placeholder="自动生成售后编号">
                 <template #append>
-                  <el-button type="primary" @click="generateAfterSalesCode" :disabled="isCodeGenerated"> 生成编号 </el-button>
+                  <el-button
+                    type="primary"
+                    @click="generateAfterSalesCode"
+                    :disabled="isCodeGenerated || routeParams.type === 'view' || routeParams.type === 'approval'"
+                  >
+                    生成编号
+                  </el-button>
                 </template>
               </el-input>
             </el-form-item>
           </el-col>
+
           <el-col :span="12">
-            <el-form-item label="项目名称" prop="projectId">
-              <el-select v-model="form.projectId" placeholder="请选择项目" filterable clearable style="width: 100%" @change="handleProjectChange">
-                <el-option v-for="item in projectList" :key="item.projectId" :label="item.projectName" :value="item.projectId" />
-              </el-select>
+            <el-form-item label="项目号" prop="projectCode">
+              <el-input v-model="form.projectCode" placeholder="请选择项目" readonly :disabled="isReadOnly" @click="openProjectSelect">
+                <template #suffix>
+                  <el-icon style="cursor: pointer" @click.stop="openProjectSelect" :class="{ 'is-disabled': isReadOnly }">
+                    <Search />
+                  </el-icon>
+                </template>
+              </el-input>
             </el-form-item>
           </el-col>
+
           <el-col :span="12">
-            <el-form-item label="项目编号" prop="projectCode">
-              <el-input v-model="form.projectCode" placeholder="根据项目名称自动关联" disabled />
+            <el-form-item label="项目名称" prop="projectName">
+              <el-input v-model="form.projectName" placeholder="选择项目后自动填充" disabled />
+              <input type="hidden" :value="form.projectId" />
             </el-form-item>
           </el-col>
+
           <el-col :span="12">
             <el-form-item label="客户名称" prop="customerId">
-              <el-input v-model="form.customerName" placeholder="根据合同/项目自动关联" disabled />
+              <el-input v-model="form.customerName" placeholder="选择合同后自动填充" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -104,7 +118,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="客户干系人" prop="stakeholderId">
-              <el-select v-model="form.stakeholderId" multiple placeholder="请选择客户干系人" style="width: 100%">
+              <el-select v-model="form.stakeholderId" multiple placeholder="请选择客户干系人" filterable style="width: 100%">
                 <el-option v-for="item in contactOptions" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
@@ -183,10 +197,10 @@
           <el-col :span="1.5">
             <span class="card-title">人员费用成本</span>
           </el-col>
-          <el-col :span="1.5" v-if="routeParams.type !== 'view'">
+          <el-col :span="1.5" v-if="routeParams.type !== 'view' && routeParams.type !== 'approval'">
             <el-button type="primary" plain icon="Plus" size="small" @click="handleAddLabor">新增</el-button>
           </el-col>
-          <el-col :span="1.5" v-if="routeParams.type !== 'view'">
+          <el-col :span="1.5" v-if="routeParams.type !== 'view' && routeParams.type !== 'approval'">
             <el-button type="danger" plain icon="Delete" size="small" @click="handleDeleteLabor">删除</el-button>
           </el-col>
         </el-row>
@@ -200,7 +214,7 @@
               v-model="scope.row.laborId"
               filterable
               style="width: 100%"
-              :disabled="routeParams.type === 'view'"
+              :disabled="routeParams.type === 'view' || routeParams.type === 'approval'"
               @change="(val) => handleLaborChange(val, scope.row)"
             >
               <el-option v-for="user in userList" :key="user.userId" :label="user.nickName" :value="user.userId" />
@@ -209,7 +223,7 @@
         </el-table-column>
         <el-table-column label="费用科目" prop="expenseItem">
           <template #default="scope">
-            <el-input v-model="scope.row.expenseItem" placeholder="" :disabled="routeParams.type === 'view'" />
+            <el-input v-model="scope.row.expenseItem" placeholder="" :disabled="routeParams.type === 'view' || routeParams.type === 'approval'" />
           </template>
         </el-table-column>
         <el-table-column label="成本" prop="cost" align="center">
@@ -220,13 +234,13 @@
               :precision="2"
               controls-position="right"
               style="width: 100%"
-              :disabled="routeParams.type === 'view'"
+              :disabled="routeParams.type === 'view' || routeParams.type === 'approval'"
             />
           </template>
         </el-table-column>
         <el-table-column label="备注" prop="remark">
           <template #default="scope">
-            <el-input v-model="scope.row.remark" :disabled="routeParams.type === 'view'" />
+            <el-input v-model="scope.row.remark" :disabled="routeParams.type === 'view' || routeParams.type === 'approval'" />
           </template>
         </el-table-column>
       </el-table>
@@ -239,10 +253,10 @@
           <el-col :span="1.5">
             <span class="card-title">消耗材料明细</span>
           </el-col>
-          <el-col :span="1.5" v-if="routeParams.type !== 'view'">
+          <el-col :span="1.5" v-if="routeParams.type !== 'view' && routeParams.type !== 'approval'">
             <el-button type="primary" plain icon="Plus" size="small" @click="handleAddMaterial">新增</el-button>
           </el-col>
-          <el-col :span="1.5" v-if="routeParams.type !== 'view'">
+          <el-col :span="1.5" v-if="routeParams.type !== 'view' && routeParams.type !== 'approval'">
             <el-button type="danger" plain icon="Delete" size="small" @click="handleDeleteMaterial">删除</el-button>
           </el-col>
         </el-row>
@@ -289,7 +303,6 @@
           <template #default="scope"> {{ Number(scope.row.taxExclusiveAmount).toFixed(2) }}</template>
         </el-table-column>
 
-        <!-- 赠品：字典回显 -->
         <el-table-column label="赠品" prop="giftFlag" width="80" align="center">
           <template #default="scope">
             <dict-tag :options="gift_flag" :value="scope.row.giftFlag" />
@@ -299,10 +312,9 @@
         <el-table-column label="备注" prop="remark" min-width="150" show-overflow-tooltip />
 
         <!-- 操作列 -->
-        <el-table-column label="操作" align="center" width="120" fixed="right" v-if="routeParams.type !== 'view'">
+        <el-table-column label="操作" align="center" width="120" fixed="right" v-if="routeParams.type !== 'view' && routeParams.type !== 'approval'">
           <template #default="scope">
             <el-button link type="primary" icon="Edit" @click="handleEditMaterialRow(scope.row, scope.$index)">修改 </el-button>
-            <!-- 这里可以加单个删除，或者只保留顶部的批量删除，看习惯 -->
           </template>
         </el-table-column>
       </el-table>
@@ -402,76 +414,119 @@
     <submitVerify ref="submitVerifyRef" :task-variables="taskVariables" @submit-callback="submitCallback" />
     <!-- 审批记录 -->
     <approvalRecord ref="approvalRecordRef" />
+    <ProjectSelect ref="projectSelectRef" :multiple="false" @confirm-call-back="projectInfoSelectCallBack" />
   </div>
 </template>
 
 <script setup name="AfterSalesFormComponent" lang="ts">
-import { ref, reactive, toRefs, onMounted, getCurrentInstance, watch } from 'vue';
-import { getAfterSales, addAfterSales, updateAfterSales } from '@/api/oa/erp/afterSales';
+import { ref, reactive, toRefs, onMounted, getCurrentInstance, watch, computed, nextTick } from 'vue';
+import { useRoute, useRouter } from 'vue-router';
+
+// import type { ElFormInstance } from 'element-plus';
+import ProjectSelect from '@/components/ProjectSelect/index.vue';
+
+import { getAfterSales, addAfterSales, updateAfterSales, submitAfterSalesAndFlowStart } from '@/api/oa/erp/afterSales';
+import { listProjectInfo } from '@/api/oa/erp/projectInfo';
+import { listUser } from '@/api/system/user';
+import { getErpProjectContractsList } from '@/api/oa/erp/projectContracts';
+import { listContractInfo } from '@/api/oa/erp/contractInfo';
+import { listCustomerContact } from '@/api/oa/crm/customerContact';
+import { listUnitInfo } from '@/api/oa/base/unitInfo';
+import { getRuleGenerateCode } from '@/api/system/codeRule';
+import type { ProjectInfoVO } from '@/api/oa/erp/projectInfo/types';
+
+import { StartProcessBo } from '@/api/workflow/workflowCommon/types';
 import SubmitVerify from '@/components/Process/submitVerify.vue';
 import ApprovalRecord from '@/components/Process/approvalRecord.vue';
 import ApprovalButton from '@/components/Process/approvalButton.vue';
-import { StartProcessBo } from '@/api/workflow/workflowCommon/types';
-import { listProjectInfo } from '@/api/oa/erp/projectInfo'; // 引入项目列表API
-import { listUser } from '@/api/system/user'; // 引入用户API
-import { getErpProjectContractsList } from '@/api/oa/erp/projectContracts';
-import { getContractInfo, listContractInfo } from '@/api/oa/erp/contractInfo';
-import { listCustomerContact } from '@/api/oa/crm/customerContact';
-import { getRuleGenerateCode } from '@/api/system/codeRule';
-import { CodeRuleEnum } from '@/enums/OAEnum';
-import { listUnitInfo } from '@/api/oa/base/unitInfo';
+
+import { CodeRuleEnum, FlowCodeEnum } from '@/enums/OAEnum';
+import { useUserStore } from '@/store/modules/user';
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const route = useRoute();
 const router = useRouter();
 
-// 字典
+// 字典加载
 const { after_sales_type, solve_status, gift_flag } = toRefs<any>(proxy?.useDict('after_sales_type', 'solve_status', 'gift_flag'));
 
-// 路由参数
+// 路由与加载状态
 const routeParams = ref<Record<string, any>>({});
-
 const buttonLoading = ref(false);
-const afterSalesFormRef = ref<ElFormInstance>();
 
-// 审批相关组件引用
+// 组件 Refs
+const afterSalesFormRef = ref<ElFormInstance>();
+const projectSelectRef = ref<InstanceType<typeof ProjectSelect>>();
 const submitVerifyRef = ref<InstanceType<typeof SubmitVerify>>();
 const approvalRecordRef = ref<InstanceType<typeof ApprovalRecord>>();
+const materialFormRef = ref<any>(null);
 
-// 流程相关数据
-const submitFormData = ref<StartProcessBo>({
-  businessId: '',
-  flowCode: '',
-  variables: {},
-  bizExt: {}
-});
-
-// 任务变量
-const taskVariables = ref<Record<string, any>>({});
-const flowInstanceBizExtBo = ref<Record<string, any>>({});
-
-// 记录当前正在编辑的行索引 (-1 表示新增模式)
-const editingIndex = ref<number>(-1);
-
-// 售后项目编号生成状态
-const isCodeGenerated = ref(false);
-
-const checkedLabor = ref<any[]>([]);
-const checkedMaterial = ref<any[]>([]);
-
-// 下拉框数据源
+// 基础下拉数据源
 const projectList = ref<any[]>([]);
 const userList = ref<any[]>([]);
 const contractList = ref<any[]>([]);
 const contactOptions = ref<any[]>([]);
 const unitOptions = ref<any[]>([]);
 
-//  定义材料弹窗相关变量
-const materialDialog = reactive({
-  visible: false,
-  title: '添加消耗材料'
+// 页面状态控制
+const isCodeGenerated = ref(false); // 编号是否已生成
+const editingIndex = ref<number>(-1); // 材料表编辑索引 (-1 为新增)
+const checkedLabor = ref<any[]>([]); // 人员表选中项
+const checkedMaterial = ref<any[]>([]); // 材料表选中项
+
+// 流程相关变量
+const submitFormData = ref<StartProcessBo>({ businessId: '', flowCode: '', variables: {}, bizExt: {} });
+const taskVariables = ref<Record<string, any>>({});
+const flowInstanceBizExtBo = ref<Record<string, any>>({});
+
+const data = reactive({
+  form: {
+    // 主表字段
+    afterSalesId: undefined,
+    afterSalesSubject: undefined,
+    afterSalesCode: undefined,
+    projectId: undefined,
+    projectCode: undefined,
+    projectName: undefined,
+    customerId: undefined,
+    customerName: undefined,
+    contractId: undefined,
+    contractCode: undefined,
+    contactPerson: undefined,
+    contactPhone: undefined,
+    afterSalesDate: undefined,
+    afterSalesType: undefined,
+    stakeholderId: [],
+    handlerId: [],
+    problemDescription: undefined,
+    ossId: undefined,
+    totalWorkHours: undefined,
+    totalCost: undefined,
+    completionDate: undefined,
+    solveStatus: undefined,
+    processingResult: undefined,
+    flowStatus: 'draft',
+
+    // 子表数据
+    laborCostsList: [] as any[],
+    materialCostsList: [] as any[]
+  },
+  rules: {
+    afterSalesSubject: [{ required: true, message: '售后主题不能为空', trigger: 'blur' }],
+    afterSalesCode: [{ required: true, message: '售后编号不能为空', trigger: 'blur' }],
+    projectCode: [{ required: true, message: '请选择项目', trigger: 'change' }],
+    projectName: [{ required: true, message: '请选择项目', trigger: 'change' }],
+    afterSalesDate: [{ required: true, message: '请选择日期', trigger: 'change' }],
+    afterSalesType: [{ required: true, message: '请选择售后类型', trigger: 'change' }],
+    stakeholderId: [{ required: true, message: '客户干系人不能为空', trigger: 'change' }],
+    handlerId: [{ required: true, message: '售后处理人不能为空', trigger: 'change' }]
+  }
 });
-const materialFormRef = ref<any>(null);
+
+const { form, rules } = toRefs(data);
+
+// 材料弹窗表单数据
+const materialDialog = reactive({ visible: false, title: '添加消耗材料' });
 const materialForm = ref<any>({
   productCode: '',
   productName: '',
@@ -486,8 +541,6 @@ const materialForm = ref<any>({
   giftFlag: '0',
   remark: ''
 });
-
-// 弹窗表单校验规则
 const materialRules = {
   productName: [{ required: true, message: '请输入产品名称', trigger: 'blur' }],
   unitId: [{ required: true, message: '请选择单位', trigger: 'change' }],
@@ -495,371 +548,172 @@ const materialRules = {
   taxInclusivePrice: [{ required: true, message: '请输入含税单价', trigger: 'blur' }]
 };
 
-const data = reactive({
-  form: {
-    laborCostsList: [] as any[],
-    materialCostsList: [] as any[],
-    afterSalesId: undefined,
-    afterSalesSubject: undefined,
-    afterSalesCode: undefined,
-    projectId: undefined,
-    projectCode: undefined, // 增加
-    projectName: undefined, // 增加
-    customerId: undefined, // 增加
-    customerName: undefined, // 增加
-    contractId: undefined, // 增加
-    contractCode: undefined, // 增加
-    contactPerson: undefined,
-    contactPhone: undefined,
-    afterSalesDate: undefined,
-    afterSalesType: undefined,
-    stakeholderId: [], // 前端用数组，后端要字符串
-    handlerId: [], // 前端用数组，后端要字符串
-    problemDescription: undefined,
-    ossId: undefined, // 附件
-    totalWorkHours: undefined,
-    totalCost: undefined,
-    completionDate: undefined,
-    solveStatus: undefined,
-    processingResult: undefined,
-    flowStatus: 'draft'
-  },
-  rules: {
-    afterSalesSubject: [{ required: true, message: '售后主题不能为空', trigger: 'blur' }],
-    afterSalesCode: [{ required: true, message: '售后编号不能为空', trigger: 'blur' }],
-    projectId: [{ required: true, message: '请选择项目', trigger: 'change' }],
-    customerId: [{ required: true, message: '客户名称不能为空', trigger: 'change' }],
-    afterSalesDate: [{ required: true, message: '请选择日期', trigger: 'change' }],
-    afterSalesType: [{ required: true, message: '请选择售后类型', trigger: 'change' }],
-    stakeholderId: [{ required: true, message: '客户干系人不能为空', trigger: 'change' }],
-    handlerId: [{ required: true, message: '售后处理人不能为空', trigger: 'change' }]
-  }
+const isReadOnly = computed(() => {
+  return routeParams.value.type === 'view' || routeParams.value.type === 'approval';
 });
 
-const { form, rules } = toRefs(data);
-
-// 生成售后项目编号
-const generateAfterSalesCode = async () => {
-  if (isCodeGenerated.value) return;
-
-  try {
-    // 这里使用刚才定义的 AFTER_SALES 枚举
-    const params = { codeRuleCode: CodeRuleEnum.AFTER_SALES } as any;
-    const res = await getRuleGenerateCode(params);
-
-    if (res.code === 200) {
-      form.value.afterSalesCode = res.msg;
-      isCodeGenerated.value = true; // 标记为已生成，防止重复点击
-      proxy?.$modal.msgSuccess('售后编号生成成功');
-    }
-  } catch (error) {
-    console.error('生成售后编号失败:', error);
-    // 如果后端没有配置这个规则，可能会报错，这里可以提示一下
-    proxy?.$modal.msgError('生成项目编号失败');
-  }
-};
-
-/**
- * 人员费用表尾合计逻辑
- * 只计算“成本”列，其他列显示“合计”或空
- */
-const getLaborSummaries = (param: any) => {
-  const { columns, data } = param;
-  const sums: string[] = [];
-
-  columns.forEach((column: any, index: number) => {
-    // 第一列（多选框）不显示
-    if (index === 0) {
-      sums[index] = '';
-      return;
-    }
-    // 第二列（序号）显示文字“合计”
-    if (index === 1) {
-      sums[index] = '合计';
-      return;
-    }
-
-    // 判断是否是“成本”列 (根据 prop 判断)
-    // 假设你的成本列 prop="cost"
-    if (column.property === 'cost') {
-      const values = data.map((item: any) => Number(item[column.property]));
-      if (!values.every((value: any) => Number.isNaN(value))) {
-        const total = values.reduce((prev: any, curr: any) => {
-          const value = Number(curr);
-          if (!Number.isNaN(value)) {
-            return prev + curr;
-          } else {
-            return prev;
-          }
-        }, 0);
-        // 保留两位小数，并加上单位
-        sums[index] = total.toFixed(2) + ' 元';
-      } else {
-        sums[index] = '0.00 元';
-      }
-    } else {
-      // 其他列（姓名、科目、备注）留空
-      sums[index] = '';
-    }
-  });
-
-  return sums;
-};
-
-/**
- * 材料费用表尾合计逻辑
- * 计算字段：含税金额、未税金额
- */
-const getMaterialSummaries = (param: any) => {
-  const { columns, data } = param
-  const sums: string[] = []
-
-  columns.forEach((column: any, index: number) => {
-    // 1. 第一列（多选框）留空
-    if (index === 0) {
-      sums[index] = ''
-      return
-    }
-    // 2. 第二列（序号）显示“合计”
-    if (index === 1) {
-      sums[index] = '合计'
-      return
-    }
-
-    // 3. 定义需要合计的字段 (属性名 prop)
-    // 这里我们合计：含税金额、未税金额。如果你想合计数量，把 'quantity' 也加进去
-    const propList = ['taxInclusiveAmount', 'taxExclusiveAmount']
-
-    if (propList.includes(column.property)) {
-      const values = data.map((item: any) => Number(item[column.property]))
-
-      if (!values.every((value: any) => Number.isNaN(value))) {
-        const total = values.reduce((prev: any, curr: any) => {
-          const value = Number(curr)
-          if (!Number.isNaN(value)) {
-            return prev + curr
-          } else {
-            return prev
-          }
-        }, 0)
-
-        // 格式化显示：保留2位小数 + "元"
-        sums[index] = total.toFixed(2) + ' 元'
-      } else {
-        sums[index] = '0.00 元'
-      }
-    } else {
-      // 其他列（单价、税率、单位等）不合计
-      sums[index] = ''
-    }
-  })
-
-  return sums
-}
-
-/**
- * 自动计算材料行的金额信息
- * 触发时机：数量、税率、含税单价 发生变化时
- */
-const calculateMaterialInDialog = () => {
-  const row = materialForm.value;
-  const quantity = row.quantity || 0;
-  const taxRate = row.taxRate || 0;
-  const taxInclusivePrice = row.taxInclusivePrice || 0;
-
-  // 计算含税金额
-  row.taxInclusiveAmount = (quantity * taxInclusivePrice).toFixed(2);
-
-  // 计算未税单价
-  const taxBase = 1 + taxRate / 100;
-  if (taxBase !== 0) {
-    row.taxExclusivePrice = (taxInclusivePrice / taxBase).toFixed(2);
-  } else {
-    row.taxExclusivePrice = 0.0;
-  }
-
-  // 计算未税金额
-  row.taxExclusiveAmount = (row.taxExclusivePrice * quantity).toFixed(2);
-};
-
-/** 提交材料 */
-function submitMaterial() {
-  materialFormRef.value.validate((valid: boolean) => {
-    if (valid) {
-      if (editingIndex.value > -1) {
-        // 编辑模式：替换原位置的数据
-        form.value.materialCostsList.splice(editingIndex.value, 1, { ...materialForm.value });
-      } else {
-        // 新增模式：追加到末尾
-        form.value.materialCostsList.push({ ...materialForm.value });
-      }
-
-      materialDialog.visible = false;
-      proxy.$modal.msgSuccess(editingIndex.value > -1 ? '修改成功' : '添加成功');
-    }
-  });
-}
-
-/** 辅助函数：翻译单位ID为中文名称 */
-const getUnitName = (unitId: string) => {
-  if (!unitId) return '';
-  const unit = unitOptions.value.find((u) => u.unitId === unitId); // 注意检查你的 unitOptions 里的主键是 unitId 还是 id
-  return unit ? unit.unitName : unitId;
-};
-
-/**
- * 自动计算售后总成本
- * 公式：人员费用总和 + 材料费(含税)总和
- */
-const calculateTotalCost = () => {
-  // 1. 计算人员费用总和
-  const laborTotal = form.value.laborCostsList.reduce((sum: number, item: any) => {
-    const val = Number(item.cost)
-    return sum + (Number.isNaN(val) ? 0 : val)
-  }, 0)
-
-  // 2. 计算材料费用总和 (取含税金额 taxInclusiveAmount)
-  const materialTotal = form.value.materialCostsList.reduce((sum: number, item: any) => {
-    const val = Number(item.taxInclusiveAmount)
-    return sum + (Number.isNaN(val) ? 0 : val)
-  }, 0)
-
-  // 3. 赋值给 totalCost (保留2位小数)
-  form.value.totalCost = Number((laborTotal + materialTotal).toFixed(2))
-}
-
-// 4. 开启侦听器：深度监听两个数组的变化
+// 监听子表变化，自动计算总成本
 watch(
   [() => form.value.laborCostsList, () => form.value.materialCostsList],
   () => {
-    calculateTotalCost()
+    calculateTotalCost();
   },
-  { deep: true } // 【关键】必须开启 deep，否则监听不到数组内部属性的变化
-)
+  { deep: true }
+);
 
-// 初始化加载
 onMounted(async () => {
-  routeParams.value = route.query;
-  const id = routeParams.value.id;
+  nextTick(async () => {
+    // 1. 获取路由参数
+    routeParams.value = route.query;
+    const id = routeParams.value.id;
 
-  // 1. 并行加载基础下拉数据 (用户列表、项目列表)
-  loadBaseOptions();
+    // 2. 加载基础数据
+    loadBaseOptions();
 
-  // 2. 加载详情
-  if (id && (routeParams.value.type === 'update' || routeParams.value.type === 'view')) {
-    const res: any = await getAfterSales(id);
-    form.value = res.data;
+    // 3. 判断模式 (新增 / 修改 / 查看 / 审批)
+    if (id && (routeParams.value.type === 'update' || routeParams.value.type === 'view' || routeParams.value.type === 'approval')) {
+      const res: any = await getAfterSales(id);
+      form.value = res.data;
 
-    // 数据转换：多选字段从 String 转 Array (如果后端存的是 "1,2,3")
-    if (form.value.handlerId && typeof form.value.handlerId === 'string') {
-      form.value.handlerId = (form.value.handlerId as string).split(',') as any;
-    }
-    if (form.value.stakeholderId && typeof form.value.stakeholderId === 'string') {
-      form.value.stakeholderId = (form.value.stakeholderId as string).split(',') as any;
-    } else if (typeof form.value.stakeholderId === 'number') {
-      form.value.stakeholderId = [String(form.value.stakeholderId)] as any;
-    }
+      // 格式转换：String -> Array (用于多选下拉回显)
+      if (typeof form.value.handlerId === 'string') {
+        form.value.handlerId = (form.value.handlerId as string).split(',') as any;
+      }
+      if (typeof form.value.stakeholderId === 'string') {
+        form.value.stakeholderId = (form.value.stakeholderId as string).split(',') as any;
+      }
 
-    // 初始化子表
-    if (!form.value.laborCostsList) form.value.laborCostsList = [];
-    if (!form.value.materialCostsList) form.value.materialCostsList = [];
+      // 初始化空子表防止报错
+      if (!form.value.laborCostsList) form.value.laborCostsList = [];
+      if (!form.value.materialCostsList) form.value.materialCostsList = [];
 
-    // 编辑回显时，如果已经有 ProjectId，需要手动触发加载合同列表，否则合同下拉框是空的
-    if (form.value.projectId) {
-      loadContractOptions(form.value.projectId);
+      // 触发级联加载
+      if (form.value.projectId) loadContractOptions(form.value.projectId);
+      if (form.value.customerId) loadContactOptions(form.value.customerId);
+
+      // 标记编号状态
+      if (form.value.afterSalesCode) isCodeGenerated.value = true;
+    } else {
+      // 新增模式初始化
+      form.value.laborCostsList = [];
+      form.value.materialCostsList = [];
+      form.value.flowStatus = 'draft';
+      isCodeGenerated.value = false;
     }
-    // 如果有 ContractId/CustomerId，加载联系人
-    if (form.value.customerId) {
-      loadContactOptions(form.value.customerId);
-    }
-    // 如果已有编号，标记为已生成，禁用按钮
-    if (form.value.afterSalesCode) {
-      isCodeGenerated.value = true;
-    }
-  } else {
-    // 新增模式
-    form.value.laborCostsList = [];
-    form.value.materialCostsList = [];
-    form.value.flowStatus = 'draft';
-    isCodeGenerated.value = false; // 新增模式默认为 false
-  }
+  });
 });
 
-/** 加载基础数据 */
+// 加载基础下拉数据
 function loadBaseOptions() {
-  // 加载项目列表
   listProjectInfo({ pageNum: 1, pageSize: 1000 }).then((res: any) => {
     projectList.value = res.rows;
   });
-  // 加载所有用户 (处理人)
   listUser({ pageNum: 1, pageSize: 1000 }).then((res: any) => {
     userList.value = res.rows;
   });
-  // 加载计量单位
   listUnitInfo({ pageNum: 1, pageSize: 1000 }).then((res: any) => {
     unitOptions.value = res.rows;
   });
 }
 
-/** 联动 1：选择项目 -> 填编号 + 查合同 */
-function handleProjectChange(val: any) {
-  // 1. 清空下级数据
-  form.value.projectCode = undefined;
+// 生成售后编号
+const generateAfterSalesCode = async () => {
+  if (isCodeGenerated.value) return;
+  try {
+    const params = { codeRuleCode: CodeRuleEnum.AFTER_SALES } as any;
+    const res = await getRuleGenerateCode(params);
+    if (res.code === 200) {
+      form.value.afterSalesCode = res.msg;
+      isCodeGenerated.value = true;
+      proxy?.$modal.msgSuccess('售后编号生成成功');
+    }
+  } catch (error) {
+    console.error('生成售后编号失败:', error);
+    proxy?.$modal.msgError('生成项目编号失败');
+  }
+};
+
+// 计算售后总成本 (人员 + 材料)
+const calculateTotalCost = () => {
+  const laborList = form.value.laborCostsList || [];
+  const materialList = form.value.materialCostsList || [];
+
+  const laborTotal = laborList.reduce((sum: number, item: any) => {
+    const val = Number(item.cost);
+    return sum + (Number.isNaN(val) ? 0 : val);
+  }, 0);
+
+  const materialTotal = materialList.reduce((sum: number, item: any) => {
+    const val = Number(item.taxInclusiveAmount);
+    return sum + (Number.isNaN(val) ? 0 : val);
+  }, 0);
+
+  form.value.totalCost = Number((laborTotal + materialTotal).toFixed(2));
+};
+
+// 打开项目选择弹窗
+const openProjectSelect = () => {
+  if (isReadOnly.value) return;
+  projectSelectRef.value?.open();
+};
+
+// 项目选择回调
+const projectInfoSelectCallBack = (data: ProjectInfoVO[]) => {
+  if (data && data.length > 0) {
+    const project = data[0];
+    if (form.value.projectId === project.projectId) return;
+
+    // 清空下级数据
+    form.value.contractId = undefined;
+    form.value.customerName = undefined;
+    form.value.customerId = undefined;
+    contractList.value = [];
+
+    // 回填项目信息
+    form.value.projectId = project.projectId;
+    form.value.projectCode = project.projectCode;
+    form.value.projectName = project.projectName;
+
+    // 加载关联合同
+    if (project.projectId) {
+      loadContractOptions(project.projectId);
+    }
+    afterSalesFormRef.value?.validateField(['projectName', 'projectCode']);
+  }
+};
+
+const handleProjectSelected = (row: any) => {
+  if (form.value.projectId === row.projectId) return;
   form.value.contractId = undefined;
   form.value.customerName = undefined;
   form.value.customerId = undefined;
   contractList.value = [];
+  form.value.projectId = row.projectId;
+  form.value.projectCode = row.projectCode;
+  form.value.projectName = row.projectName;
+  loadContractOptions(row.projectId);
+};
 
-  if (!val) return;
-
-  // 2. 找到选中项目，回填编号
-  const project = projectList.value.find((p) => p.projectId === val);
-  if (project) {
-    form.value.projectCode = project.projectCode;
-    form.value.projectName = project.projectName; // 冗余存一下
-  }
-
-  // 3. 查关联合同
-  loadContractOptions(val);
-}
-
-/** 查询关联合同 */
+// 加载项目关联合同
 function loadContractOptions(projectId: any) {
-  // 这里使用项目模块提供的“查询某项目下合同”的接口
   getErpProjectContractsList({ projectId: projectId }).then((res: any) => {
-    // 注意：这里假设后端返回了包含 contractCode, contractName 的详细信息
-    // 如果只返回了 ID，可能还需要再查一遍合同表，视后端接口实现而定
     contractList.value = res.data;
   });
 }
 
-/** 联动 2：选择合同 -> 填客户 + 查干系人 */
+// 合同变更联动 -> 客户 -> 联系人
 function handleContractChange(val: any) {
-  // 1. 先清空旧数据
   form.value.customerName = undefined;
   form.value.customerId = undefined;
   contactOptions.value = [];
 
   if (!val) return;
 
-  // 2. 【关键修改】调用列表接口，而不是详情接口
-  // 因为列表接口对应的 Mapper XML 里写了 Left Join，能查出 oneCustomerName
-  listContractInfo({
-    contractId: val, // 传入 ID 作为查询条件
-    pageNum: 1,
-    pageSize: 10
-  } as any).then((res: any) => {
+  listContractInfo({ contractId: val, pageNum: 1, pageSize: 10 } as any).then((res: any) => {
     if (res.rows && res.rows.length > 0) {
-      // 取第一条数据（因为是用ID查的，肯定只有一条）
       const contract = res.rows[0];
-
-      // 3. 赋值
       form.value.customerId = contract.oneCustomerId;
-      // 这里直接取 oneCustomerName，因为列表接口里已经查出来了
-      // 也就是你截图里列表显示的那个“某一集团...”
       form.value.customerName = contract.oneCustomerName;
-
-      // 4. 加载客户联系人
       if (contract.oneCustomerId) {
         loadContactOptions(contract.oneCustomerId);
       }
@@ -867,23 +721,11 @@ function handleContractChange(val: any) {
   });
 }
 
-/** 加载客户干系人 */
+// 加载客户联系人
 function loadContactOptions(customerId: any) {
   if (!customerId) return;
-
-  // 1. 构造查询参数
-  // 加上 pageSize: 1000 是为了把该客户下的所有联系人都查出来，否则默认只查10个
-  const params = {
-    customerId: customerId,
-    pageNum: 1,
-    pageSize: 1000
-  };
-
-  // 2. 调用接口 (使用 as any 绕过类型检查，或者引入 CustomerContactQuery 类型)
+  const params = { customerId: customerId, pageNum: 1, pageSize: 1000 };
   listCustomerContact(params as any).then((res: any) => {
-    // 3. 数据映射 (Mapping)
-    // 数据库字段: contact_id -> TS属性: contactId
-    // 数据库字段: contact_name -> TS属性: contactName
     contactOptions.value = res.rows.map((item: any) => ({
       id: String(item.contactId),
       name: item.contactName
@@ -891,101 +733,68 @@ function loadContactOptions(customerId: any) {
   });
 }
 
-/** 提交按钮 */
-const submitForm = (status: string, mode: boolean) => {
-  afterSalesFormRef.value.validate((valid: boolean) => {
-    if (valid) {
-      buttonLoading.value = true;
-
-      // 数据处理：数组转字符串
-      const submitData = { ...form.value };
-      if (Array.isArray(submitData.handlerId)) {
-        submitData.handlerId = submitData.handlerId.join(',') as any;
-      }
-      if (Array.isArray(submitData.stakeholderId)) {
-        submitData.stakeholderId = submitData.stakeholderId.join(',') as any;
-      }
-
-      if (status === 'draft') {
-        submitData.flowStatus = 'draft';
-      } else {
-        submitData.flowStatus = 'waiting';
-      }
-
-      const saveFunc = submitData.afterSalesId ? updateAfterSales : addAfterSales;
-
-      saveFunc(submitData as any)
-        .then(() => {
-          buttonLoading.value = false;
-          proxy.$modal.msgSuccess(status === 'draft' ? '暂存成功' : '操作成功');
-          proxy.$tab.closePage(route);
-          router.go(-1);
-        })
-        .catch(() => {
-          buttonLoading.value = false;
-        });
-    }
-  });
-};
-
-// 审批记录
-const handleApprovalRecord = () => {
-  if (form.value.afterSalesId) {
-    approvalRecordRef.value?.init(form.value.afterSalesId);
-  }
-};
-
-// 审批校验打开（预留给审批流）
-const approvalVerifyOpen = async () => {
-  if (submitVerifyRef.value) {
-    await submitVerifyRef.value.openDialog(routeParams.value.taskId);
-  }
-};
-
-// 提交回调
-const submitCallback = async () => {
-  await proxy.$tab.closePage(route);
-  router.go(-1);
-};
-
-/**
- * 人员选择
- * 选中 ID 后，自动回填 Name
- */
-const handleLaborChange = (val: any, row: any) => {
-  // 从 userOptions 里找到当前选中的人
-  const user = userList.value.find((u: any) => u.userId === val);
-  if (user) {
-    row.laborName = user.nickName;
-  } else {
-    row.laborName = '';
-  }
-};
-
-// 子表逻辑
+// 新增人员行
 function handleAddLabor() {
   form.value.laborCostsList.push({
-    laborId: undefined, // 新增：初始化 ID
+    laborId: undefined,
     laborName: '',
-    expenseItem: '', // 默认为空，或者可以填 '差旅费'
+    expenseItem: '',
     cost: 0,
     remark: ''
   });
 }
 
+// 删除人员行
 function handleDeleteLabor() {
   if (checkedLabor.value.length === 0) return proxy.$modal.msgError('请选择要删除的数据');
   const delList = checkedLabor.value;
   form.value.laborCostsList = form.value.laborCostsList.filter((item: any) => !delList.includes(item));
 }
 
+// 人员选择联动回填名称
+const handleLaborChange = (val: any, row: any) => {
+  const user = userList.value.find((u: any) => u.userId === val);
+  row.laborName = user ? user.nickName : '';
+};
+
 function handleLaborSelectionChange(selection: any) {
   checkedLabor.value = selection;
 }
 
-/** 打开新增材料弹窗 */
+// 人员表尾合计
+const getLaborSummaries = (param: any) => {
+  const { columns, data } = param;
+  const sums: string[] = [];
+  columns.forEach((column: any, index: number) => {
+    if (index === 0) {
+      sums[index] = '';
+      return;
+    }
+    if (index === 1) {
+      sums[index] = '合计';
+      return;
+    }
+    if (column.property === 'cost') {
+      const values = data.map((item: any) => Number(item[column.property]));
+      if (!values.every((value: any) => Number.isNaN(value))) {
+        const total = values.reduce((prev: any, curr: any) => {
+          const value = Number(curr);
+          return !Number.isNaN(value) ? prev + curr : prev;
+        }, 0);
+        sums[index] = total.toFixed(2) + ' 元';
+      } else {
+        sums[index] = '0.00 元';
+      }
+    } else {
+      sums[index] = '';
+    }
+  });
+  return sums;
+};
+
+// 打开新增弹窗
 function handleAddMaterial() {
-  editingIndex.value = -1; // 标记为新增
+  editingIndex.value = -1;
   materialForm.value = {
     productCode: '',
     productName: '',
@@ -1004,16 +813,47 @@ function handleAddMaterial() {
   materialDialog.visible = true;
 }
 
-/** 打开修改弹窗 (新增逻辑) */
+// 打开修改弹窗
 function handleEditMaterialRow(row: any, index: number) {
-  editingIndex.value = index; // 记录索引
-  // 深拷贝数据到表单，防止修改时列表跟着变
+  editingIndex.value = index;
   materialForm.value = JSON.parse(JSON.stringify(row));
-
   materialDialog.title = '修改消耗材料';
   materialDialog.visible = true;
 }
 
+// 弹窗内自动计算
+const calculateMaterialInDialog = () => {
+  const row = materialForm.value;
+  const quantity = row.quantity || 0;
+  const taxRate = row.taxRate || 0;
+  const taxInclusivePrice = row.taxInclusivePrice || 0;
+
+  row.taxInclusiveAmount = (quantity * taxInclusivePrice).toFixed(2);
+  const taxBase = 1 + taxRate / 100;
+  if (taxBase !== 0) {
+    row.taxExclusivePrice = (taxInclusivePrice / taxBase).toFixed(2);
+  } else {
+    row.taxExclusivePrice = 0.0;
+  }
+  row.taxExclusiveAmount = (row.taxExclusivePrice * quantity).toFixed(2);
+};
+
+// 提交弹窗数据
+function submitMaterial() {
+  materialFormRef.value.validate((valid: boolean) => {
+    if (valid) {
+      if (editingIndex.value > -1) {
+        form.value.materialCostsList.splice(editingIndex.value, 1, { ...materialForm.value });
+      } else {
+        form.value.materialCostsList.push({ ...materialForm.value });
+      }
+      materialDialog.visible = false;
+      proxy.$modal.msgSuccess(editingIndex.value > -1 ? '修改成功' : '添加成功');
+    }
+  });
+}
+
+// 删除材料行
 function handleDeleteMaterial() {
   if (checkedMaterial.value.length === 0) return proxy.$modal.msgError('请选择要删除的数据');
   const delList = checkedMaterial.value;
@@ -1023,6 +863,122 @@ function handleDeleteMaterial() {
 function handleMaterialSelectionChange(selection: any) {
   checkedMaterial.value = selection;
 }
+
+// 获取单位名称
+const getUnitName = (unitId: string) => {
+  if (!unitId) return '';
+  const unit = unitOptions.value.find((u) => u.unitId === unitId);
+  return unit ? unit.unitName : unitId;
+};
+
+// 材料表尾合计
+const getMaterialSummaries = (param: any) => {
+  const { columns, data } = param;
+  const sums: string[] = [];
+  columns.forEach((column: any, index: number) => {
+    if (index === 0) {
+      sums[index] = '';
+      return;
+    }
+    if (index === 1) {
+      sums[index] = '合计';
+      return;
+    }
+    if (['taxInclusiveAmount', 'taxExclusiveAmount'].includes(column.property)) {
+      const values = data.map((item: any) => Number(item[column.property]));
+      if (!values.every((value: any) => Number.isNaN(value))) {
+        const total = values.reduce((prev: any, curr: any) => {
+          const value = Number(curr);
+          return !Number.isNaN(value) ? prev + curr : prev;
+        }, 0);
+        sums[index] = total.toFixed(2) + ' 元';
+      } else {
+        sums[index] = '0.00 元';
+      }
+    } else {
+      sums[index] = '';
+    }
+  });
+  return sums;
+};
+
+/** 提交按钮 */
+const submitForm = (status: string, mode: boolean) => {
+  afterSalesFormRef.value.validate(async (valid: boolean) => {
+    if (valid) {
+      buttonLoading.value = true;
+      try {
+        const submitData: any = { ...form.value };
+
+        // 数据格式转换：数组 -> 字符串
+        if (Array.isArray(submitData.handlerId)) submitData.handlerId = submitData.handlerId.join(',');
+        if (Array.isArray(submitData.stakeholderId)) submitData.stakeholderId = submitData.stakeholderId.join(',');
+
+        if (status !== 'draft') {
+          // --- 提交审批 ---
+          submitData.flowCode = FlowCodeEnum.AFTER_SALES_KEY;
+          submitData.variables = {
+            afterSalesId: submitData.afterSalesId,
+            totalCost: submitData.totalCost || 0,
+            startUserId: useUserStore().userId
+          };
+          submitData.bizExt = {
+            businessTitle: `售后申请：${submitData.afterSalesSubject}`,
+            businessCode: submitData.afterSalesCode
+          };
+          submitData.afterSalesStatus = '1'; // 审批中
+          submitData.flowStatus = 'waiting';
+
+          const res = await submitAfterSalesAndFlowStart(submitData);
+          if (res && res.data) {
+            form.value = res.data;
+            if (!form.value.laborCostsList) form.value.laborCostsList = [];
+            if (!form.value.materialCostsList) form.value.materialCostsList = [];
+          }
+          proxy.$modal.msgSuccess('提交成功，流程已发起');
+        } else {
+          // --- 暂存草稿 ---
+          submitData.flowStatus = 'draft';
+          submitData.afterSalesStatus = '0'; // 草稿
+          if (submitData.afterSalesId) {
+            await updateAfterSales(submitData);
+          } else {
+            await addAfterSales(submitData);
+          }
+          proxy.$modal.msgSuccess('暂存成功');
+        }
+        // 返回列表
+        proxy.$tab.closePage(route);
+        router.go(-1);
+      } catch (error) {
+        console.error('提交发生错误:', error);
+        proxy.$modal.msgError('提交失败，请查看控制台错误详情');
+      } finally {
+        buttonLoading.value = false;
+      }
+    }
+  });
+};
+
+// 审批记录初始化
+const handleApprovalRecord = () => {
+  if (form.value.afterSalesId) {
+    approvalRecordRef.value?.init(form.value.afterSalesId);
+  }
+};
+
+// 审批校验弹窗
+const approvalVerifyOpen = async () => {
+  if (submitVerifyRef.value) {
+    await submitVerifyRef.value.openDialog(routeParams.value.taskId);
+  }
+};
+
+// 提交后的回调
+const submitCallback = async () => {
+  await proxy.$tab.closePage(route);
+  router.go(-1);
+};
 </script>
 
 <style scoped lang="scss">
diff --git a/src/views/oa/erp/afterSales/index.vue b/src/views/oa/erp/afterSales/index.vue
index 9342fc1..b4d0984 100644
--- a/src/views/oa/erp/afterSales/index.vue
+++ b/src/views/oa/erp/afterSales/index.vue
@@ -18,7 +18,7 @@
                 <el-option v-for="dict in after_sales_type" :key="dict.value" :label="dict.label" :value="dict.value" />
               </el-select>
             </el-form-item>
-            <el-form-item label="售后问题是否解决" prop="solveStatus">
+            <el-form-item label="是否解决" prop="solveStatus" >
               <el-select v-model="queryParams.solveStatus" placeholder="请选择售后问题是否解决" clearable>
                 <el-option v-for="dict in solve_status" :key="dict.value" :label="dict.label" :value="dict.value" />
               </el-select>
@@ -68,45 +68,45 @@
       <el-table v-loading="loading" border :data="afterSalesList" @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55" align="center" />
         <el-table-column label="售后ID" align="center" prop="afterSalesId" v-if="columns[0].visible" />
-        <el-table-column label="售后编号" align="center" prop="afterSalesCode" v-if="columns[2].visible" />
+        <el-table-column label="售后编号" align="center" prop="afterSalesCode" width="140" v-if="columns[2].visible" />
         <el-table-column label="售后主题" align="center" prop="afterSalesSubject" v-if="columns[3].visible" />
         <el-table-column label="项目ID" align="center" prop="projectId" v-if="columns[4].visible" />
-        <el-table-column label="项目编号" align="center" prop="projectCode" v-if="columns[5].visible" />
-        <el-table-column label="项目名称" align="center" prop="projectName" v-if="columns[6].visible" />
+        <el-table-column label="项目编号" align="center" prop="projectCode" width="130" v-if="columns[5].visible" />
+        <el-table-column label="项目名称" align="center" prop="projectName" width="130" v-if="columns[6].visible" />
         <el-table-column label="客户ID" align="center" prop="customerId" v-if="columns[7].visible" />
-        <el-table-column label="客户名称" align="center" prop="customerName" v-if="columns[8].visible" />
+        <el-table-column label="客户名称" align="center" prop="customerName" width="130" v-if="columns[8].visible" />
         <el-table-column label="联系人" align="center" prop="contactPerson" v-if="columns[9].visible" />
-        <el-table-column label="联系电话" align="center" prop="contactPhone" v-if="columns[10].visible" />
-        <el-table-column label="售后日期" align="center" prop="afterSalesDate" width="180" v-if="columns[11].visible">
+        <el-table-column label="联系电话" align="center" prop="contactPhone" width="130" v-if="columns[10].visible" />
+        <el-table-column label="售后日期" align="center" prop="afterSalesDate" width="100" v-if="columns[11].visible">
           <template #default="scope">
-            <span>{{ parseTime(scope.row.afterSalesDate, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+            <span>{{ parseTime(scope.row.afterSalesDate, '{y}-{m}-{d}') }}</span>
           </template>
         </el-table-column>
         <el-table-column label="合同ID" align="center" prop="contractId" v-if="columns[12].visible" />
-        <el-table-column label="合同号" align="center" prop="contractCode" v-if="columns[13].visible">
+        <el-table-column label="合同号" align="center" prop="contractCode" width="140" v-if="columns[13].visible">
           <template #default="scope">
             <!-- 如果有编号显示编号，否则显示 '无编号' -->
             {{ scope.row.contractCode ? scope.row.contractCode : '无编号' }}
           </template>
         </el-table-column>
-        <el-table-column label="售后类型" align="center" prop="afterSalesType" v-if="columns[14].visible">
+        <el-table-column label="售后类型" align="center" prop="afterSalesType" width="100" v-if="columns[14].visible">
           <template #default="scope">
             <dict-tag :options="after_sales_type" :value="scope.row.afterSalesType" />
           </template>
         </el-table-column>
-        <el-table-column label="客户干系人" align="center" prop="stakeholderName" v-if="columns[15].visible" />
+        <el-table-column label="客户干系人" align="center" prop="stakeholderName" width="130" v-if="columns[15].visible" />
         <el-table-column label="处理人" align="center" prop="handlerName" v-if="columns[16].visible" />
         <el-table-column label="问题描述" align="center" prop="problemDescription" v-if="columns[17].visible" />
-        <el-table-column label="售后总工时" align="center" prop="totalWorkHours" v-if="columns[18].visible" />
-        <el-table-column label="售后总成本" align="center" prop="totalCost" v-if="columns[19].visible" />
+        <el-table-column label="售后总工时" align="center" prop="totalWorkHours" width="90" v-if="columns[18].visible" />
+        <el-table-column label="售后总成本" align="center" prop="totalCost" width="90" v-if="columns[19].visible" />
         <el-table-column label="售后问题是否解决" align="center" prop="solveStatus" v-if="columns[20].visible">
           <template #default="scope">
             <dict-tag :options="solve_status" :value="scope.row.solveStatus" />
           </template>
         </el-table-column>
-        <el-table-column label="完成日期" align="center" prop="completionDate" width="180" v-if="columns[21].visible">
+        <el-table-column label="完成日期" align="center" prop="completionDate" width="100" v-if="columns[21].visible">
           <template #default="scope">
-            <span>{{ parseTime(scope.row.completionDate, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+            <span>{{ parseTime(scope.row.completionDate, '{y}-{m}-{d}') }}</span>
           </template>
         </el-table-column>
         <el-table-column label="处理结果" align="center" prop="processingResult" v-if="columns[22].visible" />

From 24e741e8704aeb695a6a367c6b17fd892e846623 Mon Sep 17 00:00:00 2001
From: Yangk <yangk@menace.com>
Date: Thu, 4 Dec 2025 10:27:48 +0800
Subject: [PATCH 2/6] =?UTF-8?q?add=E9=A1=B9=E7=9B=AE=E5=94=AE=E5=90=8E?=
 =?UTF-8?q?=E5=AE=A1=E6=89=B9=E6=B5=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/enums/OAEnum.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/enums/OAEnum.ts b/src/enums/OAEnum.ts
index fc9b638..4790344 100644
--- a/src/enums/OAEnum.ts
+++ b/src/enums/OAEnum.ts
@@ -98,9 +98,9 @@ export enum FlowCodeEnum {
   /**
    * 项目周报确认标识KEY
    */
-  PROJECT_REPRORT_CODE = 'XMZB'
+  PROJECT_REPRORT_CODE = 'XMZB',
   /**
    * 售后项目标识KEY
    */
-  AFTER_SALES_KEY = 'OAAS',
+  AFTER_SALES_KEY = 'OAAS'
 }

From c802f5f0338c4fd93f5dc8df2450a0ce20fbac55 Mon Sep 17 00:00:00 2001
From: yinq <yinq>
Date: Thu, 4 Dec 2025 10:47:47 +0800
Subject: [PATCH 3/6] =?UTF-8?q?1.0.45=20=E4=BE=9B=E5=BA=94=E5=95=86?=
 =?UTF-8?q?=E3=80=81=E9=87=87=E8=B4=AD=E9=A1=B5=E9=9D=A2=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/oa/erp/projectPurchase/types.ts    |   15 +
 src/views/oa/crm/crmSupplierInfo/index.vue | 1193 ++++++++++----------
 src/views/oa/erp/projectPurchase/index.vue |   15 +-
 3 files changed, 622 insertions(+), 601 deletions(-)

diff --git a/src/api/oa/erp/projectPurchase/types.ts b/src/api/oa/erp/projectPurchase/types.ts
index 020b756..3f41885 100644
--- a/src/api/oa/erp/projectPurchase/types.ts
+++ b/src/api/oa/erp/projectPurchase/types.ts
@@ -56,6 +56,11 @@ export interface ProjectPurchaseVO {
    */
   deputyName?: string;
 
+  /**
+   * 版本
+   */
+  version?: number;
+
   /**
    * 提报人
    */
@@ -164,6 +169,11 @@ export interface ProjectPurchaseForm extends BaseEntity {
    */
   deputyId?: string | number;
 
+  /**
+   * 版本
+   */
+  version?: number;
+
   /**
    * 部门ID
    */
@@ -332,6 +342,11 @@ export interface ProjectPurchaseQuery extends PageQuery {
    * 日期范围参数
    */
   params?: any;
+
+  /**
+   * 项目经理名称
+   */
+  managerName?: string;
 }
 
 
diff --git a/src/views/oa/crm/crmSupplierInfo/index.vue b/src/views/oa/crm/crmSupplierInfo/index.vue
index 1755a23..53c0d8d 100644
--- a/src/views/oa/crm/crmSupplierInfo/index.vue
+++ b/src/views/oa/crm/crmSupplierInfo/index.vue
@@ -1,618 +1,619 @@
 <template>
-    <div class="p-2">
-        <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
-            <div v-show="showSearch" class="mb-[10px]">
-                <el-card shadow="hover">
-                    <el-form ref="queryFormRef" :model="queryParams" :inline="true" label-width='100px'>
-                                    <el-form-item label="供应商名称" prop="supplierName">
-                                        <el-input v-model="queryParams.supplierName" placeholder="请输入供应商名称" clearable @keyup.enter="handleQuery" />
-                                    </el-form-item>
-                                    <el-form-item label="助记名称" prop="mnemonicName">
-                                        <el-input v-model="queryParams.mnemonicName" placeholder="请输入助记名称" clearable @keyup.enter="handleQuery" />
-                                    </el-form-item>
-                                    <el-form-item label="供应商类型" prop="supplierType">
-                                        <el-select v-model="queryParams.supplierType" placeholder="请选择供应商类型" clearable >
-                                            <el-option v-for="dict in supplier_type" :key="dict.value" :label="dict.label" :value="dict.value"/>
-                                        </el-select>
-                                    </el-form-item>
-<!--                                    <el-form-item label="注册资本" prop="registeredCapital">
-                                        <el-input v-model="queryParams.registeredCapital" placeholder="请输入注册资本" clearable @keyup.enter="handleQuery" />
-                                    </el-form-item>
-                                    <el-form-item label="成立日期" prop="establishmentDate">
-                                        <el-date-picker clearable
-                                                        v-model="queryParams.establishmentDate"
-                                                        type="date"
-                                                        value-format="YYYY-MM-DD"
-                                                        placeholder="请选择成立日期"
-                                        />
-                                    </el-form-item>
-                                    <el-form-item label="经营范围" prop="businessScope">
-                                        <el-input v-model="queryParams.businessScope" placeholder="请输入经营范围" clearable @keyup.enter="handleQuery" />
-                                    </el-form-item>-->
-                                    <el-form-item label="主营行业" prop="mainIndustry">
-                                        <el-input v-model="queryParams.mainIndustry" placeholder="请输入主营行业" clearable @keyup.enter="handleQuery" />
-                                    </el-form-item>
-<!--                                    <el-form-item label="法定代表人" prop="legalRepresentative">
-                                        <el-input v-model="queryParams.legalRepresentative" placeholder="请输入法定代表人" clearable @keyup.enter="handleQuery" />
-                                    </el-form-item>-->
-<!--                                    <el-form-item label="营业执照号码" prop="businessLicenseNumber">
-                                        <el-input v-model="queryParams.businessLicenseNumber" placeholder="请输入营业执照号码" clearable @keyup.enter="handleQuery" />
-                                    </el-form-item>
-                                    <el-form-item label="税号" prop="taxNumber">
-                                        <el-input v-model="queryParams.taxNumber" placeholder="请输入税号" clearable @keyup.enter="handleQuery" />
-                                    </el-form-item>
-                                    <el-form-item label="开户银行" prop="bankAccountOpening">
-                                        <el-input v-model="queryParams.bankAccountOpening" placeholder="请输入开户银行" clearable @keyup.enter="handleQuery" />
-                                    </el-form-item>
-                                    <el-form-item label="银行账号" prop="bankNumber">
-                                        <el-input v-model="queryParams.bankNumber" placeholder="请输入银行账号" clearable @keyup.enter="handleQuery" />
-                                    </el-form-item>-->
-<!--                                    <el-form-item label="注册地址" prop="registeredAddress">
-                                        <el-input v-model="queryParams.registeredAddress" placeholder="请输入注册地址" clearable @keyup.enter="handleQuery" />
-                                    </el-form-item>
-                                    <el-form-item label="经营地址" prop="businessAddress">
-                                        <el-input v-model="queryParams.businessAddress" placeholder="请输入经营地址" clearable @keyup.enter="handleQuery" />
-                                    </el-form-item>-->
-<!--                                    <el-form-item label="联系人" prop="contactPerson">
-                                        <el-input v-model="queryParams.contactPerson" placeholder="请输入联系人" clearable @keyup.enter="handleQuery" />
-                                    </el-form-item>
-                                    <el-form-item label="联系电话" prop="contactPhone">
-                                        <el-input v-model="queryParams.contactPhone" placeholder="请输入联系电话" clearable @keyup.enter="handleQuery" />
-                                    </el-form-item>
-                                    <el-form-item label="联系手机" prop="contactMobile">
-                                        <el-input v-model="queryParams.contactMobile" placeholder="请输入联系手机" clearable @keyup.enter="handleQuery" />
-                                    </el-form-item>
-                                    <el-form-item label="联系邮箱" prop="contactEmail">
-                                        <el-input v-model="queryParams.contactEmail" placeholder="请输入联系邮箱" clearable @keyup.enter="handleQuery" />
-                                    </el-form-item>
-                                    <el-form-item label="传真" prop="contactFax">
-                                        <el-input v-model="queryParams.contactFax" placeholder="请输入传真" clearable @keyup.enter="handleQuery" />
-                                    </el-form-item>-->
-                                    <!-- 注释掉不合理的搜索条件 -->
-                                    <!-- <el-form-item label="网址" prop="website">
-                                        <el-input v-model="queryParams.website" placeholder="请输入网址" clearable @keyup.enter="handleQuery" />
-                                    </el-form-item> -->
-                                    <!-- <el-form-item label="详细地址" prop="detailedAddress">
-                                        <el-input v-model="queryParams.detailedAddress" placeholder="请输入详细地址" clearable @keyup.enter="handleQuery" />
-                                    </el-form-item> -->
-                                    <!-- <el-form-item label="附件ID" prop="ossId">
-                                        <el-input v-model="queryParams.ossId" placeholder="请输入附件ID" clearable @keyup.enter="handleQuery" />
-                                    </el-form-item> -->
-                                    <el-form-item label="激活标识" prop="activeFlag">
-                                        <el-select v-model="queryParams.activeFlag" placeholder="请选择激活标识" clearable >
-                                            <el-option v-for="dict in active_flag" :key="dict.value" :label="dict.label" :value="dict.value"/>
-                                        </el-select>
-                                    </el-form-item>
-                        <el-form-item>
-                            <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
-                            <el-button icon="Refresh" @click="resetQuery">重置</el-button>
-                        </el-form-item>
-                    </el-form>
-                </el-card>
-            </div>
-        </transition>
+  <div class="p-2">
+    <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
+      <div v-show="showSearch" class="mb-[10px]">
+        <el-card shadow="hover">
+          <el-form ref="queryFormRef" :model="queryParams" :inline="true" label-width="100px">
+            <el-form-item label="供应商名称" prop="supplierName">
+              <el-input v-model="queryParams.supplierName" placeholder="请输入供应商名称" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="助记名称" prop="mnemonicName">
+              <el-input v-model="queryParams.mnemonicName" placeholder="请输入助记名称" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="供应商类型" prop="supplierType">
+              <el-select v-model="queryParams.supplierType" placeholder="请选择供应商类型" clearable>
+                <el-option v-for="dict in supplier_type" :key="dict.value" :label="dict.label" :value="dict.value" />
+              </el-select>
+            </el-form-item>
+            <!--                                    <el-form-item label="注册资本" prop="registeredCapital">
+                                                    <el-input v-model="queryParams.registeredCapital" placeholder="请输入注册资本" clearable @keyup.enter="handleQuery" />
+                                                </el-form-item>
+                                                <el-form-item label="成立日期" prop="establishmentDate">
+                                                    <el-date-picker clearable
+                                                                    v-model="queryParams.establishmentDate"
+                                                                    type="date"
+                                                                    value-format="YYYY-MM-DD"
+                                                                    placeholder="请选择成立日期"
+                                                    />
+                                                </el-form-item>
+                                                <el-form-item label="经营范围" prop="businessScope">
+                                                    <el-input v-model="queryParams.businessScope" placeholder="请输入经营范围" clearable @keyup.enter="handleQuery" />
+                                                </el-form-item>-->
+            <el-form-item label="主营行业" prop="mainIndustry">
+              <el-input v-model="queryParams.mainIndustry" placeholder="请输入主营行业" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <!--                                    <el-form-item label="法定代表人" prop="legalRepresentative">
+                                                    <el-input v-model="queryParams.legalRepresentative" placeholder="请输入法定代表人" clearable @keyup.enter="handleQuery" />
+                                                </el-form-item>-->
+            <!--                                    <el-form-item label="营业执照号码" prop="businessLicenseNumber">
+                                                    <el-input v-model="queryParams.businessLicenseNumber" placeholder="请输入营业执照号码" clearable @keyup.enter="handleQuery" />
+                                                </el-form-item>
+                                                <el-form-item label="税号" prop="taxNumber">
+                                                    <el-input v-model="queryParams.taxNumber" placeholder="请输入税号" clearable @keyup.enter="handleQuery" />
+                                                </el-form-item>
+                                                <el-form-item label="开户银行" prop="bankAccountOpening">
+                                                    <el-input v-model="queryParams.bankAccountOpening" placeholder="请输入开户银行" clearable @keyup.enter="handleQuery" />
+                                                </el-form-item>
+                                                <el-form-item label="银行账号" prop="bankNumber">
+                                                    <el-input v-model="queryParams.bankNumber" placeholder="请输入银行账号" clearable @keyup.enter="handleQuery" />
+                                                </el-form-item>-->
+            <!--                                    <el-form-item label="注册地址" prop="registeredAddress">
+                                                    <el-input v-model="queryParams.registeredAddress" placeholder="请输入注册地址" clearable @keyup.enter="handleQuery" />
+                                                </el-form-item>
+                                                <el-form-item label="经营地址" prop="businessAddress">
+                                                    <el-input v-model="queryParams.businessAddress" placeholder="请输入经营地址" clearable @keyup.enter="handleQuery" />
+                                                </el-form-item>-->
+            <!--                                    <el-form-item label="联系人" prop="contactPerson">
+                                                    <el-input v-model="queryParams.contactPerson" placeholder="请输入联系人" clearable @keyup.enter="handleQuery" />
+                                                </el-form-item>
+                                                <el-form-item label="联系电话" prop="contactPhone">
+                                                    <el-input v-model="queryParams.contactPhone" placeholder="请输入联系电话" clearable @keyup.enter="handleQuery" />
+                                                </el-form-item>
+                                                <el-form-item label="联系手机" prop="contactMobile">
+                                                    <el-input v-model="queryParams.contactMobile" placeholder="请输入联系手机" clearable @keyup.enter="handleQuery" />
+                                                </el-form-item>
+                                                <el-form-item label="联系邮箱" prop="contactEmail">
+                                                    <el-input v-model="queryParams.contactEmail" placeholder="请输入联系邮箱" clearable @keyup.enter="handleQuery" />
+                                                </el-form-item>
+                                                <el-form-item label="传真" prop="contactFax">
+                                                    <el-input v-model="queryParams.contactFax" placeholder="请输入传真" clearable @keyup.enter="handleQuery" />
+                                                </el-form-item>-->
+            <!-- 注释掉不合理的搜索条件 -->
+            <!-- <el-form-item label="网址" prop="website">
+                <el-input v-model="queryParams.website" placeholder="请输入网址" clearable @keyup.enter="handleQuery" />
+            </el-form-item> -->
+            <!-- <el-form-item label="详细地址" prop="detailedAddress">
+                <el-input v-model="queryParams.detailedAddress" placeholder="请输入详细地址" clearable @keyup.enter="handleQuery" />
+            </el-form-item> -->
+            <!-- <el-form-item label="附件ID" prop="ossId">
+                <el-input v-model="queryParams.ossId" placeholder="请输入附件ID" clearable @keyup.enter="handleQuery" />
+            </el-form-item> -->
+            <el-form-item label="激活标识" prop="activeFlag">
+              <el-select v-model="queryParams.activeFlag" placeholder="请选择激活标识" clearable>
+                <el-option v-for="dict in active_flag" :key="dict.value" :label="dict.label" :value="dict.value" />
+              </el-select>
+            </el-form-item>
+            <el-form-item>
+              <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+              <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+            </el-form-item>
+          </el-form>
+        </el-card>
+      </div>
+    </transition>
 
-        <el-card shadow="never">
-            <template #header>
-                <el-row :gutter="10" class="mb8">
-                    <el-col :span="1.5">
-                        <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['oa/crm:crmSupplierInfo:add']">新增</el-button>
-                    </el-col>
-                    <el-col :span="1.5">
-                        <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['oa/crm:crmSupplierInfo:edit']">修改</el-button>
-                    </el-col>
-                    <el-col :span="1.5">
-                        <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['oa/crm:crmSupplierInfo:remove']">删除</el-button>
-                    </el-col>
-                    <el-col :span="1.5">
-                        <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['oa/crm:crmSupplierInfo:export']">导出</el-button>
-                    </el-col>
-                    <right-toolbar v-model:showSearch="showSearch" :columns="columns" :search="true" @queryTable="getList"></right-toolbar>
-                </el-row>
-            </template>
+    <el-card shadow="never">
+      <template #header>
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['oa/crm:crmSupplierInfo:add']"> 新增 </el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['oa/crm:crmSupplierInfo:edit']"
+              >修改
+            </el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['oa/crm:crmSupplierInfo:remove']"
+              >删除
+            </el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['oa/crm:crmSupplierInfo:export']">导出 </el-button>
+          </el-col>
+          <right-toolbar v-model:showSearch="showSearch" :columns="columns" :search="true" @queryTable="getList"></right-toolbar>
+        </el-row>
+      </template>
 
-            <el-table v-loading="loading" border :data="crmSupplierInfoList" @selection-change="handleSelectionChange">
-                <el-table-column type="selection" width="55" align="center" />
-                        <el-table-column label="供应商ID" align="center" prop="supplierId" v-if="columns[0].visible"/>
-                        <el-table-column label="供应商名称" align="center" prop="supplierName" v-if="columns[2].visible"/>
-                        <el-table-column label="助记名称" align="center" prop="mnemonicName" v-if="columns[3].visible"/>
-                        <el-table-column label="供应商类型" align="center" prop="supplierType" v-if="columns[4].visible">
-                            <template #default="scope">
-                                    <dict-tag :options="supplier_type" :value="scope.row.supplierType"/>
-                            </template>
-                        </el-table-column>
-                        <el-table-column label="注册资本" align="center" prop="registeredCapital" v-if="columns[5].visible"/>
-                        <el-table-column label="成立日期" align="center" prop="establishmentDate" width="180" v-if="columns[6].visible">
-                            <template #default="scope">
-                                <span>{{ parseTime(scope.row.establishmentDate, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
-                            </template>
-                        </el-table-column>
-                        <el-table-column label="经营范围" align="center" prop="businessScope" v-if="columns[7].visible"/>
-                        <el-table-column label="主营行业" align="center" prop="mainIndustry" v-if="columns[8].visible"/>
-                        <el-table-column label="法定代表人" align="center" prop="legalRepresentative" v-if="columns[9].visible"/>
-                        <el-table-column label="营业执照号码" align="center" prop="businessLicenseNumber" v-if="columns[10].visible"/>
-                        <el-table-column label="税号" align="center" prop="taxNumber" v-if="columns[11].visible"/>
-                        <el-table-column label="开户银行" align="center" prop="bankAccountOpening" v-if="columns[12].visible"/>
-                        <el-table-column label="银行账号" align="center" prop="bankNumber" v-if="columns[13].visible"/>
-                        <el-table-column label="注册地址" align="center" prop="registeredAddress" v-if="columns[14].visible"/>
-                        <el-table-column label="经营地址" align="center" prop="businessAddress" v-if="columns[15].visible"/>
-                        <el-table-column label="联系人" align="center" prop="contactPerson" v-if="columns[16].visible"/>
-                        <el-table-column label="联系电话" align="center" prop="contactPhone" v-if="columns[17].visible"/>
-                        <el-table-column label="联系手机" align="center" prop="contactMobile" v-if="columns[18].visible"/>
-                        <el-table-column label="联系邮箱" align="center" prop="contactEmail" v-if="columns[19].visible"/>
-                        <el-table-column label="传真" align="center" prop="contactFax" v-if="columns[20].visible"/>
-                        <el-table-column label="网址" align="center" prop="website" v-if="columns[21].visible"/>
-                        <el-table-column label="归属人员" align="center" prop="ownerName" v-if="columns[22].visible"/>
-                        <el-table-column label="详细地址" align="center" prop="detailedAddress" v-if="columns[23].visible"/>
-                        <el-table-column label="附件ID" align="center" prop="ossId" v-if="columns[24].visible"/>
-                        <el-table-column label="备注" align="center" prop="remark" v-if="columns[25].visible"/>
-                        <el-table-column label="激活标识" align="center" prop="activeFlag" v-if="columns[26].visible">
-                            <template #default="scope">
-                                    <dict-tag :options="active_flag" :value="scope.row.activeFlag"/>
-                            </template>
-                        </el-table-column>
-              <el-table-column label="创建时间" align="center" prop="createTime" width="180" v-if="columns[27].visible">
-                            <template #default="scope">
-                                <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
-                            </template>
-                        </el-table-column>
-              <el-table-column label="创建人" align="center" prop="createName" v-if="columns[28].visible"/>
-                <el-table-column label="操作" align="center" fixed="right"  class-name="small-padding fixed-width">
-                    <template #default="scope">
-                        <el-tooltip content="修改" placement="top">
-                            <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['oa/crm:crmSupplierInfo:edit']"></el-button>
-                        </el-tooltip>
-                        <el-tooltip content="删除" placement="top">
-                            <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['oa/crm:crmSupplierInfo:remove']"></el-button>
-                        </el-tooltip>
-                    </template>
-                </el-table-column>
-            </el-table>
+      <el-table v-loading="loading" border :data="crmSupplierInfoList" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column label="供应商ID" align="center" prop="supplierId" v-if="columns[0].visible" />
+        <el-table-column label="供应商名称" align="center" prop="supplierName" v-if="columns[2].visible" />
+        <el-table-column label="助记名称" align="center" prop="mnemonicName" v-if="columns[3].visible" />
+        <el-table-column label="供应商类型" align="center" prop="supplierType" v-if="columns[4].visible">
+          <template #default="scope">
+            <dict-tag :options="supplier_type" :value="scope.row.supplierType" />
+          </template>
+        </el-table-column>
+        <el-table-column label="注册资本" align="center" prop="registeredCapital" v-if="columns[5].visible" />
+        <el-table-column label="成立日期" align="center" prop="establishmentDate" width="180" v-if="columns[6].visible">
+          <template #default="scope">
+            <span>{{ parseTime(scope.row.establishmentDate, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="经营范围" align="center" prop="businessScope" v-if="columns[7].visible" />
+        <el-table-column label="主营行业" align="center" prop="mainIndustry" v-if="columns[8].visible" />
+        <el-table-column label="法定代表人" align="center" prop="legalRepresentative" v-if="columns[9].visible" />
+        <el-table-column label="营业执照号码" align="center" prop="businessLicenseNumber" v-if="columns[10].visible" />
+        <el-table-column label="税号" align="center" prop="taxNumber" v-if="columns[11].visible" />
+        <el-table-column label="开户银行" align="center" prop="bankAccountOpening" v-if="columns[12].visible" />
+        <el-table-column label="银行账号" align="center" prop="bankNumber" v-if="columns[13].visible" />
+        <el-table-column label="注册地址" align="center" prop="registeredAddress" v-if="columns[14].visible" />
+        <el-table-column label="经营地址" align="center" prop="businessAddress" v-if="columns[15].visible" />
+        <el-table-column label="联系人" align="center" prop="contactPerson" v-if="columns[16].visible" />
+        <el-table-column label="联系电话" align="center" prop="contactPhone" v-if="columns[17].visible" />
+        <el-table-column label="联系手机" align="center" prop="contactMobile" v-if="columns[18].visible" />
+        <el-table-column label="联系邮箱" align="center" prop="contactEmail" v-if="columns[19].visible" />
+        <el-table-column label="传真" align="center" prop="contactFax" v-if="columns[20].visible" />
+        <el-table-column label="网址" align="center" prop="website" v-if="columns[21].visible" />
+        <el-table-column label="归属人员" align="center" prop="ownerName" v-if="columns[22].visible" />
+        <el-table-column label="详细地址" align="center" prop="detailedAddress" v-if="columns[23].visible" />
+        <el-table-column label="附件ID" align="center" prop="ossId" v-if="columns[24].visible" />
+        <el-table-column label="备注" align="center" prop="remark" v-if="columns[25].visible" />
+        <el-table-column label="激活标识" align="center" prop="activeFlag" v-if="columns[26].visible">
+          <template #default="scope">
+            <dict-tag :options="active_flag" :value="scope.row.activeFlag" />
+          </template>
+        </el-table-column>
+        <el-table-column label="创建时间" align="center" prop="createTime" width="180" v-if="columns[27].visible">
+          <template #default="scope">
+            <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="创建人" align="center" prop="createName" v-if="columns[28].visible" />
+        <el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width">
+          <template #default="scope">
+            <el-tooltip content="修改" placement="top">
+              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['oa/crm:crmSupplierInfo:edit']"></el-button>
+            </el-tooltip>
+            <el-tooltip content="删除" placement="top">
+              <el-button
+                link
+                type="primary"
+                icon="Delete"
+                @click="handleDelete(scope.row)"
+                v-hasPermi="['oa/crm:crmSupplierInfo:remove']"
+              ></el-button>
+            </el-tooltip>
+          </template>
+        </el-table-column>
+      </el-table>
 
-            <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+    </el-card>
+
+    <!-- 添加或修改供应商信息对话框 -->
+    <el-dialog :title="dialog.title" v-model="dialog.visible" width="760px" append-to-body>
+      <el-form ref="crmSupplierInfoFormRef" :model="form" :rules="rules" label-width="110px" class="supplier-form">
+        <el-card shadow="never" class="mb-12" body-class="pb-2">
+          <template #header>
+            <span class="section-title">基础信息</span>
+          </template>
+          <el-row :gutter="16">
+            <el-col :md="12" :sm="24">
+              <el-form-item label="供应商名称" prop="supplierName">
+                <el-input v-model="form.supplierName" placeholder="请输入供应商名称" />
+              </el-form-item>
+            </el-col>
+            <el-col :md="12" :sm="24">
+              <el-form-item label="助记名称" prop="mnemonicName">
+                <el-input v-model="form.mnemonicName" placeholder="请输入助记名称" />
+              </el-form-item>
+            </el-col>
+            <el-col :md="12" :sm="24">
+              <el-form-item label="供应商类型" prop="supplierType">
+                <el-select v-model="form.supplierType" placeholder="请选择供应商类型">
+                  <el-option v-for="dict in supplier_type" :key="dict.value" :label="dict.label" :value="dict.value" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :md="12" :sm="24">
+              <el-form-item label="成立日期" prop="establishmentDate">
+                <el-date-picker v-model="form.establishmentDate" type="date" value-format="YYYY-MM-DD" placeholder="请选择成立日期" clearable />
+              </el-form-item>
+            </el-col>
+            <el-col :md="12" :sm="24">
+              <el-form-item label="主营行业" prop="mainIndustry">
+                <el-input v-model="form.mainIndustry" placeholder="请输入主营行业" />
+              </el-form-item>
+            </el-col>
+            <el-col :md="12" :sm="24">
+              <el-form-item label="注册资本" prop="registeredCapital">
+                <el-input-number v-model="form.registeredCapital" placeholder="请输入注册资本" />
+              </el-form-item>
+            </el-col>
+            <el-col :md="24">
+              <el-form-item label="经营范围" prop="businessScope">
+                <el-input v-model="form.businessScope" placeholder="请输入经营范围" maxlength="500" show-word-limit type="textarea" />
+              </el-form-item>
+            </el-col>
+          </el-row>
         </el-card>
 
-        <!-- 添加或修改供应商信息对话框 -->
-        <el-dialog :title="dialog.title" v-model="dialog.visible" width="760px" append-to-body>
-            <el-form ref="crmSupplierInfoFormRef" :model="form" :rules="rules" label-width="110px" class="supplier-form">
-                <el-card shadow="never" class="mb-12" body-class="pb-2">
-                    <template #header>
-                        <span class="section-title">基础信息</span>
-                    </template>
-                    <el-row :gutter="16">
-                        <el-col :md="12" :sm="24">
-                            <el-form-item label="供应商名称" prop="supplierName">
-                                <el-input v-model="form.supplierName" placeholder="请输入供应商名称" />
-                            </el-form-item>
-                        </el-col>
-                        <el-col :md="12" :sm="24">
-                            <el-form-item label="助记名称" prop="mnemonicName">
-                                <el-input v-model="form.mnemonicName" placeholder="请输入助记名称" />
-                            </el-form-item>
-                        </el-col>
-                        <el-col :md="12" :sm="24">
-                            <el-form-item label="供应商类型" prop="supplierType">
-                                <el-select v-model="form.supplierType" placeholder="请选择供应商类型">
-                                    <el-option
-                                        v-for="dict in supplier_type"
-                                        :key="dict.value"
-                                        :label="dict.label"
-                                        :value="dict.value"
-                                    />
-                                </el-select>
-                            </el-form-item>
-                        </el-col>
-                        <el-col :md="12" :sm="24">
-                            <el-form-item label="成立日期" prop="establishmentDate">
-                                <el-date-picker
-                                    v-model="form.establishmentDate"
-                                    type="date"
-                                    value-format="YYYY-MM-DD"
-                                    placeholder="请选择成立日期"
-                                    clearable
-                                />
-                            </el-form-item>
-                        </el-col>
-                        <el-col :md="12" :sm="24">
-                            <el-form-item label="主营行业" prop="mainIndustry">
-                                <el-input v-model="form.mainIndustry" placeholder="请输入主营行业" />
-                            </el-form-item>
-                        </el-col>
-                        <el-col :md="12" :sm="24">
-                            <el-form-item label="注册资本" prop="registeredCapital">
-                                <el-input-number v-model="form.registeredCapital" placeholder="请输入注册资本" />
-                            </el-form-item>
-                        </el-col>
-                        <el-col :md="24">
-                            <el-form-item label="经营范围" prop="businessScope">
-                                <el-input v-model="form.businessScope" placeholder="请输入经营范围" maxlength="500" show-word-limit type="textarea" />
-                            </el-form-item>
-                        </el-col>
-                    </el-row>
-                </el-card>
+        <el-card shadow="never" class="mb-12" body-class="pb-2">
+          <template #header>
+            <span class="section-title">联系方式</span>
+          </template>
+          <el-row :gutter="16">
+            <el-col :md="12" :sm="24">
+              <el-form-item label="联系人" prop="contactPerson">
+                <el-input v-model="form.contactPerson" placeholder="请输入联系人" />
+              </el-form-item>
+            </el-col>
+            <el-col :md="12" :sm="24">
+              <el-form-item label="联系电话" prop="contactPhone">
+                <el-input v-model="form.contactPhone" placeholder="请输入联系电话" />
+              </el-form-item>
+            </el-col>
+            <el-col :md="12" :sm="24">
+              <el-form-item label="联系手机" prop="contactMobile">
+                <el-input v-model="form.contactMobile" placeholder="请输入联系手机" />
+              </el-form-item>
+            </el-col>
+            <el-col :md="12" :sm="24">
+              <el-form-item label="联系邮箱" prop="contactEmail">
+                <el-input v-model="form.contactEmail" placeholder="请输入联系邮箱" />
+              </el-form-item>
+            </el-col>
+            <el-col :md="12" :sm="24">
+              <el-form-item label="传真" prop="contactFax">
+                <el-input v-model="form.contactFax" placeholder="请输入传真" />
+              </el-form-item>
+            </el-col>
+            <el-col :md="12" :sm="24">
+              <el-form-item label="网址" prop="website">
+                <el-input v-model="form.website" placeholder="请输入网址" />
+              </el-form-item>
+            </el-col>
+            <el-col :md="24">
+              <el-form-item label="归属人员" prop="ownerId">
+                <el-select v-model="form.ownerId" placeholder="请选择归属人员" clearable filterable>
+                  <el-option v-for="user in userList" :key="user.userId" :label="user.nickName" :value="user.userId" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-card>
 
-                <el-card shadow="never" class="mb-12" body-class="pb-2">
-                    <template #header>
-                        <span class="section-title">联系方式</span>
-                    </template>
-                    <el-row :gutter="16">
-                        <el-col :md="12" :sm="24">
-                            <el-form-item label="联系人" prop="contactPerson">
-                                <el-input v-model="form.contactPerson" placeholder="请输入联系人" />
-                            </el-form-item>
-                        </el-col>
-                        <el-col :md="12" :sm="24">
-                            <el-form-item label="联系电话" prop="contactPhone">
-                                <el-input v-model="form.contactPhone" placeholder="请输入联系电话" />
-                            </el-form-item>
-                        </el-col>
-                        <el-col :md="12" :sm="24">
-                            <el-form-item label="联系手机" prop="contactMobile">
-                                <el-input v-model="form.contactMobile" placeholder="请输入联系手机" />
-                            </el-form-item>
-                        </el-col>
-                        <el-col :md="12" :sm="24">
-                            <el-form-item label="联系邮箱" prop="contactEmail">
-                                <el-input v-model="form.contactEmail" placeholder="请输入联系邮箱" />
-                            </el-form-item>
-                        </el-col>
-                        <el-col :md="12" :sm="24">
-                            <el-form-item label="传真" prop="contactFax">
-                                <el-input v-model="form.contactFax" placeholder="请输入传真" />
-                            </el-form-item>
-                        </el-col>
-                        <el-col :md="12" :sm="24">
-                            <el-form-item label="网址" prop="website">
-                                <el-input v-model="form.website" placeholder="请输入网址" />
-                            </el-form-item>
-                        </el-col>
-                        <el-col :md="24">
-                            <el-form-item label="归属人员" prop="ownerId">
-                                <el-select v-model="form.ownerId" placeholder="请选择归属人员" clearable filterable>
-                                    <el-option v-for="user in userList" :key="user.userId" :label="user.nickName" :value="user.userId" />
-                                </el-select>
-                            </el-form-item>
-                        </el-col>
-                    </el-row>
-                </el-card>
+        <el-card shadow="never" class="mb-12" body-class="pb-2">
+          <template #header>
+            <span class="section-title">办公与财务信息</span>
+          </template>
+          <el-row :gutter="16">
+            <el-col :md="12" :sm="24">
+              <el-form-item label="法定代表人" prop="legalRepresentative">
+                <el-input v-model="form.legalRepresentative" placeholder="请输入法定代表人" />
+              </el-form-item>
+            </el-col>
+            <el-col :md="12" :sm="24">
+              <el-form-item label="营业执照号码" prop="businessLicenseNumber">
+                <el-input v-model="form.businessLicenseNumber" placeholder="请输入营业执照号码" />
+              </el-form-item>
+            </el-col>
+            <el-col :md="12" :sm="24">
+              <el-form-item label="税号" prop="taxNumber">
+                <el-input v-model="form.taxNumber" placeholder="请输入税号" />
+              </el-form-item>
+            </el-col>
+            <el-col :md="12" :sm="24">
+              <el-form-item label="开户银行" prop="bankAccountOpening">
+                <el-input v-model="form.bankAccountOpening" placeholder="请输入开户银行" />
+              </el-form-item>
+            </el-col>
+            <el-col :md="12" :sm="24">
+              <el-form-item label="银行账号" prop="bankNumber">
+                <el-input v-model="form.bankNumber" placeholder="请输入银行账号" />
+              </el-form-item>
+            </el-col>
+            <el-col :md="12" :sm="24">
+              <el-form-item label="注册地址" prop="registeredAddress">
+                <el-input v-model="form.registeredAddress" type="textarea" placeholder="请输入注册地址" />
+              </el-form-item>
+            </el-col>
+            <el-col :md="12" :sm="24">
+              <el-form-item label="经营地址" prop="businessAddress">
+                <el-input v-model="form.businessAddress" type="textarea" placeholder="请输入经营地址" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-card>
 
-                <el-card shadow="never" class="mb-12" body-class="pb-2">
-                    <template #header>
-                        <span class="section-title">办公与财务信息</span>
-                    </template>
-                    <el-row :gutter="16">
-                        <el-col :md="12" :sm="24">
-                            <el-form-item label="法定代表人" prop="legalRepresentative">
-                                <el-input v-model="form.legalRepresentative" placeholder="请输入法定代表人" />
-                            </el-form-item>
-                        </el-col>
-                        <el-col :md="12" :sm="24">
-                            <el-form-item label="营业执照号码" prop="businessLicenseNumber">
-                                <el-input v-model="form.businessLicenseNumber" placeholder="请输入营业执照号码" />
-                            </el-form-item>
-                        </el-col>
-                        <el-col :md="12" :sm="24">
-                            <el-form-item label="税号" prop="taxNumber">
-                                <el-input v-model="form.taxNumber" placeholder="请输入税号" />
-                            </el-form-item>
-                        </el-col>
-                        <el-col :md="12" :sm="24">
-                            <el-form-item label="开户银行" prop="bankAccountOpening">
-                                <el-input v-model="form.bankAccountOpening" placeholder="请输入开户银行" />
-                            </el-form-item>
-                        </el-col>
-                        <el-col :md="12" :sm="24">
-                            <el-form-item label="银行账号" prop="bankNumber">
-                                <el-input v-model="form.bankNumber" placeholder="请输入银行账号" />
-                            </el-form-item>
-                        </el-col>
-                        <el-col :md="12" :sm="24">
-                            <el-form-item label="注册地址" prop="registeredAddress">
-                                <el-input v-model="form.registeredAddress" type="textarea" placeholder="请输入注册地址" />
-                            </el-form-item>
-                        </el-col>
-                        <el-col :md="12" :sm="24">
-                            <el-form-item label="经营地址" prop="businessAddress">
-                                <el-input v-model="form.businessAddress" type="textarea" placeholder="请输入经营地址" />
-                            </el-form-item>
-                        </el-col>
-                    </el-row>
-                </el-card>
-
-                <el-card shadow="never" body-class="pb-2">
-                    <template #header>
-                        <span class="section-title">附件与其他</span>
-                    </template>
-                    <el-row :gutter="16">
-                        <el-col :md="12" :sm="24">
-                            <el-form-item label="附件" prop="ossId">
-                                <FileUpload v-model="form.ossId" :limit="1" :is-show-tip="true" :file-size="10" />
-                                <span class="upload-tip">仅支持单文件上传，大小不超过10MB</span>
-                                <div v-if="form.attachmentList?.length" class="mt-2">
-                                    <el-tag
-                                        v-for="item in form.attachmentList"
-                                        :key="item.ossId"
-                                        size="small"
-                                        class="mr-2 mb-2"
-                                    >
-                                        <el-link :href="item.url" target="_blank" type="primary">
-                                            {{ item.originalName || item.name }}
-                                        </el-link>
-                                    </el-tag>
-                                </div>
-                            </el-form-item>
-                        </el-col>
-                        <el-col :md="12" :sm="24">
-                            <el-form-item label="激活标识" prop="activeFlag">
-                                <el-radio-group v-model="form.activeFlag">
-                                    <el-radio
-                                        v-for="dict in active_flag"
-                                        :key="dict.value"
-                                        :value="dict.value"
-                                    >{{ dict.label }}</el-radio>
-                                </el-radio-group>
-                            </el-form-item>
-                        </el-col>
-                        <el-col :md="24">
-                            <el-form-item label="备注" prop="remark">
-                                <el-input v-model="form.remark" type="textarea" placeholder="请输入备注" maxlength="300" show-word-limit />
-                            </el-form-item>
-                        </el-col>
-                    </el-row>
-                </el-card>
-            </el-form>
-            <template #footer>
-                <div class="dialog-footer">
-                    <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
-                    <el-button @click="cancel">取 消</el-button>
-                </div>
-            </template>
-        </el-dialog>
-    </div>
+        <el-card shadow="never" body-class="pb-2">
+          <template #header>
+            <span class="section-title">附件与其他</span>
+          </template>
+          <el-row :gutter="16">
+            <!--                        <el-col :md="12" :sm="24">-->
+            <el-form-item label="附件" prop="ossId">
+              <FileUpload v-model="form.ossId" :limit="1" :is-show-tip="true" :file-size="10" />
+              <!--                                <span class="upload-tip">仅支持单文件上传，大小不超过10MB</span>-->
+              <!--                                <div v-if="form.attachmentList?.length" class="mt-2">-->
+              <!--                                    <el-tag-->
+              <!--                                        v-for="item in form.attachmentList"-->
+              <!--                                        :key="item.ossId"-->
+              <!--                                        size="small"-->
+              <!--                                        class="mr-2 mb-2"-->
+              <!--                                    >-->
+              <!--                                        <el-link :href="item.url" target="_blank" type="primary">-->
+              <!--                                            {{ item.originalName || item.name }}-->
+              <!--                                        </el-link>-->
+              <!--                                    </el-tag>-->
+              <!--                                </div>-->
+            </el-form-item>
+            <!--                        </el-col>-->
+            <!--                        <el-col :md="12" :sm="24">-->
+            <!--                            <el-form-item label="激活标识" prop="activeFlag">-->
+            <!--                                <el-radio-group v-model="form.activeFlag">-->
+            <!--                                    <el-radio-->
+            <!--                                        v-for="dict in active_flag"-->
+            <!--                                        :key="dict.value"-->
+            <!--                                        :value="dict.value"-->
+            <!--                                    >{{ dict.label }}</el-radio>-->
+            <!--                                </el-radio-group>-->
+            <!--                            </el-form-item>-->
+            <!--                        </el-col>-->
+            <el-col :md="24">
+              <el-form-item label="激活标识" prop="activeFlag">
+                <el-radio-group v-model="form.activeFlag">
+                  <el-radio v-for="dict in active_flag" :key="dict.value" :value="dict.value">{{ dict.label }} </el-radio>
+                </el-radio-group>
+              </el-form-item>
+            </el-col>
+            <el-col :md="24">
+              <el-form-item label="备注" prop="remark">
+                <el-input v-model="form.remark" type="textarea" placeholder="请输入备注" maxlength="300" show-word-limit />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-card>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
 </template>
 
 <script setup name="CrmSupplierInfo" lang="ts">
-    import { listCrmSupplierInfo, getCrmSupplierInfo, delCrmSupplierInfo, addCrmSupplierInfo, updateCrmSupplierInfo } from '@/api/oa/crm/crmSupplierInfo';
-    import { CrmSupplierInfoVO, CrmSupplierInfoQuery, CrmSupplierInfoForm } from '@/api/oa/crm/crmSupplierInfo/types';
-    import { listUser } from '@/api/system/user';
-    import { UserVO } from '@/api/system/user/types';
-    import FileUpload from '@/components/FileUpload/index.vue';
+import { listCrmSupplierInfo, getCrmSupplierInfo, delCrmSupplierInfo, addCrmSupplierInfo, updateCrmSupplierInfo } from '@/api/oa/crm/crmSupplierInfo';
+import { CrmSupplierInfoVO, CrmSupplierInfoQuery, CrmSupplierInfoForm } from '@/api/oa/crm/crmSupplierInfo/types';
+import { listUser } from '@/api/system/user';
+import { UserVO } from '@/api/system/user/types';
+import FileUpload from '@/components/FileUpload/index.vue';
 
-    const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-        const { active_flag, supplier_type } = toRefs<any>(proxy?.useDict('active_flag', 'supplier_type'));
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { active_flag, supplier_type } = toRefs<any>(proxy?.useDict('active_flag', 'supplier_type'));
 
-    const crmSupplierInfoList = ref<CrmSupplierInfoVO[]>([]);
-    const userList = ref<UserVO[]>([]);
-    const buttonLoading = ref(false);
-    const loading = ref(true);
-    const showSearch = ref(true);
-    const ids = ref<Array<string | number>>([]);
-    const single = ref(true);
-    const multiple = ref(true);
-    const total = ref(0);
+const crmSupplierInfoList = ref<CrmSupplierInfoVO[]>([]);
+const userList = ref<UserVO[]>([]);
+const buttonLoading = ref(false);
+const loading = ref(true);
+const showSearch = ref(true);
+const ids = ref<Array<string | number>>([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
 
-    const queryFormRef = ref<ElFormInstance>();
-    const crmSupplierInfoFormRef = ref<ElFormInstance>();
+const queryFormRef = ref<ElFormInstance>();
+const crmSupplierInfoFormRef = ref<ElFormInstance>();
 
-    const dialog = reactive<DialogOption>({
-        visible: false,
-        title: ''
-    });
+const dialog = reactive<DialogOption>({
+  visible: false,
+  title: ''
+});
 
-    // 列显隐信息
-    const columns = ref<FieldOption[]>([
-            { key: 0, label: `供应商ID`, visible: false },
-            { key: 1, label: `租户编号`, visible: false },
-            { key: 2, label: `供应商名称`, visible: true },
-            { key: 3, label: `助记名称`, visible: true },
-            { key: 4, label: `供应商类型`, visible: true },
-            { key: 5, label: `注册资本`, visible: false },
-            { key: 6, label: `成立日期`, visible: false },
-            { key: 7, label: `经营范围`, visible: false },
-            { key: 8, label: `主营行业`, visible: true },
-            { key: 9, label: `法定代表人`, visible: false },
-            { key: 10, label: `营业执照号码`, visible: false },
-            { key: 11, label: `税号`, visible: false },
-            { key: 12, label: `开户银行`, visible: false },
-            { key: 13, label: `银行账号`, visible: false },
-            { key: 14, label: `注册地址`, visible: false },
-            { key: 15, label: `经营地址`, visible: false },
-            { key: 16, label: `联系人`, visible: false },
-            { key: 17, label: `联系电话`, visible: false },
-            { key: 18, label: `联系手机`, visible: false },
-            { key: 19, label: `联系邮箱`, visible: false },
-            { key: 20, label: `传真`, visible: false },
-            { key: 21, label: `网址`, visible: false },
-            { key: 22, label: `归属人员`, visible: true },
-            { key: 23, label: `详细地址`, visible: false },
-            { key: 24, label: `附件ID`, visible: false },
-            { key: 25, label: `备注`, visible: true },
-            { key: 26, label: `激活标识`, visible: true },
-      { key: 27, label: `创建时间`, visible: true },
-            { key: 28, label: `创建人`, visible: true },
-    ]);
+// 列显隐信息
+const columns = ref<FieldOption[]>([
+  { key: 0, label: `供应商ID`, visible: false },
+  { key: 1, label: `租户编号`, visible: false },
+  { key: 2, label: `供应商名称`, visible: true },
+  { key: 3, label: `助记名称`, visible: true },
+  { key: 4, label: `供应商类型`, visible: true },
+  { key: 5, label: `注册资本`, visible: false },
+  { key: 6, label: `成立日期`, visible: false },
+  { key: 7, label: `经营范围`, visible: false },
+  { key: 8, label: `主营行业`, visible: true },
+  { key: 9, label: `法定代表人`, visible: false },
+  { key: 10, label: `营业执照号码`, visible: false },
+  { key: 11, label: `税号`, visible: false },
+  { key: 12, label: `开户银行`, visible: false },
+  { key: 13, label: `银行账号`, visible: false },
+  { key: 14, label: `注册地址`, visible: false },
+  { key: 15, label: `经营地址`, visible: false },
+  { key: 16, label: `联系人`, visible: false },
+  { key: 17, label: `联系电话`, visible: false },
+  { key: 18, label: `联系手机`, visible: false },
+  { key: 19, label: `联系邮箱`, visible: false },
+  { key: 20, label: `传真`, visible: false },
+  { key: 21, label: `网址`, visible: false },
+  { key: 22, label: `归属人员`, visible: true },
+  { key: 23, label: `详细地址`, visible: false },
+  { key: 24, label: `附件ID`, visible: false },
+  { key: 25, label: `备注`, visible: true },
+  { key: 26, label: `激活标识`, visible: true },
+  { key: 27, label: `创建时间`, visible: true },
+  { key: 28, label: `创建人`, visible: true }
+]);
 
-    const initFormData: CrmSupplierInfoForm = {
-                        supplierId: undefined,
-                        supplierName: undefined,
-                        mnemonicName: undefined,
-                        supplierType: undefined,
-                        registeredCapital: undefined,
-                        establishmentDate: undefined,
-                        businessScope: undefined,
-                        mainIndustry: undefined,
-                        legalRepresentative: undefined,
-                        businessLicenseNumber: undefined,
-                        taxNumber: undefined,
-                        bankAccountOpening: undefined,
-                        bankNumber: undefined,
-                        registeredAddress: undefined,
-                        businessAddress: undefined,
-                        contactPerson: undefined,
-                        contactPhone: undefined,
-                        contactMobile: undefined,
-                        contactEmail: undefined,
-                        contactFax: undefined,
-                        website: undefined,
-                        ownerId: undefined,
-                        detailedAddress: undefined,
-                        ossId: undefined,
-                        remark: undefined,
-                        activeFlag: undefined,
-      ownerName: undefined,
-      createName: undefined,
+const initFormData: CrmSupplierInfoForm = {
+  supplierId: undefined,
+  supplierName: undefined,
+  mnemonicName: undefined,
+  supplierType: undefined,
+  registeredCapital: undefined,
+  establishmentDate: undefined,
+  businessScope: undefined,
+  mainIndustry: undefined,
+  legalRepresentative: undefined,
+  businessLicenseNumber: undefined,
+  taxNumber: undefined,
+  bankAccountOpening: undefined,
+  bankNumber: undefined,
+  registeredAddress: undefined,
+  businessAddress: undefined,
+  contactPerson: undefined,
+  contactPhone: undefined,
+  contactMobile: undefined,
+  contactEmail: undefined,
+  contactFax: undefined,
+  website: undefined,
+  ownerId: undefined,
+  detailedAddress: undefined,
+  ossId: undefined,
+  remark: undefined,
+  activeFlag: undefined,
+  ownerName: undefined,
+  createName: undefined
+};
+const data = reactive<PageData<CrmSupplierInfoForm, CrmSupplierInfoQuery>>({
+  form: { ...initFormData },
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    supplierName: undefined,
+    mnemonicName: undefined,
+    supplierType: undefined,
+    registeredCapital: undefined,
+    establishmentDate: undefined,
+    businessScope: undefined,
+    mainIndustry: undefined,
+    legalRepresentative: undefined,
+    businessLicenseNumber: undefined,
+    taxNumber: undefined,
+    bankAccountOpening: undefined,
+    bankNumber: undefined,
+    registeredAddress: undefined,
+    businessAddress: undefined,
+    contactPerson: undefined,
+    contactPhone: undefined,
+    contactMobile: undefined,
+    contactEmail: undefined,
+    contactFax: undefined,
+    website: undefined,
+    ownerId: undefined,
+    detailedAddress: undefined,
+    ossId: undefined,
+    activeFlag: undefined,
+    ownerName: undefined,
+    createName: undefined,
+    params: {}
+  },
+  rules: {
+    supplierName: [{ required: true, message: '供应商名称不能为空', trigger: 'blur' }],
+    mnemonicName: [{ required: true, message: '助记名称不能为空', trigger: 'blur' }],
+    supplierType: [{ required: true, message: '供应商类型不能为空', trigger: 'change' }],
+    mainIndustry: [{ required: true, message: '主营行业不能为空', trigger: 'blur' }]
+  }
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+/** 查询供应商信息列表 */
+const getList = async () => {
+  loading.value = true;
+  const res = await listCrmSupplierInfo(queryParams.value);
+  crmSupplierInfoList.value = res.rows;
+  total.value = res.total;
+  loading.value = false;
+};
+
+/** 获取用户列表 */
+const getUserList = async () => {
+  const res = await listUser({ pageNum: 1, pageSize: 1000 });
+  userList.value = res.rows;
+};
+
+/** 取消按钮 */
+const cancel = () => {
+  reset();
+  dialog.visible = false;
+};
+
+/** 表单重置 */
+const reset = () => {
+  form.value = { ...initFormData };
+  crmSupplierInfoFormRef.value?.resetFields();
+};
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.value.pageNum = 1;
+  getList();
+};
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value?.resetFields();
+  handleQuery();
+};
+
+/** 多选框选中数据 */
+const handleSelectionChange = (selection: CrmSupplierInfoVO[]) => {
+  ids.value = selection.map((item) => item.supplierId);
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+};
+
+/** 新增按钮操作 */
+const handleAdd = () => {
+  reset();
+  form.value.activeFlag = '1';
+  dialog.visible = true;
+  dialog.title = '添加供应商信息';
+};
+
+/** 修改按钮操作 */
+const handleUpdate = async (row?: CrmSupplierInfoVO) => {
+  reset();
+  const _supplierId = row?.supplierId || ids.value[0];
+  const res = await getCrmSupplierInfo(_supplierId);
+  Object.assign(form.value, res.data);
+  dialog.visible = true;
+  dialog.title = '修改供应商信息';
+};
+
+/** 提交按钮 */
+const submitForm = () => {
+  crmSupplierInfoFormRef.value?.validate(async (valid: boolean) => {
+    if (valid) {
+      buttonLoading.value = true;
+      if (form.value.supplierId) {
+        await updateCrmSupplierInfo(form.value).finally(() => (buttonLoading.value = false));
+      } else {
+        await addCrmSupplierInfo(form.value).finally(() => (buttonLoading.value = false));
+      }
+      proxy?.$modal.msgSuccess('操作成功');
+      dialog.visible = false;
+      await getList();
     }
-    const data = reactive<PageData<CrmSupplierInfoForm, CrmSupplierInfoQuery>>({
-        form: {...initFormData},
-        queryParams: {
-            pageNum: 1,
-            pageSize: 10,
-                            supplierName: undefined,
-                            mnemonicName: undefined,
-                            supplierType: undefined,
-                            registeredCapital: undefined,
-                            establishmentDate: undefined,
-                            businessScope: undefined,
-                            mainIndustry: undefined,
-                            legalRepresentative: undefined,
-                            businessLicenseNumber: undefined,
-                            taxNumber: undefined,
-                            bankAccountOpening: undefined,
-                            bankNumber: undefined,
-                            registeredAddress: undefined,
-                            businessAddress: undefined,
-                            contactPerson: undefined,
-                            contactPhone: undefined,
-                            contactMobile: undefined,
-                            contactEmail: undefined,
-                            contactFax: undefined,
-                            website: undefined,
-                            ownerId: undefined,
-                            detailedAddress: undefined,
-                            ossId: undefined,
-                            activeFlag: undefined,
-          ownerName: undefined,
-          createName: undefined,
-            params: {
-            }
-        },
-        rules: {
-                            supplierName: [
-                            { required: true, message: "供应商名称不能为空", trigger: "blur" }
-                        ],
-                            mnemonicName: [
-                            { required: true, message: "助记名称不能为空", trigger: "blur" }
-                        ],
-                            supplierType: [
-                            { required: true, message: "供应商类型不能为空", trigger: "change" }
-                        ],
-                            mainIndustry: [
-                            { required: true, message: "主营行业不能为空", trigger: "blur" }
-                        ]
-        }
-    });
+  });
+};
 
-    const { queryParams, form, rules } = toRefs(data);
+/** 删除按钮操作 */
+const handleDelete = async (row?: CrmSupplierInfoVO) => {
+  const _supplierIds = row?.supplierId || ids.value;
+  await proxy?.$modal.confirm('是否确认删除供应商信息编号为"' + _supplierIds + '"的数据项？').finally(() => (loading.value = false));
+  await delCrmSupplierInfo(_supplierIds);
+  proxy?.$modal.msgSuccess('删除成功');
+  await getList();
+};
 
-    /** 查询供应商信息列表 */
-    const getList = async () => {
-        loading.value = true;
-        const res = await listCrmSupplierInfo(queryParams.value);
-            crmSupplierInfoList.value = res.rows;
-        total.value = res.total;
-        loading.value = false;
-    }
+/** 导出按钮操作 */
+const handleExport = () => {
+  proxy?.download(
+    'oa/crm/crmSupplierInfo/export',
+    {
+      ...queryParams.value
+    },
+    `crmSupplierInfo_${new Date().getTime()}.xlsx`
+  );
+};
 
-    /** 获取用户列表 */
-    const getUserList = async () => {
-        const res = await listUser({ pageNum: 1, pageSize: 1000 });
-        userList.value = res.rows;
-    }
-
-    /** 取消按钮 */
-    const cancel = () => {
-        reset();
-        dialog.visible = false;
-    }
-
-    /** 表单重置 */
-    const reset = () => {
-        form.value = {...initFormData};
-            crmSupplierInfoFormRef.value?.resetFields();
-    }
-
-    /** 搜索按钮操作 */
-    const handleQuery = () => {
-        queryParams.value.pageNum = 1;
-        getList();
-    }
-
-    /** 重置按钮操作 */
-    const resetQuery = () => {
-        queryFormRef.value?.resetFields();
-        handleQuery();
-    }
-
-    /** 多选框选中数据 */
-    const handleSelectionChange = (selection: CrmSupplierInfoVO[]) => {
-        ids.value = selection.map(item => item.supplierId);
-        single.value = selection.length != 1;
-        multiple.value = !selection.length;
-    }
-
-    /** 新增按钮操作 */
-    const handleAdd = () => {
-        reset();
-        form.value.activeFlag = '1';
-        dialog.visible = true;
-        dialog.title = "添加供应商信息";
-    }
-
-    /** 修改按钮操作 */
-    const handleUpdate = async (row?: CrmSupplierInfoVO) => {
-        reset();
-        const _supplierId = row?.supplierId || ids.value[0]
-        const res = await getCrmSupplierInfo(_supplierId);
-        Object.assign(form.value, res.data);
-        dialog.visible = true;
-        dialog.title = "修改供应商信息";
-    }
-
-    /** 提交按钮 */
-    const submitForm = () => {
-            crmSupplierInfoFormRef.value?.validate(async (valid: boolean) => {
-            if (valid) {
-                buttonLoading.value = true;
-                if (form.value.supplierId) {
-                    await updateCrmSupplierInfo(form.value).finally(() =>  buttonLoading.value = false);
-                } else {
-                    await addCrmSupplierInfo(form.value).finally(() =>  buttonLoading.value = false);
-                }
-                proxy?.$modal.msgSuccess("操作成功");
-                dialog.visible = false;
-                await getList();
-            }
-        });
-    }
-
-    /** 删除按钮操作 */
-    const handleDelete = async (row?: CrmSupplierInfoVO) => {
-        const _supplierIds = row?.supplierId || ids.value;
-        await proxy?.$modal.confirm('是否确认删除供应商信息编号为"' + _supplierIds + '"的数据项？').finally(() => loading.value = false);
-        await delCrmSupplierInfo(_supplierIds);
-        proxy?.$modal.msgSuccess("删除成功");
-        await getList();
-    }
-
-    /** 导出按钮操作 */
-    const handleExport = () => {
-        proxy?.download('oa/crm/crmSupplierInfo/export', {
-            ...queryParams.value
-        }, `crmSupplierInfo_${new Date().getTime()}.xlsx`)
-    }
-
-    onMounted(() => {
-        getList();
-        getUserList();
-    });
+onMounted(() => {
+  getList();
+  getUserList();
+});
 </script>
diff --git a/src/views/oa/erp/projectPurchase/index.vue b/src/views/oa/erp/projectPurchase/index.vue
index c2161ae..4218324 100644
--- a/src/views/oa/erp/projectPurchase/index.vue
+++ b/src/views/oa/erp/projectPurchase/index.vue
@@ -4,17 +4,17 @@
       <div v-show="showSearch" class="mb-[10px]">
         <el-card shadow="hover">
           <el-form ref="queryFormRef" :model="queryParams" :inline="true" label-width="100px">
-            <el-form-item label="项目号" prop="projectCode">
-              <el-input v-model="queryParams.projectCode" placeholder="请输入项目号" clearable @keyup.enter="handleQuery" />
-            </el-form-item>
             <el-form-item label="采购编号" prop="purchaseCode">
               <el-input v-model="queryParams.purchaseCode" placeholder="请输入采购编号" clearable @keyup.enter="handleQuery" />
             </el-form-item>
+            <el-form-item label="项目号" prop="projectCode">
+              <el-input v-model="queryParams.projectCode" placeholder="请输入项目号" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
             <el-form-item label="项目名称" prop="projectName">
               <el-input v-model="queryParams.projectName" placeholder="请输入项目名称" clearable @keyup.enter="handleQuery" />
             </el-form-item>
-            <el-form-item label="项目经理" prop="managerId">
-              <el-input v-model="queryParams.managerId" placeholder="请输入项目经理" clearable @keyup.enter="handleQuery" />
+            <el-form-item label="项目经理" prop="managerName">
+              <el-input v-model="queryParams.managerName" placeholder="请输入项目经理" clearable @keyup.enter="handleQuery" />
             </el-form-item>
             <el-form-item label="项目采购状态" prop="projectPurchaseStatus">
               <el-select v-model="queryParams.projectPurchaseStatus" placeholder="请选择项目采购状态" clearable>
@@ -59,6 +59,11 @@
         <el-table-column label="项目经理" align="center" prop="managerName" width="120" v-if="columns[5].visible" />
         <el-table-column label="部门负责人" align="center" prop="chargeName" width="120" v-if="columns[6].visible" />
         <el-table-column label="分管副总" align="center" prop="deputyName" width="120" v-if="columns[7].visible" />
+        <el-table-column label="版本" align="center" prop="version" width="100" v-if="columns[8].visible">
+          <template #default="scope">
+            <span>v{{ scope.row.version }}.0</span>
+          </template>
+        </el-table-column>
         <el-table-column label="提报人" align="center" prop="reporterName" width="120" v-if="columns[9].visible" />
         <el-table-column label="收货人" align="center" prop="consigneeUser" width="120" v-if="columns[10].visible" />
         <el-table-column label="收货地址" align="center" prop="consigneeAddress" width="200" show-overflow-tooltip v-if="columns[11].visible" />

From 50ef949bd10bf47a8cbc9fe33a0de3c5436a5ff5 Mon Sep 17 00:00:00 2001
From: Yangk <yangk@menace.com>
Date: Thu, 4 Dec 2025 11:08:28 +0800
Subject: [PATCH 4/6] =?UTF-8?q?feat(afterSales):=20=E5=94=AE=E5=90=8E?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E4=BF=A1=E6=81=AF=E5=88=97=E8=A1=A8=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E6=9F=A5=E7=9C=8B=E8=AF=A6=E6=83=85=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/oa/erp/afterSales/index.vue | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/views/oa/erp/afterSales/index.vue b/src/views/oa/erp/afterSales/index.vue
index b4d0984..4d6ef0a 100644
--- a/src/views/oa/erp/afterSales/index.vue
+++ b/src/views/oa/erp/afterSales/index.vue
@@ -18,7 +18,7 @@
                 <el-option v-for="dict in after_sales_type" :key="dict.value" :label="dict.label" :value="dict.value" />
               </el-select>
             </el-form-item>
-            <el-form-item label="是否解决" prop="solveStatus" >
+            <el-form-item label="是否解决" prop="solveStatus">
               <el-select v-model="queryParams.solveStatus" placeholder="请选择售后问题是否解决" clearable>
                 <el-option v-for="dict in solve_status" :key="dict.value" :label="dict.label" :value="dict.value" />
               </el-select>
@@ -128,11 +128,11 @@
         <el-table-column label="备注" align="center" prop="remark" v-if="columns[26].visible" />
         <el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width">
           <template #default="scope">
-            <el-tooltip content="修改" placement="top">
+            <el-tooltip content="修改" placement="top" v-if="scope.row.flowStatus === 'draft' || scope.row.flowStatus === 'back'">
               <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['oa/erp:afterSales:edit']"></el-button>
             </el-tooltip>
-            <el-tooltip content="删除" placement="top">
-              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['oa/erp:afterSales:remove']"></el-button>
+            <el-tooltip content="查看详情" placement="top"  v-if="scope.row.flowStatus !== 'draft'">
+              <el-button link type="info" icon="DocumentChecked" @click="handleView(scope.row)"></el-button>
             </el-tooltip>
           </template>
         </el-table-column>
@@ -343,7 +343,7 @@ const handleView = (row?: AfterSalesVO) => {
   const _afterSalesId = row?.afterSalesId;
   proxy.$tab.closePage(route);
   router.push({
-    path: '/erp/afterSales/edit',
+    path: '/project/afterSales/edit',
     query: {
       id: _afterSalesId,
       type: 'view'

From d3d99e72e57234853e355ce023ca466771f6aea1 Mon Sep 17 00:00:00 2001
From: xs <xins@mesnac.com>
Date: Thu, 4 Dec 2025 13:59:22 +0800
Subject: [PATCH 5/6] =?UTF-8?q?1.0.46=EF=BC=9A=20=E5=89=8D=E7=AB=AF?=
 =?UTF-8?q?=EF=BC=9A=20=20=20=20fix(budget):=E6=96=B0=E5=A2=9Erouter?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/oa/erp/budgetInfo/edit.vue          | 588 +++++++++++++-----
 src/views/oa/erp/budgetInfo/index.vue         |  36 +-
 .../oa/erp/budgetInfo/rd/BudgetTable.vue      |   2 +-
 .../oa/erp/budgetInfo/rd/MaterialCost.vue     |  36 +-
 4 files changed, 489 insertions(+), 173 deletions(-)

diff --git a/src/views/oa/erp/budgetInfo/edit.vue b/src/views/oa/erp/budgetInfo/edit.vue
index 1d4da2e..b83c201 100644
--- a/src/views/oa/erp/budgetInfo/edit.vue
+++ b/src/views/oa/erp/budgetInfo/edit.vue
@@ -175,11 +175,12 @@
 <script setup lang="ts" name="BudgetInfoEdit">
 import { ref, reactive } from 'vue';
 import { ElMessage } from 'element-plus';
-import { listProjectInfo, addErpBudgetInfo, updateErpBudgetInfo, getErpBudgetInfo } from '@/api/oa/erp/budgetInfo';
+import { listProjectInfo, addErpBudgetInfo, updateErpBudgetInfo, changeErpBudgetInfo, getErpBudgetInfo } from '@/api/oa/erp/budgetInfo';
 import { ProjectInfoVO, ProjectInfoQuery } from '@/api/oa/erp/projectInfo/types';
 import { getUserList } from '@/api/system/user';
 
 import { deepEqualArrays } from '@/utils/objHandle';
+import { cloneDeep } from 'lodash-es';
 
 const router = useRouter();
 
@@ -644,11 +645,20 @@ const handleSave = async (status: string, mode: boolean) => {
       ElMessage.warning('不支持的预算类型');
       return;
     }
+    console.log('----');
+    console.log(budgetForm);
 
     // 统一保存逻辑
-    const saveOperation = budgetForm.budgetId ? () => updateErpBudgetInfo(budgetForm) : () => addErpBudgetInfo(budgetForm);
-
-    await saveOperation();
+    if (budgetForm.budgetId) {
+      await updateErpBudgetInfo(budgetForm);
+    } else {
+      if (routeParams.value.changeFlag === '1') {
+        await changeErpBudgetInfo(budgetForm);
+      } else {
+        budgetForm.budgetVersion = 1;
+        await addErpBudgetInfo(budgetForm);
+      }
+    }
 
     ElMessage.success('操作成功');
     handleSaveSuccess();
@@ -685,8 +695,6 @@ const processRdBudgetForm = async (status: string): Promise<budgetInfoForm> => {
     ...initializeRdCostLists()
   };
 
-  console.log(budgetForm);
-
   // 处理各项成本数据
   processRdCostData(budgetForm);
 
@@ -760,6 +768,8 @@ const initializeMarketCostLists = () => ({
 // 处理研发成本数据
 const processRdCostData = (budgetForm: budgetInfoForm) => {
   // 设备成本
+  console.log(rdMaterialCostRef.value?.allMaterialData);
+  console.log(oriRdBudgetMaterialCostList.value);
   if (assignIfChanged([], rdEquipmentCostRef.value?.equipmentData, oriRdBudgetEquipmentCostList.value).length) {
     budgetForm.erpRdBudgetEquipmentCostList = rdEquipmentCostRef.value?.equipmentData || [];
   }
@@ -883,153 +893,437 @@ const handleClose = () => {
 
 const route = useRoute();
 const budgetId = ref();
+
 // 初始化
+// 定义不同类型的主键字段映射
+const PRIMARY_KEY_MAP = {
+  // 研发预算相关
+  erpRdBudgetEquipmentCostList: 'equipmentCostId',
+  erpRdBudgetMaterialCostList: 'materialCostId',
+  erpRdBudgetTravelCostList: 'travelCostId',
+  erpRdBudgetMeetingCostList: 'meetingCostId',
+  erpRdBudgetExchangeCostList: 'exchangeCostId',
+  erpRdBudgetTechCostList: 'techCostId',
+  erpRdBudgetLaborCostList: 'laborCostId',
+  erpRdBudgetLiteratureCostList: 'literatureCostId',
+  erpRdBudgetTestingCostList: 'testingCostId',
+  erpRdBudgetOtherCostList: 'otherCostId',
+
+  // 市场预算相关
+  erpBudgetMaterialCostList: 'materialCostId',
+  erpBudgetLaborCostList: 'laborCostId',
+  erpBudgetInstallCostList: 'installCostId',
+  erpBudgetTravelCostList: 'travelCostId',
+  erpBudgetOtherCostList: 'otherCostId',
+
+  // 预算明细
+  erpBudgetDetailList: 'budgetDetailId',
+  erpBudgetInfo: 'budgetId',
+
+  // 默认主键
+  default: 'id'
+} as const;
+
+// 定义需要删除的通用字段
+const COMMON_FIELDS_TO_REMOVE = ['budgetId', 'createDept', 'createBy', 'createTime', 'updateBy', 'updateTime', 'delFlag'];
+
 onMounted(() => {
   nextTick(async () => {
-    // 获取路由参数
-    routeParams.value = route.query;
-    budgetId.value = routeParams.value.id as string | number;
-    if (budgetId.value && (routeParams.value.type === 'update' || routeParams.value.type === 'view' || routeParams.value.type === 'approval')) {
-      proxy?.$modal.loading('正在加载数据，请稍后...');
-
-      const res = await getErpBudgetInfo(budgetId.value);
-      Object.assign(searchForm, res.data);
-      console.log(res.data);
-      await getUsers();
-      if (searchForm.projectCategory === PROJECT_CATEGORY.RD || searchForm.projectCategory === PROJECT_CATEGORY.PRE_PRODUCTION) {
-        oriRdBudgetEquipmentCostList.value = JSON.parse(JSON.stringify(res.data.erpRdBudgetEquipmentCostList));
-
-        const erpRdBudgetMaterialCostList = res.data.erpRdBudgetMaterialCostList;
-        const groupedRdBudgetMaterialCostListByMaterialType = erpRdBudgetMaterialCostList.reduce((acc, item) => {
-          const materialType = item.materialType;
-          if (!acc[materialType]) {
-            acc[materialType] = [];
-          }
-          acc[materialType].push(item);
-          return acc;
-        }, {});
-
-        const rdBudgetMainMaterialCostList = groupedRdBudgetMaterialCostListByMaterialType[MATERIAL_TYPE.MAIN] || [];
-        const rdBudgetOtherMaterialCostList = groupedRdBudgetMaterialCostListByMaterialType[MATERIAL_TYPE.OTHER] || [];
-        oriRdBudgetMaterialCostList.value = JSON.parse(JSON.stringify(erpRdBudgetMaterialCostList));
-
-        oriRdBudgetTravelCostList.value = JSON.parse(JSON.stringify(res.data.erpRdBudgetTravelCostList));
-        oriRdBudgetMeetingCostList.value = JSON.parse(JSON.stringify(res.data.erpRdBudgetMeetingCostList));
-        oriRdBudgetExchangeCostList.value = JSON.parse(JSON.stringify(res.data.erpRdBudgetExchangeCostList));
-
-        const erpRdBudgetTechCostList = res.data.erpRdBudgetTechCostList;
-        const groupedRdBudgetTechCostListByTechType = erpRdBudgetTechCostList.reduce((acc, item) => {
-          const techType = item.techType;
-          if (!acc[techType]) {
-            acc[techType] = [];
-          }
-          acc[techType].push(item);
-          return acc;
-        }, {});
-
-        const rdBudgetTechConsultCostList = groupedRdBudgetTechCostListByTechType[TECH_TYPE.TECH_CONSULT] || [];
-        const rdBudgetExpertMeetingCostList = groupedRdBudgetTechCostListByTechType[TECH_TYPE.EXPERT_MEETING] || [];
-        const rdBudgetExpertCommCostList = groupedRdBudgetTechCostListByTechType[TECH_TYPE.EXPERT_COMM] || [];
-        oriRdBudgetTechConsultCostList.value = JSON.parse(JSON.stringify(rdBudgetTechConsultCostList)); //技术咨询
-        oriRdBudgetExpertMeetingCostList.value = JSON.parse(JSON.stringify(rdBudgetExpertMeetingCostList)); //专家咨询会议形式
-        oriRdBudgetExpertCommCostList.value = JSON.parse(JSON.stringify(rdBudgetExpertCommCostList)); //专家咨询通讯形式
-
-        const erpRdBudgetLaborCostList = res.data.erpRdBudgetLaborCostList;
-        const groupedRdBudgetLaborCostListByLaborType = erpRdBudgetLaborCostList.reduce((acc, item) => {
-          const laborType = item.laborType;
-          if (!acc[laborType]) {
-            acc[laborType] = [];
-          }
-          acc[laborType].push(item);
-          return acc;
-        }, {});
-
-        const rdBudgetLaborCostList = groupedRdBudgetLaborCostListByLaborType[LABOR_TYPE.LABOR] || [];
-        const rdBudgetServiceCostList = groupedRdBudgetLaborCostListByLaborType[LABOR_TYPE.SERVICE] || [];
-        oriRdBudgetLaborCostList.value = JSON.parse(JSON.stringify(rdBudgetLaborCostList)); //人工费
-        oriRdBudgetServiceCostList.value = JSON.parse(JSON.stringify(rdBudgetServiceCostList)); //劳务费
-
-        const erpRdBudgetLiteratureCostList = res.data.erpRdBudgetLiteratureCostList;
-        const groupedRdBudgetLiteratureCostListByLiteratureType = erpRdBudgetLiteratureCostList.reduce((acc, item) => {
-          const literatureType = item.literatureType;
-          if (!acc[literatureType]) {
-            acc[literatureType] = [];
-          }
-          acc[literatureType].push(item);
-          return acc;
-        }, {});
-
-        const rdBudgetLiteratureMaterialCostList = groupedRdBudgetLiteratureCostListByLiteratureType[LITERATURE_TYPE.MATERIAL] || [];
-        const rdBudgetLiteratureSoftwareCostList = groupedRdBudgetLiteratureCostListByLiteratureType[LITERATURE_TYPE.SOFTWARE] || [];
-        oriRdBudgetLiteratureMaterialCostList.value = JSON.parse(JSON.stringify(rdBudgetLiteratureMaterialCostList)); //资料费
-        oriRdBudgetLiteratureSofwareCostList.value = JSON.parse(JSON.stringify(rdBudgetLiteratureSoftwareCostList)); //专用软件购买费
-
-        const rdBudgetLiteratureRetrievalCostList = groupedRdBudgetLiteratureCostListByLiteratureType[LITERATURE_TYPE.DOCUMENT] || []; //文献检索费
-
-        oriRdBudgetTestingCostList.value = JSON.parse(JSON.stringify(res.data.erpRdBudgetTestingCostList));
-        oriRdBudgetOtherCostList.value = JSON.parse(JSON.stringify(res.data.erpRdBudgetOtherCostList));
-
-        nextTick(() => {
-          console.log(rdBudgetTableRef.value?.budgetForm);
-          Object.assign(rdBudgetTableRef.value?.rdBudgetInfoForm, res.data);
-          Object.assign(rdBudgetTableRef.value?.footerForm, res.data);
-          Object.assign(rdBudgetTableRef.value?.budgetDetailData || [], res.data.erpBudgetDetailList);
-          Object.assign(rdEquipmentCostRef.value?.equipmentData || [], res.data.erpRdBudgetEquipmentCostList);
-          Object.assign(rdMaterialCostRef.value?.materialData || [], rdBudgetMainMaterialCostList);
-          Object.assign(rdMaterialCostRef.value?.otherMaterial || [], rdBudgetOtherMaterialCostList[0]);
-          Object.assign(rdTravelMeetingExchangeRef.value?.travelList || [], res.data.erpRdBudgetTravelCostList);
-          Object.assign(rdTravelMeetingExchangeRef.value?.meetingList || [], res.data.erpRdBudgetMeetingCostList);
-          Object.assign(rdTravelMeetingExchangeRef.value?.exchangeList || [], res.data.erpRdBudgetExchangeCostList);
-          Object.assign(rdLaborServiceRef.value?.techConsultList || [], rdBudgetTechConsultCostList);
-          Object.assign(rdLaborServiceRef.value?.expertMeetingList || [], rdBudgetExpertMeetingCostList);
-          Object.assign(rdLaborServiceRef.value?.expertCommList || [], rdBudgetExpertCommCostList);
-          Object.assign(rdLaborServiceRef.value?.laborList || [], rdBudgetLaborCostList);
-          Object.assign(rdLaborServiceRef.value?.serviceList || [], rdBudgetServiceCostList);
-
-          Object.assign(rdLiteratureCostRef.value?.materialsList || [], rdBudgetLiteratureMaterialCostList);
-          Object.assign(rdLiteratureCostRef.value?.softwareList || [], rdBudgetLiteratureSoftwareCostList);
-          Object.assign(
-            rdLiteratureCostRef.value?.literatureRetrieval || [],
-            rdBudgetLiteratureRetrievalCostList.length > 0 ? rdBudgetLiteratureRetrievalCostList[0] : {}
-          );
-          Object.assign(rdTestingCostRef.value?.testData || [], res.data.erpRdBudgetTestingCostList);
-          Object.assign(rdOtherCostRef.value?.otherCostList || [], res.data.erpRdBudgetOtherCostList);
-        });
-      } else if (searchForm.projectCategory === PROJECT_CATEGORY.MARKET || searchForm.projectCategory === PROJECT_CATEGORY.MARKET_PART) {
-        // 创建初始状态的深拷贝（确保完全独立）
-        oriBudgetMaterialCostList.value = JSON.parse(JSON.stringify(res.data.erpBudgetMaterialCostList));
-        oriBudgetLaborCostList.value = JSON.parse(JSON.stringify(res.data.erpBudgetLaborCostList));
-        oriBudgetInstallCostList.value = JSON.parse(JSON.stringify(res.data.erpBudgetInstallCostList));
-        oriBudgetTravelCostList.value = JSON.parse(JSON.stringify(res.data.erpBudgetTravelCostList));
-        oriBudgetOtherCostList.value = JSON.parse(JSON.stringify(res.data.erpBudgetOtherCostList));
-
-        nextTick(() => {
-          console.log(budgetTableRef.value?.budgetForm);
-          Object.assign(budgetTableRef.value?.budgetForm, res.data);
-          Object.assign(budgetTableRef.value?.budgetDetailData, res.data.erpBudgetDetailList);
-          Object.assign(materialCostRef.value?.budgetMaterialCostList, res.data.erpBudgetMaterialCostList);
-          Object.assign(laborCostRef.value?.budgetLaborCostList, res.data.erpBudgetLaborCostList);
-          Object.assign(installationCostRef.value?.installCostList, res.data.erpBudgetInstallCostList);
-          Object.assign(travelCostRef.value?.travelCostList, res.data.erpBudgetTravelCostList);
-          Object.assign(otherCostRef.value?.otherCostList, res.data.erpBudgetOtherCostList);
-        });
-      }
-
-      proxy?.$modal.closeLoading();
-    } else {
-      searchForm.projectCategory = routeParams.value.projectCategory;
-      // 新增模式：如果已有合同编号，禁用生成按钮
-      // if (form.value.contractCode) {
-      //   isCodeGenerated.value = true;
-      // } else if (form.value.contractFlag === '1') {
-      //   // 如果有合同但没有编号，允许生成
-      //   isCodeGenerated.value = false;
-      // }
-    }
-    queryParams.value.projectCategory = searchForm.projectCategory;
+    await loadBudgetData();
   });
 });
 
+async function loadBudgetData() {
+  routeParams.value = route.query;
+  budgetId.value = routeParams.value.id as string | number;
+
+  if (!budgetId.value || !['update', 'view', 'approval'].includes(routeParams.value.type as string)) {
+    handleAddMode();
+    return;
+  }
+
+  await handleLoadMode();
+}
+
+function handleAddMode() {
+  searchForm.projectCategory = routeParams.value.projectCategory;
+  queryParams.value.projectCategory = searchForm.projectCategory;
+}
+
+async function handleLoadMode() {
+  proxy?.$modal.loading('正在加载数据，请稍后...');
+
+  try {
+    const res = await getErpBudgetInfo(budgetId.value);
+    Object.assign(searchForm, res.data);
+    if (routeParams.value.changeFlag === '1') {
+      searchForm.flowStatus = 'draft';
+    }
+    await getUsers();
+
+    if (isRdOrPreProductionCategory()) {
+      await handleRdOrPreProductionData(res.data);
+    } else if (isMarketCategory()) {
+      await handleMarketCategoryData(res.data);
+    }
+  } finally {
+    proxy?.$modal.closeLoading();
+  }
+}
+
+function isRdOrPreProductionCategory(): boolean {
+  return searchForm.projectCategory === PROJECT_CATEGORY.RD || searchForm.projectCategory === PROJECT_CATEGORY.PRE_PRODUCTION;
+}
+
+function isMarketCategory(): boolean {
+  return searchForm.projectCategory === PROJECT_CATEGORY.MARKET || searchForm.projectCategory === PROJECT_CATEGORY.MARKET_PART;
+}
+
+async function handleRdOrPreProductionData(data: any) {
+  const isChangeType = routeParams.value.changeFlag === '1';
+
+  // 只有在非变更类型时才初始化原始数据
+  if (!isChangeType) {
+    initOriginalRdData(data);
+  }
+
+  // 分组数据
+  const groupedMaterialData = groupByField(data.erpRdBudgetMaterialCostList, 'materialType');
+  const groupedTechData = groupByField(data.erpRdBudgetTechCostList, 'techType');
+  const groupedLaborData = groupByField(data.erpRdBudgetLaborCostList, 'laborType');
+  const groupedLiteratureData = groupByField(data.erpRdBudgetLiteratureCostList, 'literatureType');
+
+  // 获取并处理分类数据
+  const categorizedData = {
+    rdBudgetMainMaterialCostList: handleChangeTypeIds(groupedMaterialData[MATERIAL_TYPE.MAIN] || [], 'erpRdBudgetMaterialCostList', isChangeType),
+    rdBudgetOtherMaterialCostList: handleChangeTypeIds(groupedMaterialData[MATERIAL_TYPE.OTHER] || [], 'erpRdBudgetMaterialCostList', isChangeType),
+    rdBudgetTechConsultCostList: handleChangeTypeIds(groupedTechData[TECH_TYPE.TECH_CONSULT] || [], 'erpRdBudgetTechCostList', isChangeType),
+    rdBudgetExpertMeetingCostList: handleChangeTypeIds(groupedTechData[TECH_TYPE.EXPERT_MEETING] || [], 'erpRdBudgetTechCostList', isChangeType),
+    rdBudgetExpertCommCostList: handleChangeTypeIds(groupedTechData[TECH_TYPE.EXPERT_COMM] || [], 'erpRdBudgetTechCostList', isChangeType),
+    rdBudgetLaborCostList: handleChangeTypeIds(groupedLaborData[LABOR_TYPE.LABOR] || [], 'erpRdBudgetLaborCostList', isChangeType),
+    rdBudgetServiceCostList: handleChangeTypeIds(groupedLaborData[LABOR_TYPE.SERVICE] || [], 'erpRdBudgetLaborCostList', isChangeType),
+    rdBudgetLiteratureMaterialCostList: handleChangeTypeIds(
+      groupedLiteratureData[LITERATURE_TYPE.MATERIAL] || [],
+      'erpRdBudgetLiteratureCostList',
+      isChangeType
+    ),
+    rdBudgetLiteratureSoftwareCostList: handleChangeTypeIds(
+      groupedLiteratureData[LITERATURE_TYPE.SOFTWARE] || [],
+      'erpRdBudgetLiteratureCostList',
+      isChangeType
+    ),
+    rdBudgetLiteratureRetrievalCostList: handleChangeTypeIds(
+      groupedLiteratureData[LITERATURE_TYPE.DOCUMENT] || [],
+      'erpRdBudgetLiteratureCostList',
+      isChangeType
+    )
+  };
+
+  await nextTick();
+
+  assignRdDataToComponents(data, categorizedData, isChangeType);
+}
+
+async function handleMarketCategoryData(data: any) {
+  const isChangeType = routeParams.value.changeFlag === '1';
+
+  // 只有在非变更类型时才初始化原始数据
+  if (!isChangeType) {
+    initOriginalMarketData(data);
+  }
+
+  // 处理所有列表数据
+  const processedLists = {
+    materialCostList: handleChangeTypeIds(data.erpBudgetMaterialCostList, 'erpBudgetMaterialCostList', isChangeType),
+    laborCostList: handleChangeTypeIds(data.erpBudgetLaborCostList, 'erpBudgetLaborCostList', isChangeType),
+    installCostList: handleChangeTypeIds(data.erpBudgetInstallCostList, 'erpBudgetInstallCostList', isChangeType),
+    travelCostList: handleChangeTypeIds(data.erpBudgetTravelCostList, 'erpBudgetTravelCostList', isChangeType),
+    otherCostList: handleChangeTypeIds(data.erpBudgetOtherCostList, 'erpBudgetOtherCostList', isChangeType),
+    detailList: handleChangeTypeIds(data.erpBudgetDetailList, 'erpBudgetDetailList', isChangeType)
+  };
+
+  await nextTick();
+
+  assignMarketDataToComponents(data, processedLists, isChangeType);
+}
+
+// 根据字段名获取主键字段
+function getPrimaryKeyField(listName: string): string {
+  return PRIMARY_KEY_MAP[listName] || PRIMARY_KEY_MAP.default;
+}
+
+// 处理变更类型的数据：清空主键ID和相关字段
+function handleChangeTypeIds(data: any[], listName: string, isChangeType: boolean): any[] {
+  if (!isChangeType || !data || data.length === 0) {
+    return data || [];
+  }
+
+  const primaryKey = getPrimaryKeyField(listName);
+
+  return data.map((item) => {
+    return processFormDataForChange(item, primaryKey);
+  });
+}
+
+// 处理表单数据的变更逻辑
+function processFormDataForChange(data: any, primaryKey: string): any {
+  const processedData = { ...data };
+
+  // 删除主键字段
+  if (primaryKey in processedData) {
+    delete processedData[primaryKey];
+  }
+
+  // 删除通用字段
+  COMMON_FIELDS_TO_REMOVE.forEach((field) => {
+    if (field in processedData) {
+      delete processedData[field];
+    }
+  });
+
+  // 删除所有以"Id"结尾的字段（通常是外键）
+  // Object.keys(newItem).forEach((key) => {
+  //   if (key.endsWith('Id') && key !== primaryKey) {
+  //     delete newItem[key];
+  //   }
+  // });
+
+  return processedData;
+}
+
+function groupByField(array: any[], field: string): Record<string, any[]> {
+  if (!array) return {};
+
+  return array.reduce((acc, item) => {
+    const key = item[field];
+    if (!acc[key]) {
+      acc[key] = [];
+    }
+    acc[key].push(item);
+    return acc;
+  }, {});
+}
+
+function initOriginalRdData(data: any) {
+  // 只保存原始数据，不处理变更逻辑
+  oriRdBudgetEquipmentCostList.value = deepClone(data.erpRdBudgetEquipmentCostList);
+  oriRdBudgetMaterialCostList.value = deepClone(data.erpRdBudgetMaterialCostList);
+  oriRdBudgetTravelCostList.value = deepClone(data.erpRdBudgetTravelCostList);
+  oriRdBudgetMeetingCostList.value = deepClone(data.erpRdBudgetMeetingCostList);
+  oriRdBudgetExchangeCostList.value = deepClone(data.erpRdBudgetExchangeCostList);
+  oriRdBudgetTestingCostList.value = deepClone(data.erpRdBudgetTestingCostList);
+  oriRdBudgetOtherCostList.value = deepClone(data.erpRdBudgetOtherCostList);
+
+  // 处理分组后的数据
+  if (data.erpRdBudgetTechCostList) {
+    const groupedTechData = groupByField(data.erpRdBudgetTechCostList, 'techType');
+    oriRdBudgetTechConsultCostList.value = deepClone(groupedTechData[TECH_TYPE.TECH_CONSULT] || []);
+    oriRdBudgetExpertMeetingCostList.value = deepClone(groupedTechData[TECH_TYPE.EXPERT_MEETING] || []);
+    oriRdBudgetExpertCommCostList.value = deepClone(groupedTechData[TECH_TYPE.EXPERT_COMM] || []);
+  }
+
+  if (data.erpRdBudgetLaborCostList) {
+    const groupedLaborData = groupByField(data.erpRdBudgetLaborCostList, 'laborType');
+    oriRdBudgetLaborCostList.value = deepClone(groupedLaborData[LABOR_TYPE.LABOR] || []);
+    oriRdBudgetServiceCostList.value = deepClone(groupedLaborData[LABOR_TYPE.SERVICE] || []);
+  }
+
+  if (data.erpRdBudgetLiteratureCostList) {
+    const groupedLiteratureData = groupByField(data.erpRdBudgetLiteratureCostList, 'literatureType');
+    oriRdBudgetLiteratureMaterialCostList.value = deepClone(groupedLiteratureData[LITERATURE_TYPE.MATERIAL] || []);
+    oriRdBudgetLiteratureSofwareCostList.value = deepClone(groupedLiteratureData[LITERATURE_TYPE.SOFTWARE] || []);
+  }
+}
+
+// 修改 initOriginalMarketData 函数，移除 isChangeType 参数
+function initOriginalMarketData(data: any) {
+  // 只保存原始数据，不处理变更逻辑
+  oriBudgetMaterialCostList.value = deepClone(data.erpBudgetMaterialCostList);
+  oriBudgetLaborCostList.value = deepClone(data.erpBudgetLaborCostList);
+  oriBudgetInstallCostList.value = deepClone(data.erpBudgetInstallCostList);
+  oriBudgetTravelCostList.value = deepClone(data.erpBudgetTravelCostList);
+  oriBudgetOtherCostList.value = deepClone(data.erpBudgetOtherCostList);
+}
+
+// 研发数据赋值到组件（保持不变）
+function assignRdDataToComponents(data: any, categorizedData: any, isChangeType: boolean) {
+  if (!rdBudgetTableRef.value) return;
+
+  // 处理基础表单数据 - 如果是变更类型，清空预算ID
+  const formData = isChangeType ? processFormDataForChange(data, 'budgetId') : data;
+  Object.assign(rdBudgetTableRef.value.rdBudgetInfoForm, formData);
+  Object.assign(rdBudgetTableRef.value.footerForm, formData);
+
+  // 处理预算明细数据
+  const budgetDetailList = isChangeType
+    ? handleChangeTypeIds(data.erpBudgetDetailList, 'erpBudgetDetailList', true)
+    : deepClone(data.erpBudgetDetailList || []);
+
+  // 预算明细数据
+  if (rdBudgetTableRef.value.budgetDetailData) {
+    rdBudgetTableRef.value.budgetDetailData = budgetDetailList;
+  }
+
+  // 设备费数据 - 如果是变更类型，直接从 categorizedData 获取；否则从 ori 获取
+  const equipmentData = isChangeType
+    ? handleChangeTypeIds(data.erpRdBudgetEquipmentCostList, 'erpRdBudgetEquipmentCostList', true)
+    : oriRdBudgetEquipmentCostList.value;
+
+  if (rdEquipmentCostRef.value?.equipmentData) {
+    rdEquipmentCostRef.value.equipmentData = deepClone(equipmentData);
+  }
+
+  // 材料费数据
+  if (rdMaterialCostRef.value) {
+    // 主要材料
+    if (rdMaterialCostRef.value.materialData) {
+      rdMaterialCostRef.value.materialData = deepClone(categorizedData.rdBudgetMainMaterialCostList);
+    }
+
+    // 其他材料（单个对象）
+    if (categorizedData.rdBudgetOtherMaterialCostList.length > 0) {
+      rdMaterialCostRef.value.otherMaterial = deepClone(categorizedData.rdBudgetOtherMaterialCostList[0]);
+    }
+  }
+
+  // 差旅/会议/交流费数据
+  if (rdTravelMeetingExchangeRef.value) {
+    // 差旅费
+    const travelData = isChangeType
+      ? handleChangeTypeIds(data.erpRdBudgetTravelCostList, 'erpRdBudgetTravelCostList', true)
+      : oriRdBudgetTravelCostList.value;
+
+    if (rdTravelMeetingExchangeRef.value.travelList) {
+      rdTravelMeetingExchangeRef.value.travelList = deepClone(travelData);
+    }
+
+    // 会议费
+    const meetingData = isChangeType
+      ? handleChangeTypeIds(data.erpRdBudgetMeetingCostList, 'erpRdBudgetMeetingCostList', true)
+      : oriRdBudgetMeetingCostList.value;
+
+    if (rdTravelMeetingExchangeRef.value.meetingList) {
+      rdTravelMeetingExchangeRef.value.meetingList = deepClone(meetingData);
+    }
+
+    // 交流费
+    const exchangeData = isChangeType
+      ? handleChangeTypeIds(data.erpRdBudgetExchangeCostList, 'erpRdBudgetExchangeCostList', true)
+      : oriRdBudgetExchangeCostList.value;
+
+    if (rdTravelMeetingExchangeRef.value.exchangeList) {
+      rdTravelMeetingExchangeRef.value.exchangeList = deepClone(exchangeData);
+    }
+  }
+
+  // 劳务/服务费数据
+  if (rdLaborServiceRef.value) {
+    // 技术咨询费
+    if (rdLaborServiceRef.value.techConsultList) {
+      rdLaborServiceRef.value.techConsultList = deepClone(categorizedData.rdBudgetTechConsultCostList);
+    }
+
+    // 专家咨询会议形式
+    if (rdLaborServiceRef.value.expertMeetingList) {
+      rdLaborServiceRef.value.expertMeetingList = deepClone(categorizedData.rdBudgetExpertMeetingCostList);
+    }
+
+    // 专家咨询通讯形式
+    if (rdLaborServiceRef.value.expertCommList) {
+      rdLaborServiceRef.value.expertCommList = deepClone(categorizedData.rdBudgetExpertCommCostList);
+    }
+
+    // 人工费
+    if (rdLaborServiceRef.value.laborList) {
+      rdLaborServiceRef.value.laborList = deepClone(categorizedData.rdBudgetLaborCostList);
+    }
+
+    // 劳务费
+    if (rdLaborServiceRef.value.serviceList) {
+      rdLaborServiceRef.value.serviceList = deepClone(categorizedData.rdBudgetServiceCostList);
+    }
+  }
+
+  // 资料/软件/文献检索费数据
+  if (rdLiteratureCostRef.value) {
+    // 资料费
+    if (rdLiteratureCostRef.value.materialsList) {
+      rdLiteratureCostRef.value.materialsList = deepClone(categorizedData.rdBudgetLiteratureMaterialCostList);
+    }
+
+    // 专用软件购买费
+    if (rdLiteratureCostRef.value.softwareList) {
+      rdLiteratureCostRef.value.softwareList = deepClone(categorizedData.rdBudgetLiteratureSoftwareCostList);
+    }
+
+    // 文献检索费（单个对象）
+    if (rdLiteratureCostRef.value.literatureRetrieval && categorizedData.rdBudgetLiteratureRetrievalCostList.length > 0) {
+      rdLiteratureCostRef.value.literatureRetrieval = deepClone(categorizedData.rdBudgetLiteratureRetrievalCostList[0]);
+    }
+  }
+
+  // 测试/化验/加工费数据
+  const testingData = isChangeType
+    ? handleChangeTypeIds(data.erpRdBudgetTestingCostList, 'erpRdBudgetTestingCostList', true)
+    : oriRdBudgetTestingCostList.value;
+
+  if (rdTestingCostRef.value?.testData) {
+    rdTestingCostRef.value.testData = deepClone(testingData);
+  }
+
+  // 其他费用数据
+  const otherData = isChangeType
+    ? handleChangeTypeIds(data.erpRdBudgetOtherCostList, 'erpRdBudgetOtherCostList', true)
+    : oriRdBudgetOtherCostList.value;
+
+  if (rdOtherCostRef.value?.otherCostList) {
+    rdOtherCostRef.value.otherCostList = deepClone(otherData);
+  }
+}
+
+// 修改 assignMarketDataToComponents 函数，增加 isChangeType 参数
+function assignMarketDataToComponents(data: any, processedLists: any, isChangeType: boolean) {
+  if (!budgetTableRef.value) return;
+
+  // 基础表单数据
+  const formData = isChangeType ? processFormDataForChange(data, 'budgetId') : data;
+  Object.assign(budgetTableRef.value.budgetForm, formData);
+
+  // 预算明细数据
+  if (budgetTableRef.value.budgetDetailData) {
+    budgetTableRef.value.budgetDetailData = deepClone(processedLists.detailList);
+  }
+
+  // 材料费数据
+  if (materialCostRef.value?.budgetMaterialCostList) {
+    materialCostRef.value.budgetMaterialCostList = deepClone(processedLists.materialCostList);
+  }
+
+  // 人工费数据
+  if (laborCostRef.value?.budgetLaborCostList) {
+    laborCostRef.value.budgetLaborCostList = deepClone(processedLists.laborCostList);
+  }
+
+  // 安装费数据
+  if (installationCostRef.value?.installCostList) {
+    installationCostRef.value.installCostList = deepClone(processedLists.installCostList);
+  }
+
+  // 差旅费数据
+  if (travelCostRef.value?.travelCostList) {
+    travelCostRef.value.travelCostList = deepClone(processedLists.travelCostList);
+  }
+
+  // 其他费用数据
+  if (otherCostRef.value?.otherCostList) {
+    otherCostRef.value.otherCostList = deepClone(processedLists.otherCostList);
+  }
+}
+
+function deepClone<T>(obj: T): T {
+  return cloneDeep(obj);
+}
+
 import SubmitVerify from '@/components/Process/submitVerify.vue';
 import ApprovalRecord from '@/components/Process/approvalRecord.vue';
 import ApprovalButton from '@/components/Process/approvalButton.vue';
diff --git a/src/views/oa/erp/budgetInfo/index.vue b/src/views/oa/erp/budgetInfo/index.vue
index c48a620..a4f9f19 100644
--- a/src/views/oa/erp/budgetInfo/index.vue
+++ b/src/views/oa/erp/budgetInfo/index.vue
@@ -73,6 +73,7 @@
         </el-table-column>
         <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"/>
         <el-table-column label="项目经理" align="center" prop="managerName" v-if="columns[8].visible" width="100px;"/>
         <el-table-column label="产品经理" align="center" prop="productManagerName" v-if="columns[10].visible" />
         <el-table-column label="合同额(万元)" align="center" prop="contractAmount" v-if="columns[14].visible" />
@@ -80,7 +81,7 @@
         <el-table-column label="预算成本(万元)" align="center" prop="budgetCost" v-if="columns[16].visible" />
         <el-table-column label="预算毛利率" align="center" prop="budgetRate" v-if="columns[17].visible">
           <template #default="scope">
-            {{ formatRate(scope.row.reduceBudgetRate) }}
+            {{ formatRate(scope.row.budgetRate) }}
           </template>
         </el-table-column>
         <el-table-column label="降成本后预算成本(万元)" align="center" prop="reduceBudgetCost" v-if="columns[18].visible" />
@@ -110,14 +111,14 @@
                 type="primary"
                 icon="Edit"
                 size="small"
-                @click="handleUpdate(scope.row,'update')"
+                @click="handleUpdate(scope.row, 'update')"
                 v-if="scope.row.budgetStatus === BUDGET_STATUS.DRAFT"
                 v-hasPermi="['oa:erp/budgetInfo:edit']"
                 >修改&nbsp;</el-button>
             </el-tooltip>
             <el-tooltip content="导出" placement="top">
               <el-button
-                type="primary"
+                type="success"
                 icon="Download"
                 size="small"
                 @click="handleExport(scope.row)"
@@ -129,8 +130,8 @@
                 size="small"
                 type="warning"
                 icon="Delete"
-                @click="handleUpdate(scope.row,'change')"
-                v-if="scope.row.budgetStatus === BUDGET_STATUS.DRAFT"
+                @click="handleChange(scope.row)"
+                v-if="scope.row.budgetStatus === BUDGET_STATUS.AVAILABLE"
                 v-hasPermi="['oa:erp/budgetInfo:change']"
               >变更&nbsp;</el-button>
             </el-tooltip>
@@ -154,7 +155,7 @@
 </template>
 
 <script setup name="budgetInfo" lang="ts">
-import { listErpBudgetInfo, getErpBudgetInfo, delErpBudgetInfo, addErpBudgetInfo, updateErpBudgetInfo } from '@/api/oa/erp/budgetInfo';
+import { listErpBudgetInfo, delErpBudgetInfo } from '@/api/oa/erp/budgetInfo';
 import { budgetInfoVO, budgetInfoQuery, budgetInfoForm } from '@/api/oa/erp/budgetInfo/types';
 import router from '@/router';
 import { getUserList } from '@/api/system/user';
@@ -220,7 +221,8 @@ const columns = ref<FieldOption[]>([
   { key: 30, label: `创建人`, visible: true },
   { key: 31, label: `创建时间`, visible: true },
   { key: 32, label: `更新人`, visible: true },
-  { key: 33, label: `更新时间`, visible: true }
+  { key: 33, label: `更新时间`, visible: true },
+  { key: 34, label: `版本`, visible: true }
 ]);
 
 const initFormData: budgetInfoForm = {
@@ -364,7 +366,7 @@ const handleSelectionChange = (selection: budgetInfoVO[]) => {
 /** 新增市场项目预算按钮操作 */
 const handleAdd = () => {
   router.push({
-    path: '/budget/budget-add/index',
+    path: '/budget/budgetInfo/edit',
     query: {
       type: 'add',
       projectCategory: PROJECT_CATEGORY.MARKET,
@@ -381,7 +383,7 @@ const handleAdd = () => {
 /** 新增研发项目按钮操作 */
 const handleAddRd = () => {
   router.push({
-    path: '/budget/budget-add/index',
+    path: '/budget/budgetInfo/edit',
     query: {
       type: 'add',
       pageNum: queryParams.value.pageNum,
@@ -390,13 +392,14 @@ const handleAddRd = () => {
   });
 };
 
-/** 查询、修改和变更按钮操作 */
-const handleUpdate = async (row?: budgetInfoVO, type?: string) => {
+/** 查询、修改按钮操作 */
+const handleUpdate = async (row?: budgetInfoVO, type?: string, changeFlag?: string) => {
   router.push({
-    path: '/budget/budget-add/index',
+    path: '/budget/budgetInfo/edit',
     query: {
       type: type,
       id: row.budgetId,
+      changeFlag: changeFlag,
       pageNum: queryParams.value.pageNum,
       projectCategory: row.projectCategory
     }
@@ -406,13 +409,14 @@ const handleUpdate = async (row?: budgetInfoVO, type?: string) => {
   // proxy.$tab.openPage('/oa/erp/budgetInfo/edit', '项目预算申请', params);
 };
 
-/** 修改按钮操作 */
-const handleView = async (row?: budgetInfoVO) => {
+/** 变更按钮操作 */
+const handleChange = async (row?: budgetInfoVO) => {
   router.push({
-    path: '/budget/budget-add/index',
+    path: '/budget/budgetInfo/change',
     query: {
-      type: 'view',
+      type: 'update',
       id: row.budgetId,
+      changeFlag: '1',
       pageNum: queryParams.value.pageNum,
       projectCategory: row.projectCategory
     }
diff --git a/src/views/oa/erp/budgetInfo/rd/BudgetTable.vue b/src/views/oa/erp/budgetInfo/rd/BudgetTable.vue
index ab8ab22..ca10cbe 100644
--- a/src/views/oa/erp/budgetInfo/rd/BudgetTable.vue
+++ b/src/views/oa/erp/budgetInfo/rd/BudgetTable.vue
@@ -253,7 +253,7 @@ const getSummaries = ({ columns, data }: any) => {
         }
       }, 0);
       sums[index] = formatNumber(sums[index]);
-      footerForm.budgetCost = sums[index];
+      rdBudgetInfoForm.budgetCost = sums[index];
     } else {
       sums[index] = '';
     }
diff --git a/src/views/oa/erp/budgetInfo/rd/MaterialCost.vue b/src/views/oa/erp/budgetInfo/rd/MaterialCost.vue
index 5b7f4e0..72a61a6 100644
--- a/src/views/oa/erp/budgetInfo/rd/MaterialCost.vue
+++ b/src/views/oa/erp/budgetInfo/rd/MaterialCost.vue
@@ -141,7 +141,9 @@ const materialData = ref<rdBudgetMaterialCostVO[]>([]);
 const toDeletedMaterialCostIdList = ref([]);
 
 // 其他材料费
-const otherMaterial = reactive({
+const otherMaterialData = ref<rdBudgetMaterialCostVO>();
+
+const defaultOtherMaterial = ref({
   sortOrder: 1,
   materialName: '其他材料费',
   materialType: MATERIAL_TYPE.OTHER,
@@ -150,10 +152,12 @@ const otherMaterial = reactive({
   amount: undefined,
   price: 0
 });
+// 响应式数据
+const otherMaterial = ref(defaultOtherMaterial);
 
 // 合并所有材料数据（主要材料 + 其他材料）
 const allMaterialData = computed(() => {
-  return [...materialData.value, otherMaterial];
+  return [...materialData.value, otherMaterial.value];
 });
 
 const unitOptions = ref<UnitInfoVO[]>([]);
@@ -192,6 +196,19 @@ const checkSelectable = (row: rdBudgetMaterialCostVO, index: number) => {
   return row.materialType === MATERIAL_TYPE.MAIN;
 };
 
+// 监听 otherMaterialData 的变化
+watch(
+  otherMaterialData,
+  (newVal) => {
+    if (newVal) {
+      otherMaterial.value = newVal;
+    } else {
+      otherMaterial.value = defaultOtherMaterial.value;
+    }
+  },
+  { immediate: true }
+); // immediate: true 立即执行一次
+
 // 监听材料数据变化，更新总合计
 watch(
   () => [materialData, otherMaterial],
@@ -221,7 +238,7 @@ const addSpecifiedRows = async () => {
       price: 0
     });
   }
-  otherMaterial.sortOrder = currentSortOrder + 1 + addRowCount.value;
+  otherMaterial.value.sortOrder = currentSortOrder + 1 + addRowCount.value;
   // 等待DOM更新后滚动到底部
   await nextTick();
   scrollToBottom();
@@ -251,7 +268,7 @@ const handleDelete = (index: number, row: rdBudgetMaterialCostVO) => {
   if (row.materialCostId) {
     toDeletedMaterialCostIdList.value.push(row.materialCostId);
   }
-  otherMaterial.sortOrder = otherMaterial.sortOrder - 1;
+  otherMaterial.value.sortOrder = otherMaterial.value.sortOrder - 1;
   calculateTotal();
 };
 
@@ -272,7 +289,7 @@ const handleBatchDelete = () => {
   materialData.value.forEach((item, index) => {
     item.sortOrder = index + 1;
   });
-  otherMaterial.sortOrder = otherMaterial.sortOrder - selectedRows.value.length;
+  otherMaterial.value.sortOrder = otherMaterial.value.sortOrder - selectedRows.value.length;
   calculateTotal();
   selectedRows.value = [];
 };
@@ -285,7 +302,7 @@ const calculateAmount = () => {
   });
 
   // 计算其他材料金额
-  otherMaterial.price = (otherMaterial.amount || 0) * (otherMaterial.unitPrice || 0);
+  otherMaterial.value.price = (otherMaterial.value.amount || 0) * (otherMaterial.value.unitPrice || 0);
 
   // 计算总金额
   calculateTotal();
@@ -294,7 +311,7 @@ const calculateAmount = () => {
 // 计算总金额和总数量
 const calculateTotal = () => {
   const mainAmount = parseFloat(((Number(mainMaterialTotalAmount.value) || 0) / 10000).toFixed(2));
-  const otherAmount = parseFloat(((Number(otherMaterial.price) || 0) / 10000).toFixed(2));
+  const otherAmount = parseFloat(((Number(otherMaterial.value.price) || 0) / 10000).toFixed(2));
   totalAmount.value = (mainAmount + otherAmount).toFixed(2);
 };
 
@@ -328,8 +345,8 @@ const resetData = () => {
   // 重置其他材料费
   // otherMaterial.unit = '';
   // otherMaterial.quantity = 0;
-  otherMaterial.unitPrice = 0;
-  otherMaterial.amount = 0;
+  // otherMaterial.unitPrice = 0;
+  // otherMaterial.amount = 0;
 };
 
 // 获取表单数据
@@ -346,6 +363,7 @@ const getFormData = () => {
 defineExpose({
   materialData,
   otherMaterial,
+  otherMaterialData,
   allMaterialData,
   toDeletedMaterialCostIdList,
   getTotalAmount

From 64a778c9547bb0ed4c509ad6e19e393c8e6e0f12 Mon Sep 17 00:00:00 2001
From: xs <xins@mesnac.com>
Date: Thu, 4 Dec 2025 14:01:23 +0800
Subject: [PATCH 6/6] =?UTF-8?q?1.0.47=EF=BC=9A=20=E5=89=8D=E7=AB=AF?=
 =?UTF-8?q?=EF=BC=9A=20=20=20=20fix(budget):=E6=96=B0=E5=A2=9Erouter?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/oa/erp/budgetInfo/index.ts | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/api/oa/erp/budgetInfo/index.ts b/src/api/oa/erp/budgetInfo/index.ts
index 102ec18..f603184 100644
--- a/src/api/oa/erp/budgetInfo/index.ts
+++ b/src/api/oa/erp/budgetInfo/index.ts
@@ -57,6 +57,18 @@ export const updateErpBudgetInfo = (data: budgetInfoForm) => {
   });
 };
 
+/**
+ * 变更项目预算
+ * @param data
+ */
+export const changeErpBudgetInfo = (data: budgetInfoForm) => {
+  return request({
+    url: '/oa/erp/budgetInfo/change',
+    method: 'post',
+    data: data
+  });
+};
+
 /**
  * 删除项目预算
  * @param budgetId