Эх сурвалжийг харах

出入管理 界面调整

zhulu 23 цаг өмнө
parent
commit
b43b5811f0

+ 1 - 0
src/assets/svg/glass.svg

@@ -0,0 +1 @@
+<svg t="1761622218825" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4747" width="200" height="200"><path d="M949.9 899l-124-124.1c28.2-33.3 51.1-70.4 68.2-110.8 22.5-53.3 34-109.9 34-168.2s-11.4-114.9-34-168.2c-21.8-51.5-52.9-97.6-92.6-137.3-39.7-39.7-85.8-70.8-137.3-92.6C610.9 75.4 554.3 64 496 64S381.1 75.4 327.8 98c-51.5 21.8-97.6 52.9-137.3 92.6-39.7 39.7-70.8 85.8-92.6 137.3C75.4 381.1 64 437.7 64 496s11.4 114.9 34 168.2c21.8 51.5 52.9 97.6 92.6 137.3 39.7 39.7 85.8 70.8 137.3 92.6 53.3 22.5 109.9 34 168.2 34s114.9-11.4 168.2-34c40.4-17.1 77.5-40 110.8-68.2l123.9 124c14 14 36.9 14 50.9 0s14-36.9 0-50.9zM496 856c-198.8 0-360-161.2-360-360s161.2-360 360-360 360 161.2 360 360-161.2 360-360 360z" fill="#e6e6e6" p-id="4748"></path><path d="M644 460H532V348c0-19.8-16.2-36-36-36s-36 16.2-36 36v112H348c-19.8 0-36 16.2-36 36s16.2 36 36 36h112v112c0 19.8 16.2 36 36 36s36-16.2 36-36V532h112c19.8 0 36-16.2 36-36s-16.2-36-36-36z" fill="#e6e6e6" p-id="4749"></path></svg>

+ 1 - 0
src/assets/svg/history.svg

@@ -0,0 +1 @@
+<svg t="1761629318102" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="6012" width="200" height="200"><path d="M511.73808594 93.19941406c-140.67070313 0-264.92695313 69.1453125-341.01035156 175.08955078v-70.47597656c0-21.66767578-17.61679688-39.22998047-39.346875-39.22998047s-39.346875 17.56318359-39.346875 39.22998047v156.91992188c0 21.66240234 17.61679688 39.22998047 39.346875 39.22998047h170.50341796c21.73007813 0 39.346875-17.56669922 39.346875-39.22998047 0-21.66767578-17.61679688-39.22998047-39.346875-39.22998047h-68.4421875c61.73085937-86.98798828 163.28496094-143.84267578 278.296875-143.84267578 188.32851562 0 341.00507812 152.22128906 341.00507813 339.99345703 0 187.76865234-152.6765625 339.99345703-341.00507813 339.99345703-158.73574219 0-291.74589844-108.29179688-329.75771484-254.70439453l-0.68291016 0.21269531c-5.3015625-15.41162109-19.54248047-26.65986328-36.8024414-26.65986328-21.73007813 0-39.346875 17.56318359-39.346875 39.22558594 0 3.86630859 1.16367187 7.36875 2.20605469 10.89316406l-0.40957032 0.12919922c0.25839844 0.95009766 0.73212891 1.8 0.99580078 2.74482422 0.28916016 0.76201172 0.48164063 1.52314453 0.81650391 2.2640625 49.92539062 175.47011719 210.98935547 304.35380859 402.98378906 304.35380859 231.79394531 0 419.69970703-187.35029297 419.69970703-418.45341797-0.00175781-231.10751953-187.90839844-418.45429688-419.70322265-418.45429687z m0 176.53183594c-21.73007813 0-39.346875 17.56318359-39.346875 39.22998047v235.37988281c0 21.66767578 17.61679688 39.22998047 39.346875 39.22998047h170.50253906c21.73007813 0 39.346875-17.56318359 39.346875-39.22558594 0-21.67119141-17.61679688-39.22998047-39.346875-39.22998047H551.08496094v-196.15429687c0-21.66767578-17.61767578-39.22998047-39.34775391-39.22998047z" p-id="6013" fill="#8a8a8a"></path></svg>

+ 2 - 2
src/router/router.config.js

@@ -517,7 +517,7 @@ export let routers = [
         path: '/new/letter',
         name: 'letter',
         component: () => import('@/views/menu/introduceLetter/letter/index.vue'),
-        meta: { title: '介绍信管理', keepAlive: false, hideTabBar: false, deep: 1 }
+        meta: { title: '出入申请', keepAlive: false, hideTabBar: false, deep: 1 }
       },
       {
         path: '/new/addletter',
@@ -553,7 +553,7 @@ export let routers = [
         path: '/new/outIn',
         name: 'outInRquest',
         component: () => import('@/views/menu/introduceLetter/outIn/index.vue'),
-        meta: { title: '出入记录管理', keepAlive: false, hideTabBar: false, deep: 1 }
+        meta: { title: '出入记', keepAlive: false, hideTabBar: false, deep: 1 }
       },
       {
         path: '/new/outIn/fillOutInInfo',

+ 6 - 4
src/views/menu/introduceLetter/letter/imageThumbnail.vue

@@ -5,14 +5,16 @@
       <div v-if="parsedImageList.length === 0" class="empty">
         <!-- 暂无图片 -->
       </div>
-      <van-image v-else :width="width" :height="height" :src="parsedImageList[0]">
+      <van-image :radius="radius" v-else :width="width" :height="height" :src="parsedImageList[0]">
         <!-- 右下角显示数量 -->
         <div v-if="parsedImageList.length > 1" slot="default" class="image-count">
           {{ parsedImageList.length}}
         </div>
          <!-- 中央:放大镜图标 -->
         <div v-if="parsedImageList.length > 0" class="image-zoom-icon">
-          <van-icon name="search" size="20px" color="#fff"/>
+          <!-- <van-icon name="search" size="30px" color="#fff" /> -->
+          <img src="../../../../assets/svg/glass.svg" width="30px" height="30px" color="#fff"/>
+          <!-- style="font-weight:800;" -->
           <!-- <van-icon name="search" size="30px" color="#fff" /> -->
         </div>
       </van-image>
@@ -47,7 +49,7 @@ import { ImagePreview } from 'vant'
       },
       radius:{
         type: String,
-        default: '0px'
+        default: '8px'
       },
       showIndicators:{
         type: Boolean,
@@ -143,7 +145,7 @@ import { ImagePreview } from 'vant'
   transform: translate(-50%, -50%);
   z-index: 2; /* 确保在图片和其他元素之上 */
   pointer-events: none; /* ✅ 关键:不阻挡点击事件 */
-  opacity: 0.6;
+  opacity: 0.4;
   /* 可选:添加背景圆圈 */
   /* background: rgba(0, 0, 0, 0.4);
   border-radius: 50%;

+ 31 - 21
src/views/menu/introduceLetter/letter/index.vue

@@ -59,7 +59,7 @@
               <div class="cert-img">
                   <ImageThumbnail
                     :image-list="user.imgFile"
-                    height="70px"
+                    height="60px"
                     width="80px"
                     radius="8px"
                     />
@@ -70,14 +70,15 @@
           </div>
 
           <div class="records" v-if="item.recentOutInRequestRecords.length > 0">
-            <div>
-                <van-icon name="label-o" class="rec-icon"/>
+            <div style="display: flex;align-items: center;">
+                <!-- <van-icon name="underway-o" class="rec-icon"/> -->
+                <img src="../../../../assets/svg/history.svg" width="15px" height="15px" class="rec-icon"/>
                 <span class="rec-text">最新申请记录</span>
             </div>
             <!-- <van-icon name="more" /> -->
             <div>
                 <!-- <van-icon size="25px" name="ellipsis" /> -->
-                <span class="entry-title" @click.stop="goOutInList()" >更多</span>
+                <span class="rec-title" @click.stop="goOutInList()" >更多</span>
             </div>
           </div>
 
@@ -86,17 +87,20 @@
               <div class="entry-left">
                 <div class="entry-title">出入名单:{{ e.userNames }}</div>
                 <div class="entry-sub">核对人:{{ e.createBy }}</div>
-                <div class="entry-time" >申请提交时间:{{ dayjs(e.createTime).format("YYYY-MM-DD HH:mm") }}</div>
-                <div class="entry-time" v-if="e.approveTime">审核时间:{{ dayjs(e.approveTime).format("YYYY-MM-DD HH:mm") }}</div>
+                <div class="entry-time" >
+                  <span>申请时间:{{ dayjs(e.createTime).format("YYYY-MM-DD HH:mm") }}</span>
+                  <span v-if="e.approveTime"> | 审核时间:{{ dayjs(e.approveTime).format("YYYY-MM-DD HH:mm") }}</span>
+                </div>
+                <!-- <div class="entry-time" v-if="e.approveTime">审核时间:{{ dayjs(e.approveTime).format("YYYY-MM-DD HH:mm") }}</div> -->
                                 
               </div>
               <div class="entry-right" @click.stop="handleOutInRequestRecordClick(e)">
                 <van-tag size="large" v-if="e.status===0" type="warning" plain>待审批</van-tag>
-                <van-tag size="large" v-else-if="e.status===1" type="warning" plain>待登记</van-tag>
+                <van-tag size="large" v-else-if="e.status===1" type="primary" plain>待登记</van-tag>
                 <van-tag size="large" v-else-if="e.status===2" type="success" plain>已完成</van-tag>
                 <van-tag size="large" v-else-if="e.status===3" type="danger" plain>已拒绝</van-tag>
-                <van-tag size="large" v-else-if="e.status===4" type="primary" plain>已逾期</van-tag>
-                <van-tag size="large" v-else-if="e.status===5" type="default" plain>已补登</van-tag>
+                <van-tag size="large" v-else-if="e.status===4" type="danger" plain>已逾期</van-tag>
+                <van-tag size="large" v-else-if="e.status===5" type="success" plain>已补登</van-tag>
               </div>
             </div>
           </div>
@@ -310,7 +314,7 @@ export default {
         margin: 0px !important;
     }
     .van-divider{
-        margin: 2.266667vw 0 !important;
+        margin: 1.266667vw 0 !important;
     }
     .van-tabs__nav--card {
     border-radius: 25px !important;
@@ -348,7 +352,7 @@ export default {
         height: 8vw;
     }
     .van-tag {
-        font-size:18px;
+      font-size:26px;
     }
     .van-tabs__nav--line.van-tabs__nav--complete
     {
@@ -401,11 +405,12 @@ export default {
   font-weight: 550;
   font-size: 30px;
   margin-bottom: 8px;
+  margin-left: 15px;
 }
 .period {
-  font-size: 28px;
+  font-size: 24px;
   color: #969799;
-  margin-bottom: 15px;
+  margin-bottom: 5px;
 }
 .certs {
   display: flex;
@@ -433,8 +438,8 @@ export default {
   /* border-radius: 10px; */
 }
 .cert-img-name{
-  font-size:28px;
-  height: 35px;
+  font-size:20px;
+  height: 25px;
   /* width: 150px;
   height: 120px; */
   /* background: #e6ebf5; */
@@ -449,14 +454,15 @@ export default {
   display: flex;
   align-items: center;
   color: #888;
-  font-size: 28px;
+  font-size: 24px;
   padding-bottom: 10px;
   border-bottom: 1px solid #f2f3f5;
   justify-content:space-between;
 }
 .rec-icon { margin-right: 4px; }
-.rec-text { font-size: 28px; }
-.entries { margin-top: 8px;margin-left: 15px; }
+.rec-text { font-size: 24px; }
+.rec-title { font-size: 24px; color: #333; }
+.entries { margin-top: 0px;margin-left: 15px; }
 .entry {
   display: flex;
   align-items: center;
@@ -464,13 +470,17 @@ export default {
   padding: 10px 0;
   border-bottom: 1px solid #f2f3f5;
 }
+.entry-right{
+  margin-bottom: 50px;
+}
 .entry:last-child { border-bottom: none; }
 .entry-title { font-size: 28px; color: #333; }
-.entry-sub { font-size: 28px; color: #999; margin-top: 8px; }
-.entry-time { font-size: 28px; color: #999; margin-top: 8px; }
+.entry-sub { font-size: 24px; color: #999; margin-top: 8px; }
+.entry-time { font-size: 20px; color: #999; margin-top: 8px; }
 
 .card-footer { 
-    margin-top: 10px; }
+    margin-top: 8px; 
+  }
 
 .fab {
   position: fixed;

+ 1 - 1
src/views/menu/introduceLetter/outIn/fillOutInInfo.vue

@@ -152,7 +152,7 @@
               v-model="outInRequestInfo.remark"
               rows="1"
               autosize
-              :maxlength="200"
+              :maxlength="150"
               placeholder="请输入备注信息"></van-field>
            
       </div>

+ 19 - 18
src/views/menu/introduceLetter/outIn/index.vue

@@ -45,23 +45,24 @@
               <div>{{ item.letterNo ==null || item.letterNo==''?"紧急出入": item.letterNo}}</div>
             </div>
 
-            <van-tag size="large" v-if="item.letterType!=3" color="rgb(216 237 220)" text-color="rgb(2 134 18)">普通</van-tag>
-            <van-tag size="large" v-if="item.letterType==3" color="#ffe1e1" text-color="#ad0000">紧急</van-tag>
+            <!-- <van-tag size="large" v-if="item.letterType!=3" color="rgb(216 237 220)" text-color="rgb(2 134 18)">普通</van-tag>
+            <van-tag size="large" v-if="item.letterType==3" color="#ffe1e1" text-color="#ad0000">紧急</van-tag> -->
 
             <van-tag size="large" v-if="item.status===0" type="warning" plain>待审批</van-tag>
-            <van-tag size="large" v-else-if="item.status===1" type="warning" plain>待登记</van-tag>
+            <van-tag size="large" v-else-if="item.status===1" type="primary" plain>待登记</van-tag>
             <van-tag size="large" v-else-if="item.status===2" type="success" plain>已完成</van-tag>
             <van-tag size="large" v-else-if="item.status===3" type="danger" plain>已拒绝</van-tag>
-            <van-tag size="large" v-else-if="item.status===4" type="primary" plain>已逾期</van-tag>
-            <van-tag size="large" v-else-if="item.status===5" type="default" plain>已补登</van-tag>
+            <van-tag size="large" v-else-if="item.status===4" type="danger" plain>已逾期</van-tag>
+            <van-tag size="large" v-else-if="item.status===5" type="success" plain>已补登</van-tag>
           </div>
           <van-divider />
           <div class="period">
-            <span>申请提交时间:{{ dayjs(item.createTime).format("YYYY-MM-DD HH:mm") }}</span>
+            <span>申请时间:{{ dayjs(item.createTime).format("YYYY-MM-DD HH:mm") }}</span>
+            <span v-if="item.approveTime"> | 审批时间:{{ dayjs(item.approveTime).format("YYYY-MM-DD HH:mm") }}</span>
           </div>
-          <div class="period" style="margin-top:10px;">
+          <!-- <div class="period" style="margin-top:10px;">
             <span style="margin-top:10px;" v-if="item.approveTime">审批时间:{{ dayjs(item.approveTime).format("YYYY-MM-DD HH:mm") }}</span>
-          </div>
+          </div> -->
           
           <div class="certs" @click.stop>
             <div class="cert-thumb" v-for="user in item.userInfos" :key="user.id">
@@ -69,7 +70,7 @@
               <div class="cert-img">
                   <ImageThumbnail
                     :image-list="user.imgFile"
-                    height="70px"
+                    height="60px"
                     width="80px"                
                     radius="8px"
                     />
@@ -247,7 +248,7 @@ export default {
         margin: 0px !important;
     }
     .van-divider{
-        margin: 2.266667vw 0 !important;
+        margin: 1.266667vw 0 !important;
     }
     .van-tabs__nav--card {
     border-radius: 25px !important;
@@ -285,7 +286,7 @@ export default {
         height: 8vw;
     }
     .van-tag {
-        font-size:18px;
+        font-size:26px;
     }
     .van-tabs__nav--line.van-tabs__nav--complete
     {
@@ -345,7 +346,7 @@ export default {
   align-items: center;
 }
 .period {
-  font-size: 28px;
+  font-size: 20px;
   color: #969799;
 }
 .certs {
@@ -381,8 +382,8 @@ export default {
   /* border-radius: 10px; */
 }
 .cert-img-name{
-  font-size:28px;
-  height: 35px;
+  font-size:20px;
+  height: 25px;
   /* width: 150px;
   height: 120px; */
   /* background: #e6ebf5; */
@@ -423,17 +424,17 @@ export default {
     display: flex;
     box-sizing: border-box;
     width: 100%;
-    padding: 2.666667vw 2.266667vw;
+    padding: 0.666667vw 0px;
     overflow: hidden;
     color: #323233;
     font-size: 3.733333vw;
-    line-height: 6.4vw;
+    line-height: 4.4vw;
     background-color: #fff;
   .item-label{
-    flex: 0.25;
+    flex: 0.20;
   }
   .item-value{
-    flex: 0.75;
+    flex: 0.8;
     position: relative;
     overflow: hidden;
     color: #969799;

+ 1 - 1
src/views/menu/visitRegister/addOutInRequest.vue

@@ -265,7 +265,7 @@ export default {
     padding: 20px;
   }
   .card-cell-box{
-    width: 60%;
+    width: 70%;
     .van-cell{
       padding: 4px;
       &::after{