From 87a9e71e1d768a1a6471e059109579518fe16271 Mon Sep 17 00:00:00 2001
From: yangan <yangan0921@163.com>
Date: 星期四, 25 七月 2024 08:46:23 +0800
Subject: [PATCH] fix:库管首页异常
---
pages/doorkeeper-page/doorkeeper-index/doorkeeper-index.vue | 350 ++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 267 insertions(+), 83 deletions(-)
diff --git a/pages/doorkeeper-page/doorkeeper-index/doorkeeper-index.vue b/pages/doorkeeper-page/doorkeeper-index/doorkeeper-index.vue
index 7e3f1f2..318a78b 100644
--- a/pages/doorkeeper-page/doorkeeper-index/doorkeeper-index.vue
+++ b/pages/doorkeeper-page/doorkeeper-index/doorkeeper-index.vue
@@ -4,27 +4,44 @@
<u-search @change="change" :searchIconSize="40" placeholder="璇疯緭鍏ヨ溅鐗屽彿" height="80" clearabled v-model="carNo" @search="search" @custom="custom" @clear="clear" >
</u-search >
</view>
- <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-th align="center">棰勭害鏃堕棿娈�</uni-th>
- <uni-th align="center">鎿嶄綔</uni-th>
- </uni-tr>
- <uni-tr v-for="(item, index) in driverBillOfLoadingData"
- :key="item.id">
- <uni-td align="center">{{ item.driver }}</uni-td>
- <uni-td align="center">{{ item.productName || '' }}</uni-td>
- <uni-td align="center">{{ item.carNo || '' }}</uni-td>
- <uni-td align="center">{{ item.phone || '' }}</uni-td>
- <uni-td align="center">{{ item.startTime || '' }}-{{item.endTime || ""}}</uni-td>
- <uni-td>
+ <view style="position: relative;top: -120px;">
+ <u-empty mode="data"
+ icon="http://cdn.uviewui.com/uview/empty/data.png"
+ textSize="30"
+ iconSize="1000"
+ text="鏆傛棤杞﹁締"
+ v-if="driverBillOfLoadingData.length == 0"></u-empty>
+ </view>
+ <view class="collection-form">
+ <view class="collection-form-item"
+ v-for="(item, index) in driverBillOfLoadingData"
+ :key="index">
+ <view class="first-line">
+ <view class="dispatch-receive">
+ <view class="dispatch-dept">{{ item.carNo || '' }}</view>
+ <view class="black-bar"></view>
+ <view class="dispatch">{{ item.driver ||'' }}</view>
+ </view>
+ <view class="point-number">
+ <text class="residue">{{ item.productNames || '' }}</text>
+ </view>
+ </view>
+ <view class="second-line">
+ <view class="coal-name">
+ <text>{{ item.phone || '' }}</text>
+ </view>
+ </view>
+ <view class="third-line">
+ <view class="time-icon">
+ <view
+ style="width: 24rpx;height: 24rpx;li ne-height: 24rpx;background: url('https://mx.jzeg.cn:9096/appimg/image/banner/clock.png') no-repeat;background-size: cover">
+ </view>
+ </view>
+ <view class="send-date">{{ item.sendDate }} {{ item.startTime || '' }}-{{item.endTime || ""}}</view>
+ </view>
+ <view class="fourth-line">
<view class="buttons">
- <u-button text="鏌ョ湅杩愯緭璇�"
+ <u-button text="鏌ョ湅"
type="primary"
class="buttonitem"
v-if="item.roadTransportId"
@@ -34,9 +51,9 @@
class="buttonitem"
@click="yuYueBtnClick(item)"></u-button>
</view>
- </uni-td>
- </uni-tr>
- </uni-table>
+ </view>
+ </view>
+ </view>
<u-popup :show="imgshow"
@close="closeimg"
@open="openimg"
@@ -45,12 +62,19 @@
<view class="imgrPopup">
<u--image :showLoading="true"
:src="certificateImg != null ? BaseUrl + certificateImg : ''"
- width="500rpx"
+ width="700rpx"
height="400rpx"
@click="imageClick(certificateImg)">
<view slot="error"
style="font-size: 24rpx;">鍔犺浇澶辫触</view>
</u--image>
+ <view class="driveruser">
+ <view>鍙告満锛歿{ysData.driverName}}</view>
+ </view>
+ <view class="driveruser">
+ <view>鎶艰繍鍛橈細{{ysData.supercargoInfo?ysData.supercargoInfo.split("|")[0]:null}}</view>
+ <view>鎵嬫満鍙凤細{{ysData.supercargoInfo?ysData.supercargoInfo.split("|")[2]:null}}</view>
+ </view>
</view>
</u-popup>
<view class="previewImage-container">
@@ -59,8 +83,8 @@
@close="previewImageClose"
@open="previewImageOpen">
<u--image :src="previewImageSrc != null ? BaseUrl + previewImageSrc : ''"
- width="400px"
- height="400px"></u--image>
+ width="750rpx"
+ height="800rpx"></u--image>
</u-popup>
</view>
<u-popup :show="show"
@@ -89,13 +113,31 @@
:loading="ClickLoading"></u-button></view>
</view>
</u-popup>
+ <view class="logoutModel">
+ <u-modal :show="logoutShow"
+ :title="logoutTitle"
+ showCancelButton
+ :content="logoutContent"
+ @confirm="logoutConfirm"
+ @cancel="logoutCancel"></u-modal>
+ </view>
+ <view class="falseModel">
+ <u-modal :show="falseShow"
+ :title="logoutTitle"
+ showCancelButton
+ :content="logoutContent"
+ @confirm="falseConfirm"
+ @cancel="falseCancel"></u-modal>
+ </view>
</view>
</template>
<script>
import { BaseUrl } from '@/api/publicInterface.js';
+ import previewImage from '@/components/kxj-previewImage/kxj-previewImage.vue';
export default {
components: {
+ previewImage,
},
data() {
return {
@@ -110,18 +152,77 @@
imgshow:false,
ClickLoading:false,
certificateImg:"",
- previewImageSrc:""
+ logoutShow: false,
+ falseShow:false,
+ logoutTitle: '鎻愮ず',
+ logoutContent: '鏄惁妫�鏌ュ畬姣�',
+ previewImageSrc:"",
+ ysData:{}
}
},
onShow() {
this.init();
},
methods: {
- imageClick(data) {
- this.previewImageSrc = data;
- this.$nextTick(() => {
- this.previewImageShow = true;
- });
+ falseConfirm(){
+ this.inspectData=[]
+ uni.showLoading({ title: '鍔犺浇涓�...' });
+ this.$reqPost('addCheckLog',{
+ carNo:this.form.carNo,
+ taskId:this.form.id,
+ taskcode:this.form.code,
+ }, 'json').then(res => {
+ if (res.code === 0) {
+ uni.$u.toast('妫�鏌ユ垚鍔�')
+ this.form={}
+ this.ClickLoading = false;
+ this.show = false;
+ this.TaskCoalList()
+ this.falseShow = false;
+ } else {
+ uni.$u.toast(res.msg ? res.msg : '妫�鏌ュけ璐�')
+ this.falseShow = false;
+ }
+ })
+ },
+ logoutConfirm() {
+ if(this.isAllSelected==true){
+ this.ClickLoading = true;
+ this.inspectData=this.inspectData.map(item=>{
+ return {
+ ...item,
+ valve:"閫氳繃"
+ }
+ })
+ uni.showLoading({ title: '鍔犺浇涓�...' });
+ this.$reqPost('addCheckLog',{
+ carNo:this.form.carNo,
+ taskId:this.form.id,
+ taskcode:this.form.code,
+ inspectedResult:JSON.stringify(this.inspectData)
+ }, 'json').then(res => {
+ if (res.code === 0) {
+ uni.$u.toast('妫�鏌ユ垚鍔�')
+ this.form={}
+ this.ClickLoading = false;
+ this.inspectData=[]
+ this.show = false;
+ this.logoutShow = false;
+ this.TaskCoalList()
+ } else {
+ uni.$u.toast(res.msg ? res.msg : '妫�鏌ュけ璐�')
+ this.logoutShow = false;
+ }
+ })
+ }else{
+ uni.$u.toast('蹇呴』鍏ㄩ儴妫�娴�')
+ }
+ },
+ logoutCancel() {
+ this.logoutShow = false;
+ },
+ falseCancel() {
+ this.falseShow = false;
},
previewImageClose() {
this.previewImageShow = false;
@@ -136,6 +237,7 @@
lookRoad(item){
this.$reqGetId('getById', item.roadTransportId).then(res => {
this.certificateImg=res.data.certificateImg
+ this.ysData=res.data
this.imgshow=true
});
},
@@ -176,24 +278,8 @@
this.form=item
this.show = true;
}else{
- this.inspectData=[]
+ this.falseShow = true;
this.form=item
- uni.showLoading({ title: '鍔犺浇涓�...' });
- this.$reqPost('addCheckLog',{
- carNo:this.form.carNo,
- taskId:this.form.id,
- taskcode:this.form.code,
- }, 'json').then(res => {
- if (res.code === 0) {
- uni.$u.toast('妫�鏌ユ垚鍔�')
- this.form={}
- this.ClickLoading = false;
- this.show = false;
- this.TaskCoalList()
- } else {
- uni.$u.toast(res.msg ? res.msg : '妫�鏌ュけ璐�')
- }
- })
}
}
@@ -210,35 +296,7 @@
this.certificateImg=""
},
popClick() {
- if(this.isAllSelected==true){
- this.ClickLoading = true;
- this.inspectData=this.inspectData.map(item=>{
- return {
- ...item,
- valve:"閫氳繃"
- }
- })
- uni.showLoading({ title: '鍔犺浇涓�...' });
- this.$reqPost('addCheckLog',{
- carNo:this.form.carNo,
- taskId:this.form.id,
- taskcode:this.form.code,
- inspectedResult:JSON.stringify(this.inspectData)
- }, 'json').then(res => {
- if (res.code === 0) {
- uni.$u.toast('妫�鏌ユ垚鍔�')
- this.form={}
- this.ClickLoading = false;
- this.inspectData=[]
- this.show = false;
- this.TaskCoalList()
- } else {
- uni.$u.toast(res.msg ? res.msg : '妫�鏌ュけ璐�')
- }
- })
- }else{
- uni.$u.toast('蹇呴』鍏ㄩ儴妫�娴�')
- }
+ this.logoutShow = true;
},
open() {},
close() {
@@ -258,28 +316,27 @@
this.$reqGet('getCheckTaskCoal',{flag:0}).then(res => {
uni.hideLoading();
this.driverBillOfLoadingData = res.data;
+ uni.stopPullDownRefresh();
});
}else{
this.$reqGet('getCheckTaskCoal',{flag:0,carNo:this.carNo}).then(res => {
uni.hideLoading();
this.driverBillOfLoadingData = res.data;
+ uni.stopPullDownRefresh();
});
}
},
change(res) {
- console.log(res)
},
search(res) {
- console.log(res)
this.TaskCoalList()
},
clear(res) {
this.carNo=""
},
custom(res) {
- console.log(res)
}
}
};
@@ -294,8 +351,12 @@
}
}
.imgrPopup{
- width: 500rpx;
- height: 400rpx;
+ width: 700rpx;
+ background-color: #ffffff;
+ .driveruser{
+ display: flex;
+ justify-content: space-between
+ }
}
.receiverPopup {
height: vww(110);
@@ -401,4 +462,127 @@
width: 30%;
}
}
+ @mixin flex {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ }
+ .collection-form-item {
+ margin: 0 vww(15);
+ width: 690rpx;
+ height: 370rpx;
+ background: #ffffff;
+ box-shadow: 4rpx 6rpx 25rpx 0rpx rgba(73, 120, 240, 0.15);
+ border-radius: 20rpx;
+ overflow: hidden;
+ @include flex;
+ flex-direction: column;
+ position: relative;
+ align-items: flex-start;
+ margin-top: vww(10);
+
+ .first-line {
+ width: 94%;
+ height: vww(30);
+ margin: vww(10) vww(16) 0 vww(16);
+ display: flex;
+ justify-content: space-between;
+
+ .dispatch-receive {
+ width: 70%;
+ display: flex;
+ justify-content: flex-start;
+ align-items: center;
+
+ .dispatch-dept {
+
+ display: flex;
+ align-items: center;
+ }
+
+ .black-bar {
+ width: 2rpx;
+ height: 30rpx;
+ background: #515151;
+ margin-left: vww(12);
+ }
+
+ .dispatch {
+ margin-left: vww(12);
+ min-width: vww(50);
+ }
+
+ }
+
+ .point-number {
+ width: 15%;
+
+ text {
+ font-size: 24rpx;
+ font-weight: 400;
+ color: #c78a64;
+ }
+
+ .residue {
+ font-size: 40rpx;
+ font-weight: 400;
+ color: #f81414;
+ }
+ }
+ }
+
+ .second-line {
+ width: 100%;
+ height: vww(30);
+ margin-left: vww(16);
+ display: flex;
+ align-items: center;
+ justify-content: flex-start;
+
+ .coal-name {
+ flex-grow: 1;
+ height: 30rpx;
+ font-size: 30rpx;
+ font-weight: 300;
+ color: #515151;
+ position: relative;
+ display: flex;
+ align-items: center;
+
+ .black-bar {
+ width: 2rpx;
+ height: 30rpx;
+ background: #515151;
+ margin-left: vww(12);
+ }
+
+ .coal-type {
+ margin-left: vww(12);
+ min-width: vww(50);
+ height: 30rpx;
+ line-height: 30rpx;
+ font-size: 30rpx;
+ font-weight: 300;
+ color: #515151;
+ }
+ }
+ }
+
+ .third-line {
+ height: vww(30);
+ margin-left: vww(15);
+ display: flex;
+ justify-content: flex-start;
+ align-items: center;
+
+ .send-date {
+ margin-left: vww(14);
+ height: 24rpx;
+ line-height: 24rpx;
+ font-size: 28rpx;
+ font-weight: 300;
+ color: #515151;
+ }
+ }
+ }
</style>
\ No newline at end of file
--
Gitblit v1.9.1