bug更新

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
 }

pageMy/my/resume/addSkill.vue

@@ -118,20 +118,16 @@ export default {
 				url: `./skillLevel?id=${this.skillsId}&worktypesId=${this.worktypesId}&maxLayer=3&type=2`
 			})
 		},
-		submit: function () {
+		submit: async function () {
-			console.log(this.tradeName, this.worktypesName, this.skillsName);
+			// 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 => {
+			await addSkills(this.tradeName, result[0], result[1], 0)
-				uni.navigateBack()
-			})
 			// 岗位
-			addSkills(this.tradeName, `${result1[0]}、${result1[1]}`, result1[2], 1).then(res => {
+			await addSkills(this.tradeName, `${result1[0]}、${result1[1]}`, result1[2], 1)
 			uni.navigateBack()
-			})
 		}
 	}
 }

pages/recruit/subPage/person.vue

@@ -42,15 +42,16 @@
 						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" 
+				<u-form-item label="招工描述" prop="jobDescription" borderBottom labelWidth="80" ref="item5">
-					 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
@@ -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>
@@ -127,14 +129,14 @@
 			        <text>出淤泥而不染，濯清涟而不妖</text>
 			    </view>
 			</u-popup> -->
-			<u-picker :show="showAge" ref="agePicker" keyName="label"  :columns="ageColumns"
+			<u-picker :show="showAge" ref="agePicker" keyName="label" :columns="ageColumns" @confirm="ageConfirm"
-				@confirm="ageConfirm" @cancel="ageClose" @close="ageClose">
+				@cancel="ageClose" @close="ageClose">
 			</u-picker>
-			<u-picker :show="showEdu" ref="eduPicker" keyName="label"  :columns="eduColumns"
+			<u-picker :show="showEdu" ref="eduPicker" keyName="label" :columns="eduColumns" @confirm="eduConfirm"
-				@confirm="eduConfirm" @cancel="eduClose" @close="eduClose">
+				@cancel="eduClose" @close="eduClose">
 			</u-picker>
-			<u-picker :show="showExpe" ref="expePicker" keyName="label"  :columns="expeColumns"
+			<u-picker :show="showExpe" ref="expePicker" keyName="label" :columns="expeColumns" @confirm="expeConfirm"
-				@confirm="expeConfirm" @cancel="expeClose" @close="expeClose">
+				@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>
@@ -146,7 +148,7 @@
 
 <script>
 import dic from '@/common/dic.js'
-	import { submitInfo, getWorktypesBaseList } from '@/api/userrecruit.js'
+import { submitInfo, getWorktypesBaseList, findTradeList } from '@/api/userrecruit.js'
 export default {
 	data() {
 		return {
@@ -308,16 +310,31 @@
 	watch: {
 		company(val) {
 			if (!val) return;
-                const { manager, companyTid, comname,  companyDesc, telphone } = val
+			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
+			}
 		},
-		methods: {
 		wageConfirm(e) {
 			const {
 				value

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)
+				const tenantArray = dic.companyEnum?.filter(item => item.value === nature)
-				console.log(tenantArray, "00000000000000000000000");
-
 				if (tenantArray?.length === 0) return;
 				this.info.jobCompanyNature = tenantArray[0]?.label
 			}

pages/recruit/subPage/work.vue

@@ -50,7 +50,9 @@
 					<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
@@ -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>
@@ -125,14 +128,14 @@
 			<!-- <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"
+			<u-picker :show="showAge" ref="agePicker" keyName="label" :columns="ageColumns" @confirm="ageConfirm"
-				@confirm="ageConfirm" @cancel="ageClose" @close="ageClose">
+				@cancel="ageClose" @close="ageClose">
 			</u-picker>
-			<u-picker :show="showEdu" ref="eduPicker" keyName="label"  :columns="eduColumns"
+			<u-picker :show="showEdu" ref="eduPicker" keyName="label" :columns="eduColumns" @confirm="eduConfirm"
-				@confirm="eduConfirm" @cancel="eduClose" @close="eduClose">
+				@cancel="eduClose" @close="eduClose">
 			</u-picker>
-			<u-picker :show="showExpe" ref="expePicker" keyName="label"  :columns="expeColumns"
+			<u-picker :show="showExpe" ref="expePicker" keyName="label" :columns="expeColumns" @confirm="expeConfirm"
-				@confirm="expeConfirm" @cancel="expeClose" @close="expeClose">
+				@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>
@@ -144,7 +147,7 @@
 
 <script>
 import dic from '@/common/dic.js'
-	import { submitInfo, getWorktypesBaseList } from '@/api/userrecruit.js'
+import { submitInfo, getWorktypesBaseList,findTradeList } from '@/api/userrecruit.js'
 export default {
 	data() {
 		return {
@@ -294,15 +297,31 @@
 	created() {
 		this.getWorkTypes()
 		if (this.company) {
-                const { companyTid, comname, manager, telphone, companyDesc } = 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
+			}
+
+			if (nature / 1 !== -1) {
+				const tenantArray = dic.companyEnum?.filter(item => item.value === nature)
+				if (tenantArray?.length === 0) return;
+				this.info.jobCompanyNature = tenantArray[0]?.label
 			}
 		},
-		methods: {
+
 		wageConfirm(e) {
 			const {
 				value