Skip to content

G
GaoQuYingJiH5-ASD
Commit ae7cab1d authored by xinzhedeai's avatar xinzhedeai
Browse files
Options

fix：bug处理 一键驳回

parent b082f5be
Show whitespace changes
Inline Side-by-side
Showing with 127 additions and 11 deletions
src/_anquan_changshi.js
View file @ ae7cab1d
...@@ -28,7 +28,7 @@ window.addEventListener("load", function () { ...@@ -28,7 +28,7 @@ window.addEventListener("load", function () {
], ],
loading: false, loading: false,
finished: false, finished: false,
page: 0, page: 1,
size: 6, size: 6,
total: 0, total: 0,
type: '1' // 常识视频 2，3 type: '1' // 常识视频 2，3
...@@ -52,7 +52,7 @@ window.addEventListener("load", function () { ...@@ -52,7 +52,7 @@ window.addEventListener("load", function () {
}, },
reset() { reset() {
this.page = 0 this.page = 1
this.size = 6 this.size = 6
this.total = 0 this.total = 0
this.hazardList = [] this.hazardList = []
......
src/_check_info.css
View file @ ae7cab1d
...@@ -468,6 +468,39 @@ body { ...@@ -468,6 +468,39 @@ body {
color: #545454; color: #545454;
} }
/* 审批通过 */
.pass-status {
background: #FFFAFA;
border: 0.02rem solid #01b764;
/* 边框宽度2px */
padding: .12rem;
position: relative;
}
.pass-status .status-tag {
position: absolute;
right: .2rem;
top: 0.17rem;
background: #01b764;
color: #fff;
font-size: 0.24rem;
/* 标签字体24px */
padding: 0.1rem 0.12rem;
/* 标签内边距4px 12px */
border-radius: 0.04rem;
/* 标签圆角4px */
}
.pass-status>.status-content>p {
font-weight: 500;
font-size: 0.28rem;
color: #545454;
margin: .1rem;
}
/* 待审批状态 */ /* 待审批状态 */
.pending-status { .pending-status {
border: 0.02rem solid #fcd34d; border: 0.02rem solid #fcd34d;
......
src/_check_info.html
View file @ ae7cab1d
...@@ -153,6 +153,22 @@ ...@@ -153,6 +153,22 @@
</div> </div>
</div> </div>
<!-- 审核通过 -->
<div v-if="record.rectificationStatus === 1" class="pass-status">
<span class="status-tag">{{ record.rectificationStatusName }}</span>
<div class="status-content">
<p>审批日期：{{ record.reviewDate }}</p>
</div>
</div>
<!-- 审核通过且有驳回日期的则显示驳回内容 -->
<div v-if="record.rectificationStatus === 1&&record.rejectDate" class="reject-status" style="margin-top: .2rem;">
<span class="status-tag">{{ '驳回' }}</span>
<div class="status-content">
<p>驳回日期：{{ record.rejectDate }}</p>
<p>驳回原因：{{ record.rejectReason }}</p>
</div>
</div>
<!-- 待审核 --> <!-- 待审核 -->
<div v-if="record.rectificationStatus === 2" class="pending-status"> <div v-if="record.rectificationStatus === 2" class="pending-status">
<span class="status-tag">{{ record.rectificationStatusName }}</span> <span class="status-tag">{{ record.rectificationStatusName }}</span>
...@@ -231,6 +247,23 @@ ...@@ -231,6 +247,23 @@
</van-form> </van-form>
<!-- 驳回弹窗 -->
<van-action-sheet v-model="bohui.show4modal" title=" ">
<div class="content" style="padding:0.5rem 0.4rem 0.5rem; text-align: center;">
<h5 style="text-align: left;font-size: .3rem;">驳回原因</h5>
<textarea class="textareaEle" v-model="bohui.reason" name="" id="" cols="24" rows="3"
style="resize: none;"></textarea>
<div class="footer-bar">
<van-button type="info" plain size="small" @click="bohui.show4modal=false">取消</van-button>
<van-button type="info" size="small"
@click="bohui.show4modal=false;bohuiFunc();">确定</van-button>
</div>
</div>
</van-action-sheet>
<!-- 拒绝弹窗 --> <!-- 拒绝弹窗 -->
<van-action-sheet v-model="jujue.show4modal" title=" "> <van-action-sheet v-model="jujue.show4modal" title=" ">
<div class="content" style="padding:0.5rem 0.4rem 0.5rem; text-align: center;"> <div class="content" style="padding:0.5rem 0.4rem 0.5rem; text-align: center;">
...@@ -299,7 +332,7 @@ ...@@ -299,7 +332,7 @@
</van-action-sheet> --> </van-action-sheet> -->
<!-- 隐患详情底部栏 --> <!-- 隐患详情底部栏 -->
<div class="bottom_bar" v-if="flag=='3' && (userType == 'wgy' || userType=='safety')"> <div class="bottom_bar" v-if="flag=='3' && from !='shangbao' && (userType == 'wgy' || userType=='safety')">
<div> <div>
<!-- 2025年7月21日11:10:58 新增延期两次后才需要预期上报功能。 --> <!-- 2025年7月21日11:10:58 新增延期两次后才需要预期上报功能。 -->
<van-button type="primary" size="small" @click="shangbao" v-if="jujue.pushFlag">逾期上报</van-button> <van-button type="primary" size="small" @click="shangbao" v-if="jujue.pushFlag">逾期上报</van-button>
...@@ -320,6 +353,14 @@ ...@@ -320,6 +353,14 @@
</div> </div>
</div> </div>
<!-- 一键驳回功能 -->
<div class="bottom_bar" v-if="(flag=='1') && userType=='common'">
<div style="display: flex; justify-content: center; gap: 1rem">
<van-button type="info" size="small" @click="bohui.show4modal=true" style="width: 2rem">驳回</van-button>
</div>
</div>
<!-- 新增底部栏 --> <!-- 新增底部栏 -->
<div class="bottom_bar" v-if="flag=='ADD' || flag=='JC_XQ'"> <div class="bottom_bar" v-if="flag=='ADD' || flag=='JC_XQ'">
<div> <div>
......
src/_check_info.js
View file @ ae7cab1d
...@@ -98,6 +98,10 @@ window.onload = function () { ...@@ -98,6 +98,10 @@ window.onload = function () {
deptDict:[] // 列表 deptDict:[] // 列表
}, },
bohui:{
show4modal :false,
reason: '', // 拒绝原因
},
recordList: [], recordList: [],
checkDeptName: '' // 检查单位 checkDeptName: '' // 检查单位
...@@ -520,6 +524,43 @@ window.onload = function () { ...@@ -520,6 +524,43 @@ window.onload = function () {
// } // }
// }) // })
// }, // },
bohuiFunc() {
vant.Toast.loading({
message: '正在处理...',
forbidClick: true,
loadingType: 'spinner',
});
let reqParams = {
sign: 37,
"hdId": this.id,
reason: this.bohui.reason,
}
http2.post({
serviceId: API_KEY_MAP["submit"]['id'],
interfacePublicKey: API_KEY_MAP["submit"]["publicKey"],
interfacePrivateKey: API_KEY_MAP["submit"]["privateKey"],
reqParams
}, (res, type) => {
if (res) {
console.log('添加结果', res)
var result = JSON.parse(res)
if(result.code === 200){
vant.Toast({
message: '操作成功',
})
// history.back()
setTimeout(() => {
gemhoUtil.navigatePage(`${this.pageName}.html${window.location.search}`, '操作完成,跳转中...')
}, 1000);
}else{
vant.Toast({
message: '操作失败',
})
}
}
})
},
add4DZG_XQ() { add4DZG_XQ() {
console.log('整改图片', this.checkData[0]['gqCheckItemList'][0].photos) console.log('整改图片', this.checkData[0]['gqCheckItemList'][0].photos)
if (!this.checkData[0]['gqCheckItemList'][0].photos.length) { if (!this.checkData[0]['gqCheckItemList'][0].photos.length) {
......
src/_shangbao-list.js
View file @ ae7cab1d
...@@ -119,6 +119,7 @@ window.addEventListener('load', function () { ...@@ -119,6 +119,7 @@ window.addEventListener('load', function () {
...urlParams, ...urlParams,
id: item.id, id: item.id,
flag: item.rectificationStatus, flag: item.rectificationStatus,
from: 'shangbao',
pageName: '_shangbao-list', pageName: '_shangbao-list',
} }
let url = gemhoUtil.setParameter('_check_info.html', param) let url = gemhoUtil.setParameter('_check_info.html', param)
......
src/_shanghu_detail-edit.js
View file @ ae7cab1d
...@@ -9,7 +9,7 @@ window.addEventListener('load', function () { ...@@ -9,7 +9,7 @@ window.addEventListener('load', function () {
previewUrl: BASE_URL, previewUrl: BASE_URL,
loading: false, loading: false,
finished: false, finished: false,
page: 0, page: 1,
size: 9999, size: 9999,
total: 0, total: 0,
...@@ -94,7 +94,7 @@ window.addEventListener('load', function () { ...@@ -94,7 +94,7 @@ window.addEventListener('load', function () {
}, },
methods: { methods: {
reset(){ reset(){
this.page = 0 this.page = 1
this.size = 9999 this.size = 9999
this.total = 0 this.total = 0
this.consumerSuggestList = [] this.consumerSuggestList = []
......
src/_shanghu_home.html
View file @ ae7cab1d
...@@ -168,7 +168,7 @@ ...@@ -168,7 +168,7 @@
<!-- 第三行：商家和箭头 --> <!-- 第三行：商家和箭头 -->
<div style="display: flex; justify-content: space-between; align-items: center;"> <div style="display: flex; justify-content: space-between; align-items: center;">
<span style="color: #666; font-size: 0.28rem;">{{item.exerciseType == 1 ? '培训': '演练'}}人数（人）：{{ item.merName }}</span> <span style="color: #666; font-size: 0.28rem;">{{item.exerciseType == 1 ? '培训': '演练'}}人数（人）：{{ item.participantsNum }}</span>
</div> </div>
<div style="display: flex; justify-content: space-between; align-items: center;"> <div style="display: flex; justify-content: space-between; align-items: center;">
<span style="color: #666; font-size: 0.28rem;">负责人：{{ item.responsiblePerson }}</span> <span style="color: #666; font-size: 0.28rem;">负责人：{{ item.responsiblePerson }}</span>
......
src/_tezhongzuoye_detail.js
View file @ ae7cab1d
...@@ -27,11 +27,11 @@ window.addEventListener("load", function() { ...@@ -27,11 +27,11 @@ window.addEventListener("load", function() {
merchantPhone : '', merchantPhone : '',
merName: '', merName: '',
attachmentFile: [], attachmentFile: [],
workType: '1', workType: '',
companyName:'2', companyName:'',
workerName:'2', workerName:'',
startTime: '2025-07-24 09:57', // 开始时间字段 startTime: '', // 开始时间字段
endTime: '2025-07-24 10:57' // 结束时间字段 endTime: '' // 结束时间字段
}, },
id: '' id: ''
} }
......
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