فهرست منبع

修改列表页展示细节

凉纪 1 سال پیش
والد
کامیت
6fe909e354

+ 3 - 3
src/components/dateCell/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="date-cell" >
-    <van-cell v-if="disabled" :title="title"  :value="isRow?label:''" :label="!isRow?label:''" />
-    <van-cell v-else :title="title" :required="required" :value="isRow?label:''" :label="!isRow?label:''"  @click="clickItem">
+    <van-cell v-if="disabled" :title="title" :value="isRow?label:''" :label="!isRow?label:''" />
+    <van-cell v-else :title="title" clickable :required="required" :value="isRow?label:''" :label="!isRow?label:''"  @click="clickItem">
       <template #right-icon>
         <van-icon name="notes-o" class="date-icon"/>
       </template>
@@ -147,7 +147,7 @@ export default {
     font-weight: 500;
     width: 42px;
     height: 6.4vw;
-    color: #008cd6;
+    color: #969799;
     font-size: 42px;
     line-height: 6.4vw;
   }

+ 11 - 4
src/views/menu/problemItem/index.vue

@@ -23,8 +23,8 @@
           :pullup="pullup">
           <empty  v-if="!dataList || dataList.length === 0" />
           <card v-else v-for="(v,i) in dataList" :key="v.id">
-              <van-cell :title="v.orgName">
-                <template #extra>
+              <van-cell class="item-title" :border="false" :title="v.orgName || ''">
+                <template #right-icon>
                   <van-button
                     style="width: 60px;"
                     v-if="v.orgId==orgId && v.confirmStatus==0"
@@ -62,7 +62,9 @@
                     详情
                   </van-button>
                 </template>
-                <template #label>
+              </van-cell>
+              <van-cell :border="false">
+                <template #default>
                   <div class="info-box">
                     <div class="info-desc">隐患描述:<span>{{v.questionDesc}}</span></div>
                     <div class="info-item">发现日期:<span>{{v.submitTime}}</span></div>
@@ -221,9 +223,13 @@ export default {
 }
 .card-list{
   padding:0 20px 20px 20px;
-  height: calc(100vh - 514px);
+  height: calc(100vh - 516px);
   overflow:  auto;
 }
+.item-title{
+  border-bottom: 1px solid #f5f5f5;
+  padding-bottom: 20px !important;
+}
 .card-num{
   display: flex;
   align-items: center;
@@ -241,6 +247,7 @@ export default {
 }
 .info-box{
   color:#555;
+  padding-top: 20px;
 }
 .info-desc{
   padding-top: 10px;

+ 13 - 1
src/views/menu/visitCheck/index.vue

@@ -30,6 +30,8 @@
           <empty  v-if="!dataList || dataList.length === 0" />
           <card v-else v-for="(v,i) in dataList" :key="v.id">
             <van-cell
+              :border="false"
+              class="item-title"
               :title-style="{color:'#008cd6'}"
               :title="`介绍信类型: ${getDictLabel(v.type,'out_in_type')}`"
               @click="clickItem(v.id)">
@@ -38,7 +40,12 @@
                     {{getDictLabel(v.approveStatus,'out_in_approve_status') }}
                   </span>
               </template>
-              <template #label>
+            </van-cell>
+
+            <van-cell
+              :border="false"
+              @click="clickItem(v.id)">
+              <template #default>
                 <div class="info-box">
                   <div v-if="v.type == 2" class="info-item">
                     <div class="item-label">介绍信编号:</div>
@@ -212,6 +219,10 @@ export default {
   height: calc(100vh - 426px);
   overflow:  auto;
 }
+.item-title{
+  border-bottom: 1px solid #f5f5f5;
+  padding-bottom: 20px !important;
+}
 .card-num{
   display: flex;
   align-items: center;
@@ -238,6 +249,7 @@ export default {
 }
 .info-box{
   color:#555;
+  padding-top:20px;
 }
 .info-desc{
   padding-top: 10px;

+ 76 - 30
src/views/menu/visitRecord/index.vue

@@ -23,45 +23,84 @@
           <empty  v-if="!dataList || dataList.length === 0"/>
           <card v-else v-for="(v,i) in dataList" :key="v.id">
             <van-cell
+              :border="false"
+              class="item-title"
               :title-style="{color:'#008cd6'}"
               :title="`介绍信类型: ${getDictLabel(v.type,'out_in_type')}`"
-            @click="clickItem(v.id)">
+              @click="clickItem(v.id)">
               <template #right-icon>
                 <van-button v-if="!v.departureTime" type="info" size="mini">登记离开时间</van-button>
-                <van-button v-else type="info" size="mini">查看登记详情</van-button>
               </template>
-            <template #label>
-              <div class="info-box">
-                <div class="info-item">
-                  <div class="item-label">人员姓名:</div>
-                  <div class="item-value"> {{v.userName}}</div>
-                </div>
-<!--                <div class="info-item">-->
-<!--                  <div class="item-label">证件号码:</div>-->
-<!--                  <div class="item-value">{{v.idCard}}</div>-->
-<!--                </div>-->
-                <div class="info-item">
-                  <div class="item-label">到达时间:</div>
-                  <div class="item-value">
-                    {{ dayjs(v.arrivalTime).format('YYYY-MM-DD HH:mm')}}
+            </van-cell>
+            <van-cell
+              :border="false"
+              class="item-value"
+              @click="clickItem(v.id)">
+              <template #default>
+                <div class="info-box">
+                  <div class="info-item">
+                    <div class="item-label">人员姓名:</div>
+                    <div class="item-value"> {{v.userName}}</div>
                   </div>
-                </div>
-                <div class="info-item">
-                  <div class="item-label">离开时间:</div>
-                  <div class="item-value">
-                    {{v.departureTime? dayjs(v.departureTime).format('YYYY-MM-DD HH:mm') : '暂无'}}
+                  <div class="info-item">
+                    <div class="item-label">到达时间:</div>
+                    <div class="item-value">
+                      {{ dayjs(v.arrivalTime).format('YYYY-MM-DD HH:mm')}}
+                    </div>
+                  </div>
+                  <div class="info-item">
+                    <div class="item-label">离开时间:</div>
+                    <div class="item-value">
+                      {{v.departureTime? dayjs(v.departureTime).format('YYYY-MM-DD HH:mm') : '暂无'}}
+                    </div>
                   </div>
                 </div>
+              </template>
+            </van-cell>
+          </card>
+
+
+<!--          <card v-else v-for="(v,i) in dataList" :key="v.id">-->
+<!--            <van-cell-->
+<!--              :title-style="{color:'#008cd6'}"-->
+<!--              :title="`介绍信类型: ${getDictLabel(v.type,'out_in_type')}`"-->
+<!--            @click="clickItem(v.id)">-->
+<!--              <template #right-icon>-->
+<!--                <van-button v-if="!v.departureTime" type="info" size="mini">登记离开时间</van-button>-->
+<!--                <van-button v-else type="info" size="mini">查看登记详情</van-button>-->
+<!--              </template>-->
+<!--              <template #label>-->
+<!--              <div class="info-box">-->
 <!--                <div class="info-item">-->
-<!--                  <div class="item-label">出入事由:</div>-->
+<!--                  <div class="item-label">人员姓名:</div>-->
+<!--                  <div class="item-value"> {{v.userName}}</div>-->
+<!--                </div>-->
+<!--&lt;!&ndash;                <div class="info-item">&ndash;&gt;-->
+<!--&lt;!&ndash;                  <div class="item-label">证件号码:</div>&ndash;&gt;-->
+<!--&lt;!&ndash;                  <div class="item-value">{{v.idCard}}</div>&ndash;&gt;-->
+<!--&lt;!&ndash;                </div>&ndash;&gt;-->
+<!--                <div class="info-item">-->
+<!--                  <div class="item-label">到达时间:</div>-->
 <!--                  <div class="item-value">-->
-<!--                    {{v.reasons}}-->
+<!--                    {{ dayjs(v.arrivalTime).format('YYYY-MM-DD HH:mm')}}-->
 <!--                  </div>-->
 <!--                </div>-->
-              </div>
-            </template>
-          </van-cell>
-          </card>
+<!--                <div class="info-item">-->
+<!--                  <div class="item-label">离开时间:</div>-->
+<!--                  <div class="item-value">-->
+<!--                    {{v.departureTime? dayjs(v.departureTime).format('YYYY-MM-DD HH:mm') : '暂无'}}-->
+<!--                  </div>-->
+<!--                </div>-->
+<!--&lt;!&ndash;                <div class="info-item">&ndash;&gt;-->
+<!--&lt;!&ndash;                  <div class="item-label">出入事由:</div>&ndash;&gt;-->
+<!--&lt;!&ndash;                  <div class="item-value">&ndash;&gt;-->
+<!--&lt;!&ndash;                    {{v.reasons}}&ndash;&gt;-->
+<!--&lt;!&ndash;                  </div>&ndash;&gt;-->
+<!--&lt;!&ndash;                </div>&ndash;&gt;-->
+<!--              </div>-->
+<!--            </template>-->
+<!--            </van-cell>-->
+<!--          </card>-->
         </Scroll>
       </div>
     </div>
@@ -80,9 +119,11 @@ import {mapGetters} from "vuex";
 import {formatDate} from "@/filters/filter";
 import DragButton from "@/components/DragButton/index.vue";
 import dayjs from "dayjs";
+import Item from "@/views/menu/protection/components/item.vue";
 export default {
   name: 'visitRecord',
   components: {
+    Item,
     DragButton,
     NavBar,
     OrgTree,
@@ -203,6 +244,10 @@ export default {
   height: calc(100vh - 426px);
   overflow:  auto;
 }
+.item-title{
+  border-bottom: 1px solid #f5f5f5;
+  padding-bottom: 20px !important;
+}
 .card-num{
   display: flex;
   align-items: center;
@@ -229,6 +274,7 @@ export default {
 }
 .info-box{
   color:#555;
+  padding-top: 20px;
 }
 .info-desc{
   padding-top: 10px;
@@ -247,17 +293,17 @@ export default {
 .info-item{
   display: flex;
   justify-content: space-between;
+  align-items: center;
   font-size: 26px;
   .item-label{
-    flex:.25;
+    flex:.23;
     text-align: left;
     color:#333;
   }
   .item-value{
-    flex:.75;
+    flex:.77;
     color:#666;
     min-height: 50px;
-    line-height: 36px;
     max-height: 250px;
     display: -webkit-box;
     -webkit-line-clamp: 3; /* 限制显示为3行 */

+ 20 - 12
src/views/menu/visitRegister/index.vue

@@ -22,20 +22,24 @@
           <empty  v-if="!dataList || dataList.length === 0" />
           <card v-else v-for="(v,i) in dataList" :key="v.id"  >
               <van-cell
+                :border="false"
+                class="item-title"
                 :title-style="{color:'#008cd6'}"
                 :title="`介绍信类型: ${getDictLabel(v.type,'out_in_type')}`"
                 @click="clickItem(v.id)">
-                <template #right-icon>
-                  <span :style="{color:getState(getDictLabel(v.approveStatus,'out_in_approve_status'))}">
-                    {{getDictLabel(v.approveStatus,'out_in_approve_status') }}
-                  </span>
-                </template>
-                <template #label>
+                  <template #right-icon>
+                    <span :style="{color:getState(getDictLabel(v.approveStatus,'out_in_approve_status'))}">
+                      {{getDictLabel(v.approveStatus,'out_in_approve_status') }}
+                    </span>
+                  </template>
+              </van-cell>
+              <van-cell :border="false" @click="clickItem(v.id)">
+                <template #default>
                   <div class="info-box">
-<!--                    <div v-if="v.type == 2" class="info-item">-->
-<!--                      <div class="item-label">介绍信编号:</div>-->
-<!--                      <div class="item-value"> {{v.letterNo}}</div>-->
-<!--                    </div>-->
+  <!--                    <div v-if="v.type == 2" class="info-item">-->
+  <!--                      <div class="item-label">介绍信编号:</div>-->
+  <!--                      <div class="item-value"> {{v.letterNo}}</div>-->
+  <!--                    </div>-->
                     <div class="info-item">
                       <div class="item-label">来访事由</div>
                       <div class="item-value">
@@ -220,6 +224,10 @@ export default {
   overflow:  auto;
 
 }
+.item-title{
+  border-bottom:1px solid #f5f5f5;
+  padding-bottom: 20px!important;
+}
 .card-num{
   display: flex;
   align-items: center;
@@ -246,11 +254,12 @@ export default {
 }
 .info-box{
   color:#555;
-  margin-top: 20px;
+  padding-top: 20px;
 }
 .info-item{
   display: flex;
   justify-content: space-between;
+  align-items: center;
   font-size: 26px;
   .item-label{
     flex:.25;
@@ -261,7 +270,6 @@ export default {
     flex:.75;
     color:#666;
     min-height: 50px;
-    line-height: 36px;
     max-height: 250px;
     display: -webkit-box;
     -webkit-line-clamp: 3; /* 限制显示为3行 */