Merge remote-tracking branch 'HS_MZAP/master'

src/views/placeManage/placePerson/placePerson.vue

@@ -12,28 +12,30 @@
     </template>
   </van-nav-bar>
   <div class="main">
-    <div class="serach">
-      <van-search
-        v-model="value"
-        show-action
-        shape="round"
-        placeholder="请输入姓名/身份证/场所名称"
-      >
-        <template #action>
-          <div>
-            <van-dropdown-menu>
-              <van-dropdown-item
-                overlay="false"
-                v-model="value1"
-                :options="option1"
-                @change="changeValue(value1)"
-              />
-            </van-dropdown-menu>
-          </div>
-        </template>
-      </van-search>
-    </div>
-
+    <van-tabs v-model:active="active">
+      <van-tab title="姓名查询">
+        <van-search
+          v-model="value1"
+          show-action
+          placeholder="请输入姓名"
+        >
+          <template #action>
+            <div @click="search1">搜索</div>
+          </template>
+        </van-search>
+      </van-tab>
+      <van-tab title="身份证号">
+        <van-search
+          v-model="value2"
+          show-action
+          placeholder="请输入身份证号"
+        >
+          <template #action>
+            <div @click="search2">搜索</div>
+          </template>
+        </van-search>
+      </van-tab>
+    </van-tabs>
     <div class="PersonList" v-if="value1 == 0 || value == ''">
       <van-pull-refresh v-model="refreshing" @refresh="onRefresh">
         <van-list
@@ -42,47 +44,54 @@
           finished-text="没有更多了"
           @load="onLoad"
         >
-          <van-swipe-cell
-            v-for="item in dataList"
-            :key="item"
-          >
+          <van-swipe-cell v-for="item in dataList" :key="item">
             <div class="PersonItem" @click="goPlacePersonInfo(item)">
               <van-row>
-              <van-col span="18">
-                <p>
-                  {{ item.name }}（<span style="color: #36a7f3">{{
-                    item.idcard
-                  }}</span
-                  >）
-                </p>
-              </van-col>
-              <van-col span="6" style="text-align: right">
-                <span v-if="item.religion == 1" style="color: #25bc5c">伊斯兰教</span>
-                <span v-if="item.religion == 2" style="color: #53b4f4">基督教</span>
-                <span v-if="item.religion == 3" style="color: #36a7f3">天主教</span>
-                <span v-if="item.religion == 4" style="color: #d7cc18">佛教</span>
-                <span v-if="item.religion == 5" style="color: #36a7f3">道教</span>
-              </van-col>
-            </van-row>
-            <van-row>
-              <van-col span="18">
-                <span style="color: #a2a2a2" v-if="item.locationName">{{
-                  item.locationName
-                }}</span>
-              </van-col>
-              <van-col
-                span="6"
-                style="
-                  text-align: right;
-                  font-size: 12px;
-                  white-space: nowrap;
-                  overflow: hidden;
-                  text-overflow: ellipsis;
-                "
-              >
-                <span>{{ item.personnelTypeName }}</span>
-              </van-col>
-            </van-row>
+                <van-col span="18">
+                  <p>
+                    {{ item.name }}（<span style="color: #36a7f3">{{
+                      item.idcard
+                    }}</span
+                    >）
+                  </p>
+                </van-col>
+                <van-col span="6" style="text-align: right">
+                  <span v-if="item.religion == 1" style="color: #25bc5c"
+                    >伊斯兰教</span
+                  >
+                  <span v-if="item.religion == 2" style="color: #53b4f4"
+                    >基督教</span
+                  >
+                  <span v-if="item.religion == 3" style="color: #36a7f3"
+                    >天主教</span
+                  >
+                  <span v-if="item.religion == 4" style="color: #d7cc18"
+                    >佛教</span
+                  >
+                  <span v-if="item.religion == 5" style="color: #36a7f3"
+                    >道教</span
+                  >
+                </van-col>
+              </van-row>
+              <van-row>
+                <van-col span="18">
+                  <span style="color: #a2a2a2" v-if="item.locationName">{{
+                    item.locationName
+                  }}</span>
+                </van-col>
+                <van-col
+                  span="6"
+                  style="
+                    text-align: right;
+                    font-size: 12px;
+                    white-space: nowrap;
+                    overflow: hidden;
+                    text-overflow: ellipsis;
+                  "
+                >
+                  <span>{{ item.personnelTypeName }}</span>
+                </van-col>
+              </van-row>
             </div>
           </van-swipe-cell>
         </van-list>
@@ -96,47 +105,54 @@
           finished-text="没有更多了"
           @load="onLoad"
         >
-          <van-swipe-cell
-            v-for="item in PersonList"
-            :key="item"
-          >
+          <van-swipe-cell v-for="item in PersonList" :key="item">
             <div class="PersonItem" @click="goPlacePersonInfo(item)">
-              <van-row >
-              <van-col span="18">
-                <p>
-                  {{ item.name }}（<span style="color: #36a7f3">{{
-                    item.idcard
-                  }}</span
-                  >）
-                </p>
-              </van-col>
-              <van-col span="6" style="text-align: right">
-                <span v-if="item.religion == 1" style="color: #25bc5c">伊斯兰教</span>
-                <span v-if="item.religion == 2" style="color: #53b4f4">基督教</span>
-                <span v-if="item.religion == 3" style="color: #36a7f3">天主教</span>
-                <span v-if="item.religion == 4" style="color: #d7cc18">佛教</span>
-                <span v-if="item.religion == 5" style="color: #36a7f3">道教</span>
-              </van-col>
-            </van-row>
-            <van-row>
-              <van-col span="18">
-                <span style="color: #a2a2a2" v-if="item.locationName">{{
-                  item.locationName
-                }}</span>
-              </van-col>
-              <van-col
-                span="6"
-                style="
-                  text-align: right;
-                  font-size: 12px;
-                  white-space: nowrap;
-                  overflow: hidden;
-                  text-overflow: ellipsis;
-                "
-              >
-                <span>{{ item.personnelTypeName }}</span>
-              </van-col>
-            </van-row>
+              <van-row>
+                <van-col span="18">
+                  <p>
+                    {{ item.name }}（<span style="color: #36a7f3">{{
+                      item.idcard
+                    }}</span
+                    >）
+                  </p>
+                </van-col>
+                <van-col span="6" style="text-align: right">
+                  <span v-if="item.religion == 1" style="color: #25bc5c"
+                    >伊斯兰教</span
+                  >
+                  <span v-if="item.religion == 2" style="color: #53b4f4"
+                    >基督教</span
+                  >
+                  <span v-if="item.religion == 3" style="color: #36a7f3"
+                    >天主教</span
+                  >
+                  <span v-if="item.religion == 4" style="color: #d7cc18"
+                    >佛教</span
+                  >
+                  <span v-if="item.religion == 5" style="color: #36a7f3"
+                    >道教</span
+                  >
+                </van-col>
+              </van-row>
+              <van-row>
+                <van-col span="18">
+                  <span style="color: #a2a2a2" v-if="item.locationName">{{
+                    item.locationName
+                  }}</span>
+                </van-col>
+                <van-col
+                  span="6"
+                  style="
+                    text-align: right;
+                    font-size: 12px;
+                    white-space: nowrap;
+                    overflow: hidden;
+                    text-overflow: ellipsis;
+                  "
+                >
+                  <span>{{ item.personnelTypeName }}</span>
+                </van-col>
+              </van-row>
             </div>
           </van-swipe-cell>
         </van-list>
@@ -167,16 +183,8 @@ export default {
       nativePlace: "",
       currentResidence: "",
     });
-    const value = ref("");
-    const value1 = ref(0);
     // 导航栏颜色
     const selectColor = ref(window.localStorage.getItem("MZ_COLOR"));
-    const option1 = [
-      { text: "搜索选择", value: 0 },
-      { text: "姓名", value: 1 },
-      { text: "身份证号", value: 2 },
-      { text: "场所名称", value: 3 },
-    ];
     let PersonList = ref([]);
     let dataList = ref([]);
     //数据获取
@@ -219,48 +227,44 @@ export default {
       router.push({
         path: "/placePersoninfo",
         query: { data: data },
-        
       });
     };
     //进入场所录入页面
     const onClickright = () => {
       router.push("/placePersonAdd");
     };
-    //宗教选择
-    const changeValue = (value2) => {
-      if (value.value != "") {
-        switch (value2) {
-          case 0:
-            PersonList.value = dataList.value;
-            break;
-          case 1:
-            dataList.value.forEach((s1) => {
-              if (s1.name == value.value) {
-                PersonList.value.push(s1);
-              }
-            });
-            break;
-          case 2:
-            dataList.value.forEach((s1) => {
-              if (s1.idcard == value.value) {
-                PersonList.value.push(s1);
-              }
-            });
-            break;
-          case 3:
-            dataList.value.forEach((s1) => {
-              if (s1.locationName == value.value) {
-                PersonList.value.push(s1);
-              }
-            });
-            break;
-          default:
-            break;
-        }
-      } else {
-        PersonList.value.splice(0, PersonList.value.length);
-      }
-    };
+    //搜索选择
+    const value1 = ref("");
+    const value2 = ref("");
+    const search1 = ()=>{
+
+    }
+    const search2 = ()=>{
+
+    }
+    // const changeValue = (value2) => {
+    //   console.log(value2, "==========================>value2");
+    //   // if(value.value != ''){
+    //   //   if(value2.value==1){
+    //   //     new UserManage().list({
+    //   //       current:1,
+    //   //       size:10000,
+    //   //       name:value
+    //   //     }).then((res)=>{
+    //   //       console.log(res);
+    //   //     })
+    //   //   }
+    //   //   if(value2.value2==2){
+    //   //     new UserManage().list({
+    //   //       current:1,
+    //   //       size:10000,
+    //   //       idcard:value
+    //   //     }).then((res)=>{
+    //   //       console.log(res);
+    //   //     })
+    //   //   }
+    //   // }
+    // };
     //返回
     const onClickLeft = () => {
       history.back();
@@ -268,16 +272,17 @@ export default {
     return {
       onClickLeft,
       searchForm,
-      value,
+      //搜索
       value1,
-      option1,
+      value2,
+      search1,
+      search2,
       loading,
       finished,
       refreshing,
       onLoad,
       onRefresh,
       goPlacePersonInfo,
-      changeValue,
       PersonList,
       dataList,
       selectColor,

src/views/placeManage/placePerson/placePersonAdd.vue

@@ -8,7 +8,6 @@
   />
   <div class="main">
     <div class="formArea">
-      <p class="miniTitle">场所信息</p>
       <van-cell-group>
         <van-field
           v-model="idTypeName"

src/views/placeManage/placeTablet/placeTablet.vue

@@ -13,18 +13,17 @@
   </van-nav-bar>
   <div class="main">
     <van-search
-      v-model="searchVal"
-      readonly="true"
-      clearable
-      show-action
+      v-model="searchName"
       shape="round"
-      placeholder="请输入场所名称"
-      label="场所名称"
+      show-action
       input-align="center"
-      @search="onSearch"
-      @cancel="onCancel"
-      @click-input="showPlace = true"
-    />
+      label="场所名称"
+      placeholder="请输入场所名称"
+    >
+      <template #action>
+        <div @click="search">搜索</div>
+      </template>
+    </van-search>
     <van-pull-refresh v-model="refreshing" @refresh="onRefresh">
       <van-list
         v-model:loading="loading"
@@ -62,6 +61,28 @@ export default {
     const TabletData = ref([]);
     // 导航栏颜色
     const selectColor = ref(window.localStorage.getItem("MZ_COLOR"));
+    
+    //搜索事件
+    const show = ref(false)
+    const searchName = ref("");
+    const searchList = ref([]);
+    const search = () => {
+      if (searchName.value != "") {
+        show.value = true;
+        // new PlaceRegister()
+        //   .searchlist({
+        //     current: 1,
+        //     size: 10000,
+        //     name: searchName.value,
+        //   })
+        //   .then(({ records }) => {
+        //     searchList.value = records;
+        //   });
+      } else {
+        show.value = false;
+        onLoad();
+      }
+    };
 
     //页面跳转以及数据传递
     let router = useRouter();
@@ -123,6 +144,11 @@ export default {
       onRefresh,
       goTabletInfo,
       selectColor,
+      //搜索
+      searchName,
+      search,
+      show,
+      searchList
     };
   },
 };