From 16c42e89312ec86a5c75092cc3bf83d2fe625c8f Mon Sep 17 00:00:00 2001
From: yangan <yangan0921@163.com>
Date: 星期一, 16 十二月 2024 10:13:37 +0800
Subject: [PATCH] feat:pvc拼单大于40二次确认
---
pages/loadUnload-page/selectTarget/selectTarget.vue | 44 ++++++++++++++++++++++++++++++++++----------
1 files changed, 34 insertions(+), 10 deletions(-)
diff --git a/pages/loadUnload-page/selectTarget/selectTarget.vue b/pages/loadUnload-page/selectTarget/selectTarget.vue
index 9a25123..b760739 100644
--- a/pages/loadUnload-page/selectTarget/selectTarget.vue
+++ b/pages/loadUnload-page/selectTarget/selectTarget.vue
@@ -68,7 +68,6 @@
class="collItem"
:title="'寰呰鍗告敹鍙戝崟'">
<view class="history-information"
- @click="viewDetail(item)"
v-for="item,i in detailData"
:key="i">
<view class="first">
@@ -139,8 +138,8 @@
<uni-td align="center">
<view class="btnBox">
<!-- -->
- <!-- <u-button text='鏌ョ湅' @click="viewDetail(subItem)"></u-button> -->
- <u-button type='primary' text='纭瑁呭嵏' size='mini' v-if="subItem.flag && isBtnShow(item) && !( item.tmTaskCoalList.length >1 && !item.tmTaskCoalList.find(item=>item.isWeight !== 0) && item.packingType !== 1)" @click.native.stop="enterOk(item,subItem)"></u-button>
+ <u-button size='mini' v-if="item.isPindan === 1 && $store.state.pvcIdList.includes(subItem.productId) " type='primary' text='鏌ョ湅鎷煎崟' @click.native.stop="toViewPindan(subItem)"></u-button>
+ <u-button type='primary' text='纭瑁呭嵏' size='mini' v-if="subItem.flag && isBtnShow(item) && !( item.tmTaskCoalList.length >1 && !item.tmTaskCoalList.find(item=>item.isWeight !== 0) && item.packingType !== 1) && item.isPindan!==2" @click.native.stop="enterOk(item,subItem)"></u-button>
</view></uni-td>
<uni-td align="left">
<view>{{ subItem.productName + ( subItem.productGrade ? '-' + subItem.productGrade :'') }}</view></uni-td>
@@ -443,6 +442,18 @@
>
</u-radio>
</u-radio-group></view>
+ <!-- 鎶樺惃鍘熷洜 -->
+ <view class="queren" style="display: flex;" v-if="isClean && isCleanFlag === '1'">
+ <text>鎶樺惃鍘熷洜锛�
+ </text><u--input
+ clearable
+ type='text'
+ border="bottom"
+ v-model="discountReason"
+ placeholder="璇疯緭鍏ユ姌鍚ㄥ師鍥�"
+ />
+
+ </view>
<view v-if="isClean && isCleanFlag === '1'"><text>鎶樺惃鐓х墖:</text><u-upload :fileList="fileList1"
@afterRead="afterRead"
@delete="deletePic"
@@ -547,7 +558,7 @@
if(!item){
return false
}else{
- if( item.status === 6){
+ if( item.status === 6 || item.isPindan == 1){
return false
}else{
return true;
@@ -606,6 +617,7 @@
enterXg:false,
isOkNum:'',
fileList1:[],
+ discountReason:'',
activeObjedit:{},
discountJpg:'',
proType:['鏁ｈ','娑叉隘鐡惰','缃愯','PVC25','PVC80','PVC1150','PVc1200'],
@@ -810,6 +822,12 @@
close(){
},
+ toViewPindan(item){
+ uni.navigateTo({
+ url: `/subPages/pvcSplicePage/view?item=${JSON.stringify(item) }`
+ });
+
+ },
uploadFilePromise(url, num) {
return new Promise((resolve, reject) => {
let a = uni.uploadFile({
@@ -900,7 +918,13 @@
},
enterOk(parintItem,item){
- this.yelvFlag = false;
+ if(parintItem.isPindan === 1 && this.$store.state.pvcIdList.includes( item.productId) ){
+ uni.navigateTo({
+ url: `/subPages/pvcSplicePage/kuguan?id=${parintItem.id}&item=${JSON.stringify(parintItem)}`
+ });
+
+ }else{
+ this.yelvFlag = false;
console.log(parintItem,'priintItem')
// uni.request({
// url: `${BaseUrl}/admin/dict/type/tray_weight`,
@@ -1002,6 +1026,8 @@
// }
this.enterZx = true;
+ }
+
},
closeModal(){
@@ -1015,6 +1041,7 @@
cancelModal(){
this.enterZx = false;
this.checkNum = '';
+ this.discountReason = ''; //鎯呭喌澶囨敞
this.isEmptyCar = null;
},
cancelModaledit(){
@@ -1031,10 +1058,6 @@
}else if( this.isEmptyCar === null){
this.$u.toast(`璇锋鏌�${this.isNumOk ? '璁′欢鏁伴噺' :'鎶樺惃'}锛屼互鍙婃槸鍚︾┖杞﹀嚭鍘傞」!`);
//瑁呭嵏 涓� 2 锛屼絾鏄繀椤诲緱绉伴噸
- }else if( (this.activeObj.isWeight === 2 ) && (!this.activeObj.skin && !this.activeObj.hair) ){
- console.log('銆嬨�嬨�嬨�嬨�嬨�嬨�嬨�嬨�嬨�嬨�嬭Е鍙�')
- this.enterZx = false;
- this.$u.toast(`璇峰厛绉伴噸鍚庤鍗哥‘璁わ紒`);
}
else{
this.enterZx = false;
@@ -1047,7 +1070,8 @@
realityMeasure:this.isFlagNum ? this.checkNum : null,
productId:this.isFlagNum ? this.activeObj.productId : null,
discountJpg:this.discountJpg,
- containerNumber:this.activeObj.containerNumber ? this.activeObj.containerNumber : null
+ containerNumber:this.activeObj.containerNumber ? this.activeObj.containerNumber : null,
+ discountReason:this.discountReason,
},'json').then(res=>{
uni.hideLoading();
console.log(res,'rez')
--
Gitblit v1.9.1