From 25c5c75592946943b7c11fe0090d838c40c066b9 Mon Sep 17 00:00:00 2001
From: yangan <yangan0921@163.com>
Date: 星期四, 13 六月 2024 11:51:07 +0800
Subject: [PATCH] feat:库管查看原盐钙镁
---
pages/tabbar-page/index-tabbar/index-tabbar.vue | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 54 insertions(+), 5 deletions(-)
diff --git a/pages/tabbar-page/index-tabbar/index-tabbar.vue b/pages/tabbar-page/index-tabbar/index-tabbar.vue
index 2ea193b..facf2cd 100644
--- a/pages/tabbar-page/index-tabbar/index-tabbar.vue
+++ b/pages/tabbar-page/index-tabbar/index-tabbar.vue
@@ -3,11 +3,11 @@
<view class="search-bar">
<view class="icon-body">
<view class="icon-box"
- @click="messagePage">
+ @click="messagePage" v-if="roleType != 6">
<u-badge :isDot="true"
type="error"
v-if="dotShow"></u-badge>
- <u-icon name="chat"
+ <u-icon name="chat"
color="#fff"
size="50"></u-icon>
</view>
@@ -24,7 +24,9 @@
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"
ref="LoadUnloadRef"></selectTarget> -->
<qualityIndex ref="qualityIndexRef" v-if="roleType == 7"></qualityIndex>
@@ -47,6 +49,7 @@
import LoadUnload from '@/pages/loadUnload-page/loadUnload-page.vue'
import selectTarget from '@/pages/loadUnload-page/selectTarget/selectTarget.vue'
import qualityIndex from '@/pages/quality-inspection-page/qualityIndex/qualityIndex'
+ import doorkeepIndex from '@/pages/doorkeeper-page/doorkeeper-index/doorkeeper-index.vue';
import { mapState, mapMutations } from 'vuex';
import { webSocketUrl } from '@/api/request.js';
@@ -59,6 +62,8 @@
LoadUnload,
selectTarget,
qualityIndex, //鍖栭獙
+ doorkeepIndex,
+ selectTarget
},
computed: {
...mapState(['globalweighHouseCode', 'globalweigh', 'globalisconnect', 'globalSocket', 'websocketData',
@@ -67,7 +72,11 @@
},
//棣栭〉涓嬫媺鍒锋柊
onPullDownRefresh() {
- uni.showLoading({ title: '鍔犺浇涓�...' });
+ if(this.roleType!==6){
+ uni.showLoading({ title: '鍔犺浇涓�...' });
+ }else{
+ this.$refs.doorkeepIndexRef.TaskCoalList()
+ }
// 鑾峰彇鍘嗗彶鎻愮叅鍗�
if (this.roleType == 1 || this.roleType == 2) {
this.$reqGet('getJhOrderPlanDataPage', { current: 1, size: 10 }).then(res => {
@@ -116,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('椤甸潰闅愯棌')
},
@@ -165,6 +190,7 @@
indexHuoDaiOrderPlanData: [],
indexHistoryCoalData: [],
count:0,
+ detailData:[],
indexdriverBillOfLoadingData: {},
messagePushShow: false,
messageList: {
@@ -262,6 +288,12 @@
}
});
break;
+ case 6:
+ console.log('doorkeepIndexRef');
+ this.$nextTick(() => {
+ this.$refs.doorkeepIndexRef.init();
+ });
+ break;
default:
break;
}
@@ -316,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