Skip to content

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

add：上报接口对接

parent e19f3fbb
Hide whitespace changes
Inline Side-by-side
Showing with 115 additions and 41 deletions
home.js
View file @ 05875aa5
......@@ -66,7 +66,7 @@ window.onload = function () {
},
{
className: 'yinhuan',
title: '隐患审核',
title: '隐患记录',
remark: '',
navTo: 'yh_check',
},
......@@ -88,12 +88,12 @@ window.onload = function () {
remark: '',
navTo: 'check_info',
},
{
className: 'shangbao',
title: '隐患上报',
remark: '',
navTo: 'shangbao-list',
},
{
className: 'shangbao',
title: '隐患上报',
remark: '',
navTo: 'shangbao-list',
},
],
// 修改默认菜单结构为最小化配置
menuList: [],
......
sdk/axios_http.js
View file @ 05875aa5
......@@ -24,19 +24,14 @@ axios.defaults.headers.common['Authorization'] =
// axios.defaults.headers.common['Authorization'] =
// 'Bearer eyJhbGciOiJlUzUxMiJ9.eyJzdWlioilxNZ92MZAzMDl00SlslmxyZ2luX3VzZXJfa2V5ljoiMEONTM1NzktNTJiMSO0N2QwLTkzNmEtMmViNWFhYzMzMTI1In0.EG_EwS7xS1jgi29Ly7WXOJBCW4DcAyOtLD4he06sV8b4i70kknNQqVAx063NpcDa5kmTFdZ6zEfPHYPfVR4dEO'
// admin账号token
// axios.defaults.headers.common['Authorization'] =
// 'Bearer eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOiJhZG1pbiIsImxvZ2luX3VzZXJfa2V5IjoiOTFmMDY4MGYtODA0My00ZTE3LTk4YmUtOGI2NWM0MzI2NGZiIn0.ygF-ObL1f-ZirqG6m7Vrrs_dXLVz-zLEcLMxUP1XVoW2Dek86THn07tzZHTMCgT5ufPNjSSGkaV9Ii4SCZ3qtw'
// wgy账号token
// axios.defaults.headers.common['Authorization'] =
// 'Bearer eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOiLlrZnmgJ3lv40iLCJsb2dpbl91c2VyX2tleSI6ImU0Y2Q2YzQ2LWEyMTAtNGIyMi1hZjAxLTliNjFiMWUyMzcxZiJ9.6IYwYIgsCV2RnnxOrtphRJIcko05AVlqyYGba3KuYE9NzKJlXcgOI-1C0tjXUg2YkJDl1YVDzLKntXEwoUSjCw'
axios.defaults.headers.common['Authorization'] =
'Bearer eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOiIxNTcyMTAzMTg4NiIsImxvZ2luX3VzZXJfa2V5IjoiNGJjY2JjYzUtNmY0Yy00ZDhlLWJiYzEtZjYzMzVlZDBlZTgwIn0.j3jEfHzeu3kklm60kKCirwwyKaWD51ABicOzxEnuFOfGe63FFqYOQ122ojAhukbInnKj4try3DjrST6wNDVjVQ'
// 'Bearer eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOiLlrZnmgJ3lv40iLCJsb2dpbl91c2VyX2tleSI6IjU3MTM1MWEyLTVhNDAtNGRhMS05ODk0LTFjMzZhNTJlMzkxMyJ9.ryYWzzcwCU2EHNYb2AQCMfP2S_rvBheuhexKV6NP-E_8BQ7vlpLAYXAB6xmuPgyAotnwzxXOcOxuopdIpbiJnQ'
// admin账号token
// axios.defaults.headers.common['Authorization'] =
// 'Bearer eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOiJhZG1pbiIsImxvZ2luX3VzZXJfa2V5IjoiOTEyODc0N2ItNGE4NC00MWRjLTg0ZGUtZTY1ODNkMzBiNDcwIn0.w_JRlifng-sUQqvGnuRFH5-wiL-1tfwI1cF7E97gjaOZ37bvRQld3120Myf9MYqLtVHUVX_vhlcBj7Kmg9exZw'
axios.defaults.headers.common['Authorization'] =
'Bearer eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOiJhZG1pbiIsImxvZ2luX3VzZXJfa2V5IjoiOTEyODc0N2ItNGE4NC00MWRjLTg0ZGUtZTY1ODNkMzBiNDcwIn0.w_JRlifng-sUQqvGnuRFH5-wiL-1tfwI1cF7E97gjaOZ37bvRQld3120Myf9MYqLtVHUVX_vhlcBj7Kmg9exZw'
// 请求拦截器
......
sdk/axios_http3.js
View file @ 05875aa5
......@@ -19,12 +19,13 @@ if (window.env == 'dev') {
// 'Bearer eyJhbGciOiJlUzUxMiJ9.eyJzdWlioilxNZ92MZAzMDl00SlslmxyZ2luX3VzZXJfa2V5ljoiMEONTM1NzktNTJiMSO0N2QwLTkzNmEtMmViNWFhYzMzMTI1In0.EG_EwS7xS1jgi29Ly7WXOJBCW4DcAyOtLD4he06sV8b4i70kknNQqVAx063NpcDa5kmTFdZ6zEfPHYPfVR4dEO'
// admin账号token
// axios.defaults.headers.common['Authorization'] =
// 'Bearer eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOiJhZG1pbiIsImxvZ2luX3VzZXJfa2V5IjoiOTEyODc0N2ItNGE4NC00MWRjLTg0ZGUtZTY1ODNkMzBiNDcwIn0.w_JRlifng-sUQqvGnuRFH5-wiL-1tfwI1cF7E97gjaOZ37bvRQld3120Myf9MYqLtVHUVX_vhlcBj7Kmg9exZw'
axios.defaults.headers.common['Authorization'] =
'Bearer eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOiJhZG1pbiIsImxvZ2luX3VzZXJfa2V5IjoiOTEyODc0N2ItNGE4NC00MWRjLTg0ZGUtZTY1ODNkMzBiNDcwIn0.w_JRlifng-sUQqvGnuRFH5-wiL-1tfwI1cF7E97gjaOZ37bvRQld3120Myf9MYqLtVHUVX_vhlcBj7Kmg9exZw'
// wgy账号token
axios.defaults.headers.common['Authorization'] =
'Bearer eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOiIxNTcyMTAzMTg4NiIsImxvZ2luX3VzZXJfa2V5IjoiNGJjY2JjYzUtNmY0Yy00ZDhlLWJiYzEtZjYzMzVlZDBlZTgwIn0.j3jEfHzeu3kklm60kKCirwwyKaWD51ABicOzxEnuFOfGe63FFqYOQ122ojAhukbInnKj4try3DjrST6wNDVjVQ'
// axios.defaults.headers.common['Authorization'] =
// 'Bearer eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOiLlrZnmgJ3lv40iLCJsb2dpbl91c2VyX2tleSI6IjU3MTM1MWEyLTVhNDAtNGRhMS05ODk0LTFjMzZhNTJlMzkxMyJ9.ryYWzzcwCU2EHNYb2AQCMfP2S_rvBheuhexKV6NP-E_8BQ7vlpLAYXAB6xmuPgyAotnwzxXOcOxuopdIpbiJnQ'
}else{
......
src/_check_info.html
View file @ 05875aa5
......@@ -233,25 +233,25 @@
</van-form>
<!-- 拒绝弹窗 -->
<van-action-sheet v-model="jujue.show4jujue" title=" ">
<van-action-sheet v-model="jujue.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="jujue.refuseContent" name="" id="" cols="24" rows="3"
style="resize: none;"></textarea>
<h5 style="text-align: left;font-size: .3rem;">上报相关部门</h5>
<van-checkbox-group v-model="jujue.dept4resuse">
<div v-for="(item, index) in 3" style="overflow: hidden;">
<van-checkbox-group v-model="jujue.dept">
<div v-for="(item, index) in jujue.deptDict" style="overflow: hidden;">
<h5 style="text-align: left;font-size: .3rem;color: #1081E3;font-weight: 500;">
标题{{index}}</h5>
<van-checkbox :key="subIndex" :name="item" shape="square" v-for="(item, subIndex) in 2">
{{ '社会事业局'+subIndex }}
{{item.name}}</h5>
<van-checkbox :key="subIndex" :name="subItem.deptId" shape="square" v-for="(subItem, subIndex) in item.children">
{{ subItem.deptName }}
</van-checkbox>
</div>
</van-checkbox-group>
<div class="footer-bar">
<van-button type="info" plain size="small" @click="jujue.show4jujue=false">取消</van-button>
<van-button type="info" size="small" @click="jujue.show4jujue=false;add4DSH_XQ(0);">确定</van-button>
<van-button type="info" plain size="small" @click="jujue.show4modal=false">取消</van-button>
<van-button type="info" size="small" @click="jujue.show4modal=false;add4DSH_XQ(0);">确定</van-button>
</div>
</div>
......@@ -264,8 +264,8 @@
text-align: left;
display: inline-block;
line-height: 1.5;
margin-bottom: 1rem;">对该商家提醒限期 3 天整改，整改截止日期 为 2025-3-25</span> <br>
<van-button type="info" size="small" @click="shangbao">&nbsp;&nbsp;确定&nbsp;&nbsp;</van-button>
margin-bottom: 1rem;">对该商家提醒限期 <b style="color: #1081e3;">3</b> 天整改，整改截止日期 为 <b style="color: #1081e3;">{{ yuqi.deadlineDate }}</b></span> <br>
<van-button type="info" size="small" @click="shangbao(1)">&nbsp;&nbsp;确定&nbsp;&nbsp;</van-button>
</div>
</van-action-sheet>
......@@ -288,7 +288,7 @@
<!-- 隐患详情底部栏 -->
<div class="bottom_bar"
v-if="flag=='3' && ['admin', 'common', 'industry', 'street', 'wgy'].includes(userType)">
v-if="flag=='3' && userType == 'wgy'">
<div>
<van-button type="primary" size="small" @click="yuqi.show4shangbao=true">上报行业主管部门</van-button>
<van-button type="info" size="small" @click="yuqi.show4yanqi=true">限期3天整改</van-button>
......
src/_check_info.js
View file @ 05875aa5
......@@ -79,12 +79,14 @@ window.onload = function () {
show4yanqi:false,
show4shangbao:false,
dept:[], // 上报部门
deadlineDate: gemhoUtil.getTargetDateYMD(3)
},
jujue:{
show4jujue :false,
show4modal :false,
pushFlag: false, // 是否推送(审核拒绝时，如果true，则显示推送弹窗)
refuseContent: '', // 拒绝原因
dept4resuse:[], // 拒绝部门
dept:[], // 拒绝部门 请求参数
deptDict:[] // 列表
},
recordList: [],
......@@ -116,6 +118,8 @@ window.onload = function () {
} else if (this.flag === 'ADD') { // 新增，调用模板详情方法
this.getDetail4Template()
}
this.getDept4jujue()
},
watch: {
checkData: {
......@@ -133,11 +137,74 @@ window.onload = function () {
}
},
methods: {
shangbao(){
getDept4jujue(param) {
http2.post({
serviceId: API_KEY_MAP["no-page"]['id'],
interfacePublicKey: API_KEY_MAP["no-page"]["publicKey"],
interfacePrivateKey: API_KEY_MAP["no-page"]["privateKey"],
reqParams: {
sign: 26, // 2次拒绝上报列表获取
}
}, (res) => {
if (!res) { // 中台返回为undefined 重新请求
vant.Toast.clear()
setTimeout(() => {
this.getDept4jujue()
}, 0);
return
}
if (res) {
setTimeout(() => {
this.$nextTick(() => {
vant.Toast.clear()
})
}, 0);
var result = JSON.parse(res)
console.log('接口回调数据getDept4jujue', JSON.parse(res))
this.jujue.deptDict4resuse = result.data
}
})
},
yanqi(){
shangbao(type){
let reqParams = {
sign: 27, // 上报
"hdId": this.id,
}
if(type){ // 为1，则是延期
reqParams.type = type
}
if(!type){ 上报
if(!this.yuqi.dept.length){
vant.Dialog.alert({
title: '信息提示',
message: '请选择要上报的部门'
})
return
}
reqParams.reportedIds = this.yuqi.dept
}
http2.post({
serviceId: API_KEY_MAP["no-page"]['id'],
interfacePublicKey: API_KEY_MAP["no-page"]["publicKey"],
interfacePrivateKey: API_KEY_MAP["no-page"]["privateKey"],
reqParams
}, (res) => {
if (!res) { // 中台返回为undefined 重新请求
vant.Toast.clear()
setTimeout(() => {
this.shangbao()
}, 0);
return
}
if (res) {
vant.Toast({
message: res.code === 200 ? '操作成功': '操作失败',
})
}
})
},
prevPage(){
this.checkPageIndex--
......@@ -446,7 +513,7 @@ window.onload = function () {
},
validRefuse(auditStatus){
if(this.jujue.pushFlag){
this.jujue.show4jujue = true
this.jujue.show4modal = true
}else{
this.add4DSH_XQ(auditStatus)
}
......@@ -457,15 +524,22 @@ window.onload = function () {
forbidClick: true,
loadingType: 'spinner',
});
let reqParams = {
sign: 8,
"hdId": this.id,
auditStatus
}
// 2025年6月18日 新增逻辑： 如果是拒绝，且需要上报，则额外添加上报参数
if(this.pushFlag && auditStatus==0){
reqParams.reason = this.reason
}
http2.post({
serviceId: API_KEY_MAP["submit"]['id'],
interfacePublicKey: API_KEY_MAP["submit"]["publicKey"],
interfacePrivateKey: API_KEY_MAP["submit"]["privateKey"],
reqParams: {
sign: 8,
"hdId": this.id,
auditStatus
}
reqParams
}, (res, type) => {
if (!res && !type) { // 如果是中台接口返回为undefined，则重新发起请求
vant.Toast.clear()
......
src/_yh_check.html
View file @ 05875aa5
......@@ -94,6 +94,9 @@
<div style="display: flex; justify-content: space-between; align-items: center;">
<span style="color: #666; font-size: 0.28rem;">商家名称：{{ item.merName }}</span>
</div>
<!-- <div v-if="userType=='shop'" style="display: flex; justify-content: space-between; align-items: center;">
<span style="color: #666; font-size: 0.28rem;">{{ item.merName }}</span>
</div> -->
</div>
</van-cell>
</van-list>
......
src/_yh_check.js
View file @ 05875aa5
......@@ -5,6 +5,7 @@ window.addEventListener('load', function () {
el: '#app',
data() {
return {
userType: gemhoUtil.getCookie('userType'),
shanghuName: '',
// 新增子Tab数据
hazardList: [
......
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