Commit d94ee287 authored by xinzhedeai's avatar xinzhedeai

fix:

1、检查单 逾期上报页面跳转过来的,整改功能隐藏
2、按钮显隐优化处理
parent dc566e07
...@@ -5,6 +5,10 @@ body { ...@@ -5,6 +5,10 @@ body {
letter-spacing: 0.01rem; letter-spacing: 0.01rem;
} }
.bottom_bar {
display: none;
}
/* 通用工具类 */ /* 通用工具类 */
.pd-01rem { .pd-01rem {
padding-bottom: 0.1rem; padding-bottom: 0.1rem;
...@@ -310,9 +314,9 @@ body { ...@@ -310,9 +314,9 @@ body {
.textareaEle { .textareaEle {
border: 0.01rem solid #d8d8d8; border: 0.01rem solid #d8d8d8;
border-radius: 2px; border-radius: 2px;
font-size: .28rem; font-size: 0.28rem;
width: 95%; width: 95%;
padding: .15rem; padding: 0.15rem;
} }
.content h5 { .content h5 {
...@@ -324,7 +328,7 @@ body { ...@@ -324,7 +328,7 @@ body {
.footer-bar { .footer-bar {
display: flex; display: flex;
justify-content: space-around; justify-content: space-around;
margin-top: .5rem; margin-top: 0.5rem;
} }
.footer-bar .van-button--info { .footer-bar .van-button--info {
...@@ -361,7 +365,7 @@ body { ...@@ -361,7 +365,7 @@ body {
font-size: 0.28rem; font-size: 0.28rem;
/* 标题字体32px */ /* 标题字体32px */
font-weight: bold; font-weight: bold;
color: #00B55E; color: #00b55e;
} }
.timeline-list { .timeline-list {
...@@ -441,16 +445,16 @@ body { ...@@ -441,16 +445,16 @@ body {
/* 审批拒绝状态 */ /* 审批拒绝状态 */
.reject-status { .reject-status {
background: #FFFAFA; background: #fffafa;
border: 0.02rem solid #FF7C7C; border: 0.02rem solid #ff7c7c;
/* 边框宽度2px */ /* 边框宽度2px */
padding: .1rem .24rem; padding: 0.1rem 0.24rem;
position: relative; position: relative;
} }
.reject-status .status-tag { .reject-status .status-tag {
position: absolute; position: absolute;
right: .2rem; right: 0.2rem;
top: 0.2rem; top: 0.2rem;
background: #ef4444; background: #ef4444;
color: #fff; color: #fff;
...@@ -471,16 +475,16 @@ body { ...@@ -471,16 +475,16 @@ body {
/* 审批通过 */ /* 审批通过 */
.pass-status { .pass-status {
background: #FFFAFA; background: #fffafa;
border: 0.02rem solid #01b764; border: 0.02rem solid #01b764;
/* 边框宽度2px */ /* 边框宽度2px */
padding: .12rem; padding: 0.12rem;
position: relative; position: relative;
} }
.pass-status .status-tag { .pass-status .status-tag {
position: absolute; position: absolute;
right: .2rem; right: 0.2rem;
top: 0.17rem; top: 0.17rem;
background: #01b764; background: #01b764;
color: #fff; color: #fff;
...@@ -496,11 +500,9 @@ body { ...@@ -496,11 +500,9 @@ body {
font-weight: 500; font-weight: 500;
font-size: 0.28rem; font-size: 0.28rem;
color: #545454; color: #545454;
margin: .1rem; margin: 0.1rem;
} }
/* 待审批状态 */ /* 待审批状态 */
.pending-status { .pending-status {
border: 0.02rem solid #fcd34d; border: 0.02rem solid #fcd34d;
...@@ -513,10 +515,10 @@ body { ...@@ -513,10 +515,10 @@ body {
.pending-status .status-tag { .pending-status .status-tag {
color: #fff; color: #fff;
background: #FF9415; background: #ff9415;
font-weight: 500; font-weight: 500;
font-size: 0.24rem; font-size: 0.24rem;
padding: .1rem .3rem; padding: 0.1rem 0.3rem;
} }
/* 审批通过状态 */ /* 审批通过状态 */
...@@ -526,16 +528,16 @@ body { ...@@ -526,16 +528,16 @@ body {
padding: 0.12rem; padding: 0.12rem;
align-items: center; align-items: center;
background: #f8fcfa; background: #f8fcfa;
border: 0.02rem solid #44C688; border: 0.02rem solid #44c688;
/* 边框宽度2px */ /* 边框宽度2px */
} }
.approve-status .status-tag { .approve-status .status-tag {
color: #fff; color: #fff;
background: #00B55E; background: #00b55e;
font-weight: 500; font-weight: 500;
font-size: 0.24rem; font-size: 0.24rem;
padding: .1rem .1rem; padding: 0.1rem 0.1rem;
display: inline-block; display: inline-block;
width: 1.2rem; width: 1.2rem;
text-align: center; text-align: center;
...@@ -547,20 +549,21 @@ body { ...@@ -547,20 +549,21 @@ body {
font-size: 0.28rem; font-size: 0.28rem;
color: #545454; color: #545454;
} }
/* 图片上传camera 样式 */ /* 图片上传camera 样式 */
.form-label-div { .form-label-div {
width: 100% !important; width: 100% !important;
height: 50px; height: 50px;
line-height: 50px; line-height: 50px;
padding: 0 12px; padding: 0 12px;
font-size: .28rem; font-size: 0.28rem;
font-weight: 500; font-weight: 500;
margin-bottom: -.3rem; margin-bottom: -0.3rem;
} }
.img-wrapper { .img-wrapper {
display: flex; display: flex;
gap: .16rem; gap: 0.16rem;
margin-top: 0.25rem; margin-top: 0.25rem;
margin-bottom: 0.15rem; margin-bottom: 0.15rem;
flex-wrap: wrap; flex-wrap: wrap;
...@@ -568,15 +571,23 @@ body { ...@@ -568,15 +571,23 @@ body {
/* 在现有样式中添加以下CSS */ /* 在现有样式中添加以下CSS */
.float-read-btn { .float-read-btn {
position: fixed; /* 固定定位 */ position: fixed;
right: 0.3rem; /* 右侧距离 */ /* 固定定位 */
bottom: 2.3rem; /* 底部距离 */ right: 0.3rem;
z-index: 999; /* 层级保证不被遮挡 */ /* 右侧距离 */
cursor: pointer; /* 手型光标 */ bottom: 2.3rem;
/* 底部距离 */
z-index: 999;
/* 层级保证不被遮挡 */
cursor: pointer;
/* 手型光标 */
} }
.float-read-btn .btn-text { .float-read-btn .btn-text {
font-size: 0.28rem; /* 文字大小 */ font-size: 0.28rem;
color: #FFFFFF; /* 文字颜色 */ /* 文字大小 */
line-height: 1.2; /* 行高 */ color: #ffffff;
/* 文字颜色 */
line-height: 1.2;
/* 行高 */
} }
\ No newline at end of file
...@@ -223,7 +223,7 @@ ...@@ -223,7 +223,7 @@
<!-- 隐患详情 整改图片图片上传 2025年7月31日13:07:28新增逻辑修改 --> <!-- 隐患详情 整改图片图片上传 2025年7月31日13:07:28新增逻辑修改 -->
<!-- 2025年9月1日 添加安全员和网格员提交整改权限 --> <!-- 2025年9月1日 添加安全员和网格员提交整改权限 -->
<div v-if="(flag=='0' || flag=='3') && (userType=='shop' || userType=='safety' || userType=='wgy')"> <div v-if="(flag=='0' || flag=='3') && (userType=='shop' || userType=='safety' || userType=='wgy')" && from !='shangbao'>
<div class="form-label form-label-div title_require title_requirediv"> <div class="form-label form-label-div title_require title_requirediv">
请上传整改图片:<span 请上传整改图片:<span
style="color: red">(格式png/jpg/jpeg,最多4张)</span></div> style="color: red">(格式png/jpg/jpeg,最多4张)</span></div>
...@@ -379,7 +379,7 @@ ...@@ -379,7 +379,7 @@
</van-action-sheet> --> </van-action-sheet> -->
<!-- 隐患详情底部栏 --> <!-- 隐患详情底部栏 -->
<div class="bottom_bar" v-if="flag=='3' && from !='shangbao' && (userType == 'wgy' || userType=='safety')"> <div class="bottom_bar" v-show="flag=='3' && from !='shangbao' && (userType == 'wgy' || userType=='safety')">
<div> <div>
<!-- 2025年9月1日 新增 安全员网格员 整改功能 --> <!-- 2025年9月1日 新增 安全员网格员 整改功能 -->
<van-button type="info" size="small" @click="add4DZG_XQ" style="width: 2rem">提交整改</van-button> <van-button type="info" size="small" @click="add4DZG_XQ" style="width: 2rem">提交整改</van-button>
...@@ -389,20 +389,20 @@ ...@@ -389,20 +389,20 @@
</div> </div>
</div> </div>
<!-- 该整改按钮只用于给商户权限 --> <!-- 该整改按钮只用于给商户权限 -->
<div class="bottom_bar" v-if="(flag=='0' || flag=='3') && userType=='shop'"> <div class="bottom_bar" v-show="(flag=='0' || flag=='3') && userType=='shop'">
<div style="display: flex; justify-content: center; gap: 1rem"> <div style="display: flex; justify-content: center; gap: 1rem">
<van-button type="info" size="small" @click="add4DZG_XQ" style="width: 2rem">提交整改</van-button> <van-button type="info" size="small" @click="add4DZG_XQ" style="width: 2rem">提交整改</van-button>
</div> </div>
</div> </div>
<!-- 待整改时,该整改按钮只用于给安全员、网格员,用于区分逾期整改逻辑 --> <!-- 待整改时,该整改按钮只用于给安全员、网格员,用于区分逾期整改逻辑 -->
<div class="bottom_bar" v-if="(flag=='0') && (userType == 'wgy' || userType=='safety')"> <div class="bottom_bar" v-show="(flag=='0') && (userType == 'wgy' || userType=='safety')">
<div style="display: flex; justify-content: center; gap: 1rem"> <div style="display: flex; justify-content: center; gap: 1rem">
<van-button type="info" size="small" @click="add4DZG_XQ" style="width: 2rem">提交整改</van-button> <van-button type="info" size="small" @click="add4DZG_XQ" style="width: 2rem">提交整改</van-button>
</div> </div>
</div> </div>
<div class="bottom_bar" v-if="flag=='2' && (userType == 'wgy' || userType=='safety')"> <div class="bottom_bar" v-show="flag=='2' && (userType == 'wgy' || userType=='safety')">
<div style="display: flex; justify-content: center; gap: 1rem"> <div style="display: flex; justify-content: center; gap: 1rem">
<van-button type="danger" size="small" @click="validRefuse(0)" style="width: 2rem">拒绝</van-button> <van-button type="danger" size="small" @click="validRefuse(0)" style="width: 2rem">拒绝</van-button>
<van-button type="info" size="small" @click="add4DSH_XQ(1)" style="width: 2rem">通过</van-button> <van-button type="info" size="small" @click="add4DSH_XQ(1)" style="width: 2rem">通过</van-button>
...@@ -410,7 +410,7 @@ ...@@ -410,7 +410,7 @@
</div> </div>
<!-- 一键驳回功能 --> <!-- 一键驳回功能 -->
<div class="bottom_bar" v-if="(flag=='1') && userType=='common'"> <div class="bottom_bar" v-show="(flag=='1') && userType=='common'">
<div style="display: flex; justify-content: center; gap: 1rem"> <div style="display: flex; justify-content: center; gap: 1rem">
<van-button type="info" size="small" @click="bohui.show4modal=true" style="width: 2rem">驳回</van-button> <van-button type="info" size="small" @click="bohui.show4modal=true" style="width: 2rem">驳回</van-button>
</div> </div>
...@@ -418,7 +418,7 @@ ...@@ -418,7 +418,7 @@
<!-- 新增底部栏 --> <!-- 新增底部栏 -->
<div class="bottom_bar" v-if="flag=='ADD' || flag=='JC_XQ'"> <div class="bottom_bar" v-show="flag=='ADD' || flag=='JC_XQ'">
<div> <div>
<span class="check_num">{{ notNullCount }}/{{totalItems}}</span> <span class="check_num">{{ notNullCount }}/{{totalItems}}</span>
<span class="yh_num">{{noCount}} 隐患</span> <span class="yh_num">{{noCount}} 隐患</span>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment