From 38de059c83720527d3813448153390da3e6453dc Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期日, 02 七月 2023 13:52:25 +0800
Subject: [PATCH] 验质替换页面，称重判断修改
---
pages/tabbar-page/myPage-tabbar/myPage-tabbar.vue | 2
pages.json | 36 +-
pages/customer-page/customer-index/customer-index.vue | 16
pages/customer-page/customer-index/fayunPlanDetails/fayunPlanDetails.vue | 2
pages/driver-page/driver-index/bill-of-lading-details/selectOrderPlan/selectOrderPlan.vue | 238 ++++++++++++++++++
static/tabBar-icon/checkingblue.png | 0
components/combined-title/combined-title.vue | 123 +++++----
store/index.js | 30 ++
components/tab-bar/tab-bar.vue | 97 ++++---
pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue | 6
static/tabBar-icon/checking.png | 0
api/globalApi.js | 12 +
api/request.js | 2
pages/customer-page/customer-my/faYunstatistics/faYunstatistics.vue | 2
pages/customer-page/customer-index/fayunPlanDetails/fayunPlanMore/fayunPlanMore.vue | 131 +++++++---
15 files changed, 517 insertions(+), 180 deletions(-)
diff --git a/api/globalApi.js b/api/globalApi.js
index 0f4d899..2191807 100644
--- a/api/globalApi.js
+++ b/api/globalApi.js
@@ -140,6 +140,18 @@
url: '/wrzs/jcproduct/getJcProductList',
method: 'GET'
},
+ /**
+ * @description 楠岃川浜у搧 娌抽挗 */
+ qualityInspection: {
+ url: '/wrzs/userOperation/qualityInspection',
+ method: 'GET'
+ },
+ /**
+ * @description 楠岃川浜у搧鍘嗗彶 娌抽挗 */
+ qualityInspectionHistory: {
+ url: '/wrzs/userOperation/qualityInspectionHistory',
+ method: 'GET'
+ },
// 鐢ㄦ埛
// 鑾峰彇鐢ㄦ埛淇℃伅
getUserEntity: {
diff --git a/api/request.js b/api/request.js
index d7fff54..55c6a91 100644
--- a/api/request.js
+++ b/api/request.js
@@ -83,7 +83,7 @@
const BaseUrl = "http://192.168.31.14:9997";
const webSocketUrl = "ws://192.168.31.14:9997/wrzs/ws/info"
-
+export const onlineurl = "https://mx.jzeg.cn:9095";
// const BaseUrl = "http://192.168.0.100:9997";
// const webSocketUrl = "ws://192.168.0.100:9997/wrzs/ws/info"
diff --git a/components/combined-title/combined-title.vue b/components/combined-title/combined-title.vue
index 4266d16..973185d 100644
--- a/components/combined-title/combined-title.vue
+++ b/components/combined-title/combined-title.vue
@@ -8,10 +8,15 @@
</view>
<!-- 缁撳熬 -->
- <view class="title_end" v-if="$slots.rightText">
- <view class="title_end_text" @click="rightTextClick">
- <image src="https://mx.jzeg.cn:9095/appimg/image/banner/add.png" mode=""></image>
- <text><slot name="rightText"></slot></text>
+ <view class="title_end"
+ v-if="$slots.rightText">
+ <view class="title_end_text"
+ @click="rightTextClick">
+ <image src="https://mx.jzeg.cn:9095/appimg/image/banner/add.png"
+ mode=""></image>
+ <text>
+ <slot name="rightText"></slot>
+ </text>
</view>
</view>
</view>
@@ -19,63 +24,71 @@
</template>
<script>
-export default {
- name: 'combined-title',
- data() {
- return {};
- },
- props: {
- title: {
- type: String,
- default: ''
+ import { onlineurl } from '../../api/request.js'
+ export default {
+ name: 'combined-title',
+ data() {
+ return {};
+ },
+ props: {
+ title: {
+ type: String,
+ default: ''
+ }
+ },
+ methods: {
+ rightTextClick() {
+ this.$emit('rightText');
+ }
}
- },
- methods: {
- rightTextClick() {
- this.$emit('rightText');
- }
- }
-};
+ };
</script>
-<style lang="scss" scope>
-.title {
- width: 100%;
- margin: vww(16) auto;
- .title_wrapper {
- height: vww(14);
- display: flex;
- justify-content: space-between;
- align-items: center;
- box-sizing: border-box;
- .title_start {
- .icon {
- display: inline-block;
- width: vww(4);
- height: vww(12);
- background-color: #007aff;
- border-radius: vww(2);
- }
- .text {
- display: inline-block;
- margin-left: vww(8);
- font-size: vww(16);
- }
- }
- .title_end {
- .title_end_text {
- display: flex;
- align-items: center;
- image {
- margin-right: vww(8);
- width: vww(21);
- height: vww(21);
+<style lang="scss"
+ scope>
+ .title {
+ width: 100%;
+ margin: vww(16) auto;
+
+ .title_wrapper {
+ height: vww(14);
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ box-sizing: border-box;
+
+ .title_start {
+ .icon {
+ display: inline-block;
+ width: vww(4);
+ height: vww(12);
+ background-color: #007aff;
+ border-radius: vww(2);
}
- text {
+
+ .text {
+ display: inline-block;
+ margin-left: vww(8);
font-size: vww(16);
}
}
+
+ .title_end {
+ .title_end_text {
+ display: flex;
+ align-items: center;
+
+ image {
+ margin-right: vww(8);
+ width: vww(21);
+ height: vww(21);
+ }
+
+ text {
+ font-size: vww(16);
+ }
+ }
+ }
}
}
-}
-</style>
+</style>
\ No newline at end of file
diff --git a/components/tab-bar/tab-bar.vue b/components/tab-bar/tab-bar.vue
index f52bebc..5c915c5 100644
--- a/components/tab-bar/tab-bar.vue
+++ b/components/tab-bar/tab-bar.vue
@@ -1,55 +1,68 @@
<template>
<view class="tab-bar">
- <u-tabbar :value="current ? current : 0" @change="tabbarchange" :fixed="true" :placeholder="false" :safeAreaInsetBottom="true" :border="true">
- <u-tabbar-item v-for="(item, index) in tabBarList" :key="index" :text="item.text">
- <image class="u-page__item__slot-icon" slot="active-icon" :src="item.selectedIconPath"></image>
- <image class="u-page__item__slot-icon" slot="inactive-icon" :src="item.iconPath"></image>
+ <u-tabbar :value="current ? current : 0"
+ @change="tabbarchange"
+ :fixed="true"
+ :placeholder="false"
+ :safeAreaInsetBottom="true"
+ :border="true">
+ <u-tabbar-item v-for="(item, index) in tabBarList"
+ :key="index"
+ :text="item.text">
+ <image class="u-page__item__slot-icon"
+ slot="active-icon"
+ :src="item.selectedIconPath"></image>
+ <image class="u-page__item__slot-icon"
+ slot="inactive-icon"
+ :src="item.iconPath"></image>
</u-tabbar-item>
</u-tabbar>
</view>
</template>
<script>
-import store from '@/store';
-export default {
- props: {
- current: Number
- },
- created() {
- uni.hideTabBar();
- },
- data() {
- return {
- // tabBarList: this.$store.state.userTabbar
- };
- },
- computed: {
- tabBarList() {
- return this.$store.state.userTabbar;
+ import store from '@/store';
+ export default {
+ props: {
+ current: Number
+ },
+ created() {
+ uni.hideTabBar();
+ },
+ data() {
+ return {
+ // tabBarList: this.$store.state.userTabbar
+ };
+ },
+ computed: {
+ tabBarList() {
+ return this.$store.state.userTabbar;
+ }
+ },
+ methods: {
+ tabbarchange(e) {
+ uni.switchTab({
+ url: '/' + this.tabBarList[e].pagePath
+ });
+ }
}
- },
- methods: {
- tabbarchange(e) {
- uni.switchTab({
- url: '/' + this.tabBarList[e].pagePath
- });
- }
- }
-};
+ };
</script>
-<style lang="scss" scoped>
-::v-deep.tab-bar {
- .u-tabbar {
- &__content {
- background: #ececec !important;
- &__item-wrapper {
- height: vww(50);
+<style lang="scss"
+ scoped>
+ ::v-deep.tab-bar {
+ .u-tabbar {
+ &__content {
+ background: #ececec !important;
+
+ &__item-wrapper {
+ height: vww(50);
+ }
}
}
}
-}
-.u-page__item__slot-icon {
- width: vww(20) !important;
- height: vww(20) !important;
-}
-</style>
+ .u-page__item__slot-icon {
+ width: vww(20) !important;
+ height: vww(20) !important;
+ }
+</style>
\ No newline at end of file
diff --git a/pages.json b/pages.json
index ba79e91..537b2a7 100644
--- a/pages.json
+++ b/pages.json
@@ -210,26 +210,22 @@
"enablePullDownRefresh": false
}
+ }, {
+ "path": "pages/driver-page/driver-index/bill-of-lading-details/weighDetail/weighDetail",
+ "style": {
+ "navigationBarTitleText": "",
+ "enablePullDownRefresh": false
+ }
+
+ }, {
+ "path": "pages/driver-page/driver-index/bill-of-lading-details/selectOrderPlan/selectOrderPlan",
+ "style": {
+ "navigationBarTitleText": "",
+ "enablePullDownRefresh": false
+ }
+
}
- ,{
- "path" : "pages/driver-page/driver-index/bill-of-lading-details/weighDetail/weighDetail",
- "style" :
- {
- "navigationBarTitleText": "",
- "enablePullDownRefresh": false
- }
-
- }
- ,{
- "path" : "pages/driver-page/driver-index/bill-of-lading-details/selectOrderPlan/selectOrderPlan",
- "style" :
- {
- "navigationBarTitleText": "",
- "enablePullDownRefresh": false
- }
-
- }
- ],
+ ],
"subPackages": [{
"root": "pages/register",
"pages": [{
@@ -370,6 +366,8 @@
"pagePath": "pages/customer-page/customer-my/faYunstatistics/faYunstatistics"
},
{
+ "pagePath": "pages/driver-page/driver-index/bill-of-lading-details/selectOrderPlan/selectOrderPlan"
+ }, {
"pagePath": "pages/tabbar-page/myPage-tabbar/myPage-tabbar"
// "iconPath": "static/tabBar-icon/Gmine10.png",
// "selectedIconPath": "static/tabBar-icon/Bmine57.png",
diff --git a/pages/customer-page/customer-index/customer-index.vue b/pages/customer-page/customer-index/customer-index.vue
index 9c4f17e..f6bb3e3 100644
--- a/pages/customer-page/customer-index/customer-index.vue
+++ b/pages/customer-page/customer-index/customer-index.vue
@@ -4,7 +4,7 @@
<view class="customer-index-body">
<!-- 寰呴鍙栧拰杞彂鎻愮叅鍗� -->
<view class="wait-collection"
- style="background: url('https://mx.jzeg.cn:9095/appimg/image/banner/customerbanner.png') no-repeat;background-size:contain">
+ style="background: url('https://mx.jzeg.cn:9095/appimg/image/banner/customerbanner.png') ;background-size:contain;background-repeat: no-repeat;">
</view>
<view style="position: relative;top: -120px;">
<u-empty mode="data"
@@ -42,7 +42,7 @@
style="width: 24rpx;height: 24rpx;li ne-height: 24rpx;background: url('https://mx.jzeg.cn:9095/appimg/image/banner/carNO.png') no-repeat;background-size: cover">
</view>
</view>
- <view class="car-num">{{ item.carNos||''}}</view>
+ <view class="car-num">{{ item.carNos||item.carNo||''}}</view>
</view>
<view class="third-line">
<view class="time-icon">
@@ -63,11 +63,11 @@
v-if="item.orderType!=='澶栬喘'">
<view class="button-image">杞彂</view>
</view>
- <view class="forward"
+ <!-- <view class="forward"
@click.stop="validateClick(index)"
v-if='roleType===4'>
<view class="button-image">楠岃川</view>
- </view>
+ </view> -->
</view>
</view>
</view>
@@ -162,6 +162,7 @@
</template>
<script>
+ import { onlineurl } from '@/api/request.js'
import card from '@/components/card/card.vue';
import combinedTitle from '@/components/combined-title/combined-title.vue';
import { customerId } from '@/utils/status';
@@ -215,12 +216,14 @@
carNum: "",
// 鍓╀綑鐨勬彁鐓ゅ崟鏁伴噺
carNumSurplus: '',
- canClick: false
+ canClick: false,
+ onlineurl: ''
};
},
onLoad() {},
onShow() {
this.init();
+ this.onlineurl = onlineurl;
},
methods: {
init() {
@@ -329,7 +332,7 @@
// 鎻愮叅鍗曡鎯�
cardBodyClick(v) {
uni
- .navigateTo({ url: `/pages/customer-page/customer-index/fayunPlanDetails/fayunPlanDetails?orderPlanId=${v.id}&code=${v.code}&cars2=${v.cars2}` });
+ .navigateTo({ url: `/pages/customer-page/customer-index/fayunPlanDetails/fayunPlanDetails?orderPlanId=${v.id}&code=${v.code}&cars2=${v.cars2?v.cars2:""}` });
},
// 鐐瑰嚮鍘嗗彶鎻愮叅鍗曡幏鍙栬鎯�
faYundetail(v) {
@@ -591,6 +594,7 @@
}
.car-num {
+ color: #515151;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
diff --git a/pages/customer-page/customer-index/fayunPlanDetails/fayunPlanDetails.vue b/pages/customer-page/customer-index/fayunPlanDetails/fayunPlanDetails.vue
index 2001690..905def3 100644
--- a/pages/customer-page/customer-index/fayunPlanDetails/fayunPlanDetails.vue
+++ b/pages/customer-page/customer-index/fayunPlanDetails/fayunPlanDetails.vue
@@ -25,7 +25,7 @@
font-weight: 400;
color: #F81414;
text-shadow: 0rpx 4rpx 0rpx #1A66FE;">
- /{{ cars2 ||carNum||'' }}
+ /{{ (cars2||'') ||(carNum||'')||'' }}
</text>
</view>
</view>
diff --git a/pages/customer-page/customer-index/fayunPlanDetails/fayunPlanMore/fayunPlanMore.vue b/pages/customer-page/customer-index/fayunPlanDetails/fayunPlanMore/fayunPlanMore.vue
index a416b90..7d4800c 100644
--- a/pages/customer-page/customer-index/fayunPlanDetails/fayunPlanMore/fayunPlanMore.vue
+++ b/pages/customer-page/customer-index/fayunPlanDetails/fayunPlanMore/fayunPlanMore.vue
@@ -57,25 +57,36 @@
</view>
</view>
</view>
- <view class="origin-info"
- v-if="yyDailyList.orderType == '澶栬喘' || yyDailyList.orderType == '鍐呰喘' || yyDailyList.orderType == '杞叆'">
- <combined-title title="鍘熷彂淇℃伅"></combined-title>
- <view class="body-container">
- <view class="container-block">
- <view class="">鐨噸</view>
- <view class="">{{ yyDailyList.skinTwo || 0 }}</view>
- </view>
- </view>
- <view class="body-container">
- <view class="container-block">
- <view class="">姣涢噸</view>
- <view class="">{{ yyDailyList.hairTwo || 0 }}</view>
- </view>
- </view>
- <view class="body-container last">
- <view class="container-block">
- <view class="">鍑�閲�</view>
- <view class="">{{ yyDailyList.cleanTwo || 0 }}</view>
+ <view class="weigh-history"
+ v-if="showWeigh.length!==0">
+ <view class="block-main">
+ <view class="weigh-item"
+ v-for='item in showWeigh'
+ :key="item.id">
+ <view class="weigh-time">
+ <u-tag :text="item.createTime.slice(-8,-3)"
+ plain></u-tag>
+ </view>
+ <view class="item-block">
+ <view class="item">
+ <view class="concrete"
+ style="background: url('https://mx.jzeg.cn:9095/appimg/image/banner/skin.png') no-repeat;background-size: cover;">
+ 鐨�</view>
+ <view class="num">{{ item.skin }}</view>
+ </view>
+ <view class="item">
+ <view class="concrete"
+ style="background: url('https://mx.jzeg.cn:9095/appimg/image/banner/hair.png') no-repeat;background-size: cover;">
+ 姣�</view>
+ <view class="num">{{ item.hair }}</view>
+ </view>
+ <view class="item">
+ <view class="concrete"
+ style="background: url('https://mx.jzeg.cn:9095/appimg/image/banner/clean.png') no-repeat;background-size: cover;">
+ 鍑�</view>
+ <view class="num">{{ item.clean }}</view>
+ </view>
+ </view>
</view>
</view>
</view>
@@ -105,6 +116,12 @@
index: ''
};
},
+ computed: {
+ // 灞曠ず鐨瘺鍑�
+ showWeigh() {
+ return this.orderPlanDetail.tmTaskCoalItems ? this.orderPlanDetail.tmTaskCoalItems : []
+ }
+ },
methods: {
GetOrderPlanDetail() {
uni.showLoading({
@@ -114,7 +131,6 @@
if (res.code == 0) {
this.orderPlanDetail = res.data;
this.yyDailyList = res.data;
- console.log(this.yyDailyList);
uni.hideLoading();
} else {
this.$u.toast('鍔犺浇澶辫触');
@@ -169,33 +185,70 @@
}
}
- .origin-info {
+ .weigh-history {
width: 690rpx;
- min-height: 300rpx;
+ height: 100%;
+ min-height: 420rpx;
+ margin: vww(40) auto;
margin-top: 20rpx;
- margin-bottom: 20rpx;
background: #ffffff;
- box-shadow: 0rpx 0rpx 14rpx 0rpx rgba(73, 120, 240, 0.14), 0rpx 7rpx 45rpx 0rpx rgba(73, 120, 240, 0.12);
+ box-shadow: 4rpx 6rpx 51rpx 0rpx rgba(73, 120, 240, 0.11);
border-radius: 20rpx;
- @include flex;
- flex-direction: column;
- align-items: flex-start;
+ position: relative;
+ font-size: 30rpx;
+ font-weight: 300;
+ color: #303030;
+ overflow: hidden;
- .body-container {
- width: 100%;
- height: vww(56);
- border-bottom: vww(1) solid #d6d6d6;
- @include flex;
- justify-content: center;
- .container-block {
- width: 94%;
+ .block-main {
+ display: grid;
+ grid-template-columns: auto;
+ grid-template-rows: repeat(auto-fit, minmax(40rpx, 1fr));
+ gap: auto 5rpx;
+ width: 94%;
+ height: 100%;
+ min-height: 380rpx;
+ margin: vww(18) vww(7) vww(11) vww(17);
+ gap: 10rpx 20rpx;
+
+ .weigh-item {
+ width: 100%;
+ height: vww(80);
@include flex;
- }
- }
+ flex-direction: column;
+ justify-content: space-around;
+ align-items: flex-start;
- .last {
- border-bottom: none;
+ .item-block {
+ width: 100%;
+ height: vww(36);
+ @include flex;
+ justify-content: space-around;
+
+ .item {
+ min-width: vww(50);
+ height: vww(45);
+ font-size: 21rpx;
+ font-weight: 400;
+ color: #ffffff;
+ text-align: center;
+ line-height: vww(30);
+ @include flex;
+
+ .concrete {
+ width: vww(36);
+ height: vww(36);
+ }
+
+ .num {
+ font-size: 40rpx;
+ font-weight: 300;
+ color: #303030;
+ }
+ }
+ }
+ }
}
}
}
diff --git a/pages/customer-page/customer-my/faYunstatistics/faYunstatistics.vue b/pages/customer-page/customer-my/faYunstatistics/faYunstatistics.vue
index 4050d30..a1f1600 100644
--- a/pages/customer-page/customer-my/faYunstatistics/faYunstatistics.vue
+++ b/pages/customer-page/customer-my/faYunstatistics/faYunstatistics.vue
@@ -272,7 +272,7 @@
@click="confirmCondition"></u-button></view>
</view>
</u-popup>
- <tab-bar :current="1"></tab-bar>
+ <tab-bar :current="roleType===4?2:1"></tab-bar>
</view>
<view class="white-block"></view>
</view>
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 118f719..fa9da5f 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,11 @@
<template>
- <view>
+ <view class="main">
<view style="position: relative;top: -120px;">
<u-empty mode="data"
icon="http://cdn.uviewui.com/uview/empty/data.png"
textSize="30"
iconSize="1000"
- v-if="orderPlanData.length == 0"></u-empty>
+ v-if="!orderPlanData"></u-empty>
</view>
<view class="collection-form">
<view class="collection-form-item"
@@ -54,6 +54,74 @@
</view>
</view>
</view>
+ <view class="history-numbers">
+ <combined-title title="鍘嗗彶鎻愮叅鍗�"></combined-title>
+ <scroll-view :scroll-top="scrollTop"
+ scroll-y="true"
+ class="scroll-Y"
+ @scrolltolower="historyScrolltolower">
+ <u-empty mode="data"
+ icon="http://cdn.uviewui.com/uview/empty/data.png"
+ textSize="30"
+ iconSize="1000"
+ 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=""><u-icon name="arrow-right"
+ color="#999999"
+ size="40"></u-icon></view>
+ </view>
+ <view class="second">
+ <view class="coal-name">{{ item.coalName || '' }}</view>
+ <view class="order-type">{{ item.orderType || '' }}</view>
+ </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 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>
+ </view>
+ </view>
+ <view class="fourth">
+ <view class="fourth-icon">
+ <view
+ style="width: 24rpx;height: 24rpx;line-height: 24rpx;background: url('https://mx.jzeg.cn:9095/appimg/image/banner/clock.png') no-repeat;background-size: cover">
+ </view>
+ </view>
+ <view class="senddate">{{ item.sendDate }}</view>
+ </view>
+ <view class="fourth">
+ <view class="fourth-icon">
+ <view
+ style="width: 26rpx;height: 26rpx;line-height: 26rpx;background: url('https://mx.jzeg.cn:9095/appimg/image/banner/carnNUm.png') no-repeat;background-size: cover;">
+ </view>
+ </view>
+ <view class="senddate">{{ item.orderCode }}</view>
+ </view>
+ </view>
+ <view class="more_text"
+ v-if="showMoreData && historyCoalData.length !== 0">娌℃湁鏁版嵁浜�...</view>
+ <view class="white-block"></view>
+ </scroll-view>
+ </view>
+ <view style="height: 160rpx;width: 100%;">
+
+ </view>
+ <tab-bar :current="1"></tab-bar>
</view>
</template>
@@ -62,7 +130,14 @@
data() {
return {
orderPlanData: [],
- index: null
+ historyCoalData: [],
+ // 姣忛〉鏁版嵁閲�
+ pageSize: 10,
+ // 褰撳墠椤�
+ pageCurrent: 1,
+ // 鏄惁鏄剧ず鏇村鏁版嵁
+ showMoreData: false,
+ total: null
};
},
computed: {
@@ -70,25 +145,57 @@
return uni.getStorageSync('roleType')
}
},
- onLoad(params) {
- this.index = params.index ? params.index : ''
- },
onShow() {
this.GetOrderPlan()
+ this.qualityInspectionHistory()
},
methods: {
GetOrderPlan() {
uni.showLoading({ title: '鍔犺浇涓�...' });
- this.$reqGet('GetOrderPlan').then(res => {
+ this.$reqGet('qualityInspection').then(res => {
if (res.data) {
- this.orderPlanData = res.data[this.index].tmTaskCoals ? res.data[this.index].tmTaskCoals :
- []
uni.hideLoading();
+ this.orderPlanData = res.data
} else {
+ uni.hideLoading();
this.$u.toast('鍔犺浇澶辫触')
- uni.hideLoading()
}
})
+ },
+ // 楠岃川鍘嗗彶
+ qualityInspectionHistory() {
+ uni.showLoading({ title: '鍔犺浇涓�...' });
+ this.$reqGet('qualityInspectionHistory', { current: this.pageCurrent, size: this.pageSize }).then(res => {
+ if (res.data) {
+ uni.hideLoading();
+ this.total = res.data.total;
+ if (this.pageCurrent > 1) {
+ this.historyCoalData = this.historyCoalData.concat(res.data.records);
+ this.historyCoalData = this.ArrSet(this.historyCoalData, 'id');
+ } else {
+ this.historyCoalData = res.data.records;
+
+ }
+ } else {
+ uni.hideLoading();
+ this.$u.toast('鍔犺浇澶辫触')
+ }
+ })
+ },
+ // 涓婃媺鍔犺浇
+ historyScrolltolower() {
+ if (this.pageCurrent * this.pageSize >= this.total) return (this.showMoreData = true);
+ this.pageCurrent++;
+ this.qualityInspectionHistory();
+ },
+ //fix 鐐瑰嚮鎻愮叅鍗曡繑鍥炰細澧炲姞閲嶅鏁版嵁
+ ArrSet(Arr, id) {
+ var obj = {};
+ const arrays = Arr.reduce((setArr, item) => {
+ obj[item[id]] ? '' : (obj[item[id]] = true && setArr.push(item));
+ return setArr;
+ }, []);
+ return arrays;
},
validateClick(item) {
uni.navigateTo({
@@ -101,6 +208,113 @@
<style lang="scss"
scoped>
+ @mixin flex {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ }
+
+ .main {
+ width: 100%;
+ margin: 0 auto;
+ }
+
+ .history-numbers {
+ width: 100%;
+ position: relative;
+ // top: vww(-110);
+
+ .history-information {
+ width: 690rpx;
+ height: 398rpx;
+ margin: vww(10) vww(15);
+ 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;
+ @include flex flex-direction: column;
+ align-items: flex-start;
+ justify-content: space-evenly;
+ overflow: hidden;
+
+ .first {
+ width: 96%;
+ height: 34rpx;
+ font-size: 32rpx;
+ font-weight: 300;
+ color: #303030;
+ @include flex;
+ margin: vww(10) vww(10) 0;
+ }
+
+ .second {
+ width: 100%;
+ height: 31rpx;
+ font-size: 30rpx;
+ font-weight: 300;
+ color: #515151;
+ margin: vww(10) vww(10) 0;
+ @include flex;
+ justify-content: flex-start;
+
+ .coal-name {
+ min-width: vww(30);
+ height: vww(20);
+ margin-right: vww(21);
+ }
+
+ .order-type {
+ color: #035cfb;
+ border: 2px solid #035cfb;
+ border-radius: 4rpx;
+ padding: vww(2) vww(4);
+ text-align: center;
+ }
+ }
+
+ .third {
+ width: 96%;
+ height: 31rpx;
+ font-size: 30rpx;
+ font-weight: 300;
+ color: #515151;
+ margin: vww(10) vww(10) 0;
+ @include flex;
+
+ .third-line {
+ @include flex;
+
+ &_text {
+ color: #919090;
+ }
+
+ &_num {
+ color: #035cfb;
+ }
+ }
+ }
+
+ .fourth {
+ width: 100%;
+ height: 31rpx;
+ font-size: 30rpx;
+ font-weight: 300;
+ color: #515151;
+ margin: vww(10) vww(10) 0;
+ @include flex;
+
+ .fourth-icon {
+ width: vww(13);
+ height: vww(13);
+ margin-right: vww(14);
+ }
+
+ .senddate {
+ flex: 1;
+ }
+ }
+ }
+ }
+
.collection-form {
width: vww(345);
margin: 0 vww(15);
@@ -113,7 +327,8 @@
box-shadow: 4rpx 6rpx 25rpx 0rpx rgba(73, 120, 240, 0.15);
border-radius: 20rpx;
overflow: hidden;
- @include flex flex-direction: column;
+ @include flex;
+ flex-direction: column;
position: relative;
align-items: flex-start;
margin-top: vww(10);
@@ -205,6 +420,7 @@
}
.car-num {
+ color: #515151;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
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 4a300a1..52436c5 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
@@ -267,9 +267,9 @@
this.temporaryWeighObj.hair = newV;
} else {
this.temporaryWeighObj.skin = newV;
- this.temporaryWeighObj.clean = (this.showWeigh.hair -this.temporaryWeighObj.skin).toFixed(2);
- this.isweigh = this.temporaryWeighObj
- .clean < 0 || this.showWeigh.skin < newV && this.showWeigh.skin > 0;
+ this.temporaryWeighObj.clean = (this.showWeigh.skin - newV).toFixed(2);
+ this.isweigh = this.temporaryWeighObj.clean < 0 || this.showWeigh.skin < newV && this.showWeigh
+ .skin > 0;
}
}
},
diff --git a/pages/tabbar-page/myPage-tabbar/myPage-tabbar.vue b/pages/tabbar-page/myPage-tabbar/myPage-tabbar.vue
index ff1c1de..b8e030b 100644
--- a/pages/tabbar-page/myPage-tabbar/myPage-tabbar.vue
+++ b/pages/tabbar-page/myPage-tabbar/myPage-tabbar.vue
@@ -6,7 +6,7 @@
ref="freightForwarderMyPageRef"></freight-forwarder-my-page>
<driver-my-page v-if="roleType == 3"
ref="driverMyRef"></driver-my-page>
- <tab-bar :current="2"></tab-bar>
+ <tab-bar :current="roleType===4?3:2"></tab-bar>
</view>
</template>
diff --git a/static/tabBar-icon/checking.png b/static/tabBar-icon/checking.png
new file mode 100644
index 0000000..d6edea0
--- /dev/null
+++ b/static/tabBar-icon/checking.png
Binary files differ
diff --git a/static/tabBar-icon/checkingblue.png b/static/tabBar-icon/checkingblue.png
new file mode 100644
index 0000000..7c6f291
--- /dev/null
+++ b/static/tabBar-icon/checkingblue.png
Binary files differ
diff --git a/store/index.js b/store/index.js
index d498e51..5b11172 100644
--- a/store/index.js
+++ b/store/index.js
@@ -42,6 +42,31 @@
selectedIconPath: '../../static/tabBar-icon/Bmine57.png',
text: '鎴戠殑'
}
+ ],
+ three: [{
+ pagePath: 'pages/tabbar-page/index-tabbar/index-tabbar',
+ iconPath: '../../static/tabBar-icon/home.png',
+ selectedIconPath: '../../static/tabBar-icon/homeblue.png',
+ text: '棣栭〉'
+ },
+ {
+ pagePath: 'pages/driver-page/driver-index/bill-of-lading-details/selectOrderPlan/selectOrderPlan',
+ iconPath: '../../static/tabBar-icon/checking.png',
+ selectedIconPath: '../../static/tabBar-icon/checkingblue.png',
+ text: '楠岃川'
+ },
+ {
+ pagePath: 'pages/customer-page/customer-my/faYunstatistics/faYunstatistics',
+ iconPath: '../../static/tabBar-icon/statistics.png',
+ selectedIconPath: '../../static/tabBar-icon/statisticsactive.png',
+ text: '缁熻'
+ },
+ {
+ pagePath: 'pages/tabbar-page/myPage-tabbar/myPage-tabbar',
+ iconPath: '../../static/tabBar-icon/Gmine10.png',
+ selectedIconPath: '../../static/tabBar-icon/Bmine57.png',
+ text: '鎴戠殑'
+ }
]
}
const store = new Vuex.Store({
@@ -89,12 +114,15 @@
// 璁剧疆搴曢儴鏍�
setUserTabbar(state, roleType) {
state.roleType = roleType
- if (roleType == 1 || roleType == 4) {
+ if (roleType == 1) {
state.userTabbar = userRoleTabbar.first
uni.setStorageSync('userTabbar', state.userTabbar)
} else if (roleType == 2 || roleType == 3) {
state.userTabbar = userRoleTabbar.second
uni.setStorageSync('userTabbar', state.userTabbar)
+ } else if (roleType == 4) {
+ state.userTabbar = userRoleTabbar.three
+ uni.setStorageSync('userTabbar', state.userTabbar)
}
},
// 鏀瑰彉閲嶉噺
--
Gitblit v1.9.1