From a28d0135ee42809b2c5863609da37155d3ecba5b Mon Sep 17 00:00:00 2001
From: yangan <yangan0921@163.com>
Date: 星期二, 29 四月 2025 15:11:39 +0800
Subject: [PATCH] feat:增加类型显示
---
pages/loadUnload-page/selectTarget/selectTarget.vue | 77 +++++++++++++++++++++++++++-----------
1 files changed, 54 insertions(+), 23 deletions(-)
diff --git a/pages/loadUnload-page/selectTarget/selectTarget.vue b/pages/loadUnload-page/selectTarget/selectTarget.vue
index df5292b..899dfe5 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">
@@ -115,7 +114,6 @@
<view class="fourth">
<view class="senddate">{{ proType[item.packingType] }}</view>
</view>
-
<view class="table">
<uni-table border stripe
emptyText="鏆傛棤鏇村鏁版嵁">
@@ -128,7 +126,7 @@
<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='120'>{{item.orderType === '澶栭攢' ? '鐨噸' : '姣涢噸'}}</uni-th>
<uni-th align="center" width='120'>璁″垝閲�</uni-th>
<uni-th align="center" width='150'>璁￠噸鏂瑰紡</uni-th>
@@ -139,8 +137,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(item)"></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) && subItem.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>
@@ -160,7 +158,7 @@
<view class="name">{{ subItem.productQuantity }}</view>
</uni-td> -->
<uni-td align="right">
- <view class="name">{{ subItem.productQuantity }}</view>
+ <view class="name">{{ item.orderType === '澶栭攢' ? subItem.skin : subItem.hair }}</view>
</uni-td>
<uni-td align="right">
<view class="name">{{ subItem.planMeasure }}</view>
@@ -228,6 +226,10 @@
<view class="third-line" v-if="item.productName === '浜屾隘涔欑兎(EDC)'">
<view class="third-line_text">璐ㄦ鐘舵��:</view>
<view> <u-tag :text="checkStatusList[item.checkStatus]" plain > </u-tag></view>
+ </view>
+ <view class="third-line">
+ <view class="third-line_text">鐨噸:</view>
+ <view> {{item.skin}}</view>
</view>
</view>
<view class="fourth">
@@ -348,13 +350,22 @@
<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
+ readonly
+ 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="isClean || isFlagNum || blend">璇疯緭鍏ワ細</text>
+ <text v-if="isNumOk || isFlagNum">纭閲忥細</text>
+ <text v-if="isClean || blend">璇疯緭鍏ワ細</text>
<u--input
type='digit'
:disabled="yelvFlag"
@@ -363,18 +374,11 @@
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 v-if="activeObj.containerNumber" style="display: flex;"><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 style="display:flex;margin-top:20rpx" v-if="isClean">鏄惁闇�瑕佹姌鍚細 <u-radio-group
@@ -442,6 +446,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"
@@ -546,7 +562,7 @@
if(!item){
return false
}else{
- if( item.status === 6){
+ if( item.status === 6 || item.isPindan == 1){
return false
}else{
return true;
@@ -605,6 +621,7 @@
enterXg:false,
isOkNum:'',
fileList1:[],
+ discountReason:'',
activeObjedit:{},
discountJpg:'',
proType:['鏁ｈ','娑叉隘鐡惰','缃愯','PVC25','PVC80','PVC1150','PVc1200'],
@@ -809,6 +826,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({
@@ -899,7 +922,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`,
@@ -1001,6 +1030,8 @@
// }
this.enterZx = true;
+ }
+
},
closeModal(){
@@ -1014,6 +1045,7 @@
cancelModal(){
this.enterZx = false;
this.checkNum = '';
+ this.discountReason = ''; //鎯呭喌澶囨敞
this.isEmptyCar = null;
},
cancelModaledit(){
@@ -1023,8 +1055,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璁㈠崟璐ㄦ鐘舵�佸悗鍦ㄧ‘璁よ鍗�!`);
@@ -1044,7 +1074,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