ソースを参照

人员档案以及牌位管理搜索功能完成,对各个模块页面进行细节修改

guoqing 1 年間 前
コミット
70b5fff48e

+ 16 - 27
src/views/placeManage/placePerson/placePerson.vue

@@ -36,7 +36,7 @@
         </van-search>
       </van-tab>
     </van-tabs>
-    <div class="PersonList" v-if="value1 == 0 || value == ''">
+    <div class="PersonList" v-if="value1 == '' && value2 == ''">
       <van-pull-refresh v-model="refreshing" @refresh="onRefresh">
         <van-list
           v-model:loading="loading"
@@ -97,7 +97,7 @@
         </van-list>
       </van-pull-refresh>
     </div>
-    <div class="PersonList" v-if="value1 != 0 && value != ''">
+    <div class="PersonList" v-if="value1 != '' || value2!='' ">
       <van-pull-refresh v-model="refreshing" @refresh="onRefresh">
         <van-list
           v-model:loading="loading"
@@ -237,34 +237,23 @@ export default {
     const value1 = ref("");
     const value2 = ref("");
     const search1 = ()=>{
-
+      new UserManage().list({
+            current:1,
+            size:10000,
+            name:value1.value
+          }).then((res)=>{
+            PersonList.value = res.records
+          })
     }
     const search2 = ()=>{
-
+      new UserManage().list({
+            current:1,
+            size:10000,
+            idcard:value2.value
+          }).then((res)=>{
+            PersonList.value = res.records
+          })
     }
-    // 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();

+ 10 - 4
src/views/placeManage/placeRegister/placeRegisterList.vue

@@ -243,27 +243,33 @@ html {
         float: left;
         width: 80%;
         font-size: 16px;
+        font-weight: 700;
       }
       .item_top_right {
         float: right;
         width: 20%;
-        font-size: 14px;
+        font-size: 16px;
+        color: #000000;
       }
     }
     .item_center {
       width: 100%;
-      font-size: 12px;
-      color: #808080;
+      font-size: 16px;
+      color:#a2a2a2;
       text-align: left;
+      padding: 10px 0;
       overflow: hidden;
+      
     }
     .item_down {
       overflow: hidden;
       width: 100%;
-      font-size: 12px;
+      font-size: 16px;
+      border-bottom: 1px solid 	#F5F5F5;
       .item_down_left {
         width: 70%;
         float: left;
+        color: #000000;
       }
       .item_down_right {
         width: 30%;

+ 45 - 30
src/views/placeManage/placeTablet/placeTablet.vue

@@ -17,14 +17,14 @@
       shape="round"
       show-action
       input-align="center"
-      label="场所名称"
-      placeholder="请输入场所名称"
+      label="牌位名称"
+      placeholder="请输入牌位名称"
     >
       <template #action>
         <div @click="search">搜索</div>
       </template>
     </van-search>
-    <van-pull-refresh v-model="refreshing" @refresh="onRefresh">
+    <van-pull-refresh v-if="show==true" v-model="refreshing" @refresh="onRefresh">
       <van-list
         v-model:loading="loading"
         :finished="finished"
@@ -37,10 +37,35 @@
               <div class="item_top_left">
                 {{ item.brandName }}
               </div>
-              <div class="item_top_right">¥{{ item.sacrificeExpenses }}</div>
+              <div class="item_top_right" style="color: red">¥{{ item.sacrificeExpenses }}</div>
             </div>
             <div class="item_down">
-              <div class="item_down_left">
+              <div class="item_down_left" style="color: #a2a2a2">
+                {{ item.siteName.name }}
+              </div>
+              <div class="item_down_right">场管:{{ item.siteContact }}</div>
+            </div>
+          </div>
+        </van-swipe-cell>
+      </van-list>
+    </van-pull-refresh>
+    <van-pull-refresh v-if="show==false" v-model="refreshing" @refresh="onRefresh">
+      <van-list
+        v-model:loading="loading"
+        :finished="finished"
+        finished-text="没有更多了"
+        @load="onLoad"
+      >
+        <van-swipe-cell v-for="item in searchList" :key="item">
+          <div class="list-item" @click="goTabletInfo(item)">
+            <div class="item_top">
+              <div class="item_top_left">
+                {{ item.brandName }}
+              </div>
+              <div class="item_top_right" style="color: red">¥{{ item.sacrificeExpenses }}</div>
+            </div>
+            <div class="item_down">
+              <div class="item_down_left" style="color: #a2a2a2">
                 {{ item.siteName.name }}
               </div>
               <div class="item_down_right">场管:{{ item.siteContact }}</div>
@@ -63,25 +88,18 @@ export default {
     const selectColor = ref(window.localStorage.getItem("MZ_COLOR"));
     
     //搜索事件
-    const show = ref(false)
+    const show = ref(true)
     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();
-      }
+      show.value = false
+      new TabletServer().list({
+        current:1,
+        size:10000,
+        brandName:searchName.value
+      }).then((res)=>{
+        searchList.value = res.records
+      })
     };
 
     //页面跳转以及数据传递
@@ -190,24 +208,21 @@ html {
         float: left;
         width: 80%;
         font-size: 16px;
+        font-weight: 700;
       }
       .item_top_right {
         float: right;
         width: 20%;
-        font-size: 14px;
+        font-size: 16px;
+        color: red;
       }
     }
-    .item_center {
-      width: 100%;
-      font-size: 12px;
-      color: #808080;
-      text-align: left;
-      overflow: hidden;
-    }
     .item_down {
       overflow: hidden;
       width: 100%;
-      font-size: 12px;
+      font-size: 16px;
+      padding: 5px 0;
+      border-bottom: 1px solid 	#F5F5F5;
       .item_down_left {
         width: 70%;
         float: left;

+ 1 - 1
src/views/placeManage/placeTablet/placeTabletAdd.vue

@@ -13,7 +13,7 @@
         center
         required
         label="牌位名称:"
-        placeholder="请填写证件号码"
+        placeholder="请填写牌位名称"
         input-align="right"
       />
     </van-cell-group>

+ 4 - 4
src/views/placeManage/placeTablet/placeTabletInfo.vue

@@ -46,7 +46,7 @@
             <van-col span="24">
               <van-row justify="space-between">
                 <van-field
-                  v-model="dataitem.memorialTabletHolder"
+                  v-model="dataitem.siteContact"
                   center
                   readonly
                   clearable
@@ -62,7 +62,7 @@
         <van-col span="24">
           <van-row justify="space-between">
             <van-field
-              v-model="dataitem.memorialTabletHolderPhone"
+              v-model="dataitem.contactInformation"
               center
               readonly
               clearable
@@ -76,7 +76,7 @@
         <van-col span="24">
           <van-row justify="space-between">
             <van-field
-              v-model="dataitem.contactInformation"
+              v-model="dataitem.memorialTabletHolder"
               center
               readonly
               clearable
@@ -90,7 +90,7 @@
         <van-col span="24">
           <van-row justify="space-between">
             <van-field
-              v-model="dataitem.siteContact"
+              v-model="dataitem.memorialTabletHolderPhone"
               center
               readonly
               clearable