From b373840eba0f163ecbdb471fd2206c539e995199 Mon Sep 17 00:00:00 2001
From: yangan <yangan0921@163.com>
Date: 星期四, 19 十二月 2024 17:37:50 +0800
Subject: [PATCH] feat:库管发运日计划更改显示
---
api/globalApi.js | 6 +++
pages/register/register.vue | 2
pages/driver-page/delivery-my/delivery-my/delivery-my.vue | 4 +-
pages/loadUnload-page/orderPlanList/index.vue | 75 ++++++++++++++++++++++---------------
4 files changed, 53 insertions(+), 34 deletions(-)
diff --git a/api/globalApi.js b/api/globalApi.js
index fb9b221..1db8f5c 100644
--- a/api/globalApi.js
+++ b/api/globalApi.js
@@ -809,6 +809,12 @@
url: '/wrzs/warehouse/pvcConfirmLoadAndUnload',
methods: 'POST'
},
+ //搴撶鏌ヨ鏃ヨ鍒�
+ getMyPlanListByBunkerIdsAndProductIds:{
+ url:'/wrzs/warehouse/getMyPlanListByBunkerIdsAndProductIds',
+ methods: 'GET'
+ }
+
diff --git a/pages/driver-page/delivery-my/delivery-my/delivery-my.vue b/pages/driver-page/delivery-my/delivery-my/delivery-my.vue
index 7320fca..79d0a08 100644
--- a/pages/driver-page/delivery-my/delivery-my/delivery-my.vue
+++ b/pages/driver-page/delivery-my/delivery-my/delivery-my.vue
@@ -39,8 +39,8 @@
v-model="isCarNo"
@change="radioChange"
placement="row">
- <u-radio labelSize="26" iconSize="36" label="鏄�" name="鏄�"></u-radio>
- <u-radio labelSize="26" iconSize="36" label="鍚�" name="鍚�"></u-radio>
+ <u-radio labelSize="26" iconSize="40" label="鏄�" name="鏄�" style="margin-right: 30rpx;"></u-radio>
+ <u-radio labelSize="26" iconSize="40" label="鍚�" name="鍚�"></u-radio>
</u-radio-group>
</u-form-item>
<u-form-item prop="carNo"
diff --git a/pages/loadUnload-page/orderPlanList/index.vue b/pages/loadUnload-page/orderPlanList/index.vue
index e952dd4..dc52043 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">
@@ -63,10 +58,16 @@
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>浜у搧锛歿{ item.productNames || item.productName }}</view>
+ <view>鍖呰绫诲瀷锛� {{proType[item.packingType]}}</view>
+ <view>璁″垝杞︽暟锛歿{ item.carNum }}</view>
+ <view>棰嗗彇杞︽暟锛歿{ item.lingNum }}</view>
</view>
<view class="formBottom">
<uni-table border stripe
@@ -74,9 +75,6 @@
<uni-tr>
<uni-th align="center" width='120'>杞︾墝鍙�</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>
@@ -85,27 +83,29 @@
<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.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.productGrade }}</view></uni-td>
+ <!-- subItem.planMeasure != void 0 ? subItem.planMeasure.toFixed(4) : '' -->
+ <view>{{ subItem.planMeasure}}</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>
+ <!-- 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>
@@ -168,9 +168,19 @@
init(){
console.log('init',localStorage.getItem('bunkerIds'))
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;
+ 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();
})
},
@@ -257,15 +267,18 @@
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{
diff --git a/pages/register/register.vue b/pages/register/register.vue
index b316fbe..37dd44c 100644
--- a/pages/register/register.vue
+++ b/pages/register/register.vue
@@ -769,7 +769,7 @@
})
.catch(err => {
console.log('err', err);
- this.$u.toast('璇疯鑼冭緭鍏ュ唴瀹�');
+ this.$u.toast('璇疯鑼冭緭鍏ュ唴瀹癸紙妫�鏌ュ瘑鐮佸己搴︽槸鍚﹁繃浣庯紒锛�');
});
}
},
--
Gitblit v1.9.1