From 308db212a5f32066487f398232dc20220bba328d Mon Sep 17 00:00:00 2001
From: lion <120344285@qq.com>
Date: Mon, 7 Apr 2025 14:46:22 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package_sub/pages/BatchForm/BatchForm.vue     |   3 +--
 .../IndependentRecruitment.vue                |   7 +++++++
 .../pages/RecommendForm/RecommendForm.vue     |  18 ++++++++++++++++++
 static/waterlogo.png                          | Bin 0 -> 2830 bytes
 4 files changed, 26 insertions(+), 2 deletions(-)
 create mode 100644 static/waterlogo.png

diff --git a/package_sub/pages/BatchForm/BatchForm.vue b/package_sub/pages/BatchForm/BatchForm.vue
index e98b523..a2609df 100644
--- a/package_sub/pages/BatchForm/BatchForm.vue
+++ b/package_sub/pages/BatchForm/BatchForm.vue
@@ -243,13 +243,12 @@
 <!--    <u-select v-model="isShowSchoolSelect" mode="mutil-column-auto" :list="schoolList" @confirm="schoolListConfirm" @cancel="schoolListCancel"></u-select>-->
     <u-select v-model="isShowSchoolSelect" :list="schoolList" @confirm="schoolListConfirm" @cancel="schoolListCancel"></u-select>
     <u-select v-model="isShowSpecSelect" :list="specList" @confirm="specListConfirm" @cancel="specListCancel"></u-select>
-  <watermark></watermark>
   </view>
 </template>
 
 <script>
 import zmmWatermark from '@/uni_modules/zmm-watermark/components/zmm-watermark/zmm-watermark.vue';
-import imglogo from '@/static/logo.png';
+import imglogo from '@/static/waterlogo.png';
 export default {
   components:{
 	  zmmWatermark
diff --git a/package_sub/pages/IndependentRecruitment/IndependentRecruitment.vue b/package_sub/pages/IndependentRecruitment/IndependentRecruitment.vue
index 262eeb1..b51bf9c 100644
--- a/package_sub/pages/IndependentRecruitment/IndependentRecruitment.vue
+++ b/package_sub/pages/IndependentRecruitment/IndependentRecruitment.vue
@@ -425,8 +425,15 @@ export default {
 			["middle_exam_year", "year"],
 			["name", "name"],
 			["sex", "sex"],
+			["mobile", "mobile"],
+			["school", "school"],
+			["grade", "type"],
 			["nationality", "nationality"],
 		  ]);
+		  const province = newVal['province']?newVal['province']:''
+		  const city = newVal['city']?newVal['city']:''
+		  const area = newVal['area']?newVal['area']:''
+		  this.form.address = province+city+area
 		  Array.from(keys.keys()).forEach((key) => {
 			if (newVal[key]) {
 			  this.form[keys.get(key)] = newVal[key];
diff --git a/package_sub/pages/RecommendForm/RecommendForm.vue b/package_sub/pages/RecommendForm/RecommendForm.vue
index dba86a2..6c93b70 100644
--- a/package_sub/pages/RecommendForm/RecommendForm.vue
+++ b/package_sub/pages/RecommendForm/RecommendForm.vue
@@ -410,6 +410,7 @@ export default {
           ["sex", "sex"],
           ["nationality", "nationality"],
         ]);
+
         Array.from(keys.keys()).forEach((key) => {
           if (newVal[key]) {
             this.form[keys.get(key)] = newVal[key];
@@ -457,6 +458,14 @@ export default {
       try {
         const res = await this.$u.api.area();
         this.areaList = res.list?.map((i) => ({ label: i.name, value: i.id }));
+		
+		const areaVal = this.vuex_user?(this.vuex_user['area']?this.vuex_user['area']:''):''
+		this.areaList.map(i=>{
+			if(i.label==areaVal){
+				this.form.area_id = i.value
+			}
+		})
+		console.log("this.form.area_id",this.form.area_id)
       } catch (err) {
         console.error(err);
       }
@@ -487,7 +496,16 @@ export default {
               extra: i.id,
             })),
         }));
+		
+		const schoolVal = this.vuex_user?(this.vuex_user['school']?this.vuex_user['school']:''):''
+		list.data.map(i=>{
+			if(i.name==schoolVal){
+				this.form.school_id = i.id
+				this.form.school_name = i.name
+			}
+		})
         console.log(this.schoolList);
+		
       } catch (err) {
         console.error(err);
       }
diff --git a/static/waterlogo.png b/static/waterlogo.png
new file mode 100644
index 0000000000000000000000000000000000000000..d54e445b705ec977684ce5f0a762fd896ee050d4
GIT binary patch
literal 2830
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

literal 0
HcmV?d00001