From c311ab706cfc3934e03c875211a41082acff575a Mon Sep 17 00:00:00 2001
From: yangan <yangan0921@163.com>
Date: 星期一, 02 九月 2024 08:14:23 +0800
Subject: [PATCH] feat：PVC流程提交
---
pages/loadUnload-page/selectTarget/selectTarget.vue | 73 ++++++++++++++++++++++++++----------
1 files changed, 53 insertions(+), 20 deletions(-)
diff --git a/pages/loadUnload-page/selectTarget/selectTarget.vue b/pages/loadUnload-page/selectTarget/selectTarget.vue
index 209d886..987a188 100644
--- a/pages/loadUnload-page/selectTarget/selectTarget.vue
+++ b/pages/loadUnload-page/selectTarget/selectTarget.vue
@@ -79,7 +79,11 @@
<view class="third-line_text">瀹㈡埛鍚嶇О:</view>
<view>{{ item.customerName }}</view>
</view>
- <view class="third-line" v-if="item.productName === 'EDC'">
+ <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>
@@ -87,7 +91,7 @@
<view class="fourth">
<view class="fourth-icon">
<view
- style="width: 24rpx;height: 24rpx;line-height: 24rpx;background: url('https://mx.jzeg.cn:9096/appimg/image/banner/clock.png') no-repeat;background-size: cover">
+ 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="senddate">{{ item.sendDate }}</view>
@@ -95,7 +99,7 @@
<view class="fourth">
<view class="fourth-icon">
<view
- style="width: 26rpx;height: 26rpx;line-height: 26rpx;background: url('https://mx.jzeg.cn:9096/appimg/image/banner/carnNUm.png') no-repeat;background-size: cover;">
+ 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>
@@ -106,14 +110,15 @@
<uni-tr>
<uni-th width='120'
align="center">鎿嶄綔</uni-th>
- <uni-th align="center" width='120'>浜у搧</uni-th>
+ <uni-th align="center" width='200'>浜у搧</uni-th>
+ <uni-th align="center" width='200'>鍖呰绫诲瀷</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-th align="center">璁″垝閲�</uni-th>
+ <uni-th align="center">瀹為檯閲�</uni-th>
</uni-tr>
<uni-tr v-for="(subItem, index) in item.tmTaskCoalList" :key="index">
@@ -125,6 +130,9 @@
</view></uni-td>
<uni-td align="center">
<view>{{ subItem.productName }}</view></uni-td>
+ <uni-td>
+ <view>{{ proType[item.packingType] }}</view>
+ </uni-td>
<uni-td>
<view>{{ subItem.bunkerName }}</view>
</uni-td>
@@ -139,6 +147,12 @@
</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">
@@ -168,14 +182,14 @@
:showCancelButton="true">
<view class="slot-content">
鏄惁纭瑁呭嵏锛�
- <view v-if="isNumOk || isClean">
+ <view v-if="isNumOk || isClean||isFlagNum">
<text>浜у搧鍚嶇О锛歿{activeObj.productName}}</text>
<view class="queren">
<text>璇疯緭鍏�</text>锛�
<u--input
type='digit'
border="bottom"
- :placeholder="isNumOk ? '鏁伴噺' :'鎶樺惃'"
+ :placeholder="/鑱氭隘涔欑儻鏍戣剛/.test(activeObj.productName) ? '瀹為檯鍚ㄦ暟' : isNumOk ? '鏁伴噺' :'鎶樺惃'"
v-model="checkNum"
>
</u--input>
@@ -236,7 +250,6 @@
</template>
<script>
- import { BaseUrl } from '@/api/publicInterface.js'
import { mapState, mapMutations, mapGetters } from 'vuex';
export default {
props: {
@@ -254,6 +267,8 @@
}else{
if(this.errorStatusList.includes(item.status)){
return false
+ }else if (item.productName ==='浜屾隘涔欑兎(EDC)' && item.checkStatus !== 7){
+ return false;
}else{
return true;
}
@@ -308,6 +323,7 @@
},
data() {
return {
+ proType:['鏁ｈ','娑叉埃鐡惰','缃愯','PVC25','PVC80','PVC1150','PVc1200'],
dataForm: {
firstClass: "",
secondClass: "",
@@ -326,6 +342,7 @@
typeText:'', // 纭瑁呭嵏涓夌绫诲瀷
isNumOk:false, //璁′欢
isClean:false, // 鎶樺惃
+ isFlagNum:false,// PVCV
// 鍦哄湴鎿嶄綔鑿滃崟
firstClassActionsList: [],
firstClassShow: false,
@@ -384,11 +401,18 @@
uni.hideLoading()
if (res.code === 0) {
this.firstClassActionsList = res.data;
+ this.firstClassActionsList.unshift({name:'鍏ㄩ儴',id:res.data.map(item=>item.id).join(',')})
if(res.data.length){
- 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 = '鍏ㄩ儴'
+ if(!uni.getStorageSync('bunkerIds')){
+ this.dataForm.firstClass = '鍏ㄩ儴'
+ this.dataForm.bunkerIds = res.data.map(item=>item.id).join(',')
+ uni.setStorageSync('bunkerIds',res.data.map(item=>item.id).join(','))
+ }else{
+ this.dataForm.bunkerIds = uni.getStorageSync('bunkerIds');
+ uni.setStorageSync('bunkerIds',this.dataForm.bunkerIds)
+ }
+
+
this.getDetailData();
}
@@ -396,7 +420,7 @@
this.$u.toast('鍔犺浇澶辫触')
}
}).then(() => {
- this.getUserInfo()
+
})
},
firstClassSelect() {
@@ -475,31 +499,38 @@
if( (parintItem.orderType === '澶栬喘' ||parintItem.orderType === '澶栬喘閫�' ) && item.isWeight === 0){
this.isNumOk = true;
this.isClean = false;
+ this.isFlagNum = false;
//鍥炴樉璁℃暟閲�
this.checkNum = item.productQuantity ? item.productQuantity : '';
}else if( parintItem.orderType ==='澶栬喘' && item.isWeight === 1){
this.isClean = true;
this.isNumOk = false;
+ this.isFlagNum = false;
}else{
this.isNumOk = false;
this.isClean = false;
+ this.isFlagNum = false;
}
//鑱氭隘涔欑儻鏍戣剛
if(parintItem.orderType ==='澶栭攢' && (/鑱氭隘涔欑儻鏍戣剛/.test(item.productName) || item.productName === 'PVC') && (item.packingType === 3 || item.packingType === 4)){
- this.isNumOk = true;
+ this.isNumOk = false;
this.isClean = false;
+ this.isFlagNum = true;;
+ this.checkNum = item.planMeasure;
}
//鐡惰娑叉隘鏉′欢
//EDC 璐ㄦ瀹屾垚鏂瑰彲纭
if(item.packingType === 1){
this.isNumOk = true;
this.isClean = false;
+ this.isFlagNum = false;
}
//
//pvc澶у寘鑷姩璁＄畻鎶樺惃
if((/鑱氭隘涔欑儻鏍戣剛/.test(item.productName) || item.productName === 'PVC') && item.packingType === 5){
this.isNumOk = true;
this.isClean = false;
+ this.isFlagNum = false;
}
if(parintItem.orderType === '澶栬喘'){
this.isEmptyCar = '1';
@@ -523,11 +554,11 @@
uni.showLoading({
title:'鍔犺浇涓�'
});
- console.log(this.activeObj,this.activeObj.productName ==='EDC' && this.activeObj.checkStatus !== 7,'12313')
- if(this.activeObj.productName ==='EDC' && this.activeObj.checkStatus !== 7){
+ 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璁㈠崟璐ㄦ鐘舵�佸悗鍦ㄧ‘璁よ鍗�!`);
+ this.$u.toast(`璇锋鏌ュ綋鍓嶄簩姘箼鐑�(EDC)DC璁㈠崟璐ㄦ鐘舵�佸悗鍦ㄧ‘璁よ鍗�!`);
}else if( this.isEmptyCar === null){
this.$u.toast(`璇锋鏌�${this.isNumOk ? '璁′欢鏁伴噺' :'鎶樺惃'}锛屼互鍙婃槸鍚︾┖杞﹀嚭鍘傞」!`);
@@ -538,7 +569,9 @@
productQuantity:this.isNumOk ? this.checkNum : '',
discount:this.isClean ? this.checkNum : null,
isEmptyCar:this.isEmptyCar,
- isPretendDischar:this.activeObj.isPretendDischar
+ isPretendDischar:this.activeObj.isPretendDischar,
+ realityMeasure:this.isFlagNum ? this.checkNum : null,
+ productId:this.isFlagNum ? this.activeObj.productId : null,
},'json').then(res=>{
uni.hideLoading();
console.log(res,'rez')
@@ -697,7 +730,7 @@
}
.btnBox{
- min-width: 130rpx;
+ min-width: 100rpx;
display: flex;
justify-content: space-around;
text{
--
Gitblit v1.9.1