增加激活码列表页面,修复进件部分问题

entryManager/add/components/settlement-info.vue

@@ -49,7 +49,7 @@
 			</template>
 
 
-			<view class="form-item required" >
+			<view class="form-item required">
 				<view class="title"> 结算卡类型</view>
 				<up-radio-group v-model="form.settlementCardType">
 					<up-radio v-for="(value,key) in settlementCardTypes" :label="value" :name="key">
@@ -71,7 +71,7 @@
 
 
 			<view class="form-item required">
-				<view class="title"> 地区</view>
+				<view class="title"> 开户行省市区</view>
 				<view class="input-box u-flex  u-row-between u-col-center" @click="showCitySelect=true">
 					<text class="color-999" v-if="!pro_city_area">请选择</text>
 					<text class="color-333" v-else>{{pro_city_area}}</text>
@@ -79,11 +79,9 @@
 				</view>
 			</view>
 			<view class="form-item required">
-				<view class="title"> 银行</view>
+				<view class="title"> 开户行</view>
 				<bankSelect v-model="form.bankName" v-model:bankInstId="form.bankInstId"
-				v-model:wxProvinceCode="wxProvinceCode"
-				v-model:bankAliasCode="form.bankType"
-				></bankSelect>
+					v-model:bankAliasCode="form.bankType"></bankSelect>
 			</view>
 			<view class="form-item " v-if="pro_city_area&&form.bankName">
 				<view class="title"> 支行</view>
@@ -91,13 +89,13 @@
 					v-model:bankBranchCode="form.bankBranchCode"></bankBranchList>
 			</view>
 			<view class="form-item required">
-				<view class="title"> 结算账户卡号</view>
-				<up-input placeholder="结算账户卡号" :placeholder-class="placeholderClass"
+				<view class="title"> 结算卡号</view>
+				<up-input placeholder="结算卡号" :placeholder-class="placeholderClass"
 					v-model="form.settlementCardNo"></up-input>
 			</view>
 			<view class="form-item required">
-				<view class="title"> 结算账户户名</view>
-				<up-input placeholder="结算账户户名" :placeholder-class="placeholderClass"
+				<view class="title"> 开户名称</view>
+				<up-input placeholder="开户名称" :placeholder-class="placeholderClass"
 					v-model="form.settlementName"></up-input>
 			</view>
 			<view class="form-item required">
@@ -154,7 +152,7 @@
 		</view>
 
 
-		<citySelect v-model="showCitySelect" @city-change="cityChange"></citySelect>
+		<citySelect v-model="showCitySelect" @city-change="cityChange" @init="getRegionData"></citySelect>
 
 	</view>
 
@@ -165,7 +163,8 @@
 		computed,
 		reactive,
 		watch,
-		ref
+		ref,
+		watchEffect
 	} from 'vue';
 	import shopSelect from './shop-select.vue'
 	import citySelect from '../../components/u-city-select.vue'
@@ -183,10 +182,18 @@
 	import {
 		getInfoByImg
 	} from '@/http/api/order/entryManager.js'
+	import list from 'uview-plus/components/u-list/list';
+
+	const regions = ref([])
+
+	function getRegionData(arr = []) {
+		regions.value = arr
+	}
+
 	const showCitySelect = ref(false)
 	const showBankSelect = ref(true)
-	
-	const wxProvinceCode=ref('')
+
+	const wxProvinceCode = ref('')
 
 	function uploadSuccess(url, type, key) {
 		uni.showLoading({
@@ -213,7 +220,7 @@
 		form.openAccProvince = e.province.regionName;
 		form.openAccCity = e.city.regionName;
 		form.openAccArea = e.area.regionName;
-
+		wxProvinceCode.value = e.city.wxProvinceCode;
 		form.openAccProvinceId = e.province.regionId;
 		form.openAccCityId = e.city.regionId;
 		form.openAccAreaId = e.area.regionId;
@@ -288,9 +295,8 @@
 	const isRequired = ref('required')
 	const bankBranchListQuery = computed(() => {
 		return {
-			province: form.openAccProvince,
-			city: form.openAccCity,
-			instId: form.bankInstId,
+			bankAliceCode: form.bankType,
+			cityCode: wxProvinceCode.value
 		}
 	})
 
@@ -303,7 +309,17 @@
 		}
 	})
 
-
+	watchEffect(() => {
+		if (regions.value.length && form.openAccCityId) {
+			if (!wxProvinceCode.value) {
+				const findPItem= regions.value.find(v=>v.regionId==form.openAccProvinceId)
+				const cityIyem=findPItem?(findPItem.children.find(v=>v.regionId==form.openAccCityId)):null
+				if(cityIyem){
+					wxProvinceCode.value =cityIyem.wxProvinceCode
+				}
+			}
+		}
+	})
 	watch(() => props.data, (newval) => {
 		console.log('watch 变', newval);