From caf55a7ff217908b9dd06b69374059966cc23fbd Mon Sep 17 00:00:00 2001
From: Apcallover <1503963513@qq.com>
Date: Tue, 9 Apr 2024 10:44:52 +0800
Subject: [PATCH] =?UTF-8?q?flat:=20=E5=B7=A5=E8=B5=84=E5=8D=95=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/dic.js                  | 15 ++++++++++-
 pages/recruit/subPage/task.vue | 46 +++++++++++++++++++++++++++-------
 pages/recruit/subPage/work.vue | 38 +++++++++++++++++++++++-----
 store/models/user.js           |  8 +++++-
 vue.config.js                  |  2 +-
 5 files changed, 91 insertions(+), 18 deletions(-)

diff --git a/common/dic.js b/common/dic.js
index f38f74c..235d1a3 100644
--- a/common/dic.js
+++ b/common/dic.js
@@ -283,6 +283,17 @@ const companyEnum = [
 	{ value: 11, label: "其它" },
 ]
 
+const wageUnitCategoryState = [[
+  { id: 1, label: "元/人·时", disable: false },
+  { id: 2, label: "元/人·天", disable: false },
+  { id: 3, label: "元/人·月", disable: true },
+  { id: 4, label: "其他", disable: true },
+  // { value: 0, label: "元/人·次", disable: true },
+  // { value: 4, label: "元/人·周", disable: true },
+  // { value: 5, label: "元/人·个", disable: true },
+  // { value: 6, label: "元/人·件", disable: true },
+]];
+
 export default {
 	salary,
 	taskSalary,
@@ -290,5 +301,7 @@ export default {
 	natureArr,
 	ageArr,
 	eduArr,
-	expeArr,companyEnum
+	expeArr,
+    companyEnum,
+    wageUnitCategoryState
 }
\ No newline at end of file
diff --git a/pages/recruit/subPage/task.vue b/pages/recruit/subPage/task.vue
index caac52c..8bdba1c 100644
--- a/pages/recruit/subPage/task.vue
+++ b/pages/recruit/subPage/task.vue
@@ -23,13 +23,29 @@
 				<view style="font-size: 30rpx;font-weight: bold;padding: 20rpx 0 0;">任务要求</view>
 				<u-form-item label="招聘人数" prop="peopleNum" borderBottom labelWidth="80" ref="item3">
 					<u--input v-model="info.peopleNum" border="none" placeholder="请输入招聘人数"></u--input>
-				</u-form-item>
-				<u-form-item label="参考工资" prop="wage" labelWidth="80" borderBottom
+				</u-form-item>
+                <u-form-item label="参考工资" prop="jobName" borderBottom labelWidth="80" ref="item1">
+                	<u--input v-model="info.wage" border="none" placeholder="请输入参考工资">
+                        <template slot="suffix">
+                            <u-form-item class="wageunitLeft" prop="wage" labelWidth="0" border="surround"
+                            	@click="showWage = true; hideKeyboard()" ref="item4">
+                            	<u--input
+                                v-model="info.wageUnitCategoryName" 
+                                disabledColor="#ffffff" 
+                                placeholder="请选择单位" 
+                                style="width: 80px;"
+                            	border="none"></u--input>
+                            	<u-icon slot="right" name="arrow-right"></u-icon>
+                            </u-form-item>
+                        </template>
+                    </u--input>
+                </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="请选择参考工资"
 						border="none"></u--input>
 					<u-icon slot="right" name="arrow-right"></u-icon>
-				</u-form-item>
+				</u-form-item> -->
 				<u-form-item label="行业类型" prop="tradeNames" labelWidth="80" borderBottom
 					@click="showTrade = true; hideKeyboard()" ref="item5">
 					<u--input v-model="info.tradeNames" disabledColor="#ffffff" placeholder="请选择行业类型"
@@ -114,7 +130,7 @@
 			</u--form>
 			<u-button type="primary" text="提交" customStyle="margin-top: 50px" @click="submit"></u-button>
 			<u-button type="error" text="重置" customStyle="margin-top: 10px" @click="reset"></u-button>
-			<u-picker :show="showWage" ref="wagePicker" :columns="wageColumns" @confirm="wageConfirm"
+			<u-picker :show="showWage" ref="wagePicker" keyName="label" :columns="wageColumns" @confirm="wageConfirm"
 				@cancel="wageClose" @close="wageClose">
 			</u-picker>
 			<u-picker :show="showTrade" ref="tradePicker" keyName="name" :columns="tradeColumns" @confirm="tradeConfirm"
@@ -172,7 +188,9 @@ export default {
 				stime: '', // 发布时间
 				etime: '', // 结束时间
 				peopleNum: '', // 招聘人数
-				wage: '', // 参考工资
+				wage: '', // 参考工资
+                wageUnitCategory: '', // 工资单位
+                wageUnitCategoryName: '',
 				tradeId: '', // 行业类型id
 				tradeNames: '', // 行业类型名称
 				worktypeIds: '', // 工种一级id
@@ -211,7 +229,7 @@ export default {
 			showEdu: false, // 学历要求
 			showExpe: false, // 经验要求
 			birthday: Number(new Date()),
-			wageColumns: dic.taskSalary,
+			wageColumns: dic.wageUnitCategoryState,
 			tradeColumns: dic.tradeArr,
 			skillColumns: [],
 			skillColumnsIndex: [0, 0],
@@ -291,7 +309,8 @@ export default {
 			default: null,
 		}
 	},
-	created() {
+	created() {
+        console.log('wageColumns', this.wageColumns)
 		if (this.company) {
 			this.backfill(this.company)
 		}
@@ -328,8 +347,9 @@ export default {
 		wageConfirm(e) {
 			const {
 				value
-			} = e
-			this.info.wage = value[0]
+			} = e
+			this.info.wageUnitCategoryName = value[0].label
+            this.info.wageUnitCategory = value[0].id
 			this.showWage = false
 		},
 		tradeConfirm(e) {
@@ -568,5 +588,13 @@ export default {
 	width: 100%;
 	height: 350rpx;
 	margin-top: 30rpx;
+}
+.wageunitLeft{
+    border-left: 3rpx solid rgb(192, 196, 204, 0.6);
+    padding-left: 20rpx;
+
+}
+/deep/.wageunitLeft .u-form-item__body{
+    padding: 0;
 }
 </style>
diff --git a/pages/recruit/subPage/work.vue b/pages/recruit/subPage/work.vue
index 4818a9b..91910f1 100644
--- a/pages/recruit/subPage/work.vue
+++ b/pages/recruit/subPage/work.vue
@@ -24,12 +24,28 @@
 				<u-form-item label="招聘人数" prop="peopleNum" borderBottom labelWidth="80" ref="item3">
 					<u--input v-model="info.peopleNum" border="none" placeholder="请输入招聘人数"></u--input>
 				</u-form-item>
-				<u-form-item label="参考工资" prop="wage" labelWidth="80" borderBottom
+				<!-- <u-form-item label="参考工资" prop="wage" labelWidth="80" borderBottom
 					@click="showWage = true; hideKeyboard()" ref="item4">
 					<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> -->
+                <u-form-item label="参考工资" prop="jobName" borderBottom labelWidth="80" ref="item1">
+                	<u--input v-model="info.wage" border="none" placeholder="请输入参考工资">
+                        <template slot="suffix">
+                            <u-form-item class="wageunitLeft" prop="wage" labelWidth="0" border="surround"
+                            	@click="showWage = true; hideKeyboard()" ref="item4">
+                            	<u--input
+                                v-model="info.wageUnitCategoryName" 
+                                disabledColor="#ffffff" 
+                                placeholder="请选择单位" 
+                                style="width: 80px;"
+                            		border="none"></u--input>
+                            	<u-icon slot="right" name="arrow-right"></u-icon>
+                            </u-form-item>
+                        </template>
+                    </u--input>
+                </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="请选择行业类型"
@@ -116,7 +132,7 @@
 			</u--form>
 			<u-button type="primary" text="提交" customStyle="margin-top: 50px" @click="submit"></u-button>
 			<u-button type="error" text="重置" customStyle="margin-top: 10px" @click="reset"></u-button>
-			<u-picker :show="showWage" ref="wagePicker" :columns="wageColumns" @confirm="wageConfirm"
+			<u-picker :show="showWage" ref="wagePicker"  keyName="label"  :columns="wageColumns" @confirm="wageConfirm"
 				@cancel="wageClose" @close="wageClose">
 			</u-picker>
 			<u-picker :show="showTrade" ref="tradePicker" keyName="name" :columns="tradeColumns" @confirm="tradeConfirm"
@@ -174,7 +190,9 @@ export default {
 				stime: '', // 发布时间
 				etime: '', // 结束时间
 				peopleNum: '', // 招聘人数
-				wage: '', // 参考工资
+				wage: '', // 参考工资
+                wageUnitCategory: '', // 工资单位
+                wageUnitCategoryName: '',
 				tradeId: '', // 行业类型id
 				tradeNames: '', // 行业类型名称
 				worktypeIds: '', // 工种一级id
@@ -214,7 +232,7 @@ export default {
 			showEdu: false, // 学历要求
 			showExpe: false, // 经验要求
 			birthday: Number(new Date()),
-			wageColumns: dic.taskSalary,
+			wageColumns: dic.wageUnitCategoryState,
 			tradeColumns: dic.tradeArr,
 			skillColumns: [],
 			skillColumnsIndex: [0, 0, 0],
@@ -326,7 +344,8 @@ export default {
 			const {
 				value
 			} = e
-			this.info.wage = value[0]
+            this.info.wageUnitCategoryName = value[0].label
+            this.info.wageUnitCategory = value[0].id
 			this.showWage = false
 		},
 		tradeConfirm(e) {
@@ -565,5 +584,12 @@ export default {
 	width: 100%;
 	height: 350rpx;
 	margin-top: 30rpx;
+}
+.wageunitLeft{
+    border-left: 3rpx solid rgb(192, 196, 204, 0.6);
+    padding-left: 20rpx;
+}
+/deep/.wageunitLeft .u-form-item__body{
+    padding: 0;
 }
 </style>
diff --git a/store/models/user.js b/store/models/user.js
index af24443..2975fe9 100644
--- a/store/models/user.js
+++ b/store/models/user.js
@@ -61,7 +61,9 @@ const user = {
 		sendTimes:getStore({//用户发送短信次数
 			name:'setUserSendTimes'
 		}) || 0,
-        seeEnterprise: 0, // 0 个体招工 ； 企业招工
+        seeEnterprise: getStore({//用户发送短信次数
+			name:'enterprise'
+		}) || 0, // 0 个体招工 ； 企业招工
 	},
 	actions: {
 		//用户点击radio按钮
@@ -183,6 +185,10 @@ const user = {
 	mutations: {
         setEnterprise(state, val) { // 0 个体招工 ； 企业招工
             state.seeEnterprise = val;
+            setStore({
+            	name: 'enterprise',
+            	content: val,
+            })
         },
 		SET_TOKEN: (state, token) => {
 			state.token = token;
diff --git a/vue.config.js b/vue.config.js
index d942576..2fabec4 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -3,7 +3,7 @@ module.exports = {
         port: 1887,
         proxy: {
             '/api': {
-                target: 'http://10.165.0.173:8000',
+                target: 'http://192.168.1.106:8000',
                 ws: true,
                 pathRewrite: {
                     '^/api': '/'