From 6c6831b394c222406365f7b254cd601665d35df4 Mon Sep 17 00:00:00 2001
From: dengxin <2390584170@qq.com>
Date: Fri, 29 Mar 2024 14:53:16 +0800
Subject: [PATCH] =?UTF-8?q?bug=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/dic.js                    |  16 +-
 pageMy/my/resume/addSkill.vue    |  32 +-
 pages/recruit/subPage/person.vue | 867 ++++++++++++++++---------------
 pages/recruit/subPage/task.vue   |  21 +-
 pages/recruit/subPage/work.vue   | 845 +++++++++++++++---------------
 5 files changed, 904 insertions(+), 877 deletions(-)

diff --git a/common/dic.js b/common/dic.js
index 32d4660..f38f74c 100644
--- a/common/dic.js
+++ b/common/dic.js
@@ -269,6 +269,20 @@ const expeArr = [
 	]
 ]
 
+const companyEnum = [
+	{ value: 1, label: "机关/事业单位" },
+	{ value: 2, label: "国有企业" },
+	{ value: 3, label: "私营企业" },
+	{ value: 4, label: "外商及港澳台投资企业" },
+	{ value: 5, label: "股份制企业" },
+	{ value: 6, label: "学校/下级学院" },
+	{ value: 7, label: "医院" },
+	{ value: 8, label: "律师事务所" },
+	{ value: 9, label: "银行" },
+	{ value: 10, label: "非盈利社会组织" },
+	{ value: 11, label: "其它" },
+]
+
 export default {
 	salary,
 	taskSalary,
@@ -276,5 +290,5 @@ export default {
 	natureArr,
 	ageArr,
 	eduArr,
-	expeArr
+	expeArr,companyEnum
 }
\ No newline at end of file
diff --git a/pageMy/my/resume/addSkill.vue b/pageMy/my/resume/addSkill.vue
index 064fcd4..46c0610 100644
--- a/pageMy/my/resume/addSkill.vue
+++ b/pageMy/my/resume/addSkill.vue
@@ -89,9 +89,9 @@ export default {
 		uni.$on('setSkill', ({
 			detail
 		}) => {
-            console.log('detail,', detail)
+			console.log('detail,', detail)
 			// this.skillsId = id
-			this.skillsName = `${detail.parentLabel }-${detail.parentTwoLabel}-${detail.label}`
+			this.skillsName = `${detail.parentLabel}-${detail.parentTwoLabel}-${detail.label}`
 		})
 	},
 	methods: {
@@ -102,9 +102,9 @@ export default {
 		},
 		skill: function () {
 			// if (this.tradeId) {
-				uni.navigateTo({
-					url: `./skill?id=${this.worktypesId}&tradeId=${this.tradeId}&maxLayer=2&type=1`
-				})
+			uni.navigateTo({
+				url: `./skill?id=${this.worktypesId}&tradeId=${this.tradeId}&maxLayer=2&type=1`
+			})
 			// } else {
 			// 	uni.showToast({
 			// 		title: '请先选择从事的行业',
@@ -114,24 +114,20 @@ export default {
 		},
 		skillLevel: function () {
 
-				uni.navigateTo({
-					url: `./skillLevel?id=${this.skillsId}&worktypesId=${this.worktypesId}&maxLayer=3&type=2`
-				})
+			uni.navigateTo({
+				url: `./skillLevel?id=${this.skillsId}&worktypesId=${this.worktypesId}&maxLayer=3&type=2`
+			})
 		},
-		submit: function () {
-			console.log(this.tradeName, this.worktypesName, this.skillsName);
+		submit: async function () {
+			// console.log(this.tradeName, this.worktypesName, this.skillsName);
 			let result = this.worktypesName.split('-');
 			let result1 = this.skillsName.split('-');
-			console.log(result, result1);
-			
+
 			// 工种
-			addSkills(this.tradeName, result[0], result[1], 0).then(res => {
-				uni.navigateBack()
-			})
+			await addSkills(this.tradeName, result[0], result[1], 0)
 			// 岗位
-			addSkills(this.tradeName, `${result1[0]}、${result1[1]}`, result1[2], 1).then(res => {
-				uni.navigateBack()
-			})
+			await addSkills(this.tradeName, `${result1[0]}、${result1[1]}`, result1[2], 1)
+			uni.navigateBack()
 		}
 	}
 }
diff --git a/pages/recruit/subPage/person.vue b/pages/recruit/subPage/person.vue
index 87513a2..aef4958 100644
--- a/pages/recruit/subPage/person.vue
+++ b/pages/recruit/subPage/person.vue
@@ -10,13 +10,13 @@
 				</u-form-item>
 				<u-form-item label="发布时间" labelWidth="80" prop="stime" borderBottom
 					@click="showStime = true; hideKeyboard()" ref="item1">
-					<u--input v-model="info.stime"  disabledColor="#ffffff" placeholder="请选择发布时间"
+					<u--input v-model="info.stime" disabledColor="#ffffff" placeholder="请选择发布时间"
 						border="none"></u--input>
 					<u-icon slot="right" name="arrow-right"></u-icon>
 				</u-form-item>
 				<u-form-item label="结束时间" labelWidth="80" prop="etime" borderBottom
 					@click="showEtime = true; hideKeyboard()" ref="item2">
-					<u--input v-model="info.etime"  disabledColor="#ffffff" placeholder="请选择结束时间"
+					<u--input v-model="info.etime" disabledColor="#ffffff" placeholder="请选择结束时间"
 						border="none"></u--input>
 					<u-icon slot="right" name="arrow-right"></u-icon>
 				</u-form-item>
@@ -26,31 +26,32 @@
 				</u-form-item>
 				<u-form-item label="参考工资" prop="wage" labelWidth="80" borderBottom
 					@click="showWage = true; hideKeyboard()" ref="item4">
-					<u--input v-model="info.wage"  disabledColor="#ffffff" placeholder="请选择参考工资"
+					<u--input v-model="info.wage" disabledColor="#ffffff" placeholder="请选择参考工资"
 						border="none"></u--input>
 					<u-icon slot="right" name="arrow-right"></u-icon>
 				</u-form-item>
 				<u-form-item label="行业类型" prop="tradeNames" labelWidth="80" borderBottom
 					@click="showTrade = true; hideKeyboard()" ref="item4">
-					<u--input v-model="info.tradeNames"  disabledColor="#ffffff" placeholder="请选择行业类型"
+					<u--input v-model="info.tradeNames" disabledColor="#ffffff" placeholder="请选择行业类型"
 						border="none"></u--input>
 					<u-icon slot="right" name="arrow-right"></u-icon>
 				</u-form-item>
 				<u-form-item label="工种" prop="skillNames" labelWidth="80" borderBottom
 					@click="showSkills = true; hideKeyboard()" ref="item4">
-					<u--input v-model="info.skillNames"  disabledColor="#ffffff" placeholder="请选择工种"
+					<u--input v-model="info.skillNames" disabledColor="#ffffff" placeholder="请选择工种"
 						border="none"></u--input>
 					<u-icon slot="right" name="arrow-right"></u-icon>
 				</u-form-item>
-				<u-form-item label="招工描述" prop="jobDescription" borderBottom labelWidth="80" 
-					 ref="item5">
+				<u-form-item label="招工描述" prop="jobDescription" borderBottom labelWidth="80" ref="item5">
 					<!-- <u--textarea v-model="info.jobDescription"  placeholder="请输入招工要求"></u--textarea> -->
 					<!-- <u--input v-model="info.jobDescription" disabledColor="#ffffff" border="none" placeholder="请输入招工描述"></u--input>
 					<u-icon slot="right" name="arrow-right"></u-icon> -->
-					
+
 				</u-form-item>
 				<view>
-					<u--textarea v-model="info.jobDescription" placeholder="参考示例:岗位名称:保姆 工作内容: 一日三餐,卫生打扫 工资: 200元/天 年龄要求: 25-40岁 工作经验要求: 有过住家保姆经验, 会做饭,受过高等教育的优先" count height="100" maxlength="200"></u--textarea>
+					<u--textarea v-model="info.jobDescription"
+						placeholder="参考示例:岗位名称:保姆 工作内容: 一日三餐,卫生打扫 工资: 200元/天 年龄要求: 25-40岁 工作经验要求: 有过住家保姆经验, 会做饭,受过高等教育的优先"
+						count height="100" maxlength="200"></u--textarea>
 				</view>
 				<view style="font-size: 30rpx;font-weight: bold;padding: 20rpx 0 0;">人员要求</view>
 				<!-- <u-form-item label="人员属性" prop="userNature" labelWidth="80" borderBottom
@@ -61,19 +62,19 @@
 				</u-form-item> -->
 				<u-form-item label="年龄要求" prop="ageDesc" labelWidth="80" borderBottom
 					@click="showAge = true; hideKeyboard()" ref="item4">
-					<u--input v-model="info.ageDesc"  disabledColor="#ffffff" placeholder="请选择年龄要求"
+					<u--input v-model="info.ageDesc" disabledColor="#ffffff" placeholder="请选择年龄要求"
 						border="none"></u--input>
 					<u-icon slot="right" name="arrow-right"></u-icon>
 				</u-form-item>
 				<u-form-item label="学历要求" prop="educationLabel" labelWidth="80" borderBottom
 					@click="showEdu = true; hideKeyboard()" ref="item4">
-					<u--input v-model="info.educationLabel"  disabledColor="#ffffff" placeholder="请选择学历要求"
+					<u--input v-model="info.educationLabel" disabledColor="#ffffff" placeholder="请选择学历要求"
 						border="none"></u--input>
 					<u-icon slot="right" name="arrow-right"></u-icon>
 				</u-form-item>
 				<u-form-item label="经验要求" prop="experienceDesc" labelWidth="80" borderBottom
 					@click="showExpe = true; hideKeyboard()" ref="item4">
-					<u--input v-model="info.experienceDesc"  disabledColor="#ffffff" placeholder="请选择学历要求"
+					<u--input v-model="info.experienceDesc" disabledColor="#ffffff" placeholder="请选择学历要求"
 						border="none"></u--input>
 					<u-icon slot="right" name="arrow-right"></u-icon>
 				</u-form-item>
@@ -95,7 +96,8 @@
 					<u-icon slot="right" name="arrow-right"></u-icon> -->
 				</u-form-item>
 				<view>
-					<u--textarea v-model="info.jobCompanyDescription" placeholder="请输入企业介绍" count height="100" maxlength="200"></u--textarea>
+					<u--textarea v-model="info.jobCompanyDescription" placeholder="请输入企业介绍" count height="100"
+						maxlength="200"></u--textarea>
 				</view>
 				<u-form-item label="联系人" prop="callName" borderBottom labelWidth="80" ref="item1">
 					<u--input v-model="info.callName" border="none" placeholder="请输入联系人"></u--input>
@@ -119,7 +121,7 @@
 			<u-picker :show="showTrade" ref="tradePicker" keyName="name" :columns="tradeColumns" @confirm="tradeConfirm"
 				@cancel="tradeClose" @close="tradeClose">
 			</u-picker>
-			<u-picker :show="showSkills" ref="skillPicker" keyName="name" :columns="skillColumns"  @change="skillsChange"
+			<u-picker :show="showSkills" ref="skillPicker" keyName="name" :columns="skillColumns" @change="skillsChange"
 				@confirm="skillConfirm" @cancel="skillClose" @close="skillClose">
 			</u-picker>
 			<!-- <u-popup :show="showDesc" @close="closeDesc" @open="openDesc">
@@ -127,14 +129,14 @@
 			        <text>出淤泥而不染，濯清涟而不妖</text>
 			    </view>
 			</u-popup> -->
-			<u-picker :show="showAge" ref="agePicker" keyName="label"  :columns="ageColumns"
-				@confirm="ageConfirm" @cancel="ageClose" @close="ageClose">
+			<u-picker :show="showAge" ref="agePicker" keyName="label" :columns="ageColumns" @confirm="ageConfirm"
+				@cancel="ageClose" @close="ageClose">
 			</u-picker>
-			<u-picker :show="showEdu" ref="eduPicker" keyName="label"  :columns="eduColumns"
-				@confirm="eduConfirm" @cancel="eduClose" @close="eduClose">
+			<u-picker :show="showEdu" ref="eduPicker" keyName="label" :columns="eduColumns" @confirm="eduConfirm"
+				@cancel="eduClose" @close="eduClose">
 			</u-picker>
-			<u-picker :show="showExpe" ref="expePicker" keyName="label"  :columns="expeColumns"
-				@confirm="expeConfirm" @cancel="expeClose" @close="expeClose">
+			<u-picker :show="showExpe" ref="expePicker" keyName="label" :columns="expeColumns" @confirm="expeConfirm"
+				@cancel="expeClose" @close="expeClose">
 			</u-picker>
 			<u-datetime-picker :show="showStime" :value="birthday" mode="date" closeOnClickOverlay
 				@confirm="stimeConfirm" @cancel="stimeClose" @close="stimeClose"></u-datetime-picker>
@@ -145,422 +147,437 @@
 </template>
 
 <script>
-	import dic from '@/common/dic.js'
-	import { submitInfo, getWorktypesBaseList } from '@/api/userrecruit.js'
-	export default {
-		data() {
-			return {
-				latitude: 31.05, //中心点
-				longitude: 104.20,
-				covers: [{ //marker标记位置
-					id: 0,
-					latitude: 0,
-					longitude: 0,
-					// width:30,
-					// height:30,
-					iconPath: '../../../static/img/location.png'
+import dic from '@/common/dic.js'
+import { submitInfo, getWorktypesBaseList, findTradeList } from '@/api/userrecruit.js'
+export default {
+	data() {
+		return {
+			latitude: 31.05, //中心点
+			longitude: 104.20,
+			covers: [{ //marker标记位置
+				id: 0,
+				latitude: 0,
+				longitude: 0,
+				// width:30,
+				// height:30,
+				iconPath: '../../../static/img/location.png'
+			}],
+			value2: '招工内容',
+			fileList1: [],
+			disabled1: false,
+			tips: '',
+			value: '',
+			showCalendar: false,
+			showStime: false,
+			showEtime: false,
+			info: {
+				jobName: '', // 招工名称
+				stime: '', // 发布时间
+				etime: '', // 结束时间
+				peopleNum: '', // 招聘人数
+				wage: '', // 参考工资
+				tradeId: '', // 行业类型id
+				tradeNames: '', // 行业类型名称
+				worktypeIds: '', // 工种一级id
+				skillIds: '', // 工种二级id
+				worktypeNames: '', // 工种名称
+				skillNames: '', // 工种二级名称
+				jobDescription: '', // 任务描述
+				// userNature: '', // 人员属性
+				ageDesc: '', // 年龄要求
+				education: '', // 学历要求
+				educationLabel: '', // 学历要求前端显示
+				experienceDesc: '', // 经验要求
+				jobCompanyName: '', // 企业名称
+				jobCompanyScale: '', // 企业信用代码
+				jobCompanyIndustry: '', // 所属行业
+				jobCompanyNature: '', // 企业性质
+				jobCompanyDescription: '', // 企业介绍
+				callName: '', // 联系人
+				callTel: '', // 手机号
+				callNumber: '', // 座机
+				address: '', // 公司详细地址
+				// userInfo: {
+				// 	name: '楼兰',
+				// 	sex: '',
+				// 	birthday: ''
+				// },
+				// radiovalue1: '苹果',
+				// checkboxValue1: [],
+				// intro: '',
+				// code: ''
+			},
+			showWage: false, // 参考工资选项是否展示
+			showTrade: false, // 行业类型是否显示
+			showSkills: false, // 工种类型是否显示
+			showNature: false, // 人员属性
+			showAge: false, // 年龄要求
+			showEdu: false, // 学历要求
+			showExpe: false, // 经验要求
+			// showDesc: false, // 招工描述
+			birthday: Number(new Date()),
+			wageColumns: dic.taskSalary,
+			tradeColumns: dic.tradeArr,
+			skillColumns: [],
+			skillColumnsIndex: [0, 0],
+			natureColumns: dic.natureArr,
+			ageColumns: dic.ageArr,
+			eduColumns: dic.eduArr,
+			expeColumns: dic.expeArr,
+			rules: {
+				'userInfo.name': [{
+					type: 'string',
+					required: true,
+					message: '请填写姓名',
+					trigger: ['blur', 'change']
+				}, {
+					// 此为同步验证，可以直接返回true或者false，如果是异步验证，稍微不同，见下方说明
+					validator: (rule, value, callback) => {
+						// 调用uView自带的js验证规则，详见：https://www.uviewui.com/js/test.html
+						return uni.$u.test.chinese(value);
+					},
+					message: "姓名必须为中文",
+					// 触发器可以同时用blur和change，二者之间用英文逗号隔开
+					trigger: ["change", "blur"],
 				}],
-				value2: '招工内容',
-				fileList1: [],
-				disabled1: false,
-				tips: '',
-				value: '',
-				showCalendar: false,
-				showStime: false,
-				showEtime: false,
-				info: {
-					jobName: '', // 招工名称
-					stime: '', // 发布时间
-					etime: '', // 结束时间
-					peopleNum: '', // 招聘人数
-					wage: '', // 参考工资
-					tradeId: '', // 行业类型id
-					tradeNames: '', // 行业类型名称
-					worktypeIds: '', // 工种一级id
-					skillIds: '', // 工种二级id
-					worktypeNames: '', // 工种名称
-					skillNames: '', // 工种二级名称
-					jobDescription: '', // 任务描述
-					// userNature: '', // 人员属性
-					ageDesc: '', // 年龄要求
-					education: '', // 学历要求
-					educationLabel: '', // 学历要求前端显示
-					experienceDesc: '', // 经验要求
-					jobCompanyName: '', // 企业名称
-					jobCompanyScale: '', // 企业信用代码
-					jobCompanyIndustry: '', // 所属行业
-					jobCompanyNature: '', // 企业性质
-					jobCompanyDescription: '', // 企业介绍
-					callName: '', // 联系人
-					callTel: '', // 手机号
-					callNumber: '', // 座机
-					address: '', // 公司详细地址
-					// userInfo: {
-					// 	name: '楼兰',
-					// 	sex: '',
-					// 	birthday: ''
-					// },
-					// radiovalue1: '苹果',
-					// checkboxValue1: [],
-					// intro: '',
-					// code: ''
+				code: {
+					type: 'string',
+					required: true,
+					len: 4,
+					message: '请填写4位验证码',
+					trigger: ['blur']
 				},
-				showWage: false, // 参考工资选项是否展示
-				showTrade: false, // 行业类型是否显示
-				showSkills: false, // 工种类型是否显示
-				showNature: false, // 人员属性
-				showAge: false, // 年龄要求
-				showEdu: false, // 学历要求
-				showExpe: false, // 经验要求
-				// showDesc: false, // 招工描述
-				birthday: Number(new Date()),
-				wageColumns: dic.taskSalary,
-				tradeColumns: dic.tradeArr,
-				skillColumns: [],
-                skillColumnsIndex: [0,0],
-				natureColumns: dic.natureArr,
-				ageColumns: dic.ageArr,
-				eduColumns: dic.eduArr,
-				expeColumns: dic.expeArr,
-				rules: {
-					'userInfo.name': [{
-						type: 'string',
-						required: true,
-						message: '请填写姓名',
-						trigger: ['blur', 'change']
-					}, {
-						// 此为同步验证，可以直接返回true或者false，如果是异步验证，稍微不同，见下方说明
-						validator: (rule, value, callback) => {
-							// 调用uView自带的js验证规则，详见：https://www.uviewui.com/js/test.html
-							return uni.$u.test.chinese(value);
-						},
-						message: "姓名必须为中文",
-						// 触发器可以同时用blur和change，二者之间用英文逗号隔开
-						trigger: ["change", "blur"],
-					}],
-					code: {
-						type: 'string',
-						required: true,
-						len: 4,
-						message: '请填写4位验证码',
-						trigger: ['blur']
-					},
-					'userInfo.sex': {
-						type: 'string',
-						max: 1,
-						required: true,
-						message: '请选择男或女',
-						trigger: ['blur', 'change']
-					},
-					radiovalue1: {
-						type: 'string',
-						min: 1,
-						max: 2,
-						message: '橙子有毒',
-						trigger: ['change']
-					},
-					checkboxValue1: {
-						type: 'array',
-						min: 2,
-						required: true,
-						message: '不能太宅，至少选两项',
-						trigger: ['change']
-					},
-					intro: {
-						type: 'string',
-						min: 3,
-						required: true,
-						message: '不低于3个字',
-						trigger: ['change']
-					},
-					hotel: {
-						type: 'string',
-						min: 2,
-						required: true,
-						message: '请选择住店时间',
-						trigger: ['change']
-					},
-					'userInfo.birthday': {
-						type: 'string',
-						required: true,
-						message: '请选择生日',
-						trigger: ['change']
-					},
+				'userInfo.sex': {
+					type: 'string',
+					max: 1,
+					required: true,
+					message: '请选择男或女',
+					trigger: ['blur', 'change']
 				},
+				radiovalue1: {
+					type: 'string',
+					min: 1,
+					max: 2,
+					message: '橙子有毒',
+					trigger: ['change']
+				},
+				checkboxValue1: {
+					type: 'array',
+					min: 2,
+					required: true,
+					message: '不能太宅，至少选两项',
+					trigger: ['change']
+				},
+				intro: {
+					type: 'string',
+					min: 3,
+					required: true,
+					message: '不低于3个字',
+					trigger: ['change']
+				},
+				hotel: {
+					type: 'string',
+					min: 2,
+					required: true,
+					message: '请选择住店时间',
+					trigger: ['change']
+				},
+				'userInfo.birthday': {
+					type: 'string',
+					required: true,
+					message: '请选择生日',
+					trigger: ['change']
+				},
+			},
+		}
+	},
+	props: {
+		company: {
+			default: null,
+		}
+	},
+	created() {
+		if (this.company) {
+			const { manager, companyTid, comname, companyDesc, telphone } = this.company
+			this.info.jobCompanyScale = companyTid
+			this.info.jobCompanyName = comname
+			this.info.callName = manager
+			this.info.callTel = telphone
+			this.info.jobCompanyDescription = companyDesc
+		}
+		this.getWorkTypes()
+	},
+	watch: {
+		company(val) {
+			if (!val) return;
+			this.getDataInit()
+		}
+
+	},
+	methods: {
+		async getDataInit() {
+			const { companyTid, comname, manager, telphone, companyDesc, tradeId, nature } = this.company
+			this.info.jobCompanyScale = companyTid
+			this.info.jobCompanyName = comname
+			this.info.callName = manager
+			this.info.callTel = telphone
+			this.info.jobCompanyDescription = companyDesc
+			if (tradeId / 1 !== -1) {
+				const res = await findTradeList()
+				const tenantArray = res.data.data?.filter(item => item.id === tradeId)
+				if (tenantArray?.length === 0) return;
+				this.info.jobCompanyIndustry = tenantArray[0]?.name
+			}
+
+			if (nature / 1 !== -1) {
+				const tenantArray = dic.companyEnum?.filter(item => item.value === nature)
+				if (tenantArray?.length === 0) return;
+				this.info.jobCompanyNature = tenantArray[0]?.label
 			}
 		},
-        props: {
-            company: {
-                default: null,
-            }
-        },
-        created() {
-            if(this.company) {
-                  const { manager, companyTid, comname, companyDesc, telphone } = this.company
-                  this.info.jobCompanyScale = companyTid
-                  this.info.jobCompanyName = comname
-                  this.info.callName = manager
-                  this.info.callTel = telphone
-                  this.info.jobCompanyDescription = companyDesc
-            }
-            this.getWorkTypes()
-        },
-        watch: {
-            company(val) {
-                if(!val) return;
-                const { manager, companyTid, comname,  companyDesc, telphone } = val
-                this.info.jobCompanyScale = companyTid
-                this.info.jobCompanyName = comname
-                this.info.callName = manager
-                this.info.callTel = telphone
-                this.info.jobCompanyDescription = companyDesc
-            }
-            
-        },
-		methods: {
-			wageConfirm(e) {
-				const {
-					value
-				} = e
-				this.info.wage = value[0]
-				this.showWage = false
-			},
-			tradeConfirm(e) {
-				const { value } = e
-				this.info.tradeId = value[0].id
-				this.info.tradeNames = value[0].name
-				this.showTrade = false
-			},
-			skillConfirm(e) {
-				const { value, indexs } = e
-				this.skillColumnsIndex = indexs
-				this.info.skillNames = this.getSkilDataNameWhereId(indexs).join('-')
-				this.showSkills = false
-			},
-			// openDesc() {
-			// 	this.showDesc = true
-			// },
-			// closeDesc() {
-			// 	this.showDesc = false
-			// },
-			// natureConfirm(e) {
-			// 	const { value } = e
-			// 	this.info.userNature = value[0]
-			// 	this.showNature = false
-			// },
-			ageConfirm(e) {
-				const { value } = e
-				this.info.ageDesc = value[0].label
-				this.showAge = false
-			},
-			eduConfirm(e) {
-				const { value } = e
-				this.info.education = value[0].value
-				this.info.educationLabel = value[0].label
-				this.showEdu = false
-			},
-			expeConfirm(e) {
-				const { value } = e
-				this.info.experienceDesc = value[0].label
-				this.showExpe = false
-			},
-			expeClose() {
-				this.showExpe = false
-			},
-			eduClose() {
-				this.showEdu = false
-			},
-			ageClose() {
-				this.showAge = false
-			},
-			// natureClose() {
-			// 	this.showNature = false
-			// },
-			skillClose() {
-				this.showSkills = false
-			},
-			wageClose(e) {
-				this.showWage = false
-			},
-			tradeClose(e) {
-				this.showTrade = false
-			},
-			sexSelect(e) {
-				this.info.userInfo.sex = e.name
-				this.$refs.form1.validateField('userInfo.sex')
-			},
-			change(e) {
-				// console.log(e);
-			},
-			formatter(day) {
-				const d = new Date()
-				let month = d.getMonth() + 1
-				const date = d.getDate()
-				if (day.month == month && day.day == date + 3) {
-					day.bottomInfo = '有优惠'
-					day.dot = true
-				}
-				return day
-			},
-			calendarConfirm(e) {
-				this.showCalendar = false
-				this.info.hotel = `${e[0]} / ${e[e.length - 1]}`
-				this.$refs.form1.validateField('hotel')
-			},
-			codeChange(text) {
-				this.tips = text;
-			},
-			getCode() {
-				if (this.$refs.uCode.canGetCode) {
-					// 模拟向后端请求验证码
-					uni.showLoading({
-						title: '正在获取验证码'
-					})
-					setTimeout(() => {
-						uni.hideLoading();
-						// 这里此提示会被this.start()方法中的提示覆盖
-						uni.$u.toast('验证码已发送');
-						// 通知验证码组件内部开始倒计时
-						this.$refs.uCode.start();
-					}, 2000);
-				} else {
-					uni.$u.toast('倒计时结束后再发送');
-				}
-			},
-			calendarClose() {
-				this.showCalendar = false
-				this.$refs.form1.validateField('hotel')
-			},
-			stimeClose() {
-				this.showStime = false
-				this.$refs.form1.validateField('userInfo.birthday')
-			},
-			stimeConfirm(e) {
-				this.showStime = false
-				this.info.stime = uni.$u.timeFormat(e.value, 'yyyy-mm-dd') + ' 00:00:00'
-				this.$refs.form1.validateField('userInfo.birthday')
-			},
-			etimeClose() {
-				this.showEtime = false
-				this.$refs.form1.validateField('userInfo.birthday')
-			},
-			etimeConfirm(e) {
-				this.showEtime = false
-				this.info.etime = uni.$u.timeFormat(e.value, 'yyyy-mm-dd') +  ' 23:59:59'
-				this.$refs.form1.validateField('userInfo.birthday')
-			},
-			submit() {
-				// 如果有错误，会在catch中返回报错信息数组，校验通过则在then中返回true
-				// this.$refs.form1.validate().then(res => {
-				// 	uni.$u.toast('校验通过')
-				// }).catch(errors => {
-				// 	uni.$u.toast('校验失败')
-				// })
-                const names = this.getSkilDataNameWhereId( this.skillColumnsIndex, true)
-                const ids = this.getSkilDataNameWhereId( this.skillColumnsIndex, false)
-                this.info.jobType = 2
-                let params = {
-                    ...this.info,
-                    worktypeIds: ids[0], // 工种一级id
-                    skillIds: ids[1], // 工种二级id
-                    worktypeNames: names[0], // 工种名称
-                    skillNames: names[1], // 工种二级名称
-                }
-				let that = this
-				submitInfo(params).then(res => {
-					if(res.data.code == 200) {
-						that.reset()
-						uni.$u.toast('发布成功')
-					}
+		wageConfirm(e) {
+			const {
+				value
+			} = e
+			this.info.wage = value[0]
+			this.showWage = false
+		},
+		tradeConfirm(e) {
+			const { value } = e
+			this.info.tradeId = value[0].id
+			this.info.tradeNames = value[0].name
+			this.showTrade = false
+		},
+		skillConfirm(e) {
+			const { value, indexs } = e
+			this.skillColumnsIndex = indexs
+			this.info.skillNames = this.getSkilDataNameWhereId(indexs).join('-')
+			this.showSkills = false
+		},
+		// openDesc() {
+		// 	this.showDesc = true
+		// },
+		// closeDesc() {
+		// 	this.showDesc = false
+		// },
+		// natureConfirm(e) {
+		// 	const { value } = e
+		// 	this.info.userNature = value[0]
+		// 	this.showNature = false
+		// },
+		ageConfirm(e) {
+			const { value } = e
+			this.info.ageDesc = value[0].label
+			this.showAge = false
+		},
+		eduConfirm(e) {
+			const { value } = e
+			this.info.education = value[0].value
+			this.info.educationLabel = value[0].label
+			this.showEdu = false
+		},
+		expeConfirm(e) {
+			const { value } = e
+			this.info.experienceDesc = value[0].label
+			this.showExpe = false
+		},
+		expeClose() {
+			this.showExpe = false
+		},
+		eduClose() {
+			this.showEdu = false
+		},
+		ageClose() {
+			this.showAge = false
+		},
+		// natureClose() {
+		// 	this.showNature = false
+		// },
+		skillClose() {
+			this.showSkills = false
+		},
+		wageClose(e) {
+			this.showWage = false
+		},
+		tradeClose(e) {
+			this.showTrade = false
+		},
+		sexSelect(e) {
+			this.info.userInfo.sex = e.name
+			this.$refs.form1.validateField('userInfo.sex')
+		},
+		change(e) {
+			// console.log(e);
+		},
+		formatter(day) {
+			const d = new Date()
+			let month = d.getMonth() + 1
+			const date = d.getDate()
+			if (day.month == month && day.day == date + 3) {
+				day.bottomInfo = '有优惠'
+				day.dot = true
+			}
+			return day
+		},
+		calendarConfirm(e) {
+			this.showCalendar = false
+			this.info.hotel = `${e[0]} / ${e[e.length - 1]}`
+			this.$refs.form1.validateField('hotel')
+		},
+		codeChange(text) {
+			this.tips = text;
+		},
+		getCode() {
+			if (this.$refs.uCode.canGetCode) {
+				// 模拟向后端请求验证码
+				uni.showLoading({
+					title: '正在获取验证码'
 				})
-			},
-			reset() {
-				const validateList = [
-					'jobName', 
-					'stime', 
-					'etime', 
-					'peopleNum', 
-					'wage',
-					'tradeId', 
-					'tradeNames', 
-					'worktypeIds',
-					'skillIds',
-					'worktypeNames',
-					'skillNames',
-					'jobDescription',
-					'ageDesc',
-					'education',
-					'educationLabel',
-					'experienceDesc',
-					'jobCompanyName',
-					'jobCompanyScale',
-					'jobCompanyIndustry',
-					'jobCompanyNature',
-					'jobCompanyDescription',
-					'callName',
-					'callTel',
-					'callNumber',
-					'address'
-				]
-				this.$refs.form1.resetFields()
-				this.$refs.form1.clearValidate()
 				setTimeout(() => {
-					this.$refs.form1.clearValidate(validateList)
-					// 或者使用 this.$refs.form1.clearValidate()
-				}, 10)
-			},
-			hideKeyboard() {
-				uni.hideKeyboard()
-			},
-            skillsChange(e) {
-                    const { columnIndex, index, picker = this.$refs.uPicker } = e
-                    let [ index1, index2 ] = this.skillColumnsIndex
-                    switch (columnIndex) {
-                        case 0: 
-                            index1 = index;
-                            index2 = 0
-                            break
-                        case 1:
-                            index2 = index;
-                            break
-                    }
-                    const Indexs =  [index1, index2]
-                    picker.setColumnValues(1, this.skillData[index1].child.map((item) => item.name))
-                    this.skillColumnsIndex = Indexs
-            },
-            getSkilDataNameWhereId(Indexs, type = true) {
-                if(!this.skillData) {return}
-                const [ index1, index2 ] = Indexs
-                const work1 = this.skillData[index1]
-                const work2 = work1.child[index2]
-                if(type) {
-                    return [work1.name, work2.name]
-                } else {
-                    return [work1.id, work2.id]
-                }
-            },
-            async getWorkTypes() {
-                let resData = await getWorktypesBaseList({type: 1})
-                if(resData.data.code === 200) {
-                    const { data } = resData.data
-                    const arr = []
-                    // 1、 空间换时间策略/user/userrecruit/saveApp
-                    arr.push(data.map((item) => item.name));
-                    arr.push(data[0].child.map((item) => item.name))
-                    this.skillColumnsIndex = [0, 0]
-                    this.skillData = data
-                    this.skillColumns = arr
-                
-                }
-            }
+					uni.hideLoading();
+					// 这里此提示会被this.start()方法中的提示覆盖
+					uni.$u.toast('验证码已发送');
+					// 通知验证码组件内部开始倒计时
+					this.$refs.uCode.start();
+				}, 2000);
+			} else {
+				uni.$u.toast('倒计时结束后再发送');
+			}
+		},
+		calendarClose() {
+			this.showCalendar = false
+			this.$refs.form1.validateField('hotel')
+		},
+		stimeClose() {
+			this.showStime = false
+			this.$refs.form1.validateField('userInfo.birthday')
+		},
+		stimeConfirm(e) {
+			this.showStime = false
+			this.info.stime = uni.$u.timeFormat(e.value, 'yyyy-mm-dd') + ' 00:00:00'
+			this.$refs.form1.validateField('userInfo.birthday')
+		},
+		etimeClose() {
+			this.showEtime = false
+			this.$refs.form1.validateField('userInfo.birthday')
+		},
+		etimeConfirm(e) {
+			this.showEtime = false
+			this.info.etime = uni.$u.timeFormat(e.value, 'yyyy-mm-dd') + ' 23:59:59'
+			this.$refs.form1.validateField('userInfo.birthday')
+		},
+		submit() {
+			// 如果有错误，会在catch中返回报错信息数组，校验通过则在then中返回true
+			// this.$refs.form1.validate().then(res => {
+			// 	uni.$u.toast('校验通过')
+			// }).catch(errors => {
+			// 	uni.$u.toast('校验失败')
+			// })
+			const names = this.getSkilDataNameWhereId(this.skillColumnsIndex, true)
+			const ids = this.getSkilDataNameWhereId(this.skillColumnsIndex, false)
+			this.info.jobType = 2
+			let params = {
+				...this.info,
+				worktypeIds: ids[0], // 工种一级id
+				skillIds: ids[1], // 工种二级id
+				worktypeNames: names[0], // 工种名称
+				skillNames: names[1], // 工种二级名称
+			}
+			let that = this
+			submitInfo(params).then(res => {
+				if (res.data.code == 200) {
+					that.reset()
+					uni.$u.toast('发布成功')
+				}
+			})
+		},
+		reset() {
+			const validateList = [
+				'jobName',
+				'stime',
+				'etime',
+				'peopleNum',
+				'wage',
+				'tradeId',
+				'tradeNames',
+				'worktypeIds',
+				'skillIds',
+				'worktypeNames',
+				'skillNames',
+				'jobDescription',
+				'ageDesc',
+				'education',
+				'educationLabel',
+				'experienceDesc',
+				'jobCompanyName',
+				'jobCompanyScale',
+				'jobCompanyIndustry',
+				'jobCompanyNature',
+				'jobCompanyDescription',
+				'callName',
+				'callTel',
+				'callNumber',
+				'address'
+			]
+			this.$refs.form1.resetFields()
+			this.$refs.form1.clearValidate()
+			setTimeout(() => {
+				this.$refs.form1.clearValidate(validateList)
+				// 或者使用 this.$refs.form1.clearValidate()
+			}, 10)
+		},
+		hideKeyboard() {
+			uni.hideKeyboard()
+		},
+		skillsChange(e) {
+			const { columnIndex, index, picker = this.$refs.uPicker } = e
+			let [index1, index2] = this.skillColumnsIndex
+			switch (columnIndex) {
+				case 0:
+					index1 = index;
+					index2 = 0
+					break
+				case 1:
+					index2 = index;
+					break
+			}
+			const Indexs = [index1, index2]
+			picker.setColumnValues(1, this.skillData[index1].child.map((item) => item.name))
+			this.skillColumnsIndex = Indexs
+		},
+		getSkilDataNameWhereId(Indexs, type = true) {
+			if (!this.skillData) { return }
+			const [index1, index2] = Indexs
+			const work1 = this.skillData[index1]
+			const work2 = work1.child[index2]
+			if (type) {
+				return [work1.name, work2.name]
+			} else {
+				return [work1.id, work2.id]
+			}
+		},
+		async getWorkTypes() {
+			let resData = await getWorktypesBaseList({ type: 1 })
+			if (resData.data.code === 200) {
+				const { data } = resData.data
+				const arr = []
+				// 1、 空间换时间策略/user/userrecruit/saveApp
+				arr.push(data.map((item) => item.name));
+				arr.push(data[0].child.map((item) => item.name))
+				this.skillColumnsIndex = [0, 0]
+				this.skillData = data
+				this.skillColumns = arr
+
+			}
 		}
 	}
+}
 </script>
 
 <style>
 .map {
-		width: 100%;
-		height: 350rpx;
-		margin-top: 30rpx;
-	}
+	width: 100%;
+	height: 350rpx;
+	margin-top: 30rpx;
+}
 </style>
\ No newline at end of file
diff --git a/pages/recruit/subPage/task.vue b/pages/recruit/subPage/task.vue
index 01394e2..caac52c 100644
--- a/pages/recruit/subPage/task.vue
+++ b/pages/recruit/subPage/task.vue
@@ -306,22 +306,6 @@ export default {
 	},
 	methods: {
 		async backfill(info) {
-			const companyEnum = [
-				{ value: 1, label: "机关/事业单位" },
-				{ value: 2, label: "国有企业" },
-				{ value: 3, label: "私营企业" },
-				{ value: 4, label: "外商及港澳台投资企业" },
-				{ value: 5, label: "股份制企业" },
-				{ value: 6, label: "学校/下级学院" },
-				{ value: 7, label: "医院" },
-				{ value: 8, label: "律师事务所" },
-				{ value: 9, label: "银行" },
-				{ value: 10, label: "非盈利社会组织" },
-				{ value: 11, label: "其它" },
-			]
-
-
-			console.log(info, '99999999999999999999');
 			const { manager, companyTid, comname, companyDesc, telphone, tradeId, nature } = info
 			this.info.jobCompanyScale = companyTid
 			this.info.jobCompanyName = comname
@@ -331,15 +315,12 @@ export default {
 			if (tradeId / 1 !== -1) {
 				const res = await findTradeList()
 				const tenantArray = res.data.data?.filter(item => item.id === tradeId)
-				console.log(res, tenantArray, '----------------');
 				if (tenantArray?.length === 0) return;
 				this.info.jobCompanyIndustry = tenantArray[0]?.name
 			}
 
 			if (nature / 1 !== -1) {
-				const tenantArray = companyEnum?.filter(item => item.value === nature)
-				console.log(tenantArray, "00000000000000000000000");
-
+				const tenantArray = dic.companyEnum?.filter(item => item.value === nature)
 				if (tenantArray?.length === 0) return;
 				this.info.jobCompanyNature = tenantArray[0]?.label
 			}
diff --git a/pages/recruit/subPage/work.vue b/pages/recruit/subPage/work.vue
index 3d03653..4818a9b 100644
--- a/pages/recruit/subPage/work.vue
+++ b/pages/recruit/subPage/work.vue
@@ -10,13 +10,13 @@
 				</u-form-item>
 				<u-form-item label="发布时间" labelWidth="80" prop="stime" borderBottom
 					@click="showStime = true; hideKeyboard()" ref="item1">
-					<u--input v-model="info.stime"  disabledColor="#ffffff" placeholder="请选择发布时间"
+					<u--input v-model="info.stime" disabledColor="#ffffff" placeholder="请选择发布时间"
 						border="none"></u--input>
 					<u-icon slot="right" name="arrow-right"></u-icon>
 				</u-form-item>
 				<u-form-item label="结束时间" labelWidth="80" prop="etime" borderBottom
 					@click="showEtime = true; hideKeyboard()" ref="item2">
-					<u--input v-model="info.etime"  disabledColor="#ffffff" placeholder="请选择结束时间"
+					<u--input v-model="info.etime" disabledColor="#ffffff" placeholder="请选择结束时间"
 						border="none"></u--input>
 					<u-icon slot="right" name="arrow-right"></u-icon>
 				</u-form-item>
@@ -26,31 +26,33 @@
 				</u-form-item>
 				<u-form-item label="参考工资" prop="wage" labelWidth="80" borderBottom
 					@click="showWage = true; hideKeyboard()" ref="item4">
-					<u--input v-model="info.wage"  disabledColor="#ffffff" placeholder="请选择参考工资"
+					<u--input v-model="info.wage" disabledColor="#ffffff" placeholder="请选择参考工资"
 						border="none"></u--input>
 					<u-icon slot="right" name="arrow-right"></u-icon>
 				</u-form-item>
 				<u-form-item label="行业类型" prop="tradeNames" labelWidth="80" borderBottom
 					@click="showTrade = true; hideKeyboard()" ref="item4">
-					<u--input v-model="info.tradeNames"  disabledColor="#ffffff" placeholder="请选择行业类型"
+					<u--input v-model="info.tradeNames" disabledColor="#ffffff" placeholder="请选择行业类型"
 						border="none"></u--input>
 					<u-icon slot="right" name="arrow-right"></u-icon>
-				</u-form-item>
-                
+				</u-form-item>
+
 				<u-form-item label="工种" prop="skillNames" labelWidth="80" borderBottom
 					@click="showSkills = true; hideKeyboard()" ref="item4">
-					<u--input v-model="info.skillNames"  disabledColor="#ffffff" placeholder="请选择工种"
+					<u--input v-model="info.skillNames" disabledColor="#ffffff" placeholder="请选择工种"
 						border="none"></u--input>
 					<u-icon slot="right" name="arrow-right"></u-icon>
-				</u-form-item>
-                
+				</u-form-item>
+
 				<u-form-item label="岗位描述" prop="jobDescription" borderBottom labelWidth="80" ref="item1">
 					<!-- <u--textarea v-model="info.jobDescription"  placeholder="请输入岗位描述"></u--textarea> -->
 					<!-- <u--input v-model="info.jobDescription" border="none" placeholder="请输入任务描述"></u--input>
 					<u-icon slot="right" name="arrow-right"></u-icon> -->
 				</u-form-item>
 				<view>
-					<u--textarea v-model="info.jobDescription" placeholder="参考示例:岗位名称:保姆 工作内容: 一日三餐,卫生打扫 工资: 200元/天 年龄要求: 25-40岁 工作经验要求: 有过住家保姆经验, 会做饭,受过高等教育的优先" count height="100" maxlength="200"></u--textarea>
+					<u--textarea v-model="info.jobDescription"
+						placeholder="参考示例:岗位名称:保姆 工作内容: 一日三餐,卫生打扫 工资: 200元/天 年龄要求: 25-40岁 工作经验要求: 有过住家保姆经验, 会做饭,受过高等教育的优先"
+						count height="100" maxlength="200"></u--textarea>
 				</view>
 				<view style="font-size: 30rpx;font-weight: bold;padding: 20rpx 0 0;">人员要求</view>
 				<!-- <u-form-item label="人员属性" prop="userNature" labelWidth="80" borderBottom
@@ -61,19 +63,19 @@
 				</u-form-item> -->
 				<u-form-item label="年龄要求" prop="ageDesc" labelWidth="80" borderBottom
 					@click="showAge = true; hideKeyboard()" ref="item4">
-					<u--input v-model="info.ageDesc"  disabledColor="#ffffff" placeholder="请选择年龄要求"
+					<u--input v-model="info.ageDesc" disabledColor="#ffffff" placeholder="请选择年龄要求"
 						border="none"></u--input>
 					<u-icon slot="right" name="arrow-right"></u-icon>
 				</u-form-item>
 				<u-form-item label="学历要求" prop="educationLabel" labelWidth="80" borderBottom
 					@click="showEdu = true; hideKeyboard()" ref="item4">
-					<u--input v-model="info.educationLabel"  disabledColor="#ffffff" placeholder="请选择学历要求"
+					<u--input v-model="info.educationLabel" disabledColor="#ffffff" placeholder="请选择学历要求"
 						border="none"></u--input>
 					<u-icon slot="right" name="arrow-right"></u-icon>
 				</u-form-item>
 				<u-form-item label="经验要求" prop="experienceDesc" labelWidth="80" borderBottom
 					@click="showExpe = true; hideKeyboard()" ref="item4">
-					<u--input v-model="info.experienceDesc"  disabledColor="#ffffff" placeholder="请选择学历要求"
+					<u--input v-model="info.experienceDesc" disabledColor="#ffffff" placeholder="请选择学历要求"
 						border="none"></u--input>
 					<u-icon slot="right" name="arrow-right"></u-icon>
 				</u-form-item>
@@ -95,7 +97,8 @@
 					<u-icon slot="right" name="arrow-right"></u-icon> -->
 				</u-form-item>
 				<view>
-					<u--textarea v-model="info.jobCompanyDescription" placeholder="请输入企业介绍" count height="100" maxlength="200"></u--textarea>
+					<u--textarea v-model="info.jobCompanyDescription" placeholder="请输入企业介绍" count height="100"
+						maxlength="200"></u--textarea>
 				</view>
 				<u-form-item label="联系人" prop="callName" borderBottom labelWidth="80" ref="item1">
 					<u--input v-model="info.callName" border="none" placeholder="请输入联系人"></u--input>
@@ -120,19 +123,19 @@
 				@cancel="tradeClose" @close="tradeClose">
 			</u-picker>
 			<u-picker :show="showSkills" ref="skillPicker" keyName="name" :columns="skillColumns" @change="skillsChange"
-				@confirm="skillConfirm" @cancel="skillClose" @close="skillClose"> 
+				@confirm="skillConfirm" @cancel="skillClose" @close="skillClose">
 			</u-picker>
 			<!-- <u-picker :show="showNature" ref="naturePicker"  :columns="natureColumns"
 				@confirm="natureConfirm" @cancel="natureClose" @close="natureClose">
 			</u-picker> -->
-			<u-picker :show="showAge" ref="agePicker" keyName="label"  :columns="ageColumns"
-				@confirm="ageConfirm" @cancel="ageClose" @close="ageClose">
+			<u-picker :show="showAge" ref="agePicker" keyName="label" :columns="ageColumns" @confirm="ageConfirm"
+				@cancel="ageClose" @close="ageClose">
 			</u-picker>
-			<u-picker :show="showEdu" ref="eduPicker" keyName="label"  :columns="eduColumns"
-				@confirm="eduConfirm" @cancel="eduClose" @close="eduClose">
+			<u-picker :show="showEdu" ref="eduPicker" keyName="label" :columns="eduColumns" @confirm="eduConfirm"
+				@cancel="eduClose" @close="eduClose">
 			</u-picker>
-			<u-picker :show="showExpe" ref="expePicker" keyName="label"  :columns="expeColumns"
-				@confirm="expeConfirm" @cancel="expeClose" @close="expeClose">
+			<u-picker :show="showExpe" ref="expePicker" keyName="label" :columns="expeColumns" @confirm="expeConfirm"
+				@cancel="expeClose" @close="expeClose">
 			</u-picker>
 			<u-datetime-picker :show="showStime" :value="birthday" mode="date" closeOnClickOverlay
 				@confirm="stimeConfirm" @cancel="stimeClose" @close="stimeClose"></u-datetime-picker>
@@ -143,408 +146,424 @@
 </template>
 
 <script>
-	import dic from '@/common/dic.js'
-	import { submitInfo, getWorktypesBaseList } from '@/api/userrecruit.js'
-	export default {
-		data() {
-			return {
-				latitude: 31.05, //中心点
-				longitude: 104.20,
-				covers: [{ //marker标记位置
-					id: 0,
-					latitude: 0,
-					longitude: 0,
-					// width:30,
-					// height:30,
-					iconPath: '../../../static/img/location.png'
+import dic from '@/common/dic.js'
+import { submitInfo, getWorktypesBaseList,findTradeList } from '@/api/userrecruit.js'
+export default {
+	data() {
+		return {
+			latitude: 31.05, //中心点
+			longitude: 104.20,
+			covers: [{ //marker标记位置
+				id: 0,
+				latitude: 0,
+				longitude: 0,
+				// width:30,
+				// height:30,
+				iconPath: '../../../static/img/location.png'
+			}],
+			value2: '招工内容',
+			fileList1: [],
+			disabled1: false,
+			tips: '',
+			value: '',
+			showCalendar: false,
+			showStime: false,
+			showEtime: false,
+			info: {
+				jobName: '', // 招工名称
+				stime: '', // 发布时间
+				etime: '', // 结束时间
+				peopleNum: '', // 招聘人数
+				wage: '', // 参考工资
+				tradeId: '', // 行业类型id
+				tradeNames: '', // 行业类型名称
+				worktypeIds: '', // 工种一级id
+				skillIds: '', // 工种二级id
+				worktypeNames: '', // 工种名称
+				skillNames: '', // 工种二级名称
+				jobDescription: '', // 任务描述
+				// userNature: '', // 人员属性
+				ageDesc: '', // 年龄要求
+				education: '', // 学历要求
+				educationLabel: '', // 学历要求前端显示
+				experienceDesc: '', // 经验要求
+				jobCompanyName: '', // 企业名称
+				jobCompanyScale: '', // 企业信用代码
+				jobCompanyIndustry: '', // 所属行业
+				jobCompanyNature: '', // 企业性质
+				jobCompanyDescription: '', // 企业介绍
+				callName: '', // 联系人
+				callTel: '', // 手机号
+				callNumber: '', // 座机
+				address: '', // 公司详细地址
+				// userInfo: {
+				// 	name: '楼兰',
+				// 	sex: '',
+				// 	birthday: ''
+				// },
+				// radiovalue1: '苹果',
+				// checkboxValue1: [],
+				// intro: '',
+				// code: ''
+			},
+			showWage: false, // 参考工资选项是否展示
+			showTrade: false, // 行业类型是否显示
+			showSkills: false, // 工种类型是否显示
+			showNature: false, // 人员属性
+			showAge: false, // 年龄要求
+			showEdu: false, // 学历要求
+			showExpe: false, // 经验要求
+			birthday: Number(new Date()),
+			wageColumns: dic.taskSalary,
+			tradeColumns: dic.tradeArr,
+			skillColumns: [],
+			skillColumnsIndex: [0, 0, 0],
+			natureColumns: dic.natureArr,
+			ageColumns: dic.ageArr,
+			eduColumns: dic.eduArr,
+			expeColumns: dic.expeArr,
+			rules: {
+				'userInfo.name': [{
+					type: 'string',
+					required: true,
+					message: '请填写姓名',
+					trigger: ['blur', 'change']
+				}, {
+					// 此为同步验证，可以直接返回true或者false，如果是异步验证，稍微不同，见下方说明
+					validator: (rule, value, callback) => {
+						// 调用uView自带的js验证规则，详见：https://www.uviewui.com/js/test.html
+						return uni.$u.test.chinese(value);
+					},
+					message: "姓名必须为中文",
+					// 触发器可以同时用blur和change，二者之间用英文逗号隔开
+					trigger: ["change", "blur"],
 				}],
-				value2: '招工内容',
-				fileList1: [],
-				disabled1: false,
-				tips: '',
-				value: '',
-				showCalendar: false,
-				showStime: false,
-				showEtime: false,
-				info: {
-					jobName: '', // 招工名称
-					stime: '', // 发布时间
-					etime: '', // 结束时间
-					peopleNum: '', // 招聘人数
-					wage: '', // 参考工资
-					tradeId: '', // 行业类型id
-					tradeNames: '', // 行业类型名称
-					worktypeIds: '', // 工种一级id
-					skillIds: '', // 工种二级id
-					worktypeNames: '', // 工种名称
-					skillNames: '', // 工种二级名称
-					jobDescription: '', // 任务描述
-					// userNature: '', // 人员属性
-					ageDesc: '', // 年龄要求
-					education: '', // 学历要求
-					educationLabel: '', // 学历要求前端显示
-					experienceDesc: '', // 经验要求
-					jobCompanyName: '', // 企业名称
-					jobCompanyScale: '', // 企业信用代码
-					jobCompanyIndustry: '', // 所属行业
-					jobCompanyNature: '', // 企业性质
-					jobCompanyDescription: '', // 企业介绍
-					callName: '', // 联系人
-					callTel: '', // 手机号
-					callNumber: '', // 座机
-					address: '', // 公司详细地址
-					// userInfo: {
-					// 	name: '楼兰',
-					// 	sex: '',
-					// 	birthday: ''
-					// },
-					// radiovalue1: '苹果',
-					// checkboxValue1: [],
-					// intro: '',
-					// code: ''
+				code: {
+					type: 'string',
+					required: true,
+					len: 4,
+					message: '请填写4位验证码',
+					trigger: ['blur']
 				},
-				showWage: false, // 参考工资选项是否展示
-				showTrade: false, // 行业类型是否显示
-				showSkills: false, // 工种类型是否显示
-				showNature: false, // 人员属性
-				showAge: false, // 年龄要求
-				showEdu: false, // 学历要求
-				showExpe: false, // 经验要求
-				birthday: Number(new Date()),
-				wageColumns: dic.taskSalary,
-				tradeColumns: dic.tradeArr,
-				skillColumns: [],
-                skillColumnsIndex: [0,0,0],
-				natureColumns: dic.natureArr,
-				ageColumns: dic.ageArr,
-				eduColumns: dic.eduArr,
-				expeColumns: dic.expeArr,
-				rules: {
-					'userInfo.name': [{
-						type: 'string',
-						required: true,
-						message: '请填写姓名',
-						trigger: ['blur', 'change']
-					}, {
-						// 此为同步验证，可以直接返回true或者false，如果是异步验证，稍微不同，见下方说明
-						validator: (rule, value, callback) => {
-							// 调用uView自带的js验证规则，详见：https://www.uviewui.com/js/test.html
-							return uni.$u.test.chinese(value);
-						},
-						message: "姓名必须为中文",
-						// 触发器可以同时用blur和change，二者之间用英文逗号隔开
-						trigger: ["change", "blur"],
-					}],
-					code: {
-						type: 'string',
-						required: true,
-						len: 4,
-						message: '请填写4位验证码',
-						trigger: ['blur']
-					},
-					'userInfo.sex': {
-						type: 'string',
-						max: 1,
-						required: true,
-						message: '请选择男或女',
-						trigger: ['blur', 'change']
-					},
-					radiovalue1: {
-						type: 'string',
-						min: 1,
-						max: 2,
-						message: '橙子有毒',
-						trigger: ['change']
-					},
-					checkboxValue1: {
-						type: 'array',
-						min: 2,
-						required: true,
-						message: '不能太宅，至少选两项',
-						trigger: ['change']
-					},
-					intro: {
-						type: 'string',
-						min: 3,
-						required: true,
-						message: '不低于3个字',
-						trigger: ['change']
-					},
-					hotel: {
-						type: 'string',
-						min: 2,
-						required: true,
-						message: '请选择住店时间',
-						trigger: ['change']
-					},
-					'userInfo.birthday': {
-						type: 'string',
-						required: true,
-						message: '请选择生日',
-						trigger: ['change']
-					},
+				'userInfo.sex': {
+					type: 'string',
+					max: 1,
+					required: true,
+					message: '请选择男或女',
+					trigger: ['blur', 'change']
 				},
+				radiovalue1: {
+					type: 'string',
+					min: 1,
+					max: 2,
+					message: '橙子有毒',
+					trigger: ['change']
+				},
+				checkboxValue1: {
+					type: 'array',
+					min: 2,
+					required: true,
+					message: '不能太宅，至少选两项',
+					trigger: ['change']
+				},
+				intro: {
+					type: 'string',
+					min: 3,
+					required: true,
+					message: '不低于3个字',
+					trigger: ['change']
+				},
+				hotel: {
+					type: 'string',
+					min: 2,
+					required: true,
+					message: '请选择住店时间',
+					trigger: ['change']
+				},
+				'userInfo.birthday': {
+					type: 'string',
+					required: true,
+					message: '请选择生日',
+					trigger: ['change']
+				},
+			},
+		}
+	},
+	props: {
+		company: {
+			default: null,
+		}
+	},
+	created() {
+		this.getWorkTypes()
+		if (this.company) {
+			this.getDataInit()
+		}
+	},
+	methods: {
+		async getDataInit() {
+			const { companyTid, comname, manager, telphone, companyDesc, tradeId, nature } = this.company
+			this.info.jobCompanyScale = companyTid
+			this.info.jobCompanyName = comname
+			this.info.callName = manager
+			this.info.callTel = telphone
+			this.info.jobCompanyDescription = companyDesc
+			if (tradeId / 1 !== -1) {
+				const res = await findTradeList()
+				const tenantArray = res.data.data?.filter(item => item.id === tradeId)
+				if (tenantArray?.length === 0) return;
+				this.info.jobCompanyIndustry = tenantArray[0]?.name
 			}
-		},
-        props: { 
-            company: {
-                default: null,
-            }
-        },
-        created() {
-            this.getWorkTypes()  
-            if(this.company) {
-                const { companyTid, comname, manager, telphone, companyDesc } = this.company
-                this.info.jobCompanyScale = companyTid
-                this.info.jobCompanyName = comname
-                this.info.callName = manager
-                this.info.callTel = telphone
-                this.info.jobCompanyDescription = companyDesc
-            }
-        },
-		methods: {
-			wageConfirm(e) {
-				const {
-					value
-				} = e
-				this.info.wage = value[0]
-				this.showWage = false
-			},
-			tradeConfirm(e) {
-				const { value } = e
-				this.info.tradeId = value[0].id
-				this.info.tradeNames = value[0].name
-				this.showTrade = false
-			},
-			skillConfirm(e) {
-                const { value, indexs } = e
-                this.skillColumnsIndex = indexs
-                this.info.skillNames = this.getSkilDataNameWhereId(indexs).join('-')
-				this.showSkills = false
-			},
-			// natureConfirm(e) {
-			// 	const { value } = e
-			// 	this.info.userNature = value[0]
-			// 	this.showNature = false
-			// },
-			ageConfirm(e) {
-				const { value } = e
-				this.info.ageDesc = value[0].label
-				this.showAge = false
-			},
-			eduConfirm(e) {
-				const { value } = e
-				this.info.education = value[0].value
-				this.info.educationLabel = value[0].label
-				this.showEdu = false
-			},
-			expeConfirm(e) {
-				const { value } = e
-				this.info.experienceDesc = value[0].label
-				this.showExpe = false
-			},
-			expeClose() {
-				this.showExpe = false
-			},
-			eduClose() {
-				this.showEdu = false
-			},
-			ageClose() {
-				this.showAge = false
-			},
-			// natureClose() {
-			// 	this.showNature = false
-			// },
-			skillClose() {
-				this.showSkills = false
-			},
-			wageClose(e) {
-				this.showWage = false
-			},
-			tradeClose(e) {
-				this.showTrade = false
-			},
-			sexSelect(e) {
-				this.info.userInfo.sex = e.name
-				this.$refs.form1.validateField('userInfo.sex')
-			},
-			change(e) {
-				// console.log(e);
-			},
-			formatter(day) {
-				const d = new Date()
-				let month = d.getMonth() + 1
-				const date = d.getDate()
-				if (day.month == month && day.day == date + 3) {
-					day.bottomInfo = '有优惠'
-					day.dot = true
-				}
-				return day
-			},
-			calendarConfirm(e) {
-				this.showCalendar = false
-				this.info.hotel = `${e[0]} / ${e[e.length - 1]}`
-				this.$refs.form1.validateField('hotel')
-			},
-			codeChange(text) {
-				this.tips = text;
-			},
-			getCode() {
-				if (this.$refs.uCode.canGetCode) {
-					// 模拟向后端请求验证码
-					uni.showLoading({
-						title: '正在获取验证码'
-					})
-					setTimeout(() => {
-						uni.hideLoading();
-						// 这里此提示会被this.start()方法中的提示覆盖
-						uni.$u.toast('验证码已发送');
-						// 通知验证码组件内部开始倒计时
-						this.$refs.uCode.start();
-					}, 2000);
-				} else {
-					uni.$u.toast('倒计时结束后再发送');
-				}
-			},
-			calendarClose() {
-				this.showCalendar = false
-				this.$refs.form1.validateField('hotel')
-			},
-			stimeClose() {
-				this.showStime = false
-				this.$refs.form1.validateField('userInfo.birthday')
-			},
-			stimeConfirm(e) {
-				this.showStime = false
-				this.info.stime = uni.$u.timeFormat(e.value, 'yyyy-mm-dd') + ' 00:00:00'
-				this.$refs.form1.validateField('userInfo.birthday')
-			},
-			etimeClose() {
-				this.showEtime = false
-				this.$refs.form1.validateField('userInfo.birthday')
-			},
-			etimeConfirm(e) {
-				this.showEtime = false
-				this.info.etime = uni.$u.timeFormat(e.value, 'yyyy-mm-dd') +  ' 23:59:59'
-				this.$refs.form1.validateField('userInfo.birthday')
-			},
-			submit() {
-				// 如果有错误，会在catch中返回报错信息数组，校验通过则在then中返回true
-				// this.$refs.form1.validate().then(res => {
-				// 	uni.$u.toast('校验通过')
-				// }).catch(errors => {
-				// 	uni.$u.toast('校验失败')
-				// })
-                const names = this.getSkilDataNameWhereId( this.skillColumnsIndex, true)
-                const ids = this.getSkilDataNameWhereId( this.skillColumnsIndex, false)
-				this.info.jobType = 1
-                let params = {
-                    ...this.info,
-                    worktypeIds: ids.join(','),
-                    worktypeNames: names.join(',')
-                }
-				let that = this
-				submitInfo(params).then(res => {
-					if(res.data.code == 200) {
-						that.reset()
-						uni.$u.toast('发布成功')
-					}
+
+			if (nature / 1 !== -1) {
+				const tenantArray = dic.companyEnum?.filter(item => item.value === nature)
+				if (tenantArray?.length === 0) return;
+				this.info.jobCompanyNature = tenantArray[0]?.label
+			}
+		},
+
+		wageConfirm(e) {
+			const {
+				value
+			} = e
+			this.info.wage = value[0]
+			this.showWage = false
+		},
+		tradeConfirm(e) {
+			const { value } = e
+			this.info.tradeId = value[0].id
+			this.info.tradeNames = value[0].name
+			this.showTrade = false
+		},
+		skillConfirm(e) {
+			const { value, indexs } = e
+			this.skillColumnsIndex = indexs
+			this.info.skillNames = this.getSkilDataNameWhereId(indexs).join('-')
+			this.showSkills = false
+		},
+		// natureConfirm(e) {
+		// 	const { value } = e
+		// 	this.info.userNature = value[0]
+		// 	this.showNature = false
+		// },
+		ageConfirm(e) {
+			const { value } = e
+			this.info.ageDesc = value[0].label
+			this.showAge = false
+		},
+		eduConfirm(e) {
+			const { value } = e
+			this.info.education = value[0].value
+			this.info.educationLabel = value[0].label
+			this.showEdu = false
+		},
+		expeConfirm(e) {
+			const { value } = e
+			this.info.experienceDesc = value[0].label
+			this.showExpe = false
+		},
+		expeClose() {
+			this.showExpe = false
+		},
+		eduClose() {
+			this.showEdu = false
+		},
+		ageClose() {
+			this.showAge = false
+		},
+		// natureClose() {
+		// 	this.showNature = false
+		// },
+		skillClose() {
+			this.showSkills = false
+		},
+		wageClose(e) {
+			this.showWage = false
+		},
+		tradeClose(e) {
+			this.showTrade = false
+		},
+		sexSelect(e) {
+			this.info.userInfo.sex = e.name
+			this.$refs.form1.validateField('userInfo.sex')
+		},
+		change(e) {
+			// console.log(e);
+		},
+		formatter(day) {
+			const d = new Date()
+			let month = d.getMonth() + 1
+			const date = d.getDate()
+			if (day.month == month && day.day == date + 3) {
+				day.bottomInfo = '有优惠'
+				day.dot = true
+			}
+			return day
+		},
+		calendarConfirm(e) {
+			this.showCalendar = false
+			this.info.hotel = `${e[0]} / ${e[e.length - 1]}`
+			this.$refs.form1.validateField('hotel')
+		},
+		codeChange(text) {
+			this.tips = text;
+		},
+		getCode() {
+			if (this.$refs.uCode.canGetCode) {
+				// 模拟向后端请求验证码
+				uni.showLoading({
+					title: '正在获取验证码'
 				})
-			},
-            getSkilDataNameWhereId(Indexs, type = true) {
-                if(!this.skillData) {return}
-                const [ index1, index2, index3 ] = Indexs
-                const work1 = this.skillData[index1]
-                const work2 = work1.child[index2]
-                const work3 = work2.child[index3]
-                if(type) {
-                    return [work1.name, work2.name, work3.name]
-                } else {
-                    return [work1.id, work2.id, work3.id]
-                }
-            },
-			reset() {
-				const validateList = [
-					'jobName', 
-					'stime', 
-					'etime', 
-					'peopleNum', 
-					'wage',
-					'tradeId', 
-					'tradeNames', 
-					'worktypeIds',
-					'skillIds',
-					'worktypeNames',
-					'skillNames',
-					'jobDescription',
-					'ageDesc',
-					'education',
-					'educationLabel',
-					'experienceDesc',
-					'jobCompanyName',
-					'jobCompanyScale',
-					'jobCompanyIndustry',
-					'jobCompanyNature',
-					'jobCompanyDescription',
-					'callName',
-					'callTel',
-					'callNumber',
-					'address'
-				]
-				this.$refs.form1.resetFields()
-				this.$refs.form1.clearValidate()
 				setTimeout(() => {
-					this.$refs.form1.clearValidate(validateList)
-					// 或者使用 this.$refs.form1.clearValidate()
-				}, 10)
-			},
-			hideKeyboard() {
-				uni.hideKeyboard()
-			},
-            skillsChange(e) {
-                    const { columnIndex, index, picker = this.$refs.uPicker } = e
-                    let [ index1, index2, index3 ] = this.skillColumnsIndex
-                    switch (columnIndex) {
-                        case 0: 
-                            index1 = index;
-                            index2 = 0
-                            index3 = 0
-                            break
-                        case 1:
-                            index2 = index;
-                            index3 = 0
-                            break
-                        case 2: 
-                            index3 = index
-                            break
-                    }
-                    const Indexs =  [index1, index2, index3]
-                    picker.setColumnValues(1, this.skillData[index1].child.map((item) => item.name))
-                    picker.setColumnValues(2, this.skillData[index1].child[index2].child.map((item) => item.name))
-                    this.skillColumnsIndex = Indexs
-            },
-            async getWorkTypes() {
-                let resData = await getWorktypesBaseList({type: 2})
-                if(resData.data.code === 200) {
-                    const { data } = resData.data
-                    const arr = []
-                    // 1、 空间换时间策略/user/userrecruit/saveApp
-                    arr.push(data.map((item) => item.name));
-                    arr.push(data[0].child.map((item) => item.name))
-                    arr.push(data[0].child[0].child.map((item) => item.name))
-                    this.skillColumnsIndex = [0, 0, 0]
-                    this.skillData = data
-                    this.skillColumns = arr
-                }
-            }
+					uni.hideLoading();
+					// 这里此提示会被this.start()方法中的提示覆盖
+					uni.$u.toast('验证码已发送');
+					// 通知验证码组件内部开始倒计时
+					this.$refs.uCode.start();
+				}, 2000);
+			} else {
+				uni.$u.toast('倒计时结束后再发送');
+			}
+		},
+		calendarClose() {
+			this.showCalendar = false
+			this.$refs.form1.validateField('hotel')
+		},
+		stimeClose() {
+			this.showStime = false
+			this.$refs.form1.validateField('userInfo.birthday')
+		},
+		stimeConfirm(e) {
+			this.showStime = false
+			this.info.stime = uni.$u.timeFormat(e.value, 'yyyy-mm-dd') + ' 00:00:00'
+			this.$refs.form1.validateField('userInfo.birthday')
+		},
+		etimeClose() {
+			this.showEtime = false
+			this.$refs.form1.validateField('userInfo.birthday')
+		},
+		etimeConfirm(e) {
+			this.showEtime = false
+			this.info.etime = uni.$u.timeFormat(e.value, 'yyyy-mm-dd') + ' 23:59:59'
+			this.$refs.form1.validateField('userInfo.birthday')
+		},
+		submit() {
+			// 如果有错误，会在catch中返回报错信息数组，校验通过则在then中返回true
+			// this.$refs.form1.validate().then(res => {
+			// 	uni.$u.toast('校验通过')
+			// }).catch(errors => {
+			// 	uni.$u.toast('校验失败')
+			// })
+			const names = this.getSkilDataNameWhereId(this.skillColumnsIndex, true)
+			const ids = this.getSkilDataNameWhereId(this.skillColumnsIndex, false)
+			this.info.jobType = 1
+			let params = {
+				...this.info,
+				worktypeIds: ids.join(','),
+				worktypeNames: names.join(',')
+			}
+			let that = this
+			submitInfo(params).then(res => {
+				if (res.data.code == 200) {
+					that.reset()
+					uni.$u.toast('发布成功')
+				}
+			})
+		},
+		getSkilDataNameWhereId(Indexs, type = true) {
+			if (!this.skillData) { return }
+			const [index1, index2, index3] = Indexs
+			const work1 = this.skillData[index1]
+			const work2 = work1.child[index2]
+			const work3 = work2.child[index3]
+			if (type) {
+				return [work1.name, work2.name, work3.name]
+			} else {
+				return [work1.id, work2.id, work3.id]
+			}
+		},
+		reset() {
+			const validateList = [
+				'jobName',
+				'stime',
+				'etime',
+				'peopleNum',
+				'wage',
+				'tradeId',
+				'tradeNames',
+				'worktypeIds',
+				'skillIds',
+				'worktypeNames',
+				'skillNames',
+				'jobDescription',
+				'ageDesc',
+				'education',
+				'educationLabel',
+				'experienceDesc',
+				'jobCompanyName',
+				'jobCompanyScale',
+				'jobCompanyIndustry',
+				'jobCompanyNature',
+				'jobCompanyDescription',
+				'callName',
+				'callTel',
+				'callNumber',
+				'address'
+			]
+			this.$refs.form1.resetFields()
+			this.$refs.form1.clearValidate()
+			setTimeout(() => {
+				this.$refs.form1.clearValidate(validateList)
+				// 或者使用 this.$refs.form1.clearValidate()
+			}, 10)
+		},
+		hideKeyboard() {
+			uni.hideKeyboard()
+		},
+		skillsChange(e) {
+			const { columnIndex, index, picker = this.$refs.uPicker } = e
+			let [index1, index2, index3] = this.skillColumnsIndex
+			switch (columnIndex) {
+				case 0:
+					index1 = index;
+					index2 = 0
+					index3 = 0
+					break
+				case 1:
+					index2 = index;
+					index3 = 0
+					break
+				case 2:
+					index3 = index
+					break
+			}
+			const Indexs = [index1, index2, index3]
+			picker.setColumnValues(1, this.skillData[index1].child.map((item) => item.name))
+			picker.setColumnValues(2, this.skillData[index1].child[index2].child.map((item) => item.name))
+			this.skillColumnsIndex = Indexs
+		},
+		async getWorkTypes() {
+			let resData = await getWorktypesBaseList({ type: 2 })
+			if (resData.data.code === 200) {
+				const { data } = resData.data
+				const arr = []
+				// 1、 空间换时间策略/user/userrecruit/saveApp
+				arr.push(data.map((item) => item.name));
+				arr.push(data[0].child.map((item) => item.name))
+				arr.push(data[0].child[0].child.map((item) => item.name))
+				this.skillColumnsIndex = [0, 0, 0]
+				this.skillData = data
+				this.skillColumns = arr
+			}
 		}
 	}
+}
 </script>
 
 <style>
 .map {
-		width: 100%;
-		height: 350rpx;
-		margin-top: 30rpx;
-	}
+	width: 100%;
+	height: 350rpx;
+	margin-top: 30rpx;
+}
 </style>