From 4e4842518007726677c1dd23dc57f3448e7b08b4 Mon Sep 17 00:00:00 2001
From: yangan <yangan0921@163.com>
Date: 星期二, 30 七月 2024 17:37:35 +0800
Subject: [PATCH] feat:库管首页修改细节
---
pages/loadUnload-page/selectTarget/selectTarget.vue | 239 ++++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 176 insertions(+), 63 deletions(-)
diff --git a/pages/loadUnload-page/selectTarget/selectTarget.vue b/pages/loadUnload-page/selectTarget/selectTarget.vue
index 305908d..ddc800c 100644
--- a/pages/loadUnload-page/selectTarget/selectTarget.vue
+++ b/pages/loadUnload-page/selectTarget/selectTarget.vue
@@ -2,7 +2,7 @@
<view class="main">
<!-- 褰撳墠閫夋嫨浠撳簱 -->
<view class="top-tag">
- <text>鐐瑰嚮鍒囨崲/閫夋嫨浠撳簱</text>
+ <text style="margin-right:20rpx">鐐瑰嚮鍒囨崲/閫夋嫨浠撳簱</text>
<u-tag
size='large'
icon='map'
@@ -11,6 +11,7 @@
></u-tag>
</view>
<!-- 鐐瑰嚮鏌ョ湅鍘熺洂閽欓晛 -->
+
<view class="self-deliver">
<view class="self-deliver_text">
鏌ョ湅鍘熺洂閽欓晛缁撴灉
@@ -22,6 +23,11 @@
@click="todoDetail"></u-button>
</view>
</view>
+ <view
+ class="notice-bar"><u-notice-bar :text="messageText"
+ :fontSize="30" :showIcon = 'true'
+ :direction='messageObj.carNo ? "row" :"column"'
+ ></u-notice-bar></view>
<!-- <u--form labelPosition="top"
labelWidth="20%"
:borderBottom="false"
@@ -48,7 +54,7 @@
text="鏌ョ湅璇ヤ粨搴撴敹鍙戝崟"
@click.stop="formHandle"></u-button>
</view> -->
- <!-- 鐓ゅ満 -->
+ <!-- 鍦哄湴 -->
<view class='div-box'>
<u-empty mode="data"
icon="http://cdn.uviewui.com/uview/empty/data.png"
@@ -98,14 +104,14 @@
<uni-table border stripe
emptyText="鏆傛棤鏇村鏁版嵁">
<uni-tr>
- <uni-th width='140'
+ <uni-th width='120'
align="center">鎿嶄綔</uni-th>
<uni-th align="center" width='120'>浜у搧</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='200'>浠撳簱</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> -->
@@ -115,21 +121,21 @@
<view class="btnBox">
<!-- -->
<u-button text='鏌ョ湅' @click="viewDetail(subItem)"></u-button>
- <u-button type='primary' text='纭瑁呭嵏' v-if="subItem.flag" @click="enterOk(subItem)"></u-button>
+ <u-button type='primary' text='纭瑁呭嵏' v-if="subItem.flag && isBtnShow(item)" @click="enterOk(item,subItem)"></u-button>
</view></uni-td>
<uni-td align="center">
<view>{{ subItem.productName }}</view></uni-td>
<uni-td>
- <view class="name">{{ subItem.bunkerName }}</view>
+ <view>{{ subItem.bunkerName }}</view>
</uni-td>
<uni-td>
- <view class="name">{{ subItem.skin }}</view>
+ <view class="name" v-if="subItem.skin">{{ Number(subItem.skin).toFixed(2) || '' }}</view>
</uni-td>
<uni-td>
- <view class="name">{{ subItem.hair }}</view>
+ <view class="name" v-if="subItem.hair"> {{ Number(subItem.hair).toFixed(2) || '' }}</view>
</uni-td>
<uni-td>
- <view class="name">{{ subItem.clean }}</view>
+ <view class="name" v-if="(subItem.clean || (subItem.clean && subItem.clean === 0))">{{ Number(subItem.clean).toFixed(2) || ''}}</view>
</uni-td>
<uni-td>
<view class="name">{{ subItem.productQuantity }}</view>
@@ -164,13 +170,11 @@
鏄惁纭瑁呭嵏锛�
<view v-if="isNumOk || isClean">
<text>浜у搧鍚嶇О锛歿{activeObj.productName}}</text>
-
<view class="queren">
<text>璇疯緭鍏�</text>锛�
<u--input
type='digit'
border="bottom"
- :disabled="activeObj.productName === 'PVC' && activeObj.packingType === 5"
:placeholder="isNumOk ? '鏁伴噺' :'鎶樺惃'"
v-model="checkNum"
>
@@ -183,6 +187,8 @@
</view>
<view v-if="isNumOk && activeObj.productQuantity">褰撳墠鏁伴噺锛歿{activeObj.productQuantity}}浠�</view>
<view v-if="activeObj.containerNumber"><span>闆嗚绠卞彿锛�</span>{{activeObj.containerNumber}}</view>
+
+ </view>
<view>鏄惁绌鸿溅鍑哄巶: <u-radio-group
v-model="isEmptyCar"
placement="row"
@@ -210,11 +216,9 @@
>
</u-radio>
</u-radio-group></view>
- </view>
-
</view>
</u-modal>
- <!-- 鐓や粨 -->
+ <!-- 浠撳簱 -->
<!-- <u-action-sheet :actions="secondClassActionsList"
:show="secondClassShow"
cancelText='鍙栨秷'
@@ -232,12 +236,42 @@
</template>
<script>
+ import { BaseUrl } from '@/api/publicInterface.js'
+ import { mapState, mapMutations, mapGetters } from 'vuex';
export default {
props: {
loadUnloadData: {
type: Object,
default: {}
}
+ },
+ computed:{
+ isBtnShow(){
+ return function(item){
+ console.log(item,'itemssss')
+ if(!item){
+ return false
+ }else{
+ if(this.errorStatusList.includes(item.status)){
+ return false
+ }else{
+ return true;
+ }
+ }
+
+ }
+
+ },
+ messageText(){
+ if(this.messageObj.carNo){
+ return `鏃堕棿:${this.messageObj.now}锛�${this.messageObj.carNo}锛屼骇鍝�${this.messageObj.productNames}鍦�${this.messageObj.bunkerName}鍏ュ満浜嗭紝璇峰強鏃舵鏌ワ紒`
+ }else{
+ return '鏆傛棤娑堟伅'
+ }
+
+ },
+ ...mapGetters(['websocketData'])
+
},
watch: {
loadUnloadData: {
@@ -247,6 +281,29 @@
},
deep: true,
immediate: true
+ },
+ //鐩戝惉娑堟伅
+ 'websocketData': {
+ handler(v) {
+ console.log(v, '鎺ュ彈鐨剋s鏁版嵁');
+ if(v) {
+ if (v.startsWith('kgTipHead')) {
+ console.log('vvvvv',v.slice(11))
+ let nowWeighObj = JSON.parse(v.slice(11));
+ console.log(nowWeighObj,'nowWeight');
+ this.messageObj = nowWeighObj;
+ // 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;
+ }
+ }
+ },
+ deep: true,
+ immediate: true
}
},
data() {
@@ -255,7 +312,10 @@
firstClass: "",
secondClass: "",
orderType: '',
- bunkerId:""
+ bunkerIds:""
+ },
+ messageObj:{
+ carNo:'',
},
isEmptyCar:null, //鏄惁绌鸿溅鍑哄巶
checkStatusList:[
@@ -266,10 +326,10 @@
typeText:'', // 纭瑁呭嵏涓夌绫诲瀷
isNumOk:false, //璁′欢
isClean:false, // 鎶樺惃
- // 鐓ゅ満鎿嶄綔鑿滃崟
+ // 鍦哄湴鎿嶄綔鑿滃崟
firstClassActionsList: [],
firstClassShow: false,
- // 鐓や粨鎿嶄綔鑿滃崟
+ // 浠撳簱鎿嶄綔鑿滃崟
secondClassActionsList: [],
secondClassShow: false,
coalList: [],
@@ -281,6 +341,7 @@
filedId: "",
selectedCoal: [],
orderTypeShow: false,
+ pvcWeight:'',
orderTypeList: [{
name: '澶栭攢',
id: Math.floor(Math.random() * 100) + 1,
@@ -292,14 +353,18 @@
],
isOrderType: '璇烽�夋嫨', //纾呮埧绫诲瀷鏄惁閫夋嫨浜� 閫夋嫨浜嗘竻绌�
cleanIconClick: true, //淇敼鐐瑰嚮娓呯┖纾呮埧閫夋嫨浼氬嚭鐜�
+ errorStatusList:[0,1,6,24,27,26] // 涓嶈兘鐐瑰嚮纭瑁呭嵏鐨勭姸鎬�
};
},
methods: {
+ getPVCWeight(){
+
+ },
viewDetail(item){
//鏌ョ湅鏀跺彂鍗曡鎯�
uni.navigateTo({
- url: `/pages/loadUnload-page/loadUnlaodPageDetail/detail?id=${item.id}&checkId=${item.checkId}`
+ url: `/subPages/loadUnlaodPageDetail/detail?id=${item.id}&checkId=${item.checkId}`
});
},
@@ -309,7 +374,8 @@
this.userInfo.password = null
})
},
- // 鑾峰彇鐓ゅ満
+
+ // 鑾峰彇鍦哄湴
getDeptIdFiled() {
uni.showLoading({
title: "鍔犺浇涓�"
@@ -319,9 +385,10 @@
if (res.code === 0) {
this.firstClassActionsList = res.data;
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.dataForm.bunkerIds = res.data.map(item=>item.id).join(',')
+ uni.setStorageSync('bunkerIds',res.data.map(item=>item.id).join(','))
+ this.firstClassActionsList.unshift({name:'鍏ㄩ儴',id:res.data.map(item=>item.id).join(',')})
+ this.dataForm.firstClass = '鍏ㄩ儴'
this.getDetailData();
}
@@ -342,7 +409,7 @@
uni.showLoading({
title:'鍔犺浇涓�'
})
- this.$reqGet('getTaskCoalListByBunkerId', { bunkerId:this.dataForm.bunkerId }).then(res => {
+ this.$reqGet('getTaskCoalListByBunkerId', { bunkerIds:this.dataForm.bunkerIds }).then(res => {
uni.hideLoading();
if (res.code === 0) {
this.detailData = res.data.map(item=>{
@@ -365,20 +432,21 @@
},
firstClassSelectClick(val) {
this.dataForm.firstClass = val.name;
- this.dataForm.bunkerId= val.id;
- uni.setStorageSync('bunkerId', val.id);
+ this.dataForm.bunkerIds= val.id;
+ uni.removeStorageSync('bunkerIds')
+ uni.setStorageSync('bunkerIds', val.id);
this.getDetailData();
this.filedId = val.id
},
- formHandle() {
- if (!this.dataForm.firstClass) return this.$u.toast('璇烽�夋嫨鐓ゅ満鎴栬�呯叅浠�');
- this.$nextTick(()=>{
- uni.navigateTo({
- url: `/pages/loadUnload-page/loadUnload-detail/loadUnload-detail?bunkerId=${this.dataForm.bunkerId}`
- })
- })
+ // formHandle() {
+ // if (!this.dataForm.firstClass) return this.$u.toast('璇烽�夋嫨鍦哄湴鎴栬�呬粨搴�');
+ // this.$nextTick(()=>{
+ // uni.navigateTo({
+ // url: `/pages/loadUnload-page/loadUnload-detail/loadUnload-detail?bunkerId=${this.dataForm.bunkerId}`
+ // })
+ // })
- },
+ // },
change(){
},
@@ -386,28 +454,56 @@
},
open(){},
- enterOk(item){
+ enterOk(parintItem,item){
+ console.log(parintItem,'priintItem')
+ // uni.request({
+ // url: `${BaseUrl}/admin/dict/type/tray_weight`,
+ // method: 'GET',
+ // header: {
+ // Authorization: 'Bearer' + ' ' + uni.getStorageSync('token'),
+ // clientToc: 'Y',
+ // 'CLIENT_TOC': 'Y',
+ // },
+ // success: (res) => {
+ // this.pvcWeight = res.data.data.find(item=>item.label === '5') ? Number(res.data.data.find(item=>item.label == '5').value) : '';
+
+ // }
+ // })
+ // 璁′欢锛� 0 pvc type
+ // 鎶樺惃:
this.activeObj = item;
- if( (item.orderType === '澶栬喘' ||item.orderType === '澶栬喘閫�' ) && item.isWeight === 0){
+ if( (parintItem.orderType === '澶栬喘' ||parintItem.orderType === '澶栬喘閫�' ) && item.isWeight === 0){
this.isNumOk = true;
this.isClean = false;
//鍥炴樉璁℃暟閲�
this.checkNum = item.productQuantity ? item.productQuantity : '';
- }else if( item.orderType ==='澶栬喘' && item.isWeight === 1){
+ }else if( parintItem.orderType ==='澶栬喘' && item.isWeight === 1){
this.isClean = true;
this.isNumOk = false;
}else{
this.isNumOk = false;
this.isClean = false;
}
+ //pvc
+ if(parintItem.orderType ==='澶栭攢' && item.productName ==='PVC' && (item.packingType === 3 || item.packingType === 4)){
+ this.isNumOk = true;
+ this.isClean = false;
+ }
+ //鐡惰娑叉隘鏉′欢
+ //EDC 璐ㄦ瀹屾垚鏂瑰彲纭
+ if(item.packingType === 1){
+ this.isNumOk = true;
+ this.isClean = false;
+ }
+ //
//pvc澶у寘鑷姩璁＄畻鎶樺惃
if(item.productName === 'PVC' && item.packingType === 5){
- this.checkNum = (Number(item.productQuantity) * 60)
-
+ this.isNumOk = true;
+ this.isClean = false;
}
- if(item.orderType === '澶栬喘'){
+ if(parintItem.orderType === '澶栬喘'){
this.isEmptyCar = '1';
- }else if(this.orderType === '澶栭攢' || this.orderType === '澶栬喘閫�'){
+ }else if(parintItem.orderType === '澶栭攢' || parintItem.orderType === '澶栬喘閫�'){
this.isEmptyCar = '0';
}
this.enterZx = true;
@@ -427,9 +523,14 @@
uni.showLoading({
title:'鍔犺浇涓�'
});
- if(!this.checkNum || this.isEmptyCar === null){
+ console.log(this.activeObj,this.activeObj.productName ==='EDC' && this.activeObj.checkStatus !== 7,'12313')
+ if(this.activeObj.productName ==='EDC' && this.activeObj.checkStatus !== 7){
+ console.log('瑙﹀彂锛屸��13131')
+ this.enterZx = false;
+ this.$u.toast(`璇锋鏌ュ綋鍓岴DC璁㈠崟璐ㄦ鐘舵�佸悗鍦ㄧ‘璁よ鍗�!`);
+
+ }else if( this.isEmptyCar === null){
this.$u.toast(`璇锋鏌�${this.isNumOk ? '璁′欢鏁伴噺' :'鎶樺惃'}锛屼互鍙婃槸鍚︾┖杞﹀嚭鍘傞」!`);
- return
}else{
this.enterZx = false;
this.$reqPost('confirmLoadAndUnload',{
@@ -461,6 +562,7 @@
})
}
+
},
//鍒ゆ柇鏄惁鏄� 涓夌鐗规畩绫诲瀷瀵瑰簲寮圭獥
judgeTypeFun(name){
@@ -471,12 +573,10 @@
todoDetail(){
console.log()
uni.navigateTo({
- url: `/pages/loadUnload-page/checkTestDetails/index`
+ url: `/subPages/checkTestDetails/index`
})
}
-
-
},
onShow(){
@@ -487,19 +587,16 @@
uni.hideLoading()
if (res.code === 0) {
this.firstClassActionsList = res.data;
- if(res.data.length === 1){
- this.dataForm.bunkerId = res.data[0].id;
- uni.setStorageSync('bunkerId', res.data[0].id)
- this.dataForm.firstClass = res.data[0].name;
- }
} else {
this.$u.toast('鍔犺浇澶辫触')
}
}).then(() => {
- this.getUserInfo()
- })
- }
+
+ });
+
+
+ },
}
</script>
@@ -513,16 +610,30 @@
/deep/ .uni-table{
min-width: 0!important;
margin-left: 20rpx;
+ width: auto;
}
+}
+.notice-bar{
+ margin-left: vww(10);
+ margin-bottom: 20rpx;
+ margin-top: 20rpx;
+
+ width: 98%;
+ .u-notice-bar{
+ border-radius: 20rpx;
+ margin-top: 20rpx;
+ height: 40rpx;
+ }
}
// 鑷富閰嶉��
.self-deliver {
position: relative;
+ text-indent: 20rpx;
top: vww(10);
- width: 95%;
+ width: 96%;
height: vww(40);
- margin: vww(8) 10rpx;
+ margin: vww(13) 10rpx;
padding: 0 vww(8);
background: #ffffff;
box-shadow: 0rpx 0rpx 14rpx 0rpx rgba(73, 120, 240, 0.14), 0rpx 7rpx 45rpx 0rpx rgba(73, 120, 240, 0.12);
@@ -535,6 +646,7 @@
height: 28px !important;
line-height: 40px;
padding: 0 12px;
+ text-indent: 0!important;
font-size: 28rpx;
font-weight: 300;
color: #ffffff;
@@ -598,14 +710,15 @@
position: relative;
top: vww(-160);
.top-tag{
- width: 33%;
+ width: 60%;
+ margin-left: 55%!important;
height: 100rpx;
- margin-left: 65%;
+ margin-left: 50%;
display: flex;
/* margin-top: 40rpx; */
color: #fff;
align-items: center;
- justify-content: space-between;
+
}
.div-box{
@@ -653,7 +766,7 @@
}
}
.history-information {
- margin-bottom:50rpx;
+ margin-bottom:30rpx;
margin-top: 10rpx;
background: #ffffff;
border-radius: 20rpx;
--
Gitblit v1.9.1