From cbfc1953c7e7333dbcb1e43fff15433ed24fc543 Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期日, 08 十月 2023 17:28:32 +0800
Subject: [PATCH] 修正打印入门证接口错误 增加装卸员页面详情信息
---
pages/driver-page/drvier-my/drvier-my.vue | 1 -
pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue | 12 ++++++++++--
pages/loadUnload-page/loadUnload-detail/loadUnload-detail.vue | 20 +++++++++++++++++---
store/index.js | 1 -
4 files changed, 27 insertions(+), 7 deletions(-)
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 3661fb7..f7db267 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
@@ -25,7 +25,7 @@
<view class="status-button"
style="background: url('https://mx.jzeg.cn:9095/appimg/image/banner/statusbutton.png') no-repeat;
background-size: cover;">
- {{coalStatus[correctStatus]}}
+ {{coalStatus[correctStatus]||''}}
</view>
</view>
<view class="time">
@@ -752,7 +752,15 @@
title: '姝ｅ湪鎵撳嵃涓�,璇风◢鍚�'
})
this.enterLoading = true
- this.$reqGet('printer', { type: 2, tmId: this.coalDetailsData.id, weighingNumber: 1 }).then(
+ let form = {
+ deptId: this.getWeightHouseObj.deptId,
+ tmId: this.getWeightHouseObj.tmId,
+ carNo: uni.getStorageSync('carNo'),
+ type: 2,
+ weighingNumber: 1
+ }
+ this.$reqPost('printer', Object.assign(form, JSON.parse(uni.getStorageSync('WeighHouseForm'))),
+ 'json').then(
res => {
uni.hideLoading()
this.enterLoading = false
diff --git a/pages/driver-page/drvier-my/drvier-my.vue b/pages/driver-page/drvier-my/drvier-my.vue
index 7f722ae..6bcc8d1 100644
--- a/pages/driver-page/drvier-my/drvier-my.vue
+++ b/pages/driver-page/drvier-my/drvier-my.vue
@@ -12,7 +12,6 @@
<view class="edit-button"><u-button type="primary"
@click="editBtnClick"
shape="circle"
- :disabled="userInfo.isRegister!==2"
plain>缂栬緫涓汉璧勬枡</u-button></view>
</view>
</view>
diff --git a/pages/loadUnload-page/loadUnload-detail/loadUnload-detail.vue b/pages/loadUnload-page/loadUnload-detail/loadUnload-detail.vue
index 3d278b5..525172f 100644
--- a/pages/loadUnload-page/loadUnload-detail/loadUnload-detail.vue
+++ b/pages/loadUnload-page/loadUnload-detail/loadUnload-detail.vue
@@ -43,6 +43,12 @@
<view class="file-name info">
鐘舵��:{{coalStatus[item.status]}}
</view>
+ <view class="info createTime">
+ 鍏ュ満鏃堕棿:{{item.createTime}}
+ </view>
+ <view class="info code">
+ 璁㈠崟缂栧彿:{{item.code}}
+ </view>
</view>
</view>
<view class="confirm-button">
@@ -145,7 +151,7 @@
.collection-form-item {
width: 690rpx;
- height: 380rpx;
+ height: 440rpx;
background: #ffffff;
box-shadow: 4rpx 6rpx 25rpx 0rpx rgba(73, 120, 240, 0.15);
border-radius: 20rpx;
@@ -190,13 +196,13 @@
.info-container {
width: 100%;
- height: vww(100);
+ height: vww(150);
display: flex;
justify-content: center;
.info-block {
width: 600rpx;
- height: vww(80);
+ height: vww(120);
display: flex;
justify-content: center;
flex-wrap: wrap;
@@ -219,6 +225,14 @@
color: #515151;
margin: vww(5);
}
+
+ .createTime,
+ .code {
+ width: 100%;
+ margin-left: vww(9);
+ display: flex;
+ justify-content: flex-start;
+ }
}
diff --git a/store/index.js b/store/index.js
index bdb23b7..ec18080 100644
--- a/store/index.js
+++ b/store/index.js
@@ -295,7 +295,6 @@
clearInterval(state.reconnectTimeOut)
state.socketTask = null
commit('changereconnectState', false)
- console.log(state.connectNum, state.connectNum.connectNum, '閾炬帴鏁�');
if (state.connectNum < 6 || state.connectNum.connectNum < 6 && state.globalisLogin) {
uni.showToast({
title: '杩炴帴澶辫触锛屾鍦ㄥ皾璇曢噸鏂拌繛鎺�',
--
Gitblit v1.9.1