diff --git a/src/api/mine.js b/src/api/mine.js index 953f957c..55f410fc 100644 --- a/src/api/mine.js +++ b/src/api/mine.js @@ -88,7 +88,7 @@ export function getAccountRecordDetail(data){ data }) } -//工单对账计算金额(记账) +//工单对账计算金额(计算) export function accountRecordCompute(data){ return request({ url:'/supplierAppV2/dispatchApp/accountRecord/accountRecordCompute', @@ -97,7 +97,7 @@ export function accountRecordCompute(data){ data }) } -//修改服务商记账信息 (重新记账) +//修改服务商记账信息 (提交记账) export function updateAccountRecordInfo(data){ return request({ url:'/supplierAppV2/dispatchApp/accountRecord/updateAccountRecordInfo', @@ -106,6 +106,37 @@ export function updateAccountRecordInfo(data){ data }) } +// 查询工单记账图片 +export function selectRecordPictureList(data){ + return request({ + url:'/supplierAppV2/dispatchApp/accountRecord/selectRecordPictureList', + method:'POST', + contentType:'application/json', + data + }) +} +//删除记账图片 +export function deleteImage(data){ + return request({ + url:'/supplierAppV2/dispatchApp/accountRecord/deleteImage', + method:'POST', + contentType:'application/json', + data + }) +} +//新增记账图片 form-data +export function insertRecordPicture(data){ + return request({ + url:'/supplierAppV2/dispatchApp/accountRecord/insertRecordPicture', + method:'POST', + contentType:'multipart/form-data', + data, + // headers: { + // 'Content-Type': 'multipart/form-data', + // }, + }) +} + //开票通知列表 export function notifyInvoiceList(data){ return request({ diff --git a/src/views/workOrder/accounting.vue b/src/views/workOrder/accounting.vue index cbf8d828..dfb58689 100644 --- a/src/views/workOrder/accounting.vue +++ b/src/views/workOrder/accounting.vue @@ -29,7 +29,7 @@
工单状态: - {{ orderInfo.taskSuccessStatus?.label }} + {{ orderInfo.taskStatus?.label }}
结算比例: @@ -102,15 +102,15 @@
收取客户金额:
-
+
基本费用:
-
+
-
+
额外费用总计:
-
+
费用总计:
@@ -172,11 +172,11 @@ 基本费用:{{orderInfo.basePrice +'元'}} - + 额外费用总计:{{orderInfo.extraPrice +'元'}} - + 收取客户:{{orderInfo.customerAmount +'元'}} @@ -184,28 +184,30 @@ 费用总计:{{orderInfo.settleAmount +'元'}} - - + +
审核失败原因
-
{{orderInfo.financeRefuseAuditRemark}}
-
- +
{{orderInfo.auditRemark}}
+
+
-
本次补充说明:
- -
+
备注:{{orderInfo.supplierRemark}}
+
本次补充说明:
+
+ +
+
import {myMixins} from '@/utils/myMixins' import {leftCopy} from '@/utils/common' -import {getAccountRecordDetail,accountRecordCompute,updateAccountRecordInfo} from "@/api/mine" +import { + getAccountRecordDetail, accountRecordCompute, + updateAccountRecordInfo, insertRecordPicture, + selectRecordPictureList,deleteImage +} from "@/api/mine" import TwoCommonBtn from "@/components/twoBtnCommon.vue" export default { name: "accountingView", mixins:[myMixins], data(){ return{ - fileList:[], + files: [], + formData:'', id:'', postfix:'', orderInfo:{}, @@ -257,6 +264,8 @@ export default { extraPrice:'0', commitLoading: false, auditFormShow:false, + auditPhotoList:[], + supplierPhotoList:[], form:{ id:'', taskOrderCostHisId:'', @@ -334,7 +343,6 @@ export default { this.$nextTick(async ()=>{ await this.getDetail() }) - console.log("this.basePriceDisabled",this.basePriceDisabled) }, computed:{ basePriceDisabled(){ @@ -350,11 +358,9 @@ export default { }, }, methods:{ - handleFileRead({ file }) { - const url = URL.createObjectURL(file); - this.fileList.push({ file, url }); - this.$toast('图片上传成功'); - }, + handleFileRead() { + // console.log("file",file) + }, async compute() { //现金业务置为0 // if(this.form.contractSettleTypeString == '车主现收'){ @@ -391,6 +397,16 @@ export default { // console.log("有责任险",this.form.supplierSettleAmount) } }, + async pictureList(){ + let res = await selectRecordPictureList({ + taskOrderCostRecordId:this.id, + state:0, + postfix:this.postfix + }) + if(res.code === 200){ + this.supplierPhotoList = res.data + } + }, async getDetail(){ this.abState = false this.bcState = false @@ -420,7 +436,9 @@ export default { this.fixedPrice = this.orderInfo.fixedPrice this.fixedPriceType=this.orderInfo.fixedPriceType this.supplierId=this.orderInfo.supplierId + this.auditPhotoList=this.orderInfo.auditPhoto } + await this.pictureList() if(this.accountStatus == 1 || this.accountStatus == 0){//没有记录,等待审核 leftCopy(this.form, {...res.data}) // console.log("form",this.form) @@ -509,16 +527,31 @@ export default { accountStatus: accountStatus, supplierBridgeAmount:parseInt(this.form.supplierBridgeAmountAb || 0) + parseInt(this.form.supplierBridgeAmountBc || 0) + parseInt(this.form.supplierBridgeAmountCa || 0) }); + const formData = new FormData(); + this.files.forEach((file) => { + formData.append('file', file.file); + }); + formData.append('taskOrderCostRecordId', this.id); + formData.append('state', 0); + formData.append('postfix', this.postfix); + await insertRecordPicture(formData); if(res.code === 200){ this.$toast('操作成功') - // setTimeout(()=>{ - // this.$router.back() - // },) + setTimeout(()=>{ + this.$router.back() + },2000) } - // this.hiddenReset(); this.$emit('success'); this.commitLoading = false; }, + async delSupplierPhoto(item){ + let res = await deleteImage({ + recordPictureId:item.id, + postfix:this.postfix + }) + this.$toast(res.msg) + await this.pictureList() + } }, components:{ TwoCommonBtn @@ -636,15 +669,21 @@ img{ } .alignLeft{ text-align: left !important; + opacity: 1 !important; .reason{ @include fontWeightSize(400,11px); color: #FF8F37; opacity: 1 !important; } .camerImg{ - @include widHeiMar(54px,42px,4px); + @include widHeiMar(54px,42px,5px); margin-top: 15px; } + .supplierImg{ + @include widHeiMar(54px,42px,8px); + margin-top: 0; + margin-left: 0; + } .title{ @include fontWeightSize(400,11px); opacity: .5; diff --git a/src/views/workOrder/aduitCompleteDetail.vue b/src/views/workOrder/aduitCompleteDetail.vue index dbd2ff2c..e6b12e8c 100644 --- a/src/views/workOrder/aduitCompleteDetail.vue +++ b/src/views/workOrder/aduitCompleteDetail.vue @@ -29,7 +29,7 @@
工单状态: - {{ orderInfo.taskSuccessStatus?.label }} + {{ orderInfo.taskStatus?.label }}
结算比例: diff --git a/src/views/workOrder/workOrderReconciliation.vue b/src/views/workOrder/workOrderReconciliation.vue index ea4acf13..f71f5ba0 100644 --- a/src/views/workOrder/workOrderReconciliation.vue +++ b/src/views/workOrder/workOrderReconciliation.vue @@ -11,10 +11,10 @@ @click-left="goBack" > @@ -24,9 +24,8 @@ v-if="showDatetime" v-model="currentDate" type="year-month" - title="查询时间" @confirm="onConfirm" - @cancel="showDatetime == false" + @cancel="showDatetime = false" />