diff --git a/src/components/commonBtn.vue b/src/components/commonBtn.vue index 23fefad3..4b70520c 100644 --- a/src/components/commonBtn.vue +++ b/src/components/commonBtn.vue @@ -31,7 +31,7 @@ import {myMixins} from "@/utils/myMixins" \ No newline at end of file diff --git a/src/views/index/supplySettlement.vue b/src/views/index/supplySettlement.vue index ca1f2e99..4dd45f8d 100644 --- a/src/views/index/supplySettlement.vue +++ b/src/views/index/supplySettlement.vue @@ -40,24 +40,27 @@
小轮个数
等候费
困境费
-
已收取客户金额
+
已收取客户金额
-
+
-
- +
+
+ + +
@@ -135,10 +138,9 @@ export default { \ No newline at end of file diff --git a/src/views/index/vehicleAdd.vue b/src/views/index/vehicleAdd.vue index eb9b9bc6..eec260fc 100644 --- a/src/views/index/vehicleAdd.vue +++ b/src/views/index/vehicleAdd.vue @@ -152,7 +152,7 @@ export default { vehicleId:this.id ? this.id : '', plateNumber:this.carNum ? this.carNum :'', vehicleType:this.selectedOption ? this.selectedOption : '', - hasPolymerization:Number(this.isJoin ? this.isJoin : '') , + hasPolymerization:this.isJoin ? this.isJoin : '', serviceIds:this.serviceIds ? this.serviceIds : [] }) if(this.id){ diff --git a/src/views/trainDocment.vue b/src/views/trainDocment.vue deleted file mode 100644 index 5fcfe7fd..00000000 --- a/src/views/trainDocment.vue +++ /dev/null @@ -1,16 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/views/workOrder/accounting.vue b/src/views/workOrder/accounting.vue index 5d6e4b4b..70800247 100644 --- a/src/views/workOrder/accounting.vue +++ b/src/views/workOrder/accounting.vue @@ -59,7 +59,7 @@
-
到达事发地距离:
+
到事发地距离:
公里
@@ -131,8 +131,8 @@ 供应商数据 - 到达事发地距离:{{orderInfo.settleMileageAb + '公里'}} - + 到事发地距离:{{orderInfo.settleMileageAb + '公里'}} + 拖车里程:{{orderInfo.settleMileageBc + '公里'}} @@ -267,6 +267,7 @@ export default { auditPhotoList:[], supplierPhotoList:[], index:'',//记录工单对账属于哪个状态 + uploadedImage: null, form:{ id:'', taskOrderCostHisId:'', @@ -360,6 +361,19 @@ export default { }, }, methods:{ + // openFileSelector() { + // this.$refs.fileInput.click(); + // }, + // handleFileUpload(event) { + // const file = event.target.files[0]; + // if (file) { + // const reader = new FileReader(); + // reader.onload = (e) => { + // this.uploadedImage = e.target.result; + // }; + // reader.readAsDataURL(file); + // } + // }, handleFileRead(file) { console.log("file",file) }, @@ -620,7 +634,10 @@ img{ } .supplierData{ - @include wh(100%,438px); + width: 100%; + margin-bottom: 0; + + //@include wh(100%,438px); .inpInfo{ //display: flex; //justify-content: space-between; @@ -663,7 +680,7 @@ img{ box-sizing: border-box; } .btn{ - margin-top: 8px; + margin-top: 28px; } } .dataType{ @@ -755,7 +772,7 @@ img{ display: flex; justify-content: space-around; box-sizing: border-box; - padding: 0 8px; + //padding: 0 8px; button{ @include wh(105px,39px); line-height: 39px; diff --git a/src/views/workOrder/workOrderReconciliation.vue b/src/views/workOrder/workOrderReconciliation.vue index 071ac5d7..a9ff6f72 100644 --- a/src/views/workOrder/workOrderReconciliation.vue +++ b/src/views/workOrder/workOrderReconciliation.vue @@ -33,41 +33,40 @@ {{ item.name }}
-
-
-
-
- {{item.orderCode}} - {{ item.plateNumber }} + + +
+
+
+
+ {{item.orderCode}} + {{ item.plateNumber }} +
+
+ {{ item.taskStatus?.label }} +
-
- {{ item.taskStatus?.label }} +
+
+ 服务商: + {{ item.supplierName }}
-
-
-
- 服务商: - {{ item.supplierName }} -
-
-
- 审核状态: - {{ item.accountStatus?.label }} -
-
- - - - +
+
+ 审核状态: + {{ item.accountStatus?.label }} +
+
+ + + + +
+ -
- - - -
@@ -91,7 +90,7 @@ export default { showDatetime: false, currentDate: new Date(), ymTime: '', - recordIndex:'', + isLoading:"", } }, mounted() { @@ -102,6 +101,13 @@ export default { this.getList(); }, methods: { + onRefresh() { + this.getList() + setTimeout(() => { + this.$toast('刷新成功'); + this.isLoading = false; + }, 1000); + }, initIndex(){ if(this.activeIndex === 0){ this.queryType = 1