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 | 778 +++++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 669 insertions(+), 109 deletions(-)
diff --git a/pages/driver-page/driver-index/driver-index.vue b/pages/driver-page/driver-index/driver-index.vue
index a9e020c..af1c0d6 100644
--- a/pages/driver-page/driver-index/driver-index.vue
+++ b/pages/driver-page/driver-index/driver-index.vue
@@ -2,29 +2,24 @@
<view class="">
<view class="driver-index">
<view class="driver-index-body">
- <!-- 寰呴鍙栨彁鐓ゅ崟 -->
+ <!-- 寰呴鍙栨敹鍙戝崟 -->
<view class="wait-collection"
- style="background: url('https://mx.jzeg.cn:9095/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>
<!-- 寮曞椤� -->
- <view class="noob-tour"
- v-if="roleType===3&&isFirstLogin">
- <combined-title title="鎿嶄綔鎸囧紩"></combined-title>
- <u-cell-group>
- <u-cell title="鏂版墜鎸囧紩"
- name='1'
- :clickable="true"
- @click="noobTour">
- <u-badge type="primary"
- value="01"
- slot='icon'></u-badge>
- <u-icon slot="value"
- name="arrow-right"
- size="30"
- color="#b8b8b8"></u-icon>
- </u-cell>
- </u-cell-group>
- </view>
+ <noob-tour></noob-tour>
+ <!-- 鑷富閰嶉�佺晫闈� -->
+ <!-- <view class="self-deliver">
+ <view class="self-deliver_text">
+ 鍒涘缓鑷富閰嶉�佸崟
+ </view>
+ <view class="self-deliver_btn">
+ <u-button text="鍘诲垱寤�"
+ type="primary"
+ shape="cirle"
+ @click="selfDeliver"></u-button>
+ </view>
+ </view> -->
<view class="collection-form">
<view class="collection-form-item"
v-for="(item, index) in driverBillOfLoadingData.list1"
@@ -35,9 +30,9 @@
<view class="sign">瑁�</view>
<view class="filedname exceedHide">
<text
- v-if="item.orderType == '澶栭攢' || item.orderType == '鍐呴攢' ">{{ item.deptName|| '' }}</text>
+ v-if="item.orderType == '澶栭攢' || item.orderType == '鍐呴攢'||item.orderType == '澶栭攢閫�' ">{{ item.deptName|| '' }}</text>
<text
- v-else-if="item.orderType == '澶栬喘' || item.orderType == '鍐呰喘' ">{{ item.customerId?item.customerName:item.customerNameCopy|| '' }}</text>
+ v-else-if="item.orderType == '澶栬喘' || item.orderType == '鍐呰喘'||item.orderType == '澶栬喘閫�' ">{{ item.customerId?item.customerName:item.customerNameCopy|| '' }}</text>
<text v-else-if="item.orderType == '杞嚭'|| item.orderType == '杞叆'">{{item.filedName}}
</text>
@@ -52,11 +47,11 @@
<view class="main-information">
<view class="sign">鍗�</view>
<view class="filedname exceedHide">
- <text v-if="item.orderType == '澶栭攢' || item.orderType == '鍐呴攢' ">
+ <text v-if="item.orderType == '澶栭攢' || item.orderType == '鍐呴攢'||item.orderType == '澶栭攢閫�' ">
{{ item.customerNameCopy ? item.customerNameCopy : item.customerName|| '' }}
</text>
<text
- v-else-if="item.orderType == '澶栬喘' || item.orderType == '鍐呰喘' ">{{ item.deptName|| '' }}</text>
+ v-else-if="item.orderType == '澶栬喘' || item.orderType == '鍐呰喘'||item.orderType == '澶栬喘閫�' ">{{ item.deptName|| '' }}</text>
<text
v-else-if="item.orderType == '杞嚭'|| item.orderType == '杞叆'">{{item.toFiledName}}
@@ -73,17 +68,19 @@
size="40"></u-icon></view>
<view class="send-date">{{ item.sendDate }}</view>
<view class="type">
- <view class="coal-name">{{ item.coalName }}</view>
+ <view class="coal-name">{{ item.productNames || item.productName }}</view>
</view>
</view>
<view class="fourth-line"
@click="qiangDanBtn(item)"
v-if="item.carNum - item.taskNum !== 0">
- <view class="button-img">绔嬪嵆鎶㈠崟</view>
+ <!-- <view class="button-img">绔嬪嵆鎺ュ崟</view> -->
+ <u-button type="primary"
+ class="button-img">绔嬪嵆鎺ュ崟</u-button>
</view>
</view>
</view>
- <!-- 鎶㈠崟鎻愮ず妯℃�佹 -->
+ <!-- 鎺ュ崟鎻愮ず妯℃�佹 -->
<view class="qianDanModel">
<u-modal :show="qiangDanShow"
:title="qiangDanTitle"
@@ -92,10 +89,9 @@
@confirm="qiangDanConfirm"
@cancel="qiangDanCancel"></u-modal>
</view>
-
- <!-- 寰呴绾︽彁鐓ゅ崟 -->
+ <!-- 寰呴绾︽敹鍙戝崟 -->
<view class="wait-appointment">
- <combined-title title="寰呴绾︽彁鐓ゅ崟"></combined-title>
+ <combined-title title="寰呴绾︽敹鍙戝崟"></combined-title>
<u-empty mode="data"
icon="http://cdn.uviewui.com/uview/empty/data.png"
text="鏆傛棤鏁版嵁"
@@ -113,9 +109,9 @@
<view class="sign">瑁�</view>
<view class="filedname exceedHide">
<text
- v-if="item.orderType == '澶栭攢' || item.orderType == '鍐呴攢' ">{{ item.deptName }}</text>
+ v-if="item.orderType == '澶栭攢' || item.orderType == '鍐呴攢'||item.orderType == '澶栭攢閫�' ">{{ item.deptName }}</text>
<text
- v-else-if="item.orderType == '澶栬喘' || item.orderType == '鍐呰喘' ">{{ item.customerName }}</text>
+ v-else-if="item.orderType == '澶栬喘' || item.orderType == '鍐呰喘'||item.orderType == '澶栬喘閫�' ">{{ item.customerName }}</text>
<text
v-else-if="item.orderType == '杞嚭'|| item.orderType == '杞叆'">{{item.filedName}}
</text>
@@ -133,9 +129,9 @@
<view class="sign">鍗�</view>
<view class="filedname exceedHide">
<text
- v-if="item.orderType == '澶栭攢' || item.orderType == '鍐呴攢' ">{{ item.customerName }}</text>
+ v-if="item.orderType == '澶栭攢' || item.orderType == '鍐呴攢'||item.orderType == '澶栭攢閫�' ">{{ item.customerName }}</text>
<text
- v-else-if="item.orderType == '澶栬喘' || item.orderType == '鍐呰喘' ">{{ item.deptName }}</text>
+ v-else-if="item.orderType == '澶栬喘' || item.orderType == '鍐呰喘'||item.orderType == '澶栬喘閫�' ">{{ item.deptName }}</text>
<text
v-else-if="item.orderType == '杞嚭'|| item.orderType == '杞叆'">{{item.toFiledName}}</text>
</view>
@@ -155,21 +151,66 @@
<view class="send-date">{{ item.sendDate }}</view>
</view>
<view class="type">
- <view class="coal-name">{{ item.coalName }}</view>
+ <view class="coal-name">{{ item.productNames || item.productName }}</view>
<!-- <view class="order-type">{{ item.orderType }}</view> -->
</view>
</view>
- <view class="fourth-line"
- @click="toAppointmentClick(item)">
- <view class="button-img">绔嬪嵆棰勭害</view>
+ <view class="fifth-line">
+ <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>
</view>
-
- <!-- 宸查绾︽彁鐓ゅ崟 -->
+ <!-- 璇锋眰閫�鍗曞脊绐� -->
+ <view class="">
+ <u-modal :show="cancelAppointShow"
+ title="閫�鍗曠‘璁�"
+ showCancelButton
+ content="鏄惁纭閫�鍗�"
+ @confirm="cancelAppointConfirm"
+ @cancel="cancelAppointCancel"></u-modal>
+ </view>
+ <!-- 鍦哄唴鎺ュ崟寮圭獥 -->
+ <view class="">
+ <u-modal :show="insideConnectShow"
+ title="鎺ュ崟閫夋嫨"
+ showCancelButton
+ cancel-text="姝ｅ父鎺ュ崟"
+ confirm-text="鍦哄唴鎺ュ崟"
+ content="鍦哄唴鎺ュ崟鏃犻渶绉扮毊,鏄惁纭鎺ュ崟"
+ @confirm="insideConnectConfirm"
+ @cancel="insideConnectCancel"></u-modal>
+ </view>
+ <!-- 宸查绾︽敹鍙戝崟 -->
+ <!-- 濉啓闆嗚绠卞彿 -->
+ <view class="">
+ <u-modal :show="enterCode"
+ title="闆嗚绠卞彿"
+ showCancelButton
+ content="璇峰～鍐欓泦瑁呯鍙�"
+ @confirm="cancelCodeEnter"
+ @cancel="cancelCodeCancel">
+ <view style=" display: flex; align-items: center;">
+ <text>璇疯緭鍏ワ細</text> <u--input
+ style="border: 1px solid black"
+ v-model="enterCodeStr"
+ placeholder="璇疯緭鍏ラ泦瑁呯鍙�"></u--input>
+ </view>
+
+ </u-modal>
+ </view>
<view class="Reserved">
- <combined-title title="宸查绾︽彁鐓ゅ崟"></combined-title>
+ <combined-title title="宸查绾︽敹鍙戝崟"></combined-title>
<u-empty mode="data"
icon="http://cdn.uviewui.com/uview/empty/data.png"
textSize="30"
@@ -187,9 +228,9 @@
<view class="sign">瑁�</view>
<view class="filedname exceedHide">
<text
- v-if="item.orderType == '澶栭攢' || item.orderType == '鍐呴攢' ">{{ item.deptName }}</text>
+ v-if="item.orderType == '澶栭攢' || item.orderType == '鍐呴攢'||item.orderType == '澶栭攢閫�' ">{{ item.deptName }}</text>
<text
- v-else-if="item.orderType == '澶栬喘' || item.orderType == '鍐呰喘' ">{{ item.customerName }}</text>
+ v-else-if="item.orderType == '澶栬喘' || item.orderType == '鍐呰喘'||item.orderType == '澶栬喘閫�' ">{{ item.customerName }}</text>
<text v-else-if="item.orderType == '杞嚭'||item.orderType == '杞叆'">
{{item.filedName}}
@@ -208,9 +249,9 @@
<view class="sign">鍗�</view>
<view class="filedname exceedHide">
<text
- v-if="item.orderType == '澶栭攢' || item.orderType == '鍐呴攢' ">{{ item.customerName }}</text>
+ v-if="item.orderType == '澶栭攢' || item.orderType == '鍐呴攢'||item.orderType == '澶栭攢閫�' ">{{ item.customerName }}</text>
<text
- v-else-if="item.orderType == '澶栬喘' || item.orderType == '鍐呰喘'">{{ item.deptName }}</text>
+ v-else-if="item.orderType == '澶栬喘' || item.orderType == '鍐呰喘'||item.orderType == '澶栬喘閫�' ">{{ item.deptName }}</text>
<text v-else-if="item.orderType == '杞嚭'||item.orderType == '杞叆'">
{{item.toFiledName}}
@@ -232,22 +273,135 @@
<view class="send-date">{{ item.yuYueSection|| '' }}</view>
</view>
<view class="type">
- <view class="coal-name">{{ item.coalName || '' }}</view>
+ <view class="coal-name">{{ item.productNames || item.productName }}</view>
<!-- <view class="order-type">{{ item.orderType }}</view> -->
+ </view>
+ </view>
+ <view class="fourth-line"
+ v-if="item.isDanger === 1">
+ <view class="button-img"
+ @click.stop="cancelCerifCate(item)">
+ 鍓ф瘨杩愯緭璇�
+ </view>
+ <view class="button-img"
+ @click.stop="cancelAppoint(item)">
+ 璇锋眰閫�鍗�
</view>
</view>
</view>
</view>
<view class="white-block"></view>
- <!-- 鍥剧墖棰勮寮瑰嚭妗� -->
- <view class="previewImage-container">
- <previewImage ref="previewImage"
- :imgs="driverTourImgList"
- :saveBtn='false'></previewImage>
- </view>
</view>
</view>
</view>
+ <u-popup :show="show"
+ @close="close"
+ @open="open"
+ mode="center"
+ round="10">
+ <view class="receiverPopup">
+ <view class="image">
+ <u--image
+ :src="previewImageSrc != null ? BaseUrl + previewImageSrc : ''"
+ width="80px"
+ height="80px"
+ >
+ <view slot="error"
+ style="font-size: 24rpx;">鍔犺浇澶辫触</view>
+ </u--image>
+ </view>
+ <view class="tables">
+ <uni-table border
+ stripe
+ type="selection"
+ @selection-change="selectionChange"
+ emptyText="鏆傛棤鏇村鏁版嵁">
+ <uni-tr>
+ <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 inspectData"
+ :key="item.id">
+ <uni-td align="center">{{ item.name.split("|")[0] }}</uni-td>
+ <uni-td align="center">{{ item.name.split("|")[1] }}</uni-td>
+ <uni-td align="center">{{ item.name.split("|")[2] }}</uni-td>
+ </uni-tr>
+ </uni-table>
+ </view>
+
+ <view class="receiverPopup__btn"><u-button text="纭畾"
+ type="primary"
+ @click="popClick"
+ :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>
@@ -256,10 +410,12 @@
import combinedTitle from '@/components/combined-title/combined-title.vue';
import previewImage from '@/components/kxj-previewImage/kxj-previewImage.vue';
import { mapState } from 'vuex'
+ import { BaseUrl } from '@/api/publicInterface.js'
export default {
components: {
combinedTitle,
- previewImage
+ previewImage,
+
},
props: {
indexdriverBillOfLoadingData: {
@@ -284,26 +440,107 @@
},
data() {
return {
+ show: false,
+ BaseUrl,
+ yaList:[],
+ num:0,
+ radioValue:'',
+ showLing:false,
+ pageList:[],
+ receiveNum:"",
+ inspectData:[],
+ activeObj:{},
driverBillOfLoadingData: {
list1: [],
list2: [],
list3: []
},
- // 鎶㈠崟妯℃�佹
+ // 鎺ュ崟妯℃�佹
qiangDanShow: false,
- qiangDanTitle: '鎶㈠崟鎻愮ず',
+ enterCode:false,
+ openObj:{},
+ activeObj:{},
+ enterCodeStr:'',
+ qiangDanTitle: '鎺ュ崟鎻愮ず',
qiangDanContent: '',
qiangDanOrderPlanId: null,
+ isFirstLogin: true, //鏄惁鏄涓�娆＄櫥褰�
+ phone: "",
+ isFirstTime: false, //鏄惁鏄櫥褰曡繘鍏ラ椤碉紝杩樻槸鍒殑椤甸潰杩斿洖 false鏄櫥褰� true鏄埆鐨勯〉闈�
+ cancelAppointShow: false, //纭閫�鍗曞脊绐楁帶鍒�
+ cancelAppointId: '',
+ insideConnectShow: false,
+ orderPlanId: '',
fleetId: '',
- xsUserId: '',
customerId: '',
- isFirstLogin: true //鏄惁鏄涓�娆＄櫥褰�
+ xsUserId: '',
+ filedId: '',
+ previewImageSrc:"",
+ pvcForwardIdList:[],
+
};
},
onShow() {
this.init();
},
methods: {
+ open() {},
+ 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=>{
+ return item.name
+ })
+ let paramsData={
+ idCardEscort:data.join(','),roadTransportId:this.yaList[0].roadTransportId,id: this.yaList[0].Id
+ }
+ this.$reqPut('saveMyEscort', paramsData, 'json')
+ .then(res => {
+ if (res.code == 0) {
+ this.$u.toast('娣诲姞鎴愬姛');
+ this.qiangDanList();
+ this.show=false
+ } else {
+ this.$u.toast(res.msg ? res.msg : '娣诲姞澶辫触');
+ }
+ })
+ },
// 璺宠浆鍦板浘
skipMap(val) {
uni.navigateTo({
@@ -312,7 +549,11 @@
}`
});
},
+ popupDetermineClick() {
+ this.qiangDan(this.activeObj.orderPlanId, this.activeObj.fleetId, this.activeObj.customerId, !this.activeObj.xsUserId ? '0' : this.activeObj.xsUserId);
+ },
init() {
+ this.inspectData=[]
this.qiangDanList();
},
// 鍙告満棣栭〉鍒楄〃
@@ -325,21 +566,40 @@
this.driverBillOfLoadingData = res.data;
});
},
- // 鎶㈠崟鎸夐挳
+ // 鎺ュ崟鎸夐挳
qiangDanBtn(value) {
- if (value.tmcCount == '0') {
- this.qiangDan(value.orderPlanId, value.fleetId, value.customerId === null ? '0' : value.customerId,
- value.xsUserId === null ? '0' : value.xsUserId);
+ 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
+ this.orderPlanId = value.orderPlanId
+ this.fleetId = value.fleetId
+ this.customerId = !value.customerId ? '0' : value.customerId
+ this.xsUserId = !value.xsUserId ? '0' : value.xsUserId
+ this.filedId = value.filedId
} else {
- this.qiangDanOrderPlanId = value.orderPlanId;
- this.fleetId = value.fleetId;
- this.customerId = value.customerId === null ? '0' : value.customerId;
- this.xsUserId = value.xsUserId === null ? '0' : value.xsUserId;
- this.qiangDanShow = true;
- this.qiangDanContent = `宸叉姠${value.tmcCount}鍗曪紝纭畾鎶㈠崟锛焋;
+ if (value.tmcCount == '0') {
+ this.qiangDan(value.orderPlanId, value.fleetId, !value.customerId ? '0' : value.customerId,
+ !value.xsUserId ? '0' : value.xsUserId);
+ } else {
+ this.qiangDanOrderPlanId = value.orderPlanId;
+ this.fleetId = value.fleetId;
+ this.customerId = !value.customerId ? '0' : value.customerId;
+ this.xsUserId = !value.xsUserId ? '0' : value.xsUserId;
+ this.qiangDanShow = true;
+ this.qiangDanContent = `宸叉帴${value.tmcCount}鍗曪紝纭畾鎺ュ崟锛焋;
+ }
}
},
- // 鎶㈠崟妯℃�佹
+ // 鎺ュ崟妯℃�佹
qiangDanConfirm() {
this.qiangDanContent = '';
this.qiangDanShow = false;
@@ -348,53 +608,240 @@
qiangDanCancel() {
this.qiangDanShow = false;
},
- // 鎶㈠崟璇锋眰
+ // 鎺ュ崟璇锋眰
qiangDan(id, fleetId, customerId, xsUserId) {
+ uni.showLoading({
+ title: '鍔犺浇涓�'
+ })
this.$reqPost('qiangDan', {
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.$u.toast('鎺ュ崟鎴愬姛');
+ this.showLing =false;
+
} else {
- this.$u.toast(res.msg ? res.msg : '鎶㈠崟澶辫触');
+ this.$u.toast(res.msg ? res.msg : '鎺ュ崟澶辫触');
+ this.showLing =false;
}
})
.then(() => {
setTimeout(() => {
this.qiangDanList();
- }, 1000);
- });
+ this.radioValue = '';
+ this.showLing =false;
+ }, 1500);
+ }).catch(e => {
+ uni.hideLoading()
+ })
+ },
+ insideConnectHandle(orderPlanId, fleetId, customerId, xsUserId, filedId) {
+ uni.showLoading({
+ title: '鍔犺浇涓�'
+ })
+ this.$reqPost('insideConnect', {
+ orderPlanId,
+ fleetId,
+ customerId,
+ xsUserId,
+ filedId
+ }, 'params').then(res => {
+ uni.hideLoading()
+ if (res.code == 0) {
+ this.$u.toast('鍦哄唴鎺ュ崟鎴愬姛');
+ } else {
+ this.$u.toast(res.msg ? res.msg : '鍦哄唴鎺ュ崟澶辫触');
+ }
+ })
},
list3CardIconClick(value) {
uni.navigateTo({
- url: `/pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details?orderPlanId=${value.id}&yyId=${value.yyId}`
+ url: `/subPages/bill-of-lading-details/bill-of-lading-details?orderPlanId=${value.id}&yyId=${value.yyId}&orderType=${value.orderType}`
});
},
- // 鎻愮叅鍗曡鎯�
+ // 鏀跺彂鍗曡鎯�
cardBodyClick(name) {
uni.navigateTo({
- url: `/pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details?orderPlanId=${name}`
+ url: `/subPages/bill-of-lading-details/bill-of-lading-details?orderPlanId=${name}`
});
+ },
+
+ openLing() {
+ this.getBuild();
+ },
+ // 璇锋眰閫�鍗�
+ cancelAppoint(item) {
+ if (item.status >= 3 && item.status !== 24) {
+ this.$u.toast('褰撳墠鐘舵�佷笉鍙��鍗�')
+ return
+ }
+ this.cancelAppointShow = true
+ this.cancelAppointId = item.id
+ },
+ cancelCerifCate(value){
+ this.$reqGet('getMyEscortList', { customerId: value.customerId }).then(res => {
+ this.inspectData=[]
+ if (res.code == 0) {
+ this.previewImageSrc=res.data.certificateImg
+ this.inspectData=res.data.persons.map(item=>{
+ return {name:item,roadTransportId:res.data.id,Id: value.id}
+ })
+ this.show=true
+ } else {
+ this.$u.toast(res.msg ? res.msg : '璇锋坊鍔犲墽姣掕繍杈撹瘉');
+ uni.navigateTo({
+ url: '/pages/driver-page/drvier-my/certifiCate/certifiCate'
+ })
+ }
+ })
+ },
+ // 閫�鍗曞脊绐楃‘璁�
+ cancelAppointConfirm() {
+ this.cancelAppointShow = false
+ uni.showLoading({
+ title: '鍔犺浇涓�'
+ })
+ this.$reqPost('cancelAppoint', { takeCoalId: this.cancelAppointId }, 'params').then(res => {
+ uni.hideLoading()
+ if (res.code == 0) {
+ this.$u.toast('閫�鍗曟垚鍔�');
+ } else {
+ this.$u.toast(res.msg ? res.msg : '閫�鍗曞け璐�');
+ }
+ }).then(() => {
+ setTimeout(() => {
+ this.qiangDanList();
+ }, 1000);
+ }).catch(e => {
+ uni.hideLoading()
+ })
+ },
+ // 閫�鍗曞脊绐楀彇娑�
+ cancelAppointCancel() {
+ this.cancelAppointShow = false
+ },
+ insideConnectCancel() {
+ this.insideConnectShow = false
+ this.qiangDan(this.orderPlanId, this.fleetId, this.customerId, this.xsUserId)
+ },
+ // 鍦哄唴鎺ュ崟
+ insideConnectConfirm() {
+ this.insideConnectShow = false
+ this.insideConnectHandle(this.orderPlanId, this.fleetId, this.customerId, this.xsUserId, this.filedId)
},
// 鍘婚绾�
toAppointmentClick(value) {
+ // 鐢变簬鑷富閰嶉�佸崟 鏄璐崟 浣嗘槸涓嶉渶瑕佸～鍐欏師鍙戜负1涓嶉渶瑕佸～鍐欏師鍙�
+ uni.setStorageSync('isNeedOrigin', value.orderType === '澶栬喘' && value.isSpecial === 1 ? 1 : 0);
+ //鍒ゆ柇鏄笉鏄泦瑁呯 鏄惁闇�瑕佽緭鍏�
+ this.activeObj = value;
+ if(value.isDanger === 1){
+ if(!value.idCardEscort){
+ this.$u.toast('璇烽�夋嫨鍓ф瘨杩愯緭璇佸徃鏈猴紒');
+ this.cancelCerifCate(value);
+ return
+ }
+ }
+ if(value.isContainerNum){
+ this.enterCode = true;
+ }else{
+ this.enterCode = false;
+ if (value.orderType === '澶栬喘') {
+ 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}`
+ });
+ } else {
+ uni.navigateTo({
+ url: `/pages/driver-page/appointment/appointment?takeCoalId=${value.id}&filedId=${value.filedId}&deptId=${value.deptId}&sendDate=${value.sendDate}`
+ });
+ }
+ }
+
+ },
+ // 鑷富閰嶉��
+ selfDeliver() {
uni.navigateTo({
- url: `/pages/driver-page/appointment/appointment?takeCoalId=${value.id}&filedId=${value.filedId}&deptId=${value.deptId}&sendDate=${value.sendDate}`
- });
+ url: '/pages/driver-page/driver-index/SelfDelivery/SelfDelivery'
+ })
},
- noobTour() {
- this.$refs.previewImage.open('https://mx.jzeg.cn:9096/appimg/image/tour/driver/sj1.png')
+ cancelCodeEnter(){
+ console.log(this.activeObj,'tmid')
+ this.activeObj.containerNumber = this.enterCodeStr;
+ this.$reqPut('addContainer',{
+ id:this.activeObj.id,
+ containerNumber:this.activeObj.containerNumber
+ }).then(res=>{
+ this.$u.toast('鎿嶄綔鎴愬姛');
+ this.enterCodeStr = '';
+ this.enterCode = false;
+
+ }).catch(err=>{
+
+ }).finally(() => {
+ if (this.activeObj.orderType === '澶栬喘') {
+ 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}`
+ });
+ } else {
+ uni.navigateTo({
+ url: `/pages/driver-page/appointment/appointment?takeCoalId=${this.activeObj.id}&filedId=${this.activeObj.filedId}&deptId=${this.activeObj.deptId}&sendDate=${this.activeObj.sendDate}`
+ });
+ }
+ })
},
- }
+ cancelCodeCancel(){
+ this.enterCode = false;
+ this.enterCodeStr = '';
+ if (this.activeObj.orderType === '澶栬喘') {
+ 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}`
+ });
+ } else {
+ uni.navigateTo({
+ 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);
@@ -425,7 +872,7 @@
align-items: center;
.send-date {
- width: 148rpx;
+ min-width: 170rpx;
height: 24rpx;
line-height: 24rpx;
font-size: 28rpx;
@@ -434,7 +881,7 @@
}
.havedclock {
- width: 58% !important;
+ width: 70% !important;
margin-right: 0 !important;
.send-date {
@@ -451,25 +898,74 @@
}
@mixin fourthLine {
- width: 34%;
+ width: 64%;
height: vww(68);
display: flex;
align-items: center;
position: relative;
- left: vww(203);
+ left: vww(102);
bottom: vww(3);
.button-img {
- width: 100%;
- height: 100%;
- background: url('https://mx.jzeg.cn:9095/appimg/image/banner/button.png') no-repeat;
+ width: vww(122);
+ height: vww(41);
+ background: url('https://wrzs.czjlchem.com:9090/appimg/image/banner/button.png') no-repeat;
background-size: cover;
font-size: 28rpx;
font-weight: 300;
color: #ffffff;
text-align: center;
line-height: vww(40);
+
}
+ }
+ .receiverPopup {
+ height: vww(280);
+ width: 700rpx;
+ padding: 20rpx;
+ // overflow: auto;
+ // position: relative;
+ .image{
+ width: 100%;
+ height: vww(110);
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ }
+ .tables{
+ width: 100%;
+ }
+ .receiverPopup__title {
+ margin: vww(10) auto 0;
+ width: 80%;
+ text-align: center;
+ }
+
+
+ &__btn {
+ margin: vww(10) auto;
+ width: 50%;
+ position: absolute;
+ left: 25%;
+ top: 87%;
+
+ .u-button {
+ height: vww(20);
+ }
+ }
+ }
+ /deep/.u-button {
+ width: 100%;
+ height: 28px !important;
+ line-height: 40px;
+ padding: 0 12px;
+ font-size: 28rpx;
+ font-weight: 300;
+ color: #ffffff;
+ background: #497bfb !important;
+ letter-spacing: 4rpx;
+ border-radius: 37rpx 37rpx 37rpx 37rpx !important;
+ box-shadow: 2rpx 3rpx 13rpx 0rpx rgba(43, 98, 239, 0.5), 0rpx 0rpx 9rpx 0rpx rgba(247, 250, 253, 0.29);
}
.exceedHide {
@@ -486,10 +982,24 @@
.driver-index-body {
// margin-bottom: vww(56);
- // 寰呴鍙栨彁鐓ゅ崟
+ // 寰呴鍙栨敹鍙戝崟
.wait-collection {
width: 100%;
height: 600rpx;
+ }
+
+ // 鑷富閰嶉��
+ .self-deliver {
+ position: relative;
+ top: vww(-120);
+ width: 88%;
+ height: vww(50);
+ margin: vww(8) auto;
+ padding: 0 vww(8);
+ background: #ffffff;
+ box-shadow: 0rpx 0rpx 14rpx 0rpx rgba(73, 120, 240, 0.14), 0rpx 7rpx 45rpx 0rpx rgba(73, 120, 240, 0.12);
+ border-radius: 20rpx;
+ @include flex;
}
.collection-form {
@@ -538,7 +1048,7 @@
height: vww(28);
line-height: vww(28);
text-align: center;
- background: url('https://mx.jzeg.cn:9095/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;
@@ -550,7 +1060,7 @@
.point-number {
position: absolute;
right: 0;
- width: 15%;
+ width: 18%;
text {
font-size: 24rpx;
@@ -581,7 +1091,7 @@
height: vww(28);
line-height: vww(28);
text-align: center;
- background: url('https://mx.jzeg.cn:9095/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;
@@ -648,7 +1158,7 @@
align-items: center;
.send-date {
- width: 148rpx;
+ min-width: 146rpx;
height: 24rpx;
margin-left: vww(14);
margin-right: vww(56);
@@ -683,27 +1193,17 @@
}
}
+ // 寰呴绾�
.fourth-line {
width: 30%;
height: vww(68);
margin-left: vww(15);
+ margin-top: vww(5);
display: flex;
justify-content: flex-end;
position: relative;
left: vww(203);
bottom: vww(3);
-
- .button-img {
- width: 100%;
- height: 100%;
- background: url('https://mx.jzeg.cn:9095/appimg/image/banner/button.png') no-repeat;
- background-size: cover;
- font-size: 28rpx;
- font-weight: 300;
- color: #ffffff;
- text-align: center;
- line-height: vww(33);
- }
}
}
}
@@ -749,7 +1249,7 @@
height: vww(28);
line-height: vww(28);
text-align: center;
- background: url('https://mx.jzeg.cn:9095/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;
@@ -785,7 +1285,7 @@
height: vww(28);
line-height: vww(28);
text-align: center;
- background: url('https://mx.jzeg.cn:9095/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;
@@ -823,7 +1323,7 @@
height: vww(28);
line-height: vww(28);
text-align: center;
- background: url('https://mx.jzeg.cn:9095/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;
@@ -891,10 +1391,34 @@
.fourth-line {
@include fourthLine;
}
+ .fifth-line {
+ height: vww(68);
+ display: flex;
+ align-items: center;
+ justify-content: flex-end;
+ .button-img {
+ width: vww(122);
+ height: vww(41);
+ background: url('https://wrzs.czjlchem.com:9090/appimg/image/banner/button.png') no-repeat;
+ background-size: cover;
+ font-size: 28rpx;
+ font-weight: 300;
+ color: #ffffff;
+ text-align: center;
+ line-height: vww(40);
+
+ }
+ }
}
}
.Reserved {
+ .fourth-line {
+ justify-content: flex-end;
+ letter-spacing: vww(2);
+ left: 223rpx !important;
+ }
+
.white-block {
width: 100%;
height: vww(50);
@@ -910,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