Commit c6707226 authored by lei's avatar lei

Merge branch 'gaoqucodecheck' of...

Merge branch 'gaoqucodecheck' of http://h.gemho.cn:7099/zhaojunbao/gaoquyingjih5-asd into gaoqucodecheck
parents 7687117a 6a475d02
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
<!-- 第二层:商户图标、名称、等级、场所类型和地址 --> <!-- 第二层:商户图标、名称、等级、场所类型和地址 -->
<div <div
class="second-layer second-layer-zf" class="second-layer second-layer-zf"
v-if="userInfo.userType!=='shop'" v-if="userInfo.userType!=='sj'"
> >
<img <img
class="merchant-icon" class="merchant-icon"
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
<!-- 第二层:商户图标、名称、等级、场所类型和地址 --> <!-- 第二层:商户图标、名称、等级、场所类型和地址 -->
<div <div
class="second-layer-sj" class="second-layer-sj"
v-if="userInfo.userType=='shop'" v-if="userInfo.userType=='sj'"
> >
<div class="header"> <div class="header">
<span>商家信息</span> <span>商家信息</span>
......
window.onload = function () { window.onload = function() {
function countSelectedNo(result) { function countSelectedNo(result) {
// 获取 checkList 中 selected 为 'no' 的对象个数 // 获取 checkList 中 selected 为 'no' 的对象个数
return result.reduce((total, category) => { return result.reduce((total, category) => {
return ( return (
total + total +
category.gqCheckItemVoList.filter((item) => item.itemAnswer === 2) category.gqCheckItemVoList.filter((item) => item.itemAnswer === 2)
.length .length
) )
}, 0) }, 0)
} }
function countSelectedNotNull(result) { function countSelectedNotNull(result) {
// 获取 checkList 中 selected 不为 null 的个数 // 获取 checkList 中 selected 不为 null 的个数
return result.reduce((total, category) => { return result.reduce((total, category) => {
return ( return (
total + total +
category.gqCheckItemVoList.filter((item) => item.itemAnswer !== 0) category.gqCheckItemVoList.filter((item) => item.itemAnswer !== 0)
.length .length
) )
}, 0) }, 0)
} }
new Vue({ new Vue({
el: '#app', el: '#app',
data: { data: {
id: '', // 记录id || 隐患id id: '', // 记录id || 隐患id
pageName: '', // 页面名称(用于记录页面来源,用于操作后返回上一页) pageName: '', // 页面名称(用于记录页面来源,用于操作后返回上一页)
flag: 'ZG_XQ', // 值为ADD新增、JC_XQ检查详情、ZG_XQ整改详情、YH_XQ隐患详情 flag: 'ZG_XQ', // 值为ADD新增、JC_XQ检查详情、ZG_XQ整改详情、YH_XQ隐患详情
flag: 'ADD', flag: 'ADD',
// flag: 'JC_XQ', // flag: 'JC_XQ',
// flag: 'YH_XQ', // flag: 'YH_XQ',
deadlineOptions: ['1', '3', '5', '7'], deadlineOptions: ['1', '3', '5', '7'],
checkData: [], // 提交给后端,图片使用vant结构,base64,后端处理,不走爱山东中台。(数据量大!) checkData: [], // 提交给后端,图片使用vant结构,base64,后端处理,不走爱山东中台。(数据量大!)
originCheckData: [], originCheckData: [],
checkPageIndex: 0, checkPageIndex: 0,
noCount: 0, noCount: 0,
totalItems: 0, totalItems: 0,
notNullCount: 0, notNullCount: 0,
// 外层表单信息 // 外层表单信息
checkDate: gemhoUtil.getTargetDateYMD(), // 检查日期 checkDate: gemhoUtil.getTargetDateYMD(), // 检查日期
checkPeopleName: '', // 检查人员 checkPeopleName: '', // 检查人员
rectificationDeadline: '', // 整改截止日期 rectificationDeadline: '', // 整改截止日期
reviewDate: '', // 隐患审核日期 reviewDate: '', // 隐患审核日期
reviewRecord: '', reviewRecord: '',
}, },
mounted() { mounted() {
/** /**
* 调转该_check_info.html页面时需要传递参数 * 调转该_check_info.html页面时需要传递参数
* type : ADD新增、JC_XQ检查详情、ZG_XQ整改详情、YH_XQ隐患详情 * type : ADD新增、JC_XQ检查详情、ZG_XQ整改详情、YH_XQ隐患详情
* id: 记录id || 隐患id * id: 记录id || 隐患id
* pageName: 页面名称(用于记录页面来源,用于操作后返回上一页) * pageName: 页面名称(用于记录页面来源,用于操作后返回上一页)
* *
*/ */
// this.flag = gemhoUtil.getParameter('type') // if (type === 'YH_XQ') { // 隐患详情
// this.id = gemhoUtil.getParameter('id') // this.getDetail4YH_XQ()
// this.pageName = gemhoUtil.getParameter('pageName') // } else if (this.flag === 'ZG_XQ') { // 整改详情
// // 表单数据 // this.getDetail4YH_XQ()
// this.checkData = result.data // } else if (this.flag === 'JC_XQ') { // 检查详情
// } // this.getDetail4JC_XQ()
// } // } else if (this.flag === 'ADD') { // 新增,调用模板详情方法
// ) this.getDetail4Template()
}, // }
getDetail4JC_XQ() { },
// 检查单详情 watch: {
vant.Toast.loading({ checkData: {
message: '正在加载...', handler(newVal) {
forbidClick: true, const snapshot = JSON.parse(JSON.stringify(newVal));
loadingType: 'spinner', console.log('全量变化:', snapshot);
}) this.noCount = countSelectedNo(newVal); // selected=no 的个数
http2.post( // this.totalItems = getTotalCheckListItems(newVal); // checkList 子元素总数
{ this.notNullCount = countSelectedNotNull(newVal); // selected 不为 null 的个数
serviceId: API_KEY_MAP['no-page']['id'], },
interfacePublicKey: API_KEY_MAP['no-page']['publicKey'], deep: true
interfacePrivateKey: API_KEY_MAP['no-page']['privateKey'], }
reqParams: { },
recordId: '1', methods: {
}, getOriginMatchedItemById(id) {
}, const result = this.originCheckData[this.checkPageIndex]['gqCheckItemVoList'].find(item =>
(res) => { item.id === id) || []
if (!res) { return JSON.parse(JSON.stringify(result))
// 中台返回为undefined 重新请求 },
vant.Toast.clear() // 处理单选变化
setTimeout(() => { handleSelectionChange(val, item, index) {
this.getDetail4YH_XQ() console.log(val, item, '数据改变了前')
}, 0) const newItem = this.getOriginMatchedItemById(item.id)
return console.log(val, newItem, '数据改变了。。。。newItem')
} newItem.itemAnswer = val
if (res) { // console.log(this.checkData[this.checkPageIndex]['gqCheckItemVoList'])
console.log('接口回调数据', JSON.parse(res)) this.$set(this.checkData[this.checkPageIndex]['gqCheckItemVoList'], index, JSON.parse(JSON
setTimeout(() => { .stringify()));
this.$nextTick(() => { console.log(val, this.checkData[this.checkPageIndex]['gqCheckItemVoList'][index], '数据改变了后',
vant.Toast.clear() index)
}) },
}, 0) // 文件上传处理
var result = JSON.parse(res) handleFileUpload(file) {
this.checkDate = result.data.checkTime // 检查日期 console.log('上传文件:', file);
this.checkPeopleName = result.data.checkPeopleName // 检查人员 // 此处可添加实际文件上传逻辑
this.checkData = result.data.gqCheckTypeDtoList },
this.noCount = result.data.hiddenCount // 整改天数确认
this.notNullCount = result.data.notRectifiedCount handleDeadlineConfirm(event, item) {
this.totalItems = result.itemAllCount console.log('select选择', event.target.value)
} const value = event.target.value;
} if (value) {
) const days = parseInt(value);
}, item.deadlineDays = days;
add4ZG_XQ() { const deadlineDate = new Date();
if (!this.checkData.photos.length) { deadlineDate.setDate(deadlineDate.getDate() + days);
vant.Dialog.alert({ item.deadlineDate = this.formatDate(deadlineDate);
message: '请上传整改图片', }
}) // this.showDeadlinePicker = false;
return },
} // 日期格式化
vant.Toast.loading({ formatDate(date) {
message: '正在处理...', return `${date.getFullYear()}-${(date.getMonth() + 1).toString().padStart(2, '0')}-${date.getDate().toString().padStart(2, '0')}`;
forbidClick: true, },
loadingType: 'spinner', getDetail4Template() { // 安全检查模板初始化
}) vant.Toast.loading({
http2.post( message: '正在加载...',
{ forbidClick: true,
serviceId: API_KEY_MAP['no-page']['id'], loadingType: 'spinner',
interfacePublicKey: API_KEY_MAP['no-page']['publicKey'], });
interfacePrivateKey: API_KEY_MAP['no-page']['privateKey'], http2.post({
reqParams: { serviceId: API_KEY_MAP["no-page"]['id'],
hdId: this.id, interfacePublicKey: API_KEY_MAP["no-page"]["publicKey"],
photos: this.checkData, interfacePrivateKey: API_KEY_MAP["no-page"]["privateKey"],
}, reqParams: {}
}, }, (res) => {
(res, type) => { if (!res) { // 中台返回为undefined 重新请求
if (!res && !type) { vant.Toast.clear()
// 如果是中台接口返回为undefined,则重新发起请求 setTimeout(() => {
vant.Toast.clear() // this.getDetail4Template()
setTimeout(() => { }, 0);
this.add4ZG_XQ() return
}, 0) }
return if (res) {
} console.log('接口回调数据', JSON.parse(res))
if (res) { setTimeout(() => {
console.log('添加结果', res) this.$nextTick(() => {
vant.Toast({ vant.Toast.clear()
message: '操作成功', })
}) }, 0);
// history.back() var result = JSON.parse(res)
gemhoUtil.navigatePage( this.checkDate = result.checkDate // 检查日期
this.pageName + '.html', this.checkPeopleName = result.checkPeopleName // 检查人员
'操作完成,跳转中...' this.rectificationDeadline = result.rectificationDeadline // 整改截止日期
) this.reviewDate = result.reviewDate // 隐患审核日期
} this.reviewRecord = result.reviewRecord
} this.totalItems = result.itemAllCount,
) // 表单数据
}, this.checkData = JSON.parse(JSON.stringify(result.data))
add4YH_XQ(auditStatus) { this.originCheckData = JSON.parse(JSON.stringify(result.data))
// 隐患详情 审核通过或拒绝 }
vant.Toast.loading({ })
message: '正在处理...',
forbidClick: true,
loadingType: 'spinner',
})
http2.post(
{
serviceId: API_KEY_MAP['no-page']['id'],
interfacePublicKey: API_KEY_MAP['no-page']['publicKey'],
interfacePrivateKey: API_KEY_MAP['no-page']['privateKey'],
reqParams: {
hdId: this.id,
auditStatus,
},
},
(res, type) => {
if (!res && !type) {
// 如果是中台接口返回为undefined,则重新发起请求
vant.Toast.clear()
setTimeout(() => {
this.add4YH_XQ()
}, 0)
return
}
if (res) {
console.log('添加结果', res)
vant.Toast({
message: '操作成功',
})
// history.back()
gemhoUtil.navigatePage(
this.pageName + '.html',
'操作完成,跳转中...'
)
}
}
)
},
add4JC_XQ() {
var reqParam = {
merId: '1',
gqCheckTypeVoList: this.checkData,
}
var url = '/gq/checkRecord/safeCheckRecord'
http.post(url, reqParam).then((res) => { },
console.log('添加结果', res) getDetail4YH_XQ() { // 隐患详情
vant.Toast({ vant.Toast.loading({
message: '操作成功', message: '正在加载...',
}) forbidClick: true,
gemhoUtil.navigatePage(this.pageName + '.html', '操作完成,跳转中...') loadingType: 'spinner',
}) });
}, http2.post({
// }, serviceId: API_KEY_MAP["no-page"]['id'],
}) interfacePublicKey: API_KEY_MAP["no-page"]["publicKey"],
} interfacePrivateKey: API_KEY_MAP["no-page"]["privateKey"],
reqParams: {
"hdId": "1",
}
}, (res) => {
if (!res) { // 中台返回为undefined 重新请求
vant.Toast.clear()
setTimeout(() => {
this.getDetail4YH_XQ()
}, 0);
return
}
if (res) {
console.log('接口回调数据', JSON.parse(res))
setTimeout(() => {
this.$nextTick(() => {
vant.Toast.clear()
})
}, 0);
var result = JSON.parse(res)
this.checkDate = result.checkDate // 检查日期
this.checkPeopleName = result.checkPeopleName // 检查人员
this.rectificationDeadline = result.rectificationDeadline // 整改截止日期
this.reviewDate = result.reviewDate // 隐患审核日期
this.reviewRecord = result.reviewRecord
// 表单数据
this.checkData = result.data
}
})
},
getDetail4JC_XQ() { // 检查单详情
vant.Toast.loading({
message: '正在加载...',
forbidClick: true,
loadingType: 'spinner',
});
http2.post({
serviceId: API_KEY_MAP["no-page"]['id'],
interfacePublicKey: API_KEY_MAP["no-page"]["publicKey"],
interfacePrivateKey: API_KEY_MAP["no-page"]["privateKey"],
reqParams: {
"recordId": "1",
}
}, (res) => {
if (!res) { // 中台返回为undefined 重新请求
vant.Toast.clear()
setTimeout(() => {
this.getDetail4YH_XQ()
}, 0);
return
}
if (res) {
console.log('接口回调数据', JSON.parse(res))
setTimeout(() => {
this.$nextTick(() => {
vant.Toast.clear()
})
}, 0);
var result = JSON.parse(res)
this.checkDate = result.data.checkTime // 检查日期
this.checkPeopleName = result.data.checkPeopleName // 检查人员
this.checkData = result.data.gqCheckTypeDtoList
this.noCount = result.data.hiddenCount
this.notNullCount = result.data.notRectifiedCount
this.totalItems = result.itemAllCount
}
})
},
add4ZG_XQ() {
if (!this.checkData.photos.length) {
vant.Dialog.alert({
message: '请上传整改图片',
})
return;
}
vant.Toast.loading({
message: '正在处理...',
forbidClick: true,
loadingType: 'spinner',
});
http2.post({
serviceId: API_KEY_MAP["no-page"]['id'],
interfacePublicKey: API_KEY_MAP["no-page"]["publicKey"],
interfacePrivateKey: API_KEY_MAP["no-page"]["privateKey"],
reqParams: {
"hdId": this.id,
"photos": this.checkData,
}
}, (res, type) => {
if (!res && !type) { // 如果是中台接口返回为undefined,则重新发起请求
vant.Toast.clear()
setTimeout(() => {
this.add4ZG_XQ()
}, 0);
return
}
if (res) {
console.log('添加结果', res)
vant.Toast({
message: '操作成功',
})
// history.back()
gemhoUtil.navigatePage(this.pageName + '.html', '操作完成,跳转中...')
}
})
},
add4YH_XQ(auditStatus) { // 隐患详情 审核通过或拒绝
vant.Toast.loading({
message: '正在处理...',
forbidClick: true,
loadingType: 'spinner',
});
http2.post({
serviceId: API_KEY_MAP["no-page"]['id'],
interfacePublicKey: API_KEY_MAP["no-page"]["publicKey"],
interfacePrivateKey: API_KEY_MAP["no-page"]["privateKey"],
reqParams: {
"hdId": this.id,
auditStatus
}
}, (res, type) => {
if (!res && !type) { // 如果是中台接口返回为undefined,则重新发起请求
vant.Toast.clear()
setTimeout(() => {
this.add4YH_XQ()
}, 0);
return
}
if (res) {
console.log('添加结果', res)
vant.Toast({
message: '操作成功',
})
// history.back()
gemhoUtil.navigatePage(this.pageName + '.html', '操作完成,跳转中...')
}
})
},
add4JC_XQ() {
var reqParam = {
"merId": "1",
"gqCheckTypeVoList": this.checkData
}
var url = "/gq/checkRecord/safeCheckRecord"
http.post(url, reqParam).then((res) => {
console.log('添加结果', res)
vant.Toast({
message: '操作成功',
})
gemhoUtil.navigatePage(this.pageName + '.html', '操作完成,跳转中...')
})
}
}
});
}
\ No newline at end of file
...@@ -52,16 +52,52 @@ window.addEventListener('load', function () { ...@@ -52,16 +52,52 @@ window.addEventListener('load', function () {
}, },
computed: {}, computed: {},
mounted() { mounted() {
this.detail()
this.detail()
}, },
methods: { methods: {
detail(id) { detail(id) {
console.log('查看详情:', id) vant.Toast.loading({
// this.formData = {} // 表单赋值 message: '正在加载...',
// 这里添加跳转逻辑 forbidClick: true,
const QR_IMAGE_URL = loadingType: 'spinner',
'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAASwAAAEsAQAAAABRBrPYAAAD70lEQVR42u2az0sUYRjHn8na6SCtVFRSOIqGHQILoRQ3f3TqYNgf0EHo4NVuLsi8YynWJbYWlgKbOQR16xJ0sjSEfsDmBEUkBI4o7lFlg9ZY5ul9n/edSc2gS9C+7DAsw8xnZ+F5n+f7/HgX8G+OdahiVayKVbEqpgMWgjhYyaJ7ASsBw8DAQNw19cLEdWCD5RA8xgEzsM2AqUc6YeI+t4NRsugax0rAMRv4p4YYNwh/SryFZBZdMe7Y3AgGcmtYkTPoh9FNUwYyjiE69K3dY6GiMRIum0J467mrvlU0Fh8h3eefTGjXH3NW5WL0NCCboANWKE5+8OjmQa0XJhZaRHFkFqFaBlfs35JRpWNSkBlVFBTOSsQo+WqGgaguTCFZIa2+E5lo69JrgEXCJeoKvuJCqEu8rOKeEOymbxWMIRVRSNnWoUqDLuL8qxGGUpZVF8Btwg+D6kbQCwtFAiJlJt+O6g3yBNQKQ3JsCcilR6qmhGVMvTAqFEmjZL8jREzlX72wkBpYamMt6fB2dIJ2mMg7FMg2kIgpKwXbYqHyMSHRVFQYUfYhE8kZhVYYVYmqejTkNEbEskpPOmFqEGGKC3FSqy7dgKFemCRLstMR7Q/NnWSdrBUWgqwV1VRNpt14yKYbhijrYabGTXH7oxdGq2zIbGvKb/2aDGuGidqJzCKNQ5NSiyZsumEO+XnsAHYU16AXFs9e5PjFBjV+CU0M9cJUww6qVZctnnRy0AwjTWaygqKIRgrt0Nw+LNUBk9s31KEDVVDUGsBO4dIGU9usEOUmOYrRECOXlk9D2m91tg9LtcDUBpzMtnLFaad1Z4FR8Vi0UUU7j6p6ZNGkQies+heXKlbF/gX2tIh+0ShjCt9hT7Eb6h8GxrR72POx56u5EWOPBy1/iUFNCt9KbCownESdwCYKmxHm1LRtzs8yPw/J9wEUz7sjcBLLuSuWX+h6sQrJCNvTe2y+j83Wwn4YhGfNHGscms5dLeeXOy9swZ7vm+pf4sKQKkG6kG11Wc+qeSIHtfmN9r0JFv2o9+SUe2sp7ZiN1mT5TbYFDkAh6STqO/I/mhdfjljR20xITiynvQJYNevGXC1hn9ze+nn76JdEjN27c9mbLKYzLYfcPo4l3dH7q+Y3d4BjlnGuN35brt9rLxrZlrOpSwX82Oamx1auZRJ1x+dT/sKRGMsc7K09s8QyrR3D+VYs9jRcv7nyfSpnLfrDcx8SA57CblxkmZEmli10dPlDWOzuHoUmfJCbtfxXwezn+G2nV8udYT/LjhtJ30fYY9v2INwdb2hIFjZvr8TYjFiwNfDcIQ/XEGpITB+5M8gNu/Da9/5zt/wJ5zVLxjs6WyMAAAAASUVORK5CYII=' });
this.generateQRCode(QR_IMAGE_URL) http2.post({
serviceId: API_KEY_MAP["no-page"]['id'],
interfacePublicKey: API_KEY_MAP["no-page"]["publicKey"],
interfacePrivateKey: API_KEY_MAP["no-page"]["privateKey"],
reqParams: {
"merId": gemhoUtil.getParameter('id'),
}
}, (res) => {
if (!res) { // 中台返回为undefined 重新请求
vant.Toast.clear()
setTimeout(() => {
this.detail()
}, 0);
return
}
if (res) {
console.log('接口回调数据', JSON.parse(res))
setTimeout(() => {
this.$nextTick(() => {
vant.Toast.clear()
})
}, 0);
var result = JSON.parse(res)
this.formData = result.data
console.log('查看详情:', id)
// this.formData = {} // 表单赋值
// 这里添加跳转逻辑
const QR_IMAGE_URL =
'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAASwAAAEsAQAAAABRBrPYAAAD70lEQVR42u2az0sUYRjHn8na6SCtVFRSOIqGHQILoRQ3f3TqYNgf0EHo4NVuLsi8YynWJbYWlgKbOQR16xJ0sjSEfsDmBEUkBI4o7lFlg9ZY5ul9n/edSc2gS9C+7DAsw8xnZ+F5n+f7/HgX8G+OdahiVayKVbEqpgMWgjhYyaJ7ASsBw8DAQNw19cLEdWCD5RA8xgEzsM2AqUc6YeI+t4NRsugax0rAMRv4p4YYNwh/SryFZBZdMe7Y3AgGcmtYkTPoh9FNUwYyjiE69K3dY6GiMRIum0J467mrvlU0Fh8h3eefTGjXH3NW5WL0NCCboANWKE5+8OjmQa0XJhZaRHFkFqFaBlfs35JRpWNSkBlVFBTOSsQo+WqGgaguTCFZIa2+E5lo69JrgEXCJeoKvuJCqEu8rOKeEOymbxWMIRVRSNnWoUqDLuL8qxGGUpZVF8Btwg+D6kbQCwtFAiJlJt+O6g3yBNQKQ3JsCcilR6qmhGVMvTAqFEmjZL8jREzlX72wkBpYamMt6fB2dIJ2mMg7FMg2kIgpKwXbYqHyMSHRVFQYUfYhE8kZhVYYVYmqejTkNEbEskpPOmFqEGGKC3FSqy7dgKFemCRLstMR7Q/NnWSdrBUWgqwV1VRNpt14yKYbhijrYabGTXH7oxdGq2zIbGvKb/2aDGuGidqJzCKNQ5NSiyZsumEO+XnsAHYU16AXFs9e5PjFBjV+CU0M9cJUww6qVZctnnRy0AwjTWaygqKIRgrt0Nw+LNUBk9s31KEDVVDUGsBO4dIGU9usEOUmOYrRECOXlk9D2m91tg9LtcDUBpzMtnLFaad1Z4FR8Vi0UUU7j6p6ZNGkQies+heXKlbF/gX2tIh+0ShjCt9hT7Eb6h8GxrR72POx56u5EWOPBy1/iUFNCt9KbCownESdwCYKmxHm1LRtzs8yPw/J9wEUz7sjcBLLuSuWX+h6sQrJCNvTe2y+j83Wwn4YhGfNHGscms5dLeeXOy9swZ7vm+pf4sKQKkG6kG11Wc+qeSIHtfmN9r0JFv2o9+SUe2sp7ZiN1mT5TbYFDkAh6STqO/I/mhdfjljR20xITiynvQJYNevGXC1hn9ze+nn76JdEjN27c9mbLKYzLYfcPo4l3dH7q+Y3d4BjlnGuN35brt9rLxrZlrOpSwX82Oamx1auZRJ1x+dT/sKRGMsc7K09s8QyrR3D+VYs9jRcv7nyfSpnLfrDcx8SA57CblxkmZEmli10dPlDWOzuHoUmfJCbtfxXwezn+G2nV8udYT/LjhtJ30fYY9v2INwdb2hIFjZvr8TYjFiwNfDcIQ/XEGpITB+5M8gNu/Da9/5zt/wJ5zVLxjs6WyMAAAAASUVORK5CYII='
this.generateQRCode(QR_IMAGE_URL)
}
})
}, },
// 新增选择确认方法 // 新增选择确认方法
onConfirmType(value) { onConfirmType(value) {
......
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