Merge branch 'master' of http://123.57.226.179:8080/yin_yu820/HS_MZAP

src/views/activityMan/personList.vue

@@ -1,5 +1,25 @@
 <template>
   <div class="personList">
+    <van-cell-group>
+      <van-field v-model="personType" clearable center readonly label="人员类型:" placeholder="请选择人员类型" input-align="right"
+        right-icon="arrow-down" @click="showPerson = true" />
+      <van-popup v-model:show="showPerson" round position="bottom">
+        <van-picker title="人员类型" :columns="$dictUtils.getDictList('hs_people_type')" :columns-field-names="{
+          text: 'label',
+          value: 'value'
+        }" @cancel="showPerson = false" @confirm="getPersonType" />
+      </van-popup>
+    </van-cell-group>
+    <van-cell-group>
+      <van-field v-model="religiousType" clearable center readonly label="宗教类型:" placeholder="请选择宗教类型" input-align="right"
+        right-icon="arrow-down" @click="showPlace = true" />
+      <van-popup v-model:show="showPlace" round position="bottom">
+        <van-picker title="宗教类型" :columns="$dictUtils.getDictList('hs_religion_type')" :columns-field-names="{
+          text: 'label',
+          value: 'value'
+        }" @cancel="showPlace = false" @confirm="getType" />
+      </van-popup>
+    </van-cell-group>
     <van-search v-model="searchForm.name" clearable show-action shape="round" placeholder="请输入搜索关键词" input-align="center"
       @search="onLoad" @cancel="onCancel" />
     <van-list v-model:loading="loading" :finished="finished" finished-text="没有更多了" @load="onLoad">
@@ -47,7 +67,8 @@ export default {
       typeOfEmployees: "",
       personnelType: "",
       religion: "",
-      sjfw: [],
+      createEnd: "",
+      createBegin: "",
       nativePlace: '',
       currentResidence: '',
     })
@@ -59,7 +80,10 @@ export default {
       index = 0;
       finished.value = false;
       searchForm.value.name = ""
-      onLoad();
+      searchForm.value.religion = ""
+      searchForm.value.personnelType = ""
+      personType.value = ""
+      religiousType.value = ""
     };
     // 选择人员
     const checked = ref([]);
@@ -95,12 +119,28 @@ export default {
         return { ...searchForm.value };
       },
       (newValue, oldValue) => {
+
         if (oldValue != newValue) {
           index = 0;
+          onLoad()
         }
       },
       { deep: true }
     );
+    let showPlace = ref(false);
+    let showPerson = ref(false);
+    let religiousType = ref('');
+    let personType = ref('');
+    const getType = ({ selectedOptions }) => {
+      showPlace.value = false;
+      searchForm.value.religion = selectedOptions[0].value;
+      religiousType.value = selectedOptions[0].label
+    };
+    const getPersonType = ({ selectedOptions }) => {
+      showPerson.value = false;
+      searchForm.value.personnelType = selectedOptions[0].value;
+      personType.value = selectedOptions[0].label
+    };
     const onLoad = () => {
       if (index == 0) {
         list.value = [];
@@ -150,6 +190,12 @@ export default {
       checkboxGroup,
       // 单选
       selectes,
+      showPlace,
+      getType,
+      showPerson,
+      getPersonType,
+      religiousType,
+      personType
     };
   },
 };