Skip to content

G
GaoQuYingJiH5-ASD
Commit d5456858 authored by lei's avatar lei
Browse files
Options

Merge branch 'gaoqucodecheck' of... 

Merge branch 'gaoqucodecheck' of http://h.gemho.cn:7099/zhaojunbao/gaoquyingjih5-asd into gaoqucodecheck
parents c1fe147e cf795b7c
Show whitespace changes
Inline Side-by-side
Showing with 50 additions and 35 deletions
src/_check_info.html
View file @ d5456858
...@@ -87,22 +87,29 @@ ...@@ -87,22 +87,29 @@
</van-cell> </van-cell>
</van-cell-group> </van-cell-group>
<van-cell-group> <van-cell-group v-if="flag!='ADD'">
<van-cell v-if="flag==='JC_XQ' || flag==='YH_XQ' || flag==='ZG_XQ' "> <van-cell>
<span class="">隐患图片:</span> <span class="">隐患图片:</span>
<div> <div>
<img v-for="(imgItem, subIndex) in item.hiddenImageUrlList" :src="imgItem" alt="" style="width:1.2rem;height:1.2rem;margin-right:.2rem;" /> <img v-for="(imgItem, subIndex) in item.hiddenImageUrlList" :src="imgItem" alt="" style="width:1.2rem;height:1.2rem;margin-right:.2rem;" />
</div> </div>
</van-cell> </van-cell>
</van-cell-group>
<van-cell v-if="flag==='JC_XQ' || flag==='YH_XQ'"><span class="">整改情况:</span> <van-cell-group v-if="flag==='JC_XQ' || flag==='YZG' || flag==='3'">
<van-cell><span class="">整改情况:</span>
<div> <div>
<img v-for="(imgItem, subIndex) in item.rectificationImageUrlList" :src="imgItem" alt="" style="width:1.2rem;height:1.2rem;margin-right:.2rem;" /> <img v-for="(imgItem, subIndex) in item.rectificationImageUrlList" :src="imgItem" alt="" style="width:1.2rem;height:1.2rem;margin-right:.2rem;" />
</div> </div>
</van-cell> </van-cell>
<van-cell><span class="">整改日期:</span>
<div>
<span>{{item.rectificationDate}}</span>
</div>
</van-cell>
</van-cell-group> </van-cell-group>
<van-cell-group v-if="flag=='ZG_XQ'">
<van-cell-group v-if="flag=='0'">
<van-cell><span class="title_require">请上传整改图片:</span><span <van-cell><span class="title_require">请上传整改图片:</span><span
style="color: red;">(格式png/jpg/jpeg,最多4张)</span> style="color: red;">(格式png/jpg/jpeg,最多4张)</span>
<!-- <div> <!-- <div>
...@@ -126,14 +133,7 @@ ...@@ -126,14 +133,7 @@
<option value="5">5</option> <option value="5">5</option>
<option value="7">7</option> <option value="7">7</option>
</select> </select>
<span> 截止整改日期: <b style="color:#148ef7">{{item.deadlineDate}}</b></span> <span> 整改截止日期: <b style="color:#148ef7">{{item.deadlineDate}}</b></span>
</div>
</van-cell>
</van-cell-group>
<van-cell-group v-if="flag!=='ADD'">
<van-cell>
<div class="limit_date_wrapper">
<span>整改期限: {{item.rectificationDate}}</span>
</div> </div>
</van-cell> </van-cell>
</van-cell-group> </van-cell-group>
...@@ -147,36 +147,39 @@ ...@@ -147,36 +147,39 @@
<van-cell> <van-cell>
<van-field label="检查日期" v-model="checkDate" /> <van-field label="检查日期" v-model="checkDate" />
</van-cell> </van-cell>
<van-cell v-if="flag==='YH_XQ'||flag==='ZG_XQ'"> <van-cell v-if="flag!='ADD'">
<van-field label="整改截止日期" v-model="rectificationDeadline" /> <van-field label="整改截止日期" v-model="rectificationDeadline" />
</van-cell> </van-cell>
<van-cell v-if="flag==='YH_XQ'"> <div v-if="flag=='0' || flag=='1' || flag=='3'">
<van-cell>
<van-field label="审核日期" v-model="reviewDate" /> <van-field label="审核日期" v-model="reviewDate" />
</van-cell> </van-cell>
<van-cell v-if="flag==='YH_XQ'"> <van-cell>
<van-field label="审核记录" v-model="reviewRecord" /> <van-field label="审核记录" v-model="reviewRecord" />
</van-cell> </van-cell>
</div>
</van-form> </van-form>
<!-- 隐患详情底部栏 --> <!-- 隐患详情底部栏 -->
<!-- <div class="bottom_bar"> <!-- <div class="bottom_bar" v-if="flag=='3'">
<div> <div>
<van-button type="primary" size="small" @click="navTo1" >上报行业主管部门</van-button> <van-button type="primary" size="small" @click="navTo1" >上报行业主管部门</van-button>
<van-button type="info" size="small" @click="navTo1" >限期3天整改</van-button> <van-button type="info" size="small" @click="navTo1" >限期3天整改</van-button>
</div> </div>
</div> --> </div> -->
<div class="bottom_bar" v-if="flag=='ZG_XQ'"> <div class="bottom_bar" v-if="flag=='0'">
<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="add4ZG_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=='YH_XQ'"> <div class="bottom_bar" v-if="flag=='2'">
<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="add4YH_XQ(0)" style="width:2rem" >拒绝</van-button> <van-button type="danger" size="small" @click="add4DSH_XQ(0)" style="width:2rem" >拒绝</van-button>
<van-button type="info" size="small" @click="add4YH_XQ(1)" style="width:2rem" >通过</van-button> <van-button type="info" size="small" @click="add4DSH_XQ(1)" style="width:2rem" >通过</van-button>
</div> </div>
</div> </div>
......
src/_check_info.js
View file @ d5456858
...@@ -9,6 +9,17 @@ ...@@ -9,6 +9,17 @@
10：查询用户检查过的商户信息 10：查询用户检查过的商户信息
11: 查询商户详情信息 11: 查询商户详情信息
跳转逻辑：
新增检查单，flag=ADD，
检查单详情，flag=JC_XQ，id=记录id
待审核隐患，flag=2，id=隐患id
待整改隐患，flag=0，id=隐患id
已整改隐患，flag=1，id=隐患id
整改逾期隐患，flag=3，id=隐患id
整改状态 0：待整改 1：已整改 2：待审核 3：整改逾期
*/ */
var VUE = null var VUE = null
...@@ -66,7 +77,7 @@ window.onload = function() { ...@@ -66,7 +77,7 @@ window.onload = function() {
* flag : ADD新增、JC_XQ检查详情、ZG_XQ整改详情、YH_XQ隐患详情 * flag : ADD新增、JC_XQ检查详情、ZG_XQ整改详情、YH_XQ隐患详情
* id: 记录id || 隐患id * id: 记录id || 隐患id
* pageName: 页面名称(用于记录页面来源，用于操作后返回上一页) * pageName: 页面名称(用于记录页面来源，用于操作后返回上一页)
* * 隐患状态 0：待整改 1：已整改 2：待审核 3：整改逾期
*/ */
console.log(gemhoUtil.getParameter, 'gemhoUtil.getParameter') console.log(gemhoUtil.getParameter, 'gemhoUtil.getParameter')
this.pageName = gemhoUtil.getParameter('pageName') this.pageName = gemhoUtil.getParameter('pageName')
...@@ -74,11 +85,12 @@ window.onload = function() { ...@@ -74,11 +85,12 @@ window.onload = function() {
this.merId = gemhoUtil.getParameter('merId') this.merId = gemhoUtil.getParameter('merId')
this.flag = gemhoUtil.getParameter('flag') this.flag = gemhoUtil.getParameter('flag')
// this.flag = 'JC_XQ' // this.flag = 'JC_XQ'
// this.flag = 'ADD' // this.flag = 'ADD'
if (this.flag === 'YH_XQ') { // 隐患详情 if (this.flag == '2' || this.flag == '0'
this.getDetail4YH_XQ() || this.flag == '1' || this.flag == '3') { // 隐患详情
} else if (this.flag === 'ZG_XQ') { // 整改详情
this.getDetail4YH_XQ() this.getDetail4YH_XQ()
} else if (this.flag === 'JC_XQ') { // 检查详情 } else if (this.flag === 'JC_XQ') { // 检查详情
this.getDetail4JC_XQ() this.getDetail4JC_XQ()
...@@ -278,7 +290,7 @@ window.onload = function() { ...@@ -278,7 +290,7 @@ window.onload = function() {
vant.Toast.clear() vant.Toast.clear()
}) })
}, 0); }, 0);
console.log('接口回调数据检查详情', res) console.log('接口回调数据检查详情', JSON.parse(res))
// setTimeout(() => { // setTimeout(() => {
// this.$nextTick(() => { // this.$nextTick(() => {
// vant.Toast.clear() // vant.Toast.clear()
...@@ -302,7 +314,7 @@ window.onload = function() { ...@@ -302,7 +314,7 @@ window.onload = function() {
) )
}, 0) }, 0)
}, },
add4ZG_XQ() { add4DZG_XQ() {
if (!this.checkData.photos.length) { if (!this.checkData.photos.length) {
vant.Dialog.alert({ vant.Dialog.alert({
message: '请上传整改图片', message: '请上传整改图片',
...@@ -327,7 +339,7 @@ window.onload = function() { ...@@ -327,7 +339,7 @@ window.onload = function() {
if (!res && !type) { // 如果是中台接口返回为undefined，则重新发起请求 if (!res && !type) { // 如果是中台接口返回为undefined，则重新发起请求
vant.Toast.clear() vant.Toast.clear()
setTimeout(() => { setTimeout(() => {
this.add4ZG_XQ() this.add4DZG_XQ()
}, 0); }, 0);
return return
} }
...@@ -341,7 +353,7 @@ window.onload = function() { ...@@ -341,7 +353,7 @@ window.onload = function() {
} }
}) })
}, },
add4YH_XQ(auditStatus) { // 隐患详情 审核通过或拒绝 add4DSH_XQ(auditStatus) { // 隐患详情 审核通过或拒绝
vant.Toast.loading({ vant.Toast.loading({
message: '正在处理...', message: '正在处理...',
forbidClick: true, forbidClick: true,
...@@ -360,7 +372,7 @@ window.onload = function() { ...@@ -360,7 +372,7 @@ window.onload = function() {
if (!res && !type) { // 如果是中台接口返回为undefined，则重新发起请求 if (!res && !type) { // 如果是中台接口返回为undefined，则重新发起请求
vant.Toast.clear() vant.Toast.clear()
setTimeout(() => { setTimeout(() => {
this.add4YH_XQ() this.add4DSH_XQ()
}, 0); }, 0);
return return
} }
......
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