refactor(oa): 移除编号生成功能并优化表单提交逻辑

- 移除出差申请、售后申请和工时填报页面的编号生成按钮和相关逻辑

src/views/oa/crm/businessTripApply/edit.vue

@@ -30,11 +30,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="申请单号" prop="applyCode">
-              <el-input v-model="form.applyCode" placeholder="点击生成申请单号" :disabled="isFormDisabled">
+              <el-input v-model="form.applyCode" placeholder="自动生成" disabled />
-                <template #append>
-                  <el-button type="primary" @click="generateApplyCode" :disabled="isCodeGenerated || isFormDisabled">生成编号</el-button>
-                </template>
-              </el-input>
             </el-form-item>
           </el-col>
 
@@ -286,8 +282,6 @@ const projectSelectRef = ref<InstanceType<typeof ProjectSelect>>();
 
 const userList = ref<any[]>([]); // 用户列表
 
-const isCodeGenerated = ref(false);
-
 // 流程相关数据
 const submitFormData = ref<StartProcessBo>({
   businessId: '',
@@ -329,7 +323,7 @@ const data = reactive({
   form: { ...initFormData },
   rules: {
     tripType: [{ required: true, message: '出差类型不能为空', trigger: 'change' }],
-    applyCode: [{ required: true, message: '申请单号不能为空', trigger: 'blur' }],
+    // applyCode: [{ required: true, message: '申请单号不能为空', trigger: 'blur' }],
     tripLocation: [{ required: true, message: '出差地点不能为空', trigger: 'blur' }],
     startTime: [{ required: true, message: '开始时间不能为空', trigger: 'change' }],
     endTime: [{ required: true, message: '结束时间不能为空', trigger: 'change' }],
@@ -393,30 +387,10 @@ onMounted(async () => {
     if (id && (routeParams.value.type === 'update' || routeParams.value.type === 'view' || routeParams.value.type === 'approval')) {
       const res = await getBusinessTripApply(id);
       Object.assign(form.value, res.data);
-      if (form.value.applyCode) {
-        isCodeGenerated.value = true;
-      }
     }
   });
 });
 
-// 生成申请编号
-const generateApplyCode = async () => {
-  if (isCodeGenerated.value) return;
-  try {
-    const params = { codeRuleCode: CodeRuleEnum.BUSINESS_TRIP } as any;
-    const res = await getRuleGenerateCode(params);
-    if (res.code === 200) {
-      form.value.applyCode = res.msg;
-      isCodeGenerated.value = true;
-      proxy?.$modal.msgSuccess('编号生成成功');
-    }
-  } catch (e) {
-    console.error(e);
-    proxy?.$modal.msgError('编号生成失败');
-  }
-};
-
 // 计算时长
 const calculateDuration = () => {
   if (form.value.startTime && form.value.endTime) {
@@ -467,8 +441,18 @@ const handleApproverSelectChange = (val: any) => {
 
 // 提交表单 (包含暂存和提交审批)
 const submitForm = (status: string, mode: boolean) => {
+  if (status === 'draft') {
+    executeSubmit(status, mode);
+    return;
+  }
   businessTripApplyFormRef.value?.validate(async (valid) => {
     if (valid) {
+      executeSubmit(status, mode);
+    }
+  });
+};
+
+const executeSubmit = async (status: string, mode: boolean) => {
   buttonLoading.value = true;
   try {
     if (status !== 'draft') {
@@ -506,8 +490,6 @@ const submitForm = (status: string, mode: boolean) => {
   } finally {
     buttonLoading.value = false;
   }
-    }
-  });
 };
 
 // 审批记录

src/views/oa/erp/afterSales/edit.vue

@@ -35,17 +35,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="售后编号" prop="afterSalesCode">
-              <el-input v-model="form.afterSalesCode" placeholder="自动生成售后编号">
+              <el-input v-model="form.afterSalesCode" placeholder="自动生成" disabled />
-                <template #append>
-                  <el-button
-                    type="primary"
-                    @click="generateAfterSalesCode"
-                    :disabled="isCodeGenerated || routeParams.type === 'view' || routeParams.type === 'approval'"
-                  >
-                    生成编号
-                  </el-button>
-                </template>
-              </el-input>
             </el-form-item>
           </el-col>
 
@@ -425,7 +415,8 @@ import { getAfterSales, addAfterSales, updateAfterSales, submitAfterSalesAndFlow
 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 { getContractInfo } from '@/api/oa/erp/contractInfo';
+import { getCustomerInfo } from '@/api/oa/crm/customerInfo';
 import { listCustomerContact } from '@/api/oa/crm/customerContact';
 import { listUnitInfo } from '@/api/oa/base/unitInfo';
 import { getRuleGenerateCode } from '@/api/system/codeRule';
@@ -509,12 +500,12 @@ const data = reactive({
   },
   rules: {
     afterSalesSubject: [{ required: true, message: '售后主题不能为空', trigger: 'blur' }],
-    afterSalesCode: [{ 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' }],
+    // stakeholderId: [{ required: true, message: '客户干系人不能为空', trigger: 'change' }],
     handlerId: [{ required: true, message: '售后处理人不能为空', trigger: 'change' }]
   }
 });
@@ -698,23 +689,38 @@ function loadContractOptions(projectId: any) {
 }
 
 // 合同变更联动 -> 客户 -> 联系人
-function handleContractChange(val: any) {
+async function handleContractChange(val: any) {
   form.value.customerName = undefined;
   form.value.customerId = undefined;
   contactOptions.value = [];
 
   if (!val) return;
 
-  listContractInfo({ contractId: val, pageNum: 1, pageSize: 10 } as any).then((res: any) => {
+  try {
-    if (res.rows && res.rows.length > 0) {
+    // 1. 获取合同详情
-      const contract = res.rows[0];
+    const resContract = await getContractInfo(val);
+    if (resContract.data) {
+      const contract = resContract.data;
       form.value.customerId = contract.oneCustomerId;
+
+      // 2. 如果合同详情中有客户名则直接用，否则单独查询客户详情
+      if (contract.oneCustomerName) {
         form.value.customerName = contract.oneCustomerName;
-      if (contract.oneCustomerId) {
+      } else if (contract.oneCustomerId) {
-        loadContactOptions(contract.oneCustomerId);
+        const resCustomer = await getCustomerInfo(contract.oneCustomerId);
+        if (resCustomer.data) {
+          form.value.customerName = resCustomer.data.customerName;
         }
       }
-  });
+
+      // 3. 加载联系人
+      if (form.value.customerId) {
+        loadContactOptions(form.value.customerId);
+      }
+    }
+  } catch (error) {
+    console.error('加载合同关联信息失败:', error);
+  }
 }
 
 // 加载客户联系人
@@ -900,8 +906,18 @@ const getMaterialSummaries = (param: any) => {
 
 /** 提交按钮 */
 const submitForm = (status: string, mode: boolean) => {
+  if (status === 'draft') {
+    executeSubmit(status, mode);
+    return;
+  }
   afterSalesFormRef.value.validate(async (valid: boolean) => {
     if (valid) {
+      executeSubmit(status, mode);
+    }
+  });
+};
+
+const executeSubmit = async (status: string, mode: boolean) => {
   buttonLoading.value = true;
   try {
     const submitData: any = { ...form.value };
@@ -952,8 +968,6 @@ const submitForm = (status: string, mode: boolean) => {
   } finally {
     buttonLoading.value = false;
   }
-    }
-  });
 };
 
 // 审批记录初始化

src/views/oa/erp/timesheetInfo/edit.vue

@@ -30,17 +30,7 @@
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="工时单号" prop="timesheetCode">
-              <el-input v-model="form.timesheetCode" placeholder="自动生成工时单号" disabled>
+              <el-input v-model="form.timesheetCode" placeholder="自动生成" disabled />
-                <template #append>
-                  <el-button
-                    type="primary"
-                    @click="generateCode"
-                    :disabled="isCodeGenerated || routeParams.type === 'view' || routeParams.type === 'approval'"
-                  >
-                    生成编号
-                  </el-button>
-                </template>
-              </el-input>
             </el-form-item>
           </el-col>
 
@@ -271,7 +261,6 @@ const userStore = useUserStore();
 const routeParams = ref<any>({});
 const buttonLoading = ref(false);
 const timesheetFormRef = ref<ElFormInstance>();
-const isCodeGenerated = ref(false);
 
 const submitVerifyRef = ref<InstanceType<typeof SubmitVerify>>();
 const approvalRecordRef = ref<InstanceType<typeof ApprovalRecord>>();
@@ -304,7 +293,7 @@ const data = reactive({
     timesheetProjectList: [] as any[]
   },
   rules: {
-    timesheetCode: [{ required: true, message: '编号不能为空', trigger: 'blur' }],
+    // timesheetCode: [{ required: true, message: '编号不能为空', trigger: 'blur' }],
     startTime: [{ required: true, message: '请选择起始日期', trigger: 'change' }],
     endTime: [{ required: true, message: '请选择结束日期', trigger: 'change' }]
   }
@@ -328,7 +317,6 @@ onMounted(async () => {
       form.value = res.data;
       if (!form.value.timesheetDeptList) form.value.timesheetDeptList = [];
       if (!form.value.timesheetProjectList) form.value.timesheetProjectList = [];
-      if (form.value.timesheetCode) isCodeGenerated.value = true;
     } else {
       setWeekDates();
       form.value.timesheetDeptList = [];
@@ -449,20 +437,6 @@ const getDeptName = (deptId: any) => {
 };
 
 /** 生成编号 */
-const generateCode = async () => {
-  if (isCodeGenerated.value) return;
-  try {
-    const res = await getRuleGenerateCode({ codeRuleCode: CodeRuleEnum.TIMESHEET } as any);
-    if (res.code === 200) {
-      form.value.timesheetCode = res.msg;
-      isCodeGenerated.value = true;
-      proxy?.$modal.msgSuccess('生成成功');
-    }
-  } catch (error) {
-    console.error(error);
-  }
-};
-
 /** 自动计算工时 */
 const calculateHours = () => {
   const deptList = form.value.timesheetDeptList || [];
@@ -525,8 +499,18 @@ const getSummary = (param: any) => {
 
 /** 提交按钮 */
 const submitForm = (status: string) => {
+  if (status === 'draft') {
+    executeSubmit(status);
+    return;
+  }
   timesheetFormRef.value?.validate(async (valid: boolean) => {
     if (valid) {
+      executeSubmit(status);
+    }
+  });
+};
+
+const executeSubmit = async (status: string) => {
   buttonLoading.value = true;
   try {
     const submitData: any = { ...form.value };
@@ -618,8 +602,6 @@ const submitForm = (status: string) => {
   } finally {
     buttonLoading.value = false;
   }
-    }
-  });
 };
 
 const handleApprovalRecord = () => {

src/views/oa/erp/timesheetInfo/index.vue

@@ -181,7 +181,7 @@ const data = reactive<PageData<TimesheetInfoForm, TimesheetInfoQuery>>({
   },
   rules: {
     timesheetId: [{ required: true, message: '工时填报ID不能为空', trigger: 'blur' }],
-    timesheetCode: [{ required: true, message: '工时填报编号不能为空', trigger: 'blur' }],
+    // timesheetCode: [{ required: true, message: '工时填报编号不能为空', trigger: 'blur' }],
     userId: [{ required: true, message: '人员ID不能为空', trigger: 'blur' }],
     startTime: [{ required: true, message: '起始时间不能为空', trigger: 'blur' }],
     endTime: [{ required: true, message: '结束时间不能为空', trigger: 'blur' }]