Browse Source

no message

ly 1 year ago
parent
commit
9c5adce39b

+ 5 - 2
src/views/business/financial/payment/form.vue

@@ -349,12 +349,12 @@
                   </el-table-column>
                   <el-table-column
                   label="已收款金额"
-                  prop="amount"
+                  prop="reallyAmount"
                   width="100"
                   align="center"
                 >
                   <template #default="scope">
-                    <span>{{ rowNum(scope.row.abc) }}</span>
+                    <span>{{ rowNum(scope.row.reallyAmount) }}</span>
                   </template>
                 </el-table-column>
                   <el-table-column
@@ -1010,6 +1010,7 @@ function contractChoiceHandler() {
 }
 
 function contractChoiceHandle(info) {
+  form.value.details = []
   form.value.contractId = info.id;
   form.value.contractNo = info.contractNo;
   form.value.contractAmount = info.trueAmount;
@@ -1024,6 +1025,8 @@ function contractChoiceHandle(info) {
         taskTypeId: item.taskTypeId,
         amount: item.amount,
         taskTypeName: item.taskTypeName,
+        payment: item.payment,
+        reallyAmount:item.reallyAmount,
       };
       form.value.details.push(detail);
     });

+ 1 - 1
src/views/business/production/salaryZero/importExcelDialogCustomer.vue

@@ -89,7 +89,7 @@
 
 
 <script setup>
-// import { exportSalaryTemplateNotCompany } from "@/api/business/production/salary";
+import { exportSalaryTemplateNotCompany } from "@/api/business/production/salary";
 import { getToken, getTenant } from "@/utils/auth";
 import useUserStore from "@/store/modules/user";
 import { deepClone } from "@/utils";