From 1da4ccbf33281b669c40488be047700a298927de Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 16 一月 2025 16:55:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
h5/pages/waybill/waybillDetail.vue | 56 ++++++++++++++-------------
h5/pages/driver/taskDetail.vue | 4 +-
h5/pages/staff/meetingCalendar.vue | 3 +
screen/src/views/LogisticsCenter.vue | 9 ++--
admin/src/views/system/user.vue | 2
h5/pages/staff/task/vDangetAppr.vue | 2
h5/pages/staff/meetingManager.vue | 5 +-
7 files changed, 42 insertions(+), 39 deletions(-)
diff --git a/admin/src/views/system/user.vue b/admin/src/views/system/user.vue
index af66120..fefcc31 100644
--- a/admin/src/views/system/user.vue
+++ b/admin/src/views/system/user.vue
@@ -45,7 +45,7 @@
<!-- <img :src="row.avatar == null ? '/static/avatar/man.png' : row.avatar">-->
<!-- </template>-->
<!-- </el-table-column>-->
- <el-table-column prop="realname" label="濮撳悕" min-width="100px" fixed="left"></el-table-column>
+ <el-table-column prop="realname" label="濮撳悕" width="80px" fixed="left"></el-table-column>
<el-table-column prop="username" label="鐢ㄦ埛鍚�" min-width="120px"></el-table-column>
<el-table-column prop="empNo" label="宸ュ彿" sortable="custom" sort-by="EMP_NO" min-width="80px"></el-table-column>
<el-table-column prop="companyName" label="鎵�灞炵粍缁�" min-width="250px"></el-table-column>
diff --git a/h5/pages/driver/taskDetail.vue b/h5/pages/driver/taskDetail.vue
index e29a05f..0e06514 100644
--- a/h5/pages/driver/taskDetail.vue
+++ b/h5/pages/driver/taskDetail.vue
@@ -207,8 +207,8 @@
// 'openLocation'
// ] // 蹇呭～锛岄渶瑕佷娇鐢ㄧ殑JS鎺ュ彛鍒楄〃
// })
- this.getLocation()
- // this.getDetail()
+ // this.getLocation()
+ this.getDetail()
} else {
this.getDetail()
}
diff --git a/h5/pages/staff/meetingCalendar.vue b/h5/pages/staff/meetingCalendar.vue
index d4edeaf..5646185 100644
--- a/h5/pages/staff/meetingCalendar.vue
+++ b/h5/pages/staff/meetingCalendar.vue
@@ -252,7 +252,8 @@
initData() {
// 褰撴湀鏁版嵁
monthMeetingPage({
- yearMonth: this.currentDate.slice(0, 7)
+ yearMonth: this.currentDate.slice(0, 7),
+ queryType: 1
}).then(res => {
this.monthMark = res.data.filter(i => i.meetingNum > 0).map(j => {
return {
diff --git a/h5/pages/staff/meetingManager.vue b/h5/pages/staff/meetingManager.vue
index b7c7bef..0c68958 100644
--- a/h5/pages/staff/meetingManager.vue
+++ b/h5/pages/staff/meetingManager.vue
@@ -165,7 +165,8 @@
initData() {
// 褰撴湀鏁版嵁
monthMeetingPage({
- yearMonth: this.currentDate.slice(0, 7)
+ yearMonth: this.currentDate.slice(0, 7),
+ queryType: 3
}).then(res => {
this.monthMark = res.data.filter(i => i.meetingNum > 0).map(j => {
return {
@@ -234,7 +235,7 @@
// 褰撳ぉ鎴戝弬涓庣殑浼氳
myMeetingPage({
model: {
- queryType: '1',
+ queryType: '3',
roomsId: activeRoom.id,
queryDate: currentDate
},
diff --git a/h5/pages/staff/task/vDangetAppr.vue b/h5/pages/staff/task/vDangetAppr.vue
index 2e619e1..14fbc1f 100644
--- a/h5/pages/staff/task/vDangetAppr.vue
+++ b/h5/pages/staff/task/vDangetAppr.vue
@@ -506,7 +506,7 @@
getMemList() {
findHiddenAreaMemberList({
...this.transferModel,
- id: this.info.areaId,
+ // id: this.info.areaId,
...this.pagination
}).then(res => {
this.memberList = res.data || []
diff --git a/h5/pages/waybill/waybillDetail.vue b/h5/pages/waybill/waybillDetail.vue
index c29ebfe..ad1d581 100644
--- a/h5/pages/waybill/waybillDetail.vue
+++ b/h5/pages/waybill/waybillDetail.vue
@@ -4,12 +4,12 @@
<map id="map" :latitude="latitude" :longitude="longitude" :polyline="polyline" :markers="markers" :scale="scale">
</map>
- <view class="main_content">
- <view class="stock_status" v-if="info.overStock && info.overStock == 1">
- <image src="@/static/ic_tip@2x.png" mode=""></image>
- <view class="">鍥犲簱瀛樹笉瓒筹紝璁㈠崟鏆傛椂鏃犳硶閰嶈浇</view>
- </view>
- <view class="info">
+ <view class="main_content">
+ <view class="info">
+ <view class="stock_status" v-if="info.overStock && info.overStock == 1">
+ <image src="@/static/ic_tip@2x.png" mode=""></image>
+ <view class="">鍥犲簱瀛樹笉瓒筹紝璁㈠崟鏆傛椂鏃犳硶閰嶈浇</view>
+ </view>
<view class="head">
<view class="code">{{info.contractNumber}}</view>
<view class="status">{{info.orderStatusDesc}}</view>
@@ -354,24 +354,6 @@
}
}
}
- .stock_status{
- background: #FFEEEE;
- font-size: 26rpx;
- color: #ED4545;
- display: flex;
- align-items: center;
- border-radius: 8rpx 8rpx 0rpx 0rpx;
- height: 80rpx;
- position: relative;
- z-index: 1;
- padding: 0 30rpx 4rpx;
- top: 8rpx;
- image{
- width: 28rpx;
- height: 28rpx;
- margin-right: 10rpx;
- }
- }
.info {
border-radius: 12rpx;
margin-bottom: 20rpx;
@@ -379,17 +361,37 @@
background-color: #fff;
overflow: hidden;
position: relative;
- z-index: 1;
+ z-index: 1;
+ .stock_status{
+ background: #FFEEEE;
+ font-size: 26rpx;
+ color: #ED4545;
+ display: flex;
+ align-items: center;
+ border-radius: 8rpx 8rpx 0rpx 0rpx;
+ height: 80rpx;
+ margin: 0rpx -30rpx 0;
+ position: relative;
+ z-index: 1;
+ padding: 0 30rpx;
+ image{
+ width: 28rpx;
+ height: 28rpx;
+ margin-right: 10rpx;
+ }
+ }
.head {
display: flex;
justify-content: space-between;
align-items: center;
padding: 0 30rpx;
- width: 690rpx;
+ width: 690rpx;
+ border-radius: 8rpx 8rpx 0rpx 0rpx;
height: 84rpx;
margin: 0 -30rpx;
background: linear-gradient(270deg, #FEFEFF 0%, #E1F7FE 100%);
-
+ position: relative;
+ z-index: 11;
.code {
font-weight: 500;
font-size: 32rpx;
diff --git a/screen/src/views/LogisticsCenter.vue b/screen/src/views/LogisticsCenter.vue
index 195f64b..39a0f91 100644
--- a/screen/src/views/LogisticsCenter.vue
+++ b/screen/src/views/LogisticsCenter.vue
@@ -56,8 +56,8 @@
</div>
<div class="hover_wrap">
<div class="triangle"></div>
- <div class="title">璋冩嫧鍑哄簱閲忥細{{ StockOutData.currentProvinceNum || 0 }}绠�</div>
- <div class="title">鍏朵粬鍑哄簱閲忥細{{ StockOutData.currentOtherNum || 0 }}绠�</div>
+ <div class="title" v-if="StockOutData.currentProvinceNum || StockOutData.currentProvinceNum == 0">璋冩嫧鍑哄簱閲忥細{{ StockOutData.currentProvinceNum.toFixed(0) }}绠�</div>
+ <div class="title" v-if="StockOutData.currentOtherNum || StockOutData.currentOtherNum == 0">鍏朵粬鍑哄簱閲忥細{{ StockOutData.currentOtherNum.toFixed(0) }}绠�</div>
</div>
</div>
@@ -1031,7 +1031,7 @@
image: fahuoImg, // 鍥炬爣鍥剧墖URL
imageSize: new AMap.Size(28, 32), // 鍥炬爣瀹為檯澶у皬
}),
- title: '鏍囪鐐�1', // 榧犳爣鎮仠鏃舵樉绀虹殑鏍囬
+ title: obj.deliveryEnterprise, // 榧犳爣鎮仠鏃舵樉绀虹殑鏍囬
})
map.add(marker1)
const marker2 = new AMap.Marker({
@@ -1041,7 +1041,7 @@
image: shouImg, // 鍥炬爣鍥剧墖URL
imageSize: new AMap.Size(28, 32), // 鍥炬爣瀹為檯澶у皬
}),
- title: '鏍囪鐐�1', // 榧犳爣鎮仠鏃舵樉绀虹殑鏍囬
+ title: obj.receiveEnterprise, // 榧犳爣鎮仠鏃舵樉绀虹殑鏍囬
})
map.add(marker2)
// 缁樺埗杞ㄨ抗
@@ -2569,7 +2569,6 @@
}
.title {
- font-weight: 600;
color: #e2ebfd;
}
}
--
Gitblit v1.9.3