From e2e96137d9b5e5dbac737e69809a941d676ba61e Mon Sep 17 00:00:00 2001
From: yangan <yangan0921@163.com>
Date: 星期二, 16 七月 2024 17:39:55 +0800
Subject: [PATCH] feat:修改业务文字
---
pages/loadUnload-page/selectTarget/selectTarget.vue | 164 ++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 128 insertions(+), 36 deletions(-)
diff --git a/pages/loadUnload-page/selectTarget/selectTarget.vue b/pages/loadUnload-page/selectTarget/selectTarget.vue
index 2e0adc3..4fb39eb 100644
--- a/pages/loadUnload-page/selectTarget/selectTarget.vue
+++ b/pages/loadUnload-page/selectTarget/selectTarget.vue
@@ -48,7 +48,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"
@@ -65,17 +65,13 @@
<view class=""></view>
</view>
<view class="second">
- <view class="coal-name">{{ item.productName || '' }}</view>
+ <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">
- <view class="third-line_text">浠撳簱:</view>
- <view >{{ item.bunkerName }}</view>
</view>
<view class="third-line" v-if="item.productName === 'EDC'">
<view class="third-line_text">璐ㄦ鐘舵��:</view>
@@ -105,11 +101,11 @@
<uni-th width='140'
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='220'>浠撳簱</uni-th>
+ <uni-th align="center" width='120'>鐨噸</uni-th>
+ <uni-th align="center" width='120'>姣涢噸</uni-th>
+ <uni-th align="center" width='120'>鍑�閲�</uni-th>
+ <uni-th align="center" width='120'>鏁伴噺</uni-th>
<!-- <uni-th align="center">浠撳簱</uni-th> -->
<!-- <uni-th align="center">鐘舵��</uni-th> -->
@@ -119,21 +115,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(subItem)" @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.orderType }}</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>
@@ -168,12 +164,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"
>
@@ -186,11 +181,38 @@
</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"
+ iconPlacement="right"
+ style="justify-content: space-evenly"
+ >
+ <u-radio
+ :key="1"
+ :label="'鏄�'"
+ :name="'1'"
+ shape="circle"
+ iconSize="32"
+ label-size="32"
+ size="40"
+ >
+ </u-radio>
+ <u-radio
+ :key="0"
+ :label="'鍚�'"
+ :name="'0'"
+ shape="circle"
+ iconSize="32"
+ label-size="32"
+ size="40"
+ >
+ </u-radio>
+ </u-radio-group></view>
</view>
</u-modal>
- <!-- 鐓や粨 -->
+ <!-- 浠撳簱 -->
<!-- <u-action-sheet :actions="secondClassActionsList"
:show="secondClassShow"
cancelText='鍙栨秷'
@@ -208,12 +230,32 @@
</template>
<script>
+ import { BaseUrl } from '@/api/publicInterface.js'
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;
+ }
+ }
+
+ }
+
+ }
+
},
watch: {
loadUnloadData: {
@@ -233,6 +275,7 @@
orderType: '',
bunkerId:""
},
+ isEmptyCar:null, //鏄惁绌鸿溅鍑哄巶
checkStatusList:[
'寰呭彇鏍�','宸插彇鏍�','璐ㄦ涓�','寰呭鏍�','澶嶆牳涓�','寰呭瀹�','瀹″畾涓�','宸插畬鎴�'
],
@@ -241,10 +284,10 @@
typeText:'', // 纭瑁呭嵏涓夌绫诲瀷
isNumOk:false, //璁′欢
isClean:false, // 鎶樺惃
- // 鐓ゅ満鎿嶄綔鑿滃崟
+ // 鍦哄湴鎿嶄綔鑿滃崟
firstClassActionsList: [],
firstClassShow: false,
- // 鐓や粨鎿嶄綔鑿滃崟
+ // 浠撳簱鎿嶄綔鑿滃崟
secondClassActionsList: [],
secondClassShow: false,
coalList: [],
@@ -256,6 +299,7 @@
filedId: "",
selectedCoal: [],
orderTypeShow: false,
+ pvcWeight:'',
orderTypeList: [{
name: '澶栭攢',
id: Math.floor(Math.random() * 100) + 1,
@@ -267,10 +311,14 @@
],
isOrderType: '璇烽�夋嫨', //纾呮埧绫诲瀷鏄惁閫夋嫨浜� 閫夋嫨浜嗘竻绌�
cleanIconClick: true, //淇敼鐐瑰嚮娓呯┖纾呮埧閫夋嫨浼氬嚭鐜�
+ errorStatusList:[0,1,6,24,27,26] // 涓嶈兘鐐瑰嚮纭瑁呭嵏鐨勭姸鎬�
};
},
methods: {
+ getPVCWeight(){
+
+ },
viewDetail(item){
//鏌ョ湅鏀跺彂鍗曡鎯�
uni.navigateTo({
@@ -284,7 +332,8 @@
this.userInfo.password = null
})
},
- // 鑾峰彇鐓ゅ満
+
+ // 鑾峰彇鍦哄湴
getDeptIdFiled() {
uni.showLoading({
title: "鍔犺浇涓�"
@@ -346,7 +395,7 @@
this.filedId = val.id
},
formHandle() {
- if (!this.dataForm.firstClass) return this.$u.toast('璇烽�夋嫨鐓ゅ満鎴栬�呯叅浠�');
+ if (!this.dataForm.firstClass) return this.$u.toast('璇烽�夋嫨鍦哄湴鎴栬�呬粨搴�');
this.$nextTick(()=>{
uni.navigateTo({
url: `/pages/loadUnload-page/loadUnload-detail/loadUnload-detail?bunkerId=${this.dataForm.bunkerId}`
@@ -361,24 +410,57 @@
},
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(parintItem.orderType === '澶栬喘'){
+ this.isEmptyCar = '1';
+ }else if(parintItem.orderType === '澶栭攢' || parintItem.orderType === '澶栬喘閫�'){
+ this.isEmptyCar = '0';
}
this.enterZx = true;
@@ -386,17 +468,24 @@
closeModal(){
this.enterZx = false;
this.checkNum = '';
+ this.isEmptyCar = null;
},
cancelModal(){
this.enterZx = false;
this.checkNum = '';
+ this.isEmptyCar = null;
},
confirmModal(){
uni.showLoading({
title:'鍔犺浇涓�'
});
- if(!this.checkNum){
- this.$u.toast(`璇疯緭鍏�${this.isNumOk ? '璁′欢鏁伴噺' :'鎶樺惃'}!`);
+ console.log(this.activeObj,'12313')
+ if(this.activeObj.productName ==='EDC' && this.activeObj.checkStatus !== 7){
+ this.$u.toast(`璇锋鏌ュ綋鍓岴DC璁㈠崟璐ㄦ鐘舵�佸悗鍦ㄧ‘璁よ鍗�!`);
+ return
+
+ }else if( this.isEmptyCar === null){
+ this.$u.toast(`璇锋鏌�${this.isNumOk ? '璁′欢鏁伴噺' :'鎶樺惃'}锛屼互鍙婃槸鍚︾┖杞﹀嚭鍘傞」!`);
return
}else{
this.enterZx = false;
@@ -404,6 +493,7 @@
id: this.activeObj.id,
productQuantity:this.isNumOk ? this.checkNum : '',
discount:this.isClean ? this.checkNum : null,
+ isEmptyCar:this.isEmptyCar,
isPretendDischar:this.activeObj.isPretendDischar
},'json').then(res=>{
uni.hideLoading();
@@ -428,6 +518,7 @@
})
}
+
},
//鍒ゆ柇鏄惁鏄� 涓夌鐗规畩绫诲瀷瀵瑰簲寮圭獥
judgeTypeFun(name){
@@ -442,8 +533,6 @@
})
}
-
-
},
onShow(){
@@ -464,9 +553,12 @@
this.$u.toast('鍔犺浇澶辫触')
}
}).then(() => {
+
this.getUserInfo()
- })
- }
+ });
+
+
+ },
}
</script>
@@ -487,7 +579,7 @@
.self-deliver {
position: relative;
top: vww(10);
- width: 95%;
+ width: 98%;
height: vww(40);
margin: vww(8) 10rpx;
padding: 0 vww(8);
--
Gitblit v1.9.1