1.0.49 合同按照选择的部门进行部门经理审批

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

@@ -261,6 +261,16 @@ export interface ProjectInfoForm extends BaseEntity {
   chargeName?: string;
 
   deputyName?: string;
+
+  /**
+   * 合同编号
+   */
+  contractCode?: string;
+
+  /**
+   * 合同名称
+   */
+  contractName?: string;
 }
 
 export interface ProjectInfoQuery extends PageQuery {
@@ -371,4 +381,14 @@ export interface ProjectInfoQuery extends PageQuery {
   chargeName?: string;
 
   deputyName?: string;
+
+  /**
+   * 合同编号
+   */
+  contractCode?: string;
+
+  /**
+   * 合同名称
+   */
+  contractName?: string;
 }

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

@@ -455,7 +455,7 @@ const approvalRecordRef = ref<InstanceType<typeof ApprovalRecord>>();
 // 流程相关数据
 const submitFormData = ref<StartProcessBo>({
   businessId: '',
-  flowCode: 'OAC',
+  flowCode: '',
   variables: {},
   bizExt: {}
 });
@@ -701,6 +701,7 @@ const submitForm = (status: string, mode: boolean) => {
             contractName: form.value.contractName,
             totalPrice: form.value.totalPrice,
             businessDirection: form.value.businessDirection,
+            contractDeptId: form.value.contractDeptId,
             contractCode: form.value.contractCode
           };
           // 流程实例业务扩展字段
@@ -739,7 +740,7 @@ const submitForm = (status: string, mode: boolean) => {
 // 提交申请
 const handleStartWorkFlow = async (data: ContractInfoForm) => {
   try {
-    submitFormData.value.flowCode = 'OAC';
+    submitFormData.value.flowCode = FlowCodeEnum.CONTRACT_CODE;
     submitFormData.value.businessId = data.contractId;
 
     // 流程变量
@@ -748,6 +749,7 @@ const handleStartWorkFlow = async (data: ContractInfoForm) => {
       contractName: data.contractName,
       totalPrice: data.totalPrice,
       businessDirection: data.businessDirection,
+      contractDeptId: data.contractDeptId,
       contractCode: data.contractCode
     };
 

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

@@ -321,7 +321,7 @@ const columns = ref<FieldOption[]>([
   { key: 15, label: `乙方授权代表`, visible: true },
   { key: 16, label: `乙方签字日期`, visible: true },
   { key: 17, label: `合同状态`, visible: true },
-  { key: 18, label: `流程状态`, visible: true },
+  { key: 18, label: `流程状态`, visible: false },
   { key: 19, label: `合同模板ID`, visible: false },
   { key: 20, label: `附件ID`, visible: false },
   { key: 21, label: `付款方式`, visible: true },

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

@@ -568,7 +568,7 @@ onMounted(async () => {
           form.value.deptId = userVO.deptId;
           form.value.managerId = userVO.userId;
           form.value.chargeId = userVO.chargeId;
-          form.value.deputyId = userVO.deputyId;
+          // form.value.deputyId = userVO.deputyId;
         }
       } catch (error) {
         console.error('获取用户信息失败:', error);