From eb59423e9bbb141d04c8c6d5a260109a8c87aeb4 Mon Sep 17 00:00:00 2001
From: yangan <yangan0921@163.com>
Date: 星期二, 24 九月 2024 17:07:09 +0800
Subject: [PATCH] feat:合卡，记住密码，库管折吨设置
---
pages/loadUnload-page/selectTarget/selectTarget.vue | 117 +++++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 82 insertions(+), 35 deletions(-)
diff --git a/pages/loadUnload-page/selectTarget/selectTarget.vue b/pages/loadUnload-page/selectTarget/selectTarget.vue
index 1c18b4f..d7f3f52 100644
--- a/pages/loadUnload-page/selectTarget/selectTarget.vue
+++ b/pages/loadUnload-page/selectTarget/selectTarget.vue
@@ -67,7 +67,9 @@
ref="collapseHeight"
class="collItem"
:title="'寰呰鍗告敹鍙戝崟'">
- <view class="history-information" v-for="item,i in detailData"
+ <view class="history-information"
+ @click="viewDetail(item)"
+ v-for="item,i in detailData"
:key="i">
<view class="first">
<view class="">{{ item.carNo || '' }}</view>
@@ -114,14 +116,14 @@
<uni-th width='120'
align="center">鎿嶄綔</uni-th>
<uni-th align="center" width='800'>浜у搧</uni-th>
- <uni-th align="center" width='85'>绛夌骇</uni-th>
- <uni-th align="center" width='85'>鍖呰</uni-th>
+ <uni-th align="center" width='110'>绛夌骇</uni-th>
+ <uni-th align="center" width='110'>鍖呰</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" width='100'>璁″垝閲�</uni-th>
+ <uni-th align="center" width='120'>璁″垝閲�</uni-th>
<!-- <uni-th align="center" width='100'>瀹為檯閲�</uni-th> -->
</uni-tr>
@@ -129,8 +131,8 @@
<uni-td align="center">
<view class="btnBox">
<!-- -->
- <u-button text='鏌ョ湅' @click="viewDetail(subItem)"></u-button>
- <u-button type='primary' text='纭瑁呭嵏' v-if="subItem.flag && isBtnShow(item)" @click="enterOk(item,subItem)"></u-button>
+ <!-- <u-button text='鏌ョ湅' @click="viewDetail(subItem)"></u-button> -->
+ <u-button type='primary' text='纭瑁呭嵏' size='mini' v-if="subItem.flag && isBtnShow(item)" @click.native.stop="enterOk(item,subItem)"></u-button>
</view></uni-td>
<uni-td align="left">
<view>{{ subItem.productName }}</view></uni-td>
@@ -141,7 +143,7 @@
</uni-td>
<!-- <uni-td>
<view>{{ subItem.bunkerName }}</view>
- </uni-td>
+ </uni-td>
<uni-td>
<view class="name" v-if="subItem.skin">{{ Number(subItem.skin).toFixed(2) || '' }}</view>
</uni-td>
@@ -239,23 +241,23 @@
<uni-tr>
<uni-th width='120'
align="center">鎿嶄綔</uni-th>
- <uni-th align="center" width='300'>浜�1鍝�</uni-th>
- <uni-th align="center" width='100'>浜у搧绛夌骇</uni-th>
- <uni-th align="center" width='100'>鍖呰绫诲瀷</uni-th>
+ <uni-th align="center" width='800'>浜у搧</uni-th>
+ <uni-th align="center" width='90'>绛夌骇</uni-th>
+ <uni-th align="center" width='90'>鍖呰</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" width='100'>璁″垝閲�</uni-th>
+ <!-- <uni-th align="center" width='100'>瀹為檯閲�</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>
+ <u-button type='primary' text='鎷煎崟' size='mini' v-if="isPinShow(item)" @click="pinDan(subItem)"></u-button>
</view></uni-td>
<uni-td w align="center">
<view>{{ subItem.productName }}</view></uni-td>
@@ -281,9 +283,6 @@
</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">
@@ -312,24 +311,27 @@
@close='firstClassClose'
@select="firstClassSelectClick"></u-action-sheet>
<u-modal :show="enterZx"
- :title="'鎻愮ず'"
+ :title="'纭瑁呭嵏'"
@close="closeModal"
- :width='700'
+ :width='740'
@cancel="cancelModal"
@confirm="confirmModal"
:closeOnClickOverlay="true"
:showCancelButton="true">
<view class="slot-content">
- 鏄惁纭瑁呭嵏锛�
<view v-if="isNumOk || isClean||isFlagNum">
<view>浜у搧鍚嶇О锛歿{activeObj.productName}}</view>
<view>浠撳簱锛歿{activeObj.bunkerName}}</view>
+ <view v-if="activeObj.isWeight === 1">
<view>鐨噸锛歿{ Number(activeObj.skin).toFixed(2) || ''}}</view>
<view>姣涢噸锛歿{Number(activeObj.hair).toFixed(2) || ''}}</view>
<view >鍑�閲嶏細{{ Number(activeObj.clean).toFixed(2) || ''}}</view>
- <view>璁″垝閲忥細{{activeObj.planMeasure || '鏆傛棤'}}</view>
- <view>瀹為檯閲忥細{{activeObj.realityMeasure || '鏆傛棤'}}</view>
- <view class="queren">
+ </view>
+ <view v-if="/鑱氭隘涔欑儻鏍戣剛/.test(activeObj.productName)">
+ <view>璁″垝閲忥細{{Number(activeObj.planMeasure)}}</view>
+ <view >瀹為檯閲忥細{{ Number(activeObj.realityMeasure)}}</view>
+ </view>
+ <view class="queren" v-show="isCleanFlag === '1'">
<text>璇疯緭鍏�</text>锛�
<u--input
type='digit'
@@ -340,6 +342,35 @@
</u--input>
<text> {{isNumOk ? '浠�' : '鍚�' }}</text>
</view>
+ <!-- 鏄惁杈撳叆鎶樺惃 -->
+ <view style="display:flex;margin-top:20rpx" v-if="isClean">鏄惁闇�瑕佹姌鍚細 <u-radio-group
+ v-model="isCleanFlag"
+ placement="row"
+ @change="isCleanChange"
+ 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 class="pvcBig" v-if="activeObj.productName === '鑱氭隘涔欑儻鏍戣剛' && activeObj.packingType === 5">
@@ -348,7 +379,7 @@
<view v-if="activeObj.containerNumber"><span>闆嗚绠卞彿锛�</span>{{activeObj.containerNumber}}</view>
</view>
- <view>鏄惁绌鸿溅鍑哄巶: <u-radio-group
+ <view style="display:flex;margin-top:20rpx">鏄惁绌鸿溅鍑哄巶: <u-radio-group
v-model="isEmptyCar"
placement="row"
iconPlacement="right"
@@ -407,7 +438,6 @@
computed:{
isBtnShow(){
return function(item){
- console.log(item,'itemssss')
if(!item){
return false
}else{
@@ -425,7 +455,6 @@
},
isPinShow(){
return function(item){
- console.log(item,'itemssss')
if(!item){
return false
}else{
@@ -485,18 +514,19 @@
},
data() {
return {
- proType:['鏁ｈ','娑叉埃鐡惰','缃愯','PVC25','PVC80','PVC1150','PVc1200'],
+ proType:['鏁ｈ','娑叉隘鐡惰','缃愯','PVC25','PVC80','PVC1150','PVc1200'],
coalStatus: ['棰嗗彇', '棰勭害', '绛惧埌', '鍏ュ満', '绉扮毊', '绉版瘺', '绂诲満', '鍏ョ鎴�', '鍑虹鎴�', '鍏ヤ粨搴�', '鍑轰粨搴�', '鏀剧┖', '浣滃簾', '鍏ュ満鐢宠',
'杩涘叆鍦洪櫌', '寮傚父瀹℃牳涓�', '杩斿洖鍔犲噺鍚�', '瓒呮椂', '鎵撳嵃涓�', '鎵撳嵃涓�', '濉啓', '鏀剧┖纭涓�', '瓒呮渶澶ф瘺閲嶇‘璁や腑','琛ユ墦','鍏ュ満妫�鏌�','璐ㄦ涓�',
'绂诲満妫�鏌�','宸叉墦鍗�','瑁呭嵏','杩斿洖鍔犲噺鍚ㄧ‘璁や腑'
],
+ isCleanFlag:'0',
dataForm: {
firstClass: "",
secondClass: "",
orderType: '',
bunkerIds:""
},
- historyData:[],
+ historyData:[],
messageObj:{
carNo:'',
},
@@ -508,7 +538,7 @@
enterZx:false,
typeText:'', // 纭瑁呭嵏涓夌绫诲瀷
isNumOk:false, //璁′欢
- isClean:false, // 鎶樺惃
+ isClean:false, // 鎶樺惃
isFlagNum:false,// PVCV
// 鍦哄湴鎿嶄綔鑿滃崟
firstClassActionsList: [],
@@ -647,11 +677,11 @@
})
},
- viewDetail(item){
+ viewDetail(value){
//鏌ョ湅鏀跺彂鍗曡鎯�
- uni.navigateTo({
- url: `/subPages/loadUnlaodPageDetail/detail?id=${item.id}&checkId=${item.checkId}`
- });
+ uni.navigateTo({
+ url: `/subPages/fayunPlanDetails/fayunPlanMore/fayunPlanMore?id=${value.id}&orderType=${value.orderType}`,
+ })
},
firstClassSelectClick(val) {
this.dataForm.firstClass = val.name;
@@ -674,6 +704,13 @@
},
close(){
+
+ },
+ isCleanChange(val){
+ console.log(val,'瑙﹀彂')
+ if(val === '0'){
+ this.checkNum = '';
+ }
},
open(){},
@@ -736,6 +773,12 @@
}else if(parintItem.orderType === '澶栭攢' || parintItem.orderType === '澶栬喘閫�'){
this.isEmptyCar = '0';
}
+
+ //澶栭攢涓嶇敤 杈撳叆鎶樺惃
+ if(parintItem.orderType ==='澶栭攢'){
+ this.isClean = false;
+
+ }
this.enterZx = true;
},
@@ -781,10 +824,11 @@
uni.hideLoading();
}else{
this.$u.toast('鎿嶄綔鎴愬姛');
- }
- setTimeout(() => {
+ setTimeout(() => {
this.getDetailData();
}, 500);
+ }
+
}).catch((err) => {
this.$u.toast(err.msg || '澶辫触');
@@ -939,6 +983,9 @@
min-width: 100rpx;
// display: flex;
justify-content: space-around;
+ :v-deep .u-button__text{
+ font-size: 12px!important;
+ }
text{
color: #035cfb;
}
@@ -948,7 +995,7 @@
margin: 10px;
// margin-top: vww(100);
position: relative;
- top: vww(-160);
+ top: vww(-200);
.top-tag{
width: 60%;
margin-left: 55%;
--
Gitblit v1.9.1