From 65d1e61e0546a5a7b42381b1f11a5ad6ed2ce145 Mon Sep 17 00:00:00 2001
From: wk
Date: 星期六, 29 六月 2024 13:50:15 +0800
Subject: [PATCH] feta：道路指引
---
pages/loadUnload-page/selectTarget/selectTarget.vue | 115 ++++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 93 insertions(+), 22 deletions(-)
diff --git a/pages/loadUnload-page/selectTarget/selectTarget.vue b/pages/loadUnload-page/selectTarget/selectTarget.vue
index ce523c3..2621ffa 100644
--- a/pages/loadUnload-page/selectTarget/selectTarget.vue
+++ b/pages/loadUnload-page/selectTarget/selectTarget.vue
@@ -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,7 +101,7 @@
<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>
@@ -119,12 +115,12 @@
<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" @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 class="name">{{ subItem.bunkerName }}</view>
</uni-td>
<uni-td>
<view class="name">{{ subItem.skin }}</view>
@@ -172,6 +168,7 @@
<view class="queren">
<text>璇疯緭鍏�</text>锛�
<u--input
+ type='digit'
border="bottom"
:disabled="activeObj.productName === 'PVC' && activeObj.packingType === 5"
:placeholder="isNumOk ? '鏁伴噺' :'鎶樺惃'"
@@ -186,6 +183,33 @@
</view>
<view v-if="isNumOk && activeObj.productQuantity">褰撳墠鏁伴噺锛歿{activeObj.productQuantity}}浠�</view>
<view v-if="activeObj.containerNumber"><span>闆嗚绠卞彿锛�</span>{{activeObj.containerNumber}}</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>
</view>
@@ -208,6 +232,7 @@
</template>
<script>
+ import { BaseUrl } from '@/api/publicInterface.js'
export default {
props: {
loadUnloadData: {
@@ -233,6 +258,7 @@
orderType: '',
bunkerId:""
},
+ isEmptyCar:null, //鏄惁绌鸿溅鍑哄巶
checkStatusList:[
'寰呭彇鏍�','宸插彇鏍�','璐ㄦ涓�','寰呭鏍�','澶嶆牳涓�','寰呭瀹�','瀹″畾涓�','宸插畬鎴�'
],
@@ -256,6 +282,7 @@
filedId: "",
selectedCoal: [],
orderTypeShow: false,
+ pvcWeight:'',
orderTypeList: [{
name: '澶栭攢',
id: Math.floor(Math.random() * 100) + 1,
@@ -271,6 +298,9 @@
};
},
methods: {
+ getPVCWeight(){
+
+ },
viewDetail(item){
//鏌ョ湅鏀跺彂鍗曡鎯�
uni.navigateTo({
@@ -284,6 +314,7 @@
this.userInfo.password = null
})
},
+
// 鑾峰彇鐓ゅ満
getDeptIdFiled() {
uni.showLoading({
@@ -360,23 +391,53 @@
close(){
},
+
+
+
+
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) => {
+ console.log(res, '缁戝畾缁撴灉');
+ this.pvcWeight = res.data.data[0].value ? Number(res.data.data[0].value) : '';
+
+ }
+ })
this.activeObj = item;
- if( (item.orderType === '澶栬喘' ||item.orderType === '澶栬喘閫�' ) && item.productQuantity){
+ if( (parintItem.orderType === '澶栬喘' ||parintItem.orderType === '澶栬喘閫�' ) && item.isWeight === 0){
this.isNumOk = true;
this.isClean = false;
- }else if( item.orderType ==='澶栬喘' && item.isWeight === 1){
+ //鍥炴樉璁℃暟閲�
+ this.checkNum = item.productQuantity ? item.productQuantity : '';
+ }else if( parintItem.orderType ==='澶栬喘' && item.isWeight === 1){
this.isClean = true;
this.isNumOk = false;
- }else{
+ }else if(parintItem.orderType ==='澶栭攢' && item.productName ==='PVC' && (item.packingType === 3 || item.packingType === 4)){
+ this.isNumOk = true;
+ this.isClean = false;
+ }
+ else{
this.isNumOk = false;
this.isClean = false;
}
//pvc澶у寘鑷姩璁＄畻鎶樺惃
- if(item.productName === 'PVC' && item.packingType === 5){
- this.checkNum = (Number(item.productQuantity) * 60)
+ if(parintItem.productName === 'PVC' && item.packingType === 5){
+ this.checkNum = (Number(item.productQuantity) * this.pvcWeight)
+ }
+ if(parintItem.orderType === '澶栬喘'){
+ this.isEmptyCar = '1';
+ }else if(parintItem.orderType === '澶栭攢' || parintItem.orderType === '澶栬喘閫�'){
+ this.isEmptyCar = '0';
}
this.enterZx = true;
@@ -384,20 +445,27 @@
closeModal(){
this.enterZx = false;
this.checkNum = '';
+ this.isEmptyCar = null;
},
cancelModal(){
this.enterZx = false;
this.checkNum = '';
+ this.isEmptyCar = null;
},
confirmModal(){
- this.enterZx = false;
uni.showLoading({
title:'鍔犺浇涓�'
- })
- this.$reqPost('confirmLoadAndUnload',{
+ });
+ if(!this.checkNum || this.isEmptyCar === null){
+ this.$u.toast(`璇锋鏌�${this.isNumOk ? '璁′欢鏁伴噺' :'鎶樺惃'}锛屼互鍙婃槸鍚︾┖杞﹀嚭鍘傞」!`);
+ return
+ }else{
+ this.enterZx = false;
+ this.$reqPost('confirmLoadAndUnload',{
id: this.activeObj.id,
- productQuantity:this.isNumOk ? this.checkNum :this.activeObj.skin,
+ productQuantity:this.isNumOk ? this.checkNum : '',
discount:this.isClean ? this.checkNum : null,
+ isEmptyCar:this.isEmptyCar,
isPretendDischar:this.activeObj.isPretendDischar
},'json').then(res=>{
uni.hideLoading();
@@ -420,6 +488,8 @@
uni.hideLoading();
})
+ }
+
},
//鍒ゆ柇鏄惁鏄� 涓夌鐗规畩绫诲瀷瀵瑰簲寮圭獥
judgeTypeFun(name){
@@ -434,8 +504,6 @@
})
}
-
-
},
onShow(){
@@ -456,9 +524,12 @@
this.$u.toast('鍔犺浇澶辫触')
}
}).then(() => {
+
this.getUserInfo()
- })
- }
+ });
+
+
+ },
}
</script>
--
Gitblit v1.9.1