Commit ccc96f73 authored by xinzhedeai's avatar xinzhedeai

fix: 隐患整改按钮显示from=shangbao;首页行业类型字段处理

parent 5ab44871
......@@ -178,8 +178,9 @@ window.onload = function() {
.deptName, // 登录用户部门name
businessAddress: result.data.merchantInfoNumVo
?.businessAddress, //
smallPlaceTypeName: result.data.merchantInfoNumVo
?.smallPlaceTypeName, //
// smallPlaceTypeName: result.data.merchantInfoNumVo
// ?.smallPlaceTypeName, //
industryTypeName: result.data.merchantInfoNumVo?.industryTypeName,
unitName: result.data.merchantInfoNumVo?.unitName, //
role: 'dudao',
roleName: result.data.roleDeptNameVo?.roleName,
......
......@@ -395,8 +395,8 @@
</div>
</div>
<!-- 待整改时,该整改按钮只用于给安全员、网格员,用于区分逾期整改逻辑 -->
<div class="bottom_bar" v-show="(flag=='0') && (userType == 'wgy' || userType=='safety')">
<!-- 待整改时,该整改按钮只用于给安全员、网格员,用于区分逾期整改逻辑 从上报页面来的都不允许整改 -->
<div class="bottom_bar" v-show="(flag=='0') && from !='shangbao' && (userType == 'wgy' || userType=='safety')">
<div style="display: flex; justify-content: center; gap: 1rem">
<van-button type="info" size="small" @click="add4DZG_XQ" style="width: 2rem">提交整改</van-button>
</div>
......
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