增加激活码列表页面,修复进件部分问题
This commit is contained in:
@@ -63,7 +63,6 @@
|
||||
|
||||
const bankAliasCode=defineModel('bankAliasCode')
|
||||
|
||||
const wxProvinceCode=defineModel('wxProvinceCode')
|
||||
|
||||
|
||||
const selid = ref('')
|
||||
@@ -95,7 +94,6 @@
|
||||
show.value = false;
|
||||
|
||||
}
|
||||
|
||||
function search() {
|
||||
isEnd.value = false
|
||||
query.page = 1
|
||||
@@ -111,7 +109,6 @@
|
||||
selItem.value = findShop
|
||||
bankInstId.value = findShop.bankCode
|
||||
bankAliasCode.value = findShop.bankAliasCode
|
||||
wxProvinceCode.value=findShop.wxProvinceCode
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
<view class="icon">
|
||||
<up-icon name="arrow-down" size="14" color="#999"></up-icon>
|
||||
</view>
|
||||
|
||||
|
||||
</view>
|
||||
<up-popup :show="show" placement="bottom" round="18rpx" closeOnClickOverlay @close="close">
|
||||
<view class="u-p-30">
|
||||
@@ -19,13 +19,13 @@
|
||||
<scroll-view scroll-with-animation :scroll-into-view="selid" class="scroll-view u-m-t-30"
|
||||
scroll-y="true" style="max-height :60vh;">
|
||||
<template v-if="list.length">
|
||||
<view class="u-m-b-10 u-flex item" v-for="item in list" :key="item.bankCode"
|
||||
@click="itemClick(item)" :id="'shop_'+item.bankCode"
|
||||
:class="{active:selItem&&selItem.bankCode==item.bankCode}">
|
||||
<view class="u-m-b-10 u-flex item" v-for="item in list" :key="item.bank_branch_id"
|
||||
@click="itemClick(item)" :id="'shop_'+item.bank_branch_id"
|
||||
:class="{active:selItem&&selItem.bank_branch_id==item.bank_branch_id}">
|
||||
<view class="checkbox">
|
||||
<up-icon name="checkbox-mark" color="#fff"></up-icon>
|
||||
</view>
|
||||
<view class="u-flex-1">{{item.branchName}}</view>
|
||||
<view class="u-flex-1">{{item.bank_branch_name}}</view>
|
||||
</view>
|
||||
<view class="u-p-20 u-flex u-row-center">
|
||||
<up-loadmore status="nomore"></up-loadmore>
|
||||
@@ -33,11 +33,11 @@
|
||||
</template>
|
||||
<template v-else>
|
||||
<template v-if="keywords">
|
||||
<up-empty text="未搜索到相关支行"></up-empty>
|
||||
<up-empty text="未搜索到相关支行"></up-empty>
|
||||
</template>
|
||||
<up-empty v-else text="暂无支行"></up-empty>
|
||||
</template>
|
||||
|
||||
|
||||
|
||||
|
||||
</scroll-view>
|
||||
@@ -71,15 +71,15 @@
|
||||
|
||||
const show = ref(false);
|
||||
const modelValue = defineModel();
|
||||
const bankBranchName = defineModel('bankBranchName', {
|
||||
const bankbank_branch_name = defineModel('bankbank_branch_name', {
|
||||
default: '',
|
||||
});
|
||||
|
||||
const selid = ref('')
|
||||
|
||||
function returnLabel() {
|
||||
const findShop = list.value.find(v => v.bankCode == modelValue.value)
|
||||
return findShop ? findShop.branchName : ''
|
||||
const findShop = list.value.find(v => v.bank_branch_id == modelValue.value)
|
||||
return findShop ? findShop.bank_branch_name : ''
|
||||
}
|
||||
const selItem = ref(null)
|
||||
|
||||
@@ -87,9 +87,9 @@
|
||||
selItem.value = data
|
||||
}
|
||||
|
||||
function returnbranchName(bankCode) {
|
||||
const item = list.value.find((v) => v.bankCode == bankCode);
|
||||
return item?.branchName || '';
|
||||
function returnbank_branch_name(bank_branch_id) {
|
||||
const item = list.value.find((v) => v.bank_branch_id == bank_branch_id);
|
||||
return item?.bank_branch_name || '';
|
||||
}
|
||||
|
||||
function close() {
|
||||
@@ -97,8 +97,8 @@
|
||||
}
|
||||
|
||||
function submit() {
|
||||
modelValue.value = selItem.value.bankCode
|
||||
bankBranchName.value = selItem.value.branchName
|
||||
modelValue.value = selItem.value.bank_branch_id
|
||||
bankbank_branch_name.value = selItem.value.bank_branch_name
|
||||
show.value = false;
|
||||
}
|
||||
|
||||
@@ -165,10 +165,12 @@
|
||||
|
||||
const list = ref([]);
|
||||
|
||||
function openPopup() {
|
||||
async function openPopup() {
|
||||
await init()
|
||||
selid.value = 'shop_' + modelValue.value
|
||||
const findShop = list.value.find(v => v.bankCode == modelValue.value)
|
||||
selItem.value=findShop?findShop:null
|
||||
console.log('list.value',list.value);
|
||||
const findShop = list.value.find(v => v.bank_branch_id == modelValue.value)
|
||||
selItem.value = findShop ? findShop : null
|
||||
show.value = true;
|
||||
|
||||
}
|
||||
@@ -208,23 +210,20 @@
|
||||
query: {
|
||||
type: Object,
|
||||
default: () => ({
|
||||
province: '',
|
||||
city: '',
|
||||
instId: '',
|
||||
bankAliceCode: '',
|
||||
cityCode: ''
|
||||
})
|
||||
}
|
||||
})
|
||||
|
||||
|
||||
watch(() => show.value, (newval) => {
|
||||
init()
|
||||
})
|
||||
|
||||
|
||||
let allList = []
|
||||
async function init() {
|
||||
const res = await bankBranchList(props.query);
|
||||
list.value = res
|
||||
allList = res
|
||||
list.value = res.data
|
||||
allList = res.data
|
||||
}
|
||||
</script>
|
||||
<style lang="scss">
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
</up-radio-group>
|
||||
</view>
|
||||
|
||||
<view class="form-item required">
|
||||
<view class="form-item required" v-if="form.userType=='1'">
|
||||
<view class="title">企业类型</view>
|
||||
<up-radio-group v-model="form.companyChildType">
|
||||
<up-radio v-for="(value,key) in companyChildTypes" :label="value" :name="key">
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
></my-upload-img>
|
||||
</view>
|
||||
<view class="form-item required">
|
||||
<view class="title"> 身份证反面(国徽)</view>
|
||||
<view class="title"> 身份证反面(人像)</view>
|
||||
<my-upload-img v-model="form.idCardBackPic.url" :size="200" :maxSize="maxSize"
|
||||
@uploadSuccess="uploadSuccess($event,'IdCard','idCardBackPic')"
|
||||
></my-upload-img>
|
||||
|
||||
@@ -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);
|
||||
|
||||
|
||||
@@ -143,47 +143,47 @@ export const rules = {
|
||||
},
|
||||
openAccProvinceId: {
|
||||
required: true,
|
||||
errorMsg: '请选择地区',
|
||||
errorMsg: '请选择开户行省市区',
|
||||
},
|
||||
openAccCityId: {
|
||||
required: true,
|
||||
errorMsg: '请选择地区',
|
||||
errorMsg: '请选择开户行省市区',
|
||||
},
|
||||
openAccAreaId: {
|
||||
required: true,
|
||||
errorMsg: '请选择地区',
|
||||
errorMsg: '请选择开户行省市区',
|
||||
},
|
||||
openAccProvince: {
|
||||
required: true,
|
||||
errorMsg: '请选择地区',
|
||||
errorMsg: '请选择开户行省市区',
|
||||
},
|
||||
openAccCity: {
|
||||
required: true,
|
||||
errorMsg: '请选择地区',
|
||||
errorMsg: '请选择开户行省市区',
|
||||
},
|
||||
openAccArea: {
|
||||
required: true,
|
||||
errorMsg: '请选择地区',
|
||||
errorMsg: '请选择开户行省市区',
|
||||
},
|
||||
bankType: {
|
||||
required: true,
|
||||
errorMsg: '请选择银行',
|
||||
errorMsg: '请选择开户行',
|
||||
},
|
||||
bankInstId: {
|
||||
required: true,
|
||||
errorMsg: '请选择银行',
|
||||
errorMsg: '请选择开户行',
|
||||
},
|
||||
bankName: {
|
||||
required: true,
|
||||
errorMsg: '请选择银行',
|
||||
errorMsg: '请选择开户行',
|
||||
},
|
||||
settlementCardNo: {
|
||||
required: true,
|
||||
errorMsg: '请填写结算账户卡号',
|
||||
errorMsg: '请填写结算卡号',
|
||||
},
|
||||
settlementName: {
|
||||
required: true,
|
||||
errorMsg: '请填写结算账户户名',
|
||||
errorMsg: '请填写开户名称',
|
||||
},
|
||||
bankMobile: {
|
||||
required: true,
|
||||
|
||||
Reference in New Issue
Block a user