From 1060979dee0a1d8511724c9e776a86d9ce9f9192 Mon Sep 17 00:00:00 2001
From: yangan <yangan0921@163.com>
Date: 星期二, 15 十月 2024 10:27:06 +0800
Subject: [PATCH] feat:液氯需求细节
---
pages/driver-page/driver-index/driver-index.vue | 263 +++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 248 insertions(+), 15 deletions(-)
diff --git a/pages/driver-page/driver-index/driver-index.vue b/pages/driver-page/driver-index/driver-index.vue
index 61310f3..efc4329 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>
@@ -159,7 +164,7 @@
<view class="button-img"
v-if="item.isDanger === 1 && !item.idCardEscort"
@click.stop="cancelCerifCate(item)">
- 鍓ф瘨杩愯緭璇�
+ 鍓ф瘨閫氳璇�
</view>
<view class="button-img"
@click.stop="cancelAppoint(item)">
@@ -223,6 +228,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>
@@ -281,7 +288,7 @@
v-if="item.isDanger === 1">
<view class="button-img"
@click.stop="cancelCerifCate(item)">
- 鍓ф瘨杩愯緭璇�
+ 鍓ф瘨閫氳璇�
</view>
<view class="button-img"
@click.stop="cancelAppoint(item)">
@@ -336,6 +343,75 @@
:loading="ClickLoading"></u-button></view>
</view>
</u-popup>
+ <!-- 棰嗗彇寮瑰嚭妗� -->
+ <u-popup :show="showLing"
+ @close="closeling"
+ closeOnClickOverlay
+ @open="openLing"
+ mode="center"
+ round="10">
+ <view class="receiverPopup">
+ <view class="tableCon" v-if="pageList.length">
+ <!-- <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 v-for="(item, index) in pageList"
+ :key="item.id">
+ <uni-td align="center">
+ <u-radio-group
+ v-model="item.flag"
+ placement="column"
+ @change="(v)=>groupChange(v,item.flag)"
+ >
+ <u-radio
+ :iconSize='40'
+ :customStyle="{marginBottom: '8px'}"
+ @change="radioChange(item.flag)"
+ >
+ </u-radio>
+ </u-radio-group>
+ </uni-td>
+ <uni-td align="center">{{ item.productName}}</uni-td>
+ <uni-td align="center">{{ item.productGrade}}</uni-td>
+ <uni-td align="center"> {{item.planMeasure}}</uni-td>
+ </uni-tr>
+ </uni-table> -->
+ <view style="text-align: center;">閫夋嫨鍚ㄦ暟</view>
+ <u-radio-group v-model="radioValue" borderBottom placement="column"
+
+ @change="radioChange"
+ >
+ <view
+ style="margin:15rpx" v-for="(item, index) in pageList" :key="index">
+ <u-radio
+ :size='40'
+ :iconSize='50' labelSize='32' shape="circle"
+
+ :key="index"
+ :label="`${item.productName} - ${item.productGrade?item.productGrade : '鏆傛棤绛夌骇' } - ${item.planMeasure}鍚╜"
+ :name="item.id"></u-radio>
+ </view>
+
+ </u-radio-group>
+
+
+ </view>
+ <view class="receiverPopup__btn"><u-button text="纭畾"
+ type="primary"
+ @click="popupDetermineClick"
+ :loading="ClickLoading"></u-button></view>
+ </view>
+ </u-popup>
+ <u-modal :show="isFirstShow" :title="'娓╅Θ鎻愮ず'" @confirm="isFirstConFirm">
+ <view>鍏ュ満闇�瑕佹壂鎻忚溅鐗岀収鍜屽埛韬唤璇佸叆鍦猴紝璇锋惡甯﹁韩浠借瘉鍘熶欢!</view>
+ </u-modal>
</view>
</template>
@@ -377,6 +453,13 @@
show: false,
BaseUrl,
yaList:[],
+ isFirstShow:false,
+ num:0,
+ radioValue:'',
+ showLing:false,
+ jiedanObj:{},
+ pageList:[],
+ receiveNum:"",
inspectData:[],
activeObj:{},
driverBillOfLoadingData: {
@@ -387,6 +470,8 @@
// 鎺ュ崟妯℃�佹
qiangDanShow: false,
enterCode:false,
+ openObj:{},
+ activeObj:{},
enterCodeStr:'',
qiangDanTitle: '鎺ュ崟鎻愮ず',
qiangDanContent: '',
@@ -403,6 +488,8 @@
xsUserId: '',
filedId: '',
previewImageSrc:"",
+ pvcForwardIdList:[],
+
};
},
onShow() {
@@ -413,10 +500,41 @@
close() {
this.show = false;
},
+ radioChange(item){
+
+ },
+ closeling() {
+ this.showLing = false;
+ this.receiveNum = null;
+ this.radioValue = '';
+ },
selectionChange(e) {
this.yaList= e.detail.index.map(item=>{
return this.inspectData[item]
})
+ },
+ selectionChange2(e){
+ console.log(e);
+ let tempArr = e.detail.index.pop();
+
+
+
+ },
+ toggleRowSelection(arrary,selected){
+ console.log(arrary,selected,'arrary,selected')
+
+ },
+ getBuild(item){
+ console.log(this.productName,'opr')
+ 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
+ return item;
+ });
+ })
+
+
},
popClick(){
let data=this.yaList.map(item=>{
@@ -444,6 +562,14 @@
}`
});
},
+ popupDetermineClick() {
+ 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=[]
this.qiangDanList();
@@ -460,6 +586,16 @@
},
// 鎺ュ崟鎸夐挳
qiangDanBtn(value) {
+ uni.setStorageSync('isFirstMeet',true)
+ if(/鑱氭隘涔欑儻鏍戣剛/.test(value.productName) || value.packingType == 1 ){
+ this.activeObj = value;
+ this.showLing = true;
+ this.lingFlag = true;
+ return
+ }else{
+ this.lingFlag = false;
+
+ }
//鏄惁鍙互鍦哄唴鎺ュ崟锛�1 鍙互2涓嶅彲浠�
if (value.isInsideConnect === 1) {
this.insideConnectShow = true
@@ -482,6 +618,16 @@
}
}
},
+ qiangDanTiShi(item){
+ const flag = uni.getStorageSync('isFirstMeet');
+ this.jiedanObj = item;
+ if(!flag){
+ this.isFirstShow = true;
+ }else{
+ this.qiangDanBtn(item)
+ }
+
+ },
// 鎺ュ崟妯℃�佹
qiangDanConfirm() {
this.qiangDanContent = '';
@@ -500,20 +646,25 @@
orderPlanId: id,
fleetId: fleetId,
customerId: customerId,
- xsUserId: xsUserId
+ xsUserId: xsUserId,
+ pvcForwardId:this.lingFlag? this.radioValue : null
}, 'params')
.then(res => {
uni.hideLoading()
if (res.code == 0) {
this.$u.toast('鎺ュ崟鎴愬姛');
+ this.showLing =false;
} else {
this.$u.toast(res.msg ? res.msg : '鎺ュ崟澶辫触');
+ this.showLing =false;
}
})
.then(() => {
setTimeout(() => {
this.qiangDanList();
+ this.radioValue = '';
+ this.showLing =false;
}, 1500);
}).catch(e => {
uni.hideLoading()
@@ -549,6 +700,10 @@
url: `/subPages/bill-of-lading-details/bill-of-lading-details?orderPlanId=${name}`
});
},
+
+ openLing() {
+ this.getBuild();
+ },
// 璇锋眰閫�鍗�
cancelAppoint(item) {
if (item.status >= 3 && item.status !== 24) {
@@ -568,7 +723,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'
})
@@ -617,7 +772,7 @@
this.activeObj = value;
if(value.isDanger === 1){
if(!value.idCardEscort){
- this.$u.toast('璇烽�夋嫨鍓ф瘨杩愯緭璇佸徃鏈猴紒');
+ this.$u.toast('璇烽�夋嫨鍓ф瘨閫氳璇佸徃鏈猴紒');
this.cancelCerifCate(value);
return
}
@@ -626,7 +781,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) {
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}`
});
@@ -658,7 +813,7 @@
}).catch(err=>{
}).finally(() => {
- if (this.activeObj.orderType === '澶栬喘') {
+ if (this.activeObj.orderType === '澶栬喘' && this.activeObj.isWeight === 1 && this.activeObj.productNames.filter(item => item != '').length <= 1) {
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}`
});
@@ -672,7 +827,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) {
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}`
});
@@ -681,13 +836,49 @@
url: `/pages/driver-page/appointment/appointment?takeCoalId=${this.activeObj.id}&filedId=${this.activeObj.filedId}&deptId=${this.activeObj.deptId}&sendDate=${this.activeObj.sendDate}`
});
}
+ },
+ groupChange(n,item) {
+ console.log(n,item,'213')
+ if(n == item && this.num == 0){
+ // 绗竴娆＄浉绛夊嵆鎵ц浠ヤ笅浠ｇ爜
+ this.num++
+ }else {
+ // 绗竴娆″悗鐩哥瓑鍗虫墽琛屼互涓嬩唬鐮�
+ // 缃┖ radioGroupValue 鍗冲彇娑堥�変腑鐨勫��
+ this.radioGroupValue = ''
+ // 鍒濆鍖� num
+ this.num = 0
+ }
+ },
+ // 褰撳垏鎹㈠叾浠栭�夐」鐨勬椂鍊欐鏂规硶鎵嶄細鎵ц
+ radioChange(n) {
+ console.log(n,'213')
+
+ },
+ isFirstConFirm(){
+ this.isFirstShow = false;
+ console.log(this.jiedanObj,'jiedan')
+ this.qiangDanBtn(this.jiedanObj)
}
- }
+ }
+
};
</script>
<style lang="scss"
scoped>
+ .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);
height: vww(150);
@@ -766,8 +957,11 @@
}
}
.receiverPopup {
- height: vww(220);
+ height: vww(280);
width: 700rpx;
+ padding: 20rpx;
+ // overflow: auto;
+ // position: relative;
.image{
width: 100%;
height: vww(110);
@@ -788,6 +982,9 @@
&__btn {
margin: vww(10) auto;
width: 50%;
+ position: absolute;
+ left: 25%;
+ top: 87%;
.u-button {
height: vww(20);
@@ -850,7 +1047,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);
@@ -865,7 +1062,7 @@
height: 2rpx;
background: #e3e3e3;
position: absolute;
- top: 122rpx;
+ top: 240rpx;
left: 128rpx;
}
@@ -1060,7 +1257,7 @@
.appointment-form-item {
@include formItem;
- height: vww(191);
+ height: vww(225);
justify-content: space-between;
overflow: hidden;
@@ -1069,7 +1266,7 @@
height: 1rpx;
background: #e3e3e3;
position: absolute;
- top: 122rpx;
+ top: 240rpx;
left: 128rpx;
}
@@ -1274,6 +1471,42 @@
position: relative;
top: -240rpx;
}
+
+ }
+ // 棰嗗彇寮瑰嚭妗�
+ .receiverPopup {
+ height: vww(110);
+
+ .receiverPopup__title {
+ margin: vww(10) auto 0;
+ width: 80%;
+ text-align: center;
+ }
+
+ .receiverPopup__input {
+ width: 80%;
+ margin: vww(10) auto 0;
+
+ .u-input {
+ border: 1px solid #dddddd;
+ }
+ }
+
+ &__btn {
+ margin: vww(10) auto;
+ width: 50%;
+
+ .u-button {
+ height: vww(20);
+ }
+ }
}
}
+</style>
+
+<style lang="scss">
+.uni-table{
+ min-width: 0px!important
+}
+
</style>
\ No newline at end of file
--
Gitblit v1.9.1