From 5211e91aa2a919a9026b1db61bc1740c97d78c51 Mon Sep 17 00:00:00 2001
From: yangan <yangan0921@163.com>
Date: 星期二, 15 十月 2024 09:29:24 +0800
Subject: [PATCH] feat:液氯瓶装同步pvc
---
pages/public-page/forward/forward.vue | 90 ++++++++++++++++++++++++++++++++++++--------
1 files changed, 73 insertions(+), 17 deletions(-)
diff --git a/pages/public-page/forward/forward.vue b/pages/public-page/forward/forward.vue
index c7d4cb9..8f1759b 100644
--- a/pages/public-page/forward/forward.vue
+++ b/pages/public-page/forward/forward.vue
@@ -15,7 +15,7 @@
<u-notice-bar :text="text"
:fontSize="30"></u-notice-bar>
<view class="notice-icon"
- style="background: url('https://mx.jzeg.cn:9096/appimg/image/banner/notice.png') no-repeat;background-size: cover; width: 42rpx;height: 42rpx;">
+ style="background: url('https://wrzs.czjlchem.com:9090/appimg/image/banner/notice.png') no-repeat;background-size: cover; width: 42rpx;height: 42rpx;">
</view>
</view>
<view v-else-if="roleType == 2"
@@ -73,7 +73,9 @@
</u-checkbox-group>
</view>
</u-form-item>
+
</u--form>
+ <view><u-button v-if="fenpeiFlag " text="鍒嗛厤鏃ヨ鍒掑惃鏁�" type="primary" :plain="true" @click="todoFenPei(val)"></u-button></view>
</view>
</view>
</view>
@@ -90,7 +92,7 @@
:disabled="whetherClick"></u-button></view>
<!--鍒嗕韩鏃ヨ鍒� -->
<view
- class="AdddBtn" v-if="isshow"><u-button text="鍒嗕韩鏃ヨ鍒�"
+ class="AdddBtn" v-if="isshow && roleType!== 2 "><u-button text="鍒嗕韩鏃ヨ鍒�"
:hairline="false"
open-type="share"
:loading='loading'></u-button></view>
@@ -106,7 +108,7 @@
</view>
<!-- 澧炲姞鎸夐挳 -->
- <!-- 閫夋嫨璐т唬鎴栬溅闃熷脊鍑烘 -->
+ <!-- 閫夋嫨鎵胯繍鍟嗘垨杞﹂槦寮瑰嚭妗� -->
<view class="selectHuoDaiOrFleet-container">
<u-popup :show="selectPopupShow"
mode="bottom"
@@ -162,17 +164,21 @@
console.log(params, '杞彂椤甸潰鐨勫弬鏁�');
let reg=RegExp(/閿�/)
this.isshow=!reg.test(params.orderType)
+ this.productName = params.productName;
+ this.customerId = params.customerId;
+ this.packingType = params.packingType;
+ this.pvcPlanMeasure = params.pvcPlanMeasure;
// 瀹㈡埛
this.cars2 = Number(params.cars2);
this.tempcarNumSurplus1 = this.carNumSurplus1 = Number(params.carNumSurplus1 || 0);
- // 璐т唬
+ // 鎵胯繍鍟�
this.carNum = Number(params.carNum);
this.carNumSurplusHuodai = this.forwardSurplus = Number(params.carNumSurplusHuodai || 0);
this.orderPlanId = params.orderPlanId;
// 鍒ゆ柇鏄惁杞彂瀹屾垚 瀹屾垚鍒欎笉鍙啀娣诲姞
if (this.roleType === 1) { //roleType 1瀹㈡埛
this.whetherClick = this.carNumSurplus1 === 0
- } else if (this.roleType === 2) { //roleType 2璐т唬
+ } else if (this.roleType === 2) { //roleType 2鎵胯繍鍟�
this.whetherClick = this.forwardSurplus === 0
}
this.getOrderPlan()
@@ -192,8 +198,12 @@
data() {
return {
isshow:false,
+ pvcPlanMeasure:'',
forwardSurplus: 0,
paramsName: {},
+ packingType:'',
+ productName:'',
+ customerId:'',
huoDaiData: [],
isClickFlag:true,// true 鍙互 or false for forward and back to the direction of the car direction (default
fleetData: [],
@@ -201,9 +211,9 @@
orderPlanId: '',
jhOrderPlanForwardList: [{ //杞彂瀵硅薄
orderPlanId: '', //鏃ヨ鍒扞d
- name: '', //杞﹂槦鎴栬揣浠ｅ悕绉�
+ name: '', //杞﹂槦鎴栨壙杩愬晢鍚嶇О
carNum: null, //杞彂鏁伴噺
- xsUserId: 0, //璐т唬Id
+ xsUserId: 0, //鎵胯繍鍟咺d
fleetId: 0, //杞﹂槦Id
checkboxValue1: '', //鍏ㄩ儴杞彂
isSelected: false
@@ -212,7 +222,7 @@
index: '',
checkboxValue1: '',
selectPopupShow: false,
- list1: [{ name: '杞﹂槦' }, { name: '璐т唬' }],
+ list1: [{ name: '杞﹂槦' }], //{ name: '鎵胯繍鍟�' }
tabHuoDai: false,
carNumSurplus1: '', //鍓╀綑鐨勬敹鍙戝崟鏁伴噺锛堣浆鍙戠殑鏁伴噺 - 棰嗗彇鐨勬暟閲忥級
tempcarNumSurplus1: '',
@@ -233,6 +243,7 @@
}],
loading: false, //鎻愪氦loading
originForwardName: '', //鍘熻浆鍙戝璞�
+ isShow:false,
laterForwardName: '', //鍚庤浆鍙戝璞�
errorDataList: [], // 閿欒鏁版嵁
isDirectAdd: false, // 鏄惁鏄湪鍘熸潵鏈夊璞＄殑item淇敼 鏄殑涓簍rue
@@ -241,6 +252,8 @@
},
onShow() {
this.init();
+ this.getBuild();
+ // this.getOrderPlan();
if (this.roleType == 2) {
this.list1.splice(1, 1);
this.tabHuoDai = false;
@@ -255,6 +268,14 @@
},
text1() {
return `宸叉嫢鏈�${this.carNum}寮犳敹鍙戝崟,鍓╀綑${this.carNumSurplusHuodai}寮犳敹鍙戝崟`;
+ },
+ fenpeiFlag(){
+ console.log(this.productName,this.packingType,'122222222cumped',/鑱氭隘涔欑儻鏍戣剛/.test(this.productName) || (this.packingType && this.packingType == '1'))
+ if(/鑱氭隘涔欑儻鏍戣剛/.test(this.productName) || (this.packingType && this.packingType == '1')){
+ return true
+ }else{
+ return false
+ }
}
},
methods: {
@@ -264,6 +285,12 @@
})
this.$reqGet('forwardList', { OrderPlanId: this.orderPlanId }).then(res => {
uni.hideLoading()
+ if(res.data.length){
+ this.isShow = true;
+ }else{
+ this.isShow = false;
+
+ }
if (res.data.length !== 0 && this.roleType == 1) {
this.jhOrderPlanForwardList = res.data.map((item, index) => {
return {
@@ -305,6 +332,15 @@
}).catch(e => {
uni.hideLoading()
})
+ },
+ getBuild(){
+ console.log(this.productName,'opr')
+ if(/鑱氭隘涔欑儻鏍戣剛/.test(this.productName)){
+ this.$reqGet('getBuildList',{orderPlanId:this.orderPlanId,customerId:this.customerId}).then(res=>{
+ console.log(res,'resss')
+ })
+ }
+
},
// 杩斿洖涓婁竴椤�
back() {
@@ -374,7 +410,7 @@
this.calculate(this.jhOrderPlanForwardList);
}
},
- // 鑾峰彇璐т唬鍒楄〃
+ // 鑾峰彇鎵胯繍鍟嗗垪琛�
getAllHuoDaiByCustomerId() {
this.$reqGet('getAllHuoDaiByCustomerId').then(res => {
this.huoDaiData = res.data;
@@ -403,7 +439,7 @@
this.selectPopupShow = false;
},
selectPopupOpen() {},
- // 杞彂閫夋嫨璐т唬
+ // 杞彂閫夋嫨鎵胯繍鍟�
forwardHuoDaiObjectSelect(item, index) {
this.$nextTick(() => {
// let isableAdd = this.jhOrderPlanForwardList.filter(v => item.name === v.name);
@@ -439,7 +475,7 @@
this.jhOrderPlanForwardList[this.index].xsUserId = item.userId;
this.jhOrderPlanForwardList[this.index].name = item.name;
this.jhOrderPlanForwardList[this.index].fleetId = 0;
- this.jhOrderPlanForwardList[this.index].forWardType = 1; //forWardType 杞彂绫诲瀷 璐т唬1 杞﹂槦2
+ this.jhOrderPlanForwardList[this.index].forWardType = 1; //forWardType 杞彂绫诲瀷 鎵胯繍鍟�1 杞﹂槦2
}
// }
});
@@ -471,6 +507,7 @@
// this.selectPopupShow = true;
// }
// } else {
+ console.log(this.jhOrderPlanForwardList,item,'jhOrderPlanForwardList')
let isableAdd = this.jhOrderPlanForwardList.filter(v => item.name === v.name);
if (isableAdd.length > 0) {
this.$u.toast('瀛樺湪閲嶅娣诲姞');
@@ -491,7 +528,7 @@
return cur.carNum + prev;
}, 0);
console.log(total, '鏀跺彂鍗曚竴鍏辩殑鏁版嵁');
- //roleType 1瀹㈡埛 2 璐т唬 3鍙告満 5瑁呭嵏鍛�
+ //roleType 1瀹㈡埛 2 鎵胯繍鍟� 3鍙告満 5瑁呭嵏鍛�
if (this.roleType == 1) {
if (Number(this.cars2) > total) {
this.carNumSurplus1 = Number(this.cars2) - total;
@@ -529,7 +566,7 @@
let time;
let that = this;
that.$set(that.jhOrderPlanForwardList[index], 'carNum', Number(value));
- //forWardType 杞彂绫诲瀷 1璐т唬 2杞﹂槦
+ //forWardType 杞彂绫诲瀷 1鎵胯繍鍟� 2杞﹂槦
that.$set(that.jhOrderPlanForwardList[index], 'forWardType', xsUserId ? 1 : 2);
return (function() {
if (!time) {
@@ -607,6 +644,7 @@
},
// 鎻愪氦
submitForm() {
+ //杞︽暟 * 鍚ㄦ暟 < 璁″垝鍚ㄦ暟
let isPass = false;
if (this.jhOrderPlanForwardList.length === 0) {
this.$u.toast('璇疯嚦灏戦�夋嫨涓�缁勮浆鍙戝璞�');
@@ -615,6 +653,10 @@
this.jhOrderPlanForwardList.forEach(v => {
if (!reg.test(v.carNum) || Number(v.carNum) <= 0) {
this.$u.toast('璇疯緭鍏ュ悎娉曟暟瀛�');
+ isPass = false;
+ return isPass;
+ } else if (!v.name){
+ this.$u.toast('璇烽�夋嫨杞﹂槦');
isPass = false;
return isPass;
} else {
@@ -628,12 +670,22 @@
this.$reqPost('forward', this.jhOrderPlanForwardList, 'json').then(res => {
console.log(res, 'zh');
// res.data.length == 0 鎻愪氦鎴愬姛 鍚﹀垯鎻愪氦澶辫触
- if (res.data.length == 0) {
+ if (res.code === 0) {
this.loading = false
this.$u.toast('鎻愪氦鎴愬姛');
- setTimeout(() => {
+ if(this.fenpeiFlag()){
+ setTimeout(()=>{
+ uni
+ .navigateTo({ url: `/subPages/allocaTetonnage/index?orderPlanId=${this.orderPlanId}&customerId=${this.customerId}&status=${1}&pvcPlanMeasure=${this.pvcPlanMeasure}`});
+
+ },500)
+
+ }else{
+ setTimeout(() => {
uni.navigateBack({ delta: 1 });
}, 1000);
+ }
+
} else {
this.loading = false
this.errorDataList = res.data
@@ -645,12 +697,16 @@
}
},
tabClick(item) {
- if (item.name == '璐т唬') {
+ if (item.name == '鎵胯繍鍟�') {
this.tabHuoDai = true;
} else {
this.tabHuoDai = false;
}
},
+ todoFenPei(val){
+ uni
+ .navigateTo({ url: `/subPages/allocaTetonnage/index?orderPlanId=${this.orderPlanId}&customerId=${this.customerId}&fleetId=${val.fleetId}&pvcPlanMeasure=${this.pvcPlanMeasure}`});
+ }
}
};
</script>
@@ -744,7 +800,7 @@
.forward-card {
margin-top: vww(10);
width: 690rpx;
- height: 275rpx;
+ height: 400rpx;
background: #ffffff;
box-shadow: 4rpx 6rpx 25rpx 0rpx rgba(73, 120, 240, 0.15);
border-radius: 20rpx;
--
Gitblit v1.9.1