From d78810a5030503b6d5518e00c8c62480f0306861 Mon Sep 17 00:00:00 2001 From: zhouxueli <2841188632@qq.com> Date: Tue, 7 May 2024 21:49:35 +0800 Subject: [PATCH] =?UTF-8?q?task#13641,=E6=9F=A5=E7=9C=8B=E7=BB=93=E7=AE=97?= =?UTF-8?q?=E5=8D=95=E6=8E=A5=E5=8F=A3=E6=9B=B4=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/workOrder/accounting.vue | 30 ++++++--- src/views/workOrder/settlementDetail.vue | 80 +++++------------------- 2 files changed, 35 insertions(+), 75 deletions(-) diff --git a/src/views/workOrder/accounting.vue b/src/views/workOrder/accounting.vue index f013cd19..79bb1910 100644 --- a/src/views/workOrder/accounting.vue +++ b/src/views/workOrder/accounting.vue @@ -42,14 +42,8 @@
结算方式： {{orderInfo.taskSettleType?.label }} - 查看结算单 + 查看结算单
-
扣除责任险费： {{orderInfo.policyAmount}} {{orderInfo.cutInsuranceAmount}} @@ -214,7 +208,7 @@
备注:{{orderInfo.supplierRemark}}
本次补充说明:
- +
@@ -247,6 +241,7 @@ import { selectRecordPictureList, deleteImage } from "@/api/mine" import { ImagePreview } from "vant"; +import {orderReportingList} from "@/api/order"; export default { name: "accountingView", mixins:[myMixins], @@ -359,7 +354,8 @@ export default { }, noClick:true, loading: false, - loading1: false + loading1: false, + settleDetail:[], } }, async mounted() { @@ -369,6 +365,7 @@ export default { this.queryTime = this.$route.params?.queryTime this.$nextTick(async ()=>{ await this.getDetail() + await this.getSettlementDetail() }) }, computed:{ @@ -393,7 +390,8 @@ export default { id: this.id, // 参数对象的属性 postfix:this.postfix, index:this.activeIndex, - queryTime: this.time || this.queryTime + queryTime: this.time || this.queryTime, + settleDetailList:this.settleDetail } }) }, @@ -426,6 +424,18 @@ export default { startPosition: index, closeable: true, }); + + }, + async getSettlementDetail(){ + let res = await orderReportingList({ + queryType:7, + userOrderId:this.orderInfo.userOrderId, + orderCode: this.orderInfo.orderCode, + taskOrderId:this.orderInfo.taskOrderId, + searchCostRemark:1 + }) + this.settleDetail=res.data + console.log("工单列表接口res",this.settleDetail) }, handleFileRead(file) { console.log("file",file) diff --git a/src/views/workOrder/settlementDetail.vue b/src/views/workOrder/settlementDetail.vue index 920909f5..fa4242bc 100644 --- a/src/views/workOrder/settlementDetail.vue +++ b/src/views/workOrder/settlementDetail.vue @@ -11,57 +11,8 @@ @click-left="goback" />
-
-
结算单:
-
-
- 起步价：     - {{orderInfo.startPrice}} -
-
- 包含公里数： - {{ orderInfo.containMileage }} -
-
- 每公里单价： - {{ orderInfo.unitPrice }} -
-
- 基本总费用： - {{ orderInfo.supplierBasePrice }} -
-
- 路桥费： - {{orderInfo.supplierBridgeAmountAb + '+' + orderInfo.supplierBridgeAmountBc + '+' + orderInfo.supplierBridgeAmountCa}} -
-
- 等候费： - {{orderInfo.supplierWaitAmount}} -
-
- 辅助轮费： - {{orderInfo.supplierTyreAmount}} -
-
- 困境费： - {{orderInfo.supplierDilemmaAmount}} -
-
- 其他费用： - {{orderInfo. supplierOtherAmount}} -
-
- 额外费用总计： - {{orderInfo.supplierExtraPrice}} -
-
- 费用总计： - {{orderInfo.supplierSettleAmount}} -
-
- 公里数： - {{orderInfo.supplierSettleMileageAb + '+' + orderInfo.supplierSettleMileageBc + '+' + orderInfo.supplierSettleMileageCa}} -
+
+
{{item.remark}}
@@ -69,7 +20,7 @@ @@ -146,16 +89,23 @@ export default { line-height: 27px; } } +.itemWrap{ + background-color: #FFFFFF; + margin-bottom: 10px; + box-sizing: border-box; + padding: 15px; +} + img{ @include wh(35px,15px); margin-left: 21px; } -.common{ +/*.common{ background-color: #FFFFFF; padding: 11px 24px 14px; box-sizing: border-box; margin-bottom: 10px; -} +}*/ .baseInfo{ @include wh(100%,100%);