From a3948addd158aa21c5ef74579b1fd64ba1d958e9 Mon Sep 17 00:00:00 2001 From: zhouxueli <2841188632@qq.com> Date: Tue, 7 May 2024 15:16:58 +0800 Subject: [PATCH] =?UTF-8?q?task#13641,=E5=9C=A8=E8=B0=83=E5=BA=A6app?= =?UTF-8?q?=E7=9A=84=E5=AF=B9=E8=B4=A6=E5=88=9D=EF=BC=8C=E5=8A=A0=E4=B8=80?= =?UTF-8?q?=E4=B8=AA=E2=80=9C=E6=9F=A5=E7=9C=8B=E7=BB=93=E7=AE=97=E5=8D=95?= =?UTF-8?q?=E2=80=9D=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router/index.js | 9 +- src/views/workOrder/accounting.vue | 70 +++++---- src/views/workOrder/aduitCompleteDetail.vue | 1 - src/views/workOrder/settlementDetail.vue | 163 ++++++++++++++++++++ 4 files changed, 211 insertions(+), 32 deletions(-) create mode 100644 src/views/workOrder/settlementDetail.vue diff --git a/src/router/index.js b/src/router/index.js index 57c82f73..c0f88934 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -70,7 +70,14 @@ const routes = [ meta: { title: '审核完成-详情' } - + }, + { + path: "/settlementDetail", + name: 'settlementDetail', + component: () => import('@/views/workOrder/settlementDetail.vue'), + meta: { + title: '结算单详情' + } }, { path: "/invoicingNotify", diff --git a/src/views/workOrder/accounting.vue b/src/views/workOrder/accounting.vue index a685634f..f013cd19 100644 --- a/src/views/workOrder/accounting.vue +++ b/src/views/workOrder/accounting.vue @@ -39,22 +39,26 @@ 结算类型: {{ orderInfo.settleType?.label }} -
+
+ 结算方式: + {{orderInfo.taskSettleType?.label }} + 查看结算单 +
+ - -
- + {{orderInfo.taskSettleType?.label}} 查看照片 + + -->
扣除责任险费: {{orderInfo.policyAmount}} {{orderInfo.cutInsuranceAmount}}
- 工单照片: + 工单照片: + 查看照片 - +
@@ -210,7 +214,8 @@
备注:{{orderInfo.supplierRemark}}
本次补充说明:
- + +
-
@@ -243,7 +247,6 @@ import { selectRecordPictureList, deleteImage } from "@/api/mine" import { ImagePreview } from "vant"; -// import TwoCommonBtn from "@/components/twoBtnCommon.vue" export default { name: "accountingView", mixins:[myMixins], @@ -383,12 +386,19 @@ export default { }, }, methods:{ + viewSettlementDoc(){//查看结算单 + this.$router.push({ + name:"settlementDetail", + params:{ + id: this.id, // 参数对象的属性 + postfix:this.postfix, + index:this.activeIndex, + queryTime: this.time || this.queryTime + } + }) + }, checkPhoto(){ let isAllowImage = 1 - console.log("this.orderInfo.userOrderId",this.orderInfo.userOrderId) - console.log("this.orderInfo.orderCode",this.orderInfo.orderCode) - console.log("this.orderInfo.taskOrderId",this.orderInfo.taskOrderId) - console.log("isAllowImage",isAllowImage) let data = { "action": "orderPhoto", "params": { @@ -420,8 +430,10 @@ export default { handleFileRead(file) { console.log("file",file) }, + viewHandle(i){ + console.log("ii",i) + }, goback(){ - // console.log("aaaaa",this.queryTime) this.$router.push({ name:"workOrderReconciliation", params:{ @@ -449,8 +461,7 @@ export default { this.form.supplierBasePrice = dilemmaBasePrice this.form.supplierExtraPrice = 0 this.form.supplierSettleAmount = dilemmaBasePrice - (parseFloat(this.form.supplierCustomerAmount) || 0) - // console.log("困境案件费用总计",this.form.supplierSettleAmount) - }else{ + }else{ let data = await accountRecordCompute( { ...this.form, settleType:this.orderInfo.settleType?.code @@ -458,12 +469,10 @@ export default { this.form.supplierBasePrice = data.data.basePrice this.form.supplierExtraPrice = data.data.extraPrice this.form.supplierSettleAmount = data.data.totalPrice - // console.log("计算",this.form.supplierSettleAmount) } // } if(this.form.cutInsuranceAmount == 1 && this.form.policyState === 0){ this.form.supplierSettleAmount = parseFloat(parseFloat(this.form.supplierSettleAmount) - parseFloat(this.form.policyAmount || 0)).toFixed(2) - // console.log("有责任险",this.form.supplierSettleAmount) } }, async pictureList(){ @@ -785,16 +794,17 @@ export default { .rightContent{ width: calc(100% - 90px); @include fontWeightSize(bold,12px); - .driverPoiBtn{ - display: inline-block; - padding: 3px 8px; - @include bgFontColor(#FFFFFF,#354D93); - opacity: .7; - border-radius: 3px; - text-align: center; - //margin-left: 6px; - cursor: pointer; - } + + } + .driverPoiBtn{ + display: inline-block; + padding: 3px 8px; + @include bgFontColor(#FFFFFF,#354D93); + opacity: .7; + border-radius: 3px; + text-align: center; + //margin-left: 6px; + cursor: pointer; } } img{ diff --git a/src/views/workOrder/aduitCompleteDetail.vue b/src/views/workOrder/aduitCompleteDetail.vue index ccda9d85..63f56a21 100644 --- a/src/views/workOrder/aduitCompleteDetail.vue +++ b/src/views/workOrder/aduitCompleteDetail.vue @@ -163,7 +163,6 @@ export default { this.postfix=this.$route.params?.postfix; this.index=this.$route.params?.index; this.queryTime = this.$route.params?.queryTime - console.log("111111111111",this.$route.params?.queryTime) await this.getDetail() }, methods: { diff --git a/src/views/workOrder/settlementDetail.vue b/src/views/workOrder/settlementDetail.vue new file mode 100644 index 00000000..ef5e564e --- /dev/null +++ b/src/views/workOrder/settlementDetail.vue @@ -0,0 +1,163 @@ + + + + + \ No newline at end of file