Merge branch '2025北京诚祥' of https://gogs.mtavip.com/wangguoyu/uniProject into 2025北京诚祥

pages/admin/Jiazheng/common/dataChecked.vue

@@ -133,18 +133,7 @@
 			isSelected(id) {
 				return this.selectedData.some(item => item.id === id);
 			},
-			// toggleSelect(data) {
-			// 	const index = this.selectedData.indexOf(data);
-			// 	console.log('index', index);
-			// 	if (index == -1) {
-			// 		this.selectedData.push(data);
-			// 	} else {
-			// 		this.selectedData.splice(index, 1);
-			// 	}
 
-			// 	console.log('this.selectedData', this.selectedData);
-			// 	this.$emit('change', this.selectedData);
-			// },
 
 			toggleSelect(data) {
 				if (this.mode == 'single') {

pages/admin/Jiazheng/gerenZiliao.vue

@@ -38,7 +38,9 @@
 			<picker mode="multiSelector" :range="multiArray" :range-key="'label'" :value="multiIndex"
 				@columnchange="bindMultiPickerColumnChange" @change="onPickerConfirm" class="select-picker-box">
 				<view class="form-radio-select">
-					<view>	{{formData.jiguanShengName === formData.jiguanShiName ? formData.jiguanShengName  : `${formData.jiguanShengName} ${formData.jiguanShiName}`}}</view>
+					<view>
+						{{formData.jiguanShengName === formData.jiguanShiName ? formData.jiguanShengName  : `${formData.jiguanShengName} ${formData.jiguanShiName}`}}
+					</view>
 					<icon></icon>
 				</view>
 			</picker>
@@ -82,7 +84,8 @@
 			<view class="phone-form-label"><text class="form-label-require"></text>通讯地址</view>
 			<view @click="openMap" class="input-text-row">
 				<view v-if="formData.jingdu&&formData.weidu">{{formData.juzhuDizhi}}</view>
-				<view v-if="formData.jingdu ==''&&formData.weidu ==''">{{formData.juzhuDizhi}} <text v-if="formData.juzhuDizhi" style="color: #3fd2a1;">(无经纬度)</text></view>
+				<view v-if="formData.jingdu ==''&&formData.weidu ==''">{{formData.juzhuDizhi}} <text
+						v-if="formData.juzhuDizhi" style="color: #3fd2a1;">(无经纬度)</text></view>
 				<icon></icon>
 			</view>
 		</view>
@@ -127,7 +130,8 @@
 			<button type="default" v-if="status =='edit'" @click="editSave" class="phone-green-btn">保存</button>
 		</view>
 		<uni-popup ref="popupMap" background-color="#fff" :is-mask-click="false" :mask-click="false">
-			<customMap style="100vh" @xuanzeAdress="xuanzeAdress" @currentWeizhi="currentWeizhi" @close="mapClose"></customMap>
+			<customMap style="100vh" @xuanzeAdress="xuanzeAdress" @currentWeizhi="currentWeizhi" @close="mapClose">
+			</customMap>
 		</uni-popup>
 	</view>
 </template>
@@ -261,11 +265,14 @@
 								this.formData.minzu = this.dataForId(this.minzuList, res.data.minzu) || ''
 								this.formData.gender = res.data.gender
 								this.formData.xueli = this.dataForId(this.xueliList, res.data.xueli) || ''
-								this.formData.hunyin = this.dataForId(this.hunyinList, res.data.hunyin) || ''
+								this.formData.hunyin = this.dataForId(this.hunyinList, res.data.hunyin) ||
+									''
 								this.formData.hujiDizhi = res.data.hujiDizhi
 								this.formData.juzhuDizhi = res.data.juzhuDizhi
-								this.formData.xingzuo = this.dataForId(this.xingzuoList, res.data.xingzuo) ||''
-								this.formData.shuxiang = this.dataForId(this.shuxiangList, res.data.xingzuo) ||''
+								this.formData.xingzuo = this.dataForId(this.xingzuoList, res.data
+									.xingzuo) || ''
+								this.formData.shuxiang = this.dataForId(this.shuxiangList, res.data
+									.xingzuo) || ''
 								this.formData.xingzuoFlag = res.data.xingzuoFlag
 								this.$emit('idCardBlur', res.data);
 							});
@@ -621,14 +628,23 @@
 				this.formData.shuxiangIndex = 0
 			},
 			selectChangeXueliList(data) {
-				this.formData.xueli = data[0]
+				if (data.length > 0) {
+					this.formData.xueli = data[0]
+				} else {
+					this.formData.xueli = {}
+				}
 			},
 			genderSelect(data) {
 				this.formData.gender = data
 			},
 			selectChangeHunyinList(data) {
 				console.log('data', data[0]);
-				this.formData.hunyin = data[0]
+				if (data.length > 0) {
+					this.formData.hunyin = data[0]
+				} else {
+					this.formData.hunyin = {}
+				}
+
 			},
 			switchXingzuoChange(e) {
 				this.formData.xingzuoFlag = e.detail.value

pages/admin/Jiazheng/index.vue

@@ -299,10 +299,12 @@
 
 
 	function selectChangeSkill(item) {
-		data.leixing = item[0].name
-		console.log('selectChangeSkill', item);
-		data.page = 0;
-		refreshData()
+		if(item.length>0){
+			data.leixing = item[0].name
+			console.log('selectChangeSkill', item);
+			data.page = 0;
+			refreshData()
+		}
 	}
 
 	function refreshData() {

pages/admin/Jiazheng/qiuzhiXinxi.vue

@@ -27,8 +27,8 @@
 		</view>
 		<view class="form-label-select">
 			<view class="phone-form-label"><text class="form-label-require"></text>薪资级别</view>
-			<picker :range="xinziJibieList" mode='selector' @change="xinziJibieChange" 
-			@cancel="xinziJibieCancel" class="select-picker-box">
+			<picker :range="xinziJibieList" mode='selector' @change="xinziJibieChange" @cancel="xinziJibieCancel"
+				class="select-picker-box">
 				<view class="form-radio-select">
 					<view>{{jibiexinzi}}</view>
 					<icon></icon>
@@ -42,7 +42,7 @@
 		</view>
 		<view class="form-label-input flex-start-row">
 			<view class="phone-form-label"><text class="form-label-require"></text>工作经历</view>
-			<textarea v-model="jingli"  placeholder="请填写工作经历" class="form-textarea-box" />
+			<textarea v-model="jingli" maxlength="-1" placeholder="请填写工作经历" class="form-textarea-box" />
 		</view>
 		<view class="page-btn-box">
 			<button type="default" v-if="status =='add'" @click="goNext" class="phone-green-btn">下一步</button>
@@ -196,7 +196,11 @@
 			},
 			selectChangeZhuangtai(data) {
 				console.log('zhuangtaiData', data);
-				this.zhuangtai = data[0].id
+				if (data.length > 0) {
+					this.zhuangtai = data[0].id
+				}else{
+					this.zhuangtai = ''
+				}
 				console.log('zhuangtai', this.zhuangtai);
 				// const index = e.detail.value
 				// this.jingyan = this.jingyanList[index]

pages/admin/banzheng/list.vue

@@ -13,8 +13,8 @@
 			<view class="filter-btn" @click="filterBtn">筛选</view>
 		</view>
 		<view class="banzheng-type-box" v-show="isOpen" @click="clickAlltype">
-			<dataChecked :list="allType" mode="single" :selectedIds='data.statusBanzheng' :defaultCount="99" :showAdd="false"
-				@change="selectChangeSkill" />
+			<dataChecked :list="allType" mode="single" :selectedIds='data.statusBanzheng' :defaultCount="99"
+				:showAdd="false" @change="selectChangeSkill" />
 		</view>
 		<!-- 课程列表 -->
 		<scroll-view scroll-y="true" refresher-enabled="true" :refresher-triggered="data.loading"
@@ -133,24 +133,32 @@
 	/*** 办证状态 ***/
 	let isOpen = ref(false)
 	let allType = ref([])
-	function getKaozhengBanzhengList(){
+
+	function getKaozhengBanzhengList() {
 		banzhengApi.getKaozhengBanzheng().then(res => {
-			const newItem = { id: 0, name: '全部状态' };
-			allType.value = [newItem,...res.data ];
-			data.statusBanzheng = 1
+			const newItem = {
+				id: 0,
+				name: '全部状态'
+			};
+			allType.value = [newItem, ...res.data];
+			data.statusBanzheng = 1
 			data.bzztName = '未办证'
 		})
 	}
 	const clickAlltype = (data) => {
 		isOpen.value = !isOpen.value;
 	}
+
 	function selectChangeSkill(item) {
-		data.statusBanzheng = item[0].id == 0 ? '' :item[0].id;
-		data.bzztName = item[0].name;
-		data.page = 0;
-		refreshData();
+		if (item.length > 0) {
+			data.statusBanzheng = item[0].id == 0 ? '' : item[0].id;
+			data.bzztName = item[0].name;
+			data.page = 0;
+			refreshData();
+		}
+
 	}
-	
+
 	function deleteFun(data) {
 		console.log('data', data);
 		deleteId.value = data.id
@@ -251,7 +259,7 @@
 		const opt = {
 			jgId: data.jgId, // 机构ID
 			realName: data.realName, // 姓名
-			statusBanzheng: data.statusBanzheng==''? 1:data.statusBanzheng, // 办证状态
+			statusBanzheng: data.statusBanzheng == '' ? 1 : data.statusBanzheng, // 办证状态
 			statusKaoshi: data.statusKaoshi, // 考试状态
 			userName: data.userName, // 手机号
 			zyId: data.zyId, // 职业ID