From dbc7e4dc6cced7bdabf31646d6406e4f16314aa2 Mon Sep 17 00:00:00 2001
From: yinq <yinq>
Date: Mon, 18 May 2026 18:12:02 +0800
Subject: [PATCH] =?UTF-8?q?1.1.44=20=E5=90=88=E5=90=8C=E6=80=BB=E4=BB=B7?=
 =?UTF-8?q?=E6=8C=AA=E5=88=B0=E4=B8=8B=E6=96=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/oa/erp/contractInfo/edit.vue | 43 +++++++++++++++++++-------
 1 file changed, 31 insertions(+), 12 deletions(-)

diff --git a/src/views/oa/erp/contractInfo/edit.vue b/src/views/oa/erp/contractInfo/edit.vue
index 2331b7b..f896440 100644
--- a/src/views/oa/erp/contractInfo/edit.vue
+++ b/src/views/oa/erp/contractInfo/edit.vue
@@ -352,16 +352,6 @@
               </div>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
-            <el-form-item label="合同总价" prop="totalPrice">
-              <el-input v-model="form.totalPrice" placeholder="根据合同物料自动计算" disabled>
-                <template #append>元</template>
-              </el-input>
-              <div style="color: #909399; font-size: 12px; line-height: 1.4; margin-top: 4px">
-                由下方具体物料明细金额自动计算生成
-              </div>
-            </el-form-item>
-          </el-col>
         </el-row>
       </el-form>
     </el-card>
@@ -425,7 +415,29 @@
     <!-- 合同物料区域 -->
     <el-card shadow="never" style="margin-top: 0">
       <template #header>
-        <div style="text-align: left; font-weight: bold; font-size: 18px">合同物料</div>
+        <div
+          style="
+            display: flex;
+            align-items: center;
+            justify-content: space-between;
+            flex-wrap: wrap;
+            gap: 8px 16px;
+            width: 100%;
+          "
+        >
+          <div style="text-align: left; font-weight: bold; font-size: 18px">合同物料</div>
+          <div style="display: flex; align-items: center; gap: 8px; flex-wrap: wrap; margin-left: auto">
+            <span style="font-size: 14px; font-weight: 600; color: #606266">合同总价</span>
+            <el-input
+              v-model="form.totalPrice"
+              placeholder="根据合同物料自动计算"
+              disabled
+              style="width: 200px"
+            >
+              <template #append>元</template>
+            </el-input>
+          </div>
+        </div>
       </template>
 
       <!-- 合同物料表格 -->
@@ -1186,7 +1198,14 @@ const data = reactive<{ form: ContractInfoFormEx; rules: any }>({
         },
         trigger: 'change'
       }
-    ]
+    ],
+    paymentAccountId: [{ required: true, message: '请选择付款账户', trigger: 'blur' }],
+    warrantyPeriodDescription: [{ required: true, message: '质保期描述不能为空', trigger: 'blur' }],
+    deliveryLocation: [{ required: true, message: '交货地点不能为空', trigger: 'blur' }],
+    shipMethod: [{ required: true, message: '运输方式不能为空', trigger: 'blur' }],
+    deliveryStart: [{ required: true, message: '发货/交货期不能为空', trigger: 'blur' }],
+    signingPlace: [{ required: true, message: '签订地点不能为空', trigger: 'blur' }],
+    paymentMethod: [{ required: true, message: '请选择付款形式', trigger: 'blur' }]
   }
 });