From 82fa9121ff649bb681fc55e482fe405c5ce0d4d0 Mon Sep 17 00:00:00 2001
From: 付延余 <f-yanyu@outlook.com>
Date: 星期三, 22 三月 2023 13:48:29 +0800
Subject: [PATCH] 称重界面完成（上磅计量页面完成）
---
components/tab-bar/tab-bar.vue | 1
pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue | 102 +++++++++++++++++++++++++++------
api/globalApi.js | 5 +
pages/driver-page/drvier-my/drvier-my.vue | 14 ++--
pages/customer-page/customer-index/fayunPlanDetails/fayunPlanDetails.vue | 28 ++++-----
pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue | 13 ++++
pages/customer-page/customer-my/customer-my.vue | 2
pages/driver-page/driver-index/driver-index.vue | 15 +++-
8 files changed, 131 insertions(+), 49 deletions(-)
diff --git a/api/globalApi.js b/api/globalApi.js
index eb8bea4..bc0f77a 100644
--- a/api/globalApi.js
+++ b/api/globalApi.js
@@ -234,6 +234,11 @@
url: "/wrzs/userOperation/weighList",
method: 'GET'
},
+ // 鍔犲噺鐓�
+ addAndSubtractCoal:{
+ url:'/wrzs/jcgatestate/repeatCheck',
+ method:'POST'
+ },
// 鑾峰彇鎵�鍦ㄧ鎴�
getWeighHouse:{
url:"/wrzs/jccoalweighhouse/getWeighHouse",
diff --git a/components/tab-bar/tab-bar.vue b/components/tab-bar/tab-bar.vue
index 6c7662f..4fb3d63 100644
--- a/components/tab-bar/tab-bar.vue
+++ b/components/tab-bar/tab-bar.vue
@@ -29,7 +29,6 @@
},
methods: {
tabbarchange(e) {
- console.log('tabbar鏀瑰彉',this.current, e,this.tabBarList);
uni.switchTab({
url: '/' + this.tabBarList[e].pagePath
});
diff --git a/pages/customer-page/customer-index/fayunPlanDetails/fayunPlanDetails.vue b/pages/customer-page/customer-index/fayunPlanDetails/fayunPlanDetails.vue
index 348131f..d2b183f 100644
--- a/pages/customer-page/customer-index/fayunPlanDetails/fayunPlanDetails.vue
+++ b/pages/customer-page/customer-index/fayunPlanDetails/fayunPlanDetails.vue
@@ -2,26 +2,22 @@
<view class="fayunPlan">
<view>
<view class="compDetails">
- <view class="comp">{{ orderPlanDetail.compName }}</view>
+ <!-- <view class="comp">{{ orderPlanDetail.compName }}</view> -->
<uni-table border stripe emptyText="鏆傛棤鏇村鏁版嵁">
<uni-tr>
- <uni-th align="left">鎬婚鍙栭噺</uni-th>
- <uni-td align="left">{{ orderPlanDetail.fowerdsum || 0 }}寮�</uni-td>
+ <uni-th align="left">杞彂鎬婚噺</uni-th>
+ <uni-td align="left">{{ orderPlanDetail.fowardSum || 0 }}寮�</uni-td>
+ </uni-tr>
+ <uni-tr v-for="(item,index) in orderPlanDetail.huodaiList" :key="index">
+ <uni-th align="left">{{ item.huoDaiName }}</uni-th>
+ <uni-td align="left">{{ item.fleetOrHuodaiNub }}寮�</uni-td>
+ </uni-tr>
+ <uni-tr v-for="(item,index) in orderPlanDetail.cheduiList" :key="index">
+ <uni-th align="left">{{item.cheduiName}}</uni-th>
+ <uni-td align="left">{{ item.fleetOrHuodaiNub }}寮�</uni-td>
</uni-tr>
<uni-tr>
- <uni-th align="left">杞﹂槦鍜岃揣浠�</uni-th>
- <uni-td align="left">{{ orderPlanDetail.fleetOrHuodaiNub || 0 }}寮�</uni-td>
- </uni-tr>
- <uni-tr>
- <uni-th align="left">杞﹂槦</uni-th>
- <uni-td align="left">{{ orderPlanDetail.cheduiList || 0 }}寮�</uni-td>
- </uni-tr>
- <uni-tr>
- <uni-th align="left">璐т唬</uni-th>
- <uni-td align="left">{{ orderPlanDetail.huodaiList || 0 }}寮�</uni-td>
- </uni-tr>
- <uni-tr>
- <uni-th align="left">鍙告満</uni-th>
+ <uni-th align="left">鍙告満鎬婚鍙�</uni-th>
<uni-td align="left">{{ orderPlanDetail.sijiSum || 0 }}寮�</uni-td>
</uni-tr>
</uni-table>
diff --git a/pages/customer-page/customer-my/customer-my.vue b/pages/customer-page/customer-my/customer-my.vue
index 04a2b1b..c7ea67c 100644
--- a/pages/customer-page/customer-my/customer-my.vue
+++ b/pages/customer-page/customer-my/customer-my.vue
@@ -147,7 +147,7 @@
},
// 鑾峰彇杞﹂槦鍒楄〃
getFleet() {
- this.$reqGet('getFleet', { customerId }).then(res => {
+ this.$reqGet('getFleet').then(res => {
this.fleetData = res.data;
console.log('杞﹂槦鍒楄〃', res);
});
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 42ae87c..f914f46 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
@@ -87,6 +87,17 @@
},
// 绛惧埌
arriveClick() {
+
+ // 鑾峰彇浣嶇疆淇℃伅
+ // wx.getFuzzyLocation({
+ // type: 'wgs84',
+ // success (res) {
+ // const latitude = res.latitude
+ // const longitude = res.longitude
+ // }
+ // })
+
+
uni.navigateTo({
url: `/pages/driver-page/driver-index/bill-of-lading-details/punchTheClock/punchTheClock?orderPlanId=${this.orderPlanId}`
});
@@ -112,7 +123,7 @@
console.log(res, '鑾峰彇纾呮埧');
if(res.code == 0){
uni.navigateTo({
- url: `/pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice?takeCoalId=${this.orderPlanId}&sceneId=${res.data.id}&gateCameraId=${res.data.gateCameraId}&gateCameraCode=${res.data.gateCameraCode}&weighCode=${res.data.weighCode}`
+ url: `/pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice?takeCoalId=${this.orderPlanId}&sceneId=${res.data.id}&gateCameraId=${res.data.lastEquipmentId}&gateCameraCode=${res.data.lastEquipmentCode}&weighHouseCode=${res.data.code}`
});
}else{
this.$u.toast('鏈湪纾呮埧锛岃鍓嶅線纾呮埧鍚庡啀璇曪紒锛�')
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 d27cf67..411d631 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
@@ -25,15 +25,18 @@
<view class="two">
<p>璁㈠崟缂栧彿锛歿{ weighList.code || '' }}</p>
<p>璁㈠崟绫诲瀷锛歿{ weighList.orderTye || '' }}</p>
- <p>璁㈠崟浣欓噺锛歿{ weighList.allowance }}</p>
- <p>鐨噸锛歿{ weighList.skin || '' }}</p>
- <p>姣涢噸锛歿{ weighList.hair || '' }}</p>
- <p>鍑�閲嶏細{{ weighList.clean || '' }}</p>
+ <p>璁㈠崟浣欓噺锛歿{ weighList.orderSurplus }}</p>
+ <p>鐨噸锛歿{ weighList.skin || 0 }}</p>
+ <p>姣涢噸锛歿{ weighList.hair || 0 }}</p>
+ <p>鍑�閲嶏細{{ weighList.skin == 0 && weighList.hair == 0 ? weighList.clean : weighList.skin != 0 ? realTimeWeigh - weighList.skin : weighList.hair - realTimeWeigh }}</p>
+ <p>鐓ょ鍚嶇О锛歿{ weighList.coalName }}</p>
+ <p>鍗曚綅鍚嶇О锛歿{ weighList.deptName }}</p>
+ <p>鐭垮満鍚嶇О锛歿{ weighList.filedName }}</p>
</view>
<view class="three">
<!-- 澶栭攢璁㈠崟鎴愮毊鏃讹紝杩斿洖鍔犲噺鍚ㄦ寜閽疆鐏般�傜О姣涙椂鍙敤.澶栬喘璁㈠崟锛屼笉鍑虹幇杩斿洖鍔犲噺鍚ㄧ殑鎸夐挳 -->
- <u-button type="primary" text="纭畾绉伴噸" @click="confirmWeigh"></u-button>
- <u-button type="primary" text="杩斿洖鍔犲噺鍚�"></u-button>
+ <u-button type="primary" text="纭畾绉伴噸" :loading="isConfirmWeighLoading" loadingText="鍔犺浇涓�" @click="confirmWeigh"></u-button>
+ <u-button type="primary" text="杩斿洖鍔犲噺鍚�" :disabled="addAndSubtractCoalDisabled" v-if="weighList.orderTye == '澶栭攢'" @click="addAndSubtractCoal"></u-button>
</view>
<view class="four">濡傛偍闇�瑕佽皟鏁磋杞借揣鍝佸惃鏁帮紝璇风偣鍑昏繑鍥炲姞鍑忓惃</view>
</view>
@@ -48,7 +51,7 @@
this.weighData.sceneId = params.sceneId;
this.weighData.gateCameraId = params.gateCameraId;
this.weighData.equipmentCode = params.gateCameraCode;
- this.weighCode = params.weighCode;
+ this.weighHouseCode = params.weighHouseCode;
},
data() {
return {
@@ -60,11 +63,12 @@
carNo: '',
gateCameraId: '',
equipmentCode: '',
- weigh: '',
+ weigh: 0,
tmCode: ''
},
takeCoalId: null,
- weighCode: '',
+ weighHouseCode: '',
+ isConfirmWeighLoading: false, //纭畾绉伴噸鎸夐挳
realTimeWeigh: '',
weighList: {},
webSocket: null // webSocket瀹炰緥
@@ -87,6 +91,15 @@
computed: {
token() {
return uni.getStorageSync('token');
+ },
+ addAndSubtractCoalDisabled() {
+ if (this.weighList.orderTye == '澶栭攢') {
+ if (this.weighList.skin == 0) {
+ return true;
+ } else if (this.weighList.skin != 0) {
+ return false;
+ }
+ }
}
},
methods: {
@@ -107,10 +120,58 @@
* @纭绉伴噸绛夊緟鍚庣鎻愪緵瀹炴椂绉伴噸鎺ュ彛锛岃幏鍙栫毊閲嶏紝姣涢噸
*/
confirmWeigh() {
- console.log('纭绉伴噸', this.weighData);
- this.$reqPost('saveWeigh',this.weighData,'json').then(res=>{
- console.log(res,"纭绉伴噸");
- })
+ if (this.isConfirmWeighLoading == false) {
+ this.isConfirmWeighLoading = true;
+ if (this.weighData.weigh != 0) {
+ if (this.weighList.orderTye == '澶栭攢') {
+ if (this.weighList.skin ? (this.weighList.skin < this.realTimeWeigh ? true : false) : true) {
+ this.saveWeigh();
+ } else {
+ this.$u.toast('姣涢噸涓嶈兘灏忎簬鐨噸');
+ this.isConfirmWeighLoading = false;
+ }
+ } else {
+ this.saveWeigh();
+ }
+ } else {
+ this.$u.toast('鏈兘鑾峰彇鍦扮閲嶉噺');
+ this.isConfirmWeighLoading = false;
+ }
+ }
+ },
+ // 纭绉伴噸鎺ュ彛
+ saveWeigh() {
+ this.$reqPost('saveWeigh', this.weighData, 'json')
+ .then(res => {
+ if (res.code == 0) {
+ this.$u.toast('绉伴噸鎴愬姛');
+ setTimeout(() => {
+ uni.navigateBack({
+ delta: 1
+ });
+ this.isConfirmWeighLoading = false;
+ }, 1000);
+ }
+ })
+ .catch(err => {
+ this.isConfirmWeighLoading = false;
+ console.log(err);
+ });
+ },
+ // 鍔犲噺鐓�
+ addAndSubtractCoal() {
+ this.$reqPost('addAndSubtractCoal', { deptId: this.weighData.deptId, sceneId: this.weighData.sceneId, carNo: this.weighData.carNo }, 'json').then(res => {
+ if (res.code == 0) {
+ this.$u.toast('鎿嶄綔鎴愬姛锛屽嵆灏嗚繑鍥炰笂涓�椤�')
+ setTimeout(() => {
+ uni.navigateBack({
+ delta: 1
+ });
+ this.isConfirmWeighLoading = false;
+ }, 1000);
+ console.log(res, '鍔犲噺鐓�');
+ }
+ });
},
/**
* 鍒濆鍖� weoSocket
@@ -131,18 +192,21 @@
console.log('onOpen');
});
socket.onMessage(res => {
+ // 鑾峰彇鏈嶅姟鍣ㄤ紶鏉ョ殑鏁版嵁锛屽仛鐩稿簲澶勭悊
console.log('socketWeigh', res);
let nowWeigh = JSON.parse(res.data.slice(7)).weigh;
- // if (nowWeigh.eqCode == this.weighCode) {
- // this.weighData.weigh = this.realTimeWeigh = nowWeigh;
- // }
- this.weighData.weigh = this.realTimeWeigh = nowWeigh;
- }); // 鑾峰彇鏈嶅姟鍣ㄤ紶鏉ョ殑鏁版嵁锛屽仛鐩稿簲澶勭悊
+ let nowWeighHouseCode = JSON.parse(res.data.slice(7)).eqCode;
+ if (nowWeighHouseCode == this.weighHouseCode) {
+ this.weighData.weigh = this.realTimeWeigh = nowWeigh;
+ }
+ });
socket.onClose(() => {
- console.log('close');
+ console.log('webSocketClose');
+ this.$u.toast('纾呮埧鎺ュ彛缁堢');
});
socket.onError(err => {
console.log('socket鎶ラ敊', err);
+ this.$u.toast('纾呮埧鎺ュ彛鏆傛椂涓嶈兘浣跨敤锛岃閲嶆柊杩涘叆璇ラ〉闈紝閲嶈瘯锛侊紒');
});
}
}
diff --git a/pages/driver-page/driver-index/driver-index.vue b/pages/driver-page/driver-index/driver-index.vue
index e90e112..3446a6c 100644
--- a/pages/driver-page/driver-index/driver-index.vue
+++ b/pages/driver-page/driver-index/driver-index.vue
@@ -126,7 +126,8 @@
// 鎶㈠崟妯℃�佹
qiangDanShow: false,
qiangDanTitle: '鎶㈠崟鎻愮ず',
- qiangDanContent: ''
+ qiangDanContent: '',
+ qiangDanOrderPlanId:null
};
},
onShow() {
@@ -141,22 +142,26 @@
uni.showLoading({
title: '鍔犺浇涓�...'
});
- // this.$reqGet('qiangDanList', { id: customerId }).then(res => {
this.$reqGet('qiangDanList').then(res => {
- console.log('鎶㈠崟鍒楄〃', res);
uni.hideLoading();
this.driverBillOfLoadingData = res.data;
});
},
// 鎶㈠崟鎸夐挳
qiangDanBtn(value) {
- if (value.taskNum == 0) {
+ if (value.tmcCount == 0) {
this.qiangDan(value.orderPlanId);
} else {
+ this.qiangDanOrderPlanId = value.orderPlanId
+ this.qiangDanShow = true
+ this.qiangDanContent = `宸叉姠${value.tmcCount}鍗曪紝纭畾鎶㈠崟锛焋
}
},
// 鎶㈠崟妯℃�佹
- qiangDanConfirm() {},
+ qiangDanConfirm() {
+ this.qiangDanContent = ''
+ this.qiangDan(this.qiangDanOrderPlanId);
+ },
qiangDanCancel() {
this.qiangDanShow = false;
},
diff --git a/pages/driver-page/drvier-my/drvier-my.vue b/pages/driver-page/drvier-my/drvier-my.vue
index 13ece51..464386b 100644
--- a/pages/driver-page/drvier-my/drvier-my.vue
+++ b/pages/driver-page/drvier-my/drvier-my.vue
@@ -38,10 +38,14 @@
<u--input border="none" inputAlign="right" disabled disabledColor="#fff"></u--input>
</u-form-item>
<u-form-item labelWidth="20%" label="杞﹁締鐓х墖" ref="item1">
- <u--image :showLoading="true" :src="BaseUrl + userInfo.carImg" width="80px" height="80px" @click="imageClick(1)"></u--image>
+ <u--image :showLoading="true" :src="userInfo.carImg != null ? BaseUrl + userInfo.carImg : ''" width="80px" height="80px" @click="imageClick(1)">
+ <view slot="error" style="font-size: 24rpx;">鍔犺浇澶辫触</view>
+ </u--image>
</u-form-item>
<u-form-item labelWidth="25%" label="琛岄┒璇佺収鐗�" ref="item1">
- <u--image :showLoading="true" :src="BaseUrl + userInfo.drivingImg" width="80px" height="80px" @click="imageClick(2)"></u--image>
+ <u--image :showLoading="true" :src="userInfo.drivingImg != null ? BaseUrl + userInfo.drivingImg : ''" width="80px" height="80px" @click="imageClick(2)">
+ <view slot="error" style="font-size: 24rpx;">鍔犺浇澶辫触</view>
+ </u--image>
</u-form-item>
</u--form>
<view class="push-information-button">
@@ -53,7 +57,7 @@
<!-- 鍥剧墖棰勮寮瑰嚭妗� -->
<view class="previewImage-container">
<u-popup :show="previewImageShow" mode="center" @close="previewImageClose" @open="previewImageOpen">
- <u--image :src="BaseUrl + previewImageSrc" width="400px" height="400px"></u--image>
+ <u--image :src="previewImageSrc!=null?BaseUrl + previewImageSrc:''" width="400px" height="400px"></u--image>
</u-popup>
</view>
@@ -106,7 +110,7 @@
drivingImg: '',
axleNum: '',
weight: '',
- userId:''
+ userId: ''
},
src: '',
fileList1: [],
@@ -135,11 +139,9 @@
title: '鍔犺浇涓�...'
});
this.$reqGet('getUserEntity').then(res => {
- console.log(res, '鍙告満璇︽儏');
uni.hideLoading();
this.userInfo = res.data;
Object.keys(this.editUserInfo).map(item => {
- console.log(res.data[item]);
if (res.data[item]) {
this.editUserInfo[item] = res.data[item];
}
--
Gitblit v1.9.1