Commit 6a8a586a authored by lei's avatar lei

Merge branch 'gaoqucodecheck' of...

Merge branch 'gaoqucodecheck' of http://h.gemho.cn:7099/zhaojunbao/gaoquyingjih5-asd into gaoqucodecheck

# Conflicts:
#	src/_check_info.js
parents 5d9a2a34 864abf51
...@@ -173,14 +173,14 @@ ...@@ -173,14 +173,14 @@
<div class="bottom_bar" v-if="flag=='ZG_XQ'"> <div class="bottom_bar" v-if="flag=='ZG_XQ'">
<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="navTo1" style="width:2rem" >提交整改</van-button> <van-button type="info" size="small" @click="add4ZG_XQ" style="width:2rem" >提交整改</van-button>
</div> </div>
</div> </div>
<div class="bottom_bar" v-if="flag=='YH_XQ'"> <div class="bottom_bar" v-if="flag=='YH_XQ'">
<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="navTo1" style="width:2rem" >拒绝</van-button> <van-button type="danger" size="small" @click="add4YH_XQ(0)" style="width:2rem" >拒绝</van-button>
<van-button type="info" size="small" @click="navTo1" style="width:2rem" >通过</van-button> <van-button type="info" size="small" @click="add4YH_XQ(1)" style="width:2rem" >通过</van-button>
</div> </div>
</div> </div>
...@@ -189,7 +189,7 @@ ...@@ -189,7 +189,7 @@
<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>
<van-button type="info" size="small" @click="navTo1" <van-button type="info" size="small" @click="add4JC_XQ"
v-show="checkPageIndex===3&&flag=='ADD'">完成检查</van-button> v-show="checkPageIndex===3&&flag=='ADD'">完成检查</van-button>
<van-button v-show="checkPageIndex<3" type="info" size="small" <van-button v-show="checkPageIndex<3" type="info" size="small"
@click="checkPageIndex++">下一项</van-button> @click="checkPageIndex++">下一项</van-button>
......
This diff is collapsed.
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