Skip to content

B
biz-trina5-app
Commit 9114e792 authored by 贺世双's avatar 贺世双
Browse files
Options

调整界面

parent bf0b8600
Expand all Show whitespace changes
Inline Side-by-side
Showing with 860 additions and 93 deletions
App.vue
View file @ 9114e792
......@@ -208,9 +208,9 @@
/* 客户单号 */
.consumer_code {
font-size: 28rpx;
font-weight: 400;
color: #8C8C8C;
//font-size: 28rpx;
//font-weight: 400;
//color: #8C8C8C;
}
// 通用按钮
......
components/baseComponents/bs-pageHeader-orderNo/bs-pageHeader-orderNo.vue
View file @ 9114e792
<template>
<view class="page-header">
<view class="page-header-orderNo flex_center">
运单号： {{shipmentNo}}
运单号： {{shipment_no}}
</view>
</view>
</template>
......
components/orderItem/orderItem.vue
View file @ 9114e792
......@@ -2,7 +2,7 @@
<view class="shipmentItem box_shadow_card">
<view class="shipment-header flex_sb" style="padding: 28rpx 24rpx 0;">
<view class="consumer_code flex_center">
<text selectable> 基础订单号：{{propData['order_base_no'] || ''}}</text>
<text style="font-weight: 600;" selectable> 基础订单号：{{propData['order_base_no'] || ''}}</text>
</view>
<view :class="propData.execute_bu == null ? 'shipment-state' : 'shipment-state shipmenting'">
{{propData.execute_bu}}
......
components/orderPodItem/orderPodItem.vue
View file @ 9114e792
......@@ -2,7 +2,7 @@
<view class="orderPodItem box_shadow_card" @click="navToOrderPodDetail()">
<view class="shipment-header flex_sb" style="padding: 28rpx 24rpx 0;">
<view class="consumer_code flex_center">
<text selectable> 回单号：{{propData['pod_no'] || ''}}</text>
<text style="font-weight: 600;" selectable> 回单号：{{propData['pod_no'] || ''}}</text>
</view>
<view :class="propData.execute_bu == null ? 'shipment-state' : 'shipment-state shipmenting'">
{{propData.execute_bu}}
......
components/shipmentBriefInfo/shipmentBriefInfo.vue deleted 100644 → 0
View file @ bf0b8600
<template>
<view class="shipmentBriefInfo">
<bs-pageHeader-orderNo :shipmentNo="shipmentNo" />
<view class="primary-info routine_radius_card flex_center">
<view class="flex">
<view class="left-icon">
<view :class="['t-icon', stopsInfo.loadStop ? 't-icon-a-zhuang2x1' : 't-icon-a-xie2x1']" />
</view>
<view class="primary-desc flex_col">
<view style="margin-bottom: 8rpx;" class="font_bolder">{{stopsInfo.locationName}}</view>
<view>{{stopsInfo.locationAddress}}</view>
</view>
</view>
<view style="width: 100%;">
<bs-customCell label="货量 :" labelCol="2" wrapCol="10"
:value="stopsInfo.locationOrders + '单/' +stopsInfo.locationQty+ '件/' + stopsInfo.locationWeight+'千克/'+ stopsInfo.locationVolume+'方'" />
</view>
</view>
</view>
</template>
<script>
export default {
name: "shipmentBriefInfo",
options: { styleIsolation: 'shared' },
created: function() { //定义组件的生命周期
this.initData()
},
data() {
return {
stopsInfo: {}, //站点信息，
shipmentNo: '' //运单号
};
},
methods: {
initData() {
const appInstance = getApp()
const { stopsInfo, shipmentInfo } = appInstance.globalData
this.stopsInfo = stopsInfo
this.shipmentNo = shipmentInfo.shipmentNo
}
}
}
</script>
<style lang="scss">
.primary-info {
flex-wrap: wrap;
.left-icon {
position: relative;
margin-right: 20rpx;
.leftIcon-text {
font-size: 28rpx;
display: inline-block;
position: absolute;
top: 5px;
left: 12px;
}
.t-icon {
width: 70rpx;
height: 70rpx;
}
}
/deep/.custom-cell-row {
width: 100%;
margin-top: 32rpx;
color: #8C8C8C;
}
}
</style>
components/shipmentItem/shipmentItem.vue
View file @ 9114e792
......@@ -4,7 +4,7 @@
<u-checkbox iconSize="20rpx" shape="circle" size="20px" :name="propData" :checked="propData.checked">
</u-checkbox>
<view class="consumer_code flex_center">
<text selectable> 运单号：{{propData.shipment_no}}</text>
<text style="font-weight: 600;" selectable> 运单号：{{propData.shipment_no}}</text>
</view>
<view :class="propData.execute_bu == null ? 'shipment-state' : 'shipment-state shipmenting'">
{{propData.execute_bu}}
......@@ -106,10 +106,11 @@
.consumer_code {
line-height: 40rpx;
text-shadow: 1rpx 3rpx 12rpx rgba(0, 0, 0, 0.04);
margin-right: 85px;
margin-right: 54px;
}
.shipment-state {
font-size: 24rpx;
color: #F7A64A;
......
pages.json
View file @ 9114e792
......@@ -167,6 +167,18 @@
"navigationBarTitleText": "签收信息",
"enablePullDownRefresh": false
}
},{
"path": "onWayUpload/onWayUpload",
"style": {
"navigationBarTitleText": "在途上报",
"enablePullDownRefresh": false
}
},{
"path": "reportSign/reportSign",
"style": {
"navigationBarTitleText": "上报信息",
"enablePullDownRefresh": false
}
}
]
}],
......
pages/carrierMenu/carrierMenu.vue
View file @ 9114e792
......@@ -38,7 +38,7 @@
},{
title:"回单管理",
path:"/subpkg/orderPod/orderPod",
src: "../../static/img/bg/shipmentOrder.png"
src: "../../static/img/bg/orderPod.png"
}
],
isAgree: false,
......
pages/dirverMenu/dirverMenu.vue
View file @ 9114e792
......@@ -34,7 +34,11 @@
},{
title:"回单管理",
path:"/subpkg/orderPod/orderPod",
src: "../../static/img/bg/shipmentOrder.png"
src: "../../static/img/bg/orderPod.png"
},{
title:"在途上报",
path:"/subpkg/onWayUpload/onWayUpload",
src: "../../static/img/bg/onWay.png"
}
],
......
subpkg/abnormalEvent/abnormalEvent.vue
View file @ 9114e792
......@@ -204,7 +204,7 @@
}
},
buttonEdit(e) {
getApp().globalData.tableData = e
getApp().globalData.tableData = e;
this.onRateItemDatail();
},
//跳转费用明细新增
......
subpkg/abnormalEventDetail/abnormalEventDetail.vue
View file @ 9114e792
......@@ -150,11 +150,12 @@
if(data){
this.formData = data
this.ficationViewEnums[this.formData.cost_classification] = this.formData.cost_classification_label;
console.log(this.ficationViewEnums)
this.rateViewEnums[this.formData.rate_item] = this.formData.rate_item;
this.currencyViewEnums[this.formData.currency] = this.formData.currency;
this.formData.change = true
console.log(this.formData.change)
this.formData.newStatus="Edit";
}else{
this.formData.newStatus="New"
}
},
methods: {
......@@ -294,9 +295,9 @@
const allData = getApp().globalData.all;//所有的明细
var totle=0;
if(allData.length>0){
console.log('222=========')
console.log(allData.length)
//判断是否存在相同
if((this.formData.newStatus=="Edit" && allData.length>1) ||
(this.formData.newStatus=="New" && allData.length>0)){
allData.map(item => {
//费用项+币种是唯一的
if(item.rate_item==this.formData.rate_item && item.currency==this.formData.currency){
......
subpkg/onWayUpload/onWayUpload.vue 0 → 100644
View file @ 9114e792
This diff is collapsed.
subpkg/orderBase/orderBase.vue
View file @ 9114e792
......@@ -11,7 +11,7 @@
<!-- 空状态 -->
<view class="emptyImg flex_col" v-if="!orderList.length">
<image mode="aspectFit" src="../../static/img/empty/shipmentEmpty.png" />
<text class="empty-text">暂时没有订单</text>
<text class="empty-text">暂时未查询到订单</text>
</view>
</view>
</template>
......
subpkg/orderPod/orderPod.vue
View file @ 9114e792
......@@ -17,7 +17,7 @@
<!-- 空状态 -->
<view class="emptyImg flex_col" v-if="!orderPod.length">
<image mode="aspectFit" src="../../static/img/empty/shipmentEmpty.png" />
<text class="empty-text">暂时没有回单</text>
<text class="empty-text">暂时未查询到回单</text>
</view>
</view>
</template>
......
subpkg/reportSign/reportSign.vue 0 → 100644
View file @ 9114e792
<template>
<view class="abnormalReport content_box">
<u-toast ref="uToast" />
<bs-pageHeader-orderNo :shipment_no="shipment_no" />
<view class="location routine_radius_card">
<bs-customCell label="当前位置 :" :value="locationInfo.address" labelCol="3" wrapCol="8">
<view slot="right-icon" class="flex_center">
<view v-if="isLocation" class="t-icon t-icon-location" @click="getUserSetting" />
<view v-else>
<u-loading-icon color="#2E75E6" size="40" mode="semicircle"></u-loading-icon>
</view>
</view>
</bs-customCell>
<map id="myAMap" style="width: 100%;min-height: 150rpx;" :show-location='true'
:markers="locationInfo.markers" :longitude="locationInfo.longitude" :latitude="locationInfo.latitude">
</map>
</view>
<view class="form-content">
<u--form :model="formData" :rules="rules" ref="myForm" errorType='none'>
<u-form-item prop="eventType" required label="在途异常" labelWidth="30%">
<view @click="onVisible">
<u-input border="none" readonly inputAlign="left" placeholder="请选择上报类型"
placeholderClass="input-tip" :value="viewEnums[formData.eventType]" />
</view>
<u-icon slot="right" name="arrow-right" @click="onVisible" />
</u-form-item>
</u--form>
</view>
<view class="reported-detail">
<!-- 备注信息 -->
<bs-todoRemark ref="myRemark" />
<!-- 上传图片 -->
<view class="uploader-img">
<bs-uploader ref="myUploadImg" :required="formData.eventType !== 'LocationReporting'"
uploadTitle="上传图片" />
</view>
</view>
<!-- 底部操作按钮 -->
<view class="operation-btn flex_sb">
<button class="backBtn common_btn" @click="onNavBack">返回</button>
<button class="submitBtn common_btn" @click="onSubmit">确认</button>
</view>
<!-- 上报类型选择 -->
<bs-selectPopup ref="mySelectPop" popTitle="请选择类型" :selectEnum="optionEnums" :visible="visible"
@onVisible="onVisible" @onConfirm="onConfirmSelect" />
</view>
</template>
<script>
import { reportInfo, getOptionEnum } from '../../api/apiList'
const getUserLocation = require('../../mixins/getUserLocation')
export default {
mixins: [getUserLocation],
options: { styleIsolation: 'shared' },
data() {
return {
formData: {
eventType: "", //上报类型
},
rules: { 'eventType': { required: true } },
selectedIds: [], //运单id
shipment_no: "", //运单号
visible: false, //选择上报类型弹窗
optionEnums: [], // 上报类型枚举
viewEnums: {}, //仅页面显示使用
}
},
onLoad: function(options) {
this.initMap();
this.shipment_no = data.shipment_no;
this.selectedIds = [data.id]
this.getUserSetting()
},
onReady: function(options) {
// #ifdef H5
this.initSignMap()
// #endif
},
methods: {
//初始化地图
initSignMap() {
const { AMapInstance, userLocation } = getApp().globalData
const { latitude, longitude } = userLocation
this.map = new AMapInstance.Map('myAMap', {
center: [longitude, latitude], //中心点坐标
zoom: 16
});
// 构造矢量圆形,如签到范围, 项目根据需要自行添加
const circle = new AMapInstance.Circle({
center: new AMap.LngLat(longitude, latitude), // 圆心位置
radius: 100, //半径
strokeColor: "#F33", //线颜色
strokeOpacity: 1, //线透明度
strokeWeight: 3, //线粗细度
fillColor: "#ee2200", //填充颜色
fillOpacity: 0.35 //填充透明度
});
// 构造点标记
const marker = new AMapInstance.Marker({
position: [longitude, latitude],
anchor: 'bottom-center'
});
this.map.add([marker]); //添加多个覆盖物[circle, marker]
},
// 返回上一级
onNavBack() {
uni.navigateBack()
},
//提交数据
onSubmit() {
this.$refs.myForm.validate().then(res => {
const { eventType } = this.formData
const imgInstance = this.$refs.myUploadImg
const remarkInstance = this.$refs.myRemark
const remarks = remarkInstance.value
imgInstance.uploadImage(images => {
const { longitude, latitude, address, time } = this.locationInfo
const { viewEnums, selectedIds } = this
const data = {
"aux": {
"eventType": eventType,
"signType": viewEnums[eventType],
"content": remarks,
eventSource: 'DriverApp',
images,
longitude,
latitude,
address,
time
},
args: {
"selectedIds": selectedIds
}
}
reportInfo('sign', data).then(res => {
if (res.data.messageType === 'success') {
uni.showToast({
title: '信息上报成功',
duration: 3000
})
setTimeout(() => {
uni.navigateBack()
}, 1500)
}
})
})
}).catch(errors => {
this.$refs.uToast.show({
message: '请选择上报类型',
})
})
},
//上报类型选择
onVisible() {
const { optionEnums, visible } = this
if (visible) { //关闭
this.visible = false
} else {
if (!optionEnums.length) {
this.getOptions()
} else {
const mySelectPop = this.$refs.mySelectPop
mySelectPop.setSelect(this.formData.eventType)
}
this.visible = true
}
},
getOptions() {
getOptionEnum('TransitType').then(res => {
let datas = res.data.data.datas
datas.map((item, index) => {
if (item.value === 'LocationReporting') {
datas.splice(index, 1)
datas.unshift(item)
}
})
let viewEnums = {}
datas.map(item => {
viewEnums[item.value] = item.label
})
this.optionEnums = datas
this.viewEnums = viewEnums
})
},
//确认选择
onConfirmSelect(value) {
this.formData.eventType = value
this.visible = false
},
}
}
</script>
<style lang="scss">
.abnormalReport {
.page-header {
padding: 40rpx 24rpx 0;
border-radius: 0 0 32rpx 32rpx;
.page-header-orderNo {
color: #181717;
padding: 30rpx 24rpx;
background: linear-gradient(90deg, rgba(46, 117, 230, .1), rgba(46, 117, 230, .1));
background-color: #EDEFFD;
border-radius: 16rpx 16rpx 0 0;
font-size: 28rpx;
}
}
/deep/.custom-cell-row {
margin: 0 0 24rpx 0;
.custom-cell-label {
color: #8C8C8C;
}
.t-icon-location {
width: 50rpx;
height: 50rpx;
}
}
/deep/.form-content {
padding: 0 40rpx;
background-color: #ffffff;
//margin: 25rpx 0;
.input-tip {
font-size: 28rpx;
color: #BFBFBF;
}
.u-form-item__body__left__content__label {
color: #8C8C8C;
font-size: 28rpx;
}
.u-form-item__body__left__content__required {
font-size: 28rpx !important;
top: auto !important;
left: -16rpx !important;
}
.u-icon {
margin-left: 20rpx;
}
}
.reported-detail {
background-color: #FFFFFF;
padding: 20rpx 25rpx;
}
.routine_radius_card {
padding: 24rpx;
/* margin: 0 24rpx 24rpx; */
background-color: #FFFFFF;
border-radius: 0 0 16rpx 16rpx;
}
.detailFoot {
position: sticky;
display: flex;
justify-content: space-between;
bottom: 0;
width: 100%;
padding-bottom: 28rpx;
background-color: #FFFFFF;
padding-top: 24rpx;
z-index: 100;
button {
width: 339rpx;
height: 88rpx;
line-height: 88rpx;
border-radius: 44rpx;
color: #f5f3f2;
padding: 0 24rpx;
border: 3rpx solid transparent;
position: relative;
background-clip: padding-box, border-box;
background-origin: padding-box, border-box;
background-image: linear-gradient(90deg, #e7651a, #e7651a), linear-gradient(90deg, #e7651a, #e7651a);
&:after {
content: "";
}
&:last-child {
background-image: linear-gradient(90deg, #e7651a, #e7651a), linear-gradient(90deg, #e7651a, #e7651a);
color: #FFFFFF;
}
}
}
}
</style>
subpkg/shipment/shipment.vue
View file @ 9114e792
......@@ -11,7 +11,7 @@
<!-- 空状态 -->
<view class="emptyImg flex_col" v-if="!shipmentOrders.length">
<image mode="aspectFit" src="../../static/img/empty/shipmentEmpty.png" />
<text class="empty-text">暂时没有运单</text>
<text class="empty-text">暂时未查询到运单</text>
</view>
<view class="box_8">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment