合并代码，解决冲突

src/views/order/pre_sale_warehouse_receipt/components/pre_sale_warehouse_receipt_bargain/components/bargain_detail/index.vue

@@ -136,7 +136,8 @@ export default defineComponent({
     .ant-form {
         height: 100%;
         .formBar {
-            height: calc(100% - 70px);
+            height: 100%;
+            max-height: 100%;
         }
     }
     .condition {

src/views/order/spot_warran/components/spot_warrant_bargain/components/bargain_detail/index.vue

@@ -136,7 +136,8 @@ export default defineComponent({
     .ant-form {
         height: 100%;
         .formBar {
-            height: calc(100% - 70px);
+            height: 100%;
+            max-height: 100%;
         }
     }
     .condition {