From 00d1ea9ed1b95255569b97ef7d0e236fa8b7cf0a Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Thu, 17 Apr 2025 13:47:53 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E7=BB=B4=E4=BF=AE=E5=8D=95?=
 =?UTF-8?q?=E5=BA=94=E6=94=B6=E8=B0=83=E5=B7=AE=E3=80=81=E7=BB=B4=E4=BF=AE?=
 =?UTF-8?q?=E5=8D=95=E5=BC=80=E7=A5=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../relation/chooseRepairbill.vue                 |  2 +-
 .../workorderinvoicing/workorderinvoicingAdd.vue  |  2 +-
 .../workorderreceivableAdd.vue                    | 13 ++++++++++---
 .../relation/chooseRepairbill.vue                 |  2 +-
 .../gongdankaipiaoFlow/workorderinvoicingEdit.vue |  2 +-
 .../workorderreceivableEdit.vue                   | 15 +++++++++++----
 6 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/yxt-as-ui/src/views/operation/workorderinvoicing/relation/chooseRepairbill.vue b/yxt-as-ui/src/views/operation/workorderinvoicing/relation/chooseRepairbill.vue
index b1015c8b8d..e1a556392c 100644
--- a/yxt-as-ui/src/views/operation/workorderinvoicing/relation/chooseRepairbill.vue
+++ b/yxt-as-ui/src/views/operation/workorderinvoicing/relation/chooseRepairbill.vue
@@ -59,7 +59,7 @@
             <el-table-column prop="outAmount" label="外出费" align="center" width="130" />
             <el-table-column prop="otherAmount" label="其它费用" align="center" width="130" />
             <el-table-column prop="settleTime" label="结算日期" align="center" width="120" />
-            <el-table-column prop="totalAmount" label="结算金额合计" align="center" width="150" />
+            <el-table-column prop="settleAmount" label="结算金额合计" align="center" width="150" />
           </el-table>
         </div>
         <div class="pages">
diff --git a/yxt-as-ui/src/views/operation/workorderinvoicing/workorderinvoicingAdd.vue b/yxt-as-ui/src/views/operation/workorderinvoicing/workorderinvoicingAdd.vue
index 5aac017244..a94f162ee5 100644
--- a/yxt-as-ui/src/views/operation/workorderinvoicing/workorderinvoicingAdd.vue
+++ b/yxt-as-ui/src/views/operation/workorderinvoicing/workorderinvoicingAdd.vue
@@ -277,7 +277,7 @@ export default {
             outAmount: e.outAmount,
             rescueAmount: e.rescueAmount,
             otherAmount: e.otherAmount,
-            totalAmount: e.totalAmount
+            totalAmount: e.settleAmount
           })
         })
       }
diff --git a/yxt-as-ui/src/views/operation/workorderreceivable/workorderreceivableAdd.vue b/yxt-as-ui/src/views/operation/workorderreceivable/workorderreceivableAdd.vue
index 2e6a862416..c15e0a4139 100644
--- a/yxt-as-ui/src/views/operation/workorderreceivable/workorderreceivableAdd.vue
+++ b/yxt-as-ui/src/views/operation/workorderreceivable/workorderreceivableAdd.vue
@@ -43,6 +43,11 @@
           <div class="title">维修单列表</div>
           <el-table :key="tableKey" :data="formobj.asBwdiffapplyDetailList" :index="index" border style="width: 100%">
             <el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center"/>
+            <el-table-column label="操作" align="center" width="100">
+              <template slot-scope="scope">
+                <el-button type="danger" size="small" @click="handleDelete(scope.$index)">删除</el-button>
+              </template>
+            </el-table-column>
             <el-table-column prop="sourceBillNo" label="维修单号" align="center" width="170" />
             <el-table-column prop="customerName" label="客户名称" align="center" width="150" />
             <el-table-column prop="vehMark" label="车牌号" align="center" width="150" />
@@ -222,8 +227,7 @@ export default {
     },
     chooseGd() {
       this.viewState = 2
-      const aa = []
-      this.$refs['divGD'].showData(aa, this.formobj.deptSid)
+      this.$refs['divGD'].showData(this.formobj.asBwdiffapplyDetailList, this.formobj.deptSid)
     },
     backData(value) {
       this.viewState = 1
@@ -244,7 +248,7 @@ export default {
             outAmount: e.outAmount,
             rescueAmount: e.rescueAmount,
             otherAmount: e.otherAmount,
-            totalAmount: e.totalAmount,
+            totalAmount: e.settleAmount,
             diffHourAmount: '',
             diffGoodsAmount: '',
             diffOutAomunt: '',
@@ -260,6 +264,9 @@ export default {
     resetState() {
       this.viewState = 1
     },
+    handleDelete(index) {
+      this.formobj.asBwdiffapplyDetailList.splice(index, 1)
+    },
     // 计算列表中差异调整的合计金额
     jeTotal(row) {
       row.diffTotalAmount = Math.round((parseFloat(row.diffHourAmount === '' ? '0' : row.diffHourAmount) + parseFloat(row.diffGoodsAmount === '' ? '0' : row.diffGoodsAmount) + parseFloat(row.diffOutAomunt === '' ? '0' : row.diffOutAomunt) + parseFloat(row.diffRescueAmount === '' ? '0' : row.diffRescueAmount) + parseFloat(row.diffOtherAmount === '' ? '0' : row.diffOtherAmount)) * 100) / 100
diff --git a/yxt-as-ui/src/views/workFlow/gongdankaipiaoFlow/relation/chooseRepairbill.vue b/yxt-as-ui/src/views/workFlow/gongdankaipiaoFlow/relation/chooseRepairbill.vue
index 93f9bec721..bc90412a3d 100644
--- a/yxt-as-ui/src/views/workFlow/gongdankaipiaoFlow/relation/chooseRepairbill.vue
+++ b/yxt-as-ui/src/views/workFlow/gongdankaipiaoFlow/relation/chooseRepairbill.vue
@@ -59,7 +59,7 @@
             <el-table-column prop="outAmount" label="外出费" align="center" width="130" />
             <el-table-column prop="otherAmount" label="其它费用" align="center" width="130" />
             <el-table-column prop="settleTime" label="结算日期" align="center" width="120" />
-            <el-table-column prop="totalAmount" label="结算金额合计" align="center" width="150" />
+            <el-table-column prop="settleAmount" label="结算金额合计" align="center" width="150" />
           </el-table>
         </div>
         <div class="pages">
diff --git a/yxt-as-ui/src/views/workFlow/gongdankaipiaoFlow/workorderinvoicingEdit.vue b/yxt-as-ui/src/views/workFlow/gongdankaipiaoFlow/workorderinvoicingEdit.vue
index b44245a462..cafa7a0d79 100644
--- a/yxt-as-ui/src/views/workFlow/gongdankaipiaoFlow/workorderinvoicingEdit.vue
+++ b/yxt-as-ui/src/views/workFlow/gongdankaipiaoFlow/workorderinvoicingEdit.vue
@@ -272,7 +272,7 @@ export default {
             outAmount: e.outAmount,
             rescueAmount: e.rescueAmount,
             otherAmount: e.otherAmount,
-            totalAmount: e.totalAmount
+            totalAmount: e.settleAmount
           })
         })
       }
diff --git a/yxt-as-ui/src/views/workFlow/gongdanyingshouFlow/workorderreceivableEdit.vue b/yxt-as-ui/src/views/workFlow/gongdanyingshouFlow/workorderreceivableEdit.vue
index e6a7bdd364..c1608c0d08 100644
--- a/yxt-as-ui/src/views/workFlow/gongdanyingshouFlow/workorderreceivableEdit.vue
+++ b/yxt-as-ui/src/views/workFlow/gongdanyingshouFlow/workorderreceivableEdit.vue
@@ -4,7 +4,7 @@
       <div class="tab-header webtop">
         <div>{{ viewTitle }}</div>
         <div>
-          <el-button type="primary" size="small" :disabled="submitdisabled" @click="chooseGd()">选择工单</el-button>
+          <el-button type="primary" size="small" :disabled="submitdisabled" @click="chooseGd()">选择维修单</el-button>
           <el-button type="primary" size="small" :disabled="submitdisabled" @click="saveOrUpdate()">保存</el-button>
           <el-button type="primary" size="small" :disabled="submitdisabled" @click="submit()">提交</el-button>
         </div>
@@ -42,6 +42,11 @@
           <div class="title">维修单列表</div>
           <el-table :key="tableKey" :data="formobj.asBwdiffapplyDetailList" :index="index" border style="width: 100%">
             <el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center"/>
+            <el-table-column label="操作" align="center" width="100">
+              <template slot-scope="scope">
+                <el-button type="danger" size="small" @click="handleDelete(scope.$index)">删除</el-button>
+              </template>
+            </el-table-column>
             <el-table-column prop="sourceBillNo" label="维修单号" align="center" width="170" />
             <el-table-column prop="customerName" label="客户名称" align="center" width="150" />
             <el-table-column prop="vehMark" label="车牌号" align="center" width="150" />
@@ -221,8 +226,7 @@ export default {
     },
     chooseGd() {
       this.viewState = 2
-      const aa = []
-      this.$refs['divGD'].showData(aa, this.formobj.deptSid)
+      this.$refs['divGD'].showData(this.formobj.asBwdiffapplyDetailList, this.formobj.deptSid)
     },
     backData(value) {
       this.viewState = 1
@@ -243,7 +247,7 @@ export default {
             outAmount: e.outAmount,
             rescueAmount: e.rescueAmount,
             otherAmount: e.otherAmount,
-            totalAmount: e.totalAmount,
+            totalAmount: e.settleAmount,
             diffHourAmount: '',
             diffGoodsAmount: '',
             diffOutAomunt: '',
@@ -259,6 +263,9 @@ export default {
     resetState() {
       this.viewState = 1
     },
+    handleDelete(index) {
+      this.formobj.asBwdiffapplyDetailList.splice(index, 1)
+    },
     // 计算列表中差异调整的合计金额
     jeTotal(row) {
       row.diffTotalAmount = Math.round((parseFloat(row.diffHourAmount === '' ? '0' : row.diffHourAmount) + parseFloat(row.diffGoodsAmount === '' ? '0' : row.diffGoodsAmount) + parseFloat(row.diffOutAomunt === '' ? '0' : row.diffOutAomunt) + parseFloat(row.diffRescueAmount === '' ? '0' : row.diffRescueAmount) + parseFloat(row.diffOtherAmount === '' ? '0' : row.diffOtherAmount)) * 100) / 100