切换是否分流时，收货地址等信息还原。收货地址改为弹框选择

pages/purchase-receive/purchase-receive.nvue

@@ -10,9 +10,9 @@
 						<view class="middle-date-des uni-list picker-year">
 							<view class="uni-list-cell">
 								<view class="uni-list-cell-db">
-									<picker class="picker-block" @change="bindPickerChange($event,'shunt')" :value="orderItem.shuntName"
+									<picker class="picker-block" @change="bindPickerChange($event,'shunt')" :value="shuntIndex"
 										range-key='name' mode="selector" :range="shuntArr">
-										<text class="uni-input">{{orderItem.shuntName}}</text>
+										<text class="uni-input">{{orderItem.shuntName || '请选择'}}</text>
 									</picker>
 								</view>
 							</view>
@@ -36,9 +36,9 @@
 						<view class="middle-date-des uni-list picker-year" v-if="orderItem.isShunt - 1 === 0">
 							<view class="uni-list-cell">
 								<view class="uni-list-cell-db">
-									<picker class="picker-block" @change="bindPickerChange($event,'shuntType')" :value="orderItem.shuntTypeName"
+									<picker class="picker-block" @change="bindPickerChange($event,'shuntType')" :value="Number(shuntTypeIndex) || 0"
 										range-key='name' mode="selector" :range="shuntTypeArr">
-										<text class="uni-input">{{orderItem.shuntTypeName}}</text>
+										<text class="uni-input">{{orderItem.shuntTypeName || '请选择'}}</text>
 									</picker>
 								</view>
 							</view>
@@ -58,20 +58,27 @@
 							<image class="icon-arrow" src="@/static/image/arrow_r@3x.png" mode=""></image>
 						</view>
 					</view>
-					<view class="text-address">
-						<text class="middle-date-unit">{{isTerminalType ? '收货终端' :'收货单位'}}</text>
+					<view class="text-address" @click="handleReceiveUnit" v-if="!isTerminalType">
+						<text class="middle-date-unit">收货单位</text>
 						<view class="middle-date-des-unit uni-list picker-year">
 							<view class="uni-list-cell">
 								<view class="uni-list-cell-db">
-									<picker class="picker-block" :disabled="isTerminalType" @change="bindPickerChange($event,'receive')" :value="orderItem.receiveUnitName"
-										range-key='PARTNER_NAME' mode="selector" :range="receiveUnitArr">
-										<text class="middle-date-margin-des">{{orderItem.receiveUnitName}}</text>
-									</picker>
+									<text class="middle-date-address-text">{{orderItem.receiveUnitName || '请选择'}}</text>
 								</view>
 							</view>
 							<image class="icon-arrow" src="@/static/image/arrow_r@3x.png" mode=""></image>
 						</view>
 					</view>
+					<view class="text-address" v-if="isTerminalType">
+						<text class="middle-date-unit">收货终端</text>
+						<view class="middle-date-des-unit uni-list picker-year">
+							<view class="uni-list-cell">
+								<view class="uni-list-cell-db">
+									<text class="middle-date-address-text">{{orderItem.receiveUnitName || '请选择'}}</text>
+								</view>
+							</view>
+						</view>
+					</view>
 					<view class="text-address">
 						<text class="middle-date-unit">喷码单位</text>
 						<!-- <view class="middle-date-des-unit uni-list picker-year" @click="handleCustomer"> -->
@@ -207,6 +214,9 @@
 				receiveUnitArr: [],
 				shuntArr: [],
 				shuntTypeArr: [],
+				shuntIndex: 0, // 是否分流的索引值
+				shuntTypeIndex: 0, // 分流渠道的索引值
+				receiveUnitIndex: 0, // 收货单位的索引值
 				array: ['2021', '2020', '2019', '2018'],
 				array1: [{'id':0,val:'00'},{'id':1,val:'01'}],
 				index: 0,
@@ -218,6 +228,15 @@
 				flag: false,
 				allFiles: [],
 				allFilesPath: [],
+				// 保存页面加载时的默认值，用于从"是"切换回"否"时恢复
+				defaultReceiveUnit: {
+					receiveUnitCode: '',
+					receiveUnitName: '',
+					spurtCodeUnitName: '',
+					contactNumber: '',
+					contacPerson: '',
+					receiveAddress: ''
+				}
 			}
 		},
 		props: {
@@ -234,15 +253,46 @@
 		},
 		watch: {
 			'orderItem.isShunt' :function (newName,oldName){
-				console.log(newName,'newName')
-				if(newName - 0 === 0){
+				console.log(newName,'newName', oldName, 'oldName')
+				// 从"是"切换到"否"时，恢复默认值
+				if(newName - 0 === 0 && oldName && oldName - 0 !== 0){
+					// 清空分流相关字段
 					this.orderItem.shuntReceiveUnitName = ''
 					this.orderItem.shuntReceiveUnitCode = ''
 					this.orderItem.shuntChannelsType = ''
 					this.orderItem.shuntDealer = ''
 					this.orderItem.shuntDealerName = ''
 					this.orderItem.shuntTypeName = ''
-				}else{
+					this.shuntTypeIndex = 0 // 重置分流渠道索引
+					
+					// 恢复收货单位、喷码单位、收货联系人、联系人电话、收货地址为默认值
+					if(this.defaultReceiveUnit && this.defaultReceiveUnit.receiveUnitCode){
+						this.orderItem.receiveUnitCode = this.defaultReceiveUnit.receiveUnitCode
+						this.orderItem.receiveUnitName = this.defaultReceiveUnit.receiveUnitName
+						this.orderItem.spurtCodeUnitName = this.defaultReceiveUnit.spurtCodeUnitName
+						this.orderItem.contactNumber = this.defaultReceiveUnit.contactNumber
+						this.orderItem.contacPerson = this.defaultReceiveUnit.contacPerson
+						this.orderItem.receiveAddress = this.defaultReceiveUnit.receiveAddress
+						// 更新收货单位索引
+						if(this.receiveUnitArr.length > 0){
+							const receiveIndex = this.receiveUnitArr.findIndex(item => item.PARTNER === this.defaultReceiveUnit.receiveUnitCode)
+							this.receiveUnitIndex = receiveIndex >= 0 ? receiveIndex : 0
+						}
+					}
+				}else if(newName - 0 === 0){
+					// 初始加载时选择"否"，只清空分流字段
+					this.orderItem.shuntReceiveUnitName = ''
+					this.orderItem.shuntReceiveUnitCode = ''
+					this.orderItem.shuntChannelsType = ''
+					this.orderItem.shuntDealer = ''
+					this.orderItem.shuntDealerName = ''
+					this.orderItem.shuntTypeName = ''
+					this.shuntTypeIndex = 0
+				}else if(newName - 0 !== 0){
+					// 从"否"切换到"是"时，确保分流渠道索引有默认值（H5平台兼容性）
+					if(this.shuntTypeArr.length > 0 && (this.shuntTypeIndex === undefined || this.shuntTypeIndex === null)){
+						this.shuntTypeIndex = 0
+					}
 					//this.getShuntAnyByDealer()
 				}
 			}
@@ -298,6 +348,13 @@
 				// 渠道
 				_this.orderItem.shuntChannelsType =  data.selectShuntAccountInfo.channels
 				_this.orderItem.shuntTypeName =  data.selectShuntAccountInfo.channelsTextView
+				// 同步更新分流渠道索引
+				if(_this.shuntTypeArr.length > 0 && _this.orderItem.shuntTypeName){
+					const shuntTypeIndex = _this.shuntTypeArr.findIndex(item => item.name === _this.orderItem.shuntTypeName)
+					if(shuntTypeIndex >= 0){
+						_this.shuntTypeIndex = shuntTypeIndex
+					}
+				}
 			})
 			uni.$on('selectAllShuntCode', function(data) {
 				console.log('监听到事件来自 selectAllShuntCode：', data);
@@ -306,6 +363,7 @@
 			})
 			uni.$on('selectShuntAdressAccountInfo', function(data) {
 				console.log('监听到事件来自 selectShuntAdressAccountInfo ，携带参数 msg 为：', data);
+				// 分流收货单位选择（type=1）
 				_this.orderItem.shuntReceiveUnitName = data.selectShuntAdressAccountInfo.PARTNER_NAME
 				_this.orderItem.shuntReceiveUnitCode = data.selectShuntAdressAccountInfo.PARTNER
 				_this.orderItem.receiveCityCode = data.selectShuntAdressAccountInfo.CITY_CODE
@@ -316,6 +374,21 @@
 				_this.orderItem.spurtCodeUnitName = data.selectShuntAdressAccountInfo.PARTNER_NAME
 				_this.getReceipt(_this.orderItem.shuntDealer, true)
 			})
+			uni.$on('selectReceiveUnitInfo', function(data) {
+				console.log('监听到事件来自 selectReceiveUnitInfo ，携带参数 msg 为：', data);
+				// 普通收货单位选择（type=2）
+				_this.orderItem.receiveUnitName = data.selectReceiveUnitInfo.PARTNER_NAME
+				_this.orderItem.receiveUnitCode = data.selectReceiveUnitInfo.PARTNER
+				_this.orderItem.contactNumber = data.selectReceiveUnitInfo.TEL_NUMBER
+				_this.orderItem.contacPerson = data.selectReceiveUnitInfo.C_O_NAME
+				_this.orderItem.receiveAddress = data.selectReceiveUnitInfo.STREET
+				_this.orderItem.spurtCodeUnitName = data.selectReceiveUnitInfo.PARTNER_NAME
+				// 更新收货单位索引
+				if(_this.receiveUnitArr.length > 0){
+					const receiveIndex = _this.receiveUnitArr.findIndex(item => item.PARTNER === data.selectReceiveUnitInfo.PARTNER)
+					_this.receiveUnitIndex = receiveIndex >= 0 ? receiveIndex : 0
+				}
+			})
 			uni.$on('selectShuntCode', function(data) {
 				console.log('监听到事件来自 selectShuntCode ，携带参数 msg 为：', data);
 				_this.orderItem.spurtCodeUnit = data.selectShuntCode.info.partner
@@ -332,10 +405,17 @@
 			// if(this.isTerminalType){
 			// 	this.changeTerminal()
 			// }
+			// 初始化索引值（延迟执行，确保数据已加载）
+			this.$nextTick(() => {
+				setTimeout(() => {
+					this.initPickerIndexes()
+				}, 300)
+			})
 		},
 		onUnload() {
 			uni.$off('selectShuntAccountInfo')
 			uni.$off('selectShuntAdressAccountInfo')
+			uni.$off('selectReceiveUnitInfo')
 			uni.$off('selectShuntCode')
 			uni.$off('selectAllShuntCode')
 			uni.$off('selectTerminalAddress')
@@ -343,6 +423,7 @@
 		beforeDestroy() {
 			uni.$off('selectShuntAccountInfo')
 			uni.$off('selectShuntAdressAccountInfo')
+			uni.$off('selectReceiveUnitInfo')
 			uni.$off('selectShuntCode')
 			uni.$off('selectAllShuntCode')
 			uni.$off('selectTerminalAddress')
@@ -356,6 +437,38 @@
 			// this.queryData()
 		},
 		methods: {
+			// 初始化picker的索引值
+			initPickerIndexes() {
+				// 初始化是否分流的索引
+				if(this.shuntArr.length > 0 && this.orderItem.isShunt){
+					const shuntIndex = this.shuntArr.findIndex(item => item.value === this.orderItem.isShunt)
+					if(shuntIndex >= 0){
+						this.shuntIndex = shuntIndex
+					}
+				}
+				// 初始化分流渠道的索引
+				if(this.shuntTypeArr.length > 0){
+					if(this.orderItem.shuntTypeName){
+						const shuntTypeIndex = this.shuntTypeArr.findIndex(item => item.name === this.orderItem.shuntTypeName)
+						if(shuntTypeIndex >= 0){
+							this.shuntTypeIndex = shuntTypeIndex
+						}else{
+							// 如果找不到匹配项，设置为0（H5平台兼容性）
+							this.shuntTypeIndex = 0
+						}
+					}else{
+						// 如果没有选中值，确保索引有默认值（H5平台兼容性）
+						this.shuntTypeIndex = 0
+					}
+				}
+				// 初始化收货单位的索引
+				if(this.receiveUnitArr.length > 0 && this.orderItem.receiveUnitCode){
+					const receiveIndex = this.receiveUnitArr.findIndex(item => item.PARTNER === this.orderItem.receiveUnitCode)
+					if(receiveIndex >= 0){
+						this.receiveUnitIndex = receiveIndex
+					}
+				}
+			},
 			// 请求历史收货地址
 			async changeTerminal(){
 			  await findFirstByTerminalId({terminalId: this.orderItem.terminalId}).then(res => {
@@ -448,6 +561,12 @@
 					url: `/pages/select-address/select-address`
 				})
 			},
+			handleReceiveUnit() {
+				// 跳转到收货单位选择页面（复用select-shunt-adress页面，type=2表示普通收货单位）
+				uni.navigateTo({
+					url: `/pages/select-shunt-adress/select-shunt-adress?order=${JSON.stringify(this.orderItem)}&type=2`
+				})
+			},
 			handleReceiptAddress() {
 				uni.navigateTo({
 					url: `/pages/select-shunt-adress/select-shunt-adress?order=${JSON.stringify(this.orderItem)}&type=2`
@@ -483,19 +602,54 @@
 				this.receiveUnitArr = res.DATA
 				if(flag)return
 				if(this.orderItem.saveTimes - 0 >= 0){
+					// 如果已有选中的收货单位，找到对应的索引
+					if(this.orderItem.receiveUnitCode && this.receiveUnitArr.length > 0){
+						const receiveIndex = this.receiveUnitArr.findIndex(item => item.PARTNER === this.orderItem.receiveUnitCode)
+						this.receiveUnitIndex = receiveIndex >= 0 ? receiveIndex : 0
+					}
+					// 保存当前值作为默认值（用于从"是"切换回"否"时恢复）
+					if(!this.defaultReceiveUnit.receiveUnitCode && this.orderItem.receiveUnitCode){
+						this.defaultReceiveUnit = {
+							receiveUnitCode: this.orderItem.receiveUnitCode || '',
+							receiveUnitName: this.orderItem.receiveUnitName || '',
+							spurtCodeUnitName: this.orderItem.spurtCodeUnitName || '',
+							contactNumber: this.orderItem.contactNumber || '',
+							contacPerson: this.orderItem.contacPerson || '',
+							receiveAddress: this.orderItem.receiveAddress || ''
+						}
+					}
 					return
 				}
 				this.orderItem.receiveUnitCode =  this.receiveUnitArr[0].PARTNER
 				this.orderItem.spurtCodeUnitName =  this.receiveUnitArr[0].PARTNER_NAME
+				this.receiveUnitIndex = 0
 				if(this.isTerminalType){
 					// this.orderItem.contactNumber = ''
 					// this.orderItem.contacPerson = ''
 					// this.orderItem.receiveAddress = ''
+					// 保存默认值（终端类型时部分字段为空）
+					this.defaultReceiveUnit = {
+						receiveUnitCode: this.receiveUnitArr[0].PARTNER,
+						receiveUnitName: this.receiveUnitArr[0].PARTNER_NAME || '',
+						spurtCodeUnitName: this.receiveUnitArr[0].PARTNER_NAME,
+						contactNumber: '',
+						contacPerson: '',
+						receiveAddress: ''
+					}
 				}else{
 					this.orderItem.contactNumber = this.receiveUnitArr[0].TEL_NUMBER
 					this.orderItem.contacPerson = this.receiveUnitArr[0].C_O_NAME
 					this.orderItem.receiveAddress = this.receiveUnitArr[0].STREET
 					this.orderItem.receiveUnitName =  this.receiveUnitArr[0].PARTNER_NAME
+					// 保存默认值
+					this.defaultReceiveUnit = {
+						receiveUnitCode: this.receiveUnitArr[0].PARTNER,
+						receiveUnitName: this.receiveUnitArr[0].PARTNER_NAME,
+						spurtCodeUnitName: this.receiveUnitArr[0].PARTNER_NAME,
+						contactNumber: this.receiveUnitArr[0].TEL_NUMBER,
+						contacPerson: this.receiveUnitArr[0].C_O_NAME,
+						receiveAddress: this.receiveUnitArr[0].STREET
+					}
 				}
 			},
 			getSelectDictDataOrigin(dictcode) {
@@ -507,13 +661,32 @@
 								this.shuntArr = res.data.Rows
 								if(this.orderItem.saveTimes - 0 >= 0 && this.orderItem.isShunt - 1 === 0){
 									this.orderItem.shuntName =  '是'
+									// 根据当前值找到对应的索引
+									const shuntIndex = this.shuntArr.findIndex(item => item.value === this.orderItem.isShunt)
+									this.shuntIndex = shuntIndex >= 0 ? shuntIndex : 1
 									return
 								}
 								this.orderItem.isShunt =  this.shuntArr[1].value
 								this.orderItem.shuntName =  this.shuntArr[1].name
+								this.shuntIndex = 1
 								break;
 							case 'A0054':
 								this.shuntTypeArr = res.data.Rows
+								// 如果已有选中的分流渠道，找到对应的索引
+								if(this.orderItem.shuntTypeName && this.shuntTypeArr.length > 0){
+									const shuntTypeIndex = this.shuntTypeArr.findIndex(item => item.name === this.orderItem.shuntTypeName)
+									this.shuntTypeIndex = shuntTypeIndex >= 0 ? shuntTypeIndex : 0
+								}else if(this.shuntTypeArr.length > 0){
+									// H5平台：如果没有选中值但数组有数据，确保索引不为undefined
+									// 避免H5端picker无法选择的问题
+									this.shuntTypeIndex = 0
+								}
+								// 使用$nextTick确保DOM更新后再设置索引（H5平台兼容性）
+								this.$nextTick(() => {
+									if(this.shuntTypeArr.length > 0 && this.shuntTypeIndex === undefined){
+										this.shuntTypeIndex = 0
+									}
+								})
 								break;
 							default:
 								break;
@@ -528,6 +701,7 @@
 				const index = e.detail.value || 0
 				switch (type) {
 					case 'shunt':
+						this.shuntIndex = index
 						this.orderItem.isShunt =  this.shuntArr[index].value
 						this.orderItem.shuntName =  this.shuntArr[index].name
 						// 参考PC端逻辑：当选择"是"时，查询分流权限
@@ -536,10 +710,12 @@
 						}
 						break;
 					case 'shuntType':
+						this.shuntTypeIndex = index
 						this.orderItem.shuntChannelsType =  this.shuntTypeArr[index].value
 						this.orderItem.shuntTypeName =  this.shuntTypeArr[index].name
 						break;
 					case 'receive':
+						this.receiveUnitIndex = index
 						this.orderItem.receiveUnitName =  this.receiveUnitArr[index].PARTNER_NAME
 						this.orderItem.receiveUnitCode =  this.receiveUnitArr[index].PARTNER
 						this.orderItem.contactNumber = this.receiveUnitArr[index].TEL_NUMBER
@@ -643,6 +819,25 @@
 					if(this.flag){
 						return
 					}
+					// 验证分流相关字段（如果选择了"是"）
+					if(this.orderItem.isShunt - 1 === 0){
+						if (!this.orderItem.shuntDealerName) {
+							uni.showToast({
+								title: '请先选择分流经销商',
+								duration: 2000,
+								icon: 'none'
+							});
+							return
+						}
+						if (!this.orderItem.shuntTypeName) {
+							uni.showToast({
+								title: '请先选择分流渠道',
+								duration: 2000,
+								icon: 'none'
+							});
+							return
+						}
+					}
 					this.flag = true
 					for(let k in this.orderItem){
 						this.orderItem[k] = this.orderItem[k] === null ? '' : this.orderItem[k]

pages/select-shunt-adress/select-shunt-adress.nvue

@@ -129,9 +129,18 @@
 		methods: {
 			handleChecked(item) {
 				this.selectShuntAdressAccountInfo = item
-				uni.$emit('selectShuntAdressAccountInfo', {
-					selectShuntAdressAccountInfo: item
-				})
+				// 根据type判断发送不同的事件：1=分流收货单位，2=普通收货单位
+				if(this.addressType === '2'){
+					// 普通收货单位选择
+					uni.$emit('selectReceiveUnitInfo', {
+						selectReceiveUnitInfo: item
+					})
+				}else{
+					// 分流收货单位选择
+					uni.$emit('selectShuntAdressAccountInfo', {
+						selectShuntAdressAccountInfo: item
+					})
+				}
 				uni.navigateBack()
 			},
 			search() {