From b63dc8ccc6163e73b9f4e4b79f9497070e8ba5ec Mon Sep 17 00:00:00 2001
From: yangan <yangan0921@163.com>
Date: 星期四, 05 十二月 2024 15:53:06 +0800
Subject: [PATCH] feat:PVC流程代码提交
---
pages/driver-page/driver-index/driver-index.vue | 48 ++++++++++++++++++++++++++++++++++--------------
1 files changed, 34 insertions(+), 14 deletions(-)
diff --git a/pages/driver-page/driver-index/driver-index.vue b/pages/driver-page/driver-index/driver-index.vue
index efc4329..6a568cc 100644
--- a/pages/driver-page/driver-index/driver-index.vue
+++ b/pages/driver-page/driver-index/driver-index.vue
@@ -162,6 +162,11 @@
</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)">
鍓ф瘨閫氳璇�
@@ -170,8 +175,6 @@
@click.stop="cancelAppoint(item)">
璇锋眰閫�鍗�
</view>
- <view class="button-img"
- @click.stop="toAppointmentClick(item)">绔嬪嵆棰勭害</view>
</view>
</view>
</view>
@@ -284,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>
@@ -409,8 +416,13 @@
:loading="ClickLoading"></u-button></view>
</view>
</u-popup>
- <u-modal :show="isFirstShow" :title="'娓╅Θ鎻愮ず'" @confirm="isFirstConFirm">
+ <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>
@@ -471,6 +483,8 @@
qiangDanShow: false,
enterCode:false,
openObj:{},
+ //
+ falseProductNames:['1818237609508347905','1818237832536268801','1818211942485995521'],
activeObj:{},
enterCodeStr:'',
qiangDanTitle: '鎺ュ崟鎻愮ず',
@@ -619,14 +633,9 @@
}
},
qiangDanTiShi(item){
- const flag = uni.getStorageSync('isFirstMeet');
this.jiedanObj = item;
- if(!flag){
this.isFirstShow = true;
- }else{
- this.qiangDanBtn(item)
- }
-
+
},
// 鎺ュ崟妯℃�佹
qiangDanConfirm() {
@@ -781,7 +790,7 @@
this.enterCode = true;
}else{
this.enterCode = false;
- if (value.orderType === '澶栬喘' && value.isWeight === 1 && value.productNames.split(',').filter(item => item != '').length <= 1) {
+ 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}`
});
@@ -813,7 +822,7 @@
}).catch(err=>{
}).finally(() => {
- if (this.activeObj.orderType === '澶栬喘' && this.activeObj.isWeight === 1 && this.activeObj.productNames.filter(item => item != '').length <= 1) {
+ 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}`
});
@@ -827,7 +836,7 @@
cancelCodeCancel(){
this.enterCode = false;
this.enterCodeStr = '';
- if (this.activeObj.orderType === '澶栬喘 '&& this.activeObj.isWeight === 1 && this.activeObj.productNames.split(',').filter(item => item != '').length <= 1) {
+ 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}`
});
@@ -859,6 +868,13 @@
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) }`
+ })
+
}
}
@@ -867,6 +883,10 @@
<style lang="scss"
scoped>
+ .tishiBox{
+ display: flex;
+ flex-direction: column;
+ }
.tableCon{
overflow: auto;
height: 560rpx;
--
Gitblit v1.9.1