From 34b154be6ee139490d82920f0cee2cd03945267a Mon Sep 17 00:00:00 2001
From: yangan <yangan0921@163.com>
Date: 星期一, 28 十月 2024 09:06:49 +0800
Subject: [PATCH] feat:库管确认装卸单位显示
---
pages/doorkeeper-page/doorkeeper-index/exit-index.vue | 126 +++++++++++++++++++++++-------------------
1 files changed, 69 insertions(+), 57 deletions(-)
diff --git a/pages/doorkeeper-page/doorkeeper-index/exit-index.vue b/pages/doorkeeper-page/doorkeeper-index/exit-index.vue
index d17e2c0..23958f9 100644
--- a/pages/doorkeeper-page/doorkeeper-index/exit-index.vue
+++ b/pages/doorkeeper-page/doorkeeper-index/exit-index.vue
@@ -73,61 +73,62 @@
</view>
</view>
</u-collapse-item>
- </u-collapse>
- <u-collapse
- ref="myCollapse"
- >
- <u-collapse-item
- ref="collapseHeights"
- name='3'
- class="collItem"
- :title="'涓存椂鍏ュ満杞﹁締'">
- <view style="position: relative;top: -40px;">
- <u-empty mode="data"
- icon="http://cdn.uviewui.com/uview/empty/data.png"
- textSize="30"
- iconSize="1000"
- text="鏆傛棤杞﹁締"
- v-if="driverTemporaryEntry.length == 0"></u-empty>
+ </u-collapse>
+ <u-collapse
+ ref="myCollapse"
+ >
+ <u-collapse-item
+ ref="collapseHeights"
+ name='3'
+ class="collItem"
+ :title="'涓存椂鍑哄満杞﹁締'">
+ <view style="position: relative;top: -40px;">
+ <u-empty mode="data"
+ icon="http://cdn.uviewui.com/uview/empty/data.png"
+ textSize="30"
+ iconSize="1000"
+ text="鏆傛棤杞﹁締"
+ v-if="driverTemporaryEntry.length == 0"></u-empty>
+ </view>
+ <view class="collection-form">
+ <view class="collection-form-item"
+ v-for="(item, index) in driverTemporaryEntry"
+ :key="index">
+ <view class="second-line">
+ <view class="coal-name">
+ <view class="dispatch-dept">{{ item.carNo || '' }}</view>
+ <view class="black-bar"></view>
+ <view class="dispatch">{{ item.tempEntrancePlan.driver ||'' }}</view>
+ <view class="black-bar"></view>
+ <text>{{ item.tempEntrancePlan.phone || '' }}</text>
</view>
- <view class="collection-form">
- <view class="collection-form-item"
- v-for="(item, index) in driverTemporaryEntry"
- :key="index">
- <view class="second-line">
- <view class="coal-name">
- <view class="dispatch-dept">{{ item.carNo || '' }}</view>
- <view class="black-bar"></view>
- <view class="dispatch">{{ item.driver ||'' }}</view>
- <view class="black-bar"></view>
- <text>{{ item.phone || '' }}</text>
- </view>
- </view>
- <view class="third-line">
- <view class="time-icon">
- <view
- style="width: 24rpx;height: 24rpx;line-height: 24rpx;background: url('https://wrzs.czjlchem.com:9090/appimg/image/banner/clock.png') no-repeat;background-size: cover">
- </view>
- </view>
- <view class="send-date">{{ item.sendDate }} {{ item.startTime || '' }}-{{item.endTime || ""}}</view>
- </view>
- <view class="first-line">
- <view class="dispatch-receive">
- <view class="point-number">
- <text class="order-type">{{ item.coalName?limitString(item.coalName,20,'...'):'' || '' }}</text>
- </view>
- <view class="black-bar"></view>
- <view class="dispatch-dept">{{ item.remark || '' }}</view>
- </view>
- </view>
- <view class="fourth-line">
- <view class="forward"
- @click.stop="yuYueLiShBtnClick(item)">
- <view class="button-image">妫�鏌�</view>
- </view>
- </view>
+ </view>
+ <view class="third-line">
+ <view class="time-icon">
+ <view
+ style="width: 24rpx;height: 24rpx;line-height: 24rpx;background: url('https://wrzs.czjlchem.com:9090/appimg/image/banner/clock.png') no-repeat;background-size: cover">
</view>
</view>
+ <view class="send-date">{{ item.tempEntrancePlan.sendDate }} {{ item.tempEntrancePlan.startTime || '' }}-{{item.tempEntrancePlan.endTime || ""}}</view>
+ </view>
+ <view class="first-line">
+ <view class="dispatch-receive">
+ <view class="dispatch-dept">{{ item.tempEntrancePlan.coalName || '' }}</view>
+ <view class="black-bar"></view>
+ <view class="dispatch">{{ item.tempEntrancePlan.customerName ||'' }}</view>
+ </view>
+ <view class="point-number">
+ <text class="order-type">{{ item.tempEntrancePlan.productNames?limitString(item.tempEntrancePlan.productNames,20,'...'):'' || '' }}</text>
+ </view>
+ </view>
+ <view class="fourth-line">
+ <view class="forward"
+ @click.stop="yuYueLiShBtnClick(item)">
+ <view class="button-image">妫�鏌�</view>
+ </view>
+ </view>
+ </view>
+ </view>
</u-collapse-item>
</u-collapse>
<u-collapse
@@ -161,6 +162,13 @@
</view>
<view class="second-line" v-if="item.splicingOrderId">
<text style="color:red">姝ゅ崟鍖呭惈鎷煎崟锛�</text>
+ </view>
+ <view class="second-line">
+ <view class="coal-name">
+ <view>鍑�閲嶏細{{item.clean|| 0}}</view>
+ <view class="black-bar"></view>
+ <view>鏁伴噺锛歿{item.productQuantity|| 0}}</view>
+ </view>
</view>
<view class="second-line">
<view class="coal-name">
@@ -261,6 +269,7 @@
<text style="color:red">鎷煎崟</text>
</view>
<view class="second-line">
+
<view class="coal-name">
<view class="dispatch-dept">{{ activeObj.carNo || '' }}</view>
<view class="black-bar"></view>
@@ -283,6 +292,7 @@
},
data() {
return {
+ door:'',
temporaryPlanId:"",
show: false, // 寮瑰嚭鍏ㄩ儴棰嗗彇鎻愮ず
showModal:false,
@@ -304,6 +314,7 @@
}
},
onShow() {
+ this.door=uni.getStorageSync('door', this.door)
this.init();
},
methods: {
@@ -422,7 +433,7 @@
});
if(!this.carNo){
- this.$reqGet('getCheckTaskCoal',{flag:1}).then(res => {
+ this.$reqGet('getCheckTaskCoal',{flag:1,door:this.door}).then(res => {
uni.hideLoading();
this.driverBillOfLoadingData = res.data;
uni.stopPullDownRefresh();
@@ -435,7 +446,7 @@
this.handleOpenChange();
});
}else{
- this.$reqGet('getCheckTaskCoal',{flag:1,carNo:this.carNo}).then(res => {
+ this.$reqGet('getCheckTaskCoal',{flag:1,carNo:this.carNo,door:this.door}).then(res => {
uni.hideLoading();
this.driverBillOfLoadingData = res.data;
uni.stopPullDownRefresh();
@@ -449,14 +460,14 @@
});
}
if(!this.carNo){
- this.$reqGet('getAlreadyCheckTaskCoal',{flag:1}).then(res => {
+ this.$reqGet('getAlreadyCheckTaskCoal',{flag:1,door:this.door}).then(res => {
uni.hideLoading();
this.driverBillOfLoadingDatas = res.data;
uni.stopPullDownRefresh();
this.handleOpenChange();
});
}else{
- this.$reqGet('getAlreadyCheckTaskCoal',{flag:1,carNo:this.carNo}).then(res => {
+ this.$reqGet('getAlreadyCheckTaskCoal',{flag:1,carNo:this.carNo,door:this.door}).then(res => {
uni.hideLoading();
this.driverBillOfLoadingDatas = res.data;
uni.stopPullDownRefresh();
@@ -482,7 +493,7 @@
},
//鏌ョ湅鎷煎崟
checkDetail(item){
- this.activeObj = item;
+ this.activeObj = item.splicingOrders ? item.splicingOrders : {};
this.showModal = true;
},
@@ -522,6 +533,7 @@
}
}
::v-deep.appointment {
+ margin-bottom: vww(100);
.appointment-description {
margin: vww(8) 0;
color: #fd1446;
--
Gitblit v1.9.1