apps/supplier-dispatch-h5
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ios页面更改

Browse Source
This commit is contained in:
zhouxueli
2023-08-24 16:02:13 +08:00
parent 65d6d73590
commit ed9302d780
9 changed files with 182 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/commonBtn.vue
View File

@ -31,7 +31,7 @@ import {myMixins} from "@/utils/myMixins"
<style scoped lang="scss"> <style scoped lang="scss">
@import "@/styles/mixin.scss"; @import "@/styles/mixin.scss";
.button { .button {
position: fixed; position: absolute;
bottom: 30px; bottom: 30px;
border-radius: 5px; border-radius: 5px;
text-align: center; text-align: center;

13
src/router/index.js
View File

@ -112,11 +112,14 @@ const routes = [
title:'司机新增或修改' title:'司机新增或修改'
} }
}, },
// { {
// path: '/trainDocment', path: '/trainDocment',
// name: 'trainDocment', name: 'trainDocment',
// component:()=>import('@/views/docmentView') component:()=>import('@/views/documentView/trainDocment.vue'),
// } meta: {
title:'培训文档'
}
}
] ]
const router = new VueRouter({ const router = new VueRouter({

0
src/views/docmentView
View File

85
src/views/documentView/trainDocment.vue Normal file
View File

@ -0,0 +1,85 @@
<template>
<div class="wrap">
<div class="navBar">
<van-nav-bar
title="培训文档 "
left-arrow
left-arrow-color="#FFFFFF"
:border="false"
:fixed="true"
:safe-area-inset-top="true"
@click-left="goBack"
>
<template slot="right">
<div class="rightWrap">
<img src="@/assets/serach.png" class="img2"/>
</div>
</template>
</van-nav-bar>
</div>
<div class="contentWrap">
<div class="itemWrap">
<div class="info">
<div class="title">会记回家和</div>
<div class="time">2023-08-24 13:14:00</div>
</div>
<div class="imgWrap">
<img src="@/assets/empty.png">
</div>
<div class="num">111</div>
<div class="doc">
<div class="left">培训材料</div>
<div class="right">
<span>未处理</span>
<span>阅读 8</span>
</div>
</div>
</div>
</div>
</div>
</template>
<script>
import {myMixins} from "@/utils/myMixins"
export default {
name: "trainDocment",
mixins:[myMixins],
}
</script>
<style scoped lang="scss">
@import "@/styles/common.scss";
@import "@/styles/mixin.scss";
.wrap{
width: 100%;
height: 100%;
background-color: #F4F5F7;
overflow-y: auto;
}
.navBar{
margin-bottom: 46px;
}
.rightWrap {
@include flexCenter;
.img2 {
@include wh(17px, 17px)
}
}
.contentWrap{
padding: 0 8px;
width: 100%;
box-sizing: border-box;
.itemWrap{
margin-top: 56px;
@include wh(100%, 300px);
background: #FFFFFF;
box-shadow: 0px 2px 10px 0px rgba(216, 216, 216, 0.5);
border-radius: 3px;
box-sizing: border-box;
//padding: 11px 13px 9px 15px;
@include fontWeightSize(400, 12px);
@include flexBetween;
}
}
</style>

56
src/views/index/supplySettlement.vue
View File

@ -40,24 +40,27 @@
<div>小轮个数</div> <div>小轮个数</div>
<div>等候费</div> <div>等候费</div>
<div>困境费</div> <div>困境费</div>
<div class="blueColor">已收取客户金额</div> <div class="blueColor" style="font-weight: 500;font-size: 14px">已收取客户金额</div>
</div> </div>
<div class="rightInputMeters" style="opacity: 1"> <div class="rightInputMeters" style="opacity: 1">
<div class="alignRight"><input type="number" v-model="form.tyreNumber"/>个</div> <div class="alignRight"><input type="number" v-model="form.tyreNumber"/>个</div>
<div class="alignRight"><input type="number" v-model="form.waitAmount"/>元</div> <div class="alignRight"><input type="number" v-model="form.waitAmount"/>元</div>
<div class="alignRight"><input type="number" v-model="form.dilemmaFee"/>元</div> <div class="alignRight"><input type="number" v-model="form.dilemmaFee"/>元</div>
<div class="blueColor"><input type="number" v-model="form.customerAmount"/>元</div> <div class="blueColor" style="font-weight: 500;font-size: 14px ;"><input class="blueColor" type="number" v-model="form.customerAmount"/>元</div>
</div> </div>
</div> </div>
</div> </div>
<div class="fixed-bottom"> <div class="btn">
<common-btn class="btn" @submitClick="submit" /> <button>提交</button>
</div> </div>
<!-- <div class="fixed-bottom">-->
<!-- <common-btn class="btn" @submitClick="submit" />-->
<!-- </div>-->
</div> </div>
</template> </template>
<script> <script>
import CommonBtn from "@/components/commonBtn.vue" // import CommonBtn from "@/components/commonBtn.vue"
import {leftCopy} from "@/utils/common" import {leftCopy} from "@/utils/common"
import {getOrderSettlement, updateOrderSettlement} from "@/api/order" import {getOrderSettlement, updateOrderSettlement} from "@/api/order"
export default { export default {
@ -127,7 +130,7 @@ export default {
} }
}, },
components:{ components:{
CommonBtn // CommonBtn
} }
} }
</script> </script>
@ -135,10 +138,9 @@ export default {
<style scoped lang="scss"> <style scoped lang="scss">
@import "@/styles/mixin.scss"; @import "@/styles/mixin.scss";
.wrap { .wrap {
@include wh(100%,100vh); @include wh(100%,100%);
background-color: #F4F5F7; background-color: #F4F5F7;
overflow-y: auto; overflow-y: scroll;
position: relative;
} }
.common { .common {
@include wh(100%, 161px); @include wh(100%, 161px);
@ -150,7 +152,7 @@ export default {
} }
.otherFee { .otherFee {
@include wh(100%, 198px); @include wh(100%, 198px);
margin-bottom: 20px; //margin-bottom: 20px;
} }
.title { .title {
@include fontWeightSize(bold, 14px); @include fontWeightSize(bold, 14px);
@ -170,9 +172,6 @@ export default {
justify-content: space-between; justify-content: space-between;
line-height: 37px; line-height: 37px;
.blueColor{ .blueColor{
display: flex;
flex-wrap: nowrap;
@include fontWeightSize(bold,14px);
color: #4682FE; color: #4682FE;
} }
.alignRight{ .alignRight{
@ -188,6 +187,7 @@ export default {
color: #323643; color: #323643;
opacity: .5; opacity: .5;
input { input {
height: 30px;
border: none; border: none;
text-align: right; text-align: right;
color: #323643; color: #323643;
@ -195,22 +195,20 @@ export default {
} }
} }
} }
.fixed-bottom { .btn {
margin-top: 20px;
position: fixed; /* 设置按钮容器为固定定位 */ display: flex;
left: 0; align-items: center;
right: 0; justify-content: center;
bottom: 0; margin-top: 20px;
//padding: 10px; /* 可根据需要调整按钮容器的内边距 */ margin-bottom: 20px;
//background-color: #f0f0f0; /* 可根据需要设置按钮容器的背景颜色 */ button {
//box-shadow: 0 -2px 4px rgba(0, 0, 0, 0.2); /* 可根据需要添加按钮容器的阴影效果 */ border: none;
border-radius: 5px;
text-align: center;
@include bgFontColor(#FFFFFF,#354D93);
@include fontWeightSize(bold,15px);
@include whLin(88%,48px);
} }
/* 如果需要调整按钮在底部容器内的位置，可以使用更具体的选择器进行样式调整 */
.fixed-bottom .btn {
position: absolute; /* 将按钮设置为绝对定位 */
bottom: 30px; /* 可根据需要调整按钮距离底部的距离 */
left: 50%; /* 可根据需要调整按钮在容器中的水平位置 */
transform: translateX(-50%); /* 将按钮向左偏移自身宽度的一半，使其居中 */
} }
</style> </style>

2
src/views/index/vehicleAdd.vue
View File

@ -152,7 +152,7 @@ export default {
vehicleId:this.id ? this.id : '', vehicleId:this.id ? this.id : '',
plateNumber:this.carNum ? this.carNum :'', plateNumber:this.carNum ? this.carNum :'',
vehicleType:this.selectedOption ? this.selectedOption : '', vehicleType:this.selectedOption ? this.selectedOption : '',
hasPolymerization:Number(this.isJoin ? this.isJoin : '') , hasPolymerization:this.isJoin ? this.isJoin : '',
serviceIds:this.serviceIds ? this.serviceIds : [] serviceIds:this.serviceIds ? this.serviceIds : []
}) })
if(this.id){ if(this.id){

16
src/views/trainDocment.vue
View File

@ -1,16 +0,0 @@
<template>
<div class="wrap">
培训文档
</div>
</template>
<script>
export default {
name: "trainDocment",
}
</script>
<style scoped lang="scss">
@import "@/styles/common.scss";
@import "@/styles/mixin.scss";
</style>

29
src/views/workOrder/accounting.vue
View File

@ -59,7 +59,7 @@
<div class="inpInfo"> <div class="inpInfo">
<div class="titleContent"> <div class="titleContent">
<div class="flex-between" v-show="abState"> <div class="flex-between" v-show="abState">
<div> 到达事发地距离:</div> <div> 到事发地距离:</div>
<div class="halfOpcity"><input type="number" v-model="form.supplierSettleMileageAb"/>公里</div> <div class="halfOpcity"><input type="number" v-model="form.supplierSettleMileageAb"/>公里</div>
</div> </div>
<div class="flex-between" v-show="bcState" > <div class="flex-between" v-show="bcState" >
@ -131,8 +131,8 @@
<td class="col2 supplierShuju">供应商数据</td> <td class="col2 supplierShuju">供应商数据</td>
</tr> </tr>
<tr v-show="abState"> <tr v-show="abState">
<td class="col1">到达事发地距离:{{orderInfo.settleMileageAb + '公里'}}</td> <td class="col1">到事发地距离:{{orderInfo.settleMileageAb + '公里'}}</td>
<td class="col2 halfOpc"><input placeholder="输入到达事发地距离" v-model="form.supplierSettleMileageAb"/></td> <td class="col2 halfOpc"><input placeholder="输入到事发地距离" v-model="form.supplierSettleMileageAb"/></td>
</tr> </tr>
<tr v-show="bcState"> <tr v-show="bcState">
<td class="col1">拖车里程:{{orderInfo.settleMileageBc + '公里'}}</td> <td class="col1">拖车里程:{{orderInfo.settleMileageBc + '公里'}}</td>
@ -267,6 +267,7 @@ export default {
auditPhotoList:[], auditPhotoList:[],
supplierPhotoList:[], supplierPhotoList:[],
index:'',//记录工单对账属于哪个状态 index:'',//记录工单对账属于哪个状态
uploadedImage: null,
form:{ form:{
id:'', id:'',
taskOrderCostHisId:'', taskOrderCostHisId:'',
@ -360,6 +361,19 @@ export default {
}, },
}, },
methods:{ 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) { handleFileRead(file) {
console.log("file",file) console.log("file",file)
}, },
@ -620,7 +634,10 @@ img{
} }
.supplierData{ .supplierData{
@include wh(100%,438px); width: 100%;
margin-bottom: 0;
//@include wh(100%,438px);
.inpInfo{ .inpInfo{
//display: flex; //display: flex;
//justify-content: space-between; //justify-content: space-between;
@ -663,7 +680,7 @@ img{
box-sizing: border-box; box-sizing: border-box;
} }
.btn{ .btn{
margin-top: 8px; margin-top: 28px;
} }
} }
.dataType{ .dataType{
@ -755,7 +772,7 @@ img{
display: flex; display: flex;
justify-content: space-around; justify-content: space-around;
box-sizing: border-box; box-sizing: border-box;
padding: 0 8px; //padding: 0 8px;
button{ button{
@include wh(105px,39px); @include wh(105px,39px);
line-height: 39px; line-height: 39px;

16
src/views/workOrder/workOrderReconciliation.vue
View File

@ -33,6 +33,8 @@
{{ item.name }} {{ item.name }}
</div> </div>
</div> </div>
<van-pull-refresh v-model="isLoading" @refresh="onRefresh">
<div > <div >
<div class="content_wrap" v-for="(item,index) in orderList" :key="index"> <div class="content_wrap" v-for="(item,index) in orderList" :key="index">
<div class="codeTxt common"> <div class="codeTxt common">
@ -62,12 +64,9 @@
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<!-- <div v-show="show" style="display: flex;justify-content: center;align-items: center; width: 100%; height: 80%;">--> </van-pull-refresh>
<!-- <img src="@/assets/empty.png">-->
<!-- </div>-->
</div> </div>
</template> </template>
@ -91,7 +90,7 @@ export default {
showDatetime: false, showDatetime: false,
currentDate: new Date(), currentDate: new Date(),
ymTime: '', ymTime: '',
recordIndex:'', isLoading:"",
} }
}, },
mounted() { mounted() {
@ -102,6 +101,13 @@ export default {
this.getList(); this.getList();
}, },
methods: { methods: {
onRefresh() {
this.getList()
setTimeout(() => {
this.$toast('刷新成功');
this.isLoading = false;
}, 1000);
},
initIndex(){ initIndex(){
if(this.activeIndex === 0){ if(this.activeIndex === 0){
this.queryType = 1 this.queryType = 1