From 74073d164925eff4962188405355debb367aaf06 Mon Sep 17 00:00:00 2001
From: yangan <yangan0921@163.com>
Date: 星期四, 24 十月 2024 18:13:25 +0800
Subject: [PATCH] feat:小问题修改
---
pages/loadUnload-page/selectTarget/selectTarget.vue | 61 ++++++++++++++++++++++++------
1 files changed, 49 insertions(+), 12 deletions(-)
diff --git a/pages/loadUnload-page/selectTarget/selectTarget.vue b/pages/loadUnload-page/selectTarget/selectTarget.vue
index 55b70d1..ed49872 100644
--- a/pages/loadUnload-page/selectTarget/selectTarget.vue
+++ b/pages/loadUnload-page/selectTarget/selectTarget.vue
@@ -108,6 +108,7 @@
</view>
</view>
<view class="senddate">{{ item.orderCode }}</view>
+ <view class="rightBtn"><u-button type='primary' text='涓�閿‘璁�' v-if="item.isWeight === 0 && item.tmTaskCoalList.length >1 && item.packingType !== 1" @click.native.stop="allOkBtn(item)"></u-button></view>
</view>
<view class="table">
<uni-table border stripe
@@ -207,7 +208,7 @@
<view class=""></view>
</view>
<view class="second">
- <view class="coal-name">{{ item.productNames || item.productName }}</view>
+ <view class="coal-name">{{ item.productNames?limitString(item.productNames,20,'...'):'' || ''}}</view>
<view class="order-type">{{ item.orderType || '' }}</view>
</view>
<view class="third">
@@ -264,7 +265,7 @@
<uni-td align="center">
<view class="btnBox">
<!-- -->
- <u-button type='primary' text='淇敼' size='mini' @click="editOrder(subItem)"></u-button>
+ <!-- <u-button type='primary' text='淇敼' size='mini' v-if="subItem.isWeight === 0 || subItem.isWeight === 2 " @click="editOrder(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">
@@ -341,7 +342,7 @@
</view>
<view v-if="/鑱氭隘涔欑儻鏍戣剛/.test(activeObj.productName)">
<view>璁″垝閲忥細{{Number(activeObj.planMeasure)}}</view>
- <view >瀹為檯閲忥細{{ Number(activeObj.realityMeasure)}}</view>
+ <view >瀹為檯閲忥細{{ Number(activeObj.productQuantity)}}</view>
</view>
<view class="queren" v-show="isCleanFlag === '1'">
<text>璇疯緭鍏�</text>锛�
@@ -349,7 +350,7 @@
type='digit'
:disabled="yelvFlag"
border="bottom"
- :placeholder="/鑱氭隘涔欑儻鏍戣剛/.test(activeObj.productName) ? '瀹為檯鍚ㄦ暟' : isNumOk ? '鏁伴噺' : blend ? '鏁伴噺' : '鎶樺惃'"
+ :placeholder="/鑱氭隘涔欑儻鏍戣剛/.test(activeObj.productName) ? '瀹為檯鍚ㄦ暟' : isNumOk ? '纭鏁伴噺' : blend ? '纭鏁伴噺' : '鎶樺惃'"
v-model="checkNum"
>
</u--input>
@@ -388,7 +389,7 @@
<view class="pvcBig" v-if="activeObj.productName === '鑱氭隘涔欑儻鏍戣剛' && activeObj.packingType === 5">
</view>
- <view v-if="isNumOk && activeObj.productQuantity">褰撳墠鏁伴噺锛歿{activeObj.productQuantity}}{{ activeObj.productUnit || '浠�' }}</view>
+ <view v-if="isNumOk && activeObj.planMeasure">璁″垝閲忥細{{activeObj.planMeasure}}{{ activeObj.productUnit || '浠�' }}</view>
<view v-if="activeObj.containerNumber"><span>闆嗚绠卞彿锛�</span>{{activeObj.containerNumber}}</view>
</view>
@@ -458,6 +459,9 @@
</view>
</view>
+ </u-modal>
+ <u-modal :show="showConfim" @confirm="confirmEnter" :showCancelButton="true" @cancel="showConfim = false" ref="uModal" :asyncClose="true">
+ <view> 鏄惁纭畾涓�閿鍗革紵</view>
</u-modal>
<!-- 浠撳簱 -->
<!-- <u-action-sheet :actions="secondClassActionsList"
@@ -577,13 +581,16 @@
],
isCleanFlag:'1',
checkNumEdit:'',
+ showConfim:false,
+ remarkContent:'',
dataForm: {
firstClass: "",
secondClass: "",
orderType: '',
bunkerIds:""
},
- historyData:[],
+ historyData:[],
+ paramsItem:{},
messageObj:{
carNo:'',
},
@@ -851,6 +858,13 @@
},
open(){},
+ allOkBtn(item){
+ //鐐瑰嚮涓�閿‘璁�
+ this.paramsItem = item;
+
+ this.showConfim = true;
+
+ },
enterOk(parintItem,item){
this.yelvFlag = false;
console.log(parintItem,'priintItem')
@@ -881,7 +895,7 @@
this.blend = true;
this.isNumOk = false;
this.isClean = false;
- this.isCleanFlag = '0';
+ // this.isCleanFlag = '0';
this.isFlagNum = false;
}
else {
@@ -922,7 +936,7 @@
this.isNumOk = true;
this.isClean = false;
this.yelvFlag = true;
- this.checkNum = item.planMeasure;
+ this.checkNum = item.productQuantity;
this.blend = false;
this.isCleanFlag = '1';
this.isFlagNum = false;
@@ -981,10 +995,6 @@
}else if( this.isEmptyCar === null){
this.$u.toast(`璇锋鏌�${this.isNumOk ? '璁′欢鏁伴噺' :'鎶樺惃'}锛屼互鍙婃槸鍚︾┖杞﹀嚭鍘傞」!`);
//瑁呭嵏 涓� 2 锛屼絾鏄繀椤诲緱绉伴噸
- }else if( (this.activeObj.isWeight === 2 || this.activeObj.packingType === 1) && (!this.activeObj.skin && !this.activeObj.hair) ){
- console.log('銆嬨�嬨�嬨�嬨�嬨�嬨�嬨�嬨�嬨�嬨�嬭Е鍙�')
- this.enterZx = false;
- this.$u.toast(`璇峰厛绉伴噸鍚庤鍗哥‘璁わ紒`);
}
else{
this.enterZx = false;
@@ -1026,6 +1036,26 @@
//鍒ゆ柇鏄惁鏄� 涓夌鐗规畩绫诲瀷瀵瑰簲寮圭獥
judgeTypeFun(name){
+
+ },
+ //纭
+ confirmEnter(){
+ this.$reqPost('oneClickLoading',{tmId:this.paramsItem.id},'params').then((res) => {
+ if(res.code == 0){
+ console.log(res,'res')
+ this.$u.toast('涓�閿‘璁ゆ垚鍔�')
+ this.showConfim = false;
+ setTimeout(() => {
+ this.getDetailData();
+ }, 500);
+ }else{
+ this.showConfim = false;
+ this.$u.toast(res.msg ? res.msg : '涓�閿‘璁ゅけ璐�');
+ }
+
+ }).catch(err=>{
+ this.$u.toast(err ? err : '鎿嶄綔寮傚父')
+ })
},
//鏌ョ湅鏈�杩戜竴娆＄殑鍘熺洂閽欓晛
@@ -1079,6 +1109,11 @@
width: auto;
}
+}
+.rightBtn{
+ position: absolute;
+ right: 100rpx;
+ bottom: 5rpx;
}
.notice-bar{
margin-left: vww(10);
@@ -1236,6 +1271,7 @@
}
}
.history-information {
+ position: relative;
margin-bottom:30rpx;
margin-top: 10rpx;
background: #ffffff;
@@ -1313,6 +1349,7 @@
font-size: 30rpx;
font-weight: 300;
color: #515151;
+ position: relative;
margin: vww(10) vww(10) 0;
@include flex;
--
Gitblit v1.9.1