From 0978691dc9047c7090dca64406f5d0ac027e8df4 Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期一, 30 十月 2023 17:59:31 +0800
Subject: [PATCH] 自主配送功能优化 部分功能增删 提煤单详情页面修改
---
pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue | 8
pages/driver-page/appointment/appointment.vue | 31 +++
api/globalApi.js | 7
pages/driver-page/driver-index/bill-of-lading-details/punchTheClock/punchTheClock.vue | 66 +++++++
pages/driver-page/drvier-my/drvier-my.vue | 10
pages/driver-page/driver-index/SelfDelivery/SelfDelivery.vue | 240 +++++++++++++++++++++--------
pages/driver-page/driver-index/bill-of-lading-details/printerStyle/printerStyle.vue | 1
pages/driver-page/driver-index/bill-of-lading-details/originInfo/originInfo.vue | 29 ++-
pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue | 50 +++--
pages/driver-page/driver-index/driver-index.vue | 4
10 files changed, 326 insertions(+), 120 deletions(-)
diff --git a/api/globalApi.js b/api/globalApi.js
index 7827072..aef4cce 100644
--- a/api/globalApi.js
+++ b/api/globalApi.js
@@ -520,4 +520,11 @@
url: '/wrzs/tmtaskcoal/saveDeliveryNote',
method: 'POST'
},
+ /**
+ * @description
+ */
+ getDeptAndProductNameByCustomer: {
+ url: '/wrzs/specialvarieties/getDeptAndProductNameByCustomer',
+ method: 'GET'
+ }
}
\ No newline at end of file
diff --git a/pages/driver-page/appointment/appointment.vue b/pages/driver-page/appointment/appointment.vue
index 3c9cdd5..339fe4c 100644
--- a/pages/driver-page/appointment/appointment.vue
+++ b/pages/driver-page/appointment/appointment.vue
@@ -1,5 +1,9 @@
<template>
<view class="appointment">
+ <view class="appointment-description"
+ v-if="isRCSQ">
+ *鎮ㄥ綋鍓嶇殑棰勭害鏃堕棿娈�<text>{{yuYueSection}}</text>
+ </view>
<combined-title
:title="yuYueData.length != 0 ? yuYueData[0].filedName + '鈥斺��' + yuYueData[0].sendDate : '鏆傛棤棰勭害鍒楄〃'"></combined-title>
<view class="appointment-table">
@@ -55,13 +59,15 @@
deptId: '',
filedId: '',
remark: ''
- }
+ },
+ yuYueSection: ''
};
},
onLoad(params) {
if (params.type == '鍏ュ満鐢宠') {
this.isRCSQ = true;
this.rcsqData.originalYyId = params.yyId;
+ this.yuYueSection = params.yuYueSection
}
this.yuYuePostParams.takeCoalId = params.takeCoalId;
this.yuYueListParams.filedId = params.filedId;
@@ -109,10 +115,10 @@
this.yuYueList();
this.$u.toast('棰勭害鎴愬姛');
let timer = setTimeout(() => {
- uni.navigateBack({
- delta: 1
- });
- }, 500);
+ uni.switchTab({
+ url: '/pages/tabbar-page/index-tabbar/index-tabbar'
+ })
+ }, 1500);
} else {
this.$u.toast(res.msg ? res.msg : '棰勭害澶辫触');
}
@@ -130,7 +136,7 @@
uni.switchTab({
url: '/pages/tabbar-page/index-tabbar/index-tabbar'
})
- }, 500);
+ }, 1500);
} else {
this.$u.toast(res.msg ? res.msg : '鍏ュ満鐢宠澶辫触锛岃绋嶅悗閲嶈瘯');
}
@@ -146,6 +152,19 @@
width: 94%;
margin: 0 auto;
+ // 棰勭害鐣岄潰鎻忚堪
+ .appointment-description {
+ margin: vww(8) 0;
+ color: #fd1446;
+
+ text {
+ font-weight: bold;
+ display: inline-block;
+ margin-left: vww(5);
+ color: #252525;
+ }
+ }
+
h1 {
font-size: vww(20);
text-align: center;
diff --git a/pages/driver-page/driver-index/SelfDelivery/SelfDelivery.vue b/pages/driver-page/driver-index/SelfDelivery/SelfDelivery.vue
index 094ce9b..b508a7d 100644
--- a/pages/driver-page/driver-index/SelfDelivery/SelfDelivery.vue
+++ b/pages/driver-page/driver-index/SelfDelivery/SelfDelivery.vue
@@ -1,27 +1,6 @@
<!-- 鑷富閰嶉�� -->
<template>
<view class="main">
- <u-modal :show="selfDeliverShow"
- title="閫夋嫨浜у搧"
- showCancelButton
- @confirm="selfDeliverConfirm"
- @cancel="selfDeliverCancel">
- <view class="slot-content">
- <niceui-data-select-input v-model="deptId"
- :localdata="deptList"
- placeholder="璇烽�夋嫨鍗曚綅"
- @change="deptChange"></niceui-data-select-input>
- <niceui-data-select-input v-model="productName"
- :localdata="productNameList"
- label="浜у搧閫夋嫨"
- placeholder="璇烽�夋嫨浜у搧"></niceui-data-select-input>
- <niceui-data-select-input v-model="filedId"
- :localdata="filedNameList"
- label="鐓ゅ満閫夋嫨"
- placeholder="璇烽�夋嫨鐓ゅ満"
- @change="filedChange"></niceui-data-select-input>
- </view>
- </u-modal>
<!-- 鍙告満閫夋嫨鐨勪骇鍝佷俊鎭� -->
<view class="product-info">
<view class="product-info_block">
@@ -30,7 +9,10 @@
褰撳墠閫夋嫨鍗曚綅
</view>
<view class="selected-info_text">
- {{deptName}}
+ <niceui-data-select-input v-model="deptId"
+ :localdata="deptList"
+ placeholder="璇烽�夋嫨鍗曚綅"
+ @change="deptChange"></niceui-data-select-input>
</view>
</view>
<view class="selected-info">
@@ -38,7 +20,11 @@
褰撳墠閫夋嫨浜у搧
</view>
<view class="selected-info_text">
- {{productName}}
+ <niceui-data-select-input v-model="productName"
+ :localdata="productNameList"
+ label="浜у搧閫夋嫨"
+ placeholder="璇烽�夋嫨浜у搧"
+ @change="productNameChange"></niceui-data-select-input>
</view>
</view>
@@ -47,12 +33,12 @@
褰撳墠閫夋嫨鐓ゅ満
</view>
<view class="selected-info_text">
- {{filedName}}
+ <niceui-data-select-input v-model="filedId"
+ :localdata="filedNameList"
+ label="鐓ゅ満閫夋嫨"
+ placeholder="璇烽�夋嫨鐓ゅ満"
+ @change="filedChange"></niceui-data-select-input>
</view>
- </view>
- <view class="re-select">
- <u-button text="閲嶆柊閫夋嫨"
- @click="reSelect"></u-button>
</view>
</view>
</view>
@@ -72,19 +58,58 @@
<view class="customer-name_label">
閫夋嫨瀹㈡埛
</view>
- <niceui-data-select-input v-model="customerId"
- :localdata="customerNameList"
- placeholder="璇烽�夋嫨瀹㈡埛"
- @change="customerNameChange"></niceui-data-select-input>
+ <view class="customer-name_block"
+ @click="selfDeliver">
+ <input class="customer-name_block-input"
+ type="text"
+ placeholder="璇烽�夋嫨瀹㈡埛"
+ v-model="customerName"
+ @focus="selfDeliver"
+ ref="selectCustomer" />
+ </view>
</view>
<!-- 鎻愪氦 -->
- <view class="re-select">
- <view class="re-select_block">
+ <view class="confirm-build">
+ <view class="confirm-build_block">
<u-button text="纭鍒涘缓"
@click="confirmBuild"
:loading="buildLoading"
:disabled="abledBuild"></u-button>
</view>
+ </view>
+ <view class="">
+ <u-popup :closeable='true'
+ :round="30"
+ mode='bottom'
+ :show="selfDeliverShow"
+ @close="selfDeliverClose"
+ @open="selfDeliverOpen">
+ <view class="name-list-section">
+ <view class="name-list_title">
+ 閫夋嫨瀹㈡埛
+ </view>
+ <view class="name-list_container">
+ <u-empty mode="data"
+ icon="http://cdn.uviewui.com/uview/empty/data.png"
+ text="鏆傛棤鏁版嵁"
+ textSize="30"
+ iconSize="1000"
+ v-if="customerNameList.length===0"></u-empty>
+ <view class="name-list_container_item"
+ v-for="item in customerNameList"
+ @click="selectCustomer(item)">
+ <view class="item-image">
+ <image src="https://mx.jzeg.cn:9096/appimg/image/banner/address.png"
+ mode="widthFix"
+ style="width: 18px;"></image>
+ </view>
+ <view class="item-customerName">
+ {{item.customerName}}
+ </view>
+ </view>
+ </view>
+ </view>
+ </u-popup>
</view>
</view>
</template>
@@ -98,7 +123,9 @@
},
onLoad() {
this.getCarNoByVarieties()
- this.getShipToList()
+ if (this.deptId && this.productName) {
+ this.getShipToList()
+ }
this.sendDate = this.sendDateStart = dayjs().format('YYYY-MM-DD')
this.sendDateEnd = dayjs().add(7, 'day').format('YYYY-MM-DD')
},
@@ -118,7 +145,7 @@
sendDateEnd: '',
customerId: '',
customerName: '',
- customerNameList: '',
+ customerNameList: [],
buildLoading: false
}
},
@@ -133,20 +160,13 @@
uni.showLoading({
title: "鍔犺浇涓�"
})
- this.$reqGet('getShipToList').then(res => {
- uni.hideLoading()
- if (res.code == 0) {
- this.customerNameList = res.data
- if (this.customerNameList.length !== 0) {
- this.customerNameList = this.customerNameList.map(v => {
- return {
- value: v.customerId,
- text: v.customerName
- }
- })
+ this.$reqGet('getDeptAndProductNameByCustomer', { deptId: this.deptId, productName: this.productName })
+ .then(res => {
+ uni.hideLoading()
+ if (res.code == 0) {
+ this.customerNameList = res.data
}
- }
- })
+ })
},
//鏌ヨ鐩稿叧鍗曚綅
getCarNoByVarieties() {
@@ -162,17 +182,23 @@
text: v.deptName
}
})
- this.selfDeliverShow = true
+ this.deptId = Array.isArray(this.deptList) && this.deptList.length !== 0 ? this.deptList[0]
+ .value : ''
} else {
this.$u.toast('鍔犺浇澶辫触')
}
-
+ }).then(() => {
+ this.getDeptByProductName()
+ this.getDeptIdByFiledList()
})
},
deptChange(e) {
this.deptName = this.deptList.find(v => v.value === e).text
this.getDeptByProductName()
this.getDeptIdByFiledList()
+ if (this.deptId && this.productName) {
+ this.getShipToList()
+ }
},
// 鏍规嵁閮ㄩ棬鑾峰彇浜у搧鍚嶇О
getDeptByProductName() {
@@ -202,20 +228,27 @@
filedChange(e) {
this.filedName = this.filedNameList.find(v => v.value === e).text
},
- customerNameChange(e) {
- this.customerName = this.customerNameList.find(v => v.value === e).text
+ productNameChange(e) {
+ if (this.deptId && this.productName) {
+ this.getShipToList()
+ }
},
- reSelect() {
+ selfDeliver() {
+ this.selfDeliverShow = true
+ this.$nextTick(() => {
+ this.$refs.selectCustomer.blur()
+ })
+ },
+ selfDeliverClose() {
+ this.selfDeliverShow = false
+ },
+ selfDeliverOpen() {
this.selfDeliverShow = true
},
- selfDeliverConfirm() {
+ selectCustomer(value) {
+ this.customerId = value.customerId
+ this.customerName = value.customerName
this.selfDeliverShow = false
- },
- selfDeliverCancel() {
- this.selfDeliverShow = false
- uni.navigateBack({
- delta: 1
- })
},
confirmBuild() {
let form = {
@@ -288,18 +321,19 @@
.product-info {
width: 96%;
- height: vww(200);
+ height: vww(250);
margin: vww(8);
margin-top: vww(20);
background: #ffffff;
box-shadow: 0rpx 0rpx 14rpx 0rpx rgba(73, 120, 240, 0.14), 0rpx 7rpx 45rpx 0rpx rgba(73, 120, 240, 0.12);
border-radius: 20rpx;
+ position: relative;
@include flex;
justify-content: center;
&_block {
width: 88%;
- height: vww(150);
+ height: vww(200);
margin-left: vww(10);
@include flex;
flex-direction: column;
@@ -308,6 +342,7 @@
.selected-info {
width: 100%;
display: flex;
+ align-items: center;
&_label {
margin-right: vww(8);
@@ -319,8 +354,9 @@
}
.re-select {
+ position: absolute;
width: vww(100);
- margin: 0 auto;
+ bottom: vww(10);
}
}
}
@@ -334,9 +370,36 @@
&_label {
margin: vww(8);
}
+
+ &_block {
+ width: 100%;
+ flex: 1;
+ height: vww(35);
+ border: 1px solid #e5e5e5;
+ box-sizing: border-box;
+ border-radius: 4px;
+ padding: 0 5px;
+ padding-left: 10px;
+ position: relative;
+ user-select: none;
+ @include flex;
+
+ &-input {
+ width: 96%;
+ height: 96%;
+ color: #333;
+ position: absolute;
+ left: vww(10);
+ z-index: -1;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ -o-text-overflow: ellipsis;
+ overflow: hidden;
+ }
+ }
}
- .re-select {
+ .confirm-build {
width: 100%;
height: vww(80);
background-color: #ffffff;
@@ -352,5 +415,52 @@
width: 94%;
}
}
+
+ .name-list-section {
+ width: 100%;
+ height: vww(600);
+ position: relative;
+ @include flex;
+ justify-content: center;
+ align-items: flex-start;
+
+ .name-list_title {
+ position: absolute;
+ top: vww(10);
+ font-size: vww(20);
+ }
+
+ .name-list_container {
+ width: 94%;
+ padding-top: vww(10);
+ overflow: scroll;
+ @include flex;
+ justify-content: flex-start;
+ flex-direction: column;
+ margin-top: vww(40);
+
+ &_item {
+ width: 100%;
+ height: vww(50);
+ @include flex;
+ justify-content: flex-start;
+ font-size: vww(18);
+
+ .item-image {
+ height: 100%;
+ display: flex;
+ align-items: center;
+ }
+
+ .item-customerName {
+ color: #252525;
+ margin-left: vww(8);
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ overflow: hidden;
+ }
+ }
+ }
+ }
}
</style>
\ No newline at end of file
diff --git a/pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue b/pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue
index c823ae7..1204596 100644
--- a/pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue
+++ b/pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue
@@ -169,12 +169,17 @@
@click="arriveClick"
shape="circle"
:disabled="coalDetailsData.status >= 2"></u-button>
- <u-button text="鍏ュ満鐢宠"
+ <!-- <u-button text="鍏ュ満鐢宠"
type="primary"
plain
@click="rcsqClick"
shape="circle"
- :disabled="correctStatus>= 3"></u-button>
+ :disabled="correctStatus>= 3"></u-button> -->
+ <u-button text="鍛煎彨瀹㈡湇"
+ type="primary"
+ plain
+ @click="callCustomerService"
+ shape="circle"></u-button>
</view>
<view class="bottom-button">
<!-- <u-button text="鏀剧┖"
@@ -184,11 +189,7 @@
throttleTime="500"
shape="circle"
:disabled="isEvacuation || isapproach"></u-button> -->
- <u-button text="鍛煎彨瀹㈡湇"
- type="primary"
- plain
- @click="callCustomerService"
- shape="circle"></u-button>
+
</view>
</view>
</view>
@@ -298,6 +299,9 @@
}
},
onHide() {
+ clearInterval(this.interval);
+ },
+ onUnload() {
clearInterval(this.interval);
},
onReady() {
@@ -582,7 +586,7 @@
.coalDetailsData
.yuYueSection.slice(-5);
if (dayjs(this.currentTime).isAfter(endTime) && this.coalDetailsData.status <= 1) {
- this.$u.toast('宸茶秴鍑洪绾︽椂闂�,鍙偣鍑诲叆鍦虹敵璇烽噸鏂板叆鍦�')
+ // this.$u.toast('宸茶秴鍑洪绾︽椂闂�,鍙偣鍑诲叆鍦虹敵璇烽噸鏂板叆鍦�')
this.timeout = '1'
}
}, 1000)
@@ -619,18 +623,20 @@
arriveClick() {
uni.navigateTo({
url: `/pages/driver-page/driver-index/bill-of-lading-details/punchTheClock/punchTheClock?orderPlanId=${this.orderPlanId}&coalStatus=${
- this.currentPageCoalStatus
- }&tmId=${this.getWeightHouseObj.tmId}`
+ this.correctStatus
+ }&tmId=${this.getWeightHouseObj.tmId}&timeout=${this.timeout}&yyId=${this.yyId}&filedId=${this.getYuYueDataParams.filedId}&deptId=${
+ this.getYuYueDataParams.deptId
+ }&sendDate=${this.getYuYueDataParams.sendDate}&yuYueSection=${this.coalDetailsData.yuYueSection}`
});
},
// 鍏ュ満鐢宠
- rcsqClick() {
- uni.navigateTo({
- url: `/pages/driver-page/appointment/appointment?type=鍏ュ満鐢宠&takeCoalId=${this.orderPlanId}&yyId=${this.yyId}&filedId=${this.getYuYueDataParams.filedId}&deptId=${
- this.getYuYueDataParams.deptId
- }&sendDate=${this.getYuYueDataParams.sendDate}`
- });
- },
+ // rcsqClick() {
+ // uni.navigateTo({
+ // url: `/pages/driver-page/appointment/appointment?type=鍏ュ満鐢宠&takeCoalId=${this.orderPlanId}&yyId=${this.yyId}&filedId=${this.getYuYueDataParams.filedId}&deptId=${
+ // this.getYuYueDataParams.deptId
+ // }&sendDate=${this.getYuYueDataParams.sendDate}`
+ // });
+ // },
callCustomerService() {
this.servieceShow = true
},
@@ -794,7 +800,8 @@
tmId: this.getWeightHouseObj.tmId,
carNo: uni.getStorageSync('carNo'),
type: 2,
- weighingNumber: 1
+ weighingNumber: 1,
+ printing: uni.getStorageSync('selectedPrintStyle')
}
let form1 = uni.getStorageSync('WeighHouseForm') ? uni.getStorageSync('WeighHouseForm') : '{}'
this.$reqPost('printer', Object.assign(form, JSON.parse(form1)),
@@ -824,7 +831,8 @@
tmId: this.getWeightHouseObj.tmId,
carNo: uni.getStorageSync('carNo'),
type: 3,
- weighingNumber: 2
+ weighingNumber: 2,
+ printing: uni.getStorageSync('selectedPrintStyle')
}
let form1 = uni.getStorageSync('WeighHouseForm') ? uni.getStorageSync('WeighHouseForm') : '{}'
this.outLoading = true
@@ -1048,6 +1056,10 @@
position: absolute;
right: vww(10);
color: #fff;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ -o-text-overflow: ellipsis;
+ overflow: hidden;
}
.basic {
diff --git a/pages/driver-page/driver-index/bill-of-lading-details/originInfo/originInfo.vue b/pages/driver-page/driver-index/bill-of-lading-details/originInfo/originInfo.vue
index 6e43e5c..07111fb 100644
--- a/pages/driver-page/driver-index/bill-of-lading-details/originInfo/originInfo.vue
+++ b/pages/driver-page/driver-index/bill-of-lading-details/originInfo/originInfo.vue
@@ -72,14 +72,18 @@
</u-form-item>
</u-form>
<view class="submit-button">
- <u-button text="鏃犻渶鎻愪氦"
- type="primary"
- @click.stop="directAppointment"
- v-if="isSpecial===1"></u-button>
- <u-button text="鎻愪氦"
- type="primary"
- @click.stop="submitOriginInfo"
- :loading="submitOriginInfoLoading"></u-button>
+ <view class="">
+ <u-button text="绔嬪嵆棰勭害"
+ type="primary"
+ @click.stop="directAppointment"
+ v-if="isSpecial"></u-button>
+ </view>
+ <view class="">
+ <u-button text="鎻愪氦淇℃伅"
+ type="primary"
+ @click.stop="submitOriginInfo"
+ :loading="submitOriginInfoLoading"></u-button>
+ </view>
</view>
</view>
</view>
@@ -115,7 +119,7 @@
sendDate: '',
deptId: '',
filedId: '',
- isSpecial: false
+ isSpecial: null
}
},
computed: {
@@ -130,7 +134,8 @@
this.sendDate = params.sendDate || ''
this.deptId = params.deptId || ''
this.filedId = params.filedId || ''
- this.isSpecial = params.isSpecial || 0
+ this.isSpecial = Number(params.isSpecial)
+ console.log(params.isSpecial, typeof params.isSpecial);
this.getTakeCoal()
},
methods: {
@@ -337,10 +342,12 @@
}
.submit-button {
- width: 180rpx;
+ width: 450rpx;
margin: vww(8) auto;
+ @include flex;
.u-button {
+ width: 45%;
font-size: 28rpx;
font-weight: 300;
color: #ffffff;
diff --git a/pages/driver-page/driver-index/bill-of-lading-details/printerStyle/printerStyle.vue b/pages/driver-page/driver-index/bill-of-lading-details/printerStyle/printerStyle.vue
index 0bc26a1..9eb383c 100644
--- a/pages/driver-page/driver-index/bill-of-lading-details/printerStyle/printerStyle.vue
+++ b/pages/driver-page/driver-index/bill-of-lading-details/printerStyle/printerStyle.vue
@@ -84,6 +84,7 @@
if (!this.checkedDefault) {
uni.setStorageSync('ischeckedDefault', 0)
}
+ this.$u.toast('閫夋嫨鎴愬姛,鍚庣画淇敼璇峰湪涓汉涓績杩涜淇敼')
//濡傛灉鍕鹃�夐粯璁ら�夋嫨 鍒欏湪鎵撳嵃鏃� 涓嶈繘琛屾彁閱�
this.$emit('selectedPrint', this.ischeckedDefault)
// 涓汉涓績 淇敼纾呭崟鎵撳嵃鏍峰紡
diff --git a/pages/driver-page/driver-index/bill-of-lading-details/punchTheClock/punchTheClock.vue b/pages/driver-page/driver-index/bill-of-lading-details/punchTheClock/punchTheClock.vue
index 1e34c21..63eae0f 100644
--- a/pages/driver-page/driver-index/bill-of-lading-details/punchTheClock/punchTheClock.vue
+++ b/pages/driver-page/driver-index/bill-of-lading-details/punchTheClock/punchTheClock.vue
@@ -10,10 +10,12 @@
<p>{{ nowTime }}</p>
</view>
</view>
- <!-- <view class="punchTheClock_text">
- <u-icon name="map" color="#51e30d" size="30"></u-icon>
- <text>鏈繘鍏ョ熆鍦哄尯鍩�</text>
- </view> -->
+ </view>
+ <view class="entrance-apply">
+ <view class="entrance-apply_block">
+ <u-button text="鏇存崲棰勭害鏃堕棿"
+ @click="entranceApply"></u-button>
+ </view>
</view>
</view>
</template>
@@ -29,12 +31,28 @@
tmcoa: null,
latA: null,
latB: null
- }
+ },
+ timeout: '2', //'1' 鏄秴鏃� '2' 鏄湭瓒呮椂
+ entranceApplyParams: {
+ takeCoalId: '',
+ filedId: '',
+ deptId: '',
+ sendDate: '',
+ yyId: ''
+ },
+ yuYueSection: '', //棰勭害鏃堕棿娈�
};
},
onLoad(params) {
this.punchTheClockObj.tmcoa = params.tmId;
this.coalStatus = params.coalStatus;
+ this.timeout = params.timeout
+ this.entranceApplyParams.takeCoalId = params.orderPlanId
+ this.entranceApplyParams.filedId = params.filedId
+ this.entranceApplyParams.deptId = params.deptId
+ this.entranceApplyParams.sendDate = params.sendDate
+ this.entranceApplyParams.yyId = params.yyId
+ this.yuYueSection = params.yuYueSection
this.getSetting(); //鑾峰彇鎺堟潈
this.getFuzzyLocation(); //鑾峰彇浣嶇疆
this.todayDate(); //褰撳墠鏃堕棿
@@ -96,6 +114,21 @@
} else {
this.$u.toast('鏆傝幏鍙栦笉鍒板埌褰撳墠浣嶇疆');
}
+ },
+ entranceApply() {
+ if (this.coalStatus !== 2) {
+ this.$u.toast('璇峰厛绛惧埌')
+ return
+ }
+ if (this.timeout === '2') {
+ this.$u.toast('鏈秴鍑洪绾︽椂闂�,鏃犻渶鏇存崲');
+ return
+ }
+ uni.navigateTo({
+ url: `/pages/driver-page/appointment/appointment?type=鍏ュ満鐢宠&takeCoalId=${this.entranceApplyParams.takeCoalId}&yyId=${this.entranceApplyParams.yyId}&filedId=${this.entranceApplyParams.filedId}&deptId=${
+ this.entranceApplyParams.deptId
+ }&sendDate=${this.entranceApplyParams.sendDate}&yuYueSection=${this.yuYueSection}`
+ });
}
}
};
@@ -108,6 +141,7 @@
display: flex;
justify-content: center;
align-items: center;
+ flex-direction: column;
.punchTheClock_container {
.punchTheClock_btn {
@@ -137,5 +171,27 @@
}
}
}
+
+ .entrance-apply {
+ width: 100%;
+ display: flex;
+ justify-content: center;
+ position: fixed;
+ bottom: vww(50);
+
+ &_block {
+ width: 50%;
+
+ /deep/.u-button {
+ font-size: 28rpx;
+ font-weight: 300;
+ color: #ffffff !important;
+ background: #497bfb !important;
+ letter-spacing: 4rpx;
+ border-radius: 37rpx 37rpx 37rpx 37rpx !important;
+ box-shadow: 2rpx 3rpx 13rpx 0rpx rgba(43, 98, 239, 0.5), 0rpx 0rpx 9rpx 0rpx rgba(247, 250, 253, 0.29);
+ }
+ }
+ }
}
</style>
\ No newline at end of file
diff --git a/pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue b/pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue
index f2cb1c9..548d717 100644
--- a/pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue
+++ b/pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue
@@ -323,7 +323,7 @@
coalContactClean: 0,
coalContactHair: 0,
coalContactSkin: 0,
- isMerge: '0', //1鏄� 0涓嶆槸 榛樿0 鏄惁鍚堝崱
+ isMerge: '0', //1鏄� 0涓嶆槸 榛樿0 鏄惁鍚堝崱 宸叉棤鐢�
isBackground: '0'
},
takeCoalId: null,
@@ -421,13 +421,10 @@
let x = new BigNumber(this.temporaryWeighObj.hair)
let y = new BigNumber(this.weighList.skin)
this.temporaryWeighObj.clean = x.minus(y).toNumber().toFixed(2)
- // this.temporaryWeighObj.clean = (this.temporaryWeighObj.hair - this.weighList.skin).toFixed(
- // 2);
this.isweigh = (this.temporaryWeighObj.clean > this.weighList.orderSurplus || this
.temporaryWeighObj
.clean < 0) && !this.isSpecial
this.orderSurplusLess = this.temporaryWeighObj.clean > this.weighList.orderSurplus
- // this.mergeStateShow = this.weighList.source !== 0 && this.orderSurplusLess
}
} else if (this.weighList.orderType == '澶栬喘' || this.weighList.orderType == '鍐呰喘' || this.weighList
.orderType == '杞叆') {
@@ -446,13 +443,10 @@
let x = new BigNumber(this.weighList.hair)
let y = new BigNumber(this.temporaryWeighObj.skin)
this.temporaryWeighObj.clean = x.minus(y).toNumber().toFixed(2)
- // this.temporaryWeighObj.clean = (this.weighList.hair - this.temporaryWeighObj.skin).toFixed(
- // 2);
this.isweigh = (this.temporaryWeighObj.clean > this.weighList.orderSurplus || this
.temporaryWeighObj
.clean < 0) && !this.isSpecial
this.orderSurplusLess = this.temporaryWeighObj.clean > this.weighList.orderSurplus
- // this.mergeStateShow = this.weighList.source !== 0 && this.orderSurplusLess
}
}
}
diff --git a/pages/driver-page/driver-index/driver-index.vue b/pages/driver-page/driver-index/driver-index.vue
index a3870bf..4ec0433 100644
--- a/pages/driver-page/driver-index/driver-index.vue
+++ b/pages/driver-page/driver-index/driver-index.vue
@@ -11,10 +11,10 @@
<!-- 鑷富閰嶉�佺晫闈� -->
<view class="self-deliver">
<view class="self-deliver_text">
- 鏌ョ湅鑷富閰嶉�侀〉闈�
+ 鍒涘缓鑷富閰嶉�佸崟
</view>
<view class="self-deliver_btn">
- <u-button text="鏌ョ湅"
+ <u-button text="鍘诲垱寤�"
type="primary"
shape="cirle"
@click="selfDeliver"></u-button>
diff --git a/pages/driver-page/drvier-my/drvier-my.vue b/pages/driver-page/drvier-my/drvier-my.vue
index 6c59039..6f815cb 100644
--- a/pages/driver-page/drvier-my/drvier-my.vue
+++ b/pages/driver-page/drvier-my/drvier-my.vue
@@ -85,7 +85,7 @@
icon 涓嬭浇鏍煎紡涓�18x18-->
<view class="line-label"
style="margin-left: 1.5%;">
- <image src="../../../static/image/banner/printer.png"
+ <image src="https://mx.jzeg.cn:9096/appimg/image/banner/printer.png"
mode="widthFix"
style="width: 18px;"></image>
<view class="label-text">纾呭崟鏍峰紡</view>
@@ -98,11 +98,11 @@
size="36"></u-icon>
</view>
</view>
- <view class="information-line"
+ <!-- <view class="information-line"
@click="addressManageHandle">
<view class="line-label"
style="margin-left: 1.5%;">
- <image src="../../../static/image/banner/address.png"
+ <image src="https://mx.jzeg.cn:9096/appimg/image/banner/address.png"
mode="widthFix"
style="width: 18px;"></image>
<view class="label-text"
@@ -112,7 +112,7 @@
<u-icon name="arrow-right"
size="36"></u-icon>
</view>
- </view>
+ </view> -->
<view class="information-line last"
@click="scoreDetail">
<view class="line-label"
@@ -817,7 +817,7 @@
&-block {
width: 690rpx;
- height: 750rpx;
+ height: 680rpx;
background: #ffffff;
box-shadow: 0rpx 0rpx 14rpx 0rpx rgba(73, 120, 240, 0.14), 0rpx 7rpx 45rpx 0rpx rgba(73, 120, 240, 0.12);
border-radius: 20rpx;
--
Gitblit v1.9.1