diff --git a/src/views/workOrder/accounting.vue b/src/views/workOrder/accounting.vue index 25871e71..f705cb94 100644 --- a/src/views/workOrder/accounting.vue +++ b/src/views/workOrder/accounting.vue @@ -216,6 +216,7 @@ + @@ -226,7 +227,7 @@ import {leftCopy} from '@/utils/common' import { getAccountRecordDetail, accountRecordCompute, updateAccountRecordInfo, - selectRecordPictureList,deleteImage + selectRecordPictureList, deleteImage, deleteVehicle } from "@/api/mine" import { ImagePreview } from "vant"; import TwoCommonBtn from "@/components/twoBtnCommon.vue" @@ -262,12 +263,13 @@ export default { auditBasePrice:'0', auditExtraPrice:'0', extraPrice:'0', - commitLoading: false, auditFormShow:false, auditPhotoList:[], supplierPhotoList:[], index:'',//记录工单对账属于哪个状态 uploadedImage: null, + show:false,//是否显示弹框 + imgId:'',//删除供应商图片的Id form:{ id:'', taskOrderCostHisId:'', @@ -505,18 +507,14 @@ export default { this.goback() }, async save() { - console.log(111111111111) - this.commitLoading = true; if(this.form.supplierOtherAmount > 0){ if(this.form.supplierOtherAmountRemark == ''){ this.$alert('请填写其他费用说明'); - this.commitLoading = false; return; } } if(this.accountStatus >= 4){ this.$alert('已进入后续流程,不允许操作'); - this.commitLoading = false; return; } let accountStatus = 0 @@ -557,16 +555,18 @@ export default { this.$router.back() },2000) } - this.commitLoading = false; }, async delSupplierPhoto(item){ - let res = await deleteImage({ - recordPictureId:item.id, - postfix:this.postfix - }) - this.$toast(res.msg) - await this.pictureList() - } + this.show = true + this.imgId=item.id + }, + async handleConfirm(){//删除供应商图片 + await deleteImage({ + recordPictureId:this.imgId, + postfix:this.postfix + }) + await this.pictureList() + }, }, components:{ TwoCommonBtn @@ -578,8 +578,7 @@ export default { @import "@/styles/mixin.scss"; @import "@/styles/common.scss"; .wrap{ - width: 100%; - height: 100%; + @include wh(100%,100%); background-color: #F4F5F7; overflow-y: auto; } @@ -599,11 +598,9 @@ export default { border-image: linear-gradient(270deg, rgba(217, 217, 217, 0.6), rgba(178, 178, 178, 1), rgba(178, 178, 178, 1), rgba(217, 217, 217, 0.6)) 1 1; } .item{ - display: flex; - align-items: center; + @include flexCenter; font-size: 12px !important; font-weight: 400 !important; - //@include fontWeightSize(400,12px) !important; .titleLeft{ opacity: .5; line-height: 27px; @@ -626,11 +623,7 @@ img{ .supplierData{ width: 100%; margin-bottom: 0; - - //@include wh(100%,438px); .inpInfo{ - //display: flex; - //justify-content: space-between; margin: 0 5px; color: #323643; line-height: 32px; @@ -640,7 +633,6 @@ img{ } .titleContent{ @include fontWeightSize(bold,13px); - } .flex-between{ @include flexColBet @@ -650,7 +642,6 @@ img{ } .inputContent{ text-align: right; - } } .btnComputed{ diff --git a/src/views/workOrder/workOrderReconciliation.vue b/src/views/workOrder/workOrderReconciliation.vue index d39d168c..0e72aa3e 100644 --- a/src/views/workOrder/workOrderReconciliation.vue +++ b/src/views/workOrder/workOrderReconciliation.vue @@ -34,7 +34,7 @@ - +
@@ -252,8 +252,7 @@ export default { .active:after { content: ''; display: block; - width: 18px; - height: 3px; + @include wh(18px,3px); background: linear-gradient(270deg, #33A3FF 0%, #176AFE 100%); border-radius: 2px; position: absolute; @@ -278,20 +277,16 @@ export default { @include flexColBet(); margin-left: 18px; margin-right: 14px; - } - .line { @include wh(100%, 1px); background: #E9E9EA; opacity: 0.6; } - .supplier { margin-left: 18px; margin-right: 14px; } - .btn { //@include wh(48px, 18px); @include all-height(20px); @@ -300,18 +295,15 @@ export default { border-radius: 3px; border: none; } - .halfTxt { display: inline-block; width: 55px; @include fontWeightSize(400, 12px); opacity: .5; } - .allTxt { @include fontWeightSize(400, 12px) } - .orderCode { @include fontWeightSize(bold, 13px) }