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 | 446 +++++++++++++++++++------------------------------------
1 files changed, 157 insertions(+), 289 deletions(-)
diff --git a/pages/loadUnload-page/orderPlanList/index.vue b/pages/loadUnload-page/orderPlanList/index.vue
index d6ebcd8..ba962ec 100644
--- a/pages/loadUnload-page/orderPlanList/index.vue
+++ b/pages/loadUnload-page/orderPlanList/index.vue
@@ -1,7 +1,6 @@
<template>
<div class="loadUnPage">
<view class="history-numbers">
- <!-- <combined-title title="鍘嗗彶鏀跺彂鍗�"></combined-title> -->
<scroll-view :scroll-top="scrollTop"
scroll-y="true"
class="scroll-Y">
@@ -11,8 +10,9 @@
iconSize="1000"
text="鏆傛棤鏁版嵁"
v-if="orderPlanList.length == 0"></u-empty>
- <view class="collection-form">
- <view class="collection-form-item"
+ <view class="collection-form"
+ >
+ <!-- <view class="collection-form-item"
v-for="(item, index) in orderPlanList"
:key="index"
@click="faYundetail(item)">
@@ -46,12 +46,71 @@
<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>
</view>
+ </view> -->
+ <!-- 鏃堕棿鐐� ======= 鎻愮叅鍗� -->
+ <view class="collection-form-item"
+ v-for="(item, index) in orderPlanList"
+ :key="index">
+ <view class="formTop">
+ <!-- <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
+ emptyText="鏆傛棤鏇村鏁版嵁">
+ <uni-tr>
+
+ <uni-th align="center" width='120'>杞︾墝鍙�</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" width='100'>鐘舵��</uni-th>
+ <uni-th align="center" width='100'>绉伴噸鏂瑰紡</uni-th>
+
+ </uni-tr>
+ <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">
+ <!-- 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">
+ {{ 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>
+ </view>
</view>
</view>
<view class="more_text"
@@ -59,7 +118,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>
@@ -68,7 +128,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,
@@ -92,20 +167,50 @@
methods: {
//鍒濆鍖�
init(){
- this.$reqGet('getMyPlanListByBunkerId',{bunkerId:this.bunkerId}).then((res) => {
- console.log(res,'res')
- this.orderPlanList = res.data;
+ console.log('init',localStorage.getItem('bunkerIds'))
+ uni.showLoading({ title: '鍔犺浇涓�...' })
+ 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();
})
},
faYundetail(v) {
uni.navigateTo({
- url: `/pages/customer-page/customer-index/fayunPlanDetails/fayunPlanDetails?orderPlanId=${v.id}&cars2=${v.cars2}&coalName=${v.coalName}&deptName=${v.deptName}&productNames=${v.productNames}&roleType=${5}&customerName=${v.customerName}`
+ url: `/subPages/fayunPlanDetails/fayunPlanDetails?orderPlanId=${v.id}&cars2=${v.cars2}&coalName=${v.coalName}&deptName=${v.deptName}&productNames=${v.productNames}&roleType=${5}&customerName=${v.customerName}`
});
},
+ showMore(item) {
+ uni.navigateTo({
+ 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:{
- bunkerId(){
- return uni.getStorageSync('bunkerId')
+ bunkerIds(){
+ return localStorage.getItem('bunkerIds')
},
// historyScrolltolower() {
// if (this.pageCurrent * this.pageSize >= this.total) return (this.showMoreData = true);
@@ -118,6 +223,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;
@@ -134,288 +247,43 @@
.scroll-Y{
height: 100%;
}
- .collection-form {
- width: vww(345);
- margin: 0 vww(15);
- margin-top: 35rpx;
- position: relative;
- box-shadow: 0rpx 0rpx 14rpx 0rpx rgba(73, 120, 240, 0.14), 0rpx 7rpx 45rpx 0rpx rgba(73, 120, 240, 0.12);
- .collection-form-item {
- 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: 130%;
- height: vww(30);
- margin: vww(10) vww(16) 0 vww(16);
- display: flex;
- font-size: 30rpx;
- justify-content: space-between;
-
- .dispatch-receive {
- 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;
- font-size: 25rpx;
- justify-content: flex-start;
- .order-type {
- color: #035cfb;
- border: 2px solid #035cfb;
- border-radius: 4rpx;
- padding: vww(2) vww(10);
- text-align: center;
- margin-left: 40rpx;
-
- }
-
- .coal-name {
- flex-grow: 1;
- height: 30rpx;
- font-size: 25rpx;
- 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: 25rpx;
- font-weight: 300;
- color: #515151;
- }
- }
- }
-
- .third-line {
- width: 40%;
- height: vww(30);
- margin-left: vww(15);
- display: flex;
- justify-content: flex-start;
- align-items: center;
-
- .send-date {
- margin-left: vww(14);
- width: 148rpx;
- height: 24rpx;
- line-height: 24rpx;
- font-size: 28rpx;
- font-weight: 300;
- color: #515151;
- }
- }
-
- .fourth-line {
- width: 100%;
- height: vww(30);
- @include flex;
- justify-content: flex-start;
- position: relative;
- bottom: vww(10);
- left: 25%;
-
- .receive,
- .forward {
- width: vww(123);
- height: vww(48);
- @include flex;
- justify-content: center;
- color: #ffffff;
- font-size: 28rpx;
- position: absolute;
-
- .button-image {
- width: 100%;
- height: 100%;
- background: url('../../../static/image/banner/button.png') no-repeat;
- background-size: cover;
- font-size: 28rpx;
- font-weight: 300;
- color: #ffffff;
- text-align: center;
- line-height: vww(45);
- }
- }
-
- .receive {
- left: vww(20);
- }
-
- .forward {
- width: vww(106);
- left: vww(140);
-
- .button-image {
- width: 100%;
- height: 100%;
- background: url('../../../static/image/banner/transpartent.png') no-repeat;
- background-size: cover;
- font-size: 28rpx;
- font-weight: 300;
- color: #3b56eb;
- text-align: center;
- line-height: vww(45);
- }
- }
- }
- }
- }
.loadUnPage{
width: 100%;
+ height: calc(100vh - 8vh);
overflow-y: auto;
-.history-numbers {
- width: 100%;
- position: relative;
- top: vww(-10);
- height: calc(100vh - 45px);
-
- .history-information {
- width: 690rpx;
- height: 398rpx;
- margin: vww(10) vww(15);
- background: #ffffff;
- box-shadow: 0rpx 0rpx 14rpx 0rpx rgba(73, 120, 240, 0.14), 0rpx 7rpx 45rpx 0rpx rgba(73, 120, 240, 0.12);
- border-radius: 20rpx;
- @include flex flex-direction: column;
- align-items: flex-start;
- justify-content: space-evenly;
- overflow: hidden;
-
- .first {
- width: 96%;
- height: 34rpx;
- font-size: 32rpx;
- font-weight: 300;
- color: #303030;
- @include flex;
- margin: vww(10) vww(10) 0;
- }
-
- .second {
- width: 100%;
- height: 31rpx;
- font-size: 30rpx;
- font-weight: 300;
- color: #515151;
- margin: vww(10) vww(10) 0;
- @include flex;
- justify-content: flex-start;
-
- .coal-name {
- min-width: vww(30);
- height: vww(20);
- margin-right: vww(21);
- }
-
-
- }
-
- .third {
- width: 96%;
- height: 31rpx;
- font-size: 30rpx;
- font-weight: 300;
- color: #515151;
- margin: vww(10) vww(10) 0;
- @include flex;
-
- .third-line {
- @include flex;
-
- &_text {
- color: #919090;
- }
-
- &_num {
- color: #035cfb;
- }
- }
- }
-
- .fourth {
- width: 100%;
- height: 31rpx;
- font-size: 30rpx;
- font-weight: 300;
- color: #515151;
- margin: vww(10) vww(10) 0;
- @include flex;
-
- .fourth-icon {
- width: vww(13);
- height: vww(13);
- margin-right: vww(14);
- }
-
- .senddate {
- flex: 1;
- }
- }
+}
+.history-numbers{
+ height: 100%;
+}
+.collection-form{
+ height: 100%;
+ margin-top: 10rpx;
+ display:flex;
+ align-items: center;
+ // justify-content: center;
+ flex-direction: column;
+ .collection-form-item{
+ width: 95%;
+ box-shadow: 0 2px 12px 0 rgba(0, 0, 0, .1);
+ margin: 20rpx 0;
+ .formTop{
+ width: 100%;
+ 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{
+ min-width: 0rpx!important;
+ }
}
</style>
\ No newline at end of file
--
Gitblit v1.9.1