From b73d5b4f9d70e997690121a04a8e93e40327d10a Mon Sep 17 00:00:00 2001
From: wk
Date: 星期二, 13 八月 2024 16:01:19 +0800
Subject: [PATCH] feta:货代改为承运商
---
pages/public-page/forward/forward.vue | 51 +++++++++++++++++++++++++++------------------------
1 files changed, 27 insertions(+), 24 deletions(-)
diff --git a/pages/public-page/forward/forward.vue b/pages/public-page/forward/forward.vue
index f27b4b9..a9ba7cb 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"
@@ -90,7 +90,7 @@
:disabled="whetherClick"></u-button></view>
<!--鍒嗕韩鏃ヨ鍒� -->
<view
- class="AdddBtn"><u-button text="鍒嗕韩鏃ヨ鍒�"
+ class="AdddBtn" v-if="isshow"><u-button text="鍒嗕韩鏃ヨ鍒�"
:hairline="false"
open-type="share"
:loading='loading'></u-button></view>
@@ -106,7 +106,7 @@
</view>
<!-- 澧炲姞鎸夐挳 -->
- <!-- 閫夋嫨璐т唬鎴栬溅闃熷脊鍑烘 -->
+ <!-- 閫夋嫨鎵胯繍鍟嗘垨杞﹂槦寮瑰嚭妗� -->
<view class="selectHuoDaiOrFleet-container">
<u-popup :show="selectPopupShow"
mode="bottom"
@@ -160,17 +160,19 @@
export default {
onLoad(params) {
console.log(params, '杞彂椤甸潰鐨勫弬鏁�');
+ let reg=RegExp(/閿�/)
+ this.isshow=!reg.test(params.orderType)
// 瀹㈡埛
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()
@@ -189,6 +191,7 @@
data() {
return {
+ isshow:false,
forwardSurplus: 0,
paramsName: {},
huoDaiData: [],
@@ -198,9 +201,9 @@
orderPlanId: '',
jhOrderPlanForwardList: [{ //杞彂瀵硅薄
orderPlanId: '', //鏃ヨ鍒扞d
- name: '', //杞﹂槦鎴栬揣浠ｅ悕绉�
+ name: '', //杞﹂槦鎴栨壙杩愬晢鍚嶇О
carNum: null, //杞彂鏁伴噺
- xsUserId: 0, //璐т唬Id
+ xsUserId: 0, //鎵胯繍鍟咺d
fleetId: 0, //杞﹂槦Id
checkboxValue1: '', //鍏ㄩ儴杞彂
isSelected: false
@@ -209,9 +212,9 @@
index: '',
checkboxValue1: '',
selectPopupShow: false,
- list1: [{ name: '杞﹂槦' }, { name: '璐т唬' }],
+ list1: [{ name: '杞﹂槦' }, { name: '鎵胯繍鍟�' }],
tabHuoDai: false,
- carNumSurplus1: '', //鍓╀綑鐨勬彁鐓ゅ崟鏁伴噺锛堣浆鍙戠殑鏁伴噺 - 棰嗗彇鐨勬暟閲忥級
+ carNumSurplus1: '', //鍓╀綑鐨勬敹鍙戝崟鏁伴噺锛堣浆鍙戠殑鏁伴噺 - 棰嗗彇鐨勬暟閲忥級
tempcarNumSurplus1: '',
cars2: '', //宸茬粡棰嗗彇鐨勮溅鏁�
carNum: '',
@@ -248,10 +251,10 @@
return uni.getStorageSync('roleType');
},
text() {
- return `宸查鍙�${this.cars2}寮犳彁鐓ゅ崟,鍓╀綑${this.carNumSurplus1}寮犳彁鐓ゅ崟`;
+ return `宸查鍙�${this.cars2}寮犳敹鍙戝崟,鍓╀綑${this.carNumSurplus1}寮犳敹鍙戝崟`;
},
text1() {
- return `宸叉嫢鏈�${this.carNum}寮犳彁鐓ゅ崟,鍓╀綑${this.carNumSurplusHuodai}寮犳彁鐓ゅ崟`;
+ return `宸叉嫢鏈�${this.carNum}寮犳敹鍙戝崟,鍓╀綑${this.carNumSurplusHuodai}寮犳敹鍙戝崟`;
}
},
methods: {
@@ -371,7 +374,7 @@
this.calculate(this.jhOrderPlanForwardList);
}
},
- // 鑾峰彇璐т唬鍒楄〃
+ // 鑾峰彇鎵胯繍鍟嗗垪琛�
getAllHuoDaiByCustomerId() {
this.$reqGet('getAllHuoDaiByCustomerId').then(res => {
this.huoDaiData = res.data;
@@ -400,7 +403,7 @@
this.selectPopupShow = false;
},
selectPopupOpen() {},
- // 杞彂閫夋嫨璐т唬
+ // 杞彂閫夋嫨鎵胯繍鍟�
forwardHuoDaiObjectSelect(item, index) {
this.$nextTick(() => {
// let isableAdd = this.jhOrderPlanForwardList.filter(v => item.name === v.name);
@@ -423,7 +426,7 @@
// })
// this.selectPopupShow = false;
// } else {
- // this.$u.toast('鎻愮叅鍗曞墿浣欐暟涓�0鎴栧凡娣诲姞');
+ // this.$u.toast('鏀跺彂鍗曞墿浣欐暟涓�0鎴栧凡娣诲姞');
// this.selectPopupShow = true;
// }
// } else {
@@ -436,7 +439,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
}
// }
});
@@ -464,7 +467,7 @@
// })
// this.selectPopupShow = false;
// } else {
- // this.$u.toast('鎻愮叅鍗曞墿浣欐暟涓�0鎴栧凡娣诲姞');
+ // this.$u.toast('鏀跺彂鍗曞墿浣欐暟涓�0鎴栧凡娣诲姞');
// this.selectPopupShow = true;
// }
// } else {
@@ -482,25 +485,25 @@
// }
});
},
- // 璁＄畻鎻愮叅鍗曟暟閲忥紝娣诲姞鎴栧垹闄ゆ椂璋冪敤
+ // 璁＄畻鏀跺彂鍗曟暟閲忥紝娣诲姞鎴栧垹闄ゆ椂璋冪敤
calculate(arr) {
let total = arr.reduce((prev, cur) => {
return cur.carNum + prev;
}, 0);
- console.log(total, '鎻愮叅鍗曚竴鍏辩殑鏁版嵁');
- //roleType 1瀹㈡埛 2 璐т唬 3鍙告満 5瑁呭嵏鍛�
+ console.log(total, '鏀跺彂鍗曚竴鍏辩殑鏁版嵁');
+ //roleType 1瀹㈡埛 2 鎵胯繍鍟� 3鍙告満 5瑁呭嵏鍛�
if (this.roleType == 1) {
if (Number(this.cars2) > total) {
this.carNumSurplus1 = Number(this.cars2) - total;
this.whetherClick = false;
this.whetherClick1 = false;
- } else if (Number(this.cars2) == total) { //鍓╀綑鐨勬彁鐓ゅ崟涓�0锛堟坊鍔犮�佹彁浜ゆ寜閽笉鑳界偣鍑伙級
+ } else if (Number(this.cars2) == total) { //鍓╀綑鐨勬敹鍙戝崟涓�0锛堟坊鍔犮�佹彁浜ゆ寜閽笉鑳界偣鍑伙級
this.whetherClick = true;
this.whetherClick1 = false;
this.carNumSurplus1 = Number(this.cars2) - total;
} else {
this.carNumSurplus1 = 0;
- this.$u.toast('鍓╀綑鎻愮叅鍗曟暟閲忎笉瓒�');
+ this.$u.toast('鍓╀綑鏀跺彂鍗曟暟閲忎笉瓒�');
this.whetherClick = true;
this.whetherClick1 = true;
}
@@ -516,7 +519,7 @@
this.carNumSurplusHuodai = Number(this.carNum) - total;
} else {
this.carNumSurplusHuodai = 0;
- this.$u.toast('鍓╀綑鎻愮叅鍗曟暟閲忎笉瓒�');
+ this.$u.toast('鍓╀綑鏀跺彂鍗曟暟閲忎笉瓒�');
this.whetherClick = true;
this.whetherClick1 = true;
}
@@ -526,7 +529,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) {
@@ -642,7 +645,7 @@
}
},
tabClick(item) {
- if (item.name == '璐т唬') {
+ if (item.name == '鎵胯繍鍟�') {
this.tabHuoDai = true;
} else {
this.tabHuoDai = false;
--
Gitblit v1.9.1