From 0eab6dcc163bec041d44bc27c9c89ef9c6ec988d Mon Sep 17 00:00:00 2001
From: yangan <yangan0921@163.com>
Date: 星期四, 26 九月 2024 17:17:39 +0800
Subject: [PATCH] feat:确认装卸bug提交
---
pages/loadUnload-page/orderPlanList/index.vue | 43 +++++++++++++++++++++++++------------------
1 files changed, 25 insertions(+), 18 deletions(-)
diff --git a/pages/loadUnload-page/orderPlanList/index.vue b/pages/loadUnload-page/orderPlanList/index.vue
index e400bcd..8f335fd 100644
--- a/pages/loadUnload-page/orderPlanList/index.vue
+++ b/pages/loadUnload-page/orderPlanList/index.vue
@@ -4,7 +4,7 @@
<view style="display:flex;" class="top">
<combined-title title="褰撳墠鏌ヨ鏀跺彂鍗曪細">
</combined-title>
- <u-tag :text="isYuyue === 1 ? '鏈叆鍦�' : '宸插叆鍦�'" class="topTag" @click="todoShow"></u-tag>
+ <u-tag :text="isYuyue === 1 ? '鏈叆鍦�' : '鍏ㄩ儴'" class="topTag" @click="todoShow"></u-tag>
</view>
<scroll-view :scroll-top="scrollTop"
scroll-y="true"
@@ -51,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>
@@ -75,13 +75,16 @@
<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='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">浠撳簱</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"
@@ -92,14 +95,17 @@
<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">
+ <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.realityMeasure }}</view></uni-td>
<uni-td align="center">
- <view class="name">{{ subItem.statusView }}</view></uni-td>
+ {{ subItem.statusView }}</uni-td>
</uni-tr>
</uni-table>
@@ -112,7 +118,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 +127,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,7 +168,7 @@
init(){
console.log('init',localStorage.getItem('bunkerIds'))
uni.showLoading({ title: '鍔犺浇涓�...' })
- this.$reqGet('getMyPlanListByBunkerId',{bunkerIds:localStorage.getItem('bunkerIds'),isYuyue:this.isYuyue}).then((res) => {
+ 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();
@@ -245,7 +253,6 @@
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{
--
Gitblit v1.9.1