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" />