From e193d75257a21568a15f99b27a2a48bd7fd815f9 Mon Sep 17 00:00:00 2001
From: 付延余 <f-yanyu@outlook.com>
Date: 星期三, 22 三月 2023 17:59:06 +0800
Subject: [PATCH] 1.磅房详情（完成） 2.入场申请报错（完成） 3.签到（完成） 4.日志（完成） 5.发运计划详情(完成）
---
api/publicInterface.js | 2
pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue | 10
pages/login/userPassword.vue | 4
pages/driver-page/appointment/appointment.vue | 2
pages/driver-page/driver-index/bill-of-lading-details/punchTheClock/punchTheClock.vue | 79 +++++++++++--
api/request.js | 4
pages/customer-page/customer-index/customer-index.vue | 8 +
pages/customer-page/customer-index/fayunPlanDetails/fayunPlanDetails.vue | 141 ++++++++++++++++------
pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue | 86 +++++++++----
9 files changed, 245 insertions(+), 91 deletions(-)
diff --git a/api/publicInterface.js b/api/publicInterface.js
index 92997f9..c295cff 100644
--- a/api/publicInterface.js
+++ b/api/publicInterface.js
@@ -4,7 +4,7 @@
// const BaseUrl = "http://192.168.3.159:9999/";
import {BaseUrl as wrBaseUrl} from '@/api/request.js'
// const BaseUrl = "http://192.168.0.120:9999"
-const BaseUrl = "http://192.168.3.130:9999"
+const BaseUrl = "http://192.168.110.101:9999"
// 鐧诲綍
// function apiLogin({
diff --git a/api/request.js b/api/request.js
index 6b7e1b8..1912f06 100644
--- a/api/request.js
+++ b/api/request.js
@@ -80,8 +80,8 @@
// const BaseUrl = "http://192.168.0.120:9997"
// const webSocketUrl = "ws://192.168.0.120:9997/wrzs/ws/info"
-const BaseUrl = "http://192.168.3.130:9997";
-const webSocketUrl = "ws://192.168.3.130:9997/wrzs/ws/info"
+const BaseUrl = "http://192.168.110.101:9997";
+const webSocketUrl = "ws://192.168.110.101:9997/wrzs/ws/info"
// 璇锋眰鎷︽埅
const fetch = (url, opt) => {
diff --git a/pages/customer-page/customer-index/customer-index.vue b/pages/customer-page/customer-index/customer-index.vue
index 32fbd19..7afe7a7 100644
--- a/pages/customer-page/customer-index/customer-index.vue
+++ b/pages/customer-page/customer-index/customer-index.vue
@@ -140,8 +140,14 @@
// 鎻愮叅鍗曡鎯�
cardBodyClick(name) {
console.log('鎻愮叅鍗曡鎯�', name);
+ let code = null;
+ this.orderPlanData.forEach(item => {
+ if (item.id == name) {
+ code = item.code;
+ }
+ });
uni.navigateTo({
- url: `/pages/customer-page/customer-index/fayunPlanDetails/fayunPlanDetails?orderPlanId=${name}`
+ url: `/pages/customer-page/customer-index/fayunPlanDetails/fayunPlanDetails?orderPlanId=${name}&code=${code}`
});
},
// 杞彂
diff --git a/pages/customer-page/customer-index/fayunPlanDetails/fayunPlanDetails.vue b/pages/customer-page/customer-index/fayunPlanDetails/fayunPlanDetails.vue
index d2b183f..0fe0230 100644
--- a/pages/customer-page/customer-index/fayunPlanDetails/fayunPlanDetails.vue
+++ b/pages/customer-page/customer-index/fayunPlanDetails/fayunPlanDetails.vue
@@ -1,34 +1,74 @@
<template>
<view class="fayunPlan">
- <view>
+ <view class="fayunPlanBody">
+ <combined-title title="棰嗗彇鎯呭喌"></combined-title>
<view class="compDetails">
<!-- <view class="comp">{{ orderPlanDetail.compName }}</view> -->
<uni-table border stripe emptyText="鏆傛棤鏇村鏁版嵁">
<uni-tr>
- <uni-th align="left">杞彂鎬婚噺</uni-th>
+ <uni-th align="left" width="200">杞彂鎬婚噺</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-tr>
+ <uni-th align="left" width="200">棰嗗彇鎬婚噺</uni-th>
+ <uni-td align="left">{{ orderPlanDetail.fleetOrHuodaiNub || 0 }}寮�</uni-td>
+ </uni-tr>
+ <uni-tr v-for="(item, index) in orderPlanDetail.huodaiList" :key="index">
+ <uni-th align="left" width="200">{{ 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-tr v-for="(item, index) in orderPlanDetail.cheduiList" :key="index">
+ <uni-th align="left" width="200">{{ item.cheduiName }}</uni-th>
<uni-td align="left">{{ item.fleetOrHuodaiNub }}寮�</uni-td>
</uni-tr>
<uni-tr>
- <uni-th align="left">鍙告満鎬婚鍙�</uni-th>
+ <uni-th align="left" width="200">鍙告満鎬婚鍙�</uni-th>
<uni-td align="left">{{ orderPlanDetail.sijiSum || 0 }}寮�</uni-td>
</uni-tr>
</uni-table>
</view>
-
- <view class="compDetails">
- <view class="comp">棰勭害鎯呭喌</view>
+ <combined-title title="鎻愮叅鍗曡鎯�"></combined-title>
+ <view class="compDetails" v-for="(item, index) in orderPlanDetail.yyDailyList" :key="index">
<uni-table border stripe emptyText="鏆傛棤鏇村鏁版嵁">
- <uni-tr v-for="(item, index) in orderPlanDetail.yyDailyList">
- <uni-td align="left">{{ orderPlanDetail.yyDailyList }}</uni-td>
- <uni-td align="left">{{ orderPlanDetail.yyDailyList }}寮�</uni-td>
+ <uni-tr>
+ <uni-th align="left">鎻愮叅鍗曠紪鍙�</uni-th>
+ <uni-td align="left">{{ item.code || '' }}</uni-td>
+ </uni-tr>
+ <uni-tr>
+ <uni-th align="left">鎻愮叅鍗曠姸鎬�</uni-th>
+ <uni-td align="left">{{ coalStatus[item.status] }}</uni-td>
+ </uni-tr>
+ <uni-tr>
+ <uni-th align="left">杞︾墝鍙�</uni-th>
+ <uni-td align="left">{{ item.carNo || '' }}</uni-td>
+ </uni-tr>
+ <uni-tr>
+ <uni-th align="left">鍏ュ満鏃堕棿</uni-th>
+ <uni-td align="left">{{ item.inTime || '' }}</uni-td>
+ </uni-tr>
+ <uni-tr>
+ <uni-th align="left">鍑哄満鏃堕棿</uni-th>
+ <uni-td align="left">{{ item.outTime || '' }}</uni-td>
+ </uni-tr>
+ <uni-tr>
+ <uni-th align="left">鐨噸</uni-th>
+ <uni-td align="left">{{ item.skin || 0 }}</uni-td>
+ </uni-tr>
+ <uni-tr>
+ <uni-th align="left">姣涢噸</uni-th>
+ <uni-td align="left">{{ item.hair || 0 }}</uni-td>
+ </uni-tr>
+ <uni-tr>
+ <uni-th align="left">鍑�閲�</uni-th>
+ <uni-td align="left">{{ item.clean || 0 }}</uni-td>
+ </uni-tr>
+ <uni-tr>
+ <uni-th align="left">璁㈠崟缂栧彿</uni-th>
+ <uni-td align="left">{{ orderCode || '' }}</uni-td>
+ </uni-tr>
+ <uni-tr>
+ <uni-th align="left">璁㈠崟鍓╀綑閲�</uni-th>
+ <uni-td align="left">{{ item.allowance || 0 }}</uni-td>
</uni-tr>
</uni-table>
</view>
@@ -37,20 +77,27 @@
</template>
<script>
+import combinedTitle from '@/components/combined-title/combined-title.vue';
export default {
+ components: {
+ combinedTitle
+ },
onLoad(value) {
console.log('椤甸潰鍔犺浇', value);
- if (value.orderPlanId) {
+ if (value.orderPlanId && value.code) {
this.orderPlanId = value.orderPlanId;
+ this.orderCode = value.code;
}
},
data() {
return {
orderPlanId: null,
- orderPlanDetail: {}
+ orderCode: null,
+ orderPlanDetail: {},
+ coalStatus: ['棰嗗彇', '棰勭害', '绛惧埌', '鍏ュ満', '绉扮毊', '绉版瘺', '绂诲満', '鍏ョ鎴�', '鍑虹鎴�', '鍏ョ叅鍦�', '鍑虹叅浠�']
};
},
- onShow(){
+ onShow() {
this.init();
},
methods: {
@@ -59,8 +106,14 @@
},
// 鑾峰彇鍙戣繍璁″垝璇︽儏
GetOrderPlanDetail() {
+ uni.showLoading({
+ title: '鍔犺浇涓�...'
+ });
this.$reqGet('xiangqingList', { orderPlanId: this.orderPlanId }).then(res => {
- this.orderPlanDetail = res.data;
+ if (res.code == 0) {
+ this.orderPlanDetail = res.data;
+ uni.hideLoading();
+ }
});
}
}
@@ -73,35 +126,43 @@
margin: 0 auto;
display: flex;
flex-direction: column;
- .compDetails {
+ .fayunPlanBody {
width: 94%;
- margin: vww(24) auto 0 auto;
- .comp {
- font-size: vww(16);
- font-weight: 400;
- padding: 0 vww(10);
- height: vww(40);
- line-height: vww(40);
- border: 1px solid #ebeef5;
- border-bottom: none;
- background-color: #f5f5f5;
+ margin: 0 auto;
+
+ .compDetails {
+ width: 94%;
+ margin: vww(24) auto 0 auto;
+ .comp {
+ font-size: vww(16);
+ font-weight: 400;
+ padding: 0 vww(10);
+ height: vww(40);
+ line-height: vww(40);
+ border: 1px solid #ebeef5;
+ border-bottom: none;
+ background-color: #f5f5f5;
+ }
}
+ // 琛ㄦ牸鏍峰紡
.uni-table {
.uni-table-tr {
padding: 0;
- // .uni-table-th {
- // height: vww(40);
- // line-height: vww(40);
- // padding: vww(5) vww(10);
- // color: #111111;
- // font-weight: 300;
- // background: #f5f5f5;
- // }
+ border:vww(1) solid #c6c6c6;
+ .uni-table-th {
+ font-size: vww(14);
+ height: vww(30);
+ line-height: vww(30);
+ padding: vww(5) vww(10);
+ color: #111111;
+ font-weight: 500;
+ background: #e2e2e2;
+ }
.uni-table-td {
- font-size: vww(16);
- font-weight: 300;
- height: vww(40);
- line-height: vww(40);
+ font-size: vww(14);
+ font-weight: 400;
+ height: vww(30);
+ line-height: vww(30);
padding: vww(5) vww(10);
color: #111111;
}
diff --git a/pages/driver-page/appointment/appointment.vue b/pages/driver-page/appointment/appointment.vue
index 272b15c..987df15 100644
--- a/pages/driver-page/appointment/appointment.vue
+++ b/pages/driver-page/appointment/appointment.vue
@@ -28,11 +28,13 @@
},
data() {
return {
+ // 棰勭害鍒楄〃璇锋眰鍙傛暟
yuYueListParams: {
filedId: '',
deptId: '',
sendDate: ''
},
+ // 棰勭害璇锋眰鍙傛暟
yuYuePostParams: {
takeCoalId: null,
yuYueId: null
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 f914f46..fd0fc70 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
@@ -1,6 +1,24 @@
<template>
<view class="bill-of-lading-details">
- <view class="bangDanMessage"><text>纾呭崟淇℃伅</text></view>
+ <view class="bangDanMessage">
+ <view class="">
+ <u--text align="center" size="35" bold plain text="涓昏壊" :text="'瀹㈡埛锛�' + coalDetailsData.customerName"></u--text>
+ <u--text align="center" size="35" bold plain text="涓昏壊" :text="'鐭垮巶锛�' + coalDetailsData.deptName"></u--text>
+ </view>
+ <view class="">
+ <u--text align="center" size="35" bold plain text="涓昏壊" :text="'鐨噸锛�' + coalDetailsData.skin"></u--text>
+ <u--text align="center" size="35" bold plain text="涓昏壊" :text="'姣涢噸锛�' + coalDetailsData.hair"></u--text>
+ <u--text align="center" size="35" bold plain text="涓昏壊" :text="'鍑�閲嶏細' + coalDetailsData.clean"></u--text>
+ </view>
+ <view class="">
+ <u--text align="center" size="35" bold plain text="涓昏壊" :text="'纾呭崟绫诲瀷锛�' + coalDetailsData.orderTye"></u--text>
+ <u--text align="center" size="35" bold plain text="涓昏壊" :text="'鐘舵�侊細' + coalStatus[coalDetailsData.status]"></u--text>
+ </view>
+ <u--text align="center" size="35" bold plain text="涓昏壊" :text="'鐓ゅ満锛�' + coalDetailsData.filedName"></u--text>
+ <u--text align="center" size="35" bold plain text="涓昏壊" :text="'鍙戣繍鏃堕棿锛�' + coalDetailsData.sendDate"></u--text>
+ <u--text align="center" size="35" bold plain text="涓昏壊" :text="'鎻愮叅鍗曠紪鍙凤細' + coalDetailsData.code"></u--text>
+ <u--text align="center" size="35" bold plain text="涓昏壊" :text="'璁㈠崟缂栧彿锛�' + coalDetailsData.orderCode"></u--text>
+ </view>
<view class="timeLine" style="font-size: 16rpx;">
<u--text type="primary" size="30" plain text="涓昏壊" v-for="(item, index) in dayRZ" :key="index" :text="item.taskStatusDes"></u--text>
</view>
@@ -39,7 +57,13 @@
tmId: '',
tmCode: '',
carNo: ''
- }
+ },
+ getYuYueDataParams: {
+ deptId: '',
+ filedId: '',
+ sendDate: ''
+ },
+ coalStatus: ['棰嗗彇', '棰勭害', '绛惧埌', '鍏ュ満', '绉扮毊', '绉版瘺', '绂诲満', '鍏ョ鎴�', '鍑虹鎴�', '鍏ョ叅鍦�', '鍑虹叅浠�'] // 鐘舵��
};
},
onShow() {
@@ -63,11 +87,16 @@
this.$reqGet('getTakeCoal', { takeCoalId: this.orderPlanId }).then(res => {
if (res.code == 0) {
this.coalDetailsData = res.data[0];
+ // 鑾峰彇鎵�鍦ㄧ鎴垮弬鏁拌祴鍊�
this.getWeightHouseObj.deptId = this.coalDetailsData.deptId;
this.getWeightHouseObj.filedId = this.coalDetailsData.filedId;
this.getWeightHouseObj.tmId = this.coalDetailsData.id;
this.getWeightHouseObj.tmCode = this.coalDetailsData.code;
this.getWeightHouseObj.carNo = this.coalDetailsData.carNo;
+ // 鑾峰彇鍏ュ満鐢宠鎿嶄綔鍚庣殑棰勭害鍒楄〃鐨勫弬鏁�
+ this.getYuYueDataParams.deptId = this.coalDetailsData.deptId;
+ this.getYuYueDataParams.filedId = this.coalDetailsData.filedId;
+ this.getYuYueDataParams.sendDate = this.coalDetailsData.sendDate;
}
});
},
@@ -87,17 +116,6 @@
},
// 绛惧埌
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}`
});
@@ -105,7 +123,9 @@
// 鍏ュ満鐢宠
rcsqClick() {
uni.navigateTo({
- url: `/pages/driver-page/appointment/appointment?takeCoalId=${this.orderPlanId}&type=鍏ュ満鐢宠&yyId=${this.yyId}`
+ 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}`
});
},
// 鍛煎彨瀹㈡湇
@@ -121,12 +141,14 @@
cengZhongClick() {
this.$reqGet('getWeighHouse', this.getWeightHouseObj).then(res => {
console.log(res, '鑾峰彇纾呮埧');
- if(res.code == 0){
+ 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.lastEquipmentId}&gateCameraCode=${res.data.lastEquipmentCode}&weighHouseCode=${res.data.code}`
+ 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('鏈湪纾呮埧锛岃鍓嶅線纾呮埧鍚庡啀璇曪紒锛�')
+ } else {
+ this.$u.toast('鏈湪纾呮埧锛岃鍓嶅線纾呮埧鍚庡啀璇曪紒锛�');
}
});
}
@@ -141,22 +163,32 @@
margin: 0 auto;
display: flex;
flex-direction: column;
-
.bangDanMessage {
- font-size: vww(20);
- font-weight: 500;
border: vww(2) solid #dddddd;
border-radius: vww(20);
margin: vww(20);
margin-bottom: vww(10);
- flex: 1;
- display: flex;
- flex-direction: row;
- align-items: center;
- justify-content: center;
+ height: 40%;
+ box-sizing: border-box;
+ overflow-y: overlay; //琛屼负涓� auto 鐩稿悓锛屼絾鏄粴鍔ㄦ潯缁樺埗鍦ㄥ唴瀹逛箣涓婏紝鑰屼笉鏄崰鎹┖闂淬��
+ .u-text {
+ margin-bottom: vww(5) !important;
+ }
+ view {
+ margin-bottom: vww(5);
+ }
+ view:nth-of-type(1) {
+ display: flex;
+ }
+ view:nth-of-type(2) {
+ display: flex;
+ }
+ view:nth-of-type(3) {
+ display: flex;
+ }
}
.timeLine {
- height: 45%;
+ height: 25%;
margin: vww(20);
margin-top: vww(10);
margin-bottom: vww(10);
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 843f75a..38d397c 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
@@ -3,8 +3,8 @@
<view class="punchTheClock">
<!-- 鎵撳崱鎸夐挳 -->
<view class="punchTheClock_container">
- <view class="punchTheClock_btn">
- <view class="">
+ <view class="punchTheClock_btn" @click="arrive">
+ <view>
<p>绛惧埌/鎵撳崱</p>
<p>{{ nowTime }}</p>
</view>
@@ -20,31 +20,84 @@
<script>
import { todayDate } from '@/utils/util.js';
export default {
- onLoad(params){
- if(params.orderPlanId){
- this.orderPlanId = params.orderPlanId
+ onLoad(params) {
+ if (params.orderPlanId) {
+ this.punchTheClockObj.id = params.orderPlanId;
}
},
data() {
return {
nowTime: '',
- orderPlanId:null
+ punchTheClockObj: {
+ latitude: null,
+ longitude: null,
+ id: null
+ }
};
},
onShow() {
this.todayDate();
+ // 鑾峰彇鏉冮檺淇℃伅
+ wx.getSetting({
+ success(res) {
+ if (!res.authSetting['scope.userFuzzyLocation']) {
+ wx.authorize({
+ scope: 'scope.userFuzzyLocation',
+ success(res) {
+ console.log(res);
+ if (res.errMsg == 'authorize:ok') {
+ // 鑾峰彇浣嶇疆淇℃伅
+ this.getFuzzyLocation();
+ }
+ }
+ });
+ } else {
+ this.getFuzzyLocation();
+ }
+ },
+ fail() {
+ console.log('鑾峰彇澶辫触');
+ }
+ });
},
methods: {
+ getFuzzyLocation() {
+ wx.getFuzzyLocation({
+ type: 'wgs84',
+ success(res) {
+ console.log(res, '鑾峰彇浣嶇疆');
+ this.punchTheClockObj.latitude = res.latitude;
+ this.punchTheClockObj.longitude = res.longitude;
+ }
+ });
+ },
todayDate() {
setInterval(() => {
this.nowTime = todayDate('hms');
}, 1000);
},
// 绛惧埌
- arrive(){
- this.$reqPost('arrive', { id: this.orderPlanId }, 'params').then(res => {
- console.log(res, '绛惧埌');
- });
+ arrive() {
+ if (this.punchTheClockObj.latitude && this.punchTheClockObj.longitude) {
+ this.$reqPost('arrive', this.punchTheClockObj, 'params').then(res => {
+ console.log(res, '绛惧埌');
+ if (res.code == 0) {
+ this.$u.toast('绛惧埌鎴愬姛');
+ setTimeout(() => {
+ uni.navigateBack(
+ {
+ delta: 1
+ },
+ 500
+ );
+ });
+ } else {
+ this.$u.toast(res.data ? res.data : '绛惧埌澶辫触');
+ }
+ });
+ } else {
+ this.$u.toast('鏆傝幏鍙栦笉鍒板埌褰撳墠浣嶇疆');
+ }
}
}
};
@@ -69,12 +122,12 @@
align-items: center;
}
.punchTheClock_text {
- display:flex;
+ display: flex;
justify-content: center;
margin-top: vww(20);
color: #b8b8b8;
- .text{
- margin-left:vww(5);
+ .text {
+ margin-left: vww(5);
}
}
}
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 411d631..8dee72c 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,13 +25,13 @@
<view class="two">
<p>璁㈠崟缂栧彿锛歿{ weighList.code || '' }}</p>
<p>璁㈠崟绫诲瀷锛歿{ weighList.orderTye || '' }}</p>
- <p>璁㈠崟浣欓噺锛歿{ weighList.orderSurplus }}</p>
+ <p>璁㈠崟浣欓噺锛歿{ weighList.orderSurplus || 0 }}</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>
+ <p>鐓ょ鍚嶇О锛歿{ weighList.coalName || '' }}</p>
+ <p>鍗曚綅鍚嶇О锛歿{ weighList.deptName || '' }}</p>
+ <p>鐭垮満鍚嶇О锛歿{ weighList.filedName || '' }}</p>
</view>
<view class="three">
<!-- 澶栭攢璁㈠崟鎴愮毊鏃讹紝杩斿洖鍔犲噺鍚ㄦ寜閽疆鐏般�傜О姣涙椂鍙敤.澶栬喘璁㈠崟锛屼笉鍑虹幇杩斿洖鍔犲噺鍚ㄧ殑鎸夐挳 -->
@@ -162,7 +162,7 @@
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('鎿嶄綔鎴愬姛锛屽嵆灏嗚繑鍥炰笂涓�椤�')
+ this.$u.toast('鎿嶄綔鎴愬姛锛屽嵆灏嗚繑鍥炰笂涓�椤�');
setTimeout(() => {
uni.navigateBack({
delta: 1
diff --git a/pages/login/userPassword.vue b/pages/login/userPassword.vue
index 605b5a5..f21222d 100644
--- a/pages/login/userPassword.vue
+++ b/pages/login/userPassword.vue
@@ -43,8 +43,8 @@
},
data() {
return {
- username: 'appuser', // 瀹㈡埛
- // username: '18805080506',// 鐜嬫锛堝徃鏈猴級
+ // username: '12222222222', // 瀹㈡埛
+ username: '13333333332',// 鍙告満
password: '123456',
remember: true,
baseUrl: ''
--
Gitblit v1.9.1