From 0be82c06720caf665cd44b24e17390e3740204ed Mon Sep 17 00:00:00 2001
From: yangan <yangan0921@163.com>
Date: 星期二, 09 七月 2024 09:59:58 +0800
Subject: [PATCH] feat:库管样式更新
---
pages/tabbar-page/index-tabbar/index-tabbar.vue | 104 +++++++++++++++++++++++++++++++++++++--------------
1 files changed, 75 insertions(+), 29 deletions(-)
diff --git a/pages/tabbar-page/index-tabbar/index-tabbar.vue b/pages/tabbar-page/index-tabbar/index-tabbar.vue
index 9741801..41aca84 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"
@@ -48,11 +48,10 @@
import freightForwarderIndex from '@/pages/freight-forwarder-page/freightForwarder-index/freightForwarder-index.vue';
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 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 { mapState, mapMutations, mapGetters } from 'vuex';
import { webSocketUrl } from '@/api/request.js';
-
let socket = null;
export default {
components: {
@@ -68,7 +67,8 @@
computed: {
...mapState(['globalweighHouseCode', 'globalweigh', 'globalisconnect', 'globalSocket', 'websocketData',
'globalIntervalId'
- ])
+ ]),
+ ...mapGetters(['websocketData'])
},
//棣栭〉涓嬫媺鍒锋柊
onPullDownRefresh() {
@@ -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: {
@@ -186,29 +203,37 @@
};
},
watch: {
- '$store.state.websocketData'(v) {
- console.log(v, '鎺ュ彈鐨剋s鏁版嵁');
- if (v.startsWith('weigh')) { //閲嶉噺锛堢О閲嶇殑鏉′欢锛�
- let nowWeighObj = JSON.parse(v.slice(7));
- if (this.globalweighHouseCode && nowWeighObj.eqCode == this.globalweighHouseCode) {
- this.changeWeigh(nowWeighObj.weigh);
- this.changeinfraredStatus(!!nowWeighObj.eqInfraredStatus);
- let warningState = nowWeighObj.warning == 1
- this.changeWarning(warningState)
- }
- } else if (v.startsWith('msg')) { //娑堟伅
- function removeTags(str) {
- return str.replace(/<\/?[^>]+>/gi, '');
- }
- this.messageList = JSON.parse(v.slice(5));
- this.messageList = {
- ...this.messageList,
- title: this.messageList.title.slice(0, 8) + '...',
- content: removeTags(this.messageList.content).trim().slice(0, 8) + '...'
- }
- this.messagePushShow = !this.messageList.appUserId || uni.getStorageSync('userId') === this.messageList
- .appUserId;
- } else if (v.startsWith('wsg')) { //鎻愰啋纾呮埧鏈夎溅
+ 'websocketData': {
+ handler(v) {
+ console.log(v, '鎺ュ彈鐨剋s鏁版嵁');
+ if(v) {
+ if (v.startsWith('weigh')) {
+ let nowWeighObj = JSON.parse(v.slice(7));
+ if (this.globalweighHouseCode && nowWeighObj.eqCode == this.globalweighHouseCode) {
+ if (nowWeighObj.eqInfraredStatus) {
+ this.changeinfraredStatus(true);
+ this.changeWeigh(nowWeighObj.weigh);
+ let warningState = nowWeighObj.warning == 1
+ this.changeWarning(warningState)
+ } else {
+ this.changeinfraredStatus(false);
+ this.changeWeigh(nowWeighObj.weigh);
+ let warningState = nowWeighObj.warning == 1
+ this.changeWarning(warningState)
+ }
+ }
+ } else if (v.startsWith('msg')) {
+ function removeTags(str) {
+ return str.replace(/<\/?[^>]+>/gi, '');
+ }
+ this.messageList = JSON.parse(v.slice(5));
+ this.messageList = {
+ ...this.messageList,
+ title: this.messageList.title.slice(0, 8) + '...',
+ content: removeTags(this.messageList.content).trim().slice(0, 8) + '...'
+ }
+ this.messagePushShow = true;
+ } else if (v.startsWith('wsg')) { //鎻愰啋纾呮埧鏈夎溅
let wsgObj = JSON.parse(v.slice(5));
if (uni.getStorageSync('carNo') === wsgObj.carNo && !wsgObj.peopleWeigh) {
this.changewsgVisiable(true) //纾呮埧蹇欑鐨勫脊妗嗙殑鐜伴殣钘�
@@ -219,6 +244,10 @@
this.changeconfirmWeighContent(wsgObj.content)
}
}
+ }
+ },
+ deep: true,
+ immediate: true
}
},
methods: {
@@ -331,7 +360,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