From 04f3f15c930c2b02187d0ce11d68978b65361d54 Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期五, 31 三月 2023 09:26:29 +0800
Subject: [PATCH] 修复多数bug
---
pages/freight-forwarder-page/freightForwarder-my/freightForwarder-my.vue | 1
pages/public-page/forward/forward.vue | 14 -
api/publicInterface.js | 4
components/card/card.vue | 15 +-
pages/register/register.vue | 44 +++++-
pages/customer-page/customer-index/customer-index.vue | 20 +-
pages/customer-page/customer-index/fayunPlanDetails/fayunPlanDetails.vue | 19 +-
pages/customer-page/fleet-management/fleet-management.vue | 11 +
pages/driver-page/driver-index/bill-of-lading-details/coal-pick-up-bill/coal-pick-up-bill.vue | 17 +-
pages/driver-page/driver-index/driver-index.vue | 38 +++-
store/index.js | 5
pages/customer-page/addTo-freightForwarder-driver/addTo-freightForwarder-driver.vue | 13 +
pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue | 39 ++++
api/globalApi.js | 22 ++
api/request.js | 8
pages/customer-page/freight-forwarder-details/freight-forwarder-details.vue | 2
pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue | 86 ++++++++++++
pages/freight-forwarder-page/freightForwarder-index/freightForwarder-index.vue | 31 ++-
18 files changed, 293 insertions(+), 96 deletions(-)
diff --git a/api/globalApi.js b/api/globalApi.js
index badd8ce..9c99255 100644
--- a/api/globalApi.js
+++ b/api/globalApi.js
@@ -243,6 +243,20 @@
},
/**
+ * @description 绗竴娆℃斁绌�
+ */
+ getOneEvacuation: {
+ url: "/wrzs/userOperation/getOneEvacuation",
+ method: 'GET'
+ },
+ /**
+ * @description 绗簩娆℃斁绌�
+ */
+ getTwoEvacuation: {
+ url: "/wrzs/userOperation/getTwoEvacuation",
+ method: 'GET'
+ },
+ /**
* @绉伴噸
*/
saveWeigh: {
@@ -270,10 +284,10 @@
url: "/wrzs/tmtaskcoallog/getTmId",
method: 'GET'
},
-
+
// 鑾峰彇openId
- getCallOutList:{
- url:'/wrzs/callout/getCallOutList',
- method:'GET'
+ getCallOutList: {
+ url: '/wrzs/callout/getCallOutList',
+ method: 'GET'
}
}
diff --git a/api/publicInterface.js b/api/publicInterface.js
index 5154bc8..e681a5d 100644
--- a/api/publicInterface.js
+++ b/api/publicInterface.js
@@ -6,8 +6,8 @@
BaseUrl as wrBaseUrl
} from '@/api/request.js'
// const BaseUrl = "http://hesuancj.cn:9999"
-// const BaseUrl = "https://hesuancj.cn:9095"
-const BaseUrl = "http://192.168.3.119:9999"
+const BaseUrl = "https://hesuancj.cn:9095"
+// const BaseUrl = "http://192.168.3.119:9999"
// 鐧诲綍
// function apiLogin({
diff --git a/api/request.js b/api/request.js
index 4e20f01..058fc92 100644
--- a/api/request.js
+++ b/api/request.js
@@ -79,15 +79,15 @@
}
// const BaseUrl = "http://192.168.0.120:9997"
-const webSocketUrl = "ws://192.168.3.119:9997/wrzs/ws/info"
+// const webSocketUrl = "ws://192.168.3.119:9997/wrzs/ws/info"
-const BaseUrl = "http://192.168.3.119:9997";
+// const BaseUrl = "http://192.168.3.119:9997";
// const BaseUrl = "http://192.168.0.144:9997";
// const BaseUrl = "http://hesuancj.cn:9997";
// 绾夸笂
-// const BaseUrl = "https://hesuancj.cn:9095";
+const BaseUrl = "https://hesuancj.cn:9095";
-// const webSocketUrl = "ws://hesuancj.cn:9095/wrzs/ws/info"
+const webSocketUrl = "wss://hesuancj.cn:9095/wrzs/ws/info"
// const webSocketUrl = "ws://hesuancj.cn:9997/wrzs/ws/info"
// 璇锋眰鎷︽埅
const fetch = (url, opt) => {
diff --git a/components/card/card.vue b/components/card/card.vue
index 3d99257..0865234 100644
--- a/components/card/card.vue
+++ b/components/card/card.vue
@@ -4,10 +4,10 @@
:style="{
background:
backgroundType == 0
- ? 'url(../../../static/image/background/customer-blue.png) no-repeat'
+ ? 'url(https://hesuancj.cn:9095/appimg/image/background/customer-blue.png) no-repeat'
: backgroundType == 1
- ? 'url(../../../static/image/background/huoDai.png) no-repeat'
- : 'url(../../../static/image/background/driver.png) no-repeat',
+ ? 'url(https://hesuancj.cn:9095/appimg/image/background/huoDai.png) no-repeat'
+ : 'url(https://hesuancj.cn:9095/appimg/image/background/driver.png) no-repeat',
backgroundSize: '100% 100%'
}"
>
@@ -29,9 +29,9 @@
// type: Boolean,
// default: false
// },
- backgroundType:{
- type:Number,
- default:0
+ backgroundType: {
+ type: Number,
+ default: 0
},
name: {
type: String,
@@ -39,8 +39,7 @@
}
},
data() {
- return {
- };
+ return {};
},
methods: {
bodyClick() {
diff --git a/pages/customer-page/addTo-freightForwarder-driver/addTo-freightForwarder-driver.vue b/pages/customer-page/addTo-freightForwarder-driver/addTo-freightForwarder-driver.vue
index 8ee16d4..20b85db 100644
--- a/pages/customer-page/addTo-freightForwarder-driver/addTo-freightForwarder-driver.vue
+++ b/pages/customer-page/addTo-freightForwarder-driver/addTo-freightForwarder-driver.vue
@@ -16,8 +16,9 @@
<script>
import { customerId } from '@/utils/status.js';
+import { mapMutations } from 'vuex';
export default {
- onLoad(params) {
+ onLoad(params) {
this.role = params.role;
if (params.fleetId) {
this.fleetId = params.fleetId;
@@ -34,6 +35,7 @@
};
},
methods: {
+ ...mapMutations(['lengthchange']),
init() {},
addToHuoDaiOrDriver() {
switch (this.role) {
@@ -74,7 +76,7 @@
});
}, 1000);
} else {
- this.$u.toast(res.data ? res.data : '鏈垚鍔熸坊鍔�');
+ this.$u.toast(res.msg ? res.msg : '鏈垚鍔熸坊鍔�');
}
});
},
@@ -83,13 +85,16 @@
this.$reqPost('bindUserFleet', { fleetId: this.fleetId, name: this.name, phone: this.phone, carNo: this.carNo }, 'params').then(res => {
console.log('閭�璇峰徃鏈�', res);
if (res.code == 0) {
- this.$u.toast(res.data ? res.data : '鎿嶄綔鎴愬姛');
+ this.$u.toast(res.msg ? res.msg : '鎿嶄綔鎴愬姛');
+ this.$reqGet('GetUserFleet', { fleetId: this.fleetId }).then(response => {
+ this.lengthchange(response.data.length);
+ });
uni.navigateBack({
delta: 1
});
} else {
uni.showToast({
- title: res.data,
+ title: res.msg,
icon: 'null',
duration: 2000
});
diff --git a/pages/customer-page/customer-index/customer-index.vue b/pages/customer-page/customer-index/customer-index.vue
index b84232b..763db1e 100644
--- a/pages/customer-page/customer-index/customer-index.vue
+++ b/pages/customer-page/customer-index/customer-index.vue
@@ -9,8 +9,8 @@
寮�
</view>
<view class="card-left__utils">
- <u-button @tap.stop="receiveClick(item)" text="棰嗗彇" type="primary" v-if="item.cars2 != item.carNum" shape="circle"></u-button>
- <u-button text="杞彂" type="primary" @tap.stop="forwardClick(item)" shape="circle"></u-button>
+ <u-button @tap.stop="receiveClick(item)" text="棰嗗彇" type="primary" v-if="item.carNumSurplus != 0" shape="circle"></u-button>
+ <u-button text="杞彂" type="primary" @tap.stop="forwardClick(item)" shape="circle" v-if="item.carNumSurplus1 != 0"></u-button>
</view>
</template>
<template v-slot:right-top>
@@ -69,7 +69,7 @@
<uni-td align="center" @row-click="faYundetail(item)">{{ item.tmCount }}</uni-td>
</uni-tr>
</uni-table>
- <view class="more_text" v-if="showMoreData">娌℃湁鏁版嵁浜�...</view>
+ <view class="more_text" v-if="showMoreData && historyCoalData.length !== 0">娌℃湁鏁版嵁浜�...</view>
</scroll-view>
</view>
<!-- 棰嗗彇寮瑰嚭妗� -->
@@ -138,7 +138,6 @@
init() {
this.GetOrderPlan();
this.getJhOrderPlanDataPage();
- if (this.pageCurrent * this.pageSize >= this.total) return (this.showMoreData = true);
},
// 鑾峰彇鍙戣繍璁″垝鍒楄〃
GetOrderPlan() {
@@ -157,9 +156,16 @@
this.loading = true;
this.$reqGet('getJhOrderPlanDataPage', { current: this.pageCurrent, size: this.pageSize }).then(res => {
if (res.data.records) {
- this.historyCoalData = [...this.historyCoalData, ...res.data.records];
- this.total = res.data.total;
- this.loading = false;
+ if (this.pageCurrent > 1) {
+ this.historyCoalData = this.historyCoalData.concat(res.data.records);
+ this.loading = false;
+ } else {
+ this.historyCoalData = res.data.records;
+ this.loading = false;
+ }
+ // this.historyCoalData = [...this.historyCoalData, ...res.data.records];
+ // this.total = res.data.total;
+ // this.loading = false;
}
});
},
diff --git a/pages/customer-page/customer-index/fayunPlanDetails/fayunPlanDetails.vue b/pages/customer-page/customer-index/fayunPlanDetails/fayunPlanDetails.vue
index ed6d1c9..4e88a84 100644
--- a/pages/customer-page/customer-index/fayunPlanDetails/fayunPlanDetails.vue
+++ b/pages/customer-page/customer-index/fayunPlanDetails/fayunPlanDetails.vue
@@ -5,12 +5,12 @@
<view class="compDetails">
<uni-table border stripe emptyText="鏆傛棤鏇村鏁版嵁">
<uni-tr>
- <uni-th align="left" width="120">杞彂鎬婚噺</uni-th>
- <uni-td align="left">{{ orderPlanDetail.fowardSum || 0 }}寮�</uni-td>
- </uni-tr>
- <uni-tr>
<uni-th align="left">棰嗗彇鎬婚噺</uni-th>
<uni-td align="left">{{ cars2 || 0 }}寮�</uni-td>
+ </uni-tr>
+ <uni-tr>
+ <uni-th align="left" width="120">杞彂鎬婚噺</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>
@@ -33,13 +33,13 @@
<view class="label-title">鎻愮叅鍗曠姸鎬�</view>
<view class="label-value">{{ coalStatus[item.status] }}</view>
</view>
- <view class="coal-clean">
- <view class="label-title">鍑�閲�</view>
- <view class="label-value">{{ item.clean || 0 }}</view>
- </view>
<view class="coal-carNo">
<view class="label-title">杞︾墝鍙�</view>
<view class="label-value">{{ item.carNo || '' }}</view>
+ </view>
+ <view class="coal-clean">
+ <view class="label-title">鍑�閲�</view>
+ <view class="label-value">{{ item.clean || 0 }}</view>
</view>
<view class="coal-allowance">
<view class="label-title">浣欓噺</view>
@@ -96,6 +96,9 @@
this.orderPlanDetail = res.data;
this.yyDailyList = res.data.yyDailyList;
uni.hideLoading();
+ } else {
+ this.$u.toast('鏈嶅姟鍣ㄩ敊璇紝璇风◢鍚庨噸璇�');
+ uni.hideLoading();
}
});
}
diff --git a/pages/customer-page/fleet-management/fleet-management.vue b/pages/customer-page/fleet-management/fleet-management.vue
index b290840..a5c2fe4 100644
--- a/pages/customer-page/fleet-management/fleet-management.vue
+++ b/pages/customer-page/fleet-management/fleet-management.vue
@@ -43,7 +43,18 @@
</template>
<script>
+import { mapState } from 'vuex';
export default {
+ computed: {
+ ...mapState(['fleetDriverDataLength'])
+ },
+ watch: {
+ fleetDriverDataLength(v) {
+ if (this.fleetDriverData.length !== v) {
+ this.GetUserFleet();
+ }
+ }
+ },
onLoad(params) {
this.deleteDriveObj.fleetId = params.id;
},
diff --git a/pages/customer-page/freight-forwarder-details/freight-forwarder-details.vue b/pages/customer-page/freight-forwarder-details/freight-forwarder-details.vue
index 8b03754..ef5a69e 100644
--- a/pages/customer-page/freight-forwarder-details/freight-forwarder-details.vue
+++ b/pages/customer-page/freight-forwarder-details/freight-forwarder-details.vue
@@ -33,7 +33,7 @@
</uni-tr>
<uni-tr>
<uni-th align="left">浠诲姟鎬绘暟</uni-th>
- <uni-td align="left">{{ HuoDaiForm.sum }}</uni-td>
+ <uni-td align="left">{{ HuoDaiForm.sum || '' }}</uni-td>
</uni-tr>
<uni-tr>
<uni-th align="left">鎵ц瀹屾垚</uni-th>
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 b4bcb74..cc668fc 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
@@ -28,16 +28,28 @@
<view class="utils_chil utils_chilTop">
<u-button text="绛惧埌" type="primary" plain @click="arriveClick"></u-button>
<u-button text="鍏ュ満鐢宠" type="primary" plain @click="rcsqClick"></u-button>
- <u-button text="鏀剧┖" type="primary" plain></u-button>
+ <u-button text="鏀剧┖" type="primary" plain @click="evacuation" throttleTime="500"></u-button>
<u-button text="鍛煎彨瀹㈡湇" type="primary" plain @click="callCustomerService"></u-button>
</view>
<view class="utils_chil"><u-button text="灞曠ず鎻愮叅鍗�" @click="showCaolPickUpBill" type="primary"></u-button></view>
<view class="utils_chil"><u-button text="涓婄璁￠噺" @click="cengZhongClick" type="primary"></u-button></view>
</view>
+ <view class="evacuationModal">
+ <u-modal
+ :show="evacuationModalShow"
+ :title="evacuationTitle"
+ :content="evacuationContent"
+ :showCancelButton="true"
+ @confirm="evacuationConfirm"
+ @cancel="evacuationCancel"
+ ></u-modal>
+ </view>
</view>
</template>
<script>
+let socket = null;
+import { webSocketUrl } from '@/api/request.js';
export default {
onLoad(value) {
if (value.orderPlanId && value.yyId) {
@@ -77,7 +89,19 @@
openId: null,
openName: ''
},
- coalStatus: ['棰嗗彇', '棰勭害', '绛惧埌', '鍏ュ満', '绉扮毊', '绉版瘺', '绂诲満', '鍏ョ鎴�', '鍑虹鎴�', '鍏ョ叅鍦�', '鍑虹叅浠�'] // 鐘舵��
+ coalStatus: ['棰嗗彇', '棰勭害', '绛惧埌', '鍏ュ満', '绉扮毊', '绉版瘺', '绂诲満', '鍏ョ鎴�', '鍑虹鎴�', '鍏ョ叅鍦�', '鍑虹叅浠�', '鏀剧┖'], // 鐘舵��
+ weighHouseCode: '',
+ // 鏀剧┖寮圭獥鎺у埗鍙橀噺
+ evacuationModalShow: false,
+ evacuationTitle: '鏀剧┖纭',
+ evacuationContent: '鏄惁纭鏀剧┖',
+ // 绗竴娆℃斁绌哄弬鏁�
+ weighData: {
+ sceneId: '',
+ gateCameraId: '',
+ equipmentCode: '',
+ weigh: 0
+ }
};
},
onShow() {
@@ -217,6 +241,10 @@
this.$reqGet('getWeighHouse', this.getWeightHouseObj).then(res => {
console.log(res, '鑾峰彇纾呮埧');
if (res.code == 0) {
+ this.weighData.sceneId = res.data.id;
+ this.weighData.gateCameraId = res.data.lastEquipmentId;
+ this.weighData.equipmentCode = res.data.lastEquipmentCode;
+ this.weighHouseCode = res.data.code;
uni.navigateTo({
url: `/pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice?takeCoalId=${this.orderPlanId}&sceneId=${
res.data.id
@@ -226,6 +254,60 @@
this.$u.toast('鏈湪纾呮埧锛岃鍓嶅線纾呮埧鍚庡啀璇曪紒锛�');
}
});
+ },
+ /**
+ * 鍒濆鍖� weoSocket
+ */
+ initWebSocket() {
+ let wsUrl = `${webSocketUrl}?access_token=${uni.getStorageSync('token')}`;
+ socket = uni.connectSocket({
+ url: wsUrl,
+ header: {
+ CLIENT_TOC: 'Y'
+ },
+ complete: res => {
+ console.log(res, 'socket缁撴灉');
+ }
+ });
+ socket.onOpen(() => {
+ console.log('onOpen');
+ });
+ // 鑾峰彇鏈嶅姟鍣ㄤ紶鏉ョ殑鏁版嵁锛屽仛鐩稿簲澶勭悊
+ socket.onMessage(res => {
+ console.log('socketWeigh', res);
+ let nowWeighObj = JSON.parse(res.data.slice(7));
+ if (nowWeighObj.eqCode == this.weighHouseCode) {
+ if (nowWeighObj.eqInfraredStatus) {
+ this.weighData.weigh = nowWeighObj.weigh;
+ } else {
+ this.weighData.weigh = nowWeighObj.weigh;
+ }
+ }
+ });
+ socket.onClose(() => {
+ console.log('webSocketClose');
+ this.$u.toast('纾呮埧鎺ュ彛缁堢');
+ });
+ socket.onError(err => {
+ console.log('socket鎶ラ敊', err);
+ this.$u.toast('纾呮埧鎺ュ彛鏆傛椂涓嶈兘浣跨敤锛岃閲嶆柊杩涘叆璇ラ〉闈紝閲嶈瘯锛侊紒');
+ });
+ },
+ // 鏀剧┖
+ evacuation() {
+ this.evacuationModalShow = true;
+ },
+ // 鏀剧┖寮圭獥纭
+ evacuationConfirm() {
+ let mix = Object.assign(this.weighData, this.getWeightHouseObj);
+ this.$reqPost('getOneEvacuation', mix, 'json').then(res => {
+ console.log(res, '绗竴娆℃斁绌�');
+ this.evacuationModalShow = false;
+ });
+ },
+ // 鏀剧┖寮圭獥鍙栨秷
+ evacuationCancel() {
+ this.evacuationModalShow = false;
}
}
};
diff --git a/pages/driver-page/driver-index/bill-of-lading-details/coal-pick-up-bill/coal-pick-up-bill.vue b/pages/driver-page/driver-index/bill-of-lading-details/coal-pick-up-bill/coal-pick-up-bill.vue
index b080272..5a8dfa7 100644
--- a/pages/driver-page/driver-index/bill-of-lading-details/coal-pick-up-bill/coal-pick-up-bill.vue
+++ b/pages/driver-page/driver-index/bill-of-lading-details/coal-pick-up-bill/coal-pick-up-bill.vue
@@ -1,12 +1,12 @@
<template>
<view class="coal-pick-up-bill">
- <view class="driver" style="background:url(../../../../../static/image/coalBackgroud/coal-background.png) no-repeat;background-size:100% 100%;">
+ <view class="driver" style="background:url(https://hesuancj.cn:9095/appimg/image/coalBackgroud/coal-background.png) no-repeat;background-size:100% 100%;">
<view class="driver-coalOne">鐢靛瓙鎻愮叅鍗�</view>
<view class="driver-coalTwo">
<view>{{ coalData.code || '鏆傛棤璁㈠崟缂栧彿' }}</view>
- <view>{{ coalData.deptName || '鏆傛棤鎵�灞炵熆' }}</view>
- <view>{{ coalData.coalName || '鏆傛棤鐓ょ' }}</view>
- <view>{{ coalData.carNo || '鏆傛棤杞︾墝' }}</view>
+ <view class="bigFont">{{ coalData.deptName || '鏆傛棤鎵�灞炵熆' }}</view>
+ <view class="bigFont">{{ coalData.coalName || '鏆傛棤鐓ょ' }}</view>
+ <view class="bigFont">{{ coalData.carNo || '鏆傛棤杞︾墝' }}</view>
</view>
<view class="driver-coalThree">
<view>{{ coalData.customerName || '鏆傛棤鍗曚綅' }}</view>
@@ -82,12 +82,15 @@
color: #2e363f;
view:nth-child(2) {
margin-top: vww(15);
+ font-size: 40px;
}
view:nth-child(3) {
margin-top: vww(15);
+ font-size: 40px;
}
view:nth-child(4) {
margin-top: vww(15);
+ font-size: 40px;
}
}
&-coalThree {
@@ -102,10 +105,10 @@
}
}
&-coalFour {
- margin: vww(58.5) 0 0 45.5%;
+ margin: vww(59) 0 0 43%;
image {
- width: vww(35);
- height: vww(35);
+ width: vww(52);
+ height: vww(52);
}
}
}
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 2b56177..f8b71d7 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
@@ -20,7 +20,7 @@
</view> -->
</view>
</view>
- <view class="bottom"><text>TIP:褰撳墠鐘舵�佹甯稿彲浠ョО閲�</text></view>
+ <view class="bottom"><text>TIP:褰撳墠鐘舵�佷负姝ｅ父鏃跺彲浠ョО閲�</text></view>
</view>
<view class="two">
<p>璁㈠崟缂栧彿锛歿{ weighList.code || '' }}</p>
@@ -34,7 +34,8 @@
<p>鐭垮満鍚嶇О锛歿{ weighList.filedName || '' }}</p>
</view>
<view class="three">
- <!-- 澶栭攢璁㈠崟鎴愮毊鏃讹紝杩斿洖鍔犲噺鍚ㄦ寜閽疆鐏般�傜О姣涙椂鍙敤.澶栬喘璁㈠崟锛屼笉鍑虹幇杩斿洖鍔犲噺鍚ㄧ殑鎸夐挳 -->
+ <u-button type="primary" text="鏀剧┖" plain @click="evacuation" throttleTime="500"></u-button>
+ <!-- 澶栭攢璁㈠崟绉扮毊鏃讹紝杩斿洖鍔犲噺鍚ㄦ寜閽疆鐏般�傜О姣涙椂鍙敤.澶栬喘璁㈠崟锛屼笉鍑虹幇杩斿洖鍔犲噺鍚ㄧ殑鎸夐挳 -->
<u-button
type="primary"
text="纭畾绉伴噸"
@@ -45,7 +46,17 @@
></u-button>
<u-button type="primary" text="杩斿洖鍔犲噺鍚�" :disabled="addAndSubtractCoalDisabled" v-if="weighList.orderTye == '澶栭攢'" @click="addAndSubtractCoal"></u-button>
</view>
- <view class="four">濡傛偍闇�瑕佽皟鏁磋杞借揣鍝佸惃鏁帮紝璇风偣鍑昏繑鍥炲姞鍑忓惃</view>
+ <view class="four" v-if="weighList.orderTye == '澶栭攢'">濡傛偍闇�瑕佽皟鏁磋杞借揣鍝佸惃鏁帮紝璇风偣鍑昏繑鍥炲姞鍑忓惃</view>
+ <view class="evacuationModal">
+ <u-modal
+ :show="evacuationModalShow"
+ :title="evacuationTitle"
+ :content="evacuationContent"
+ :showCancelButton="true"
+ @confirm="evacuationConfirm"
+ @cancel="evacuationCancel"
+ ></u-modal>
+ </view>
</view>
</template>
@@ -95,7 +106,11 @@
hair: 0,
clean: 0
},
- infraredStatus: false // 绾㈠鐘舵��
+ infraredStatus: false, // 绾㈠鐘舵�侊紝
+ // 鏀剧┖鎺у埗
+ evacuationModalShow: false,
+ evacuationTitle: '绗簩娆℃斁绌虹‘璁�',
+ evacuationContent: '鏄惁纭鏀剧┖'
};
},
watch: {
@@ -105,7 +120,7 @@
this.temporaryWeighObj.skin = this.realTimeWeigh;
} else {
this.temporaryWeighObj.hair = this.realTimeWeigh;
- this.temporaryWeighObj.clean = this.temporaryWeighObj.hair - this.weighList.skin;
+ this.temporaryWeighObj.clean = (this.temporaryWeighObj.hair - this.weighList.skin).toFixed(2);
}
} else if (this.weighList.orderTye == '澶栬喘') {
if (this.weighList.hair == 0) {
@@ -137,6 +152,18 @@
}
},
methods: {
+ // 鏀剧┖
+ evacuation() {
+ this.evacuationModalShow = true;
+ },
+ // 鏀剧┖寮圭獥纭
+ evacuationConfirm() {
+ this.evacuationModalShow = false;
+ },
+ // 鏀剧┖寮圭獥鍙栨秷
+ evacuationCancel() {
+ this.evacuationModalShow = false;
+ },
init() {
// 鑾峰彇绉伴噸淇℃伅
this.$reqGet('weighList', { id: this.takeCoalId }).then(res => {
@@ -161,7 +188,7 @@
if (this.weighList.skin ? (this.weighList.skin < this.realTimeWeigh ? true : false) : true) {
this.saveWeigh();
} else {
- this.$u.toast('姣涢噸涓嶈兘灏忎簬鐨噸');
+ this.$u.toast('姣涢噸涓峲鑳藉皬浜庣毊閲�');
this.isConfirmWeighLoading = false;
}
} else {
diff --git a/pages/driver-page/driver-index/driver-index.vue b/pages/driver-page/driver-index/driver-index.vue
index 6b386d3..f45b708 100644
--- a/pages/driver-page/driver-index/driver-index.vue
+++ b/pages/driver-page/driver-index/driver-index.vue
@@ -65,7 +65,7 @@
<!-- 寰呴绾︽彁鐓ゅ崟 -->
<view class="daiYuYue" v-for="(item, index) in driverBillOfLoadingData.list3" :key="index">
<view class="daiYuYueTop">
- <text>鎻愮叅鍗曠紪鍙凤細{{ item.code }}</text>
+ <text class="tmcode">鎻愮叅鍗曠紪鍙凤細{{ item.code }}</text>
</view>
<view class="daiYuYueTable">
<!-- <view>{{ item.deptName }}</view>
@@ -73,14 +73,14 @@
<view>宸查绾︼細{{ item.cars }} 杞�</view> -->
<uni-table border stripe emptyText="鏆傛棤鏇村鏁版嵁">
<uni-tr>
- <uni-th align="center">鐓ゅ満</uni-th>
+ <uni-th align="center">鐭垮満</uni-th>
<uni-th align="center">鐓ょ</uni-th>
<uni-th align="center">宸查绾�</uni-th>
</uni-tr>
<uni-tr>
<uni-td align="left">{{ item.deptName || '' }}</uni-td>
<uni-td align="left">{{ item.coalName || '' }}</uni-td>
- <uni-td align="left">{{ item.cars || '' }} 杞�</uni-td>
+ <uni-td align="left">{{ item.cars || 0 }} 杞︽</uni-td>
</uni-tr>
<uni-tr>
<uni-th align="center">鍙戣繍鏃ユ湡</uni-th>
@@ -110,7 +110,7 @@
<view class="">
<view @click="list3CardIconClick(item)" class="haveYuYue" v-for="(item, index) in driverBillOfLoadingData.list2" :key="index">
<view class="haveYuYueTop">
- <text>鎻愮叅鍗曠紪鍙凤細{{ item.code || '' }}</text>
+ <text class="tmcode">鎻愮叅鍗曠紪鍙凤細{{ item.code || '' }}</text>
</view>
<view class="haveYuYueCenter">
<view>{{ item.deptName || '' }}</view>
@@ -154,7 +154,9 @@
qiangDanTitle: '鎶㈠崟鎻愮ず',
qiangDanContent: '',
qiangDanOrderPlanId: null,
- fleetId: ''
+ fleetId: '',
+ xsUserId: '',
+ customerId: ''
};
},
onShow() {
@@ -178,10 +180,12 @@
// 鎶㈠崟鎸夐挳
qiangDanBtn(value) {
if (value.tmcCount == '0') {
- this.qiangDan(value.orderPlanId, value.fleetId);
+ this.qiangDan(value.orderPlanId, value.fleetId, value.customerId === null ? '0' : value.customerId, value.xsUserId === null ? '0' : value.xsUserId);
} else {
this.qiangDanOrderPlanId = value.orderPlanId;
this.fleetId = value.fleetId;
+ this.customerId = value.customerId === null ? '0' : value.customerId;
+ this.xsUserId = value.xsUserId === null ? '0' : value.xsUserId;
this.qiangDanShow = true;
this.qiangDanContent = `宸叉姠${value.tmcCount}鍗曪紝纭畾鎶㈠崟锛焋;
}
@@ -190,14 +194,14 @@
qiangDanConfirm() {
this.qiangDanContent = '';
this.qiangDanShow = false;
- this.qiangDan(this.qiangDanOrderPlanId, this.fleetId);
+ this.qiangDan(this.qiangDanOrderPlanId, this.fleetId, this.customerId, this.xsUserId);
},
qiangDanCancel() {
this.qiangDanShow = false;
},
// 鎶㈠崟璇锋眰
- qiangDan(id, fleetId) {
- this.$reqPost('qiangDan', { orderPlanId: id, fleetId: fleetId }, 'params')
+ qiangDan(id, fleetId, customerId, xsUserId) {
+ this.$reqPost('qiangDan', { orderPlanId: id, fleetId: fleetId, customerId: customerId, xsUserId: xsUserId }, 'params')
.then(res => {
if (res.code == 0) {
this.$u.toast('鎶㈠崟鎴愬姛');
@@ -284,11 +288,17 @@
font-weight: 300;
&Top {
background-color: #f5f5f5;
- height: vww(40);
+ height: vww(60);
padding-left: vww(12);
line-height: vww(40);
border: vww(1) solid #eeeeee;
font-weight: 400;
+ // .tmcode {
+ // overflow: hidden;
+ // text-overflow: ellipsis;
+ // white-space: nowrap;
+ // width: 100%;
+ // }
}
&Table {
.uni-table {
@@ -320,11 +330,17 @@
margin-top: vww(24);
&Top {
background-color: #f5f5f5;
- height: vww(40);
+ height: vww(60);
padding-left: vww(12);
line-height: vww(40);
border: vww(1) solid #eeeeee;
font-weight: 400;
+ // .tmcode {
+ // overflow: hidden;
+ // text-overflow: ellipsis;
+ // white-space: nowrap;
+ // width: 100%;
+ // }
}
&Center {
border: vww(1) solid #eeeeee;
diff --git a/pages/freight-forwarder-page/freightForwarder-index/freightForwarder-index.vue b/pages/freight-forwarder-page/freightForwarder-index/freightForwarder-index.vue
index c49a730..084d23c 100644
--- a/pages/freight-forwarder-page/freightForwarder-index/freightForwarder-index.vue
+++ b/pages/freight-forwarder-page/freightForwarder-index/freightForwarder-index.vue
@@ -2,7 +2,7 @@
<view class="freightForwarder-index">
<view class="freightForwarder-index-body">
<u-empty mode="data" icon="http://cdn.uviewui.com/uview/empty/data.png" textSize="30" iconSize="1000" v-if="orderPlanData.length == 0"></u-empty>
- <card v-for="(item, index) in orderPlanData" :key="index" :name="item.id" @click="cardBodyClick" backgroundType="1">
+ <card v-for="(item, index) in orderPlanData" :key="index" :name="item.id" @click="cardBodyClick(item)" backgroundType="1">
<template v-slot:left>
<view class="card-left__top">
<text>{{ item.carNum }}</text>
@@ -52,7 +52,7 @@
<uni-td align="center">{{ item.tmCount }}</uni-td>
</uni-tr>
</uni-table>
- <view class="more_text" v-if="showMoreData">娌℃湁鏁版嵁浜�...</view>
+ <view class="more_text" v-if="showMoreData && historyCoalData.length !== 0">娌℃湁鏁版嵁浜�...</view>
</scroll-view>
</view>
</view>
@@ -121,9 +121,13 @@
this.loading = true;
this.$reqGet('getJhOrderPlanDataPage', { current: this.pageCurrent, size: this.pageSize }).then(res => {
if (res.data.records) {
- this.historyCoalData = [...this.historyCoalData, ...res.data.records];
- this.total = res.data.total;
- this.loading = false;
+ if (this.pageCurrent > 1) {
+ this.historyCoalData = this.historyCoalData.concat(res.data.records);
+ this.loading = false;
+ } else {
+ this.historyCoalData = res.data.records;
+ this.loading = false;
+ }
}
});
},
@@ -142,15 +146,16 @@
this.orderPlanData = res.data;
});
},
- cardBodyClick(id) {
- let code = null;
- this.orderPlanData.forEach(item => {
- if (item.id == id) {
- code = item.code;
- }
- });
+ cardBodyClick(item) {
+ // let code = null;
+ // this.orderPlanData.forEach(item => {
+ // if (item.orderPlanId == id) {
+ // code = item.code;
+ // id = item.orderPlanId;
+ // }
+ // });
uni.navigateTo({
- url: `/pages/customer-page/customer-index/fayunPlanDetails/fayunPlanDetails?orderPlanId=${id}&code=${code}`
+ url: `/pages/customer-page/customer-index/fayunPlanDetails/fayunPlanDetails?orderPlanId=${item.orderPlanId}&code=${item.code}`
});
},
// 杞彂
diff --git a/pages/freight-forwarder-page/freightForwarder-my/freightForwarder-my.vue b/pages/freight-forwarder-page/freightForwarder-my/freightForwarder-my.vue
index ca82383..548b342 100644
--- a/pages/freight-forwarder-page/freightForwarder-my/freightForwarder-my.vue
+++ b/pages/freight-forwarder-page/freightForwarder-my/freightForwarder-my.vue
@@ -198,6 +198,7 @@
.addCarButton {
width: 40%;
margin: 0 auto;
+ color: rgb(10, 108, 255);
}
}
}
diff --git a/pages/public-page/forward/forward.vue b/pages/public-page/forward/forward.vue
index e57f01f..5878218 100644
--- a/pages/public-page/forward/forward.vue
+++ b/pages/public-page/forward/forward.vue
@@ -3,10 +3,10 @@
<view class="forward">
<view v-if="roleType == 1"><u-notice-bar :text="text" :fontSize="30" mode="link"></u-notice-bar></view>
<view v-else-if="roleType == 2"><u-notice-bar :text="text1" :fontSize="30" mode="link"></u-notice-bar></view>
- <view class="forward-card" v-for="(val, index) in jhOrderPlanForwardList">
+ <view class="forward-card" v-for="(val, index) in jhOrderPlanForwardList" :key="index">
<u--form labelPosition="top" :model="forwardForm" ref="form1">
<u-form-item label="杞彂瀵硅薄" labelWidth="20%" ref="item1" @click="forwardObjectClick(index)">
- <u--input v-model="val.name" placeholder="鐐瑰嚮閫夋嫨杞彂瀵硅薄"></u--input>
+ <u--input v-model="val.name" placeholder="鐐瑰嚮閫夋嫨杞彂瀵硅薄" :readonly="true"></u--input>
</u-form-item>
<u-form-item label="杈撳叆鏁伴噺" labelWidth="20%" ref="item1">
<view class="forward-card-amount">
@@ -59,14 +59,7 @@
this.carNumSurplus1 = Number(params.carNumSurplus1);
// 璐т唬
this.carNum = Number(params.carNum);
- this.carNumSurplusHuodai = Number(params.carNumSurplusHuodai);
- if (params.carNumSurplus1 || params.carNumSurplusHuodai) {
- if (params.carNumSurplus1 != 0) {
- this.forwardSurplus = params.carNumSurplus1;
- } else if (params.carNumSurplusHuodai != 0) {
- this.forwardSurplus = params.carNumSurplusHuodai;
- }
- }
+ this.carNumSurplusHuodai = this.forwardSurplus = Number(params.carNumSurplusHuodai);
this.orderPlanId = params.orderPlanId;
this.$reqGet('forwardList', { OrderPlanId: params.orderPlanId }).then(res => {
if (res.data.length !== 0 && this.roleType == 1) {
@@ -179,6 +172,7 @@
checkboxChange(value, index) {
console.log('澶嶉�夋鍙樺寲', value, index);
if (value.length != 0) {
+ console.log(this.forwardSurplus, '璐т唬杞彂鍏ㄩ儴鏁伴噺');
this.jhOrderPlanForwardList[index].carNum = this.forwardSurplus;
} else {
this.jhOrderPlanForwardList[index].carNum = null;
diff --git a/pages/register/register.vue b/pages/register/register.vue
index 9948ed9..2ff209a 100644
--- a/pages/register/register.vue
+++ b/pages/register/register.vue
@@ -35,13 +35,35 @@
<u--input v-model="registerFormModel.carNo" placeholder="璇疯緭鍏ュ唴瀹�" clearable></u--input>
</u-form-item>
<u-form-item prop="carImg" label="杞﹁締鐓х墖" labelWidth="20%" borderBottom v-if="radiovalue1 == '鍙告満'" required>
- <u-upload :fileList="fileList1" deletable @afterRead="afterRead" @delete="deletePic" name="1" multiple :maxCount="1" width="250" height="150">
+ <u-upload
+ :fileList="fileList1"
+ deletable
+ @afterRead="afterRead"
+ @delete="deletePic"
+ name="1"
+ multiple
+ :maxCount="1"
+ width="250"
+ height="150"
+ :previewFullImage="true"
+ >
<!-- <image src="https://cdn.uviewui.com/uview/demo/upload/positive.png"
mode="widthFix" style="width: 250px;height: 150px;"></image> -->
</u-upload>
</u-form-item>
<u-form-item prop="drivingImg" label="琛岄┒璇�" labelWidth="20%" borderBottom v-if="radiovalue1 == '鍙告満'" required>
- <u-upload :fileList="fileList2" deletable @afterRead="afterRead" @delete="deletePic" name="2" multiple :maxCount="1" width="250" height="150">
+ <u-upload
+ :fileList="fileList2"
+ deletable
+ @afterRead="afterRead"
+ @delete="deletePic"
+ name="2"
+ multiple
+ :maxCount="1"
+ width="250"
+ height="150"
+ :previewFullImage="true"
+ >
<!-- <image src="https://cdn.uviewui.com/uview/demo/upload/positive.png"
mode="widthFix" style="width: 250px;height: 150px;"></image> -->
</u-upload>
@@ -55,6 +77,12 @@
<u-modal :show="editRoleModelShow" :title="title" :content="content" :showCancelButton="true" @confirm="roleConfirm" @cancel="roleCancel"></u-modal>
</view>
<view class="registerBtn"><u-button text="娉ㄥ唽" type="primary" @click="registerClick"></u-button></view>
+ <!-- 鍥剧墖棰勮寮瑰嚭妗� -->
+ <!-- <view class="previewImage-container">
+ <u-popup :show="previewImageShow" mode="center" @close="previewImageClose" @open="previewImageOpen">
+ <u--image :src="previewImageSrc != null ? BaseUrl + previewImageSrc : ''" width="400px" height="400px"></u--image>
+ </u-popup>
+ </view> -->
</view>
</template>
@@ -288,7 +316,6 @@
},
// 鏂板鍥剧墖
async afterRead(event) {
- console.log('event', event);
// 褰撹缃� mutiple 涓� true 鏃�, file 涓烘暟缁勬牸寮忥紝鍚﹀垯涓哄璞℃牸寮�
let lists = [].concat(event.file);
let fileListLen = this[`fileList${event.name}`].length;
@@ -307,7 +334,7 @@
1,
Object.assign(item, {
status: 'success',
- message: '',
+ message: '涓婁紶鎴愬姛',
url: result
})
);
@@ -320,15 +347,16 @@
url: BaseUrl + '/admin/sys-file/uploadUnToken',
filePath: url,
name: 'file',
- // formData: {
- // user: 'test'
- // },
+ formData: {
+ // user: ''
+ },
success: res => {
- resolve(JSON.parse(res.data).data.url);
if (num == 1) {
this.registerFormModel.carImg = JSON.parse(res.data).data.url;
+ resolve(`${BaseUrl}${JSON.parse(res.data).data.url}`);
} else if (num == 2) {
this.registerFormModel.drivingImg = JSON.parse(res.data).data.url;
+ resolve(`${BaseUrl}${JSON.parse(res.data).data.url}`);
}
}
});
diff --git a/store/index.js b/store/index.js
index 5669602..ebd4104 100644
--- a/store/index.js
+++ b/store/index.js
@@ -37,9 +37,12 @@
userInfo: {},
roleType: null, // 1瀹㈡埛锛�2璐т唬锛�3鍙告満
userTabbar: [], // 鐢ㄦ埛鎵�鍦ㄨ鑹插簳閮ㄨ彍鍗曪紝
- orderPlanDataStore: [],
+ fleetDriverDataLength: 0
},
mutations: {
+ lengthchange(state, payload) {
+ state.fleetDriverDataLength = payload
+ },
setUserInfo(state, identity) {
state.userInfo = userObj[identity]
},
--
Gitblit v1.9.1