wangguoyu 1 mesiac pred
rodič
commit
f90bc7c7c7

+ 282 - 139
pages/admin/Jiazheng/bf/banzhengXinxi.vue

@@ -1,103 +1,112 @@
 <template>
 	<view class="jz-content-box">
-		<view v-if="status =='add'" class="bzsm-tip-box form-top-margin">
-			<view class="title-btn-box">
-				<view class="phone-line-title">说明</view>
-				<view @click="resetFun" class="reset-btn">重置</view>
-			</view>
-			<view class="tip-content-box">1.如果不需要办理证书,可直接点击保存按钮。</view>
-			<view class="tip-content-box">2.点击重置按钮,只重置办证信息,其他信息不改变。</view>
-		</view>
-		<!-- 报证机构(picker 实现下拉选择) -->
-		<view class="form-label-select form-top-margin">
-			<view class="phone-form-label"><text class="form-label-require">*</text>报证机构</view>
-			<picker :disabled="(status =='edit'&&localStatus=='')" mode="selector" :range="jigouNames"
-				@change="jigouChange" class="select-picker-box">
-				<view class="form-radio-select" :class="{'form-radio-disabled': (status =='edit'&&localStatus=='')}">
-					<view>{{ formData.baozhengJigouName || '请选择报证机构' }}</view>
-					<icon></icon>
+		<view :class="isZijiazheng=='true'?'mask-view':''">
+			<view class="content-body-box">
+				<view v-if="status =='add'" class="bzsm-tip-box form-top-margin">
+					<view class="title-btn-box">
+						<view class="phone-line-title">说明</view>
+						<view @click="resetFun" class="reset-btn">重置</view>
+					</view>
+					<view class="tip-content-box">1.如果不需要办理证书,可直接点击保存按钮。</view>
+					<view class="tip-content-box">2.点击重置按钮,只重置办证信息,其他信息不改变。</view>
 				</view>
-			</picker>
-		</view>
-		<!-- 职业名称(picker 实现下拉选择) -->
-		<view class="form-label-select">
-			<view class="phone-form-label"><text class="form-label-require">*</text>职业名称</view>
-			<picker mode="selector" :range="zhiyeNames" range-key="name" @change="zhiyeChange"
-				class="select-picker-box">
-				<view class="form-radio-select">
-					<view>{{ formData.zhiyeName || '请选择职业名称' }}</view>
-					<icon></icon>
+				<!-- 报证机构(picker 实现下拉选择) -->
+				<view class="form-label-select form-top-margin">
+					<view class="phone-form-label"><text class="form-label-require">*</text>报证机构</view>
+					<picker :disabled="(status =='edit'&&localStatus=='')" mode="selector" :range="jigouNames"
+						@change="jigouChange" class="select-picker-box">
+						<view class="form-radio-select"
+							:class="{'form-radio-disabled': (status =='edit'&&localStatus=='')}">
+							<view>{{ formData.baozhengJigouName || '请选择报证机构' }}</view>
+							<icon></icon>
+						</view>
+					</picker>
 				</view>
-			</picker>
-		</view>
-		<!-- 职业等级(picker 实现下拉选择) -->
-		<view class="form-label-select">
-			<view class="phone-form-label"><text class="form-label-require">*</text>职业等级</view>
-			<picker mode="selector" :range="zhiyeLevels" @change="levelChange" class="select-picker-box">
-				<view class="form-radio-select">
-					<view>{{ formData.zhiyeLevelName || '请选择等级' }}</view>
-					<icon></icon>
+				<!-- 职业名称(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>
-			</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"
-				@change="canxunShijianChange">
-				<view class="form-radio-select">
-					<view>{{formData.canxunShijian}}</view>
-					<icon></icon>
+				<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"
+						@change="canxunShijianChange">
+						<view class="form-radio-select">
+							<view>{{formData.canxunshijian}}</view>
+							<icon></icon>
+						</view>
+					</uni-datetime-picker>
 				</view>
-			</uni-datetime-picker>
-		</view>
 
-		<view v-if="formData.banzhengInfoFlag" class="form-label-input">
-			<view class="phone-form-label"><text class="form-label-require">*</text>实操成绩</view>
-			<input v-model="formData.shicaochengji" placeholder="请填写实操成绩" />
-		</view>
-		<view v-if="formData.banzhengInfoFlag" class="form-label-input">
-			<view class="phone-form-label"><text class="form-label-require">*</text>总课时</view>
-			<input v-model="formData.zongkeshi" placeholder="请填写总课时" />
-		</view>
+				<view v-if="formData.banzhengInfoFlag" class="form-label-input">
+					<view class="phone-form-label"><text class="form-label-require">*</text>实操成绩</view>
+					<input v-model="formData.shicaochengji" placeholder="请填写实操成绩" />
+				</view>
+				<view v-if="formData.banzhengInfoFlag" class="form-label-input">
+					<view class="phone-form-label"><text class="form-label-require">*</text>总课时</view>
+					<input v-model="formData.zongkeshi" placeholder="请填写总课时" />
+				</view>
+				<view v-if="formData.needFlag" class="form-label-select">
+					<view class="phone-form-label"><text class="form-label-require"></text>需要考试</view>
+					<radio-group @change="kaoshiChange">
+						<label class="radio-label">
+							<radio :value="'true'" :checked="formData.needKaoshi == 'true'" color="#3fd2a1"
+								style="transform:scale(0.65)" />
+							<text>是</text>
+						</label>
+						<label class="radio-label">
+							<radio :value="'false'" :checked="formData.needKaoshi == 'false'" color="#3fd2a1"
+								style="transform:scale(0.65)" />
+							<text>否</text>
+						</label>
+					</radio-group>
+				</view>
+				<view v-if="isZijiazheng !='true'" class="page-btn-box">
+					<button type="default" v-if="piliang !=1&&isZijiazheng !='true'" @click="goBack"
+						class="phone-white-btn">返回</button>
+					<button type="default" v-if="piliang ==1&&isZijiazheng !='true'" @click="piliangBaocun"
+						class="phone-green-btn">确认</button>
+					<button type="default" v-if="piliang !=1&&isZijiazheng !='true'" @click="addSaveForm"
+						class="phone-green-btn">添加</button>
+				</view>
+				<view v-if="piliangArray.length>0" v-for="(item,index) in piliangArray" :key="index"
+					class="bzsm-tip-box form-top-margin">
+					<view class="title-btn-box">
+						<view class="phone-line-title">{{item.jgName}}</view>
+						<view class="reset-btn" @click="piliangDelete(item,index)">删除</view>
+					</view>
+					<view class="tip-content-box">{{item.zyName}} {{item.zyLevelName}}</view>
+					<!-- 				<view class="tip-content-box">职业名称:{{item.zyName}}</view>
+				<view class="tip-content-box">职业等级:{{item.zyLevelName}}</view> -->
+				</view>
 
 
-		<view v-if="formData.needFlag" class="form-label-select">
-			<view class="phone-form-label"><text class="form-label-require"></text>需要课程</view>
-			<radio-group @change="kechengChange">
-				<label class="radio-label">
-					<radio :value="'true'" :disabled=" formData.kcDisabled" :checked="formData.needKecheng == 'true'"
-						color="#3fd2a1" style="transform:scale(0.65)" />
-					<text>是</text>
-				</label>
-				<label class="radio-label">
-					<radio :value="'false'" :checked="formData.needKecheng == 'false'" color="#3fd2a1"
-						style="transform:scale(0.65)" />
-					<text>否</text>
-				</label>
-			</radio-group>
-		</view>
-		<view v-if="formData.needFlag" class="form-label-select">
-			<view class="phone-form-label"><text class="form-label-require"></text>需要考试</view>
-			<radio-group @change="kaoshiChange">
-				<label class="radio-label">
-					<radio :value="'true'" :checked="formData.needKaoshi == 'true'" color="#3fd2a1"
-						style="transform:scale(0.65)" />
-					<text>是</text>
-				</label>
-				<label class="radio-label">
-					<radio :value="'false'" :checked="formData.needKaoshi == 'false'" color="#3fd2a1"
-						style="transform:scale(0.65)" />
-					<text>否</text>
-				</label>
-			</radio-group>
-		</view>
-		<view class="page-btn-box">
-			<button type="default" v-if="status!='add'" @click="goBack" class="phone-white-btn">返回</button>
-			<button type="default" @click="addSaveForm" class="phone-green-btn">保存</button>
+			</view>
+			<view v-if="isZijiazheng !='true' &&piliang ==1" class="page-btn-box content-footer-box">
+				<button type="default" v-if="piliang ==1&&isZijiazheng !='true'" @click="goBack"
+					class="phone-white-btn">返回</button>
+				<button type="default" v-if="piliang ==1&&isZijiazheng !='true'" @click="addSaveFormPiliang"
+					class="phone-green-btn">添加</button>
+			</view>
 		</view>
-		<!-- 提交按钮 -->
-		<!-- 		<button class="submit-btn" @click="submitForm">提交</button> -->
 	</view>
 </template>
 
@@ -121,15 +130,15 @@
 					zhiyeId: '',
 					zhiyeLevelName: '',
 					zhiyeLevelId: '',
-					canxunShijian: '',
+					canxunshijian: '',
 					shicaochengji: '',
 					zongkeshi: '',
 					needKecheng: 'false', // 默认选中"是"
 					needKaoshi: 'false', // 默认选中"是"
 					kcDisabled: false,
 					needFlag: false,
-					id:'',
-					createTime:''
+					id: '',
+					createTime: ''
 				},
 				baozhengJigouOpt: [
 
@@ -139,13 +148,21 @@
 
 				],
 				localStatus: '',
-				currentIndex :''
+				currentIndex: '',
+				isJgFlag: true,
+				isZyFlag: true,
+				piliang: '',
+				piliangArray: []
 			};
 		},
 		props: {
 			status: {
 				type: String,
+			},
+			isZijiazheng: {
+				type: String,
 			}
+
 		},
 		computed: {
 			jigouNames() {
@@ -164,10 +181,24 @@
 
 		},
 		methods: {
-			goBack(){
-				this.$emit('goBack');	
+			piliangDelete(item, index) {
+				this.piliangArray.splice(index, 1);
+			},
+			isPiliang(data) {
+				this.piliang = data
+				if (data == 0) {
+					this.piliangArray = []
+				}
 			},
-			editinfo(data,index) {
+			goBack() {
+				this.isJgFlag = true
+				this.isZyFlag = true
+				this.piliangArray = []
+				this.$emit('goBack');
+			},
+			editinfo(data, index) {
+				this.piliangArray = []
+				console.log('123123', data);
 				this.$nextTick(() => {
 					if (!data) {
 						return false
@@ -184,6 +215,7 @@
 					this.formData.zhiyeLevelName = data.zyLevelName;
 					this.formData.zhiyeLevelId = data.zyLevel;
 					if (this.formData.baozhengJigouId) {
+						this.isJgFlag = false
 						getJiazhengZhiye({
 							id: this.formData.baozhengJigouId
 						}).then(res => {
@@ -192,6 +224,7 @@
 						})
 					}
 					if (this.formData.baozhengJigouId && this.formData.zhiyeId) {
+						this.isZyFlag = false
 						let req = {
 							jgId: this.formData.baozhengJigouId,
 							zyId: this.formData.zhiyeId,
@@ -202,7 +235,8 @@
 							this.zhiyelevelsOpt = res.data
 						})
 					}
-					this.formData.canxunShijian = data.canxunShijian;
+					this.formData.canxunshijian = data.canxunshijian;
+					this.formData.zongkeshi = data.zongkeshi;
 					this.formData.shicaochengji = data.shicaochengji;
 					this.formData.needKecheng = data.needKecheng ? data.needKecheng.toString() : 'false';
 					this.formData.needKaoshi = data.needKaoshi ? data.needKaoshi.toString() : 'false';
@@ -252,16 +286,18 @@
 				this.formData.zhiyeId = ''
 				this.formData.zhiyeLevelName = ''
 				this.formData.zhiyeLevelId = ''
-				this.formData.canxunShijian = ''
+				this.formData.canxunshijian = ''
 				this.formData.shicaochengji = ''
 				this.formData.zongkeshi = ''
+				this.isJgFlag = true
+				this.isZyFlag = true
 			},
 			resetFun() {
 				this.formData.zhiyeName = ''
 				this.formData.zhiyeId = ''
 				this.formData.zhiyeLevelName = ''
 				this.formData.zhiyeLevelId = ''
-				this.formData.canxunShijian = ''
+				this.formData.canxunshijian = ''
 				this.formData.shicaochengji = ''
 				this.formData.zongkeshi = ''
 				this.formData.baozhengJigouName = ''
@@ -272,7 +308,9 @@
 				this.formData.needFlag = false
 				this.formData.kcDisabled = false
 				this.formData.banzhengInfoFlag = false
-	
+				this.isJgFlag = true
+				this.isZyFlag = true
+					this.piliangArray = []
 
 			},
 			// 报证机构选择
@@ -283,6 +321,7 @@
 				this.formData.banzhengInfoFlag = this.baozhengJigouOpt[e.detail.value].jgType == 1;
 				// 每一次都重置
 				this.resetData()
+
 				console.log('this.formData.banzhengInfoFlag', this.formData.banzhengInfoFlag);
 				if (this.formData.banzhengInfoFlag) {
 					this.formData.needFlag = false
@@ -293,7 +332,10 @@
 					this.formData.needKaoshi = 'true'
 					this.formData.needKecheng = 'false'
 				}
-				this.getZhiye()
+				if (this.formData.baozhengJigouId) {
+					this.isJgFlag = false //开启
+					this.getZhiye()
+				}
 			},
 
 			// 职业等级选择
@@ -326,11 +368,14 @@
 			zhiyeChange(e) {
 				this.formData.zhiyeName = this.zhiyeNameOpt[e.detail.value].name;
 				this.formData.zhiyeId = this.zhiyeNameOpt[e.detail.value].id;
-				this.getZhiyeLevel()
+				if (this.formData.baozhengJigouId && this.formData.zhiyeId) {
+					this.isZyFlag = false
+					this.getZhiyeLevel()
+				}
 			},
 			canxunShijianChange(e) {
 				console.log('e', e);
-				this.formData.canxunShijian = e
+				this.formData.canxunshijian = e
 			},
 
 			// 需要课程选择
@@ -359,11 +404,127 @@
 				this.formData.needKaoshi = e.detail.value.toString();
 			},
 			currentMove(data) {
-				console.log('');
+				console.log('data', data);
 				// currentMove 编辑状态下的新增
 				this.localStatus = data
 				console.log('localStatus', this.localStatus);
 			},
+			piliangBaocun() {
+				let req = {
+					canxunshijian: this.formData.canxunshijian,
+					jgId: this.formData.baozhengJigouId,
+					needKaoshi: this.formData.needKaoshi,
+					needKecheng: this.formData.needKecheng,
+					shicaochengji: this.formData.shicaochengji,
+					zongkeshi: this.formData.zongkeshi,
+					zyId: this.formData.zhiyeId,
+					zyLevel: this.formData.zhiyeLevelId,
+					jgType: this.formData.baozhengJigouType,
+					jgName: this.formData.baozhengJigouName,
+					zyName: this.formData.zhiyeName,
+					zyLevelName: this.formData.zhiyeLevelName,
+					id: this.formData.id,
+					createTime: dayjs().format("YYYY-MM-DD HH:mm:ss")
+				}
+				if (this.status == 'add' || this.localStatus == 'editadd' || this.localStatus == 'addEdit') {
+					req.createTime = dayjs().format("YYYY-MM-DD HH:mm:ss")
+				}
+				if (req.jgId == '' || req.zyId == '' || req.zyLevel == '') {
+					uni.showToast({
+						title: '请选择保证机构,职业名称,职业等级',
+						icon: 'none'
+					});
+					return false
+				}
+				if (this.formData.baozhengJigouType == 1 && (this.formData.shicaochengji == '' || this.formData
+						.zongkeshi ==
+						'' || this.formData.canxunshijian == '')) {
+					uni.showToast({
+						title: '请填写参训时间,实操成绩,总课时',
+						icon: 'none'
+					});
+					return false
+				}
+				// 检查重复数据 - 新增的重复检查逻辑
+				const isDuplicate = this.piliangArray.some(item =>
+					item.jgId === req.jgId &&
+					item.zyId === req.zyId &&
+					item.zyLevel === req.zyLevel
+				);
+
+				if (isDuplicate) {
+					uni.showToast({
+						title: '该机构、职业和等级已存在,无法重复添加',
+						icon: 'none'
+					});
+					return false;
+				}
+
+				//console.log('req', req);
+				this.piliangArray.push(req)
+				console.log('this.piliangArray', this.piliangArray);
+			},
+			// 提交表单
+			addSaveFormPiliang() {
+				let req = {
+					canxunshijian: this.formData.canxunshijian,
+					jgId: this.formData.baozhengJigouId,
+					needKaoshi: this.formData.needKaoshi,
+					needKecheng: this.formData.needKecheng,
+					shicaochengji: this.formData.shicaochengji,
+					zongkeshi: this.formData.zongkeshi,
+					zyId: this.formData.zhiyeId,
+					zyLevel: this.formData.zhiyeLevelId,
+					jgType: this.formData.baozhengJigouType,
+					jgName: this.formData.baozhengJigouName,
+					zyName: this.formData.zhiyeName,
+					zyLevelName: this.formData.zhiyeLevelName,
+					id: this.formData.id,
+					createTime: dayjs().format("YYYY-MM-DD HH:mm:ss")
+				}
+				if (this.status == 'add' || this.localStatus == 'editadd' || this.localStatus == 'addEdit') {
+					req.createTime = dayjs().format("YYYY-MM-DD HH:mm:ss")
+				}
+				if (req.jgId == '' || req.zyId == '' || req.zyLevel == '') {
+					uni.showToast({
+						title: '请选择保证机构,职业名称,职业等级',
+						icon: 'none'
+					});
+					return false
+				}
+				if (this.formData.baozhengJigouType == 1 && (this.formData.shicaochengji == '' || this.formData
+						.zongkeshi ==
+						'' || this.formData.canxunshijian == '')) {
+					uni.showToast({
+						title: '请填写参训时间,实操成绩,总课时',
+						icon: 'none'
+					});
+					return false
+				}
+
+
+				console.log('this.status', this.status);
+				console.log('this.localStatus', this.localStatus);
+
+				if (this.localStatus == 'editAdd') {
+					if (this.piliangArray.length == 0) {
+						this.$emit('editSavePiliang', req);
+					} else {
+						console.log('this.piliangArray', this.piliangArray);
+						this.$emit('editSavePiliang', this.piliangArray)
+					}
+
+				} else if (this.status == 'add') {
+					if (this.piliangArray.length == 0) {
+						this.$emit('addSavePiliang', req);
+					} else {
+						console.log('this.piliangArray', this.piliangArray);
+						this.$emit('addSavePiliang', this.piliangArray)
+					}
+				}
+			
+
+			},
 			// 提交表单
 			addSaveForm() {
 				//debugger
@@ -384,12 +545,19 @@
 					zyName: this.formData.zhiyeName,
 					zyLevelName: this.formData.zhiyeLevelName,
 					id: this.formData.id,
-					createTime:dayjs().format("YYYY-MM-DD HH:mm:ss")
+					createTime: dayjs().format("YYYY-MM-DD HH:mm:ss")
 				}
 				console.log('req', req);
-				if(this.status =='add'||this.localStatus =='editadd'){
+				if (this.status == 'add' || this.localStatus == 'editadd' || this.localStatus == 'addEdit') {
 					req.createTime = dayjs().format("YYYY-MM-DD HH:mm:ss")
 				}
+				if (req.jgId == '' || req.zyId == '' || req.zyLevel == '') {
+					uni.showToast({
+						title: '请选择保证机构,职业名称,职业等级',
+						icon: 'none'
+					});
+					return false
+				}
 				if (this.formData.baozhengJigouType == 1 && (this.formData.shicaochengji == '' || this.formData
 						.zongkeshi ==
 						'' || this.formData.canxunshijian == '')) {
@@ -399,19 +567,22 @@
 					});
 					return false
 				}
+				console.log('req123123123', req);
 				if (req.jgId && req.zyId && req.zyLevel) {
-					if (this.status == 'add') {
+					if (this.localStatus == 'addEdit') {
+						this.$emit('addEdit', req, 'addEdit', this.currentIndex);
+					} else if (this.status == 'add') {
 						this.$emit('addSave', req);
 					} else if (this.localStatus == 'editAdd') {
 						this.$emit('editSave', req, 'editAdd');
 					} else {
-						this.$emit('editSave', req, 'edit',this.currentIndex);
+						this.$emit('editSave', req, 'edit', this.currentIndex);
 					}
 
 				} else if (req.jgId == '' && req.zyId == '' && req.zyLevel == '') {
 					if (this.status == 'add') {
 						this.$emit('addSave', '');
-					} else if(this.localStatus == 'editAdd') {
+					} else if (this.localStatus == 'editAdd') {
 						//this.$emit('editSave', '');
 						// uni.showToast({
 						// 	title: '请选择保证机构,职业名称,职业等级',
@@ -419,8 +590,8 @@
 						// });
 
 						// return false
-					}else{
-						
+					} else {
+
 					}
 				} else {
 					uni.showToast({
@@ -430,34 +601,6 @@
 
 					return false
 				}
-				// // 表单验证
-				// if (!this.formData.institution) {
-				// 	uni.showToast({
-				// 		title: '请选择报证机构',
-				// 		icon: 'none'
-				// 	});
-				// 	return;
-				// }
-				// if (!this.formData.selectedLevel) {
-				// 	uni.showToast({
-				// 		title: '请选择职业等级',
-				// 		icon: 'none'
-				// 	});
-				// 	return;
-				// }
-				// if (!this.formData.selectedOccupation) {
-				// 	uni.showToast({
-				// 		title: '请选择职业名称',
-				// 		icon: 'none'
-				// 	});
-				// 	return;
-				// }
-
-				// // 提交数据(示例)
-				// console.log('提交数据:', this.formData);
-				// uni.showToast({
-				// 	title: '提交成功'
-				// });
 			}
 		}
 	};

+ 54 - 15
pages/admin/Jiazheng/bf/banzhengXinxiList.vue

@@ -1,22 +1,39 @@
 <template>
 	<view class="bzxx-list-page">
-		<view class="bzxx-wrap-box" v-if="list.length>0">
-			<view v-for="(item,index) in list" :key="index" class="bzxx-card-box">
-				<view class="name-btn-box">
-					<view class="jg-name">报证机构:{{item.jgName}}</view>
-					<view class="name-btn editer-btn" @click="goEdit(item,index)">编辑</view>
-					<view class="name-btn delete-btn" @click="deleteFun(item,index)">删除</view>
+		<view :class="isZijiazheng=='true'?'mask-view':''">
+			<view  class="bz-new-btn-box" v-if="list.length>0">
+				<button type="default" class="phone-white-btn" @click="addBanzheng">添加</button>
+				<button type="default" class="phone-green-btn" @click="addBanzhengPiliang">批量添加</button>
+			</view>
+			<view class="bzxx-wrap-box" v-if="list.length>0">
+				<view v-for="(item,index) in list" :key="index" class="bzxx-card-box">
+					<view class="name-btn-box">
+						<view class="jg-name">报证机构:{{item.jgName}}</view>
+						<view class="name-btn editer-btn" @click="goEdit(item,index)">编辑</view>
+						<view class="name-btn delete-btn" @click="deleteFun(item,index)">删除</view>
+					</view>
+					<view class="bzxx-zy-row">
+						<icon class="zy-icon"></icon>职业名称:<text>{{item.zyName}}</text>
+					</view>
+					<view class="bzxx-zy-row">
+						<icon class="zydj-icon"></icon>职业等级:<text>{{item.zyLevelName}}</text>
+					</view>
+					<view class="bzxx-time-row">
+						<icon class="time-icon"></icon><text>申报时间:{{item.createTime}}</text>
+					</view>
 				</view>
-				<view class="bzxx-zy-row"><icon class="zy-icon"></icon>职业名称:<text>{{item.zyName}}</text></view>
-				<view class="bzxx-zy-row"><icon class="zydj-icon"></icon>职业等级:<text>{{item.zyLevelName}}</text></view>
-				<view class="bzxx-time-row"><icon class="time-icon"></icon><text>申报时间:{{item.createTime}}</text></view>
 			</view>
-		</view>
-		<view v-if="list.length>0" class="bzxx-btn-box">
-			<button type="default" @click="addBanzheng" class="phone-white-btn">添加</button>
-		</view>
-		<view v-else class="bzxx-add-btn-box">
-			<view  @click="addBanzheng" class="bzxx-add-btn"><text>+</text>添加办证信息</view>
+		<!-- 	<view v-if="list.length>0 && status!='edit'" class="bzxx-btn-box">
+				<button type="default" v-if="status!='edit'&&isZijiazheng !='true'" @click="saveBanzheng" class="phone-green-btn">保存</button>
+			</view> -->
+			<view v-if="list.length==0" class="bzxx-add-btn-box">
+				<view @click="addBanzheng" class="bzxx-add-btn"><text>+</text>添加办证信息</view>
+				<view @click="addBanzhengPiliang" class="bzxx-add-btn"><text>+</text>批量添加办证信息</view>
+
+			</view>
+			<view v-if="status =='add'&&isZijiazheng !='true'" class="bzxx-btn-box">
+				<button type="default" @click="saveBanzheng" class="phone-green-btn">保存</button>
+			</view>
 		</view>
 	</view>
 </template>
@@ -28,6 +45,9 @@
 		getJiazhengZhiye,
 		getJiazhengBanzhengCheckKc
 	} from "@/api/jiazheng.js"
+	import {
+		toast
+	} from "@/utils/common";
 	export default {
 		data() {
 			return {
@@ -39,6 +59,9 @@
 				type: Array,
 				default: () => []
 			},
+			status: {
+				type: String,
+			}
 		},
 		computed: {
 
@@ -50,10 +73,26 @@
 			addBanzheng() {
 				this.$emit('addBanzheng');
 			},
+			addBanzhengPiliang() {
+				this.$emit('addBanzhengPiliang');
+			},
+			saveBanzheng() {
+				this.$emit('saveBanzheng');
+			},
 			goEdit(item, index) {
+
+				console.log('item', item);
+				if (item.statusBanzheng != '未办证' && this.status == 'edit') {
+					toast("已提交办证申请,禁止修改")
+					return false
+				}
 				this.$emit('editBanzheng', item, index);
 			},
 			deleteFun(item, index) {
+				if (item.statusBanzheng != '未办证' && this.status == 'edit') {
+					toast("已提交办证申请,禁止删除")
+					return false
+				}
 				this.$emit('deleteBanzheng', item, index);
 			}
 		}

+ 39 - 39
pages/admin/Jiazheng/bf/common/jiazhengUpload.vue

@@ -17,9 +17,11 @@
 </template>
 
 <script>
+	import axios from 'axios';
 	import {
 		getAliyunPolicy
 	} from "@/api/jiazheng.js"
+		import cacheManager from "@/utils/cacheManager.js";
 	export default {
 		emits: ['getFileUrl'], // 声明自定义事件
 		data() {
@@ -75,31 +77,48 @@
 					count: 1, // 只能选择一张图片
 					sourceType: [sourceType], // 'camera' 或 'album'
 					success: (res) => {
+						console.log('res', res);
+
+						// #ifndef H5
 						const filePath = res.tempFilePaths[0];
 						this.uploadFileToAliyun(filePath);
+						// #endif
+						// #ifdef H5
+						const filePath = res.tempFiles[0];
+						this.uploadFileToAliyun(filePath);
+						// #endif
 					}
 				});
 			},
 			uploadFileToAliyun(filePath) {
 				console.log('filePath', filePath);
+
 				const loading = uni.showLoading({
 					title: '上传中...',
 					mask: true
 				});
-			
 				try {
+
+					// #ifdef H5
+					const suffixList = filePath.name.split('.');
+					let req = {
+						prefix: 'resource/',
+						suffix: suffixList[suffixList.length - 1],
+					}
+					// #endif
+					// #ifndef H5
 					const suffix = filePath.split('.').pop();
 					let req = {
 						prefix: 'resource/',
 						suffix: suffix
 					}
-			
+					// #endif
 					getAliyunPolicy(req).then(res => {
 						let that = this;
 						if (res.code == 0) {
 							const policyData = res.data;
 							console.log('policyData', policyData);
-			
+
 							// #ifdef H5
 							const formData = new FormData();
 							formData.append('key', policyData.key);
@@ -107,47 +126,28 @@
 							formData.append('OSSAccessKeyId', policyData.accessid);
 							formData.append('signature', policyData.signature);
 							formData.append('success_action_status', '200');
-		
-							fetch(filePath)
-								.then(response => response.blob())
-								.then(blob => {
-									formData.append('file', blob, policyData.key);
-									fetch(policyData.uploadUrl, {
-										method: 'POST',
-										body: formData
-									})
-									.then(response => {
-										if (response.ok) {
-											that.imageUrl = `${policyData.downloadUrl}/${policyData.key}`;
-											uni.showToast({
-												title: '上传成功',
-												icon: 'success'
-											});
-											that.$emit('getFileUrl', that.imageUrl);
-										} else {
-											uni.showToast({
-												title: '上传失败',
-											});
-										}
-									})
-									.catch(error => {
-										console.error('上传失败:', error);
+							formData.append('file', filePath);
+
+							axios.post(policyData.uploadUrl, formData)
+								.then(alRes => {
+									if (alRes.status === 200) {
+										that.imageUrl =
+											`${policyData.downloadUrl}/${policyData.key}`;
+										uni.showToast({
+											title: '上传成功',
+											icon: 'success'
+										});
+										that.$emit('getFileUrl', that.imageUrl);
+									} else {
 										uni.showToast({
 											title: '上传失败',
-											icon: 'none'
 										});
-									});
+									}
 								})
-								.catch(error => {
-									console.error('文件转换失败:', error);
-									uni.showToast({
-										title: '文件转换失败',
-										icon: 'none'
-									});
-								});
 							// #endif
-			
+
 							// #ifndef H5
+							console.log('appappappappappapp');
 							// 非 H5 环境下使用 uni.uploadFile 上传
 							uni.uploadFile({
 								url: policyData.uploadUrl,
@@ -183,7 +183,7 @@
 								}
 							});
 							// #endif
-			
+
 						} else {
 							uni.showToast({
 								title: '获取凭证失败',

+ 138 - 117
pages/admin/Jiazheng/bf/gerenZiliao.vue

@@ -1,138 +1,143 @@
 <template>
 	<view class="jz-content-box">
-		<view class="upload-img-box">
-			<jiazhengUpload @getFileUrl="getFileUrl" changjingType="shenfenzheng"></jiazhengUpload>
-		</view>
-		<view class="form-label-input">
-			<view class="phone-form-label"><text class="form-label-require">*</text>手机号</view>
-			<uni-easyinput type="number" v-model="formData.userName" placeholder="请输入手机号" maxlength="11" />
-		</view>
-
-		<view class="form-label-input">
-			<view class="phone-form-label"><text class="form-label-require">*</text>姓名</view>
-			<uni-easyinput v-model="formData.realName" placeholder="请输入姓名" />
-		</view>
-
-		<view class="form-label-input">
-			<view class="phone-form-label">
-				<text class="form-label-require">*</text>
-				<text v-if="formData.idtype ==1">身份证号</text>
-				<text v-if="formData.idtype ==2">护照号</text>
-				<icon @click="idCardChange" class="change-icon">切换</icon>
+		<!-- 涂层 子家政公司使用 -->
+		<view :class="isZijiazheng=='true'?'mask-view':''">
+			<view class="upload-img-box">
+				<jiazhengUpload @getFileUrl="getFileUrl" changjingType="shenfenzheng"></jiazhengUpload>
+			</view>
+			<view class="form-label-input">
+				<view class="phone-form-label"><text class="form-label-require">*</text>手机号</view>
+				<uni-easyinput :disabled="!statusFlag && status=='edit'" type="number" v-model="formData.userName"
+					placeholder="请输入手机号" maxlength="11" />
 			</view>
-			<uni-easyinput @blur="idCardBlur" v-model="formData.idcard" placeholder="请输入身份证号或护照号" maxlength="18" />
-		</view>
 
-		<view class="form-label-select">
-			<view class="phone-form-label"><text class="form-label-require">*</text>生日</view>
-			<uni-datetime-picker type="line" v-model="formData.birthday">
-				<view class="form-radio-select">
-					<view>{{formData.birthday}}</view>
-					<icon></icon>
+			<view class="form-label-input">
+				<view class="phone-form-label"><text class="form-label-require">*</text>姓名</view>
+				<uni-easyinput :disabled="!statusFlag && status=='edit'" v-model="formData.realName"
+					placeholder="请输入姓名" />
+			</view>
+			<view class="form-label-input">
+				<view class="phone-form-label">
+					<text class="form-label-require">*</text>
+					<text v-if="formData.idtype ==1">身份证号</text>
+					<text v-if="formData.idtype ==2">护照号</text>
+					<icon @click="idCardChange" class="change-icon">切换</icon>
 				</view>
-			</uni-datetime-picker>
-		</view>
+				<uni-easyinput :disabled="!statusFlag && status=='edit'" @blur="idCardBlur" v-model="formData.idcard"
+					placeholder="请输入身份证号或护照号" maxlength="18" />
+			</view>
 
-		<view class="form-label-select">
-			<view class="phone-form-label"><text class="form-label-require">*</text>籍贯</view>
-			<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 class="form-label-select">
+				<view class="phone-form-label"><text class="form-label-require">*</text>生日</view>
+				<uni-datetime-picker type="line" v-model="formData.birthday">
+					<view class="form-radio-select">
+						<view>{{formData.birthday}}</view>
+						<icon></icon>
 					</view>
-					<icon></icon>
+				</uni-datetime-picker>
+			</view>
+
+			<view class="form-label-select">
+				<view class="phone-form-label"><text class="form-label-require">*</text>籍贯</view>
+				<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>
+						<icon></icon>
+					</view>
+				</picker>
+			</view>
+			<view class="form-label-input">
+				<view class="phone-form-label"><text class="form-label-require">*</text>身份证地址</view>
+				<uni-easyinput v-model="formData.hujiDizhi" placeholder="请输入身份证地址" />
+			</view>
+			<view class="form-label-select">
+				<view class="phone-form-label"><text class="form-label-require">*</text>民族</view>
+				<picker :range="minzuList" mode='selector' :value="formData.minzuIndex" range-key="name"
+					@change="minzuChange" @cancel="minzuCancel" class="select-picker-box">
+					<view class="form-radio-select">
+						<view>{{ formData.minzu.name }}</view>
+						<icon></icon>
+					</view>
+				</picker>
+			</view>
+			<view class="form-label-radio">
+				<view class="phone-form-label"><text class="form-label-require">*</text>性别</view>
+				<view class="form-radio-group">
+					<view class="form-radio-item" :class="{genderActive: formData.gender==1}" @click="genderSelect(1)">
+						男</view>
+					<view class="form-radio-item" :class="{genderActive: formData.gender==2}" @click="genderSelect(2)">
+						女</view>
 				</view>
-			</picker>
-		</view>
-		<view class="form-label-input">
-			<view class="phone-form-label"><text class="form-label-require">*</text>身份证地址</view>
-			<uni-easyinput v-model="formData.hujiDizhi" placeholder="请输入身份证地址" />
-		</view>
-		<view class="form-label-select">
-			<view class="phone-form-label"><text class="form-label-require">*</text>民族</view>
-			<picker :range="minzuList" mode='selector' :value="formData.minzuIndex" range-key="name"
-				@change="minzuChange" @cancel="minzuCancel" class="select-picker-box">
-				<view class="form-radio-select">
-					<view>{{ formData.minzu.name }}</view>
+			</view>
+			<view class="form-label-radio form-top-margin flex-start-row">
+				<view class="phone-form-label"><text class="form-label-require">*</text>学历</view>
+				<dataChecked :list="xueliList" :selectedIds='formData.xueli.id' mode="single" :showAdd="false"
+					@change="selectChangeXueliList" />
+			</view>
+			<view class="form-label-radio flex-start-row">
+				<view class="phone-form-label"><text class="form-label-require"></text>婚姻 </view>
+				<dataChecked :list="hunyinList" mode="single" :selectedIds='formData.hunyin.id' :showAdd="false"
+					@change="selectChangeHunyinList" />
+			</view>
+
+
+			<view class="form-label-input">
+				<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>
 					<icon></icon>
 				</view>
-			</picker>
-		</view>
-		<view class="form-label-radio">
-			<view class="phone-form-label"><text class="form-label-require">*</text>性别</view>
-			<view class="form-radio-group">
-				<view class="form-radio-item" :class="{genderActive: formData.gender==1}" @click="genderSelect(1)">
-					男</view>
-				<view class="form-radio-item" :class="{genderActive: formData.gender==2}" @click="genderSelect(2)">
-					女</view>
 			</view>
-		</view>
-		<view class="form-label-radio form-top-margin flex-start-row">
-			<view class="phone-form-label"><text class="form-label-require">*</text>学历</view>
-			<dataChecked :list="xueliList" :selectedIds='formData.xueli.id' mode="single" :showAdd="false"
-				@change="selectChangeXueliList" />
-		</view>
-		<view class="form-label-radio flex-start-row">
-			<view class="phone-form-label"><text class="form-label-require"></text>婚姻 </view>
-			<dataChecked :list="hunyinList" mode="single" :selectedIds='formData.hunyin.id' :showAdd="false"
-				@change="selectChangeHunyinList" />
-		</view>
-
 
-		<view class="form-label-input">
-			<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>
-				<icon></icon>
+			<view class="form-label-select">
+				<view class="phone-form-label"><text class="form-label-require"></text>星座</view>
+				<picker :range="xingzuoList" mode='selector' :value="formData.xingzuoIndex" range-key="name"
+					@change="xingzuoChange" @cancel="xingzuoCancel" class="select-picker-box">
+					<view class="form-radio-select">
+						<view>{{ formData.xingzuo.name  }}</view>
+						<icon></icon>
+					</view>
+				</picker>
+			</view>
+			<view class="form-label-select">
+				<view class="phone-form-label"><text class="form-label-require"></text>属相</view>
+				<picker :range="shuxiangList" mode='selector' :value="formData.shuxiangIndex" range-key="name"
+					@change="shuxiangChange" @cancel="shuxiangCancel" class="select-picker-box">
+					<view class="form-radio-select">
+						<view>{{ formData.shuxiang.name  }}</view>
+						<icon></icon>
+					</view>
+				</picker>
 			</view>
-		</view>
 
-		<view class="form-label-select">
-			<view class="phone-form-label"><text class="form-label-require"></text>星座</view>
-			<picker :range="xingzuoList" mode='selector' :value="formData.xingzuoIndex" range-key="name"
-				@change="xingzuoChange" @cancel="xingzuoCancel" class="select-picker-box">
-				<view class="form-radio-select">
-					<view>{{ formData.xingzuo.name  }}</view>
-					<icon></icon>
+			<view class="form-label-switch">
+				<view class="phone-form-label"> <text class="form-label-require"></text>星座属相展示到简历 </view>
+				<view>展示
+					<switch @change="switchXingzuoChange" :checked="formData.xingzuoFlag" color="#3fd2a1"
+						style="transform:scale(0.7)" />
 				</view>
-			</picker>
-		</view>
-		<view class="form-label-select">
-			<view class="phone-form-label"><text class="form-label-require"></text>属相</view>
-			<picker :range="shuxiangList" mode='selector' :value="formData.shuxiangIndex" range-key="name"
-				@change="shuxiangChange" @cancel="shuxiangCancel" class="select-picker-box">
-				<view class="form-radio-select">
-					<view>{{ formData.shuxiang.name  }}</view>
-					<icon></icon>
-				</view>
-			</picker>
-		</view>
-
-		<view class="form-label-switch">
-			<view class="phone-form-label"> <text class="form-label-require"></text>星座属相展示到简历 </view>
-			<view>展示
-				<switch @change="switchXingzuoChange" :checked="formData.xingzuoFlag" color="#3fd2a1"
-					style="transform:scale(0.7)" />
 			</view>
-		</view>
 
-		<view class="agree-section-box form-top-margin">
-			<checkbox-group @change="handleAgree">
-				<label class="checkbox">
-					<checkbox :checked="formData.agree" color="#3fd2a1" style="transform:scale(0.65)" />
-					<text>已征得本人同意,将其个人资料信息录入平台</text>
-				</label>
-			</checkbox-group>
-			<button type="default" v-if="status =='add'" @click="goNext" class="phone-green-btn">下一步</button>
-			<button type="default" v-if="status =='edit'" @click="editSave" class="phone-green-btn">保存</button>
+			<view  class="agree-section-box form-top-margin">
+				<checkbox-group @change="handleAgree">
+					<label class="checkbox">
+						<checkbox :checked="formData.agree" color="#3fd2a1" style="transform:scale(0.65)" />
+						<text>已征得本人同意,将其个人资料信息录入平台</text>
+					</label>
+				</checkbox-group>
+				<button type="default" v-if="status =='add'&&isZijiazheng !='true'" @click="goNext" class="phone-green-btn">下一步</button>
+				<button type="default" v-if="status =='edit' &&isZijiazheng !='true'" @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>
+			</uni-popup>
 		</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>
-		</uni-popup>
 	</view>
 </template>
 
@@ -141,6 +146,9 @@
 	import jiazhengUpload from "./common/jiazhengUpload.vue"
 	import customMap from "@/components/customMap/customMap.vue"
 	import {
+		toast
+	} from "@/utils/common";
+	import {
 		getJiazhengXueli,
 		getJiazhengHunyin,
 		getJiazhengMinzu,
@@ -159,7 +167,14 @@
 		props: {
 			status: {
 				type: String,
+			},
+			statusFlag: {
+				type: Boolean,
+			},
+			isZijiazheng: {
+				type: String,
 			}
+			
 		},
 		data() {
 			return {
@@ -220,6 +235,8 @@
 			}
 		},
 		created() {
+
+			console.log('statusFlag', this.statusFlag);
 			uni.showLoading({
 				title: '加载中'
 			});
@@ -635,6 +652,10 @@
 				}
 			},
 			genderSelect(data) {
+				if (!this.statusFlag && this.status == 'edit ') {
+					toast("非未办证状态,禁止修改")
+					return false
+				}
 				this.formData.gender = data
 			},
 			selectChangeHunyinList(data) {

+ 93 - 34
pages/admin/Jiazheng/bf/index.vue

@@ -5,7 +5,7 @@
 			<text class="nav-bar-title">家政人员</text>
 			<uni-icons class="nav-bar-right-icon bar-ml10" type="search" size="20" @click="toggle('top')"></uni-icons>
 		</view>
-		<view class="jiazheng-search-box">
+		<view v-if="isZijiazhengFlag !='true'" class="jiazheng-search-box">
 			<view @click.stop="clickAlltype" class="select-item-box">
 				<text class="select-text">{{data.zyName}}</text>
 				<icon :class="allJtClass" />
@@ -33,24 +33,23 @@
 			<dataChecked :list="allType" mode="single" :defaultCount="99" :showAdd="false"
 				@change="selectChangeSkill" />
 		</view>
+		<view v-if="isZijiazhengFlag !='true'" class="jz-new-btn-box">
+			<button type="default" class="phone-green-btn" @click="addJiazhengRenyuan">新增人员</button>
+		</view>
 		<view>
 			<scroll-view scroll-y="true" refresher-enabled="true" :refresher-triggered="data.loading"
-				:refresher-threshold="50" @scrolltolower="onScrolltolower" refresher-background="transparent" @refresherrefresh="onRefresh"
-		
-				class="jz-scroll-view">
+				:refresher-threshold="50" @scrolltolower="onScrolltolower" refresher-background="transparent"
+				@refresherrefresh="onRefresh" class="jz-scroll-view">
 				<uni-list class="admin-list-box">
-					<view class="jz-new-btn-box">
-						<button type="default" class="phone-green-btn" @click="addJiazhengRenyuan">新增人员</button>
-					</view>
 
 					<uni-list-item v-for="item in data.list" class="jz-list-item-box">
 						<template v-slot:body>
-							<view class="card-head-row">
+							<view v-if="isZijiazhengFlag !='true'" class="card-head-row">
 								<view class="head-name">{{item.realName}}</view>
 								<button type="default" class="phone-green-btn bz-bind-btn"
 									@click.stop="kechengBind(item)">课程绑定</button>
-									<button type="default" class="phone-green-btn bz-tel-btn"
-										@click.stop="telephone(item)">打电话</button>
+								<button type="default" class="phone-green-btn bz-tel-btn"
+									@click.stop="telephone(item)">打电话</button>
 								<share :id="item.id" ref="shareRef">分享</share>
 
 							</view>
@@ -68,8 +67,8 @@
 									<view class="content-text-row">
 										{{item.jiguanShengName === item.jiguanShiName ? item.jiguanShengName  : `${item.jiguanShengName} ${item.jiguanShiName}`}}人
 									</view>
-						
-									<view v-if="item.zyNames.length>0"  class="content-lx-box">
+
+									<view v-if="item.zyNames.length>0" class="content-lx-box">
 										<view class="content-lx-item" v-for="item2 in item.zyNames" :key="item2">
 											{{item2}}
 										</view>
@@ -136,6 +135,7 @@
 		}
 	})
 	let isOpen = ref(false)
+	let isZijiazhengFlag = ref('false')
 	let defauleImg = ref('@/static/images/my/user-default-img.png')
 	const allJtClass = 'select-jt-default';
 	let updataJtClass = ref('');
@@ -149,6 +149,12 @@
 	let isFirstClickUpdate = ref('true')
 	let isFirstClickluru = ref('true')
 	let isFirstClickjuli = ref('true')
+	let userIdList = ref(null)
+	let listIds = ref(null)
+	let startDate = ref(null)
+	let endDate = ref(null)
+	let from = ref(null)
+	let jzId = ref(null)
 
 	function updateTimeClick() {
 		data.sortType = 1
@@ -174,11 +180,11 @@
 		refreshData()
 	}
 
-	function onScrolltolower(){
+	function onScrolltolower() {
 		getMore()
 	}
-	
-	
+
+
 	function luruTimeClick() {
 		data.sortType = 2
 		const isFirst = isFirstClickluru.value == 'true';
@@ -273,7 +279,15 @@
 		let pageInfo = {
 			status: 'edit',
 			id: data.id,
-			userId: data.userId
+			userId: data.userId,
+			isZijiazheng: isZijiazhengFlag.value,
+			from: from.value,
+			endDate: endDate.value,
+			startDate: startDate.value,
+			jzId: jzId.value,
+			userIdList: userIdList.value ? userIdList.value : "",
+			listIds: listIds.value ? listIds.value : "",
+			
 		}
 		uni.redirectTo({
 			url: `/pages/admin/Jiazheng/jiazhengUserInfo?pageInfo=` + JSON.stringify(pageInfo)
@@ -281,9 +295,29 @@
 	}
 
 	function goUpPage() {
-		uni.redirectTo({
-			url: `/pages/admin/ShouYe/shouye`
-		})
+		if (from.value == 'zijiazhenggongsi') {
+			const originalParams =
+				`isZijiazheng=true&userIdList=${userIdList.value}&startDate=${startDate.value}&endDate=${endDate.value}&jzId=${jzId.value}&from=zijiazhenggongsi`
+			uni.redirectTo({
+				url: `/pages/admin/zijiazheng/index?${originalParams}`
+			})
+		}else if (from.value == 'banzhengshuliang'){
+			const originalParams =
+				`isZijiazheng=true&userIdList=${userIdList.value}&startDate=${startDate.value}&endDate=${endDate.value}&jzId=${jzId.value}&listIds=${listIds.value}&from=zijiazhenggongsi`
+			uni.redirectTo({
+				url: `/pages/admin/zijiazheng/banzhengshuliang?${originalParams}`
+			})
+		}else if (from.value == 'yibanzhengshuliang'){
+			const originalParams =
+				`isZijiazheng=true&userIdList=${userIdList.value}&startDate=${startDate.value}&endDate=${endDate.value}&jzId=${jzId.value}&listIds=${listIds.value}&from=zijiazhenggongsi`
+			uni.redirectTo({
+				url: `/pages/admin/zijiazheng/yibanzhengshuliang?${originalParams}`
+			})
+		} else {
+			uni.redirectTo({
+				url: `/pages/admin/ShouYe/shouye`
+			})
+		}
 	}
 
 	function onRefresh() {
@@ -309,9 +343,10 @@
 		}
 
 	}
-	function kechengBind(data){
+
+	function kechengBind(data) {
 		uni.redirectTo({
-			url: `/pages/admin/Jiazheng/kechengBind?id=`+ data.id
+			url: `/pages/admin/Jiazheng/kechengBind?id=` + data.id
 		})
 	}
 
@@ -324,6 +359,7 @@
 			refreshData()
 		}
 	}
+	const convertToArray = (str) => str.split(',').map(item => item.trim());
 
 	function refreshData() {
 		const opt = {
@@ -335,7 +371,9 @@
 			"sortType": data.sortType,
 			"userName": data.userName,
 			"jingdu": data.jingdu,
-			"weidu": data.weidu
+			"weidu": data.weidu,
+			"jzId": jzId.value,
+			"userIdList": userIdList.value ? convertToArray(userIdList.value) : []
 		}
 		data.list = [];
 		// 数学
@@ -349,10 +387,10 @@
 				const newItem = {
 					...item
 				};
-				if(item.zyNames ==''){
+				if (item.zyNames == '') {
 					newItem.zyNames = []
-				}else{
-				newItem.zyNames = item.zyNames.split(',');
+				} else {
+					newItem.zyNames = item.zyNames.split(',');
 				}
 				return newItem;
 			})
@@ -381,28 +419,36 @@
 			"sortType": data.sortType,
 			"userName": data.userName,
 			"jingdu": data.jingdu,
-			"weidu": data.weidu
+			"weidu": data.weidu,
+			"jzId": jzId.value,
+			"userIdList": userIdList.value ? convertToArray(userIdList.value) : []
 		}
 		if (data.state == 'no-more') return;
 		data.state = 'loading';
 		data.page++;
 		opt.page = data.page;
 		getJiazhengList(opt).then(res => {
+
 			data.list = data.list.concat(res.data.data);
 			data.list = data.list.map(item => {
 				const newItem = {
 					...item
 				};
-				if(item.zyNames ==''){
-					newItem.zyNames = []
-				}else{
-				newItem.zyNames = item.zyNames.split(',');
+				// if(item.zyNames ==''){
+				// 	newItem.zyNames = []
+				// }else{
+				// newItem.zyNames = item.zyNames.split(',');
+				// }
+				// 处理 zyNames 字段
+				if (typeof newItem.zyNames !== 'string') {
+					newItem.zyNames = [];
+				} else {
+					newItem.zyNames = newItem.zyNames.trim() == '' ? [] : newItem.zyNames.split(',');
 				}
 				return newItem;
 			})
 			console.log('data.list', data.list);
 			data.loading = false;
-
 			if (res.data.total > data.list.length) {
 				data.state = 'more';
 				data.loading = false;
@@ -419,9 +465,12 @@
 	function getLeixing() {
 		let req = {}
 		getJiazhengZhiyeAll(req).then(res => {
-			res.data.unshift({id:'',name:'全部职业'});
+			res.data.unshift({
+				id: '',
+				name: '全部职业'
+			});
 			allType = res.data
-		//	allType = dataConversionObject(res.data)
+			//	allType = dataConversionObject(res.data)
 			console.log('allType', allType);
 		})
 	}
@@ -449,7 +498,17 @@
 			}
 		});
 	}
-	onLoad(() => {
+	onLoad((options) => {
+		if (options && options.isZijiazheng == 'true') {
+			isZijiazhengFlag.value = 'true'
+			userIdList.value = options.userIdList
+			listIds.value = options.listIds
+			startDate.value = options.startDate
+			endDate.value = options.endDate
+			from.value = options.from
+			jzId.value = options.jzId
+			console.log('userIdList.value', userIdList.value);
+		}
 		getMore()
 		getLeixing()
 		getCurrentWeizhi()

+ 24 - 2
pages/admin/Jiazheng/bf/jiazhengUserInfo.vue

@@ -102,6 +102,13 @@
 			this.pageInfo.id = data.id
 			this.pageInfo.userId = data.userId
 			this.pageInfo.from = data.from
+			this.pageInfo.isZijiazheng = data.isZijiazheng
+			this.pageInfo.userIdList = data.userIdList
+			this.pageInfo.listIds = data.listIds
+			this.pageInfo.startDate = data.startDate
+			this.pageInfo.endDate = data.endDate
+			this.pageInfo.from = data.from
+			this.pageInfo.jzId = data.jzId
 			this.getJianliInfo()
 		},
 		methods: {
@@ -158,7 +165,14 @@
 				let pageInfo = {
 					status: 'edit',
 					id: this.pageInfo.id,
-					userId: this.pageInfo.userId
+					userId: this.pageInfo.userId,
+					isZijiazheng:this.pageInfo.isZijiazheng,
+					userIdList:this.pageInfo.userIdList,
+					listIds:this.pageInfo.listIds,
+					startDate:this.pageInfo.startDate,
+					endDate:this.pageInfo.endDate,
+					from:this.pageInfo.from,
+					jzId:this.pageInfo.jzId,
 				}
 				uni.redirectTo({
 					url: "/pages/admin/Jiazheng/jiazhengUserManager?pageInfo=" + JSON.stringify(pageInfo)
@@ -171,8 +185,16 @@
 					})
 				} else {
 					uni.redirectTo({
-						url: "/pages/admin/Jiazheng/index"
+					  url: "/pages/admin/Jiazheng/index" +
+					       "?isZijiazheng=" + this.pageInfo.isZijiazheng +
+					       "&userIdList=" + this.pageInfo.userIdList+
+					       "&listIds=" + this.pageInfo.listIds+
+					       "&startDate=" + this.pageInfo.startDate+
+					       "&endDate=" + this.pageInfo.endDate+
+					       "&from=" + this.pageInfo.from+
+					       "&jzId=" + this.pageInfo.jzId
 					})
+
 				}
 
 			},

+ 344 - 88
pages/admin/Jiazheng/bf/jiazhengUserManager.vue

@@ -6,18 +6,24 @@
 		</view>
 		<v-tabs v-model="current" :tabs="tabs" :scroll="false" @change="changeTab" field="name"
 			class="admin-tab-box"></v-tabs>
-		<gerenZiliao ref="gerenZiliao" :status='status' @idCardBlur="idCardBlur" @finishDom='finishDom'
-			@editSave="editSaveGerenziliao" @goNext="gerenziliaoNext" v-show="current ==0"></gerenZiliao>
-		<qiuzhiXinxi ref="qiuzhiXinxi" :status='status' @editSave="editSaveQiuzhixinxi" @goNext="goNextQiuzhixinxi"
-			v-show="current ==1">
+		<gerenZiliao ref="gerenZiliao" :status='status' :isZijiazheng='isZijiazheng' :statusFlag="statusFlag"
+			@idCardBlur="idCardBlur" @finishDom='finishDom' @editSave="editSaveGerenziliao" @goNext="gerenziliaoNext"
+			v-show="current ==0">
+		</gerenZiliao>
+		<qiuzhiXinxi ref="qiuzhiXinxi" :isZijiazheng='isZijiazheng' :status='status' @editSave="editSaveQiuzhixinxi"
+			@goNext="goNextQiuzhixinxi" v-show="current ==1">
 		</qiuzhiXinxi>
-		<zhaopianZiliao ref="zhaopianZiliao" :status='status' @editSave="editSaveZhaopianziliao"
-			@goNext="goNextZhaopianZiliao" v-show="current ==2"></zhaopianZiliao>
-		<banzhengXinxi ref="banzhengXinxi" :status='status' @goBack="goBack" @addSave="addSave" @editSave="editSave"
-			v-show="current ==3">
+		<zhaopianZiliao ref="zhaopianZiliao" :isZijiazheng='isZijiazheng' :status='status' :statusFlag="statusFlag"
+			@editSave="editSaveZhaopianziliao" @goNext="goNextZhaopianZiliao" v-show="current ==2"></zhaopianZiliao>
+		<banzhengXinxi ref="banzhengXinxi" :isZijiazheng='isZijiazheng' :status='status' @goBack="goBack"
+			@addEdit='addEdit' @addSave="addSave" @addSavePiliang="addSavePiliang" @editSave="editSave"
+			@editSavePiliang="editSavePiliang" v-show="banzhengXinxiFlag">
 		</banzhengXinxi>
-		<banzhengXinxiList :list="editInfo.kaozhengList" v-show="banzhengXinxiFlag" @editBanzheng="editBanzheng"
-			@addBanzheng="addBanzheng" @deleteBanzheng="deleteBanzheng" ref="banzhengXinxiList"></banzhengXinxiList>
+		<banzhengXinxiList :isZijiazheng='isZijiazheng' :status='status' :list="editInfo.kaozhengList"
+			v-show="current ==3&&!banzhengXinxiFlag&&!banzhengXinxiFlagPiliang" @saveBanzheng="saveBanzheng"
+			@editBanzheng="editBanzheng" @addBanzheng="addBanzheng" @addBanzhengPiliang="addBanzhengPiliang"
+			@deleteBanzheng="deleteBanzheng" ref="banzhengXinxiList">
+		</banzhengXinxiList>
 		<common-dialog ref="commonDialogRef" :title="deleteTitle" :content="deleteConcent"
 			@confirm-btn="deleteQuerenBtn"></common-dialog>
 	</view>
@@ -38,6 +44,7 @@
 		jiazhengAdd,
 		jiazhengUpdate,
 		jiazhengKaozhengAdd,
+		jiazhengKaozhengAdds,
 		jiazhengKaozhengDelete,
 		jiazhengKaozhengUpdate
 	} from "@/api/jiazheng.js";
@@ -86,15 +93,24 @@
 
 				},
 				status: '',
+				isPiliang: '',
 				id: '',
 				userId: '',
 				banzhengXinxiFlag: false,
+				banzhengXinxiFlagPiliang: false,
 				editInfo: {},
 				deleteConcent: '你确定要执行这个操作吗?',
 				deleteTitle: '删除',
 				deleteIndex: '',
 				deleteId: '',
 				from: '',
+				statusFlag: null,
+				isZijiazheng: "false",
+				userIdList: '',
+				listIds: '',
+				startDate: '',
+				endDate: '',
+				jzId: '',
 			}
 		},
 		components: {
@@ -123,60 +139,115 @@
 			let pageInfo = JSON.parse(options.pageInfo)
 			this.status = pageInfo.status
 			this.from = pageInfo.from
+			this.isZijiazheng = pageInfo.isZijiazheng
+			this.userIdList = pageInfo.userIdList
+			this.listIds = pageInfo.listIds
+			this.startDate = pageInfo.startDate
+			this.endDate = pageInfo.endDate
+			this.jzId = pageInfo.jzId
 			this.dataHandle(pageInfo)
 		},
 		methods: {
 			goBack() {
-				this.banzhengXinxiFlag = true
+				this.banzhengXinxiFlag = false
 			},
 			editBanzheng(data, index) {
 				console.log('dataasdf', data);
 				this.current = 3
-				this.banzhengXinxiFlag = false
-				this.$refs.banzhengXinxi.editinfo(data, index)
-				this.$refs.banzhengXinxi.currentMove('edit')
+				this.banzhengXinxiFlag = true
+				this.$refs.banzhengXinxi.isPiliang(0)
+				if (this.status == 'edit') {
+					this.$refs.banzhengXinxi.editinfo(data, index)
+					this.$refs.banzhengXinxi.currentMove('edit')
+				} else {
+					this.$refs.banzhengXinxi.editinfo(data, index)
+					this.$refs.banzhengXinxi.currentMove('addEdit')
+				}
+
 			},
 			addBanzheng(data, index) {
-				this.banzhengXinxiFlag = false
-				this.current = 3
+				if (this.allData.icon == '') {
+					uni.showToast({
+						title: "当录入办证信息时候,头像必填",
+						icon: 'none',
+						duration: 2000
+					});
+					this.allData.kaozhengList = []
+					return false;
+				}
+				this.banzhengXinxiFlag = true
 				this.$refs.banzhengXinxi.resetFun()
-				this.$refs.banzhengXinxi.currentMove('editAdd')
+				this.$refs.banzhengXinxi.isPiliang(0)
+				//this.current = 3
+				//	this.$refs.banzhengXinxi.resetFun()
+				if (this.status == 'edit') {
+					this.$refs.banzhengXinxi.currentMove('editAdd')
+				}
+
 			},
+			addBanzhengPiliang(data, index) {
+				if (this.allData.icon == '') {
+					uni.showToast({
+						title: "当录入办证信息时候,头像必填",
+						icon: 'none',
+						duration: 2000
+					});
+					this.allData.kaozhengList = []
+					return false;
+				}
+				this.banzhengXinxiFlag = true
+				this.$refs.banzhengXinxi.resetFun()
+				this.$refs.banzhengXinxi.isPiliang(1)
+				//this.current = 3
+				//	this.$refs.banzhengXinxi.resetFun()
+				if (this.status == 'edit') {
+					this.$refs.banzhengXinxi.currentMove('editAdd')
+				}
+
+			},
+
 			deleteBanzheng(data, index) {
-				console.log('data', data);
-				console.log('index', index);
-				console.log('data.statusBanzheng', data.statusBanzheng);
 				this.deleteId = data.id
 				this.deleteIndex = index
 				if (data.statusBanzheng == '办证完成') {
 					uni.showToast({
-						title: "办证状态为办证完成禁止删除",
+						title: "办证状态为办证完成禁止删除	",
 						icon: 'none',
 						duration: 2000
 					})
 					return false
 				}
 				this.$refs.commonDialogRef.handleShow()
+
 			},
 			deleteQuerenBtn() {
-				jiazhengKaozhengDelete({
-					ids: [this.deleteId]
-				}).then(res => {
-					if (res.code == 0) {
-						uni.showToast({
-							title: "成功",
-							icon: 'none',
-							duration: 2000
-						})
-						this.editInfo.kaozhengList.splice(this.deleteIndex, 1);
-						if (this.editInfo.kaozhengList.length == 0) {
-							this.banzhengXinxiFlag = true
+				if (this.status == 'add') {
+					this.allData.kaozhengList.splice(this.deleteIndex, 1)
+					this.editInfo.kaozhengList.splice(this.deleteIndex, 1)
+				} else {
+					jiazhengKaozhengDelete({
+						ids: [this.deleteId]
+					}).then(res => {
+						if (res.code == 0) {
+							uni.showToast({
+								title: "成功",
+								icon: 'none',
+								duration: 2000
+							})
+							this.editInfo.kaozhengList.splice(this.deleteIndex, 1);
+							if (this.editInfo.kaozhengList.length == 0) {
+								this.banzhengXinxiFlag = true
+								this.$refs.banzhengXinxi.resetFun()
+								this.allData.kaozhengList = []
+								this.$refs.banzhengXinxi.isPiliang(0)
+							}
 						}
-					}
-				})
+					})
+				}
+
 			},
 			idCardBlur(data) {
-				if(this.status == 'edit'){
+				if (this.status == 'edit') {
 					this.$refs.qiuzhiXinxi.editinfo(data)
 					this.$refs.zhaopianZiliao.editinfo(data)
 				}
@@ -238,11 +309,22 @@
 				}
 				getJiazhengInfo(req).then(res => {
 					if (res.code == 0) {
-						this.$refs.gerenZiliao.editinfo(res.data)
-						this.editInfo = JSON.parse(JSON.stringify(res.data));
-						this.allData = JSON.parse(JSON.stringify(res.data));
-						this.allData.id = this.id
-						console.log('this.allData this.allData ', this.allData);
+						this.$nextTick(() => {
+							this.$refs.gerenZiliao.editinfo(res.data)
+							this.editInfo = JSON.parse(JSON.stringify(res.data));
+							this.allData = JSON.parse(JSON.stringify(res.data));
+							this.allData.id = this.id
+							if (res.data.kaozhengList.length == 0) {
+								this.statusFlag = true
+							} else {
+								this.statusFlag = this.checkStatus(res.data.kaozhengList)
+							}
+							// 新增 手机端,家政人员编辑,修改为导出后不能修改
+							//this.statusFlag = this.checkStatus(res.data.kaozhengList)
+							console.log('this.checkStatus(res.data.kaozhengList)', this.checkStatus(res
+								.data.kaozhengList));
+							console.log('this.allData this.allData ', this.allData);
+						})
 					} else {
 						uni.showToast({
 							icon: 'none',
@@ -252,15 +334,21 @@
 					}
 				})
 			},
+			checkStatus(kaozhengList) {
+				if (!kaozhengList || !Array.isArray(kaozhengList) || kaozhengList.length == 0) {
+					return false;
+				}
+				return kaozhengList.every(item => item.statusBanzheng == "未办证");
+			},
 			changeTab(data) {
-				console.log('data', data);
-				if (this.status == 'edit' && data == 3) {
-					this.banzhengXinxiFlag = true
-					return false
-				} else {
-					this.banzhengXinxiFlag = false
+
+				this.banzhengXinxiFlag = false
+
+				if (this.$refs.zhaopianZiliao) {
+					this.$refs.zhaopianZiliao.zhankaiFlag = false
 				}
 				if (this.status == 'add') {
+
 					if (this.current >= 0) {
 						this.current--;
 						this.updateTabs();
@@ -281,6 +369,12 @@
 						this.$refs.zhaopianZiliao.editinfo(this.editInfo)
 						break;
 					case 3:
+						// if (this.editInfo.kaozhengList.length > 0) {
+						// 	this.banzhengXinxiFlag = false
+						// } else {
+						// 	this.banzhengXinxiFlag = false
+						// }
+						this.banzhengXinxiFlag = false
 						this.$refs.banzhengXinxi.editinfo()
 						break;
 					default:
@@ -337,7 +431,7 @@
 				this.gerenZiliaoDataHandle(data, 'edit')
 			},
 			qiuzhiXinxiDataHandle(data, flag) {
-			//	this.allData.leixing = data.leixing
+				//	this.allData.leixing = data.leixing
 				this.allData.jingyan = data.jingyan
 				this.allData.jineng = data.jineng
 				this.allData.zhuangtai = data.zhuangtai
@@ -419,57 +513,159 @@
 			editSaveZhaopianziliao(data) {
 				this.zhaopianziliaoDataHandle(data, 'edit')
 			},
+			addSavePiliang(data) {
+				console.log('data', data);
+				//  有可能是一个数组
+				this.submitJiazheng(data)
+			},
 			addSave(data) {
-				if (this.status == 'add') {
-					this.submitJiazheng(data)
-				} else {}
+				// if (this.status == 'add') {
+				// 	this.submitJiazheng(data)
+				// } else {
 
+				// }
 
+				this.submitJiazheng(data)
 			},
 			submitJiazheng(data) {
-			//	debugger
 				console.log('this.allData', this.allData);
 
-				if (data != '') {
-				//	debugger
-					this.allData.kaozhengList.push(data)
+				// 处理数组情况
+				const dataToProcess = Array.isArray(data) ? data : [data];
+
+				// 检查重复项
+				for (const item of dataToProcess) {
+					if (this.allData.kaozhengList.length > 0) {
+						const isDuplicate = this.allData.kaozhengList.some(existingItem => {
+							return existingItem.jgId == item.jgId &&
+								existingItem.zyLevelName == item.zyLevelName &&
+								existingItem.zyName == item.zyName;
+						});
+
+						if (isDuplicate) {
+							uni.showToast({
+								title: '此用户的职业等级系统已存在,如想继续添加,请联系管理员处理!',
+								icon: 'none',
+								duration: 2000
+							});
+							return false;
+						}
+					}
 				}
-				if (this.allData.kaozhengList.length > 0 && this.allData.icon == '') {
+
+				// 检查头像是否为空(如果有数据要添加)
+				if (dataToProcess.length > 0 && this.allData.icon == '') {
 					uni.showToast({
 						title: "当录入办证信息时候,头像必填",
 						icon: 'none',
 						duration: 2000
-					})
+					});
 					this.allData.kaozhengList = []
-					return false
+					return false;
 				}
-				jiazhengAdd(this.allData).then(res => {
-					if (res.code == 0) {
-						uni.showToast({
-							title: "成功",
-							icon: 'none',
-							duration: 2000
-						})
-						uni.navigateTo({
-							url: `/pages/admin/Jiazheng/index`
-						})
-					} else {
-						uni.showToast({
-							title: "失败",
-							icon: 'none',
-							duration: 2000
-						})
-						return false
-					}
 
-				})
+				// 添加所有数据项
+				this.allData.kaozhengList.push(...dataToProcess);
+				this.editInfo.kaozhengList = [...this.allData.kaozhengList];
+				this.banzhengXinxiFlag = false;
+			},
+
+			// submitJiazheng(data) {
+			// 	//	debugger
+			// 	console.log('this.allData', this.allData);
+			// 	if (this.allData.kaozhengList.length > 0) {
+			// 		const isDuplicate = this.allData.kaozhengList.some(item => {
+			// 			return item.jgId == data.jgId &&
+			// 				item.zyLevelName == data.zyLevelName &&
+			// 				item.zyName == data.zyName;
+			// 		});
+			// 		if (isDuplicate) {
+			// 			uni.showToast({
+			// 				title: '此用户的职业等级系统已存在,如想继续添加,请联系管理员处理!',
+			// 				icon: 'none',
+			// 				duration: 2000
+			// 			});
+
+			// 			return false
+			// 		}
+			// 	}
+			// 	if (data != '') {
+
+			// 		this.allData.kaozhengList.push(data)
+			// 	}
+			// 	if (this.allData.kaozhengList.length > 0 && this.allData.icon == '') {
+			// 		uni.showToast({
+			// 			title: "当录入办证信息时候,头像必填",
+			// 			icon: 'none',
+			// 			duration: 2000
+			// 		})
+			// 		this.allData.kaozhengList = []
+			// 		return false
+			// 	}
+			// 	this.editInfo.kaozhengList = this.allData.kaozhengList
+			// 	this.banzhengXinxiFlag = false
+
+
+			// },
+			saveBanzheng() {
+				if (this.status == 'add') {
+					jiazhengAdd(this.allData).then(res => {
+						if (res.code == 0) {
+							uni.showToast({
+								title: "成功",
+								icon: 'none',
+								duration: 2000
+							})
+							uni.navigateTo({
+								url: `/pages/admin/Jiazheng/index`
+							})
+						} else {
+							uni.showToast({
+								title: "失败",
+								icon: 'none',
+								duration: 2000
+							})
+							return false
+						}
 
+					})
+				} else {
+
+				}
 			},
+			addEdit(data, flag, index) {
+				uni.showToast({
+					title: "修改成功!",
+					icon: 'none',
+					duration: 2000
+				})
+				this.editInfo.kaozhengList[index].canxunshijian = data.canxunshijian
+				this.editInfo.kaozhengList[index].jgType = data.jgType
+				this.editInfo.kaozhengList[index].jgId = data.jgId
+				this.editInfo.kaozhengList[index].jgName = data.jgName
+				this.editInfo.kaozhengList[index].jzId = data.jzId
+				this.editInfo.kaozhengList[index].needKaoshi = data.needKaoshi
+				this.editInfo.kaozhengList[index].needKecheng = data.needKecheng
+				this.editInfo.kaozhengList[index].shicaochengji = data.shicaochengji
+				this.editInfo.kaozhengList[index].statusBanzheng = data.statusBanzheng
+				this.editInfo.kaozhengList[index].statusKaoshi = data.statusKaoshi
+				this.editInfo.kaozhengList[index].zongkeshi = data.zongkeshi
+				this.editInfo.kaozhengList[index].id = data.id
+				this.editInfo.kaozhengList[index].zyId = data.zyId
+				this.editInfo.kaozhengList[index].zyLevel = data.zyLevel
+				this.editInfo.kaozhengList[index].zyLevelName = data.zyLevelName
+				this.editInfo.kaozhengList[index].zyName = data.zyName
+				this.allData.kaozhengList = JSON.parse(JSON.stringify(this.editInfo.kaozhengList));
+				this.banzhengXinxiFlag = false
+			},
+
 			editSave(data, flag, index) {
-			//	debugger
+				//	debugger
 				console.log('this.allData', this.allData);
 				console.log('this.editInfo', this.editInfo);
-				if (flag == 'edit') {
+				data.userId = this.userId
+				if (flag == 'edit' && this.allData.kaozhengList.length > 0) {
+
 					jiazhengKaozhengUpdate(data).then(res => {
 						if (res.code == 0) {
 							uni.showToast({
@@ -477,16 +673,15 @@
 								icon: 'none',
 								duration: 2000
 							})
-							this.banzhengXinxiFlag = true
 							this.editInfo.kaozhengList[index].canxunshijian = data.canxunshijian
 							this.editInfo.kaozhengList[index].jgId = data.jgId
 							this.editInfo.kaozhengList[index].jgName = data.jgName
 							this.editInfo.kaozhengList[index].jzId = data.jzId
+							this.editInfo.kaozhengList[index].jgType = data.jgType
 							this.editInfo.kaozhengList[index].needKaoshi = data.needKaoshi
 							this.editInfo.kaozhengList[index].needKecheng = data.needKecheng
-							this.editInfo.kaozhengList[index].needKecheng = data.needKecheng
+							this.editInfo.kaozhengList[index].statusBanzheng = '未办证'
 							this.editInfo.kaozhengList[index].shicaochengji = data.shicaochengji
-							this.editInfo.kaozhengList[index].statusBanzheng = data.statusBanzheng
 							this.editInfo.kaozhengList[index].statusKaoshi = data.statusKaoshi
 							this.editInfo.kaozhengList[index].zongkeshi = data.zongkeshi
 							this.editInfo.kaozhengList[index].id = data.id
@@ -494,9 +689,30 @@
 							this.editInfo.kaozhengList[index].zyLevel = data.zyLevel
 							this.editInfo.kaozhengList[index].zyLevelName = data.zyLevelName
 							this.editInfo.kaozhengList[index].zyName = data.zyName
+							this.banzhengXinxiFlag = false
 						}
 
 					})
+				} else if (flag == 'edit' && this.allData.kaozhengList.length == 0) {
+					data.userId = this.userId
+					if (this.allData.icon == '') {
+						uni.showToast({
+							title: "当录入办证信息时候,头像必填",
+							icon: 'none',
+							duration: 2000
+						})
+						return false
+					}
+					jiazhengKaozhengAdd(data).then(res => {
+						if (res.code == 0) {
+							data.id = res.data
+							data.statusBanzheng = '未办证'
+							this.allData.kaozhengList.push(data)
+							this.editInfo.kaozhengList.push(data)
+							console.log('this.editInfo.kaozhengList', this.editInfo.kaozhengList);
+							this.banzhengXinxiFlag = false
+						}
+					})
 				} else if (flag == 'editAdd') {
 					data.userId = this.userId
 					if (this.allData.icon == '') {
@@ -510,10 +726,11 @@
 					jiazhengKaozhengAdd(data).then(res => {
 						if (res.code == 0) {
 							data.id = res.data
+							data.statusBanzheng = '未办证'
 							this.allData.kaozhengList.push(data)
 							this.editInfo.kaozhengList.push(data)
 							console.log('this.editInfo.kaozhengList', this.editInfo.kaozhengList);
-							this.banzhengXinxiFlag = true
+							this.banzhengXinxiFlag = false
 						}
 					})
 
@@ -527,17 +744,56 @@
 
 				// }
 			},
+			editSavePiliang(data) {
+
+				console.log('data', data);
+				const updatedData = data.map(item => ({
+					...item, // 展开原有属性
+					userId: this.userId // 添加新字段
+				}));
+				if (this.allData.icon == '') {
+					uni.showToast({
+						title: "当录入办证信息时候,头像必填",
+						icon: 'none',
+						duration: 2000
+					})
+					return false
+				}
+				jiazhengKaozhengAdds(updatedData).then(res => {
+					if (res.code == 0) {
+						//	data.id = res.data
+						const dataWithIds = updatedData.map((item, index) => ({
+							...item,
+							statusBanzheng: '未办证',
+							id: res.data[index]
+						}));
+						this.allData.kaozhengList = [...this.allData.kaozhengList, ...dataWithIds];
+						this.editInfo.kaozhengList = [...this.editInfo.kaozhengList, ...dataWithIds];
+						// console.log('this.editInfo.kaozhengList', this.editInfo.kaozhengList);
+						this.banzhengXinxiFlag = false
+						console.log('this.allData.kaozhengList', this.allData.kaozhengList);
+					}
+				})
+
+			},
 			goUpPage() {
-				if(this.from =='banzheng'){
+				if (this.from == 'banzheng') {
 					uni.redirectTo({
 						url: "/pages/admin/banzheng/list"
 					})
-				}else{
-					uni.navigateTo({
-						url: `/pages/admin/Jiazheng/index`
+				} else {
+
+					uni.redirectTo({
+						url: "/pages/admin/Jiazheng/index" +
+							"?isZijiazheng=" + this.isZijiazheng +
+							"&userIdList=" + this.userIdList + "&listIds=" + this.listIds +
+							"&startDate=" + this.startDate +
+							"&endDate=" + this.endDate +
+							"&from=" + this.from +
+							"&jzId=" + this.jzId
 					})
 				}
-				
+
 			}
 
 		}

+ 50 - 45
pages/admin/Jiazheng/bf/qiuzhiXinxi.vue

@@ -5,48 +5,50 @@
 			<dataChecked :list="typeList" mode="multiple" :defaultCount="9" :selectedNames="leixing"
 				@change="selectChangeType" @add="addType" />
 		</view> -->
-		<view class="form-label-select">
-			<view class="phone-form-label"><text class="form-label-require"></text>经验</view>
-			<picker :range="jingyanList" mode='selector' :value="jingyanIndex" range-key="name" @change="jingyanChange"
-				@cancel="jingyanCancel" class="select-picker-box">
-				<view class="form-radio-select">
-					<view>{{ jingyan }}</view>
-					<icon></icon>
-				</view>
-			</picker>
-		</view>
-		<view class="form-label-radio flex-start-row">
-			<view class="phone-form-label"><text class="form-label-require">*</text>技能</view>
-			<dataChecked :list="skillList" mode="multiple" :defaultCount="9" :selectedNames="jineng"
-				@change="selectChangeSkill" @add="addSkill" />
-		</view>
-		<view class="form-label-radio form-top-margin flex-start-row">
-			<view class="phone-form-label"><text class="form-label-require">*</text>状态</view>
-			<dataChecked :list="zhuangtaiList" mode="single" :selectedIds='zhuangtai' :showAdd="false"
-				@change="selectChangeZhuangtai" />
-		</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">
-				<view class="form-radio-select">
-					<view>{{jibiexinzi}}</view>
-					<icon></icon>
-				</view>
-			</picker>
-		</view>
+		<view :class="isZijiazheng=='true'?'mask-view':''">
+			<view class="form-label-select">
+				<view class="phone-form-label"><text class="form-label-require"></text>经验</view>
+				<picker :range="jingyanList" mode='selector' :value="jingyanIndex" range-key="name"
+					@change="jingyanChange" @cancel="jingyanCancel" class="select-picker-box">
+					<view class="form-radio-select">
+						<view>{{ jingyan }}</view>
+						<icon></icon>
+					</view>
+				</picker>
+			</view>
+			<view class="form-label-radio flex-start-row">
+				<view class="phone-form-label"><text class="form-label-require">*</text>技能</view>
+				<dataChecked :list="skillList" mode="multiple" :defaultCount="9" :selectedNames="jineng"
+					@change="selectChangeSkill" @add="addSkill" />
+			</view>
+			<view class="form-label-radio form-top-margin flex-start-row">
+				<view class="phone-form-label"><text class="form-label-require">*</text>状态</view>
+				<dataChecked :list="zhuangtaiList" mode="single" :selectedIds='zhuangtai' :showAdd="false"
+					@change="selectChangeZhuangtai" />
+			</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">
+					<view class="form-radio-select">
+						<view>{{jibiexinzi}}</view>
+						<icon></icon>
+					</view>
+				</picker>
+			</view>
 
-		<view class="form-label-input">
-			<view class="phone-form-label"><text class="form-label-require"></text>期望薪资</view>
-			<input v-model="qiwangxinzi" placeholder="请输入期望薪资" />
-		</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" 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>
-			<button type="default" v-if="status =='edit'" @click="editSave" class="phone-green-btn">保存</button>
+			<view class="form-label-input">
+				<view class="phone-form-label"><text class="form-label-require"></text>期望薪资</view>
+				<input v-model="qiwangxinzi" placeholder="请输入期望薪资" />
+			</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" maxlength="-1" placeholder="请填写工作经历" class="form-textarea-box" />
+			</view>
+			<view v-if="isZijiazheng !='true'" class="page-btn-box">
+				<button type="default" v-if="status =='add'&&isZijiazheng !='true'" @click="goNext" class="phone-green-btn">下一步</button>
+				<button type="default" v-if="status =='edit'&&isZijiazheng !='true'" @click="editSave" class="phone-green-btn">保存</button>
+			</view>
 		</view>
 	</view>
 </template>
@@ -72,6 +74,9 @@
 		props: {
 			status: {
 				type: String,
+			},
+			isZijiazheng: {
+				type: String,
 			}
 		},
 		data() {
@@ -98,7 +103,7 @@
 		methods: {
 			async initRequests() {
 				await Promise.all([
-				//	this.getLeixing(),
+					//	this.getLeixing(),
 					this.getJineng(),
 					this.getZhuangtai()
 				]);
@@ -106,7 +111,7 @@
 			editinfo(data) {
 				this.$nextTick(() => {
 					console.log('data11111', data);
-				//	this.leixing = data.leixing
+					//	this.leixing = data.leixing
 					this.jingyan = data.jingyan
 					this.jineng = data.jineng
 					this.zhuangtai = data.zhuangtai
@@ -198,7 +203,7 @@
 				console.log('zhuangtaiData', data);
 				if (data.length > 0) {
 					this.zhuangtai = data[0].id
-				}else{
+				} else {
 					this.zhuangtai = ''
 				}
 				console.log('zhuangtai', this.zhuangtai);
@@ -215,7 +220,7 @@
 			},
 			yanzheng() {
 				this.formData = {
-				//	leixing: this.leixing,
+					//	leixing: this.leixing,
 					jingyan: this.jingyan,
 					jineng: this.jineng,
 					zhuangtai: this.zhuangtai,

+ 113 - 74
pages/admin/Jiazheng/bf/zhaopianZiliao.vue

@@ -1,81 +1,94 @@
 <template>
 	<view class="jz-content-box">
-		<view class="upload-img-box">
-			<jiazhengUpload @getFileUrl="getTouxiang" :img='icon' bottomText="上传头像和生活照"></jiazhengUpload>
-		</view>
-		<view class="form-label-switch">
-			<view class="phone-form-label"><text class="form-label-require"></text>身份证照片</view>
-			<!-- 	<switch @change="switchSfzChange" color="#3fd2a1" style="transform:scale(0.7)" /> -->
-		</view>
-		<view class="ziliao-upload-box">
-			<view class="upload-item-box">
-				<jiazhengUpload @getFileUrl="getSfzTouxiang" :img='idcardUrl1' bottomText="上传身份证头像面"></jiazhengUpload>
+		<view :class="isZijiazheng=='true'?'mask-view':''">
+			<view class="upload-img-box" :class="String(statusFlag) =='false'?'upload-img-mask-box':''"
+				@click="touxiangTishi">
+				<jiazhengUpload @getFileUrl="getTouxiang" :img='icon' bottomText="上传头像"></jiazhengUpload>
 			</view>
-			<view class="upload-item-box">
-				<jiazhengUpload @getFileUrl="getSfzGuohui" :img='idcardUrl2' bottomText="上传身份证国徽面"></jiazhengUpload>
-			</view>
-		</view>
-		<view class="form-label-switch form-top-margin">
-			<view class="phone-form-label"><text class="form-label-require"></text>体检报告</view>
-			<!-- <switch @change="switchGzChange" color="#3fd2a1" style="transform:scale(0.7)" /> -->
-		</view>
-		<view class="zhaopianZiliao-shenfenzhengImg">
-			<view class="ziliao-upload-box">
-				<view v-for="(item, index) in tijianbaogaoList" :key="index" v-if="tijianbaogaoList.length>0" class="ziliao-image-box">
-					<img class="ziliao-image" :src="item" alt="">
-					<view @click="deleteTijianbaogao(item,index)" class="ziliao-image-close"></view>
-				</view>
-				<jiazhengUpload changjingType="more" @getFileUrl="getTijianbaogao"></jiazhengUpload>
+			<view class="form-label-switch">
+				<view class="phone-form-label"><text class="form-label-require"></text>身份证照片</view>
+				<!-- 	<switch @change="switchSfzChange" color="#3fd2a1" style="transform:scale(0.7)" /> -->
 			</view>
-		</view>
-
-		<view class="form-label-switch form-top-margin">
-			<view class="phone-form-label"><text class="form-label-require"></text>工作生活照</view>
-			<!-- <switch @change="switchGzChange" color="#3fd2a1" style="transform:scale(0.7)" /> -->
-		</view>
-		<view class="zhaopianZiliao-shenfenzhengImg">
 			<view class="ziliao-upload-box">
-				<view v-for="(item, index) in shenghuizhaoList" :key="index" v-if="shenghuizhaoList.length>0" class="ziliao-image-box">
-					<img class="ziliao-image" :src="item" alt="">
-					<view @click="deleteShenghuoZhao(item,index)" class="ziliao-image-close"></view>
+				<view class="upload-item-box">
+					<jiazhengUpload @getFileUrl="getSfzTouxiang" :img='idcardUrl1' bottomText="上传身份证头像面">
+					</jiazhengUpload>
 				</view>
-				<jiazhengUpload changjingType="more" @getFileUrl="getGzShenghuozhao"></jiazhengUpload>
-			</view>
-		</view>
-		<view class="form-label-switch form-top-margin">
-			<view class="phone-form-label"><text class="form-label-require"></text>资格类照片</view>
-			<!-- 	<switch @change="switchZgChange" color="#3fd2a1" style="transform:scale(0.7)" /> -->
-		</view>
-		<view class="zhaopianZiliao-shenfenzhengImg">
-			<view class="ziliao-upload-box">
-				<view v-for="(item, index) in zigezhaoList" :key="index" v-if="zigezhaoList.length>0" class="ziliao-image-box">
-					<img class="ziliao-image" :src="item" alt="">
-					<view @click="deleteZigeZhao(item,index)" class="ziliao-image-close"></view>
+				<view class="upload-item-box">
+					<jiazhengUpload @getFileUrl="getSfzGuohui" :img='idcardUrl2' bottomText="上传身份证国徽面"></jiazhengUpload>
 				</view>
-				<jiazhengUpload changjingType="more" @getFileUrl="getZigezhao"></jiazhengUpload>
 			</view>
-		</view>
-		<view class="form-label-select">
-			<view class="phone-form-label"><text class="form-label-require"></text>最近体检日期</view>
-			<uni-datetime-picker class="form-radio-picker" type="date" @change="changeTijian">
-				<view class="form-radio-select">
-					<view>{{tijianDate}}</view>
-					<icon></icon>
+
+			<view @click="changeZhankai" :class="zhankaiFlag==1?'zpzl-open-box':'zpzl-close-box'">
+				<view class="gdzl-row">更多资料<icon></icon>
 				</view>
-			</uni-datetime-picker>
-		</view>
+				<view v-show="zhankaiFlag">
+					<view class="form-label-switch form-top-margin">
+						<view class="phone-form-label"><text class="form-label-require"></text>体检报告</view>
+						<!-- <switch @change="switchGzChange" color="#3fd2a1" style="transform:scale(0.7)" /> -->
+					</view>
+					<view class="zhaopianZiliao-shenfenzhengImg">
+						<view class="ziliao-upload-box">
+							<view v-for="(item, index) in tijianbaogaoList" :key="index"
+								v-if="tijianbaogaoList.length>0" class="ziliao-image-box">
+								<img class="ziliao-image" :src="item" alt="">
+								<view @click="deleteTijianbaogao(item,index)" class="ziliao-image-close"></view>
+							</view>
+							<jiazhengUpload changjingType="more" @getFileUrl="getTijianbaogao"></jiazhengUpload>
+						</view>
+					</view>
+
+					<view class="form-label-switch form-top-margin">
+						<view class="phone-form-label"><text class="form-label-require"></text>工作生活照</view>
+						<!-- <switch @change="switchGzChange" color="#3fd2a1" style="transform:scale(0.7)" /> -->
+					</view>
+					<view class="zhaopianZiliao-shenfenzhengImg">
+						<view class="ziliao-upload-box">
+							<view v-for="(item, index) in shenghuizhaoList" :key="index"
+								v-if="shenghuizhaoList.length>0" class="ziliao-image-box">
+								<img class="ziliao-image" :src="item" alt="">
+								<view @click="deleteShenghuoZhao(item,index)" class="ziliao-image-close"></view>
+							</view>
+							<jiazhengUpload changjingType="more" @getFileUrl="getGzShenghuozhao"></jiazhengUpload>
+						</view>
+					</view>
+					<view class="form-label-switch form-top-margin">
+						<view class="phone-form-label"><text class="form-label-require"></text>资格类照片</view>
+						<!-- 	<switch @change="switchZgChange" color="#3fd2a1" style="transform:scale(0.7)" /> -->
+					</view>
+					<view class="zhaopianZiliao-shenfenzhengImg">
+						<view class="ziliao-upload-box">
+							<view v-for="(item, index) in zigezhaoList" :key="index" v-if="zigezhaoList.length>0"
+								class="ziliao-image-box">
+								<img class="ziliao-image" :src="item" alt="">
+								<view @click="deleteZigeZhao(item,index)" class="ziliao-image-close"></view>
+							</view>
+							<jiazhengUpload changjingType="more" @getFileUrl="getZigezhao"></jiazhengUpload>
+						</view>
+					</view>
+					<view class="form-label-select">
+						<view class="phone-form-label"><text class="form-label-require"></text>最近体检日期</view>
+						<uni-datetime-picker class="form-radio-picker" type="date" @change="changeTijian">
+							<view class="form-radio-select">
+								<view>{{tijianDate}}</view>
+								<icon></icon>
+							</view>
+						</uni-datetime-picker>
+					</view>
 
-		<view class="form-label-select">
-			<view class="phone-form-label"><text class="form-label-require"></text>健康证日期</view>
-			<uni-datetime-picker class="form-radio-picker" type="date" @change="changeJiankang">
-				<view class="form-radio-select">
-					<view>{{jiankangDate}}</view>
-					<icon></icon>
+					<view class="form-label-select">
+						<view class="phone-form-label"><text class="form-label-require"></text>健康证日期</view>
+						<uni-datetime-picker class="form-radio-picker" type="date" @change="changeJiankang">
+							<view class="form-radio-select">
+								<view>{{jiankangDate}}</view>
+								<icon></icon>
+							</view>
+						</uni-datetime-picker>
+					</view>
 				</view>
-			</uni-datetime-picker>
-		</view>
+			</view>
 
-		<!-- 	<view class="zpzl-tip-box form-top-margin">
+			<!-- 	<view class="zpzl-tip-box form-top-margin">
 			<view>体检报告文件</view>
 			<view class="red-tip">(*如未经同意,体检报告均不展示在简历中;在系统中预约的体检,如有电子报告,会自动关联到简历中) </view>
 			<view>
@@ -92,9 +105,12 @@
 			<button type="default" class="phone-green-btn scbg-btn">+从手机上传体检报告(pdf)</button>
 		</view> -->
 
-		<view class="page-btn-box">
-			<button type="default" v-if="status =='add'" @click="goNext" class="phone-green-btn">下一步</button>
-			<button type="default" v-if="status =='edit'" @click="editSave" class="phone-green-btn">保存</button>
+			<view v-if="isZijiazheng !='true'" class="page-btn-box">
+				<button type="default" v-if="status =='add'&&isZijiazheng !='true'" @click="goNext"
+					class="phone-green-btn">下一步</button>
+				<button type="default" v-if="status =='edit'&&isZijiazheng !='true'" @click="editSave"
+					class="phone-green-btn">保存</button>
+			</view>
 		</view>
 	</view>
 </template>
@@ -121,17 +137,40 @@
 				jiankangDate: '',
 				tijianbaogaoFlag: false,
 				zhengshuUrls: '',
+				accordionVal: '',
+				zhankaiFlag: false
 			}
 		},
 		props: {
 			status: {
 				type: String,
-			}
+			},
+			isZijiazheng: {
+				type: String,
+			},
+			statusFlag: {
+				type: Boolean,
+			},
 		},
 		components: {
 			jiazhengUpload
 		},
 		methods: {
+			touxiangTishi() {
+
+				if (String(this.statusFlag) == 'false') {
+					uni.showToast({
+						title: '已提交办证申请,禁止修改',
+						icon: 'none'
+					});
+					return false
+				}
+
+			},
+			changeZhankai() {
+				this.zhankaiFlag = !this.zhankaiFlag
+				console.log('this.changeZhankai', this.changeZhankai);
+			},
 			editinfo(data) {
 				console.log('data', data);
 				this.$nextTick(() => {
@@ -208,9 +247,9 @@
 					idcardUrl1: this.idcardUrl1,
 					idcardUrl2: this.idcardUrl2,
 					tijianbaogaoFlag: this.tijianbaogaoFlag,
-					shenghuoUrls:  this.shenghuizhaoList?this.shenghuizhaoList.join(','):'',
-					zhengshuUrls:  this.zigezhaoList?this.zigezhaoList.join(','):'',
-					tijianUrls:  this.tijianbaogaoList?this.tijianbaogaoList.join(','):'',
+					shenghuoUrls: this.shenghuizhaoList ? this.shenghuizhaoList.join(',') : '',
+					zhengshuUrls: this.zigezhaoList ? this.zigezhaoList.join(',') : '',
+					tijianUrls: this.tijianbaogaoList ? this.tijianbaogaoList.join(',') : '',
 					tijianDate: this.tijianDate,
 					jiankangDate: this.jiankangDate,
 
@@ -229,7 +268,7 @@
 					zhengshuUrls: this.zigezhaoList.length > 0 ? this.zigezhaoList.join(',') : '',
 					tijianDate: this.tijianDate,
 					jiankangDate: this.jiankangDate,
-					tijianUrls:  this.tijianbaogaoList?this.tijianbaogaoList.join(','):'',
+					tijianUrls: this.tijianbaogaoList ? this.tijianbaogaoList.join(',') : '',
 
 				}
 				console.log('this.formData', this.formData);