From f880863b9292a4cc4c0a484f721bb87bf42e57ed Mon Sep 17 00:00:00 2001
From: yangan <yangan0921@163.com>
Date: 星期五, 10 十一月 2023 17:32:32 +0800
Subject: [PATCH] 质检完成修改为处理完成
---
pages/driver-page/driver-index/bill-of-lading-details/selectOrderPlan/selectOrderPlan.vue | 119 +++++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 99 insertions(+), 20 deletions(-)
diff --git a/pages/driver-page/driver-index/bill-of-lading-details/selectOrderPlan/selectOrderPlan.vue b/pages/driver-page/driver-index/bill-of-lading-details/selectOrderPlan/selectOrderPlan.vue
index e1f2bb1..9ac0585 100644
--- a/pages/driver-page/driver-index/bill-of-lading-details/selectOrderPlan/selectOrderPlan.vue
+++ b/pages/driver-page/driver-index/bill-of-lading-details/selectOrderPlan/selectOrderPlan.vue
@@ -1,11 +1,12 @@
<template>
<view class="main">
- <view style="position: relative;top: -120px;">
+ <view>
<u-empty mode="data"
icon="http://cdn.uviewui.com/uview/empty/data.png"
textSize="30"
iconSize="1000"
- v-if="!orderPlanData"></u-empty>
+ text="鏆傛棤鏁版嵁"
+ v-if="orderPlanData.length===0"></u-empty>
</view>
<view class="collection-form">
<view class="collection-form-item"
@@ -27,6 +28,11 @@
<view class="black-bar"></view>
<view class="coal-type"
v-if="item.orderType">{{ item.orderType||'' }}</view>
+ </view>
+ </view>
+ <view class="second-line">
+ <view class="coal-name">
+ <view class="">{{ item.orderCode ||''}}</view>
</view>
</view>
<view class="third-line">
@@ -55,7 +61,7 @@
</view>
</view>
<view class="history-numbers">
- <combined-title title="鍘嗗彶鎻愮叅鍗�"></combined-title>
+ <combined-title title="鍘嗗彶楠岃川瀹屾垚"></combined-title>
<scroll-view :scroll-top="scrollTop"
scroll-y="true"
class="scroll-Y"
@@ -64,13 +70,14 @@
icon="http://cdn.uviewui.com/uview/empty/data.png"
textSize="30"
iconSize="1000"
+ text="鏆傛棤鏁版嵁"
v-if="historyCoalData.length==0"></u-empty>
<view class="history-information"
v-for="(item, index) in historyCoalData"
:key="index"
@click="faYundetail(item)">
<view class="first">
- <view class="">{{ item.deptName || '' }}</view>
+ <view class="">{{ item.filedName || '' }}</view>
<view class=""><u-icon name="arrow-right"
color="#999999"
size="40"></u-icon></view>
@@ -81,19 +88,11 @@
</view>
<view class="third">
<view class="third-line">
- <view class="third-line_text">棰嗗彇鏁�:</view>
- <view class="third-line_num">{{ item.cars2 }}</view>
- </view>
- <view class="third-line">
- <view class="third-line_text">鍓╀綑鏁�:</view>
+ <view
+ :style="{backgroundImage: `url(${onlineurl}/appimg/image/banner/carNO.png)`,backgroundSize: 'cover',backgroundRepeat: 'no-repeat',width:'24rpx',height:'24rpx',lineHeight:'24rpx'}">
+ </view>
<view class="third-line_num"
- v-if="roleType == 1">{{ item.carNumSurplus1 }}</view>
- <view class="third-line_num"
- v-else-if="roleType == 2">{{ item.carNumSurplus }}</view>
- </view>
- <view class="third-line">
- <view class="third-line_text">鎻愮叅鍗曚釜鏁�:</view>
- <view class="third-line_num">{{ item.tmCount }}</view>
+ style=" color: #303030;">{{ item.carNo }}</view>
</view>
</view>
<view class="fourth">
@@ -121,12 +120,41 @@
<view style="height: 160rpx;width: 100%;">
</view>
- <tab-bar :current="1"></tab-bar>
+ <!-- 鍥剧墖棰勮寮瑰嚭妗� -->
+ <view class="previewImage-container">
+ <view class="previewImage-container">
+ <previewImage ref="previewImage"
+ :imgs="customerTourImgList"
+ :saveBtn='false'></previewImage>
+ </view>
+ </view>
+ <view class="noob-tour"
+ v-if="roleType===4&&isFirstLogin">
+ <combined-title title="鎿嶄綔鎸囧紩"></combined-title>
+ <u-cell-group>
+ <u-cell title="鏂版墜鎸囧紩"
+ name='1'
+ :clickable="true"
+ @click="noobTour">
+ <u-badge type="primary"
+ value="01"
+ slot='icon'></u-badge>
+ <u-icon slot="value"
+ name="arrow-right"
+ size="30"
+ color="#b8b8b8"></u-icon>
+ </u-cell>
+ </u-cell-group>
+ </view>
+ <tab-bar :current="0"></tab-bar>
</view>
</template>
<script>
import { onlineurl } from '@/api/request.js'
+ import { mapState } from 'vuex'
+ import { BaseUrl } from '@/api/publicInterface.js'
+ import previewImage from '@/components/kxj-previewImage/kxj-previewImage.vue';
export default {
data() {
return {
@@ -139,19 +167,31 @@
// 鏄惁鏄剧ず鏇村鏁版嵁
showMoreData: false,
total: null,
+ isFirstLogin:false,
onlineurl,
};
},
+ components:{
+ previewImage
+ },
computed: {
+ ...mapState(['customerTourImgList']),
roleType() {
return uni.getStorageSync('roleType')
}
+ },
+ mounted() {
+ this.getLogOn();
},
onShow() {
this.GetOrderPlan()
this.qualityInspectionHistory()
},
methods: {
+ init(){
+ this.GetOrderPlan()
+ this.qualityInspectionHistory()
+ },
GetOrderPlan() {
uni.showLoading({ title: '鍔犺浇涓�...' });
this.$reqGet('qualityInspection').then(res => {
@@ -190,7 +230,7 @@
this.pageCurrent++;
this.qualityInspectionHistory();
},
- //fix 鐐瑰嚮鎻愮叅鍗曡繑鍥炰細澧炲姞閲嶅鏁版嵁
+ //fix 鐐瑰嚮閫氱煡鍗曡繑鍥炰細澧炲姞閲嶅鏁版嵁
ArrSet(Arr, id) {
var obj = {};
const arrays = Arr.reduce((setArr, item) => {
@@ -199,11 +239,40 @@
}, []);
return arrays;
},
+ // 楠岃川閫夋嫨
validateClick(item) {
uni.navigateTo({
url: `/pages/driver-page/driver-index/bill-of-lading-details/weighDetail/weighDetail?orderPlanId=${item.id}`
})
- }
+ },
+ // 鍘嗗彶
+ faYundetail(item) {
+ uni.navigateTo({
+ url: `/pages/driver-page/driver-index/bill-of-lading-details/weighDetail/weighDetail?orderPlanId=${item.id}&flag=${true}`
+ })
+ },
+ noobTour(v) {
+ this.$refs.previewImage.open('https://mx.jzeg.cn:9095/appimg/image/tour/quality/quality1.jpg')
+ },
+ getLogOn() {
+ this.$reqGet('getUserEntity').then(res => {
+ this.phone = res.data.phone
+ }).then(() => {
+ uni.request({
+ url: `${BaseUrl}/admin/log/getLogOnType?phone=${this.phone}`,
+ success: res => {
+ // res.data.data 涓�1 浠ｈ〃绗竴娆＄櫥褰� 涓�0鍙栨秷瀛︿範鎸囧紩 涓�2浠ｈ〃瀛樺湪
+ if (res.data.data === 1) {
+ this.noobTour()
+ } else if (res.data.data === 2) {
+ this.isFirstLogin = true
+ } else {
+ this.isFirstLogin = false
+ }
+ }
+ });
+ })
+ },
},
}
</script>
@@ -218,7 +287,17 @@
.main {
width: 100%;
- margin: 0 auto;
+ margin: 30px auto;
+ }
+
+ .scroll-Y {
+ height: 900rpx;
+
+ .more_text {
+ color: #333;
+ font-size: 24rpx;
+ text-align: center;
+ }
}
.history-numbers {
--
Gitblit v1.9.1