From 9dcaac6cb2e5bbf0c6a70330bdda6c25a5faaa1f Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期一, 27 十月 2025 13:35:38 +0800
Subject: [PATCH] fix: s

---
 apps/bMiniApp/src/subpackages/payrollManage/payrollChange/InnerPage.vue |   99 +++++++++++++++++++++++++++++++++++--------------
 1 files changed, 70 insertions(+), 29 deletions(-)

diff --git a/apps/bMiniApp/src/subpackages/payrollManage/payrollChange/InnerPage.vue b/apps/bMiniApp/src/subpackages/payrollManage/payrollChange/InnerPage.vue
index aef693c..9e4e7af 100644
--- a/apps/bMiniApp/src/subpackages/payrollManage/payrollChange/InnerPage.vue
+++ b/apps/bMiniApp/src/subpackages/payrollManage/payrollChange/InnerPage.vue
@@ -41,6 +41,7 @@
             :max="999999999999"
             :precision="2"
             type="text"
+            @change="onActualSettlementAmountChange"
           />
           <div class="form-input-unit">鍏�</div>
         </div>
@@ -54,11 +55,17 @@
             :max="999999999999"
             :precision="2"
             type="text"
+            @change="onActualSettlementAmountChange"
           />
           <div class="form-input-unit">鍏�</div>
         </div>
       </nut-form-item>
-      <nut-form-item label="缁撶畻閲戦:" class="bole-form-item" prop="bank" label-width="90px">
+      <nut-form-item
+        label="缁撶畻閲戦:"
+        class="bole-form-item"
+        prop="settlementAmount"
+        label-width="90px"
+      >
         {{ `${settlementAmount}鍏僠 }}
       </nut-form-item>
       <nut-form-item label="澶囨敞:" class="bole-form-item alignTop" prop="remark" label-width="90px">
@@ -113,6 +120,7 @@
     if (res?.detail) {
       form.serviceFee = settlementTaskUser?.serviceFee ?? 0;
       form.actualSettlementAmount = settlementTaskUser?.actualSettlementAmount ?? 0;
+      form.settlementAmount = settlementTaskUser?.settlementAmount ?? 0;
       form.receiveAccount = settlementTaskUser?.receiveAccount ?? '';
       form.bank = settlementTaskUser?.bank ?? '';
       form.settlementAccess = res?.detail?.settlementAccess;
@@ -129,6 +137,7 @@
 });
 
 const form = reactive({
+  settlementAmount: '' as any as number,
   serviceFee: '' as any as number,
   actualSettlementAmount: '' as any as number,
   receiveAccount: '',
@@ -141,9 +150,19 @@
   remark: '',
 });
 
-const settlementAmount = computed(
-  () => Number(form.timeoutFee ?? 0) + Number(form.serviceFee ?? 0) + Number(form.otherFee ?? 0)
-);
+const settlementAmount = computed(() => sumSettlementAmount());
+
+function sumSettlementAmount() {
+  return (
+    getFeeValue(Number(form.timeoutFee ?? 0)) +
+    getFeeValue(Number(form.serviceFee ?? 0)) +
+    getFeeValue(Number(form.otherFee ?? 0))
+  );
+}
+
+function getFeeValue(val: number) {
+  return val || 0;
+}
 
 const rules = reactive<FormRules>({
   code: [
@@ -160,6 +179,12 @@
 
 function onTimeoutHoursChange(event: any) {
   form.timeoutFee = form.timeoutServiceFee * event.detail.value;
+  onActualSettlementAmountChange();
+}
+
+function onActualSettlementAmountChange() {
+  //鏆傛椂娉ㄦ帀
+  // form.actualSettlementAmount = sumSettlementAmount();
 }
 
 const formRef = ref<any>(null);
@@ -175,31 +200,47 @@
 const eventChannel = useEventChannel();
 
 async function confirm() {
-  try {
-    let params: API.EditTaskSettlementOrderRosterCommand = {
-      id: orderRosterId,
-      settlementAmount: settlementAmount.value,
-      actualSettlementAmount: form.actualSettlementAmount,
-      receiveAccount: form.receiveAccount,
-      bank: form.bank,
-      // totalWorkHours: editForm.totalWorkHours,
-      // bankBranch: editForm.bankBranch,
-      serviceFee: form.serviceFee,
-      timeoutHours: form.timeoutHours,
-      timeoutFee: form.timeoutFee,
-      otherFee: form.otherFee,
-      remark: form.remark,
-    };
-    let res = await taskServices.editTaskSettlementOrderRoster(params);
-    if (res) {
-      Message.success('淇敼鎴愬姛', {
-        onClosed() {
-          goBack();
-        },
-      });
-      eventChannel.emit('update');
-    }
-  } catch (error) {}
+  let params: API.EditTaskSettlementOrderRosterCommand = {
+    id: orderRosterId,
+    settlementAmount: settlementAmount.value,
+    actualSettlementAmount: settlementAmount.value,
+    receiveAccount: form.receiveAccount,
+    bank: form.bank,
+    // totalWorkHours: editForm.totalWorkHours,
+    // bankBranch: editForm.bankBranch,
+    serviceFee: Number(form.serviceFee),
+    timeoutHours: Number(form.timeoutHours),
+    timeoutFee: Number(form.timeoutFee),
+    otherFee: Number(form.otherFee),
+    remark: form.remark,
+  };
+  // try {
+  //   let params: API.EditTaskSettlementOrderRosterCommand = {
+  //     id: orderRosterId,
+  //     settlementAmount: settlementAmount.value,
+  //     actualSettlementAmount: form.actualSettlementAmount,
+  //     receiveAccount: form.receiveAccount,
+  //     bank: form.bank,
+  //     // totalWorkHours: editForm.totalWorkHours,
+  //     // bankBranch: editForm.bankBranch,
+  //     serviceFee: form.serviceFee,
+  //     timeoutHours: form.timeoutHours,
+  //     timeoutFee: form.timeoutFee,
+  //     otherFee: form.otherFee,
+  //     remark: form.remark,
+  //   };
+  //   let res = await taskServices.editTaskSettlementOrderRoster(params);
+  //   if (res) {
+  //     Message.success('淇敼鎴愬姛', {
+  //       onClosed() {
+  //         goBack();
+  //       },
+  //     });
+  //     eventChannel.emit('update');
+  //   }
+  // } catch (error) {}
+  eventChannel.emit('update', params);
+  goBack();
 }
 </script>
 

--
Gitblit v1.9.1