From f07a8cfc7041cc23ca203b46f46b97e0b1ef91f5 Mon Sep 17 00:00:00 2001
From: yinq <yinq>
Date: Mon, 26 Jan 2026 18:13:16 +0800
Subject: [PATCH] =?UTF-8?q?1.0.56=20=E5=90=88=E5=90=8C=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E7=AD=BE=E8=AE=A2=E5=9C=B0=E7=82=B9=E3=80=81=20=E5=90=88?=
 =?UTF-8?q?=E5=90=8C=E7=89=A9=E6=96=99=E5=A4=87=E6=B3=A8=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/oa/erp/contractInfo/types.ts   | 20 ++++++++++++++++++++
 src/views/oa/erp/contractInfo/edit.vue | 21 ++++++++++++++++++---
 2 files changed, 38 insertions(+), 3 deletions(-)

diff --git a/src/api/oa/erp/contractInfo/types.ts b/src/api/oa/erp/contractInfo/types.ts
index 42e8685..b3ccaef 100644
--- a/src/api/oa/erp/contractInfo/types.ts
+++ b/src/api/oa/erp/contractInfo/types.ts
@@ -149,6 +149,16 @@ export interface ContractInfoVO {
    */
   remark: string;
 
+  /**
+   * 签订地点
+   */
+  signingPlace?: string;
+
+  /**
+   * 合同物料备注
+   */
+  materialRemark?: string;
+
   /**
    * 激活标识（1是 0否）
    */
@@ -327,6 +337,16 @@ export interface ContractInfoForm extends BaseEntity {
    */
   remark?: string;
 
+  /**
+   * 签订地点
+   */
+  signingPlace?: string;
+
+  /**
+   * 合同物料备注
+   */
+  materialRemark?: string;
+
   /**
    * 激活标识（1是 0否）
    */
diff --git a/src/views/oa/erp/contractInfo/edit.vue b/src/views/oa/erp/contractInfo/edit.vue
index 75b9364..25f13a8 100644
--- a/src/views/oa/erp/contractInfo/edit.vue
+++ b/src/views/oa/erp/contractInfo/edit.vue
@@ -81,6 +81,11 @@
               </el-date-picker>
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item label="签订地点" prop="signingPlace">
+              <el-input v-model="form.signingPlace" placeholder="请输入签订地点" :disabled="isFormDisabled" />
+            </el-form-item>
+          </el-col>
           <el-col :span="12">
             <el-form-item label="合同总价" prop="totalPrice">
               <el-input v-model="form.totalPrice" placeholder="根据合同物料自动计算" disabled>
@@ -104,12 +109,12 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="甲方授权代表" prop="oneRepresent">
-              <el-input v-model="form.oneRepresent" placeholder="请输入甲方授权代表" :disabled="isFormDisabled" />
+              <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="请输入乙方授权代表" :disabled="isFormDisabled" />
+              <el-input v-model="form.twoRepresent" placeholder="请输入乙方法人或其授权代表" :disabled="isFormDisabled" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -261,6 +266,12 @@
           </template>
         </el-table-column>
       </el-table>
+
+      <!-- 合同物料备注 -->
+      <el-form-item label="合同物料备注" prop="materialRemark" style="margin-bottom: 16px">
+        <el-input v-model="form.materialRemark" type="textarea" :rows="3" placeholder="请输入合同物料备注" :disabled="isFormDisabled" />
+      </el-form-item>
+
     </el-card>
 
     <!-- 合同物料编辑对话框 -->
@@ -334,7 +345,9 @@
                 allow-create
                 default-first-option
               >
+                <el-option label="0" :value="0"></el-option>
                 <el-option label="6" :value="6"></el-option>
+                <el-option label="9" :value="9"></el-option>
                 <el-option label="13" :value="13"></el-option>
               </el-select>
             </el-form-item>
@@ -590,7 +603,9 @@ const initFormData: ContractInfoFormEx = {
   variables: undefined,
   activeFlag: '1',
   contractMaterialList: [],
-  file: undefined
+  file: undefined,
+  signingPlace: undefined,
+  materialRemark: undefined
 } as any;
 
 const data = reactive<{ form: ContractInfoFormEx; rules: any }>({