diff --git a/src/api/oa/base/materialInfo/index.ts b/src/api/oa/base/materialInfo/index.ts
index 9603057..b5ed6eb 100644
--- a/src/api/oa/base/materialInfo/index.ts
+++ b/src/api/oa/base/materialInfo/index.ts
@@ -1,6 +1,7 @@
 import request from '@/utils/request';
 import { AxiosPromise } from 'axios';
 import { MaterialInfoVO, MaterialInfoForm, MaterialInfoQuery } from '@/api/oa/base/materialInfo/types';
+import { RelationMaterialVO } from '@/api/oa/base/relationMaterial/types';
 
 /**
  * 查询SAP物料信息列表
@@ -74,3 +75,16 @@ export function getBaseMaterialInfoList (query) {
         params: query
     });
 };
+
+/**
+ * 查询物料信息并关联销售物料表
+ * @param query
+ * @returns {*}
+ */
+export const listMaterialInfoWithRelation = (query?: MaterialInfoQuery): AxiosPromise<RelationMaterialVO[]> => {
+  return request({
+    url: '/oa/base/materialInfo/listWithRelation',
+    method: 'get',
+    params: query
+  });
+};
diff --git a/src/api/oa/base/relationMaterial/types.ts b/src/api/oa/base/relationMaterial/types.ts
index 9fca428..1529f6c 100644
--- a/src/api/oa/base/relationMaterial/types.ts
+++ b/src/api/oa/base/relationMaterial/types.ts
@@ -19,6 +19,11 @@ export interface RelationMaterialVO {
    */
   saleMaterialName: string;
 
+  /**
+   * 销售物料型号
+   */
+  saleMaterialModel?: string;
+
   /**
    * SAP物料编码
    */
@@ -29,6 +34,11 @@ export interface RelationMaterialVO {
    */
   materialName?: string;
 
+  /**
+   * 物料型号
+   */
+  materialModel?: string;
+
   /**
    * 客户名称
    */
@@ -92,6 +102,11 @@ export interface RelationMaterialForm extends BaseEntity {
    */
   saleMaterialName?: string;
 
+  /**
+   * 销售物料型号
+   */
+  saleMaterialModel?: string;
+
   /**
    * 备注
    */
@@ -126,6 +141,11 @@ export interface RelationMaterialQuery extends PageQuery {
    */
   saleMaterialName?: string;
 
+  /**
+   * 销售物料型号
+   */
+  saleMaterialModel?: string;
+
   /**
    * 激活标识（1是 0否）
    */
diff --git a/src/api/oa/erp/contractInfo/types.ts b/src/api/oa/erp/contractInfo/types.ts
index c5edbdc..0cf3d50 100644
--- a/src/api/oa/erp/contractInfo/types.ts
+++ b/src/api/oa/erp/contractInfo/types.ts
@@ -154,6 +154,26 @@ export interface ContractInfoVO {
    */
   activeFlag: string;
 
+  /**
+   * 合同负责人
+   */
+  contractManagerId: string | number;
+
+  /**
+   * 合同负责人名称
+   */
+  contractManagerName: string;
+
+  /**
+   * 合同大写金额
+   */
+  capitalizedAmount: string;
+
+  /**
+   * 合同模板标识（1客户 2内部）
+   */
+  contractTemplateFlag: string;
+
 }
 
 export interface ContractInfoForm extends BaseEntity {
@@ -312,6 +332,21 @@ export interface ContractInfoForm extends BaseEntity {
    */
   activeFlag?: string;
 
+  /**
+   * 合同负责人
+   */
+  contractManagerId?: string | number;
+
+  /**
+   * 合同大写金额
+   */
+  capitalizedAmount?: string;
+
+  /**
+   * 合同模板标识（1客户 2内部）
+   */
+  contractTemplateFlag?: string;
+
   /**
    * 合同物料列表
    */
@@ -468,6 +503,21 @@ export interface ContractInfoQuery extends PageQuery {
    */
   activeFlag?: string;
 
+  /**
+   * 合同负责人
+   */
+  contractManagerId?: string | number;
+
+  /**
+   * 合同大写金额
+   */
+  capitalizedAmount?: string;
+
+  /**
+   * 合同模板标识（1客户 2内部）
+   */
+  contractTemplateFlag?: string;
+
   /**
    * 日期范围参数
    */
diff --git a/src/api/oa/erp/contractMaterial/types.ts b/src/api/oa/erp/contractMaterial/types.ts
index 509f8d0..99434b1 100644
--- a/src/api/oa/erp/contractMaterial/types.ts
+++ b/src/api/oa/erp/contractMaterial/types.ts
@@ -182,6 +182,11 @@ export interface ContractMaterialForm extends BaseEntity {
    */
   activeFlag?: string;
 
+  /**
+   * 销售物料名称
+   */
+  saleMaterialName?: string;
+
 }
 
 export interface ContractMaterialQuery extends PageQuery {
diff --git a/src/components/SaleMaterialSelect/index.vue b/src/components/SaleMaterialSelect/index.vue
index b9b4040..768b3ec 100644
--- a/src/components/SaleMaterialSelect/index.vue
+++ b/src/components/SaleMaterialSelect/index.vue
@@ -13,11 +13,11 @@
                   <el-form-item label="SAP物料名称" prop="materialName">
                     <el-input v-model="queryParams.materialName" placeholder="请输入SAP物料名称" clearable @keyup.enter="handleQuery" />
                   </el-form-item>
+                  <el-form-item label="物料型号" prop="materialModel">
+                    <el-input v-model="queryParams.materialModel" placeholder="请输入物料型号" clearable @keyup.enter="handleQuery" />
+                  </el-form-item>
 <!--                  <el-form-item label="物料品牌" prop="materialBrand">-->
 <!--                    <el-input v-model="queryParams.materialBrand" placeholder="请输入物料品牌" clearable @keyup.enter="handleQuery" />-->
-<!--                  </el-form-item>-->
-<!--                  <el-form-item label="物料型号" prop="materialModel">-->
-<!--                    <el-input v-model="queryParams.materialModel" placeholder="请输入物料型号" clearable @keyup.enter="handleQuery" />-->
 <!--                  </el-form-item>-->
                   <el-form-item>
                     <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -56,9 +56,11 @@
               <vxe-column type="checkbox" width="50" align="center" />
               <!--              <vxe-column key="relationMaterialId" title="关联物料ID" align="center" field="relationMaterialId" />-->
               <vxe-column key="materialCode" title="SAP物料编码" align="center" field="materialCode" width="120" />
-              <vxe-column key="materialName" title="SAP物料名称" align="center" field="materialName" width="120" />
-              <vxe-column key="customerName" title="客户名称" align="center" field="customerName" width="120" />
+              <vxe-column key="materialName" title="SAP物料名称" align="center" field="materialName" width="300" />
+              <vxe-column key="materialModel" title="物料型号" align="center" field="materialModel" width="120" />
+              <vxe-column key="customerName" title="客户名称" align="center" field="customerName" width="200" />
               <vxe-column key="saleMaterialName" title="销售物料名称" align="center" field="saleMaterialName" width="120" />
+              <vxe-column key="saleMaterialModel" title="销售物料型号" align="center" field="saleMaterialModel" width="120" />
               <!--              <vxe-column key="purchasePrice" title="采购单价(元)" align="center" field="purchasePrice" width="120" />-->
               <!--              <vxe-column key="foreignPrice" title="售前对外单价(元)" align="center" field="foreignPrice" width="140" />-->
               <!--              <vxe-column key="stockingPeriod" title="备货期" align="center" field="stockingPeriod" />-->
@@ -89,10 +91,11 @@
 </template>
 
 <script setup lang="ts">
-import { listRelationMaterial } from '@/api/oa/base/relationMaterial';
+import { listMaterialInfoWithRelation } from '@/api/oa/base/materialInfo';
 import { VxeTableInstance } from 'vxe-table';
 import useDialog from '@/hooks/useDialog';
-import { RelationMaterialQuery, RelationMaterialVO } from '@/api/oa/base/relationMaterial/types';
+import { RelationMaterialVO } from '@/api/oa/base/relationMaterial/types';
+import { MaterialInfoQuery } from '@/api/oa/base/materialInfo/types';
 
 interface PropType {
   modelValue?: RelationMaterialVO[] | RelationMaterialVO | undefined;
@@ -123,7 +126,7 @@ const materialDialog = useDialog({
   title: '物料选择'
 });
 
-const queryParams = ref<RelationMaterialQuery>({
+const queryParams = ref<MaterialInfoQuery>({
   pageNum: 1,
   pageSize: 10,
   materialCode: undefined,
@@ -161,7 +164,7 @@ const computedIds = (data) => {
 /** 查询物料信息列表 */
 const getList = async () => {
   loading.value = true;
-  const res = await listRelationMaterial(queryParams.value);
+  const res = await listMaterialInfoWithRelation(queryParams.value);
   loading.value = false;
   materialInfoList.value = res.rows;
   total.value = res.total;
diff --git a/src/views/oa/base/relationMaterial/index.vue b/src/views/oa/base/relationMaterial/index.vue
index 8c35b5c..1c5cfdb 100644
--- a/src/views/oa/base/relationMaterial/index.vue
+++ b/src/views/oa/base/relationMaterial/index.vue
@@ -18,6 +18,9 @@
             <el-form-item label="销售物料名称" prop="saleMaterialName">
               <el-input v-model="queryParams.saleMaterialName" placeholder="请输入销售物料名称" clearable @keyup.enter="handleQuery" />
             </el-form-item>
+            <el-form-item label="销售物料型号" prop="saleMaterialModel">
+              <el-input v-model="queryParams.saleMaterialModel" placeholder="请输入销售物料型号" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
 <!--            <el-form-item label="激活标识" prop="activeFlag">-->
 <!--              <el-select v-model="queryParams.activeFlag" placeholder="请选择激活标识" clearable>-->
 <!--                <el-option v-for="dict in active_flag" :key="dict.value" :label="dict.label" :value="dict.value" />-->
@@ -58,12 +61,13 @@
       <el-table v-loading="loading" border :data="relationMaterialList" @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55" align="center" />
         <el-table-column label="关联物料ID" align="center" prop="relationMaterialId" v-if="columns[0].visible" />
-        <el-table-column label="物料编码" align="center" prop="materialCode" v-if="columns[1].visible" />
-        <el-table-column label="物料名称" align="center" prop="materialName" v-if="columns[2].visible" />
-        <el-table-column label="客户名称" align="center" prop="customerName" v-if="columns[3].visible" />
-        <el-table-column label="销售物料名称" align="center" prop="saleMaterialName" v-if="columns[4].visible" />
-        <el-table-column label="备注" align="center" prop="remark" v-if="columns[5].visible" />
-        <el-table-column label="激活标识" align="center" prop="activeFlag" v-if="columns[6].visible">
+        <el-table-column label="物料编码" align="center" prop="materialCode" width="120"  v-if="columns[1].visible" />
+        <el-table-column label="物料名称" align="center" prop="materialName" width="280"  v-if="columns[2].visible" />
+        <el-table-column label="客户名称" align="center" prop="customerName" width="180"  v-if="columns[3].visible" />
+        <el-table-column label="销售物料名称" align="center" prop="saleMaterialName" width="180"  v-if="columns[4].visible" />
+        <el-table-column label="销售物料型号" align="center" prop="saleMaterialModel" width="180"  v-if="columns[5].visible" />
+        <el-table-column label="备注" align="center" prop="remark" width="180"   v-if="columns[6].visible" />
+        <el-table-column label="激活标识" align="center" prop="activeFlag" v-if="columns[7].visible">
           <template #default="scope">
             <dict-tag :options="active_flag" :value="scope.row.activeFlag" />
           </template>
@@ -121,6 +125,9 @@
         <el-form-item label="销售物料名称" prop="saleMaterialName">
           <el-input v-model="form.saleMaterialName" placeholder="请输入销售物料名称" />
         </el-form-item>
+        <el-form-item label="销售物料型号" prop="saleMaterialModel">
+          <el-input v-model="form.saleMaterialModel" placeholder="请输入销售物料型号" />
+        </el-form-item>
         <el-form-item label="备注" prop="remark">
           <el-input v-model="form.remark" placeholder="请输入备注" />
         </el-form-item>
@@ -191,9 +198,9 @@ const columns = ref<FieldOption[]>([
   { key: 2, label: `物料名称`, visible: true },
   { key: 3, label: `客户名称`, visible: true },
   { key: 4, label: `销售物料名称`, visible: true },
-  { key: 5, label: `备注`, visible: true },
-  { key: 6, label: `激活标识`, visible: false },
-  { key: 7, label: `删除标志`, visible: false },
+  { key: 5, label: `销售物料型号`, visible: true },
+  { key: 6, label: `备注`, visible: true },
+  { key: 7, label: `激活标识`, visible: false },
   { key: 8, label: `创建部门`, visible: false },
   { key: 9, label: `创建人`, visible: false },
   { key: 10, label: `创建时间`, visible: true },
@@ -207,6 +214,7 @@ const initFormData: RelationMaterialForm = {
   materialName: undefined,
   customerId: undefined,
   saleMaterialName: undefined,
+  saleMaterialModel: undefined,
   remark: undefined,
   activeFlag: undefined
 };
@@ -218,6 +226,7 @@ const data = reactive<PageData<RelationMaterialForm, RelationMaterialQuery>>({
     materialId: undefined,
     customerId: undefined,
     saleMaterialName: undefined,
+    saleMaterialModel: undefined,
     activeFlag: undefined,
     materialCode: undefined,
     materialName: undefined,
diff --git a/src/views/oa/erp/contractInfo/edit.vue b/src/views/oa/erp/contractInfo/edit.vue
index 1f88f46..c58df9f 100644
--- a/src/views/oa/erp/contractInfo/edit.vue
+++ b/src/views/oa/erp/contractInfo/edit.vue
@@ -21,21 +21,20 @@
         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">
-              <el-radio-group v-model="form.contractFlag">
+              <el-radio-group v-model="form.contractFlag" :disabled="isFormDisabled">
                 <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="contractCode">
-              <el-input v-model="form.contractCode" placeholder="请输入合同编号">
+              <el-input v-model="form.contractCode" placeholder="请输入合同编号" :disabled="isFormDisabled">
                 <template #append>
                   <el-button type="primary" @click="generateContractCode" :disabled="isCodeGenerated">生成合同编号 </el-button>
                 </template>
@@ -44,7 +43,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="合同名称" prop="contractName">
-              <el-input v-model="form.contractName" placeholder="请输入合同名称" />
+              <el-input v-model="form.contractName" placeholder="请输入合同名称" :disabled="isFormDisabled"/>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -54,30 +53,30 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
-            <el-form-item label="合同类型" prop="contractType">
-              <el-select v-model="form.contractType" placeholder="请选择合同类型">
-                <el-option v-for="dict in contract_type" :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="contractType">-->
+<!--              <el-select v-model="form.contractType" placeholder="请选择合同类型">-->
+<!--                <el-option v-for="dict in contract_type" :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="businessDirection">
-              <el-select v-model="form.businessDirection" placeholder="请选择业务方向">
+              <el-select v-model="form.businessDirection" placeholder="请选择业务方向" :disabled="isFormDisabled">
                 <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="contractDeptId">
-              <el-select v-model="form.contractDeptId" disabled>
+              <el-select v-model="form.contractDeptId" :disabled="isFormDisabled">
                 <el-option v-for="item in deptInfoList" :key="item.deptId" :label="item.deptName" :value="item.deptId" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="合同时间" prop="contractDate">
-              <el-date-picker clearable v-model="form.contractDate" type="date" value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择合同时间">
+            <el-form-item label="合同签订日期" prop="contractDate">
+              <el-date-picker clearable v-model="form.contractDate" type="date" value-format="YYYY-MM-DD HH:mm:ss" :disabled="isFormDisabled" placeholder="请选择合同时间">
               </el-date-picker>
             </el-form-item>
           </el-col>
@@ -88,44 +87,39 @@
               </el-input>
             </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="oneCustomerId">
-              <el-select v-model="form.oneCustomerId" placeholder="请选择甲方公司" filterable>
+              <el-select v-model="form.oneCustomerId" placeholder="请选择甲方公司" :disabled="isFormDisabled" filterable>
                 <el-option v-for="item in customerInfoList" :key="item.customerId" :label="item.customerName" :value="item.customerId" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="乙方公司" prop="twoCustomerId">
-              <el-select v-model="form.twoCustomerId" placeholder="请选择乙方公司" filterable>
+              <el-select v-model="form.twoCustomerId" placeholder="请选择乙方公司" :disabled="isFormDisabled" filterable>
                 <el-option v-for="item in customerInfoList" :key="item.customerId" :label="item.customerName" :value="item.customerId" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="甲方授权代表" prop="oneRepresent">
-              <el-input v-model="form.oneRepresent" placeholder="请输入甲方授权代表" />
+              <el-input v-model="form.oneRepresent" placeholder="请输入甲方授权代表" :disabled="isFormDisabled"/>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="乙方授权代表" prop="twoRepresent">
-              <el-input v-model="form.twoRepresent" placeholder="请输入乙方授权代表" />
+              <el-input v-model="form.twoRepresent" placeholder="请输入乙方授权代表" :disabled="isFormDisabled"/>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="甲方签字日期" prop="oneDate">
-              <el-date-picker clearable v-model="form.oneDate" type="date" value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择甲方签字日期">
+              <el-date-picker clearable v-model="form.oneDate" type="date" value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择甲方签字日期" :disabled="isFormDisabled">
               </el-date-picker>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="乙方签字日期" prop="twoDate">
-              <el-date-picker clearable v-model="form.twoDate" type="date" value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择乙方签字日期">
+              <el-date-picker clearable v-model="form.twoDate" type="date" value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择乙方签字日期" :disabled="isFormDisabled">
               </el-date-picker>
             </el-form-item>
           </el-col>
@@ -142,8 +136,22 @@
           <!--            </el-form-item>-->
           <!--          </el-col>-->
           <el-col :span="12">
-            <el-form-item label="合同模板" prop="templateId">
-              <el-select v-model="form.templateId" placeholder="请选择合同模板" filterable>
+            <el-form-item label="合同模板标识" prop="contractTemplateFlag">
+              <el-radio-group v-model="form.contractTemplateFlag" :disabled="isFormDisabled">
+                <el-radio v-for="dict in contract_template_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="contractManagerId">
+              <el-select v-model="form.contractManagerId" placeholder="请选择该合同客户经理或签订人" :disabled="isFormDisabled" filterable>
+                <el-option v-for="item in userInfoList" :key="item.userId" :label="item.nickName" :value="item.userId" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="合同模板" prop="templateId" v-if="form.contractTemplateFlag !== '1'">
+              <el-select v-model="form.templateId" placeholder="请选择合同模板" :disabled="isFormDisabled" filterable>
                 <el-option
                   v-for="item in printTemplateList"
                   :key="item.templateId"
@@ -153,17 +161,34 @@
               </el-select>
             </el-form-item>
           </el-col>
+          <!-- <el-col :span="12">
+            <el-form-item label="合同大写金额" prop="capitalizedAmount">
+              <el-input v-model="form.capitalizedAmount" placeholder="请输入合同大写金额" />
+            </el-form-item>
+          </el-col> -->
           <el-col :span="12">
             <el-form-item label="附件" prop="ossId">
-              <!--              <el-input v-model="form.ossId" type="textarea" placeholder="请输入内容" />-->
-              <el-button type="primary" plain icon="Upload" @click="handleFile">上传合同附件</el-button>
+              <!--              <el-button type="primary" plain icon="Upload" @click="handleFile">上传合同附件</el-button>-->
+              <FileUpload
+                v-model="ossIdString"
+                :limit="5"
+                :fileSize="20"
+                :fileType="['doc', 'docx', 'pdf', 'xls', 'xlsx']"
+                :disabled="isFormDisabled"
+                :isShowTip="true"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="备注" prop="remark">
-              <el-input v-model="form.remark" type="textarea" placeholder="请输入备注" />
+              <el-input v-model="form.remark" type="textarea" placeholder="请输入备注" :disabled="isFormDisabled"/>
             </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-row>
       </el-form>
     </el-card>
@@ -390,8 +415,10 @@ 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 { getUserList } from '@/api/system/user';
 import { CodeRuleEnum, FlowCodeEnum } from '@/enums/OAEnum';
 import { getInfo } from '@/api/login';
+import FileUpload from '@/components/FileUpload/index.vue';
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const route = useRoute();
@@ -399,8 +426,8 @@ const router = useRouter();
 
 // 路由参数
 const routeParams = ref<Record<string, any>>({});
-const { contract_category, business_direction, contract_flag, contract_type, contract_status, material_flag } = toRefs<any>(
-  proxy?.useDict('contract_category', 'business_direction', 'contract_flag', 'contract_type', 'contract_status', 'material_flag')
+const { contract_category, business_direction, contract_flag, contract_type, contract_status, material_flag, contract_template_flag } = toRefs<any>(
+  proxy?.useDict('contract_category', 'business_direction', 'contract_flag', 'contract_type', 'contract_status', 'material_flag', 'contract_template_flag')
 );
 
 const buttonLoading = ref(false);
@@ -471,6 +498,13 @@ const getCustomerInfoListSelect = async () => {
   customerInfoList.value = res.data;
 };
 
+/** 查询用户信息下拉框结构 */
+const userInfoList = ref([]);
+const getUserInfoListSelect = async () => {
+  const res = await getUserList({ pageNum: 1, pageSize: 1000 });
+  userInfoList.value = res.data;
+};
+
 // 合同物料对话框
 const materialDialog = reactive({
   visible: false,
@@ -486,6 +520,7 @@ const initMaterialFormData: ContractMaterialForm = {
   specificationDescription: undefined,
   materialId: undefined,
   relationMaterialId: undefined,
+  saleMaterialName: undefined,
   amount: undefined,
   unitId: undefined,
   beforePrice: undefined,
@@ -532,6 +567,9 @@ const initFormData: ContractInfoFormEx = {
   signatureAppendix: undefined,
   taxRate: undefined,
   remark: undefined,
+  contractManagerId: undefined,
+  capitalizedAmount: undefined,
+  contractTemplateFlag: '2',
   flowCode: undefined,
   bizExt: undefined,
   variables: undefined,
@@ -546,7 +584,25 @@ const data = reactive<{ form: ContractInfoFormEx; rules: any }>({
     contractFlag: [{ required: true, message: '有无合同不能为空', trigger: 'blur' }],
     contractCode: [{ required: true, message: '合同编号不能为空', trigger: 'blur' }],
     contractName: [{ required: true, message: '合同名称不能为空', trigger: 'blur' }],
-    paymentMethod: [{ required: true, message: '付款方式不能为空', trigger: 'blur' }]
+    businessDirection: [{ required: true, message: '业务方向不能为空', trigger: 'blur' }],
+    contractManagerId: [{ required: true, message: '合同负责人不能为空', trigger: 'blur' }],
+    contractTemplateFlag: [{ required: true, message: '合同模板标识不能为空', trigger: 'blur' }],
+  }
+});
+
+// 判断表单是否禁用（查看或审批模式）
+const isFormDisabled = computed(() => {
+  return routeParams.value.type === 'view' || routeParams.value.type === 'approval';
+});
+
+// 附件ID字符串转换（用于FileUpload组件）
+const ossIdString = computed({
+  get() {
+    const v = form.value.ossId as any;
+    return v === undefined || v === null ? '' : String(v);
+  },
+  set(val: string) {
+    form.value.ossId = val || (undefined as any);
   }
 });
 
@@ -594,6 +650,7 @@ const saleMaterialSelectCallBack = (data: any) => {
     materialForm.value.materialCode = materialList[0].materialCode;
     materialForm.value.materialName = materialList[0].materialName;
     materialForm.value.productName = materialList[0].saleMaterialName;
+    materialForm.value.saleMaterialName = materialList[0].saleMaterialName;
     materialForm.value.relationMaterialId = materialList[0].relationMaterialId;
     materialForm.value.customerName = materialList[0].customerName;
   }
@@ -616,9 +673,9 @@ const handleFile = () => {
 /** 提交按钮 */
 const submitForm = (status: string, mode: boolean) => {
   try {
+    buttonLoading.value = true;
     contractInfoFormRef.value?.validate(async (valid: boolean) => {
       if (valid) {
-        buttonLoading.value = true;
         // 设置后端发起和不等于草稿状态 直接走流程发起
         if (status != 'draft') {
           // 后端发起流程模式
@@ -627,6 +684,7 @@ const submitForm = (status: string, mode: boolean) => {
           form.value.variables = {
             contractName: form.value.contractName,
             totalPrice: form.value.totalPrice,
+            businessDirection: form.value.businessDirection,
             contractCode: form.value.contractCode
           };
           // 流程实例业务扩展字段
@@ -638,7 +696,6 @@ const submitForm = (status: string, mode: boolean) => {
           form.value.flowStatus = 'waiting';
           const res = await contractSubmitAndFlowStart(form.value).finally(() => (buttonLoading.value = false));
           form.value = res.data;
-          buttonLoading.value = false;
           proxy?.$modal.msgSuccess('操作成功');
           proxy?.$tab.closePage();
           router.go(-1);
@@ -652,7 +709,6 @@ const submitForm = (status: string, mode: boolean) => {
           } else {
             await addContractInfo(form.value).finally(() => (buttonLoading.value = false));
           }
-          buttonLoading.value = false;
           proxy?.$modal.msgSuccess('暂存成功');
           proxy?.$tab.closePage();
           router.go(-1);
@@ -675,6 +731,7 @@ const handleStartWorkFlow = async (data: ContractInfoForm) => {
       contractId: data.contractId,
       contractName: data.contractName,
       totalPrice: data.totalPrice,
+      businessDirection: data.businessDirection,
       contractCode: data.contractCode
     };
 
@@ -803,18 +860,25 @@ const submitMaterialForm = () => {
         (form.value as any).contractMaterialList = [];
       }
 
+      const unitInfo = unitInfoList.value.find((item: any) => item.unitId === materialForm.value.unitId);
+      const unitName = unitInfo ? unitInfo.unitName : '';
+      const materialData = {
+        ...materialForm.value,
+        unitName: unitName
+      };
+
       if (materialForm.value.contractMaterialId) {
         // 编辑模式：更新现有物料
         const index = (form.value as any).contractMaterialList.findIndex(
           (item: any) => item.contractMaterialId === materialForm.value.contractMaterialId
         );
         if (index !== -1) {
-          (form.value as any).contractMaterialList[index] = { ...materialForm.value };
+          (form.value as any).contractMaterialList[index] = materialData;
         }
       } else {
         // 新增模式：添加新物料
         const newMaterial = {
-          ...materialForm.value,
+          ...materialData,
           contractMaterialId: Date.now() // 临时ID
         };
         (form.value as any).contractMaterialList.push(newMaterial);
@@ -835,6 +899,7 @@ const loadSelectOptions = () => {
   getDeptInfoListSelect();
   getCustomerInfoListSelect();
   getPrintTemplateListSelect();
+  getUserInfoListSelect();
 };
 
 onMounted(async () => {
diff --git a/src/views/oa/erp/contractInfo/index.vue b/src/views/oa/erp/contractInfo/index.vue
index 6853ffd..539c759 100644
--- a/src/views/oa/erp/contractInfo/index.vue
+++ b/src/views/oa/erp/contractInfo/index.vue
@@ -113,12 +113,12 @@
           </template>
         </el-table-column>
         <el-table-column label="部门" align="center" prop="deptName" width="100" v-if="columns[8].visible" />
-        <el-table-column label="合同时间" align="center" prop="contractDate" width="100" v-if="columns[9].visible">
+        <el-table-column label="合同签订日期" align="center" prop="contractDate" width="120" v-if="columns[9].visible">
           <template #default="scope">
             <span>{{ parseTime(scope.row.contractDate, '{y}-{m}-{d}') }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="合同总价" align="center" prop="totalPrice" v-if="columns[10].visible" />
+        <el-table-column label="合同总价" align="center" prop="totalPrice" width="100" v-if="columns[10].visible" />
         <el-table-column label="甲方公司" align="center" prop="oneCustomerName" width="200" v-if="columns[11].visible" />
         <el-table-column label="甲方授权代表" align="center" prop="oneRepresent" width="110" v-if="columns[12].visible" />
         <el-table-column label="甲方签字日期" align="center" prop="aDate" width="120" v-if="columns[13].visible">
@@ -162,6 +162,13 @@
         <el-table-column label="外部合同号" align="center" prop="externalContractCode" width="160" v-if="columns[35].visible" />
         <el-table-column label="订单号" align="center" prop="orderContractCode" width="160" v-if="columns[36].visible" />
         <el-table-column label="项目号" align="center" prop="projectContractCode" width="160" v-if="columns[37].visible" />
+        <el-table-column label="合同负责人" align="center" prop="contractManagerName" width="120" v-if="columns[38].visible" />
+        <el-table-column label="合同大写金额" align="center" prop="capitalizedAmount" width="150" v-if="columns[39].visible" />
+        <el-table-column label="合同模板标识" align="center" prop="contractTemplateFlag" width="120" v-if="columns[40].visible">
+          <template #default="scope">
+            <dict-tag :options="contract_template_flag" :value="scope.row.contractTemplateFlag" />
+          </template>
+        </el-table-column>
         <el-table-column label="备注" align="center" prop="remark" v-if="columns[24].visible" />
         <el-table-column label="激活标识" align="center" prop="activeFlag" v-if="columns[25].visible">
           <template #default="scope">
@@ -191,7 +198,7 @@
             <!--            <el-tooltip content="审批记录" placement="top" v-if="scope.row.contractStatus === '2' || scope.row.contractStatus === '3'">-->
             <!--              <el-button link type="info" icon="View" @click="handleApprovalRecord(scope.row)"></el-button>-->
             <!--            </el-tooltip>-->
-            <el-tooltip content="合同模板" placement="top" v-if="scope.row.templateId != null && scope.row.contractStatus === '3'">
+            <el-tooltip content="合同模板" placement="top" v-if="scope.row.templateId != null">
               <el-button link type="info" icon="Download" @click="contractView(scope.row)"></el-button>
             </el-tooltip>
             <el-tooltip content="上传终版合同" placement="top" v-if="!scope.row.signatureAppendix && scope.row.contractStatus === '3'">
@@ -270,8 +277,8 @@ import ApprovalRecord from '@/components/Process/approvalRecord.vue';
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const route = useRoute();
 const router = useRouter();
-const { contract_category, business_direction, active_flag, contract_flag, contract_type, contract_status } = toRefs<any>(
-  proxy?.useDict('contract_category', 'business_direction', 'active_flag', 'contract_flag', 'contract_type', 'contract_status')
+const { contract_category, business_direction, active_flag, contract_flag, contract_type, contract_status, contract_template_flag } = toRefs<any>(
+  proxy?.useDict('contract_category', 'business_direction', 'active_flag', 'contract_flag', 'contract_type', 'contract_status', 'contract_template_flag')
 );
 
 const approvalRecordRef = ref<InstanceType<typeof ApprovalRecord>>();
@@ -297,7 +304,7 @@ const columns = ref<FieldOption[]>([
   { key: 6, label: `合同类型`, visible: true },
   { key: 7, label: `业务方向`, visible: true },
   { key: 8, label: `部门`, visible: true },
-  { key: 9, label: `合同时间`, visible: true },
+  { key: 9, label: `合同签订日期`, visible: true },
   { key: 10, label: `合同总价`, visible: true },
   { key: 11, label: `甲方公司`, visible: true },
   { key: 12, label: `甲方授权代表`, visible: true },
@@ -325,7 +332,10 @@ const columns = ref<FieldOption[]>([
   { key: 34, label: `内部合同号`, visible: true },
   { key: 35, label: `外部合同号`, visible: true },
   { key: 36, label: `订单号`, visible: true },
-  { key: 37, label: `项目号`, visible: true }
+  { key: 37, label: `项目号`, visible: true },
+  { key: 38, label: `合同负责人`, visible: true },
+  { key: 39, label: `合同大写金额`, visible: false },
+  { key: 40, label: `合同模板标识`, visible: true }
 ]);
 
 const data = reactive<{ queryParams: ContractInfoQuery }>({
@@ -356,6 +366,9 @@ const data = reactive<{ queryParams: ContractInfoQuery }>({
     signatureAppendix: undefined,
     taxRate: undefined,
     activeFlag: undefined,
+    contractManagerId: undefined,
+    capitalizedAmount: undefined,
+    contractTemplateFlag: undefined,
     params: {}
   }
 });