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/exit-index.vue | 345 +++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 295 insertions(+), 50 deletions(-)
diff --git a/pages/doorkeeper-page/doorkeeper-index/exit-index.vue b/pages/doorkeeper-page/doorkeeper-index/exit-index.vue
index fa0fd82..18f018d 100644
--- a/pages/doorkeeper-page/doorkeeper-index/exit-index.vue
+++ b/pages/doorkeeper-page/doorkeeper-index/exit-index.vue
@@ -1,44 +1,88 @@
<template>
<view class="appointment">
- <view class="wait-collection"
- style="background: url('https://mx.jzeg.cn:9096/appimg/image/banner/diverbanner.png') no-repeat;background-size:contain">
+ <view class="searchview">
+ <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-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><u-button text="閫夋嫨"
- type="primary"
- @click="yuYueBtnClick(item)"></u-button></uni-td>
- </uni-tr>
- </uni-table>
+ <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="妫�鏌�"
+ type="primary"
+ @click="yuYueBtnClick(item)"></u-button>
+ </view>
+ </view>
+ </view>
+ </view>
<u-popup :show="show"
@close="close"
@open="open"
mode="center"
round="10">
<view class="receiverPopup">
+ <uni-table border
+ stripe
+ type="selection"
+ @selection-change="selectionChange"
+ emptyText="鏆傛棤鏇村鏁版嵁">
+ <uni-tr>
+ <uni-th align="center">妫�娴嬮」</uni-th>
+ </uni-tr>
+ <uni-tr v-for="(item, index) in inspectData"
+ :key="item.id">
+ <uni-td align="center">{{ item.title }}</uni-td>
+ </uni-tr>
+ </uni-table>
<view class="receiverPopup__title"><text>纭畾妫�鏌ュ畬姣�</text></view>
<view class="receiverPopup__btn"><u-button text="纭畾"
type="primary"
@click="popClick"
- :disabled="canClick"
:loading="ClickLoading"></u-button></view>
</view>
</u-popup>
<tab-bar :current="1"></tab-bar>
+ <view class="logoutModel">
+ <u-modal :show="logoutShow"
+ :title="logoutTitle"
+ showCancelButton
+ :content="logoutContent"
+ @confirm="logoutConfirm"
+ @cancel="logoutCancel"></u-modal>
+ </view>
</view>
</template>
@@ -50,8 +94,14 @@
return {
show: false, // 寮瑰嚭鍏ㄩ儴棰嗗彇鎻愮ず
driverBillOfLoadingData:[],
+ inspectData:[],
isAllSelected:false,
form:{},
+ carNo:'',
+ logoutShow: false,
+ logoutTitle: '鎻愮ず',
+ logoutContent: '鏄惁妫�鏌ュ畬姣�',
+ previewImageSrc:"",
ClickLoading:false
}
},
@@ -59,33 +109,74 @@
this.init();
},
methods: {
+ logoutConfirm() {
+
+ 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.TaskCoalList()
+ this.logoutShow = false;
+ } else {
+ uni.$u.toast(res.msg ? res.msg : '妫�鏌ュけ璐�')
+ this.logoutShow = false;
+ }
+ })
+ },
+ logoutCancel() {
+ this.logoutShow = false;
+ },
yuYueBtnClick(item){
+ this.logoutShow = true;
+ this.inspectData=[]
this.form=item
- this.show = true;
+ },
+ selectionChange(items){
+ const allIds = this.inspectData.map(item => item);
+ this.isAllSelected = items?.detail.index.length === allIds.length
},
init() {
this.isAllSelected=false
this.TaskCoalList();
this.form={}
+ this.inspectData=[]
},
popClick() {
- this.ClickLoading = true;
- 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 : '妫�鏌ュけ璐�')
- }
- })
+ 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('蹇呴』鍏ㄩ儴妫�娴�')
+ }
},
open() {},
close() {
@@ -96,17 +187,49 @@
uni.showLoading({
title: '鍔犺浇涓�...'
});
- this.$reqGet('getCheckTaskCoal',{flag:1}).then(res => {
- uni.hideLoading();
- this.driverBillOfLoadingData = res.data;
- });
+ if(!this.carNo){
+ this.$reqGet('getCheckTaskCoal',{flag:1}).then(res => {
+ uni.hideLoading();
+ this.driverBillOfLoadingData = res.data;
+ uni.stopPullDownRefresh();
+ });
+ }else{
+ this.$reqGet('getCheckTaskCoal',{flag:1,carNo:this.carNo}).then(res => {
+ uni.hideLoading();
+ this.driverBillOfLoadingData = res.data;
+ uni.stopPullDownRefresh();
+ });
+ }
},
+ onPullDownRefresh() {
+ this.TaskCoalList()
+ },
+ change(res) {
+ console.log(res)
+ },
+ search(res) {
+ console.log(res)
+ this.TaskCoalList()
+ },
+ clear(res) {
+ this.carNo=""
+ },
+ custom(res) {
+ console.log(res)
+ }
}
};
</script>
<style lang="scss" scoped>
+ .searchview{
+ margin: 20rpx 0;
+ height: 200rpx;
+ u-search{
+ width: 100rpx;
+ }
+ }
.receiverPopup {
height: vww(110);
width: 300rpx;
@@ -127,10 +250,6 @@
}
}
}
- .wait-collection {
- width: 100%;
- height: 600rpx;
- }
::v-deep.appointment {
.appointment-description {
margin: vww(8) 0;
@@ -203,4 +322,130 @@
}
}
}
+ .wait-appointment,
+ .Reserved {
+ position: relative;
+ top: vww(-120);
+ }
+ @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