From 66a74ea7126a5b97361b4d7b9d9520e3e25ede5b Mon Sep 17 00:00:00 2001
From: yangan <yangan0921@163.com>
Date: 星期三, 12 六月 2024 17:36:26 +0800
Subject: [PATCH] feat:库管首页改版
---
pages/loadUnload-page/loadUnload-page.vue | 20 ++++
pages/loadUnload-page/selectTarget/selectTarget.vue | 136 ++++++++++++++++++++++------------
pages/tabbar-page/index-tabbar/index-tabbar.vue | 38 +++++++++
3 files changed, 142 insertions(+), 52 deletions(-)
diff --git a/pages/loadUnload-page/loadUnload-page.vue b/pages/loadUnload-page/loadUnload-page.vue
index 2cc7a9e..2e87ef7 100644
--- a/pages/loadUnload-page/loadUnload-page.vue
+++ b/pages/loadUnload-page/loadUnload-page.vue
@@ -3,7 +3,7 @@
<view class="customer-index">
<view class="customer-index_body">
<view class="wait-collection"
- style="background: url('https://mx.jzeg.cn:9096/appimg/image/banner/customerbanner.png') no-repeat;background-size:contain">
+ style="background: url('https://mx.jzeg.cn:9096/appimg/image/banner/customerbanner.png') no-repeat;background-size:100% 100%">
</view>
<!-- <view style="position: relative;top: -120px;">
<u-empty mode="data"
@@ -13,7 +13,7 @@
v-if="CoalNameList.length == 0"></u-empty>
</view> -->
<view class="">
- <selectTarget ref='selectTarget'></selectTarget>
+ <selectTarget ref='selectTarget' :loadUnloadData='loadUnloadData' ></selectTarget>
</view>
</view>
</view>
@@ -23,11 +23,27 @@
<script>
import selectTarget from '@/pages/loadUnload-page/selectTarget/selectTarget.vue'
export default {
+ props: {
+ indexLoadUnloadBillOfLoadingData: {
+ type: Object,
+ default: {}
+ }
+ },
+ watch: {
+ indexLoadUnloadBillOfLoadingData: {
+ handler(v) {
+ this.loadUnloadData = v;
+ },
+ deep: true,
+ immediate: true
+ }
+ },
components: {
selectTarget
},
data() {
return {
+ loadUnloadData:[],
};
},
diff --git a/pages/loadUnload-page/selectTarget/selectTarget.vue b/pages/loadUnload-page/selectTarget/selectTarget.vue
index 2860dcd..495d911 100644
--- a/pages/loadUnload-page/selectTarget/selectTarget.vue
+++ b/pages/loadUnload-page/selectTarget/selectTarget.vue
@@ -2,7 +2,10 @@
<view class="main">
<!-- 褰撳墠閫夋嫨浠撳簱 -->
<view class="top-tag">
+ <text>鐐瑰嚮鍒囨崲/閫夋嫨浠撳簱</text>
<u-tag
+ size='large'
+ icon='map'
:text="dataForm.firstClass ? dataForm.firstClass : '璇烽�夋嫨浠撳簱'"
@click="firstClassSelect"
></u-tag>
@@ -42,37 +45,31 @@
iconSize="1000"
v-if="detailData.length===0"></u-empty>
<!-- 娓叉煋鍖哄煙 -->
- <zh-collapse @change='change' accordion v-for="item,i in detailData"
+
+ <view class="history-information" v-for="item,i in detailData"
:key="i">
- <zh-collapse-item
- class="collItem">
- <view class="" slot='title'>
- <view class="history-information">
<view class="first">
- <view class="">{{ item.deptName || '' }}</view>
+ <view class="">{{ item.carNo || '' }}</view>
<view class=""><u-icon name="arrow-right"
color="#999999"
size="40"></u-icon></view>
</view>
<view class="second">
- <view class="coal-name">{{ item.coalName || '' }}</view>
+ <view class="coal-name">{{ item.productName || '' }}</view>
<view class="order-type">{{ item.orderType || '' }}</view>
</view>
<view class="third">
<view class="third-line">
- <view class="third-line_text">棰嗗彇鏁�:</view>
- <view class="third-line_num">{{ item.cars2 }}</view>
+ <view class="third-line_text">瀹㈡埛鍚嶇О:</view>
+ <view>{{ item.customerName }}</view>
</view>
<view class="third-line">
- <view class="third-line_text">鍓╀綑鏁�:</view>
- <!-- <view class="third-line_num"
- v-if="roleType == 1">{{ item.carNumSurplus1 }}</view>
- <view class="third-line_num"
- v-else-if="roleType == 2">{{ item.carNumSurplus }}</view> -->
+ <view class="third-line_text">浠撳簱:</view>
+ <view >{{ item.bunkerName }}</view>
</view>
<view class="third-line">
- <view class="third-line_text">鎻愮叅鍗曚釜鏁�:</view>
- <view class="third-line_num">{{ item.tmCount }}</view>
+ <view class="third-line_text">璐ㄦ鐘舵��:</view>
+ <view> <u-tag :text="checkStatusList[item.checkStatus]" plain > </u-tag></view>
</view>
</view>
<view class="fourth">
@@ -91,23 +88,21 @@
</view>
<view class="senddate">{{ item.orderCode }}</view>
</view>
- </view>
-
- </view>
- <view class="" slot='cont'>
- <view class="table">
+ <view class="table">
<uni-table border stripe
emptyText="鏆傛棤鏇村鏁版嵁">
<uni-tr>
- <uni-th width='200'
+ <uni-th width='140'
align="center">鎿嶄綔</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-th align="center" width='100'>姣涢噸</uni-th>
+ <uni-th align="center">绫诲瀷</uni-th>
+ <uni-th align="center">鐨噸</uni-th>
+ <uni-th align="center">姣涢噸</uni-th>
+ <uni-th align="center">鍑�閲�</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">鐘舵��</uni-th> -->
</uni-tr>
<uni-tr v-for="(subItem, index) in item.tmTaskCoalList" :key="index">
@@ -130,18 +125,23 @@
<uni-td>
<view class="name">{{ subItem.hair }}</view>
</uni-td>
+ <uni-td>
+ <view class="name">{{ subItem.clean }}</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 class="name">{{ subItem.statusView }}</view></uni-td> -->
</uni-tr>
</uni-table>
</view>
- </view>
- </zh-collapse-item>
- </zh-collapse>
+ </view>
+
</view>
<u-action-sheet :actions="firstClassActionsList"
@@ -161,12 +161,16 @@
鏄惁纭瑁呭嵏锛�
<view v-if="isNumOk || isClean">
<text>浜у搧鍚嶇О锛歿{activeObj.productName}}</text>
- <view>
+
+ <view class="queren">
+ <text>璇疯緭鍏�</text>锛�
<u--input
- :placeholder="isNumOk ? '璇疯緭鍏ユ暟閲�' : isClean ? '璇疯緭鍏ユ姌鍚�' : '璇疯緭鍏�'"
- border="surround"
+ border="bottom"
+ :placeholder="isNumOk ? '鏁伴噺' :'鎶樺惃'"
v-model="checkNum"
- ></u--input>
+ >
+ </u--input>
+ <text> {{isNumOk ? '浠�' : '鍚�' }}</text>
</view>
<view v-if="activeObj.containerNumber"><span>闆嗚绠卞彿锛�</span>{{activeObj.containerNumber}}</view>
</view>
@@ -192,6 +196,22 @@
<script>
export default {
+ props: {
+ loadUnloadData: {
+ type: Object,
+ default: {}
+ }
+ },
+ watch: {
+ loadUnloadData: {
+ handler(v) {
+ console.log(v,'vvvvvv')
+ this.loadUnloadData = v;
+ },
+ deep: true,
+ immediate: true
+ }
+ },
data() {
return {
dataForm: {
@@ -200,6 +220,9 @@
orderType: '',
bunkerId:""
},
+ checkStatusList:[
+ '寰呭彇鏍�','宸插彇鏍�','鍚堟牸','涓嶅悎鏍�'
+ ],
index: '',
enterZx:false,
typeText:'', // 纭瑁呭嵏涓夌绫诲瀷
@@ -257,10 +280,11 @@
uni.hideLoading()
if (res.code === 0) {
this.firstClassActionsList = res.data;
- if(res.data.length === 1){
+ if(res.data.length){
this.dataForm.bunkerId = res.data[0].id;
uni.setStorageSync('bunkerId',res.data[0].id)
this.dataForm.firstClass = res.data[0].name;
+ this.getDetailData();
}
} else {
@@ -323,10 +347,13 @@
this.activeObj = item;
if(item.productQuantity){
this.isNumOk = true;
+ this.isClean = false;
}else if(item.isWeight === 1){
this.isClean = true;
+ this.isNumOk = false;
}
- this.enterZx = true;
+ this.enterZx = true;
+
},
closeModal(){
this.enterZx = false;
@@ -338,8 +365,6 @@
},
confirmModal(){
this.enterZx = false;
- this.isClean = false;
- this.isNumOk = false;
this.$reqPost('confirmLoadAndUnload',{
id: this.activeObj.id,
productQuantity:this.isNumOk ? this.checkNum :this.activeObj.skin,
@@ -388,13 +413,21 @@
<style lang="scss"
scoped>
+ .queren{
+ display: flex;
+ justify-content: space-between;
+ /deep/ .u-input {
+ border-bottom: 1px solid #ccc;
+ }
+ }
.name{
- width: 100rpx;
+ width: 50rpx;
}
.table{
width: 94%;
margin-left: 20rpx;
position: relative;
+ margin-top: 30rpx;
overflow-x: auto;
/deep/ .uni-table-th{
font-size: 12px;
@@ -403,7 +436,7 @@
font-size: 12px;
}
/deep/ .uni-table{
- min-width: 340rpx!important;
+ min-width: 100rpx!important;
// position: sticky !important;;
}
/deep/ .uni-table-body-wrapper {
@@ -420,9 +453,9 @@
}
.btnBox{
- min-width: 150rpx;
+ min-width: 130rpx;
display: flex;
- justify-content: space-between;
+ justify-content: space-around;
text{
color: #035cfb;
}
@@ -434,17 +467,21 @@
position: relative;
top: vww(-160);
.top-tag{
- width: 25%;
+ width: 33%;
height: 100rpx;
- margin-left: 70%;
+ margin-left: 65%;
display: flex;
/* margin-top: 40rpx; */
color: #fff;
+ align-items: center;
justify-content: space-between;
}
.div-box{
width: 100%;
+ display: flex;
+ margin-left: 10rpx;
+ flex-direction: column;
/deep/ .u-collapse{
background: #fff;
}
@@ -485,7 +522,8 @@
}
}
.history-information {
-
+ margin-bottom:50rpx;
+ margin-top: 10rpx;
background: #ffffff;
border-radius: 20rpx;
@include flex flex-direction: column;
@@ -533,15 +571,17 @@
.third {
width: 96%;
- height: 31rpx;
+ height: 120rpx;
font-size: 30rpx;
font-weight: 300;
color: #515151;
margin: vww(10) vww(10) 0;
@include flex;
+ flex-direction: column;
.third-line {
@include flex;
+ align-items: center;;
&_text {
color: #919090;
diff --git a/pages/tabbar-page/index-tabbar/index-tabbar.vue b/pages/tabbar-page/index-tabbar/index-tabbar.vue
index 9741801..facf2cd 100644
--- a/pages/tabbar-page/index-tabbar/index-tabbar.vue
+++ b/pages/tabbar-page/index-tabbar/index-tabbar.vue
@@ -24,7 +24,7 @@
ref="driverIndexRef"
:indexdriverBillOfLoadingData="indexdriverBillOfLoadingData"></driver-index>
<load-unload ref="LoadUnloadRef"
- v-if="roleType == 5"></load-unload>
+ v-if="roleType == 5" :indexLoadUnloadBillOfLoadingData="detailData"></load-unload>
<doorkeep-index ref="doorkeepIndexRef"
v-if="roleType == 6"></doorkeep-index>
<!-- <selectTarget v-if="roleType == 5"
@@ -125,8 +125,24 @@
uni.stopPullDownRefresh();
}
});
+ }else if(this.roleType == 5){
+ //瑁呭嵏鍛�
+ this.getDetailData();
}
},
+ // getWarehouseListFun() {
+ // this.$reqGet('getWarehouseList').then(res => {
+ // uni.hideLoading()
+ // if (res.code === 0) {
+ // if(res.data.length){
+ // this.getDetailData();
+
+ // }
+ // } else {
+ // this.$u.toast('鍔犺浇澶辫触')
+ // }
+ // })
+ // },
onHide() {
console.log('椤甸潰闅愯棌')
},
@@ -174,6 +190,7 @@
indexHuoDaiOrderPlanData: [],
indexHistoryCoalData: [],
count:0,
+ detailData:[],
indexdriverBillOfLoadingData: {},
messagePushShow: false,
messageList: {
@@ -331,7 +348,24 @@
this.dotShow = filtermessage.length > 0;
}
});
- }
+ },
+ getDetailData(){
+ this.$reqGet('getTaskCoalListByBunkerId', { bunkerId:uni.getStorageSync('bunkerId')}).then(res => {
+ if (res.code === 0) {
+ this.detailData = res.data.map(item=>{
+ item.tmTaskCoalList.map(el=>{
+ el.flag = el.isPretendDischar ? false : true
+ return el
+ })
+ return item;
+ });
+ this.$u.toast('鍔犺浇鎴愬姛');
+ uni.stopPullDownRefresh();
+ uni.hideLoading();
+ }
+ })
+
+ },
}
};
</script>
--
Gitblit v1.9.1