From 74073d164925eff4962188405355debb367aaf06 Mon Sep 17 00:00:00 2001
From: yangan <yangan0921@163.com>
Date: 星期四, 24 十月 2024 18:13:25 +0800
Subject: [PATCH] feat:小问题修改
---
pages/loadUnload-page/orderPlanList/index.vue | 123 ++++++++++++++++++++++++++--------------
1 files changed, 80 insertions(+), 43 deletions(-)
diff --git a/pages/loadUnload-page/orderPlanList/index.vue b/pages/loadUnload-page/orderPlanList/index.vue
index 517212b..e952dd4 100644
--- a/pages/loadUnload-page/orderPlanList/index.vue
+++ b/pages/loadUnload-page/orderPlanList/index.vue
@@ -1,7 +1,11 @@
<template>
<div class="loadUnPage">
<view class="history-numbers">
- <!-- <combined-title title="鍘嗗彶鏀跺彂鍗�"></combined-title> -->
+ <view style="display:flex;" class="top">
+ <combined-title title="褰撳墠鏌ヨ鏀跺彂鍗曪細">
+ </combined-title>
+ <u-tag :text="isYuyue === 1 ? '鏈叆鍦�' : '鍏ㄩ儴'" class="topTag" @click="todoShow"></u-tag>
+ </view>
<scroll-view :scroll-top="scrollTop"
scroll-y="true"
class="scroll-Y">
@@ -11,7 +15,8 @@
iconSize="1000"
text="鏆傛棤鏁版嵁"
v-if="orderPlanList.length == 0"></u-empty>
- <view class="collection-form">
+ <view class="collection-form"
+ >
<!-- <view class="collection-form-item"
v-for="(item, index) in orderPlanList"
:key="index"
@@ -46,7 +51,7 @@
<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">
+ style="width: 24rpx;height: 24rpx;li ne-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.sendDate }}</view>
@@ -59,56 +64,48 @@
:key="index">
<view class="formTop">
<text>{{item.startTime}} ~ {{item.endTime}}</text>
- <view style="marginRight:20rpx">
+ <!-- <view style="marginRight:20rpx">
<text>鍙戣繍鏃ユ湡锛歿{item.sendDate}}</text>
- </view>
+ </view> -->
</view>
<view class="formBottom">
<uni-table border stripe
emptyText="鏆傛棤鏇村鏁版嵁">
<uni-tr>
- <uni-th width='120'
- align="center">鎿嶄綔</uni-th>
- <uni-th align="center" width='120'>浜у搧</uni-th>
+
<uni-th align="center" width='120'>杞︾墝鍙�</uni-th>
- <uni-th align="center" width='200'>浠撳簱</uni-th>
- <uni-th align="center" width='100'>鐨噸</uni-th>
+ <uni-th align="center" width='200'>浜у搧</uni-th>
+ <uni-th align="center" width='80'>浜у搧绛夌骇</uni-th>
+ <uni-th align="center" width='80'>鍖呰绫诲瀷</uni-th>
+ <uni-th align="center" width='90'>璁″垝閲�</uni-th>
+ <uni-th align="center" width='80'>瀹為檯閲�</uni-th>
+ <!-- <uni-th align="center" width='100'>鐨噸</uni-th>
<uni-th align="center" width='100'>姣涢噸</uni-th>
<uni-th align="center" width='100'>鍑�閲�</uni-th>
- <uni-th align="center" width='100'>鏁伴噺</uni-th>
+ <uni-th align="center" width='100'>鏁伴噺</uni-th> -->
<!-- <uni-th align="center">浠撳簱</uni-th> -->
- <!-- <uni-th align="center">鐘舵��</uni-th> -->
+ <uni-th align="center" width='100'>鐘舵��</uni-th>
</uni-tr>
- <uni-tr v-for="(subItem, index2) in item.tmTaskCoalList" :key="index2">
- <uni-td align='center'>
- <u-button text='鏌ョ湅' @click="showMore(subItem)"></u-button>
- </uni-td>
- <uni-td align="center">
- <view>{{ subItem.productName }}</view></uni-td>
- <uni-td>
+ <uni-tr v-for="(subItem, index2) in item.tmTaskCoalList" :key="index2"
+ @click.native="showMore(subItem)"
+ >
+ <uni-td align="center">
<view>{{ subItem.carNo }}</view></uni-td>
- <uni-td>
- <view>{{ subItem.bunkerName }}</view>
- </uni-td>
- <uni-td>
- <view class="name" v-if="subItem.skin">{{ Number(subItem.skin).toFixed(2) || '' }}</view>
- </uni-td>
- <uni-td>
- <view class="name" v-if="subItem.hair"> {{ Number(subItem.hair).toFixed(2) || '' }}</view>
- </uni-td>
- <uni-td>
- <view class="name" v-if="(subItem.clean || (subItem.clean && subItem.clean === 0))">{{ Number(subItem.clean).toFixed(2) || ''}}</view>
- </uni-td>
- <uni-td>
- <view class="name">{{ subItem.productQuantity }}</view>
- </uni-td>
-<!--
- 聽 <uni-td align="center">
- <view>{{ subItem.bunkerName }}</view></uni-td> -->
- <!-- <uni-td align="center">
- <view class="name">{{ subItem.statusView }}</view></uni-td> -->
+ <uni-td align="center">
+ <view>{{ subItem.productName }}</view></uni-td>
+ <uni-td align="center">
+ <view>{{ subItem.productGrade }}</view></uni-td>
+ <uni-td align="center">
+ <view>{{proType[subItem.packingType]}}</view></uni-td>
+ <uni-td align="center">
+ <view>{{ subItem.planMeasure }}</view></uni-td>
+ <uni-td align="center">
+ <view>{{ subItem.productQuantity }}</view></uni-td>
+
+ <uni-td align="center">
+ {{ subItem.statusView }}</uni-td>
</uni-tr>
</uni-table>
@@ -120,7 +117,8 @@
<view class="white-block"></view>
</scroll-view>
</view>
- <tab-bar :current="1"></tab-bar>
+ <u-action-sheet :actions="list" @close='showClose' closeOnClickOverlay :show="show" @select="selectClick"></u-action-sheet>
+ <tab-bar :current="2"></tab-bar>
</div>
</template>
@@ -129,7 +127,22 @@
data() {
return {
orderPlanList:[],
+ proType:['鏁ｈ','娑叉隘鐡惰','缃愯','PVC25','PVC80','PVC1150','PVc1200'],
+ show:false,
+ pageLoading:false,
+ isYuyue :0, //鍏ュ満锛屾湭鍏ュ満
scrollTop:0,
+ list:[
+ {
+ name: '鍏ㄩ儴',
+ value:0
+ },
+ {
+ name:'鏈叆鍦�',
+ value:1
+ },
+
+ ],
historyCoalData: [],
// 琛ㄦ牸鍔犺浇鐘舵��
loading: false,
@@ -154,9 +167,11 @@
//鍒濆鍖�
init(){
console.log('init',localStorage.getItem('bunkerIds'))
- this.$reqGet('getMyPlanListByBunkerId',{bunkerIds:localStorage.getItem('bunkerIds')}).then((res) => {
+ uni.showLoading({ title: '鍔犺浇涓�...' })
+ this.$reqGet('getMyPlanListByBunkerId',{bunkerIds:localStorage.getItem('bunkerIds'),isYuyue:this.isYuyue,productIds:uni.getStorageSync('productIds') }).then((res) => {
console.log(res,'res')
this.orderPlanList = res.data;
+ uni.hideLoading();
})
},
faYundetail(v) {
@@ -169,6 +184,18 @@
url: `/subPages/fayunPlanDetails/fayunPlanMore/fayunPlanMore?orderPlanId=${this.orderPlanId}&id=${item.id}&orderType=${item.orderType}`
});
},
+ todoShow(){
+ this.show = true;
+ },
+ selectClick(item){
+ console.log(item,'item')
+ this.isYuyue = item.value;
+ this.init();
+ this.show = false;
+ },
+ showClose(){
+ this.show = false;
+ }
},
computed:{
bunkerIds(){
@@ -185,6 +212,14 @@
</script>
<style lang="scss" scoped>
+ .top{
+ position: relative;
+ }
+ .topTag{
+ position: absolute;
+ left: calc(100% - (100% - 140px));
+ top: 20%;
+ }
.five-line{
height: 50rpx;
line-height: 24rpx;
@@ -213,11 +248,13 @@
height: 100%;
margin-top: 10rpx;
display:flex;
- justify-content: center;
+ align-items: center;
+ // justify-content: center;
+ flex-direction: column;
.collection-form-item{
width: 95%;
- height: 400rpx;
box-shadow: 0 2px 12px 0 rgba(0, 0, 0, .1);
+ margin: 20rpx 0;
.formTop{
width: 100%;
height: 100rpx;
--
Gitblit v1.9.1