From 8d5ae3fe418d5d287253da040da5adb20b0748b6 Mon Sep 17 00:00:00 2001
From: yinq <yinq>
Date: Thu, 30 Oct 2025 17:49:05 +0800
Subject: [PATCH] =?UTF-8?q?1.0.24=20=E5=90=88=E5=90=8C=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E8=87=AA=E5=8A=A8=E8=8E=B7=E5=8F=96=E7=94=A8=E6=88=B7=E9=83=A8?=
 =?UTF-8?q?=E9=97=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/enums/OAEnum.ts                    | 11 +++++++++++
 src/views/oa/erp/contractInfo/edit.vue | 27 +++++++++++++++++---------
 2 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/src/enums/OAEnum.ts b/src/enums/OAEnum.ts
index 9973dc6..94e82c7 100644
--- a/src/enums/OAEnum.ts
+++ b/src/enums/OAEnum.ts
@@ -44,3 +44,14 @@ export enum ProjectCategoryEnum {
 }
 
 
+/**
+ * 流程定义编码枚举
+ */
+export enum FlowCodeEnum {
+  /**
+   * 合同编号规则
+   */
+  CONTRACT_CODE = 'OAC',
+
+
+}
diff --git a/src/views/oa/erp/contractInfo/edit.vue b/src/views/oa/erp/contractInfo/edit.vue
index c87db1a..7bbc982 100644
--- a/src/views/oa/erp/contractInfo/edit.vue
+++ b/src/views/oa/erp/contractInfo/edit.vue
@@ -15,7 +15,7 @@
         :pageType="routeParams.type"
         :mode="false"
       />
-      <el-form ref="contractInfoFormRef" :model="form" :disabled="routeParams.type === 'view'" :rules="rules" label-width="120px">
+      <el-form ref="contractInfoFormRef" :model="form" :loading="buttonLoading" :disabled="routeParams.type === 'view' || routeParams.type === 'approval'" :rules="rules" label-width="120px">
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="有无合同" prop="contractFlag">
@@ -61,7 +61,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="部门" prop="contractDeptId">
-              <el-select v-model="form.contractDeptId" placeholder="请选择部门">
+              <el-select v-model="form.contractDeptId" disabled>
                 <el-option v-for="item in deptInfoList" :key="item.deptId" :label="item.deptName" :value="item.deptId" />
               </el-select>
             </el-form-item>
@@ -167,10 +167,10 @@
 
       <!-- 合同物料表格 -->
       <div style="margin-bottom: 16px">
-        <el-button type="primary" icon="Plus" v-if="routeParams.type !== 'view'" @click="handleAddMaterial">新增物料 </el-button>
+        <el-button type="primary" icon="Plus" v-if="routeParams.type !== 'view' && routeParams.type != 'approval'" @click="handleAddMaterial">新增物料 </el-button>
       </div>
 
-      <el-table :data="contractMaterialList" border v-loading="materialLoading">
+      <el-table :data="contractMaterialList" v-loading="buttonLoading" border>
         <el-table-column label="产品名称" align="center" prop="productName" min-width="120" />
         <el-table-column label="规格描述" align="center" prop="specificationDescription" min-width="120" />
         <el-table-column label="物料编号" align="center" prop="materialCode" width="120" />
@@ -203,7 +203,7 @@
           </template>
         </el-table-column>
         <el-table-column label="备注" align="center" prop="remark" min-width="100" />
-        <el-table-column label="操作" align="center" fixed="right" width="150" v-if="routeParams.type !== 'view'">
+        <el-table-column label="操作" align="center" fixed="right" width="150" v-if="routeParams.type !== 'view' && routeParams.type != 'approval'">
           <template #default="scope">
             <el-button link type="primary" icon="Edit" @click="handleEditMaterial(scope.row)">编辑</el-button>
             <el-button link type="danger" icon="Delete" @click="handleDeleteMaterial(scope.row)">删除</el-button>
@@ -366,7 +366,6 @@
 <script setup name="ContractInfoEdit" lang="ts">
 import { addContractInfo, contractSubmitAndFlowStart, getContractInfo, updateContractInfo } from '@/api/oa/erp/contractInfo';
 import { ContractInfoForm } from '@/api/oa/erp/contractInfo/types';
-import { getErpContractMaterialList } from '@/api/oa/erp/contractMaterial';
 import { ContractMaterialVO, ContractMaterialForm } from '@/api/oa/erp/contractMaterial/types';
 import { getBaseUnitInfoList } from '@/api/oa/base/unitInfo';
 import { getRuleGenerateCode } from '@/api/system/codeRule';
@@ -380,7 +379,8 @@ import { ref } from 'vue';
 import { allListDept, listDept } from '@/api/system/dept';
 import { getCrmCustomerInfoList } from '@/api/oa/crm/customerInfo';
 import { getBasePrintTemplateList } from '@/api/oa/base/printTemplate';
-import { CodeRuleEnum } from '@/enums/OAEnum';
+import { CodeRuleEnum, FlowCodeEnum } from '@/enums/OAEnum';
+import { getInfo } from '@/api/login';
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const route = useRoute();
@@ -424,7 +424,6 @@ const ossFileModel = ref<string | string[] | undefined>(undefined);
 const isCodeGenerated = ref(false);
 
 // 合同物料相关
-const materialLoading = ref(false);
 const materialFormRef = ref<ElFormInstance>();
 
 // 合同物料列表计算属性
@@ -609,7 +608,7 @@ const submitForm = (status: string, mode: boolean) => {
         // 设置后端发起和不等于草稿状态 直接走流程发起
         if (status != 'draft') {
           // 后端发起流程模式
-          form.value.flowCode = 'OAC';
+          form.value.flowCode = FlowCodeEnum.CONTRACT_CODE;
           // 流程变量
           form.value.variables = {
             contractName: form.value.contractName,
@@ -845,6 +844,16 @@ onMounted(async () => {
         isCodeGenerated.value = false;
       }
     } else {
+      // 新增模式：获取登录用户部门ID并自动赋值
+      try {
+        const userInfoRes = await getInfo();
+        if (userInfoRes.data?.user?.deptId && !form.value.contractDeptId) {
+          form.value.contractDeptId = userInfoRes.data.user.deptId;
+        }
+      } catch (error) {
+        console.error('获取用户信息失败:', error);
+      }
+
       // 新增模式：如果已有合同编号，禁用生成按钮
       if (form.value.contractCode) {
         isCodeGenerated.value = true;