合并代码，解决冲突

src/views/manage/business-review/components/settlementAudit/index.vue

@@ -69,11 +69,12 @@
         </a-row>
         <a-row :gutter="24">
           <a-col :span="12">
-            <a-form-item label="调整保证金">
+              <a-form-item label="调整保证金">
               <span class="white">{{
-                                  formatValue(selectedRow.addmargin !== 0 ? "+" + formatValue(selectedRow.addmargin) : (selectedRow.decmargin === 0 ? 0.0 : "-" + formatValue(selectedRow.decmargin)))
+                                  formatValue(selectedRow.addmargin !== 0 && selectedRow.addmargin !== undefined ?
+                  "+" + formatValue(selectedRow.addmargin) : (selectedRow.decmargin === 0 ? 0.0 : "-" + formatValue(selectedRow.decmargin)))
                               }}</span>
-            </a-form-item>
+              </a-form-item>
           </a-col>
           <a-col :span="12">
             <a-form-item label="调整金额">

src/views/manage/business-review/components/settlementCancel/index.vue

@@ -67,11 +67,12 @@
         </a-row>
         <a-row :gutter="24">
           <a-col :span="12">
-            <a-form-item label="调整保证金">
+              <a-form-item label="调整保证金">
               <span class="white">{{
-                              formatValue(selectedRow.addmargin !== 0 ? "+" + formatValue(selectedRow.addmargin) : (selectedRow.decmargin === 0 ? 0.0 : "-" + formatValue(selectedRow.decmargin)))
-                            }}</span>
-            </a-form-item>
+                                  formatValue(selectedRow.addmargin !== 0 && selectedRow.addmargin !== undefined ?
+                  "+" + formatValue(selectedRow.addmargin) : (selectedRow.decmargin === 0 ? 0.0 : "-" + formatValue(selectedRow.decmargin)))
+                              }}</span>
+              </a-form-item>
           </a-col>
           <a-col :span="12">
             <a-form-item label="调整金额">

src/views/manage/finance-review/components/fundsAudit/index.vue

@@ -64,7 +64,7 @@
           </a-col>
           <a-col :span="12">
             <a-form-item label="登记金额">
-              <span class="white">{{ formatValue(selectedRow.payamount) }}</span>
+                <span class="white">{{(selectedRow.deductamount === undefined || selectedRow.deductamount === 0) ? formatValue(selectedRow.payamount): formatValue(selectedRow.deductamount)}}</span>
             </a-form-item>
           </a-col>
         </a-row>

src/views/manage/finance-review/components/fundsCancel/index.vue

@@ -58,7 +58,7 @@
           </a-col>
           <a-col :span="12">
             <a-form-item label="登记金额">
-              <span class="white">{{ formatValue(selectedRow.payamount) }}</span>
+                <span class="white">{{(selectedRow.deductamount === undefined || selectedRow.deductamount === 0) ? formatValue(selectedRow.payamount): formatValue(selectedRow.deductamount)}}</span>
             </a-form-item>
           </a-col>
         </a-row>