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 | 27 ++++++++++++++++++---------
1 files changed, 18 insertions(+), 9 deletions(-)
diff --git a/pages/loadUnload-page/selectTarget/selectTarget.vue b/pages/loadUnload-page/selectTarget/selectTarget.vue
index d2949b4..ed49872 100644
--- a/pages/loadUnload-page/selectTarget/selectTarget.vue
+++ b/pages/loadUnload-page/selectTarget/selectTarget.vue
@@ -108,7 +108,7 @@
</view>
</view>
<view class="senddate">{{ item.orderCode }}</view>
- <view class="rightBtn"><u-button type='primary' text='涓�閿‘璁�' v-if="item.isWeight === 0" @click.native.stop="allOkBtn(item)"></u-button></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
@@ -208,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">
@@ -265,7 +265,7 @@
<uni-td align="center">
<view class="btnBox">
<!-- -->
- <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="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">
@@ -342,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>锛�
@@ -350,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>
@@ -389,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>
@@ -461,7 +461,7 @@
</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"
@@ -582,6 +582,7 @@
isCleanFlag:'1',
checkNumEdit:'',
showConfim:false,
+ remarkContent:'',
dataForm: {
firstClass: "",
secondClass: "",
@@ -894,7 +895,7 @@
this.blend = true;
this.isNumOk = false;
this.isClean = false;
- this.isCleanFlag = '0';
+ // this.isCleanFlag = '0';
this.isFlagNum = false;
}
else {
@@ -935,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;
@@ -1040,12 +1041,20 @@
//纭
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 : '鎿嶄綔寮傚父')
})
},
--
Gitblit v1.9.1