1.1.13 新建研发项目可以拆分成子项目页面逻辑

src/api/oa/erp/projectInfo/types.ts

@@ -4,6 +4,16 @@ export interface ProjectInfoVO {
    */
   projectId: string | number;
 
+  /**
+   * 父项目ID（子项目指向研发主项目）
+   */
+  parentProjectId?: string | number;
+
+  /**
+   * 是否含有子项目（0否 1是，仅研发主项目使用；子项目行一般为0）
+   */
+  subProjectFlag?: string;
+
   /**
    * 有无合同（1有 2无）
    */
@@ -204,6 +214,16 @@ export interface ProjectInfoForm extends BaseEntity {
    */
   projectId?: string | number;
 
+  /**
+   * 父项目ID（子项目必填，主项目为空）
+   */
+  parentProjectId?: string | number;
+
+  /**
+   * 是否含有子项目（0否 1是，主项目；子项目存0）
+   */
+  subProjectFlag?: string;
+
   /**
    * 有无合同（1有 2无）
    */
@@ -576,4 +596,14 @@ export interface ProjectInfoQuery extends PageQuery {
    * 创建人用户ID
    */
   createBy?: string | number;
+
+  /**
+   * 父项目ID
+   */
+  parentProjectId?: string | number;
+
+  /**
+   * 是否研发子项目（0否 1是）
+   */
+  subProjectFlag?: string;
 }

src/views/oa/erp/projectInfo/devEdit.vue

@@ -17,18 +17,11 @@
     <el-card shadow="never" style="margin-top: 0">
       <el-form ref="projectInfoFormRef" :model="form" :rules="rules" label-width="120px">
         <el-row :gutter="20">
-          <!--          <el-col :span="12">-->
-          <!--            <el-form-item label="有无合同" prop="contractFlag">-->
-          <!--              <el-radio-group v-model="form.contractFlag">-->
-          <!--                <el-radio v-for="dict in contract_flag" :key="dict.value" :value="dict.value">{{ dict.label }} </el-radio>-->
-          <!--              </el-radio-group>-->
-          <!--            </el-form-item>-->
-          <!--          </el-col>-->
           <el-col :span="12">
             <el-form-item label="项目编号" prop="projectCode">
               <el-input v-model="form.projectCode" placeholder="请输入项目编号" :disabled="isFormDisabled">
                 <template #append>
-                  <el-button type="primary" @click="generateProjectCode" :disabled="isCodeGenerated">生成项目编号 </el-button>
+                  <el-button type="primary" @click="generateProjectCode" :disabled="isCodeGenerated || codeLockedBySubRows">生成项目编号</el-button>
                 </template>
               </el-input>
             </el-form-item>
@@ -38,13 +31,6 @@
               <el-input v-model="form.projectName" placeholder="请输入项目名称" :disabled="isFormDisabled" />
             </el-form-item>
           </el-col>
-          <!--          <el-col :span="12">-->
-          <!--            <el-form-item label="业务方向" prop="businessDirection">-->
-          <!--              <el-select v-model="form.businessDirection" placeholder="请选择业务方向">-->
-          <!--                <el-option v-for="dict in business_direction" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>-->
-          <!--              </el-select>-->
-          <!--            </el-form-item>-->
-          <!--          </el-col>-->
           <el-col :span="12">
             <el-form-item label="项目类别" prop="projectCategory">
               <el-select v-model="form.projectCategory" placeholder="请选择项目类别" :disabled="true">
@@ -52,29 +38,17 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <!--          <el-col :span="12">-->
+          <el-col :span="12" v-if="showHasSubProjectSwitch">
-          <!--            <el-form-item label="备件标识" prop="spareFlag">-->
+            <el-form-item label="含有子项目" prop="subProjectFlag">
-          <!--              <el-radio-group v-model="form.spareFlag" disabled>-->
+              <el-switch
-          <!--                <el-radio v-for="dict in spare_flag" :key="dict.value" :value="dict.value">{{ dict.label }}</el-radio>-->
+                v-model="form.subProjectFlag"
-          <!--              </el-radio-group>-->
+                active-value="1"
-          <!--            </el-form-item>-->
+                inactive-value="0"
-          <!--          </el-col>-->
+                :disabled="isFormDisabled"
-          <!--          <el-col :span="12">-->
+                @change="onHasSubProjectChange"
-          <!--            <el-form-item label="项目类型" prop="projectTypeId">-->
+              />
-          <!--              <el-cascader-->
+            </el-form-item>
-          <!--                v-model="form.projectTypeId"-->
+          </el-col>
-          <!--                :options="projectTypeOptions"-->
-          <!--                :props="{ value: 'projectTypeId', label: 'typeName', children: 'children', emitPath: false }"-->
-          <!--                placeholder="请选择项目类型"-->
-          <!--                style="width: 100%"-->
-          <!--              />-->
-          <!--            </el-form-item>-->
-          <!--          </el-col>-->
-          <!--          <el-col :span="12">-->
-          <!--            <el-form-item label="付款方式" prop="paymentMethod">-->
-          <!--              <el-input v-model="form.paymentMethod" placeholder="请输入付款方式（如：3-3-3-1）" />-->
-          <!--            </el-form-item>-->
-          <!--          </el-col>-->
           <el-col :span="12">
             <el-form-item label="部门" prop="deptId">
               <el-select v-model="form.deptId" placeholder="请选择部门" :disabled="isFormDisabled">
@@ -96,13 +70,6 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <!--          <el-col :span="12">-->
-          <!--            <el-form-item label="分管副总" prop="deputyId">-->
-          <!--              <el-select v-model="form.deputyId" 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-col :span="12">
             <el-form-item label="抄送人员" prop="peopleId">
               <el-select v-model="form.peopleId" placeholder="请选择抄送人员" clearable filterable multiple :disabled="isFormDisabled">
@@ -110,20 +77,6 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <!--          <el-col :span="12">-->
-          <!--            <el-form-item label="金额" prop="amount">-->
-          <!--              <el-input v-model="form.amount" placeholder="请输入金额">-->
-          <!--                <template #append>元</template>-->
-          <!--              </el-input>-->
-          <!--            </el-form-item>-->
-          <!--          </el-col>-->
-          <!--          <el-col :span="12">-->
-          <!--            <el-form-item label="项目状态" prop="projectStatus">-->
-          <!--              <el-radio-group v-model="form.projectStatus" disabled>-->
-          <!--                <el-radio v-for="dict in project_status" :key="dict.value" :value="dict.value">{{ dict.label }} </el-radio>-->
-          <!--              </el-radio-group>-->
-          <!--            </el-form-item>-->
-          <!--          </el-col>-->
           <el-col :span="24">
             <el-form-item label="附件" prop="ossId">
               <FileUpload
@@ -145,115 +98,43 @@
       </el-form>
     </el-card>
 
-    <!-- 项目关联合同 -->
+    <el-card v-if="showSubProjectSection" shadow="never" style="margin-top: 0">
-    <el-card shadow="never" style="margin-top: 0" v-if="false">
       <template #header>
-        <el-row :gutter="10">
+        <el-row :gutter="10" align="middle">
-          <el-col :span="1.5">
+          <el-col :span="12">
-            <span class="card-title">项目关联合同</span>
+            <span class="sub-project-card-title">子项目</span>
+            <span class="sub-project-card-tip">（子项目编号自动生成，子项目名称必填）</span>
           </el-col>
-          <el-col :span="1.5">
+          <el-col :span="12" style="text-align: right">
-            <el-button type="primary" plain icon="Plus" @click="handleAddContract" size="small" :disabled="isFormDisabled">新增关联 </el-button>
+            <el-button
+              type="primary"
+              plain
+              icon="Plus"
+              size="small"
+              :disabled="isFormDisabled || !form.projectCode"
+              @click="addSubProjectRow"
+            >
+              添加子项目
+            </el-button>
           </el-col>
         </el-row>
       </template>
-
+      <el-table border :data="subProjectRows" empty-text="请点击「添加子项目」">
-      <el-table v-loading="contractLoading" border :data="projectContractsList">
         <el-table-column type="index" label="序号" width="60" align="center" />
-        <el-table-column label="合同编号" align="center" prop="contractCode" min-width="120" />
+        <el-table-column label="子项目编号" prop="projectCode" min-width="140" align="center" />
-        <el-table-column label="合同名称" align="center" prop="contractName" min-width="180" />
+        <el-table-column label="子项目名称" min-width="200" align="center">
-        <el-table-column label="合同总价" align="center" prop="totalPrice" min-width="120">
           <template #default="scope">
-            {{ scope.row.totalPrice ? scope.row.totalPrice + ' 元' : '-' }}
+            <el-input v-model="scope.row.projectName" placeholder="请输入子项目名称" :disabled="isFormDisabled" maxlength="200" show-word-limit />
           </template>
         </el-table-column>
-        <el-table-column label="业务方向" align="center" prop="businessDirection" min-width="120">
+        <el-table-column v-if="!isFormDisabled" label="操作" width="90" align="center" fixed="right">
           <template #default="scope">
-            <dict-tag :options="business_direction" :value="scope.row.businessDirection" />
+            <el-button link type="danger" icon="Delete" @click="removeSubProjectRow(scope.$index)">删除</el-button>
-          </template>
-        </el-table-column>
-        <el-table-column label="合同状态" align="center" prop="contractStatus" min-width="100">
-          <template #default="scope">
-            <dict-tag :options="contract_status" :value="scope.row.contractStatus" />
-          </template>
-        </el-table-column>
-        <el-table-column label="备注" align="center" prop="remark" min-width="150" show-overflow-tooltip />
-        <el-table-column label="操作" align="center" width="120" fixed="right" v-if="routeParams.type !== 'view'">
-          <template #default="scope">
-            <el-tooltip content="删除" placement="top">
-              <el-button link type="danger" icon="Delete" @click="handleDeleteContract(scope.row)"></el-button>
-            </el-tooltip>
           </template>
         </el-table-column>
       </el-table>
     </el-card>
 
-    <!-- 添加合同关联对话框 -->
-    <el-dialog title="选择关联合同" v-model="contractDialog.visible" width="900px" append-to-body>
-      <el-form :model="contractQueryParams" :inline="true" label-width="100px">
-        <el-form-item label="合同编号">
-          <el-input
-            v-model="contractQueryParams.contractCode"
-            placeholder="请输入合同编号"
-            clearable
-            @keyup.enter="getContractList"
-            style="width: 200px"
-          />
-        </el-form-item>
-        <el-form-item label="合同名称">
-          <el-input
-            v-model="contractQueryParams.contractName"
-            placeholder="请输入合同名称"
-            clearable
-            @keyup.enter="getContractList"
-            style="width: 200px"
-          />
-        </el-form-item>
-        <el-form-item>
-          <el-button type="primary" icon="Search" @click="getContractList">搜索</el-button>
-          <el-button icon="Refresh" @click="resetContractQuery">重置</el-button>
-        </el-form-item>
-      </el-form>
-
-      <el-table
-        ref="contractTableRef"
-        v-loading="contractSelectLoading"
-        border
-        :data="contractList"
-        @selection-change="handleContractSelectionChange"
-        max-height="400"
-      >
-        <el-table-column type="selection" width="55" align="center" />
-        <el-table-column label="合同编号" align="center" prop="contractCode" min-width="120" />
-        <el-table-column label="合同名称" align="center" prop="contractName" min-width="180" show-overflow-tooltip />
-        <el-table-column label="合同总价" align="center" prop="totalPrice" min-width="120">
-          <template #default="scope">
-            {{ scope.row.totalPrice ? scope.row.totalPrice + ' 元' : '-' }}
-          </template>
-        </el-table-column>
-        <el-table-column label="业务方向" align="center" prop="businessDirection" min-width="120">
-          <template #default="scope">
-            <dict-tag :options="business_direction" :value="scope.row.businessDirection" />
-          </template>
-        </el-table-column>
-      </el-table>
-
-      <pagination
-        v-show="contractTotal > 0"
-        :total="contractTotal"
-        v-model:page="contractQueryParams.pageNum"
-        v-model:limit="contractQueryParams.pageSize"
-        @pagination="getContractList"
-      />
-
-      <template #footer>
-        <div class="dialog-footer">
-          <el-button type="primary" @click="submitContractRelation" :loading="contractButtonLoading">确 定</el-button>
-          <el-button @click="contractDialog.visible = false">取 消</el-button>
-        </div>
-      </template>
-    </el-dialog>
-
     <!-- 提交审批组件 -->
     <submitVerify ref="submitVerifyRef" :task-variables="taskVariables" @submit-callback="submitCallback" />
     <!-- 审批记录 -->
@@ -262,25 +143,23 @@
 </template>
 
 <script setup name="ProjectInfoDevEdit" lang="ts">
-import { getProjectInfo, addProjectInfo, updateProjectInfo } from '@/api/oa/erp/projectInfo';
+import {
-import { projectSubmitAndFlowStart } from '@/api/oa/erp/projectInfo';
+  getProjectInfo,
-import { ProjectInfoForm } from '@/api/oa/erp/projectInfo/types';
+  addProjectInfo,
+  updateProjectInfo,
+  projectSubmitAndFlowStart,
+  getErpProjectInfoList,
+  listProjectInfo,
+  delProjectInfo
+} from '@/api/oa/erp/projectInfo';
+import { ProjectInfoForm, ProjectInfoVO } from '@/api/oa/erp/projectInfo/types';
 import { getRuleGenerateCode } from '@/api/system/codeRule';
-import { startWorkFlow } from '@/api/workflow/task';
-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 { allListDept } from '@/api/system/dept';
-import { listProjectType } from '@/api/oa/erp/projectType';
-import { ProjectTypeVO } from '@/api/oa/erp/projectType/types';
 import { getUserList } from '@/api/system/user';
-import { UserQuery } from '@/api/system/user/types';
 import { CodeRuleEnum, FlowCodeEnum, ProjectCategoryEnum } from '@/enums/OAEnum';
-import { listProjectContracts, addProjectContracts, delProjectContracts, getErpProjectContractsList } from '@/api/oa/erp/projectContracts';
-import { ProjectContractsForm, ProjectContractsQuery } from '@/api/oa/erp/projectContracts/types';
-import { listContractInfo } from '@/api/oa/erp/contractInfo';
-import { ContractInfoVO, ContractInfoQuery } from '@/api/oa/erp/contractInfo/types';
 import { getInfo } from '@/api/login';
 import FileUpload from '@/components/FileUpload/index.vue';
 
@@ -290,9 +169,7 @@ const router = useRouter();
 
 // 路由参数
 const routeParams = ref<Record<string, any>>({});
-const { business_direction, project_status, contract_flag, project_category, spare_flag, contract_status } = toRefs<any>(
+const { project_category } = toRefs<any>(proxy?.useDict('project_category'));
-  proxy?.useDict('business_direction', 'project_status', 'contract_flag', 'project_category', 'spare_flag', 'contract_status')
-);
 
 const buttonLoading = ref(false);
 const projectInfoFormRef = ref<ElFormInstance>();
@@ -301,17 +178,8 @@ const projectInfoFormRef = ref<ElFormInstance>();
 const submitVerifyRef = ref<InstanceType<typeof SubmitVerify>>();
 const approvalRecordRef = ref<InstanceType<typeof ApprovalRecord>>();
 
-// 流程相关数据
-const submitFormData = ref<StartProcessBo>({
-  businessId: '',
-  flowCode: '',
-  variables: {},
-  bizExt: {}
-});
-
 // 任务变量
 const taskVariables = ref<Record<string, any>>({});
-const flowInstanceBizExtBo = ref<Record<string, any>>({});
 
 // 项目编号生成状态
 const isCodeGenerated = ref(false);
@@ -332,18 +200,6 @@ const getUserSelectList = async () => {
   userList.value = res.data;
 };
 
-const projectTypeOptions = ref<ProjectTypeVO[]>([]);
-// 保存原始的项目类型列表（扁平结构），用于查找 parentId
-const projectTypeList = ref<ProjectTypeVO[]>([]);
-/** 查询项目类型列表 */
-const getProjectTypeList = async () => {
-  const params = { spareFlag: form.value.spareFlag } as any;
-  const res = await listProjectType(params);
-  // 保存原始数据用于查找
-  projectTypeList.value = res.data || [];
-  projectTypeOptions.value = proxy?.handleTree<ProjectTypeVO>(res.data, 'projectTypeId', 'parentId') || [];
-};
-
 type ProjectInfoFormEx = ProjectInfoForm & {
   flowCode?: string;
   variables?: any;
@@ -352,6 +208,8 @@ type ProjectInfoFormEx = ProjectInfoForm & {
 
 const initFormData: ProjectInfoFormEx = {
   projectId: undefined,
+  parentProjectId: undefined,
+  subProjectFlag: '0',
   contractFlag: '2',
   projectCode: undefined,
   projectName: undefined,
@@ -381,16 +239,178 @@ const initFormData: ProjectInfoFormEx = {
 const data = reactive<{ form: ProjectInfoFormEx; rules: any }>({
   form: { ...initFormData },
   rules: {
-    contractFlag: [{ required: true, message: '有无合同不能为空', trigger: 'change' }],
     projectCode: [{ required: true, message: '项目编号不能为空', trigger: 'blur' }],
     projectName: [{ required: true, message: '项目名称不能为空', trigger: 'blur' }],
-    businessDirection: [{ required: true, message: '业务方向不能为空', trigger: 'change' }],
     projectCategory: [{ required: true, message: '项目类别不能为空', trigger: 'change' }]
   }
 });
 
 const { form, rules } = toRefs(data);
 
+/** 表格行：子项目 */
+type SubProjectRow = {
+  _key: string;
+  projectId?: string | number;
+  projectCode: string;
+  projectName: string;
+};
+
+const subProjectRows = ref<SubProjectRow[]>([]);
+const removedSubProjectIds = ref<Array<string | number>>([]);
+
+const isRdCategory = computed(() => form.value.projectCategory === ProjectCategoryEnum.RD);
+
+/** 当前单据为研发主线（非子项目自身编辑页） */
+const isRdMainLine = computed(() => !form.value.parentProjectId);
+
+const showHasSubProjectSwitch = computed(() => isRdCategory.value && isRdMainLine.value);
+
+/** 开启「含有子项目」后展示子项目表格与添加按钮 */
+const showSubProjectSection = computed(() => showHasSubProjectSwitch.value && form.value.subProjectFlag === '1');
+
+const codeLockedBySubRows = computed(() => subProjectRows.value.length > 0);
+
+const escapeRegExp = (s: string) => s.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+
+/** 根据主项目编号与当前表格行计算下一个子项目编号 */
+const nextSubProjectCode = (parentCode: string, rows: SubProjectRow[]): string | null => {
+  const pc = parentCode.trim();
+  if (!pc) return null;
+  const pattern = new RegExp(`^${escapeRegExp(pc)}\\.(\\d{2})$`);
+  let max = 0;
+  for (const r of rows) {
+    const m = pattern.exec(r.projectCode || '');
+    if (m) max = Math.max(max, parseInt(m[1], 10));
+  }
+  if (max >= 99) return null;
+  return `${pc}.${String(max + 1).padStart(2, '0')}`;
+};
+
+const onHasSubProjectChange = () => {
+  if (form.value.subProjectFlag !== '1') {
+    if (subProjectRows.value.some((r) => r.projectId)) {
+      proxy?.$modal.msgWarning('存在已保存的子项目，请先在表格中删除后再关闭「含有子项目」');
+      nextTick(() => {
+        form.value.subProjectFlag = '1';
+      });
+      return;
+    }
+    subProjectRows.value = [];
+    removedSubProjectIds.value = [];
+  }
+};
+
+const addSubProjectRow = () => {
+  const pcode = form.value.projectCode != null ? String(form.value.projectCode).trim() : '';
+  if (!pcode) {
+    proxy?.$modal.msgWarning('请先生成主项目编号');
+    return;
+  }
+  const next = nextSubProjectCode(pcode, subProjectRows.value);
+  if (!next) {
+    proxy?.$modal.msgError('子项目序号已达上限 99');
+    return;
+  }
+  subProjectRows.value.push({
+    _key: `${Date.now()}_${Math.random()}`,
+    projectCode: next,
+    projectName: ''
+  });
+};
+
+const removeSubProjectRow = async (index: number) => {
+  const row = subProjectRows.value[index];
+  if (row.projectId) {
+    await proxy?.$modal.confirm(`是否确认移除子项目「${row.projectCode}」？保存时将删除该子项目数据。`);
+    removedSubProjectIds.value.push(row.projectId);
+  }
+  subProjectRows.value.splice(index, 1);
+};
+
+/** 从服务端加载子项目列表（仅主项目编辑） */
+const loadSubProjectsFromServer = async () => {
+  subProjectRows.value = [];
+  removedSubProjectIds.value = [];
+  if (!form.value.projectId || form.value.parentProjectId) return;
+  const res = await getErpProjectInfoList({ parentProjectId: form.value.projectId } as any);
+  const list: ProjectInfoVO[] = res.data || [];
+  subProjectRows.value = list.map((c) => ({
+    _key: String(c.projectId),
+    projectId: c.projectId,
+    projectCode: c.projectCode != null ? String(c.projectCode) : '',
+    projectName: c.projectName != null ? String(c.projectName) : ''
+  }));
+  if (list.length > 0) {
+    form.value.subProjectFlag = '1';
+  }
+};
+
+const resolveParentIdByCode = async (projectCode: string): Promise<string | number | undefined> => {
+  const res = await listProjectInfo({ projectCode, pageNum: 1, pageSize: 30 } as any);
+  const rows = (res as any).rows || [];
+  const exact = rows.find((r: ProjectInfoVO) => String(r.projectCode) === String(projectCode));
+  return exact?.projectId;
+};
+
+const buildChildPayload = (
+  parentId: string | number,
+  row: SubProjectRow,
+  peopleJoined: string,
+  statusSnap: { projectStatus?: string; flowStatus?: string }
+): ProjectInfoForm => {
+  const m = form.value;
+  return {
+    contractFlag: m.contractFlag,
+    businessDirection: m.businessDirection,
+    projectCategory: m.projectCategory,
+    spareFlag: m.spareFlag,
+    singleContractFlag: m.singleContractFlag,
+    projectTypeId: m.projectTypeId,
+    paymentMethod: m.paymentMethod,
+    deptId: m.deptId,
+    managerId: m.managerId,
+    chargeId: m.chargeId,
+    deputyId: m.deputyId,
+    peopleId: peopleJoined as any,
+    amount: m.amount,
+    remark: m.remark,
+    ossId: m.ossId,
+    activeFlag: m.activeFlag ?? '1',
+    sortOrder: m.sortOrder ?? 0,
+    contractId: m.contractId,
+    parentProjectId: parentId,
+    subProjectFlag: '0',
+    projectCode: row.projectCode,
+    projectName: row.projectName.trim(),
+    projectStatus: '3',
+    flowStatus: statusSnap.flowStatus ?? m.flowStatus
+  };
+};
+
+const persistSubProjects = async (
+  parentId: string | number,
+  statusSnap: { projectStatus?: string; flowStatus?: string }
+) => {
+  if (subProjectRows.value.length === 0 && removedSubProjectIds.value.length === 0) {
+    return;
+  }
+  const peopleJoined = Array.isArray(form.value.peopleId)
+    ? form.value.peopleId.join(',')
+    : ((form.value.peopleId as string) ?? '');
+  for (const id of removedSubProjectIds.value) {
+    await delProjectInfo(id);
+  }
+  removedSubProjectIds.value = [];
+  for (const row of subProjectRows.value) {
+    const payload = buildChildPayload(parentId, row, peopleJoined, statusSnap);
+    if (row.projectId) {
+      await updateProjectInfo({ ...payload, projectId: row.projectId });
+    } else {
+      await addProjectInfo(payload);
+    }
+  }
+};
+
 // 附件ID字符串转换（用于FileUpload组件）
 const ossIdString = computed({
   get() {
@@ -407,9 +427,9 @@ const isFormDisabled = computed(() => {
   return routeParams.value.type === 'view' || routeParams.value.type === 'approval';
 });
 
-// 生成项目编号
+// 生成主项目编号（存在子项目行时禁止改主编号）
 const generateProjectCode = async () => {
-  if (isCodeGenerated.value) return;
+  if (isCodeGenerated.value || codeLockedBySubRows.value) return;
 
   try {
     const codeRuleCode = form.value.projectCategory === ProjectCategoryEnum.RD ? CodeRuleEnum.PROJECT_RD : CodeRuleEnum.PROJECT;
@@ -426,84 +446,80 @@ const generateProjectCode = async () => {
 
 /** 提交按钮 */
 const submitForm = (status: string, mode: boolean) => {
-  try {
+  projectInfoFormRef.value?.validate(async (valid: boolean) => {
-    projectInfoFormRef.value?.validate(async (valid: boolean) => {
+    if (!valid) return;
-      if (valid) {
-        buttonLoading.value = true;
 
-        // 准备提交数据，将 peopleId 数组转换为字符串
+    if (form.value.subProjectFlag === '1' && subProjectRows.value.length > 0) {
-        const submitData = { ...form.value };
+      for (const row of subProjectRows.value) {
-        if (Array.isArray(submitData.peopleId)) {
+        if (!row.projectName || !String(row.projectName).trim()) {
-          submitData.peopleId = submitData.peopleId.join(',') as any;
+          proxy?.$modal.msgError('请填写所有子项目名称');
-        }
+          return;
-
-        // 设置后端发起和不等于草稿状态 直接走流程发起
-        if (status != 'draft') {
-          // 后端发起流程模式
-          submitData.flowCode = FlowCodeEnum.PROJECT_RD_KEY;
-          const res = await projectSubmitAndFlowStart(submitData).finally(() => (buttonLoading.value = false));
-          form.value = res.data;
-          buttonLoading.value = false;
-          proxy?.$modal.msgSuccess('操作成功');
-          proxy?.$tab.closePage();
-          router.go(-1);
-        } else {
-          if (status === 'draft') {
-            submitData.projectStatus = '1';
-            submitData.flowStatus = 'draft';
-          }
-          if (submitData.projectId) {
-            await updateProjectInfo(submitData).finally(() => (buttonLoading.value = false));
-          } else {
-            await addProjectInfo(submitData).finally(() => (buttonLoading.value = false));
-          }
-          buttonLoading.value = false;
-          proxy?.$modal.msgSuccess('暂存成功');
-          proxy?.$tab.closePage();
-          router.go(-1);
         }
       }
-    });
+    }
-  } finally {
-    buttonLoading.value = false;
-  }
-};
 
-// 提交申请
+    buttonLoading.value = true;
-// const handleStartWorkFlow = async (data: ProjectInfoForm) => {
+
-//   try {
+    const submitData = { ...form.value };
-//     submitFormData.value.flowCode = 'OAP';
+    submitData.subProjectFlag = subProjectRows.value.length > 0 ? '1' : '0';
-//     submitFormData.value.businessId = data.projectId;
+    if (Array.isArray(submitData.peopleId)) {
-//
+      submitData.peopleId = submitData.peopleId.join(',') as any;
-//     // 流程变量
+    }
-//     taskVariables.value = {
+
-//       projectId: data.projectId,
+    const runAfterClose = () => {
-//       projectCode: data.projectCode,
+      proxy?.$modal.msgSuccess(status === 'draft' ? '暂存成功' : '操作成功');
-//       projectName: data.projectName,
+      proxy?.$tab.closePage();
-//       amount: data.amount,
+      router.go(-1);
-//       contractFlag: Number(data.contractFlag)
+    };
-//     };
+
-//
+    try {
-//     // 流程实例业务扩展字段
+      if (status != 'draft') {
-//     flowInstanceBizExtBo.value = {
+        submitData.flowCode = FlowCodeEnum.PROJECT_RD_KEY;
-//       businessTitle: '项目审批',
+        const res = await projectSubmitAndFlowStart(submitData);
-//       businessCode: data.projectCode
+        const flowVo = (res as any).data;
-//     };
+        let parentId: string | number | undefined = flowVo?.projectId ?? submitData.projectId;
-//
+        if (!parentId && submitData.projectCode) {
-//     submitFormData.value.variables = taskVariables.value;
+          parentId = await resolveParentIdByCode(String(submitData.projectCode));
-//     submitFormData.value.bizExt = flowInstanceBizExtBo.value;
+        }
-//
+        const snap = {
-//     const resp = await startWorkFlow(submitFormData.value);
+          projectStatus: flowVo?.projectStatus,
-//
+          flowStatus: flowVo?.flowStatus
-//     if (submitVerifyRef.value) {
+        };
-//       buttonLoading.value = false;
+        if (parentId && (subProjectRows.value.length > 0 || removedSubProjectIds.value.length > 0)) {
-//       await submitVerifyRef.value.openDialog(resp.data.taskId);
+          await persistSubProjects(parentId, snap);
-//     }
+        }
-//   } finally {
+        if (flowVo) {
-//     buttonLoading.value = false;
+          Object.assign(form.value, flowVo);
-//     router.go(-1);
+        }
-//   }
+        runAfterClose();
-// };
+      } else {
+        if (status === 'draft') {
+          submitData.projectStatus = '1';
+          submitData.flowStatus = 'draft';
+        }
+        const snap = {
+          projectStatus: submitData.projectStatus,
+          flowStatus: submitData.flowStatus
+        };
+        if (submitData.projectId) {
+          await updateProjectInfo(submitData);
+          await persistSubProjects(submitData.projectId as string | number, snap);
+        } else {
+          await addProjectInfo(submitData);
+          const parentId = await resolveParentIdByCode(String(submitData.projectCode));
+          if (parentId && (subProjectRows.value.length > 0 || removedSubProjectIds.value.length > 0)) {
+            await persistSubProjects(parentId, snap);
+          }
+        }
+        runAfterClose();
+      }
+    } catch (e) {
+      console.error(e);
+    } finally {
+      buttonLoading.value = false;
+    }
+  });
+};
 
 //初始化调用
 const loadSelectOptions = () => {
@@ -521,19 +537,21 @@ onMounted(async () => {
     if (id && (routeParams.value.type === 'update' || routeParams.value.type === 'view' || routeParams.value.type === 'approval')) {
       const res = await getProjectInfo(id);
       Object.assign(form.value, res.data);
+      if (!form.value.subProjectFlag) {
+        form.value.subProjectFlag = '0';
+      }
       // 将抄送人员字符串转换为数组，用于多选下拉框显示
       if (form.value.peopleId && typeof form.value.peopleId === 'string') {
         form.value.peopleId = (form.value.peopleId as string).split(',').map((id) => {
           return String(id.trim());
         }) as any;
       }
-      // 编辑模式：如果已有项目编号，禁用生成按钮
       if (form.value.projectCode) {
         isCodeGenerated.value = true;
       }
-
+      if (isRdMainLine.value) {
-      // 加载项目关联的合同列表
+        await loadSubProjectsFromServer();
-      await getProjectContractsList();
+      }
     } else {
       // 新增模式：获取登录用户信息并自动赋值
       try {
@@ -559,7 +577,6 @@ onMounted(async () => {
       }
     }
     form.value.spareFlag = form.value.projectCategory === ProjectCategoryEnum.SALE_SPARE ? '1' : '0';
-    await getProjectTypeList();
     proxy?.$modal.closeLoading();
   });
 });
@@ -579,130 +596,15 @@ const submitCallback = async () => {
 const approvalVerifyOpen = async () => {
   await submitVerifyRef.value.openDialog(routeParams.value.taskId);
 };
-
-// ================== 项目关联合同相关 ==================
-const contractLoading = ref(false);
-const projectContractsList = ref<any[]>([]);
-const contractDialog = reactive({ visible: false });
-const contractTableRef = ref();
-const contractSelectLoading = ref(false);
-const contractList = ref<ContractInfoVO[]>([]);
-const contractTotal = ref(0);
-const selectedContracts = ref<ContractInfoVO[]>([]);
-const contractButtonLoading = ref(false);
-
-// 合同查询参数
-const contractQueryParams = ref<ContractInfoQuery>({
-  pageNum: 1,
-  pageSize: 10,
-  contractStatus: '3' // 只查询可用状态的合同
-});
-
-/** 查询项目关联的合同列表 */
-const getProjectContractsList = async () => {
-  if (!form.value.projectId) return;
-
-  try {
-    contractLoading.value = true;
-    const params = { projectId: form.value.projectId } as any;
-    const res = await getErpProjectContractsList(params);
-    // 后端已经通过left join返回了完整的合同信息
-    projectContractsList.value = res.data || [];
-  } catch (error) {
-    console.error('查询项目关联合同失败:', error);
-  } finally {
-    contractLoading.value = false;
-  }
-};
-
-/** 打开添加合同关联对话框 */
-const handleAddContract = () => {
-  contractDialog.visible = true;
-  contractQueryParams.value.pageNum = 1;
-  getContractList();
-};
-
-/** 查询合同列表 */
-const getContractList = async () => {
-  try {
-    contractSelectLoading.value = true;
-    const res = await listContractInfo(contractQueryParams.value);
-    // 过滤掉已经关联的合同
-    const existingContractIds = projectContractsList.value.map((item) => item.contractId);
-    contractList.value = res.rows.filter((contract) => !existingContractIds.includes(contract.contractId));
-    contractTotal.value = contractList.value.length;
-  } catch (error) {
-    console.error('查询合同列表失败:', error);
-  } finally {
-    contractSelectLoading.value = false;
-  }
-};
-
-/** 重置合同查询 */
-const resetContractQuery = () => {
-  contractQueryParams.value.contractCode = undefined;
-  contractQueryParams.value.contractName = undefined;
-  contractQueryParams.value.pageNum = 1;
-  getContractList();
-};
-
-/** 合同多选框选中数据 */
-const handleContractSelectionChange = (selection: ContractInfoVO[]) => {
-  selectedContracts.value = selection;
-};
-
-/** 提交合同关联 */
-const submitContractRelation = async () => {
-  if (selectedContracts.value.length === 0) {
-    proxy?.$modal.msgWarning('请至少选择一个合同');
-    return;
-  }
-
-  try {
-    contractButtonLoading.value = true;
-    // 批量添加关联关系
-    const promises = selectedContracts.value.map((contract, index) => {
-      const data: ProjectContractsForm = {
-        projectId: form.value.projectId,
-        contractId: contract.contractId,
-        sortOrder: projectContractsList.value.length + index + 1,
-        activeFlag: '1'
-      };
-      return addProjectContracts(data);
-    });
-
-    await Promise.all(promises);
-    proxy?.$modal.msgSuccess('添加关联成功');
-    contractDialog.visible = false;
-    selectedContracts.value = [];
-    // 刷新列表
-    await getProjectContractsList();
-  } catch (error) {
-    console.error('添加合同关联失败:', error);
-    proxy?.$modal.msgError('添加关联失败');
-  } finally {
-    contractButtonLoading.value = false;
-  }
-};
-
-/** 删除合同关联 */
-const handleDeleteContract = async (row: any) => {
-  try {
-    await proxy?.$modal.confirm(`是否确认删除与合同"${row.contractName}"的关联关系？`);
-    await delProjectContracts(row.projectContractsId);
-    proxy?.$modal.msgSuccess('删除关联成功');
-    // 刷新列表
-    await getProjectContractsList();
-  } catch (error) {
-    console.error('删除合同关联失败:', error);
-  }
-};
 </script>
 
 <style scoped lang="scss">
-.card-title {
+.sub-project-card-title {
-  font-weight: bold;
+  font-weight: 600;
-  font-size: 16px;
+  margin-right: 8px;
-  color: #303133;
+}
+.sub-project-card-tip {
+  font-size: 12px;
+  color: var(--el-text-color-secondary);
 }
 </style>

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

@@ -111,7 +111,7 @@
             <dict-tag :options="contract_flag" :value="scope.row.contractFlag" />
           </template>
         </el-table-column>
-        <el-table-column label="项目编号" align="center" prop="projectCode" width="140" v-if="columns[3].visible">
+        <el-table-column label="项目编号" align="center" prop="projectCode" width="160" v-if="columns[3].visible">
           <template #default="scope">
             <el-link type="primary" underline @click="handleLedger(scope.row)">
               {{ scope.row.projectCode }}
@@ -174,10 +174,14 @@
         </el-table-column>
         <el-table-column label="操作" align="center" width="120" fixed="right">
           <template #default="scope">
-            <el-tooltip content="修改" placement="top" v-if="scope.row.flowStatus === 'draft' || scope.row.flowStatus === 'back'">
+            <el-tooltip
+              content="修改"
+              placement="top"
+              v-if="!isRdSubProject(scope.row) && (scope.row.flowStatus === 'draft' || scope.row.flowStatus === 'back')"
+            >
               <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['oa/erp:projectInfo:edit']"></el-button>
             </el-tooltip>
-            <el-tooltip content="查看详情" placement="top"  v-if="scope.row.flowStatus !== 'draft'">
+            <el-tooltip content="查看详情" placement="top" v-if="!isRdSubProject(scope.row) && scope.row.flowStatus !== 'draft'">
               <el-button link type="info" icon="DocumentChecked" @click="handleView(scope.row)"></el-button>
             </el-tooltip>
 <!--            <el-col :span="1.5" v-if="scope.row.flowStatus === 'waiting'">-->
@@ -366,6 +370,11 @@ const resetMaintainForm = () => {
   maintainForm.requiredWork = '';
 };
 
+/** 研发子项目（挂在主项目下）：列表不提供编辑/查看/维护入口 */
+const isRdSubProject = (row: ProjectInfoVO) => {
+  return row.projectCategory === '3' && row.parentProjectId != null;
+};
+
 const openMaintainFromSelection = () => {
   const id = ids.value[0];
   const row = projectInfoList.value.find((item) => item.projectId === id);