From 48a4ff3409804fc62139a9fa9fc05498cbc0a0ce Mon Sep 17 00:00:00 2001
From: yangan <yangan0921@163.com>
Date: 星期四, 05 九月 2024 17:41:02 +0800
Subject: [PATCH] feat:库管拼单
---
pages/loadUnload-page/selectTarget/selectTarget.vue | 218 ++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 202 insertions(+), 16 deletions(-)
diff --git a/pages/loadUnload-page/selectTarget/selectTarget.vue b/pages/loadUnload-page/selectTarget/selectTarget.vue
index 33ce89b..d503693 100644
--- a/pages/loadUnload-page/selectTarget/selectTarget.vue
+++ b/pages/loadUnload-page/selectTarget/selectTarget.vue
@@ -55,15 +55,18 @@
@click.stop="formHandle"></u-button>
</view> -->
<!-- 鍦哄湴 -->
+
<view class='div-box'>
- <u-empty mode="data"
- icon="http://cdn.uviewui.com/uview/empty/data.png"
- text="鏆傛棤鏁版嵁"
- textSize="30"
- iconSize="1000"
- v-if="detailData.length===0"></u-empty>
<!-- 娓叉煋鍖哄煙 -->
-
+ <u-collapse
+ :value='["1"]'
+ ref="myCollapse"
+ >
+ <u-collapse-item
+ name='1'
+ ref="collapseHeight"
+ class="collItem"
+ :title="'寰呰鍗告敹鍙戝崟'">
<view class="history-information" v-for="item,i in detailData"
:key="i">
<view class="first">
@@ -167,8 +170,140 @@
</uni-table>
</view>
</view>
-
+
+ <u-empty mode="data"
+ icon="http://cdn.uviewui.com/uview/empty/data.png"
+ text="鏆傛棤鏁版嵁"
+ textSize="30"
+ iconSize="1000"
+ v-if="detailData.length===0"></u-empty>
+ </u-collapse-item>
+ </u-collapse>
+ </view>
+ <!-- 宸茶鍗告敹鍙戝崟 -->
+ <view class='div-box'>
+ <!-- 娓叉煋鍖哄煙 -->
+ <u-collapse
+ ref="myCollapse"
+ >
+ <u-collapse-item
+ name='1'
+
+ class="collItem"
+ :title="'宸茶鍗告敹鍙戝崟'">
+ <view class="history-information" v-for="item,i in historyData"
+ :key="i">
+ <view class="first">
+ <view class="">瑁呭嵏鏃ユ湡锛� {{ item.sendDate || '' }}</view>
+ <view class=""></view>
+ </view>
+ <view class="second">
+ <view class="coal-name">{{ item.productNames || 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>{{ item.customerName }}</view>
+ </view>
+ <view class="third-line" v-if="/鑱氭隘涔欑儻鏍戣剛/.test(item.productName)">
+ <view class="third-line_text">鍖呰绫诲瀷:</view>
+ <view>{{ proType[item.packingType] }}</view>
+ </view>
+ <view class="third-line" v-if="item.productName === '浜屾隘涔欑兎(EDC)'">
+ <view class="third-line_text">璐ㄦ鐘舵��:</view>
+ <view> <u-tag :text="checkStatusList[item.checkStatus]" plain > </u-tag></view>
+ </view>
+ </view>
+ <view class="fourth">
+
+ <view
+ style="height: 24rpx">
+
+ </view>
+
+ <view class="senddate">{{ item.carNo }}</view>
+ </view>
+ <view class="fourth">
+ <view class="fourth-icon">
+ <view
+ style="width: 26rpx;height: 26rpx;line-height: 26rpx;background: url('https://wrzs.czjlchem.com:9090/appimg/image/banner/carnNUm.png') no-repeat;background-size: cover;">
+ </view>
+ </view>
+ <view class="senddate">{{ item.orderCode }}</view>
+ </view>
+ <view class="table">
+ <uni-table border stripe
+ emptyText="鏆傛棤鏇村鏁版嵁">
+ <uni-tr>
+ <uni-th width='120'
+ 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='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>
+
+ </uni-tr>
+ <uni-tr v-for="(subItem, index) in item.tmTaskCoalList" :key="index">
+ <uni-td align="center">
+ <view class="btnBox">
+ <!-- -->
+ <u-button type='primary' text='鎷煎崟' v-if="isPinShow(item)" @click="pinDan(subItem)"></u-button>
+ </view></uni-td>
+ <uni-td align="center">
+ <view>{{ subItem.productName }}</view></uni-td>
+ <uni-td align="center">
+ <view>{{ subItem.productGrade }}</view></uni-td>
+ <uni-td>
+ <view>{{ proType[item.packingType] }}</view>
+ </uni-td>
+ <uni-td>
+ <view>{{ subItem.bunkerName }}</view>
+ </uni-td>
+ <uni-td>
+ <view class="name" v-if="subItem.skin">{{ Number(subItem.skin).toFixed(2) || '' }}</view>
+ </uni-td>
+ <uni-td>
+ <view class="name" v-if="subItem.hair"> {{ Number(subItem.hair).toFixed(2) || '' }}</view>
+ </uni-td>
+ <uni-td>
+ <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>
+ </uni-td>
+ <uni-td>
+ <view class="name">{{ subItem.planMeasure }}</view>
+ </uni-td>
+ <uni-td>
+ <view class="name">{{ subItem.realityMeasure }}</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-tr>
+ </uni-table>
+ </view>
+ </view>
+
+ <u-empty mode="data"
+ icon="http://cdn.uviewui.com/uview/empty/data.png"
+ text="鏆傛棤鏁版嵁"
+ textSize="30"
+ iconSize="1000"
+ v-if="detailData.length===0"></u-empty>
+ </u-collapse-item>
+ </u-collapse>
</view>
<u-action-sheet :actions="firstClassActionsList"
:show="firstClassShow"
@@ -254,6 +389,7 @@
<script>
import { mapState, mapMutations, mapGetters } from 'vuex';
+ import combinedTitle from '@/components/combined-title/combined-title.vue';
export default {
props: {
loadUnloadData: {
@@ -280,6 +416,21 @@
}
},
+ isPinShow(){
+ return function(item){
+ console.log(item,'itemssss')
+ if(!item){
+ return false
+ }else{
+ if( !item.orderType === '澶栭攢' || item.status === 6){
+ return false
+ }else{
+ return true;
+ }
+ }
+
+ }
+ },
messageText(){
if(this.messageObj.carNo){
return `鏃堕棿:${this.messageObj.now}锛�${this.messageObj.carNo}锛屼骇鍝�${this.messageObj.productNames}鍦�${this.messageObj.bunkerName}鍏ュ満浜嗭紝璇峰強鏃舵鏌ワ紒`
@@ -296,6 +447,7 @@
handler(v) {
console.log(v,'vvvvvv')
this.loadUnloadData = v;
+ this.getTodayOrder();
},
deep: true,
immediate: true
@@ -327,12 +479,17 @@
data() {
return {
proType:['鏁ｈ','娑叉埃鐡惰','缃愯','PVC25','PVC80','PVC1150','PVc1200'],
+ coalStatus: ['棰嗗彇', '棰勭害', '绛惧埌', '鍏ュ満', '绉扮毊', '绉版瘺', '绂诲満', '鍏ョ鎴�', '鍑虹鎴�', '鍏ヤ粨搴�', '鍑轰粨搴�', '鏀剧┖', '浣滃簾', '鍏ュ満鐢宠',
+ '杩涘叆鍦洪櫌', '寮傚父瀹℃牳涓�', '杩斿洖鍔犲噺鍚�', '瓒呮椂', '鎵撳嵃涓�', '鎵撳嵃涓�', '濉啓', '鏀剧┖纭涓�', '瓒呮渶澶ф瘺閲嶇‘璁や腑','琛ユ墦','鍏ュ満妫�鏌�','璐ㄦ涓�',
+ '绂诲満妫�鏌�','宸叉墦鍗�','瑁呭嵏','杩斿洖鍔犲噺鍚ㄧ‘璁や腑'
+ ],
dataForm: {
firstClass: "",
secondClass: "",
orderType: '',
bunkerIds:""
},
+ historyData:[],
messageObj:{
carNo:'',
},
@@ -381,12 +538,32 @@
getPVCWeight(){
},
- viewDetail(item){
- //鏌ョ湅鏀跺彂鍗曡鎯�
- uni.navigateTo({
- url: `/subPages/loadUnlaodPageDetail/detail?id=${item.id}&checkId=${item.checkId}`
- });
-
+ handleOpenChange() {
+ // 鏂规硶涓�
+ console.log(this.$refs.collapseHeight);
+ // let long = this.$refs.collapseHeight.length;
+ // setTimeout(() => {
+ // for (let i = 0; i < long; i++) {
+ // this.$refs.collapseHeight[i].queryRect();// 璁＄畻楂樺害
+ // }
+ // }, 20);
+
+ // 鏂规硶浜�
+ this.$nextTick(() => {
+ this.$refs.collapseHeight.init()
+ });
+
+ },
+ //鑾峰彇宸茶鍗告敹鍙戝崟
+ getTodayOrder(){
+ this.$reqGet('getTodayConfirmedTaskCoalList',{ bunkerIds:this.dataForm.bunkerIds }).then(res=>{
+ if(res.code === 0){
+ this.historyData = res.data;
+ }else{
+ this.historyData = [];
+ }
+
+ })
},
getUserInfo() {
this.$reqGet('getUserEntity').then(res => {
@@ -417,7 +594,7 @@
this.getDetailData();
-
+ this.getTodayOrder();
}
} else {
this.$u.toast('鍔犺浇澶辫触')
@@ -446,11 +623,13 @@
})
return item;
});
+ this.handleOpenChange();
console.log(this.detailData,'detailData')
}else if(res.code === 1){
this.detailData = [];
this.$u.toast(res.msg ? res.msg : '鎿嶄綔澶辫触锛侊紒')
}
+
}).catch(err=>{
this.detailData = [];
this.$u.toast(res.msg ? res.msg : '鎿嶄綔澶辫触锛侊紒')
@@ -612,10 +791,17 @@
url: `/subPages/checkTestDetails/index`
})
+ },
+ pinDan(item){
+ console.log('pindan')
+ uni.navigateTo({
+ url: `/subPages/splicingOrders/index?taskCoalId=${item.id}`
+ })
}
},
onShow(){
+ console.log('瑙﹀彂ONShow')
uni.showLoading({
title: "鍔犺浇涓�"
})
@@ -630,7 +816,7 @@
}).then(() => {
});
-
+
},
}
--
Gitblit v1.9.1