Browse Source

人员档案现居地添加必填效果,人员档案搜索功能优化

guoqing 2 years ago
parent
commit
17587e3514

+ 19 - 6
src/views/placeManage/placePerson/placePerson.vue

@@ -16,19 +16,19 @@
       <van-tab title="姓名查询">
         <van-search v-model="value1" show-action placeholder="请输入姓名">
           <template #action>
-            <div @click="search1">搜索</div>
+            <div @click="searchSelset">搜索</div>
           </template>
         </van-search>
       </van-tab>
       <van-tab title="身份证查询">
         <van-search v-model="value2" show-action placeholder="请输入身份证号">
           <template #action>
-            <div @click="search2">搜索</div>
+            <div @click="searchSelset">搜索</div>
           </template>
         </van-search>
       </van-tab>
     </van-tabs>
-    <div class="PersonList">
+    <div class="PersonList" v-if="show == false">
       <van-pull-refresh v-model="refreshing" @refresh="onRefresh">
         <van-list
           v-model:loading="loading"
@@ -234,6 +234,7 @@ export default {
     const finished1 = ref(false);
     let index1 = 0;
     const search1 = () => {
+      show.value = true
       loading1.value = true;
       finished1.value = false;
       new UserManage()
@@ -252,7 +253,20 @@ export default {
           index1++;
         });
     };
+    const searchSelset = ()=>{
+      if(value1.value!=''){
+        PersonList.value = [];
+        search1()
+      }
+      if(value2.value!=''){
+        PersonList.value = [];
+        search2()
+      }
+    }
     const search2 = () => {
+      show.value = true
+      loading1.value = true;
+      finished1.value = false;
       new UserManage()
         .list({
           current: 1,
@@ -279,8 +293,6 @@ export default {
       //搜索
       value1,
       value2,
-      search1,
-      search2,
       loading,
       finished,
       loading1,
@@ -293,7 +305,8 @@ export default {
       dataList,
       selectColor,
       onClickright,
-      show
+      show,
+      searchSelset
     };
   },
 };

+ 1 - 0
src/views/placeManage/placePerson/placePersonAdd.vue

@@ -261,6 +261,7 @@
         <van-field
           v-model="inputForm.currentResidence"
           center
+          required
           readonly
           label="现居地:"
           placeholder="请填写现居地"