1

pages/admin/Jiazheng/banzhengXinxi.vue

@@ -57,7 +57,7 @@
 					</radio-group>
 				</view>
 				<view class="form-label-input">
-					<view class="phone-form-label"><text class="form-label-require">*</text>职业名称等级</view>
+					<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-if="zyNameAndLevel">{{zyNameAndLevel}}</view>
@@ -65,6 +65,16 @@
 						<icon></icon>
 					</view>
 				</view>
+				<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="isZijiazheng !='true'" class="page-btn-box">
 					<button type="default" v-if="isZijiazheng !='true'" @click="goBack"
 						class="phone-white-btn">返回</button>
@@ -180,8 +190,6 @@
 					return {
 						zyId: item.id,
 						zyName: item.name,
-						zyLevel: item.zyLevel,
-						zyLevelName: item.zyLevelName
 					};
 				});
 				this.$refs.selectRef.handleShow(newArray)
@@ -189,12 +197,16 @@
 			selectZyLevelConfirm(data) {
 				console.log('data', data);
 				this.piliangArray = [...data]
-				this.zyNameAndLevel = data.map(item => `${item.name}${item.zyLevelName}`).join(',');
+				this.zyNameAndLevel = data.map(item => `${item.name}`).join(',');
 				console.log('this.piliangArray', this.piliangArray);
+				this.zhiyeChange(this.piliangArray)
+				//234
 			},
 			// 提交表单
 			addSaveFormPiliang() {
 				let req = {
+					zyLevelName: this.formData.zhiyeLevelName,
+					zyLevel: this.formData.zhiyeLevelId,
 					canxunshijian: this.formData.canxunshijian,
 					jgId: this.formData.baozhengJigouId,
 					needKaoshi: this.formData.needKaoshi,
@@ -211,8 +223,6 @@
 						...req, // 展开req的所有属性
 						zyId: item.id,
 						zyName: item.name,
-						zyLevel: item.zyLevel,
-						zyLevelName: item.zyLevelName
 					};
 				});
 				console.log('this.mergedArray', mergedArray);
@@ -271,7 +281,7 @@
 					console.log('index', index);
 					console.log('data', data);
 					this.currentIndex = index
-					this.zyNameAndLevel = data.zyName + data.zyLevelName
+					this.zyNameAndLevel = data.zyName
 					this.formData.baozhengJigouName = data.jgName;
 					this.formData.baozhengJigouId = data.jgId;
 					this.formData.id = data.id;
@@ -281,6 +291,21 @@
 					this.formData.zhiyeId = data.zyId;
 					this.formData.zhiyeLevelName = data.zyLevelName;
 					this.formData.zhiyeLevelId = data.zyLevel;
+					if (this.formData.baozhengJigouId) {
+						this.isJgFlag = false
+					}
+					if (this.formData.baozhengJigouId && this.formData.zhiyeId) {
+						this.isZyFlag = false
+						let req = {
+							jgId: this.formData.baozhengJigouId,
+							zyId: this.formData.zhiyeId,
+						}
+						getJiazhengLevel(req).then(res => {
+							console.log('res', res);
+							this.zhiyelevelsOpt = res.data
+						})
+					}
+
 					this.formData.canxunshijian = data.canxunshijian;
 					this.formData.zongkeshi = data.zongkeshi;
 					this.formData.shicaochengji = data.shicaochengji;
@@ -341,7 +366,7 @@
 				this.isJgFlag = true
 				this.isZyFlag = true
 				this.zyNameAndLevel = ''
-					this.piliangArray = []
+				this.piliangArray = []
 			},
 			resetFun() {
 				this.formData.zhiyeName = ''
@@ -386,7 +411,7 @@
 				}
 				if (this.formData.baozhengJigouId) {
 					this.isJgFlag = false //开启
-					this.getZhiye()
+					//this.getZhiye()
 				}
 			},
 
@@ -417,9 +442,10 @@
 				})
 			},
 			// 职业名称选择
-			zhiyeChange(e) {
-				this.formData.zhiyeName = this.zhiyeNameOpt[e.detail.value].name;
-				this.formData.zhiyeId = this.zhiyeNameOpt[e.detail.value].id;
+			zhiyeChange(data) {
+				//123
+				//	this.formData.zhiyeName = this.zhiyeNameOpt[e.detail.value].name;
+				this.formData.zhiyeId = data[0].id;
 				if (this.formData.baozhengJigouId && this.formData.zhiyeId) {
 					this.isZyFlag = false
 					this.getZhiyeLevel()