From 9f60edddf8c264aaffcaa19b504989cbff2001a5 Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Wed, 27 Sep 2023 17:15:43 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=AC=E7=9B=8A=E5=B2=97=E5=B2=97=E4=BD=8D?=
 =?UTF-8?q?=E5=A4=9A=E9=80=89,=E5=B1=85=E6=B0=91=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E7=9B=B8=E5=90=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/components/resiForm.vue                  | 14 +++++++++-----
 .../publicWelfarePost/addForm.vue                  |  4 ++--
 .../publicWelfarePost/publicWelfarePost.vue        | 14 +++++++-------
 3 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/src/views/components/resiForm.vue b/src/views/components/resiForm.vue
index d7578fac8..404e82f90 100644
--- a/src/views/components/resiForm.vue
+++ b/src/views/components/resiForm.vue
@@ -308,8 +308,8 @@
                     <el-select v-model="form[itemj.id][itemk.formName]"
                                :placeholder="`请选择${itemk.label}`"
                                size="small"
-                               :multiple="itemk.formName=='specialCategoryCode'"
-                               :collapse-tags="itemk.formName=='specialCategoryCode'"
+                               :multiple="itemk.multiple"
+                               :collapse-tags="itemk.collapseTags"
                                clearable
                                :style="{'width':itemk.formName=='specialCategoryCode'?'183px':''}"
                                class="u-item-width-normal">
@@ -1222,6 +1222,8 @@ export default {
             label: '人群类别',
             itemType: "select1",
             formName: "specialCategoryCode",
+            multiple:true,
+            collapseTags:true,
             opction: []
           },]
         },
@@ -1263,6 +1265,8 @@ export default {
             label: '岗位类型',
             itemType: "select1",
             formName: "jobPost",
+            multiple:true,
+            collapseTags:true,
             opction: []
           },
           ]
@@ -1529,7 +1533,7 @@ export default {
         },
         postDto: {
           hiredate: '',//入职时间
-          jobPost: '',//岗位类型
+          jobPost: [],//岗位类型
           userId: ''
         },
         birthRecordDTO: {
@@ -1770,7 +1774,7 @@ export default {
       await this.getDictData('chronic_disease_code', 'chronicDiseaseCode')
     },
     async getWelfareDict () {
-      await this.getDictData('welfare_post', 'jobPost')
+      await this.getDictData('public_welfare_post_type', 'jobPost')
     },
     async getUnemployment () {
       await this.getDictData('unemployment_cause', 'unemploymentReason')
@@ -2669,7 +2673,7 @@ export default {
         } else {
           this.form.postDto = res.data ? res.data : {
             hiredate: '',//入职时间
-            jobPost: '',	//岗位类型
+            jobPost: [],	//岗位类型
             userId: id
           }
 
diff --git a/src/views/modules/base/residentManagement/publicWelfarePost/addForm.vue b/src/views/modules/base/residentManagement/publicWelfarePost/addForm.vue
index a5bbc364e..45e85cd8f 100644
--- a/src/views/modules/base/residentManagement/publicWelfarePost/addForm.vue
+++ b/src/views/modules/base/residentManagement/publicWelfarePost/addForm.vue
@@ -155,8 +155,8 @@
                             <span>{{ formData.postTypes }}</span>
                         </div>
                         <el-form-item label-width="100px" label="岗位类型" prop="postTypes" v-else>
-                            <el-select v-model="formData.postTypes" clearable>
-                                <el-option v-for="item in dicts.public_welfare_post_type" :key="item.value"
+                            <el-select v-model="formData.postTypes" multiple collapse-tags clearable>
+                                <el-option v-for="item in dicts.public_welfare_post_type"  :key="item.value"
                                     :label="item.label" :value="item.value">
                                 </el-option>
                             </el-select>
diff --git a/src/views/modules/base/residentManagement/publicWelfarePost/publicWelfarePost.vue b/src/views/modules/base/residentManagement/publicWelfarePost/publicWelfarePost.vue
index 828a04e28..71560b313 100644
--- a/src/views/modules/base/residentManagement/publicWelfarePost/publicWelfarePost.vue
+++ b/src/views/modules/base/residentManagement/publicWelfarePost/publicWelfarePost.vue
@@ -46,6 +46,7 @@
               >
               </el-date-picker>
               <span class="u-data-tag">至</span>
+              <!-- :picker-options="endPickerOptionsBirthday" -->
               <el-date-picker
                 v-model="formData.birthdayEnd"
                 type="date"
@@ -53,7 +54,6 @@
                 value-format="yyyy-MM-dd"
                 class="u-item-width-daterange u-data-tag"
                 placeholder="结束日期"
-                :picker-options="endPickerOptionsBirthday"
               >
               </el-date-picker>
             </el-form-item>
@@ -84,7 +84,7 @@
               </el-select>
             </el-form-item>
             <el-form-item label-width="100px" label="岗位类型" prop="postTypes" >
-                <el-select v-model="formData.postTypes" clearable size="small" class="u-item-width-normal"> 
+                <el-select v-model="formData.postTypes" multiple collapse-tags clearable size="small" class="u-item-width-normal"> 
                     <el-option
                     v-for="item in dicts.public_welfare_post_type"
                     :key="item.value"
@@ -95,6 +95,7 @@
                 </el-select>
             </el-form-item>
                 <el-form-item label="入职时间">
+                  <!-- :picker-options="startPickerOptions" -->
               <el-date-picker
                 v-model="formData.hireDateFrom"
                 type="date"
@@ -102,10 +103,11 @@
                 class="u-item-width-daterange"
                 value-format="yyyy-MM-dd"
                 placeholder="开始日期"
-                :picker-options="startPickerOptions"
               >
               </el-date-picker>
               <span class="u-data-tag">至</span>
+                
+              <!-- :picker-options="endPickerOptionsBirthday" -->
               <el-date-picker
                 v-model="formData.hireDateEnd"
                 type="date"
@@ -113,7 +115,6 @@
                 value-format="yyyy-MM-dd"
                 class="u-item-width-daterange u-data-tag"
                 placeholder="结束日期"
-                :picker-options="endPickerOptionsBirthday"
               >
               </el-date-picker>
             </el-form-item>
@@ -458,10 +459,9 @@
             this.$http.post("sys/dict/data/education", {
               formCode: "resi_base_info",
             }),
-            this.$http.post("sys/dict/data/education", {
-              formCode: "public_welfare_post_type",
+            this.$http.post("sys/dict/data/dictlist", {
+              dictType: "public_welfare_post_type",
             }),
-            
           ];
           const dictKeys = ["nationList", "educationList",'public_welfare_post_type']; // 对应的键名