From 76f165afb5462e1731540f761d04c621aee3cfb7 Mon Sep 17 00:00:00 2001
From: yangan <yangan0921@163.com>
Date: 星期一, 24 三月 2025 09:11:55 +0800
Subject: [PATCH] feat:日志页面查看日志去除皮毛净
---
pages/driver-page/driver-index/driver-index.vue | 112 ++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 89 insertions(+), 23 deletions(-)
diff --git a/pages/driver-page/driver-index/driver-index.vue b/pages/driver-page/driver-index/driver-index.vue
index c3b20e8..6a568cc 100644
--- a/pages/driver-page/driver-index/driver-index.vue
+++ b/pages/driver-page/driver-index/driver-index.vue
@@ -25,6 +25,8 @@
v-for="(item, index) in driverBillOfLoadingData.list1"
:key="index">
<view class="main-divider"></view>
+ <view class="codeBox">璁㈠崟缂栧彿锛歿{ item.orderCode }}</view>
+ <view class="codeBox">鏃ヨ鍒掔紪鍙凤細{{ item.code }}</view>
<view class="first-line">
<view class="main-information">
<view class="sign">瑁�</view>
@@ -71,8 +73,9 @@
<view class="coal-name">{{ item.productNames || item.productName }}</view>
</view>
</view>
+
<view class="fourth-line"
- @click="qiangDanBtn(item)"
+ @click="qiangDanTiShi(item)"
v-if="item.carNum - item.taskNum !== 0">
<!-- <view class="button-img">绔嬪嵆鎺ュ崟</view> -->
<u-button type="primary"
@@ -104,6 +107,8 @@
v-for="(item, index) in driverBillOfLoadingData.list3"
:key="index">
<view class="main-divider"></view>
+ <view class="codeBox">璁㈠崟缂栧彿锛歿{ item.orderCode }}</view>
+ <view class="codeBox">鏃ヨ鍒掔紪鍙凤細{{ item.code }}</view>
<view class="first-line">
<view class="main-information">
<view class="sign">瑁�</view>
@@ -157,16 +162,19 @@
</view>
<view class="fifth-line">
<view class="button-img"
+ v-if="$store.state.pvcIdList.includes(item.productId)"
+ @click.stop="PvcpinDan(item)">鎷煎崟</view>
+ <view class="button-img"
+ @click.stop="toAppointmentClick(item)">绔嬪嵆棰勭害</view>
+ <view class="button-img"
v-if="item.isDanger === 1 && !item.idCardEscort"
@click.stop="cancelCerifCate(item)">
- 鍓ф瘨杩愯緭璇�
+ 鍓ф瘨閫氳璇�
</view>
<view class="button-img"
@click.stop="cancelAppoint(item)">
璇锋眰閫�鍗�
</view>
- <view class="button-img"
- @click.stop="toAppointmentClick(item)">绔嬪嵆棰勭害</view>
</view>
</view>
</view>
@@ -223,6 +231,8 @@
:key="index"
@click="list3CardIconClick(item)">
<view class="main-divider"></view>
+ <view class="codeBox">璁㈠崟缂栧彿锛歿{ item.orderCode }}</view>
+ <view class="codeBox">鏃ヨ鍒掔紪鍙凤細{{ item.code }}</view>
<view class="first-line">
<view class="main-information">
<view class="sign">瑁�</view>
@@ -277,13 +287,17 @@
<!-- <view class="order-type">{{ item.orderType }}</view> -->
</view>
</view>
- <view class="fourth-line"
- v-if="item.isDanger === 1">
+ <view class="fourth-line">
+ <view class="button-img"
+ v-if="$store.state.pvcIdList.includes(item.productId) "
+ @click.stop="PvcpinDan(item)">鎷煎崟</view>
<view class="button-img"
+ v-if="item.isDanger === 1"
@click.stop="cancelCerifCate(item)">
- 鍓ф瘨杩愯緭璇�
+ 鍓ф瘨閫氳璇�
</view>
<view class="button-img"
+ v-if="item.status < 3"
@click.stop="cancelAppoint(item)">
璇锋眰閫�鍗�
</view>
@@ -393,14 +407,23 @@
</view>
</u-radio-group>
- <view class="receiverPopup__btn"><u-button text="纭畾"
+
+
+ </view>
+ <view class="receiverPopup__btn"><u-button text="纭畾"
type="primary"
@click="popupDetermineClick"
:loading="ClickLoading"></u-button></view>
-
- </view>
</view>
</u-popup>
+ <u-modal
+ :width="700"
+ :show="isFirstShow" :title="'娓╅Θ鎻愮ず'" @confirm="isFirstConFirm">
+ <view class="tishiBox">
+ <view>鍏ュ満闇�瑕佹壂鎻忚溅鐗岀収鍜屽埛韬唤璇佸叆鍦猴紝璇锋惡甯﹁韩浠借瘉鍘熶欢!</view>
+ <view style="color: red;font-size: 24rpx;">锛堟敞锛夛細濡傝繍杈撶浉鍏冲嵄闄╁搧锛岃鎼哄甫鐩稿叧璇佷欢鍓嶅線澶у巺</view>
+ </view>
+ </u-modal>
</view>
</template>
@@ -442,9 +465,11 @@
show: false,
BaseUrl,
yaList:[],
+ isFirstShow:false,
num:0,
radioValue:'',
showLing:false,
+ jiedanObj:{},
pageList:[],
receiveNum:"",
inspectData:[],
@@ -458,6 +483,8 @@
qiangDanShow: false,
enterCode:false,
openObj:{},
+ //
+ falseProductNames:['1818237609508347905','1818237832536268801','1818211942485995521'],
activeObj:{},
enterCodeStr:'',
qiangDanTitle: '鎺ュ崟鎻愮ず',
@@ -493,6 +520,7 @@
closeling() {
this.showLing = false;
this.receiveNum = null;
+ this.radioValue = '';
},
selectionChange(e) {
this.yaList= e.detail.index.map(item=>{
@@ -512,7 +540,7 @@
},
getBuild(item){
console.log(this.productName,'opr')
- this.$reqGet('getBuildList',{orderPlanId:this.activeObj.orderPlanId,customerId:this.activeObj.customerId,status:'',fleetId:this.activeObj.fleetId}).then(res=>{
+ this.$reqGet('getBuildList',{orderPlanId:this.activeObj.orderPlanId,customerId:this.activeObj.customerId,status:1,fleetId:this.activeObj.fleetId}).then(res=>{
console.log(res,'resss')
this.pageList = res.data.map(item=>{
item.flag = false
@@ -549,7 +577,12 @@
});
},
popupDetermineClick() {
- this.qiangDan(this.activeObj.orderPlanId, this.activeObj.fleetId, this.activeObj.customerId, !this.activeObj.xsUserId ? '0' : this.activeObj.xsUserId);
+ if(this.pageList.length && this.radioValue){
+ this.qiangDan(this.activeObj.orderPlanId, this.activeObj.fleetId, this.activeObj.customerId, !this.activeObj.xsUserId ? '0' : this.activeObj.xsUserId);
+ }else{
+ this.$u.toast('璇风‘璁よ鍗曠殑鏃ヨ鍒掑惃鏁帮紒')
+ }
+
},
init() {
this.inspectData=[]
@@ -567,7 +600,8 @@
},
// 鎺ュ崟鎸夐挳
qiangDanBtn(value) {
- if(/鑱氭隘涔欑儻鏍戣剛/.test(value.productName) ){
+ uni.setStorageSync('isFirstMeet',true)
+ if(/鑱氭隘涔欑儻鏍戣剛/.test(value.productName) || value.packingType == 1 ){
this.activeObj = value;
this.showLing = true;
this.lingFlag = true;
@@ -597,6 +631,11 @@
this.qiangDanContent = `宸叉帴${value.tmcCount}鍗曪紝纭畾鎺ュ崟锛焋;
}
}
+ },
+ qiangDanTiShi(item){
+ this.jiedanObj = item;
+ this.isFirstShow = true;
+
},
// 鎺ュ崟妯℃�佹
qiangDanConfirm() {
@@ -693,7 +732,7 @@
})
this.show=true
} else {
- this.$u.toast(res.msg ? res.msg : '璇锋坊鍔犲墽姣掕繍杈撹瘉');
+ this.$u.toast(res.msg ? res.msg : '璇锋坊鍔犲墽姣掗�氳璇�');
uni.navigateTo({
url: '/pages/driver-page/drvier-my/certifiCate/certifiCate'
})
@@ -742,7 +781,7 @@
this.activeObj = value;
if(value.isDanger === 1){
if(!value.idCardEscort){
- this.$u.toast('璇烽�夋嫨鍓ф瘨杩愯緭璇佸徃鏈猴紒');
+ this.$u.toast('璇烽�夋嫨鍓ф瘨閫氳璇佸徃鏈猴紒');
this.cancelCerifCate(value);
return
}
@@ -751,7 +790,7 @@
this.enterCode = true;
}else{
this.enterCode = false;
- if (value.orderType === '澶栬喘') {
+ if (value.orderType === '澶栬喘' && value.isWeight === 1 && value.productNames.split(',').filter(item => item != '').length <= 1 && this.falseProductNames.includes(value.productId)) {
uni.navigateTo({
url: `/subPages/bill-of-lading-details/originInfo/originInfo?orderPlanId=${value.id}&filedId=${value.filedId}&deptId=${value.deptId}&sendDate=${value.sendDate}&isSpecial=${value.isSpecial}&isWeight=${value.isWeight}`
});
@@ -783,7 +822,7 @@
}).catch(err=>{
}).finally(() => {
- if (this.activeObj.orderType === '澶栬喘') {
+ if (this.activeObj.orderType === '澶栬喘' && this.activeObj.isWeight === 1 && this.activeObj.productNames.filter(item => item != '').length <= 1 && this.falseProductNames.includes(this.activeObj.productId)) {
uni.navigateTo({
url: `/subPages/bill-of-lading-details/originInfo/originInfo?orderPlanId=${this.activeObj.id}&filedId=${this.activeObj.filedId}&deptId=${this.activeObj.deptId}&sendDate=${this.activeObj.sendDate}&isSpecial=${this.activeObj.isSpecial}&isWeight=${this.activeObj.isWeight}`
});
@@ -797,7 +836,7 @@
cancelCodeCancel(){
this.enterCode = false;
this.enterCodeStr = '';
- if (this.activeObj.orderType === '澶栬喘') {
+ if (this.activeObj.orderType === '澶栬喘 '&& this.activeObj.isWeight === 1 && this.activeObj.productNames.split(',').filter(item => item != '').length <= 1 && this.falseProductNames.includes(this.activeObj.productId)) {
uni.navigateTo({
url: `/subPages/bill-of-lading-details/originInfo/originInfo?orderPlanId=${this.activeObj.id}&filedId=${this.activeObj.filedId}&deptId=${this.activeObj.deptId}&sendDate=${this.activeObj.sendDate}&isSpecial=${this.activeObj.isSpecial}&isWeight=${this.activeObj.isWeight}`
});
@@ -817,13 +856,25 @@
// 缃┖ radioGroupValue 鍗冲彇娑堥�変腑鐨勫��
this.radioGroupValue = ''
// 鍒濆鍖� num
- this.num = 0
+ this.num = 0
}
},
// 褰撳垏鎹㈠叾浠栭�夐」鐨勬椂鍊欐鏂规硶鎵嶄細鎵ц
radioChange(n) {
console.log(n,'213')
+ },
+ isFirstConFirm(){
+ this.isFirstShow = false;
+ console.log(this.jiedanObj,'jiedan')
+ this.qiangDanBtn(this.jiedanObj)
+ },
+ //pvc鎷煎崟
+ PvcpinDan(item){
+ uni.navigateTo({
+ url: `/subPages/pvcSplicePage/index?item=${JSON.stringify(item) }`
+ })
+
}
}
@@ -832,11 +883,21 @@
<style lang="scss"
scoped>
+ .tishiBox{
+ display: flex;
+ flex-direction: column;
+ }
.tableCon{
+ overflow: auto;
+ height: 560rpx;
+ width: 700rpx;
.uni-table{
min-width: 0!important;
}
+}
+.codeBox{
+ margin: vww(8) vww(8) 0 vww(16);
}
@mixin formItem {
width: vww(345);
@@ -919,6 +980,8 @@
height: vww(280);
width: 700rpx;
padding: 20rpx;
+ // overflow: auto;
+ // position: relative;
.image{
width: 100%;
height: vww(110);
@@ -939,6 +1002,9 @@
&__btn {
margin: vww(10) auto;
width: 50%;
+ position: absolute;
+ left: 25%;
+ top: 87%;
.u-button {
height: vww(20);
@@ -1001,7 +1067,7 @@
.collection-form-item {
width: vww(345);
- height: vww(185);
+ height: vww(220);
margin-top: vww(5);
background: #ffffff;
box-shadow: 4rpx 6rpx 25rpx 0rpx rgba(73, 120, 240, 0.15);
@@ -1016,7 +1082,7 @@
height: 2rpx;
background: #e3e3e3;
position: absolute;
- top: 122rpx;
+ top: 240rpx;
left: 128rpx;
}
@@ -1211,7 +1277,7 @@
.appointment-form-item {
@include formItem;
- height: vww(191);
+ height: vww(225);
justify-content: space-between;
overflow: hidden;
@@ -1220,7 +1286,7 @@
height: 1rpx;
background: #e3e3e3;
position: absolute;
- top: 122rpx;
+ top: 240rpx;
left: 128rpx;
}
--
Gitblit v1.9.1