Merge remote-tracking branch 'origin/master'

src/views/business/purchase/components/funds/index.vue

@@ -91,7 +91,7 @@
           </a-col>
           <a-col :span="12">
             <a-form-item label="合计总额">
-              <span class="white">{{ formatValue(selectedRow.pricedavg) }}</span>
+              <span class="white">{{ formatValue(selectedRow.totalamount) }}</span>
             </a-form-item>
           </a-col>
         </a-row>

src/views/business/purchase/components/settlement/setup.ts

@@ -44,8 +44,8 @@ export function handleForm() {
         adjustMargin: 1,// 调整保证金
         adjustAmount: 1,// 调整金额
     })
-    const validateIsChecked = ()=>{
-        if (formState.ReckonAdjustAmount && Math.abs(formState.ReckonAdjustAmount)) {
+    const validateIsChecked = (rule:any,value:number)=>{
+        if (value && Math.abs(value)) {
             return Promise.resolve();
         } else {
             return Promise.reject('请输入正确的值');