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 | 202 ++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 155 insertions(+), 47 deletions(-)
diff --git a/pages/loadUnload-page/selectTarget/selectTarget.vue b/pages/loadUnload-page/selectTarget/selectTarget.vue
index 55b70d1..0507a33 100644
--- a/pages/loadUnload-page/selectTarget/selectTarget.vue
+++ b/pages/loadUnload-page/selectTarget/selectTarget.vue
@@ -108,7 +108,14 @@
</view>
</view>
<view class="senddate">{{ item.orderCode }}</view>
+
+ <!-- v-if="item.isWeight === 0 && item.tmTaskCoalList.length >1 && item.packingType !== 1" -->
+ <view class="rightBtn"><u-button type='primary' v-if=" item.tmTaskCoalList.length >1 && !item.tmTaskCoalList.find(item=>item.isWeight !== 0) && item.packingType !== 1" text='涓�閿‘璁�' @click.native.stop="allOkBtn(item)"></u-button></view>
</view>
+ <view class="fourth">
+ <view class="senddate">{{ proType[item.packingType] }}</view>
+ </view>
+
<view class="table">
<uni-table border stripe
emptyText="鏆傛棤鏇村鏁版嵁">
@@ -116,8 +123,6 @@
<uni-th width='120'
align="center">鎿嶄綔</uni-th>
<uni-th align="center" width='800'>浜у搧</uni-th>
- <uni-th align="center" width='110'>绛夌骇</uni-th>
- <uni-th align="center" width='110'>鍖呰</uni-th>
<!-- <uni-th align="center" width='200'>浠撳簱</uni-th>
<uni-th align="center" width='100'>鐨噸</uni-th>
<uni-th align="center" width='100'>姣涢噸</uni-th>
@@ -125,6 +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='150'>璁￠噸鏂瑰紡</uni-th>
<!-- <uni-th align="center" width='100'>瀹為檯閲�</uni-th> -->
@@ -133,16 +139,11 @@
<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)" @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)" @click.native.stop="enterOk(item,subItem)"></u-button>
</view></uni-td>
<uni-td align="left">
- <view>{{ subItem.productName }}</view></uni-td>
- <uni-td align="center">
- <view>{{ subItem.productGrade }}</view></uni-td>
- <uni-td align="center">
- <view>{{ proType[item.packingType] }}</view>
- </uni-td>
+ <view>{{ subItem.productName + ( subItem.productGrade ? '-' + subItem.productGrade :'') }}</view></uni-td>
<!-- <uni-td>
<view>{{ subItem.bunkerName }}</view>
</uni-td>
@@ -164,7 +165,12 @@
<uni-td align="right">
<view class="name">{{ subItem.planMeasure }}</view>
</uni-td>
-
+ <uni-td align="right">
+ <u-tag :text="'璁℃暟'" plain v-if="subItem.isWeight==0"></u-tag>
+ <u-tag :text="'绉伴噸'" plain v-else-if="subItem.isWeight==1"></u-tag>
+ <u-tag :text="'绉伴噸璁℃暟'" plain v-else-if="subItem.isWeight==2"></u-tag>
+ <u-tag v-else></u-tag>
+ </uni-td>
<!-- <uni-td>
<view class="name">{{ subItem.realityMeasure }}</view>
</uni-td> -->
@@ -207,7 +213,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">
@@ -241,6 +247,9 @@
</view>
<view class="senddate">{{ item.orderCode }}</view>
</view>
+ <view class="fourth">
+ <view class="senddate">{{ proType[item.packingType] }}</view>
+ </view>
<view class="table">
<uni-table border stripe
emptyText="鏆傛棤鏇村鏁版嵁">
@@ -248,15 +257,14 @@
<uni-th width='120'
align="center">鎿嶄綔</uni-th>
<uni-th align="center" width='800'>浜у搧</uni-th>
- <uni-th align="center" width='90'>绛夌骇</uni-th>
- <uni-th align="center" width='90'>鍖呰</uni-th>
<!-- <uni-th align="center" width='200'>浠撳簱</uni-th>
<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='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'>璁″垝閲�</uni-th>
+ <uni-th align="center" width='150'>璁￠噸鏂瑰紡</uni-th>
</uni-tr>
@@ -264,19 +272,14 @@
<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">
- <view>{{ subItem.productName }}</view></uni-td>
- <uni-td align="center">
- <view>{{ subItem.productGrade }}</view></uni-td>
- <uni-td>
- <view>{{ proType[item.packingType] }}</view>
- </uni-td>
+ <uni-td align="left">
+ <view>{{ subItem.productName + ( subItem.productGrade ? '-' + subItem.productGrade :'') }}</view></uni-td>
<!-- <uni-td>
<view>{{ subItem.bunkerName }}</view>
- </uni-td>
+ </uni-td>
<uni-td>
<view class="name" v-if="subItem.skin">{{ Number(subItem.skin).toFixed(2) || '' }}</view>
</uni-td>
@@ -289,11 +292,17 @@
<uni-td>
<view class="name">{{ subItem.productQuantity }}</view>
</uni-td> -->
- <uni-td>
+ <uni-td align="right">
<view class="name">{{ subItem.productQuantity }}</view>
</uni-td>
- <uni-td>
+ <uni-td align="right">
<view class="name">{{ subItem.planMeasure }}</view>
+ </uni-td>
+ <uni-td align="right">
+ <u-tag :text="'璁℃暟'" plain v-if="subItem.isWeight==0"></u-tag>
+ <u-tag :text="'绉伴噸'" plain v-else-if="subItem.isWeight==1"></u-tag>
+ <u-tag :text="'绉伴噸璁℃暟'" plain v-else-if="subItem.isWeight==2"></u-tag>
+ <u-tag v-else></u-tag>
</uni-td>
<!-- 聽 <uni-td align="center">
@@ -339,22 +348,35 @@
<view v-if="activeObj.skin">鐨噸锛歿{activeObj.skin.toFixed(2) || ''}}</view>
<view v-if="activeObj.hair">姣涢噸锛歿{activeObj.hair.toFixed(2) || ''}}</view>
</view>
- <view v-if="/鑱氭隘涔欑儻鏍戣剛/.test(activeObj.productName)">
+ <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.realityMeasure)}}</view>
- </view>
+ <view >瀹為檯閲忥細{{ Number(activeObj.productQuantity)}}</view>
+ </view> -->
<view class="queren" v-show="isCleanFlag === '1'">
- <text>璇疯緭鍏�</text>锛�
+ <text v-if="isNumOk || isFlagNum">纭閲忥細</text>
+ <text v-if="isClean || blend">璇疯緭鍏ワ細</text>
<u--input
type='digit'
:disabled="yelvFlag"
border="bottom"
- :placeholder="/鑱氭隘涔欑儻鏍戣剛/.test(activeObj.productName) ? '瀹為檯鍚ㄦ暟' : isNumOk ? '鏁伴噺' : blend ? '鏁伴噺' : '鎶樺惃'"
+ :placeholder="/鑱氭隘涔欑儻鏍戣剛/.test(activeObj.productName) ? '瀹為檯鍚ㄦ暟' : isNumOk ? '纭鏁伴噺' : blend ? '纭鏁伴噺' : '鎶樺惃'"
v-model="checkNum"
>
</u--input>
- <text> {{isNumOk ? activeObj.productUnit : '鍚�' }}</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"
@@ -388,8 +410,10 @@
<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="activeObj.containerNumber"><span>闆嗚绠卞彿锛�</span>{{activeObj.containerNumber}}</view>
+
+
+ <view v-if=" activeObj.planMeasure">璁″垝閲忥細{{activeObj.planMeasure}}{{ activeObj.productUnit || '浠�' }}</view>
+
</view>
<view style="display:flex;margin-top:20rpx">鏄惁绌鸿溅鍑哄巶: <u-radio-group
@@ -419,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"
@@ -458,6 +494,19 @@
</view>
</view>
+ </u-modal>
+ <u-modal :show="showConfim" @confirm="confirmEnter" :showCancelButton="true" @cancel="showConfim = false;isOkNum = ''" ref="uModal" :asyncClose="true">
+ <view class="modalBody">
+ <view style="text-align: center;"> 鏄惁纭畾涓�閿鍗革紵</view>
+ <view style="display: flex;align-items: center;"><text> 鍒拌揣:</text> <u--input
+ style="display: inline-block;width: 200rpx;border-bottom: solid 1px #ccc;"
+ type="digit"
+ :placeholder="'鏁伴噺'"
+ v-model="isOkNum"
+ >
+ </u--input> 浠�</view>
+ </view>
+
</u-modal>
<!-- 浠撳簱 -->
<!-- <u-action-sheet :actions="secondClassActionsList"
@@ -567,7 +616,9 @@
data() {
return {
enterXg:false,
+ isOkNum:'',
fileList1:[],
+ discountReason:'',
activeObjedit:{},
discountJpg:'',
proType:['鏁ｈ','娑叉隘鐡惰','缃愯','PVC25','PVC80','PVC1150','PVc1200'],
@@ -577,13 +628,16 @@
],
isCleanFlag:'1',
checkNumEdit:'',
+ showConfim:false,
+ remarkContent:'',
dataForm: {
firstClass: "",
secondClass: "",
orderType: '',
bunkerIds:""
},
- historyData:[],
+ historyData:[],
+ paramsItem:{},
messageObj:{
carNo:'',
},
@@ -769,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({
@@ -851,8 +911,21 @@
},
open(){},
+ allOkBtn(item){
+ //鐐瑰嚮涓�閿‘璁�
+ this.paramsItem = item;
+
+ this.showConfim = true;
+
+ },
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`,
@@ -881,7 +954,8 @@
this.blend = true;
this.isNumOk = false;
this.isClean = false;
- this.isCleanFlag = '0';
+ this.checkNum = item.productQuantity;
+ // this.isCleanFlag = '0';
this.isFlagNum = false;
}
else {
@@ -889,11 +963,13 @@
this.isCleanFlag = '1';
this.blend = false;
this.isClean = false;
+ this.checkNum = item.productQuantity;
this.isFlagNum = false;
}
if( (parintItem.orderType === '澶栬喘' ||parintItem.orderType === '澶栬喘閫�' ) && item.isWeight === 0){
this.isNumOk = true;
this.isClean = false;
+ this.checkNum = item.productQuantity;
this.blend = false;
this.isFlagNum = false;
this.isCleanFlag = '1';
@@ -914,15 +990,15 @@
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.checkNum = item.planMeasure;
+ // this.yelvFlag = true;
+ this.checkNum = item.productQuantity;
this.blend = false;
this.isCleanFlag = '1';
this.isFlagNum = false;
@@ -940,6 +1016,7 @@
this.isNumOk = false;
this.isClean = false;
this.blend = false;
+ this.checkNum = item.productQuantity;
this.isFlagNum = true;
this.isCleanFlag = '1';
}
@@ -950,6 +1027,8 @@
// }
this.enterZx = true;
+ }
+
},
closeModal(){
@@ -963,6 +1042,7 @@
cancelModal(){
this.enterZx = false;
this.checkNum = '';
+ this.discountReason = ''; //鎯呭喌澶囨敞
this.isEmptyCar = null;
},
cancelModaledit(){
@@ -972,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璁㈠崟璐ㄦ鐘舵�佸悗鍦ㄧ‘璁よ鍗�!`);
@@ -981,10 +1059,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;
@@ -997,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')
@@ -1026,6 +1102,26 @@
//鍒ゆ柇鏄惁鏄� 涓夌鐗规畩绫诲瀷瀵瑰簲寮圭獥
judgeTypeFun(name){
+
+ },
+ //纭
+ confirmEnter(){
+ this.$reqPost('oneClickLoading',{tmId:this.paramsItem.id,kgNum:this.isOkNum},'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 : '鎿嶄綔寮傚父')
+ })
},
//鏌ョ湅鏈�杩戜竴娆＄殑鍘熺洂閽欓晛
@@ -1068,6 +1164,11 @@
<style lang="scss"
scoped>
+ .modalBody{
+ display: flex;
+ flex-direction: column;
+ justify-content: center;
+ }
::-webkit-scrollbar{
display: none;
}
@@ -1079,6 +1180,11 @@
width: auto;
}
+}
+.rightBtn{
+ position: absolute;
+ right: 100rpx;
+ bottom: 5rpx;
}
.notice-bar{
margin-left: vww(10);
@@ -1236,6 +1342,7 @@
}
}
.history-information {
+ position: relative;
margin-bottom:30rpx;
margin-top: 10rpx;
background: #ffffff;
@@ -1313,6 +1420,7 @@
font-size: 30rpx;
font-weight: 300;
color: #515151;
+ position: relative;
margin: vww(10) vww(10) 0;
@include flex;
--
Gitblit v1.9.1