From 52f80cf3c1ca98ad877e3c9855ef7583779ac669 Mon Sep 17 00:00:00 2001
From: jinna <jn517618@163.com>
Date: Fri, 13 Oct 2023 16:27:21 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9B=BD=E9=99=85=E5=AE=A2?=
 =?UTF-8?q?=E8=BF=90=E8=88=AA=E6=AC=A1=E5=B1=95=E7=A4=BA=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../portShipping/waterInternational/form.vue  | 60 +++++++++++++++----
 1 file changed, 48 insertions(+), 12 deletions(-)

diff --git a/pages/portShipping/waterInternational/form.vue b/pages/portShipping/waterInternational/form.vue
index a0afff3..0e1bb1a 100644
--- a/pages/portShipping/waterInternational/form.vue
+++ b/pages/portShipping/waterInternational/form.vue
@@ -70,7 +70,7 @@
 				</view>
 				<view class="form_item">
 					<view class="form_item_label">航次：</view>
-					<view class="form_item_input picker">
+					<!-- <view class="form_item_input picker" v-if="item.routeIndex !== ''">
 						<picker :value="item.voyageIndex"
 							:range="item.routeIndex > -1 ? shipRouteList[item.routeIndex].voyageInfoVOList : []"
 							range-key="voyageCode" @change="e => changeVoyage(e, index)">
@@ -78,6 +78,14 @@
 							<uni-icons type="right" size="16" color="#D4D4D4"></uni-icons>
 						</picker>
 					</view>
+					<view class="form_item_input picker disabled" v-else @click="clickVoyage">
+						<text>请选择</text>
+						<uni-icons type="right" size="16" color="#D4D4D4"></uni-icons>
+					</view> -->
+					<view class="form_item_input form_input">
+						<uni-easyinput  v-model="item.voyage" placeholderStyle="color: #D4D4D4;font-size:28rpx;" placeholder="请输入" maxlength="20">
+						</uni-easyinput>
+					</view>
 				</view>
 				<view class="form_item">
 					<view class="form_item_label">航次数：</view>
@@ -164,7 +172,7 @@
 				</view>
 				<view class="form_item">
 					<view class="form_item_label">航次：</view>
-					<view class="form_item_input picker">
+					<!-- <view class="form_item_input picker" v-if="item.routeIndex !== ''">
 						<picker :value="item.voyageIndex"
 							:range="item.routeIndex > -1 ? internationalRouteList[item.routeIndex].voyageInfoVOList : []"
 							range-key="voyageCode" @change="e => changeVoyage(e, index)">
@@ -172,6 +180,14 @@
 							<uni-icons type="right" size="16" color="#D4D4D4"></uni-icons>
 						</picker>
 					</view>
+					<view class="form_item_input picker disabled" v-else @click="clickVoyage">
+						<text>请选择</text>
+						<uni-icons type="right" size="16" color="#D4D4D4"></uni-icons>
+					</view> -->
+					<view class="form_item_input form_input">
+						<uni-easyinput  v-model="item.voyage" placeholderStyle="color: #D4D4D4;font-size:28rpx;" placeholder="请输入" maxlength="20">
+						</uni-easyinput>
+					</view>
 				</view>
 				<view class="form_item">
 					<view class="form_item_label">航次数：</view>
@@ -423,24 +439,26 @@
 				this.$request(getApp().globalData.baseUrl + '/api/biz/internationalPassengerTransportPermissions/findList', {},
 					"GET").then(res => {
 					this.shipRouteList = res.data['客班轮'];
+					
 					this.internationalRouteList = res.data['国际邮轮'];
 					this.form.passengerShipDTOList.map(item => {
 						let idx = this.shipRouteList.findIndex(item2 => item2.route == item.route);
 						item.routeIndex = idx > -1 ? idx : '';
-						if (idx > -1) {
-							let _idx = this.shipRouteList[idx].voyageInfoVOList.findIndex(item2 => item2.voyageCode == item
-								.voyage);
-							item.voyageIndex = _idx > -1 ? _idx : '';
-						}
+						// console.log('routeIndex ===>',typeof item.routeIndex)
+						// if (idx > -1) {
+						// 	let _idx = this.shipRouteList[idx].voyageInfoVOList.findIndex(item2 => item2.voyageCode == item
+						// 		.voyage);
+						// 	item.voyageIndex = _idx > -1 ? _idx : '';
+						// }
 					})
 					this.form.internationalCruiseDTOList.map(item => {
 						let idx = this.internationalRouteList.findIndex(item2 => item2.route == item.route);
 						item.routeIndex = idx > -1 ? idx : '';
-						if (idx > -1) {
-							let _idx = this.internationalRouteList[idx].voyageInfoVOList.findIndex(item2 => item2.voyageCode ==
-								item.voyage);
-							item.voyageIndex = _idx > -1 ? _idx : '';
-						}
+						// if (idx > -1) {
+						// 	let _idx = this.internationalRouteList[idx].voyageInfoVOList.findIndex(item2 => item2.voyageCode ==
+						// 		item.voyage);
+						// 	item.voyageIndex = _idx > -1 ? _idx : '';
+						// }
 					})
 					console.log(this.form)
 				})
@@ -626,6 +644,20 @@
 					this.form.internationalCruiseDTOList[index].direction = this.internationalRouteList[e.detail.value].direction;
 				}
 			},
+			clickVoyage(){
+				if (this.tabType == 1) {
+					uni.showToast({
+						title:"请先选择航线",
+						icon:"none"
+					})
+				}else{
+					uni.showToast({
+						title:"请先选择国际邮轮",
+						icon:"none"
+					})
+				}
+				
+			},
 			//航次选择
 			changeVoyage(e, index) {
 				if (this.tabType == 1) {
@@ -907,6 +939,10 @@
 							text-align: right;
 						}
 					}
+					
+					&.disabled{
+						color: #D4D4D4;
+					}
 
 					//纯展示
 					&.text {