up

src/views/budget/budgetList.vue

@@ -901,16 +901,10 @@ export default {
           sums[index] = moneyFormatter(this.totalMoney);
           return;
         }
-<<<<<<< HEAD
-        
+
         if (column.property === "update_money") {
           sums[index] = moneyFormatter(this.update_money);
           return;
-=======
-        if (column.property === 'update_money') {
-          sums[index] = moneyFormatter(this.updateMoney);
-          return
->>>>>>> df592f31fb2b950dd89844eb8be5521e364db39d
         }
         // const values = data.map(item => Number(item[column.property]));
         // if (!values.every(value => isNaN(value)) && (column.property === 'money' || column.property === 'plan_price'|| column.property === 'fund_log_total')) {

src/views/contract/components/paymentRegistration.vue

@@ -488,7 +488,7 @@ export default {
         is_end: this.paymentRegistrationForm.isLast ? 1 : 0,
         remark: this.paymentRegistrationForm.remark,
         audit_money: this.paymentRegistrationForm.audit_money,
-        files: this.fileList.map(i => i?.response?.id)
+        files:this.fileList? this.fileList.map(i => i?.response?.id):[]
       };
       addFundLog(data).then((res) => {
         //付款申请后同时更新一下合同中审计金额

src/views/contract/paymentRegistrationList.vue

@@ -39,7 +39,7 @@
               <Button size="small" type="primary" style="margin-left: 10px;margin-bottom: 4px"
                 @click="$refs['detailPaymentRegistration'].getFundLog(scope.row.id),$refs['detailPaymentRegistration'].isShow = true">编辑</Button>
             </template>
-            <Button size="small" type="primary" style="margin-left: 10px;margin-bottom: 4px"
+            <Button v-if='false' size="small" type="primary" style="margin-left: 10px;margin-bottom: 4px"
               @click="$refs['printRegistration'].getDetailFundLog(scope.row.id),$refs['printRegistration'].isShow = true">打印</Button>
           </template>
         </el-table-column>