From b63dc8ccc6163e73b9f4e4b79f9497070e8ba5ec Mon Sep 17 00:00:00 2001 From: yangan <yangan0921@163.com> Date: 星期四, 05 十二月 2024 15:53:06 +0800 Subject: [PATCH] feat:PVC流程代码提交 --- pages/loadUnload-page/selectTarget/selectTarget.vue | 67 +++++++++++++++++++++++++++------ 1 files changed, 54 insertions(+), 13 deletions(-) diff --git a/pages/loadUnload-page/selectTarget/selectTarget.vue b/pages/loadUnload-page/selectTarget/selectTarget.vue index b9338f8..0507a33 100644 --- a/pages/loadUnload-page/selectTarget/selectTarget.vue +++ b/pages/loadUnload-page/selectTarget/selectTarget.vue @@ -130,7 +130,7 @@ <uni-th align="center" width='100'>鏁伴噺</uni-th> --> <uni-th align="center" width='120'>纭閲�</uni-th> <uni-th align="center" width='120'>璁″垝閲�</uni-th> - <uni-th align="center" width='120'>璁¢噸鏂瑰紡</uni-th> + <uni-th align="center" width='150'>璁¢噸鏂瑰紡</uni-th> <!-- <uni-th align="center" width='100'>瀹為檯閲�</uni-th> --> @@ -139,7 +139,7 @@ <uni-td align="center"> <view class="btnBox"> <!-- --> - <!-- <u-button text='鏌ョ湅' @click="viewDetail(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)" @click.native.stop="enterOk(item,subItem)"></u-button> </view></uni-td> <uni-td align="left"> @@ -264,7 +264,7 @@ <uni-th align="center" width='100'>鏁伴噺</uni-th> --> <uni-th align="center" width='120'>纭閲�</uni-th> <uni-th align="center" width='120'>璁″垝閲�</uni-th> - <uni-th align="center" width='120'>璁¢噸鏂瑰紡</uni-th> + <uni-th align="center" width='150'>璁¢噸鏂瑰紡</uni-th> </uni-tr> @@ -348,13 +348,21 @@ <view v-if="activeObj.skin">鐨噸锛歿{activeObj.skin.toFixed(2) || ''}}</view> <view v-if="activeObj.hair">姣涢噸锛歿{activeObj.hair.toFixed(2) || ''}}</view> </view> + <view v-if="activeObj.isContainerNum"><span>闆嗚绠卞彿锛� </span> + <u--input v-model="activeObj.containerNumber" + clearable + style="border: solid 1px #ccc;" + placeholder="杈撳叆闆嗚绠卞彿" + prefixIconStyle="color: #909399"></u--input> + <view><text style="color: red;">璇疯鐪熸牳瀵归泦瑁呯鍙峰啀鎻愪氦锛�</text></view> + </view> <!-- <view v-if="/鑱氭隘涔欑儻鏍戣剛/.test(activeObj.productName)"> <view>璁″垝閲忥細{{Number(activeObj.planMeasure)}}</view> <view >瀹為檯閲忥細{{ Number(activeObj.productQuantity)}}</view> </view> --> <view class="queren" v-show="isCleanFlag === '1'"> - <text v-if="isNumOk">纭閲忥細</text> - <text v-if="isNumOk || isFlagNum || blend">璇疯緭鍏ワ細</text> + <text v-if="isNumOk || isFlagNum">纭閲忥細</text> + <text v-if="isClean || blend">璇疯緭鍏ワ細</text> <u--input type='digit' :disabled="yelvFlag" @@ -363,9 +371,12 @@ v-model="checkNum" > </u--input> - <text v-if="isNumOk || isFlagNum || blend"> {{isNumOk ? activeObj.productUnit : '浠�' }}</text> - <text v-if="isClean"> {{'鍚�' }}</text> + <text v-if="isNumOk || isFlagNum || blend"> {{ activeObj.productUnit || '浠�' }}</text> + <text v-if="isClean"> {{activeObj.productUnit || '鍚�' }}</text> </view> + <!-- v-if="activeObj.containerNumber" --> + + <!-- 鏄惁杈撳叆鎶樺惃 --> <view style="display:flex;margin-top:20rpx" v-if="isClean">鏄惁闇�瑕佹姌鍚細 <u-radio-group v-model="isCleanFlag" @@ -399,8 +410,10 @@ <view class="pvcBig" v-if="activeObj.productName === '鑱氭隘涔欑儻鏍戣剛' && activeObj.packingType === 5"> </view> + + <view v-if=" activeObj.planMeasure">璁″垝閲忥細{{activeObj.planMeasure}}{{ activeObj.productUnit || '浠�' }}</view> - <view v-if="activeObj.containerNumber"><span>闆嗚绠卞彿锛�</span>{{activeObj.containerNumber}}</view> + </view> <view style="display:flex;margin-top:20rpx">鏄惁绌鸿溅鍑哄巶: <u-radio-group @@ -430,6 +443,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" @@ -593,6 +618,7 @@ enterXg:false, isOkNum:'', fileList1:[], + discountReason:'', activeObjedit:{}, discountJpg:'', proType:['鏁h','娑叉隘鐡惰','缃愯','PVC25','PVC80','PVC1150','PVc1200'], @@ -797,6 +823,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({ @@ -887,7 +919,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`, @@ -952,14 +990,14 @@ this.isCleanFlag = '1'; this.blend = false; this.isFlagNum = true;; - this.checkNum = item.planMeasure; + this.checkNum = item.productQuantity; } //鐡惰娑叉隘鏉′欢 //EDC 璐ㄦ瀹屾垚鏂瑰彲纭 if(item.packingType === 1){ this.isNumOk = true; this.isClean = false; - this.yelvFlag = true; + // this.yelvFlag = true; this.checkNum = item.productQuantity; this.blend = false; this.isCleanFlag = '1'; @@ -989,6 +1027,8 @@ // } this.enterZx = true; + } + }, closeModal(){ @@ -1002,6 +1042,7 @@ cancelModal(){ this.enterZx = false; this.checkNum = ''; + this.discountReason = ''; //鎯呭喌澶囨敞 this.isEmptyCar = null; }, cancelModaledit(){ @@ -1011,8 +1052,6 @@ uni.showLoading({ title:'鍔犺浇涓�' }); - console.log(this.activeObj,(this.activeObj.isWeight === 2 || this.activeObj.packingType === 1) && (this.activeObj.skin || this.activeObj.hair),'activeObj') - console.log(this.activeObj,this.activeObj.productName ==='浜屾隘涔欑兎(EDC)' && this.activeObj.checkStatus !== 7,'12313') if(this.activeObj.productName ==='浜屾隘涔欑兎(EDC)' && this.activeObj.checkStatus !== 7){ this.enterZx = false; this.$u.toast(`璇锋鏌ュ綋鍓嶄簩姘箼鐑�(EDC)DC璁㈠崟璐ㄦ鐘舵�佸悗鍦ㄧ‘璁よ鍗�!`); @@ -1032,6 +1071,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, + discountReason:this.discountReason, },'json').then(res=>{ uni.hideLoading(); console.log(res,'rez') -- Gitblit v1.9.1