1

pages/admin/Jiazheng/banzhengXinxi.vue

@@ -22,29 +22,6 @@
 						</view>
 					</picker>
 				</view>
-				<!-- 职业名称（picker 实现下拉选择） -->
-				<!-- 	<view class="form-label-select">
-					<view class="phone-form-label"><text class="form-label-require">*</text>职业名称</view>
-					<picker mode="selector" :disabled="isJgFlag" :style="isJgFlag?'color:#999':''" :range="zhiyeNames"
-						range-key="name" @change="zhiyeChange" class="select-picker-box">
-						<view class="form-radio-select">
-							<view>{{ formData.zhiyeName || '请选择职业名称' }}</view>
-							<icon></icon>
-						</view>
-					</picker>
-				</view> -->
-				<!-- 职业等级（picker 实现下拉选择） -->
-				<!-- 	<view class="form-label-select">
-					<view class="phone-form-label"><text class="form-label-require">*</text>职业等级</view>
-					<picker mode="selector" :disabled="isZyFlag" :style="isZyFlag?'color:#999':''" :range="zhiyeLevels"
-						@change="levelChange" class="select-picker-box">
-						<view class="form-radio-select">
-							<view>{{ formData.zhiyeLevelName || '请选择等级' }}</view>
-							<icon></icon>
-						</view>
-					</picker>
-				</view> -->
-
 				<view v-if="formData.banzhengInfoFlag" class="form-label-select">
 					<view class="phone-form-label"><text class="form-label-require">*</text>参训时间</view>
 					<uni-datetime-picker class="form-radio-picker" v-model="formData.canxunshijian" type="date"
@@ -83,17 +60,11 @@
 					<view class="phone-form-label"><text class="form-label-require"></text>职业名称等级</view>
 					<view @click="selectZy" class="input-text-row text-ellipsis-row">
 						<!-- wgy看这  v-for去掉换成一个数组或字符串 -->
-						<view class="text-ellipsis" v-for="(item,index) in piliangArray" :key="index">{{item.name}} {{item.zyLevelName}}</view>
+						<view class="text-ellipsis" v-if="zyNameAndLevel">{{zyNameAndLevel}}</view>
+						<view class="text-ellipsis"  v-else>请选择职业名称</view>
 						<icon></icon>
 					</view>
 				</view>
-				
-				<!-- 
-				<view v-if="piliangArray.length>0" v-for="(item,index) in piliangArray" :key="index"
-					class="bzsm-tip-box form-top-margin">
-					<view class="tip-content-box">{{item.name}} {{item.zyLevelName}}</view>
-
-				</view> -->
 				<view v-if="isZijiazheng !='true'" class="page-btn-box">
 					<button type="default" v-if="isZijiazheng !='true'" @click="goBack"
 						class="phone-white-btn">返回</button>
@@ -150,7 +121,8 @@
 				isJgFlag: true,
 				isZyFlag: true,
 				piliang: '',
-				piliangArray: []
+				piliangArray: [],
+				zyNameAndLevel:''
 			};
 		},
 		props: {
@@ -190,18 +162,23 @@
 					});
 					return false
 				}
-				this.$refs.selectRef.handleShow()
+				console.log('this.piliangArray',this.piliangArray);
+				
+				let newArray = this.piliangArray.map(item => {
+					return {
+						zyId: item.id,
+						zyName: item.name,
+						zyLevel: item.zyLevel,
+						zyLevelName: item.zyLevelName
+					};
+				});
+				this.$refs.selectRef.handleShow(newArray)
 			},
 			selectZyLevelConfirm(data) {
 				console.log('data', data);
 				this.piliangArray = [...data]
+				this.zyNameAndLevel = data.map(item => `${item.name}${item.zyLevelName}`).join(',');
 				console.log('this.piliangArray', this.piliangArray);
-				// const dataWithIds = updatedData.map((item, index) => ({
-				// 	...item,
-				// 	statusBanzheng: '未办证',
-				// 	id: res.data[index]
-				// }));
-				// this.allData.kaozhengList = [...this.allData.kaozhengList, ...dataWithIds];
 			},
 			// 提交表单
 			addSaveFormPiliang() {