From 7e7e77134aa0324993ce7d9db9884eab4d8f98fe Mon Sep 17 00:00:00 2001
From: yangan <yangan0921@163.com>
Date: 星期五, 06 九月 2024 11:41:21 +0800
Subject: [PATCH] feat:分配日计划样式更新
---
pages/driver-page/driver-index/driver-index.vue | 231 +++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 214 insertions(+), 17 deletions(-)
diff --git a/pages/driver-page/driver-index/driver-index.vue b/pages/driver-page/driver-index/driver-index.vue
index 369347c..af1c0d6 100644
--- a/pages/driver-page/driver-index/driver-index.vue
+++ b/pages/driver-page/driver-index/driver-index.vue
@@ -4,7 +4,7 @@
<view class="driver-index-body">
<!-- 寰呴鍙栨敹鍙戝崟 -->
<view class="wait-collection"
- style="background: url('https://mx.jzeg.cn:9096/appimg/image/banner/diverbanner.png') no-repeat;background-size:contain">
+ style="background: url('https://wrzs.czjlchem.com:9090/appimg/image/banner/diverbanner.png') no-repeat;background-size:contain">
</view>
<!-- 寮曞椤� -->
<noob-tour></noob-tour>
@@ -159,7 +159,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)">
@@ -281,7 +281,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 +336,72 @@
: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>
</view>
</template>
@@ -377,6 +443,11 @@
show: false,
BaseUrl,
yaList:[],
+ num:0,
+ radioValue:'',
+ showLing:false,
+ pageList:[],
+ receiveNum:"",
inspectData:[],
activeObj:{},
driverBillOfLoadingData: {
@@ -387,6 +458,8 @@
// 鎺ュ崟妯℃�佹
qiangDanShow: false,
enterCode:false,
+ openObj:{},
+ activeObj:{},
enterCodeStr:'',
qiangDanTitle: '鎺ュ崟鎻愮ず',
qiangDanContent: '',
@@ -403,6 +476,8 @@
xsUserId: '',
filedId: '',
previewImageSrc:"",
+ pvcForwardIdList:[],
+
};
},
onShow() {
@@ -413,10 +488,40 @@
close() {
this.show = false;
},
+ radioChange(item){
+
+ },
+ closeling() {
+ this.showLing = false;
+ this.receiveNum = null;
+ },
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 +549,9 @@
}`
});
},
+ popupDetermineClick() {
+ this.qiangDan(this.activeObj.orderPlanId, this.activeObj.fleetId, this.activeObj.customerId, !this.activeObj.xsUserId ? '0' : this.activeObj.xsUserId);
+ },
init() {
this.inspectData=[]
this.qiangDanList();
@@ -460,6 +568,15 @@
},
// 鎺ュ崟鎸夐挳
qiangDanBtn(value) {
+ if(/鑱氭隘涔欑儻鏍戣剛/.test(value.productName) ){
+ this.activeObj = value;
+ this.showLing = true;
+ this.lingFlag = true;
+ return
+ }else{
+ this.lingFlag = false;
+
+ }
//鏄惁鍙互鍦哄唴鎺ュ崟锛�1 鍙互2涓嶅彲浠�
if (value.isInsideConnect === 1) {
this.insideConnectShow = true
@@ -500,20 +617,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,9 +671,13 @@
url: `/subPages/bill-of-lading-details/bill-of-lading-details?orderPlanId=${name}`
});
},
+
+ openLing() {
+ this.getBuild();
+ },
// 璇锋眰閫�鍗�
cancelAppoint(item) {
- if (item.status >= 3) {
+ if (item.status >= 3 && item.status !== 24) {
this.$u.toast('褰撳墠鐘舵�佷笉鍙��鍗�')
return
}
@@ -568,7 +694,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 +743,7 @@
this.activeObj = value;
if(value.isDanger === 1){
if(!value.idCardEscort){
- this.$u.toast('璇烽�夋嫨閬撹矾杩愯緭璇佸徃鏈猴紒');
+ this.$u.toast('璇烽�夋嫨鍓ф瘨杩愯緭璇佸徃鏈猴紒');
this.cancelCerifCate(value);
return
}
@@ -681,13 +807,41 @@
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')
+
}
- }
+ }
+
};
</script>
<style lang="scss"
scoped>
+ .tableCon{
+ overflow: auto;
+ height: 560rpx;
+ width: 700rpx;
+
+ .uni-table{
+ min-width: 0!important;
+}
+}
@mixin formItem {
width: vww(345);
height: vww(150);
@@ -755,7 +909,7 @@
.button-img {
width: vww(122);
height: vww(41);
- background: url('https://mx.jzeg.cn:9096/appimg/image/banner/button.png') no-repeat;
+ background: url('https://wrzs.czjlchem.com:9090/appimg/image/banner/button.png') no-repeat;
background-size: cover;
font-size: 28rpx;
font-weight: 300;
@@ -766,8 +920,11 @@
}
}
.receiverPopup {
- height: vww(220);
+ height: vww(280);
width: 700rpx;
+ padding: 20rpx;
+ // overflow: auto;
+ // position: relative;
.image{
width: 100%;
height: vww(110);
@@ -788,6 +945,9 @@
&__btn {
margin: vww(10) auto;
width: 50%;
+ position: absolute;
+ left: 25%;
+ top: 87%;
.u-button {
height: vww(20);
@@ -888,7 +1048,7 @@
height: vww(28);
line-height: vww(28);
text-align: center;
- background: url('https://mx.jzeg.cn:9096/appimg/image/banner/blueblock.png') no-repeat;
+ background: url('https://wrzs.czjlchem.com:9090/appimg/image/banner/blueblock.png') no-repeat;
background-size: contain;
font-size: 30rpx;
font-weight: 400;
@@ -900,7 +1060,7 @@
.point-number {
position: absolute;
right: 0;
- width: 15%;
+ width: 18%;
text {
font-size: 24rpx;
@@ -931,7 +1091,7 @@
height: vww(28);
line-height: vww(28);
text-align: center;
- background: url('https://mx.jzeg.cn:9096/appimg/image/banner/redblock.png') no-repeat;
+ background: url('https://wrzs.czjlchem.com:9090/appimg/image/banner/redblock.png') no-repeat;
background-size: contain;
font-size: 30rpx;
font-weight: 400;
@@ -1089,7 +1249,7 @@
height: vww(28);
line-height: vww(28);
text-align: center;
- background: url('https://mx.jzeg.cn:9096/appimg/image/banner/blueblock.png') no-repeat;
+ background: url('https://wrzs.czjlchem.com:9090/appimg/image/banner/blueblock.png') no-repeat;
background-size: contain;
font-size: 30rpx;
font-weight: 400;
@@ -1125,7 +1285,7 @@
height: vww(28);
line-height: vww(28);
text-align: center;
- background: url('https://mx.jzeg.cn:9096/appimg/image/banner/redblock.png') no-repeat;
+ background: url('https://wrzs.czjlchem.com:9090/appimg/image/banner/redblock.png') no-repeat;
background-size: contain;
font-size: 30rpx;
font-weight: 400;
@@ -1163,7 +1323,7 @@
height: vww(28);
line-height: vww(28);
text-align: center;
- background: url('https://mx.jzeg.cn:9096/appimg/image/banner/redblock.png') no-repeat;
+ background: url('https://wrzs.czjlchem.com:9090/appimg/image/banner/redblock.png') no-repeat;
background-size: contain;
font-size: 30rpx;
font-weight: 400;
@@ -1235,10 +1395,11 @@
height: vww(68);
display: flex;
align-items: center;
+ justify-content: flex-end;
.button-img {
width: vww(122);
height: vww(41);
- background: url('https://mx.jzeg.cn:9096/appimg/image/banner/button.png') no-repeat;
+ background: url('https://wrzs.czjlchem.com:9090/appimg/image/banner/button.png') no-repeat;
background-size: cover;
font-size: 28rpx;
font-weight: 300;
@@ -1273,6 +1434,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