From a79e6ae6d20c60f813234c94461a305101e15c92 Mon Sep 17 00:00:00 2001
From: yangan <yangan0921@163.com>
Date: 星期三, 22 一月 2025 16:03:01 +0800
Subject: [PATCH] feat:库管日计划修改显示
---
pages/loadUnload-page/orderPlanList/index.vue | 99 ++++++++++++++++++++++++++++++-------------------
1 files changed, 60 insertions(+), 39 deletions(-)
diff --git a/pages/loadUnload-page/orderPlanList/index.vue b/pages/loadUnload-page/orderPlanList/index.vue
index e400bcd..ba962ec 100644
--- a/pages/loadUnload-page/orderPlanList/index.vue
+++ b/pages/loadUnload-page/orderPlanList/index.vue
@@ -1,11 +1,6 @@
<template>
<div class="loadUnPage">
<view class="history-numbers">
- <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">
@@ -51,7 +46,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>
@@ -63,10 +58,17 @@
v-for="(item, index) in orderPlanList"
:key="index">
<view class="formTop">
- <text>{{item.startTime}} ~ {{item.endTime}}</text>
+ <!-- <text>{{item.startTime}} ~ {{item.endTime}}</text> -->
<!-- <view style="marginRight:20rpx">
<text>鍙戣繍鏃ユ湡锛歿{item.sendDate}}</text>
</view> -->
+ <view>瀹㈡埛鍚嶇О锛歿{ item.customerName }}</view>
+ <view>璁㈠崟缂栧彿锛歿{ item.orderCode }}</view>
+ <view>浜у搧锛歿{ $store.state.pvcIdList.includes(item.productId) ? item.productName :item.productNames }}</view>
+ <view>鍖呰绫诲瀷锛� {{proType[item.packingType]}}</view>
+ <view>璁″垝杞︽暟锛歿{ item.carNum }}</view>
+ <view>棰嗗彇杞︽暟锛歿{ item.lingNum }}</view>
+ <view v-if="$store.state.pvcIdList.includes(item.productId)">鏃ヨ鍒掓�婚噺锛歿{ item.pvcPlanMeasure }}</view>
</view>
<view class="formBottom">
<uni-table border stripe
@@ -74,32 +76,37 @@
<uni-tr>
<uni-th align="center" width='120'>杞︾墝鍙�</uni-th>
- <uni-th align="center" width='200'>浜у搧</uni-th>
- <uni-th align="center" width='140'>浠撳簱</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">浠撳簱</uni-th> -->
- <uni-th align="center">鐘舵��</uni-th>
+ <uni-th align="center" width='100'>鐘舵��</uni-th>
+ <uni-th align="center" width='100'>绉伴噸鏂瑰紡</uni-th>
</uni-tr>
- <uni-tr v-for="(subItem, index2) in item.tmTaskCoalList" :key="index2"
- @click.native="showMore(subItem)"
+ <uni-tr v-for="(subItem, index2) in item.tmTaskCoals" :key="index2"
>
<uni-td align="center">
<view>{{ subItem.carNo }}</view></uni-td>
- <uni-td align="center">
- <view>{{ subItem.productName }}</view></uni-td>
-
- <uni-td align="center">
- <view>{{ subItem.bunkerName }}</view>
- </uni-td>
-
+ <uni-td align="center">
+ <!-- subItem.planMeasure != void 0 ? subItem.planMeasure.toFixed(4) : '' -->
+ <view>{{ subItem.planMeasure}}</view></uni-td>
+ <uni-td align="center">
+ <!-- subItem.productQuantity != void 0 ? subItem.productQuantity.toFixed(4) : '' -->
+ <view>{{subItem.productQuantity }}</view></uni-td>
<uni-td align="center">
- <view class="name">{{ subItem.statusView }}</view></uni-td>
+ {{ subItem.statusView }}</uni-td>
+ <uni-td align="right">
+ <u-tag :text="'璁℃暟'" plain v-if="subItem.isWeight==0"></u-tag>
+ <u-tag :text="'绉伴噸'" plain v-else-if="subItem.isWeight==1"></u-tag>
+ <u-tag :text="'绉伴噸璁℃暟'" plain v-else-if="subItem.isWeight==2"></u-tag>
+ <u-tag v-else></u-tag></uni-td>
+
</uni-tr>
</uni-table>
@@ -112,7 +119,7 @@
</scroll-view>
</view>
<u-action-sheet :actions="list" @close='showClose' closeOnClickOverlay :show="show" @select="selectClick"></u-action-sheet>
- <tab-bar :current="1"></tab-bar>
+ <tab-bar :current="2"></tab-bar>
</div>
</template>
@@ -121,19 +128,21 @@
data() {
return {
orderPlanList:[],
+ proType:['鏁ｈ','娑叉隘鐡惰','缃愯','PVC25','PVC80','PVC1150','PVc1200'],
show:false,
pageLoading:false,
- isYuyue :1, //鍏ュ満锛屾湭鍏ュ満
+ isYuyue :0, //鍏ュ満锛屾湭鍏ュ満
scrollTop:0,
list:[
+ {
+ name: '鍏ㄩ儴',
+ value:0
+ },
{
name:'鏈叆鍦�',
value:1
},
- {
- name: '宸插叆鍦�',
- value:0
- }
+
],
historyCoalData: [],
// 琛ㄦ牸鍔犺浇鐘舵��
@@ -160,9 +169,19 @@
init(){
console.log('init',localStorage.getItem('bunkerIds'))
uni.showLoading({ title: '鍔犺浇涓�...' })
- this.$reqGet('getMyPlanListByBunkerId',{bunkerIds:localStorage.getItem('bunkerIds'),isYuyue:this.isYuyue}).then((res) => {
- console.log(res,'res')
- this.orderPlanList = res.data;
+ this.$reqGet('getMyPlanListByBunkerIdsAndProductIds',{bunkerIds:localStorage.getItem('bunkerIds'),productIds:uni.getStorageSync('productIds') }).then((res) => {
+ this.orderPlanList = res.data.map(item=>{
+ item.tmTaskCoals && item.tmTaskCoals.map(el=>{
+ if(el.planMeasure != void 0 && el.planMeasure != ""){
+ console.log(el,'el')
+ el.planMeasure = el.planMeasure.toFixed(4);
+ }
+ if(el.productQuantity != void 0 && el.productQuantity != ""){
+ el.productQuantity = el.productQuantity.toFixed(4);
+ }
+ })
+ return item
+ });
uni.hideLoading();
})
},
@@ -245,20 +264,22 @@
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;
- background: linear-gradient(-2deg, #ffffff 0%, #0055fe 100%);
- font-size: 40rpx;
- display: flex;
- align-items: center;
- justify-content: space-between;
- font-weight: bold;
- color: #fff;
- text-indent: 20rpx;
+ height: 300rpx;
+ padding: 10rpx;
+ line-height:45rpx;
+ padding-left: 20rpx;
+ // background: linear-gradient(-2deg, #ffffff 0%, #0055fe 100%);
+ // font-size: 40rpx;
+ // display: flex;
+ // align-items: center;
+ // justify-content: space-between;
+ // font-weight: bold;
+ // color: #fff;
+ // text-indent: 20rpx;
}
}
/deep/ .uni-table{
--
Gitblit v1.9.1