From 5c63b1fccedfcd208f3434edb79926c206c3d26f Mon Sep 17 00:00:00 2001
From: yangan <yangan0921@163.com>
Date: 星期二, 29 四月 2025 14:52:35 +0800
Subject: [PATCH] feat:增加类型显示
---
pages/doorkeeper-page/doorkeeper-index/doorkeeper-index.vue | 115 ++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 100 insertions(+), 15 deletions(-)
diff --git a/pages/doorkeeper-page/doorkeeper-index/doorkeeper-index.vue b/pages/doorkeeper-page/doorkeeper-index/doorkeeper-index.vue
index d511300..851a30c 100644
--- a/pages/doorkeeper-page/doorkeeper-index/doorkeeper-index.vue
+++ b/pages/doorkeeper-page/doorkeeper-index/doorkeeper-index.vue
@@ -30,6 +30,7 @@
<view class="dispatch-dept">{{ item.code || '' }}</view>
<view class="black-bar"></view>
<view class="dispatch">{{ item.customerName ||'' }}</view>
+ <view class="dispatch-dept">{{ item.orderType || '' }}</view>
</view>
<view class="point-number">
<text class="order-type">{{ item.productNames?limitString(item.productNames,20,'...'):'' || '' }}</text>
@@ -109,6 +110,7 @@
<view class="dispatch-dept">{{ item.coalName || '' }}</view>
<view class="black-bar"></view>
<view class="dispatch">{{ item.customerName ||'' }}</view>
+ <view class="dispatch-dept">{{ item.orderType || '' }}</view>
</view>
<view class="point-number">
<text class="order-type">{{ item.productNames?limitString(item.productNames,20,'...'):'' || '' }}</text>
@@ -145,11 +147,12 @@
:key="index">
<view class="first-line">
<view class="dispatch-receive">
- <view class="point-number">
- <text class="order-type">{{ item.coalName?limitString(item.coalName,20,'...'):'' || '' }}</text>
- </view>
+ <view class="dispatch-dept">{{ item.code || '' }}</view>
<view class="black-bar"></view>
- <view class="dispatch-dept">{{ item.remark || '' }}</view>
+ <view class="dispatch">{{ item.customerName ||'' }}</view>
+ </view>
+ <view class="point-number">
+ <text class="order-type">{{ item.productNames?limitString(item.productNames,20,'...'):'' || '' }}</text>
</view>
</view>
<view class="second-line">
@@ -159,6 +162,8 @@
<view class="dispatch">{{ item.driver ||'' }}</view>
<view class="black-bar"></view>
<text>{{ item.phone || '' }}</text>
+ <view class="black-bar"></view>
+ <view class="dispatch-dept">{{ item.orderType || '' }}</view>
</view>
</view>
<view class="third-line">
@@ -167,7 +172,7 @@
style="width: 24rpx;height: 24rpx;line-height: 24rpx;background: url('https://wrzs.czjlchem.com:9090/appimg/image/banner/clock.png') no-repeat;background-size: cover">
</view>
</view>
- <view class="send-date">{{ item.inTime?item.inTime.slice(10,19):null }} </view>
+ <view class="send-date">{{ item.inInspectedTime?item.inInspectedTime.slice(10,19):null }} </view>
</view>
<view class="fourth-line">
<view class="receive"
@@ -213,6 +218,33 @@
height="800rpx"></u--image>
</u-popup>
</view>
+ <u-popup :show="doorshow"
+ @close="doorclose"
+ @open="dooropen"
+ mode="center"
+ :closeOnClickOverlay='false'
+ round="10">
+ <view class="doorPopup">
+ <view class="doorRadio">
+ <u-radio-group v-model="door"
+ placement="row"
+ size="30"
+ shape="circle"
+ iconSize="20">
+ <u-radio labelSize="14px"
+ size="20px"
+ v-for="(item, index) in doorList"
+ :key="index"
+ :label="item.label"
+ :name="item.name"></u-radio>
+ </u-radio-group>
+ </view>
+ <view class="doorPopup__btn"><u-button text="纭畾"
+ type="primary"
+ @click="doorClick"
+ ></u-button></view>
+ </view>
+ </u-popup>
<u-popup :show="show"
@close="close"
@open="open"
@@ -276,9 +308,26 @@
},
data() {
return {
+ doorList: [{
+ name: 2,
+ label: '2鍙烽棬',
+ },
+ {
+ name: 3,
+ label: '3鍙烽棬',
+ }
+ ],
+ door:2,
+ doorshow:true,
temporaryPlanId:"",
show: false, // 寮瑰嚭鍏ㄩ儴棰嗗彇鎻愮ず
- driverBillOfLoadingData:[],
+ driverBillOfLoadingData:[
+ {
+ carNo:'鍐�A99999',
+ orderType:'澶栬喘'
+ }
+
+ ],
driverBillOfLoadingDatas:[],
driverTemporaryEntry:[],
inspectData:[],
@@ -370,7 +419,7 @@
inspectedResult:JSON.stringify(this.inspectData)
}, 'json').then(res => {
if (res.code === 0) {
- uni.$u.toast('妫�鏌ユ垚鍔�')
+ this.$u.toast('妫�鏌ユ垚鍔�')
this.form={}
this.ClickLoading = false;
this.inspectData=[]
@@ -378,12 +427,15 @@
this.logoutShow = false;
this.TaskCoalList()
} else {
- uni.$u.toast(res.msg ? res.msg : '妫�鏌ュけ璐�')
+ this.ClickLoading = false;
+ this.show = false;
this.logoutShow = false;
+ this.$u.toast(res.msg || '妫�鏌ュけ璐�')
+
}
})
}else{
- uni.$u.toast('蹇呴』鍏ㄩ儴妫�娴�')
+ this.$u.toast('蹇呴』鍏ㄩ儴妫�娴�')
}
},
logoutCancel() {
@@ -465,13 +517,24 @@
},
init() {
this.isAllSelected=false
- this.TaskCoalList();
this.form={}
this.inspectData=[]
this.certificateImg=""
+ if(uni.getStorageSync('door', this.door)){
+ this.TaskCoalList();
+ }
},
popClick() {
this.logoutShow = true;
+ },
+ doorClick(){
+ this.TaskCoalList();
+ this.doorshow = false;
+ uni.setStorageSync('door', this.door);
+ },
+ dooropen() {},
+ doorclose() {
+ this.doorshow = false;
},
open() {},
close() {
@@ -487,9 +550,9 @@
title: '鍔犺浇涓�...'
});
if(!this.carNo){
- this.$reqGet('getCheckTaskCoal',{flag:0}).then(res => {
+ this.$reqGet('getCheckTaskCoal',{flag:0,door:this.door}).then(res => {
uni.hideLoading();
- this.driverBillOfLoadingData = res.data;
+ // this.driverBillOfLoadingData = res.data;
uni.stopPullDownRefresh();
this.handleOpenChange();
});
@@ -500,7 +563,7 @@
this.handleOpenChange();
});
}else{
- this.$reqGet('getCheckTaskCoal',{flag:0,carNo:this.carNo}).then(res => {
+ this.$reqGet('getCheckTaskCoal',{flag:0,carNo:this.carNo,door:this.door}).then(res => {
uni.hideLoading();
this.driverBillOfLoadingData = res.data;
uni.stopPullDownRefresh();
@@ -514,14 +577,14 @@
});
}
if(!this.carNo){
- this.$reqGet('getAlreadyCheckTaskCoal',{flag:0}).then(res => {
+ this.$reqGet('getAlreadyCheckTaskCoal',{flag:0,door:this.door}).then(res => {
uni.hideLoading();
this.driverBillOfLoadingDatas = res.data;
uni.stopPullDownRefresh();
this.handleOpenChange();
});
}else{
- this.$reqGet('getAlreadyCheckTaskCoal',{flag:0,carNo:this.carNo}).then(res => {
+ this.$reqGet('getAlreadyCheckTaskCoal',{flag:0,carNo:this.carNo,door:this.door}).then(res => {
uni.hideLoading();
this.driverBillOfLoadingDatas = res.data;
uni.stopPullDownRefresh();
@@ -559,6 +622,27 @@
justify-content: space-between
}
}
+
+ .doorPopup{
+ height: vww(123);
+ width: 60vw;
+ display: flex;
+ flex-direction: column;
+ justify-content: space-evenly;
+ align-items:center;
+ .doorPopup__btn {
+ font-size: 1.4vw;
+ margin: vww(10) auto 0;
+ width: 80%;
+ text-align: center;
+ margin: vww(10) auto;
+ width: 50%;
+
+ .u-button {
+ height: vww(20);
+ }
+ }
+ }
.receiverPopup {
height: vww(153);
width: 60vw;
@@ -594,6 +678,7 @@
box-shadow: 2rpx 3rpx 13rpx 0rpx rgba(43, 98, 239, 0.5), 0rpx 0rpx 9rpx 0rpx rgba(247, 250, 253, 0.29);
}
::v-deep.appointment {
+ margin-bottom: vww(100);
.appointment-description {
margin: vww(8) 0;
color: #fd1446;
--
Gitblit v1.9.1