guoyuepeng
/
qa-prevention-xgf-vue
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[新增流程] 

- 企业端新增安全环保检查 三端同步流程
mengfanliang-0726-businessPerson_table
huangyuxuan 2024-09-18 11:51:25 +08:00
parent f949002ed6
commit eadba20d08
10 changed files with 106 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/hiddenUtil/safetyFlowChart.vue
View File

@ -58,7 +58,7 @@ export default {
methods: { methods: {
init(row) { init(row) {
this.SuperFlowData.dialogVisible = true this.SuperFlowData.dialogVisible = true
// this.getInformation(row) this.getInformation(row)
}, },
getInformation(row) { getInformation(row) {
this.Loading = true this.Loading = true

4
src/views/safetyenvironmental/archive/components/info.vue
View File

@ -231,7 +231,7 @@ export default {
this.iframeSrc = this.config.weburl + 'static/mapshow.html?t=' + Math.random() this.iframeSrc = this.config.weburl + 'static/mapshow.html?t=' + Math.random()
}, },
async mounted() { async mounted() {
// await this.getData() await this.getData()
}, },
methods: { methods: {
formatTime(date, column) { formatTime(date, column) {
@ -244,7 +244,7 @@ export default {
getData() { getData() {
return new Promise((resolve) => { return new Promise((resolve) => {
requestFN( requestFN(
'/safetyenvironmental/goShow', '/safetyenvironmental/V2/goShow',
{ {
INSPECTION_ID: this.$parent.INSPECTION_ID INSPECTION_ID: this.$parent.INSPECTION_ID
} }

38
src/views/safetyenvironmental/archive/components/list.vue
View File

@ -92,8 +92,8 @@
align="center"/> align="center"/>
<el-table-column type="index" label="序号" width="50" align="center" fixed="left" /> <el-table-column type="index" label="序号" width="50" align="center" fixed="left" />
<el-table-column prop="INSPECTED_DEPARTMENT_NAME" show-overflow-tooltip label="被检查单位" align="center" width="150" /> <el-table-column prop="INSPECTED_DEPARTMENT_NAME" show-overflow-tooltip label="被检查单位" align="center" width="150" />
<el-table-column prop="INSPECTION_DEPARTMENT_NAME" show-overflow-tooltip label="检查部门" align="center" width="150" /> <el-table-column prop="INSPECTION_LEADDEPARTMENT_NAME" show-overflow-tooltip label="检查部门" align="center" width="150" />
<el-table-column prop="INSPECTION_ORIGINATOR_NAME" show-overflow-tooltip label="检查发起人" align="center" /> <el-table-column prop="INSPECTION_DEPARTMENT_NAME" show-overflow-tooltip label="检查发起人" align="center" />
<!-- <el-table-column prop="INSPECTED_SITEUSER_NAME" label="被检查单位现场负责人" align="center" />--> <!-- <el-table-column prop="INSPECTED_SITEUSER_NAME" label="被检查单位现场负责人" align="center" />-->
<el-table-column prop="INSPECTION_TYPE_NAME" show-overflow-tooltip label="检查类型" align="center" /> <el-table-column prop="INSPECTION_TYPE_NAME" show-overflow-tooltip label="检查类型" align="center" />
<!-- <el-table-column prop="INSPECTION_PLACE" label="检查场所" />--> <!-- <el-table-column prop="INSPECTION_PLACE" label="检查场所" />-->
@ -210,23 +210,23 @@ export default {
/** 获取列表 */ /** 获取列表 */
getList() { getList() {
this.listLoading = true this.listLoading = true
// requestFN( requestFN(
// '/safetyenvironmental/checkList?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page, '/safetyenvironmental/checkList?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
// { {
// ...this.search, ...this.search,
// ARCHIVE_USER_ID: JSON.parse(sessionStorage.getItem('user')).USER_ID, ARCHIVE_USER_ID: JSON.parse(sessionStorage.getItem('user')).USER_ID,
// INSPECTION_TIME_START: this.search.INSPECTION_TIME[0], INSPECTION_TIME_START: this.search.INSPECTION_TIME[0],
// INSPECTION_TIME_END: this.search.INSPECTION_TIME[1] INSPECTION_TIME_END: this.search.INSPECTION_TIME[1]
// } }
// ).then((data) => { ).then((data) => {
// this.listLoading = false this.listLoading = false
// this.varList = data.varList this.varList = data.varList
// this.total = data.page.totalResult this.total = data.page.totalResult
// this.hasButton() this.hasButton()
// this.pd = data.pd this.pd = data.pd
// }).catch((e) => { }).catch((e) => {
// this.listLoading = false this.listLoading = false
// }) })
setTimeout(() => { setTimeout(() => {
this.listLoading = false this.listLoading = false

36
src/views/safetyenvironmental/inspected/components/list.vue
View File

@ -98,7 +98,7 @@
<el-table-column type="index" label="序号" width="50" align="center" fixed="left" /> <el-table-column type="index" label="序号" width="50" align="center" fixed="left" />
<el-table-column prop="INSPECTED_DEPARTMENT_NAMES" width="200" label="被检查单位" align="center" /> <el-table-column prop="INSPECTED_DEPARTMENT_NAMES" width="200" label="被检查单位" align="center" />
<el-table-column prop="INSPECTED_SITEUSER_NAME" width="200" label="被检查单位现场负责人" align="center" /> <el-table-column prop="INSPECTED_SITEUSER_NAME" width="200" label="被检查单位现场负责人" align="center" />
<el-table-column prop="INSPECTION_DEPARTMENT_NAME" width="150" label="检查部门" align="center" /> <el-table-column prop="INSPECTION_LEADDEPARTMENT_NAME" width="150" label="检查部门" align="center" />
<el-table-column prop="INSPECTION_ORIGINATOR_NAME" label="检查发起人" align="center" /> <el-table-column prop="INSPECTION_ORIGINATOR_NAME" label="检查发起人" align="center" />
<!-- <el-table-column prop="INSPECTED_SITEUSER_NAME" label="被检查单位现场负责人" align="center" />--> <!-- <el-table-column prop="INSPECTED_SITEUSER_NAME" label="被检查单位现场负责人" align="center" />-->
<el-table-column prop="INSPECTION_TYPE_NAME" label="检查类型" align="center" /> <el-table-column prop="INSPECTION_TYPE_NAME" label="检查类型" align="center" />
@ -292,22 +292,22 @@ export default {
/** 获取列表 */ /** 获取列表 */
getList() { getList() {
this.listLoading = true this.listLoading = true
// requestFN( requestFN(
// '/safetyenvironmentalexplain/list?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page, '/safetyenvironmental/V2/list?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
// { {
// ...this.search, ...this.search,
// INSPECTION_TIME_START: this.search.INSPECTION_TIME[0], INSPECTION_TIME_START: this.search.INSPECTION_TIME[0],
// INSPECTION_TIME_END: this.search.INSPECTION_TIME[1] INSPECTION_TIME_END: this.search.INSPECTION_TIME[1]
// } }
// ).then((data) => { ).then((data) => {
// this.listLoading = false this.listLoading = false
// this.varList = data.varList this.varList = data.varList
// this.total = data.page.totalResult this.total = data.page.totalResult
// this.hasButton() this.hasButton()
// this.pd = data.pd this.pd = data.pd
// }).catch((e) => { }).catch((e) => {
// this.listLoading = false this.listLoading = false
// }) })
setTimeout(() => { setTimeout(() => {
this.listLoading = false this.listLoading = false
@ -344,7 +344,7 @@ export default {
hiddenCount(INSPECTION_ID) { hiddenCount(INSPECTION_ID) {
this.listLoading = true this.listLoading = true
requestFN( requestFN(
'/safetyenvironmentalexplain/hiddencount', '/safetyenvironmental/V2/hiddencount',
{ {
INSPECTION_ID: INSPECTION_ID INSPECTION_ID: INSPECTION_ID
} }

6
src/views/safetyenvironmental/inspection/components/add.vue
View File

@ -548,8 +548,8 @@ export default {
await this.handleAdd() await this.handleAdd()
await this.getDict() await this.getDict()
await this.resetForm() await this.resetForm()
// await this.getDictTreeData() await this.getDictTreeData()
// await this.getHiddenReginTreeList() await this.getHiddenReginTreeList()
// await this.getEditMyInfo() // await this.getEditMyInfo()
await this.closeLoading(loading) await this.closeLoading(loading)
}, },
@ -1029,7 +1029,7 @@ export default {
getDictTreeData() { getDictTreeData() {
return new Promise((resolve) => { return new Promise((resolve) => {
requestFN( requestFN(
'/department/listTreeCorpDept', '/department/listzTree',
{} {}
).then((data) => { ).then((data) => {
this.treeData = this.listTransTree(JSON.parse(data.zTreeNodes), 'id', 'pId', 'nodes') this.treeData = this.listTransTree(JSON.parse(data.zTreeNodes), 'id', 'pId', 'nodes')

4
src/views/safetyenvironmental/inspection/components/info.vue
View File

@ -287,7 +287,7 @@ export default {
this.iframeSrc = this.config.weburl + 'static/mapshow.html?t=' + Math.random() this.iframeSrc = this.config.weburl + 'static/mapshow.html?t=' + Math.random()
}, },
async mounted() { async mounted() {
// await this.getData() await this.getData()
}, },
methods: { methods: {
formatTime(date, column) { formatTime(date, column) {
@ -306,7 +306,7 @@ export default {
getData() { getData() {
return new Promise((resolve) => { return new Promise((resolve) => {
requestFN( requestFN(
'/safetyenvironmental/goShow', '/safetyenvironmental/V2/goShow',
{ {
INSPECTION_ID: this.$parent.INSPECTION_ID INSPECTION_ID: this.$parent.INSPECTION_ID
} }

48
src/views/safetyenvironmental/inspection/components/list.vue
View File

@ -128,7 +128,7 @@
<el-table-column type="index" label="序号" width="50" align="center" fixed="left" /> <el-table-column type="index" label="序号" width="50" align="center" fixed="left" />
<el-table-column prop="INSPECTED_DEPARTMENT_NAMES" show-overflow-tooltip width="150" label="被检查单位" align="center" /> <el-table-column prop="INSPECTED_DEPARTMENT_NAMES" show-overflow-tooltip width="150" label="被检查单位" align="center" />
<el-table-column prop="INSPECTED_SITEUSER_NAME" show-overflow-tooltip width="150" label="被检查单位现场负责人" align="center" /> <el-table-column prop="INSPECTED_SITEUSER_NAME" show-overflow-tooltip width="150" label="被检查单位现场负责人" align="center" />
<el-table-column prop="INSPECTION_DEPARTMENT_NAME" show-overflow-tooltip width="150" label="检查部门" align="center" /> <el-table-column prop="INSPECTION_LEADDEPARTMENT_NAME" show-overflow-tooltip width="150" label="检查部门" align="center" />
<el-table-column prop="INSPECTION_ORIGINATOR_NAME" show-overflow-tooltip label="检查发起人" align="center" width="120" /> <el-table-column prop="INSPECTION_ORIGINATOR_NAME" show-overflow-tooltip label="检查发起人" align="center" width="120" />
<el-table-column prop="INSPECTION_TYPE_NAME" show-overflow-tooltip label="检查类型" align="center" /> <el-table-column prop="INSPECTION_TYPE_NAME" show-overflow-tooltip label="检查类型" align="center" />
<el-table-column prop="HIDDEN_COUNT" show-overflow-tooltip label="涉及隐患数" align="center" width="120" /> <el-table-column prop="HIDDEN_COUNT" show-overflow-tooltip label="涉及隐患数" align="center" width="120" />
@ -226,7 +226,6 @@ import waves from '@/directive/waves'
import WriteSign from '@/components/WriteSign' import WriteSign from '@/components/WriteSign'
import SelectTree from '@/components/SelectTree' import SelectTree from '@/components/SelectTree'
import safetyFlowChart from '../../../hiddenUtil/safetyFlowChart' import safetyFlowChart from '../../../hiddenUtil/safetyFlowChart'
import { inspectionList } from './../Mock'
export default { export default {
components: { Pagination, WriteSign, safetyFlowChart, SelectTree }, components: { Pagination, WriteSign, safetyFlowChart, SelectTree },
@ -235,7 +234,7 @@ export default {
return { return {
userInfo: JSON.parse(sessionStorage.getItem('user')), userInfo: JSON.parse(sessionStorage.getItem('user')),
listLoading: false, listLoading: false,
add: false, add: true,
del: false, del: false,
edit: false, edit: false,
INSPECT_NAME: '安全环保总数：', INSPECT_NAME: '安全环保总数：',
@ -360,29 +359,24 @@ export default {
/** 获取列表 */ /** 获取列表 */
getList() { getList() {
this.listLoading = true this.listLoading = true
// requestFN( requestFN(
// '/safetyenvironmental/list?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page, '/safetyenvironmental/V2/list?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
// { {
// ...this.search, ...this.search,
// INSPECTION_TIME_START: this.search.INSPECTION_TIME[0], INSPECTION_TIME_START: this.search.INSPECTION_TIME[0],
// INSPECTION_TIME_END: this.search.INSPECTION_TIME[1] INSPECTION_TIME_END: this.search.INSPECTION_TIME[1]
// } }
// ).then((data) => { ).then((data) => {
// this.listLoading = false
// this.varList = data.varList
// this.safetyTotal = data.safetyTotal
// this.hiddenTotal = data.hiddenTotal
// this.total = data.page.totalResult
// this.hasButton()
// this.pd = data.pd
// }).catch((e) => {
// this.listLoading = false
// })
setTimeout(() => {
this.listLoading = false this.listLoading = false
this.varList = inspectionList this.varList = data.varList
this.total = inspectionList.length this.safetyTotal = data.safetyTotal
}, 400) this.hiddenTotal = data.hiddenTotal
this.total = data.page.totalResult
this.hasButton()
this.pd = data.pd
}).catch((e) => {
this.listLoading = false
})
}, },
/** 新建检查 */ /** 新建检查 */
handleAdd() { handleAdd() {
@ -398,6 +392,7 @@ export default {
goDetail(row) { goDetail(row) {
this.$parent.activeName = 'Info' this.$parent.activeName = 'Info'
this.$parent.INSPECTION_ID = row.INSPECTION_ID this.$parent.INSPECTION_ID = row.INSPECTION_ID
console.log("==================")
}, },
/** 开启流程图 */ /** 开启流程图 */
checkFlow(row) { checkFlow(row) {
@ -479,7 +474,7 @@ export default {
}).then(() => { }).then(() => {
this.listLoading = true this.listLoading = true
requestFN( requestFN(
'/safetyenvironmental/hide', '/safetyenvironmental/V2/hide',
{ {
INSPECTION_ID: id, INSPECTION_ID: id,
hide: '1' hide: '1'
@ -576,6 +571,7 @@ export default {
{} {}
).then((data) => { ).then((data) => {
this.treeData = JSON.parse(data.zTreeNodes) this.treeData = JSON.parse(data.zTreeNodes)
console.info(this.treeData)
}).catch((e) => { }).catch((e) => {
}) })
}, },

40
src/views/safetyenvironmental/inspector/components/list.vue
View File

@ -93,7 +93,7 @@
align="center"/> align="center"/>
<el-table-column type="index" label="序号" width="50" align="center" /> <el-table-column type="index" label="序号" width="50" align="center" />
<el-table-column prop="INSPECTED_DEPARTMENT_NAMES" show-overflow-tooltip label="被检查单位" align="center" /> <el-table-column prop="INSPECTED_DEPARTMENT_NAMES" show-overflow-tooltip label="被检查单位" align="center" />
<el-table-column prop="INSPECTION_DEPARTMENT_NAME" show-overflow-tooltip label="检查部门" align="center" /> <el-table-column prop="INSPECTION_LEADDEPARTMENT_NAME" show-overflow-tooltip label="检查部门" align="center" />
<el-table-column prop="INSPECTION_ORIGINATOR_NAME" show-overflow-tooltip label="检查发起人" align="center" /> <el-table-column prop="INSPECTION_ORIGINATOR_NAME" show-overflow-tooltip label="检查发起人" align="center" />
<el-table-column prop="INSPECTION_TYPE_NAME" show-overflow-tooltip label="检查类型" width="150" align="center" /> <el-table-column prop="INSPECTION_TYPE_NAME" show-overflow-tooltip label="检查类型" width="150" align="center" />
<el-table-column label="检查时间" width="280" show-overflow-tooltip align="center" > <el-table-column label="检查时间" width="280" show-overflow-tooltip align="center" >
@ -121,7 +121,7 @@
<template slot-scope="{row}"> <template slot-scope="{row}">
<el-button icon="el-icon-view" size="mini" @click="goDetail(row)">查看</el-button> <el-button icon="el-icon-view" size="mini" @click="goDetail(row)">查看</el-button>
<el-button <el-button
v-show="edit && !validStr(row.INSPECTION_USER_SIGN_TIME) && (row.INSPECTION_STATUS == '0' || row.INSPECTION_STATUS == '1')" v-show="edit && !validStr(row.INSPECTION_USER_SIGN_TIME) && validStr(row.USER_ID) &&(row.INSPECTION_STATUS == '0' || row.INSPECTION_STATUS == '1')"
type="primary" type="primary"
icon="el-icon-edit" icon="el-icon-edit"
size="mini" size="mini"
@ -168,7 +168,7 @@ import WriteSign from '@/components/WriteSign'
import waves from '@/directive/waves' // waves directive import waves from '@/directive/waves' // waves directive
import formatDate from '@/utils/dateformat' import formatDate from '@/utils/dateformat'
import SelectTree from '@/components/SelectTree' import SelectTree from '@/components/SelectTree'
import { inspectorList } from '../Mock' // import { inspectorList } from '../Mock'
export default { export default {
components: { Pagination, WriteSign, SelectTree }, components: { Pagination, WriteSign, SelectTree },
@ -252,22 +252,22 @@ export default {
/** 获取列表 */ /** 获取列表 */
getList() { getList() {
this.listLoading = true this.listLoading = true
// requestFN( requestFN(
// '/safetyenvironmentalinspector/list?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page, '/safetyenvironmentalinspector/V2/list?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
// { {
// ...this.search, ...this.search,
// INSPECTION_TIME_START: this.search.INSPECTION_TIME[0], INSPECTION_TIME_START: this.search.INSPECTION_TIME[0],
// INSPECTION_TIME_END: this.search.INSPECTION_TIME[1] INSPECTION_TIME_END: this.search.INSPECTION_TIME[1]
// } }
// ).then((data) => { ).then((data) => {
// this.listLoading = false this.listLoading = false
// this.varList = data.varList this.varList = data.varList
// this.total = data.page.totalResult this.total = data.page.totalResult
// this.hasButton() this.hasButton()
// this.pd = data.pd this.pd = data.pd
// }).catch((e) => { }).catch((e) => {
// this.listLoading = false this.listLoading = false
// }) })
setTimeout(() => { setTimeout(() => {
this.varList = inspectorList this.varList = inspectorList
@ -318,7 +318,7 @@ export default {
}) })
this.listLoading = true this.listLoading = true
requestFN( requestFN(
'/safetyenvironmentalinspector/verify', '/safetyenvironmentalinspector/V2/verify',
{ ...this.form, { ...this.form,
INSPECTION_STATUS: INSPECTION_STATUS INSPECTION_STATUS: INSPECTION_STATUS
} }

34
src/views/safetyenvironmental/plead/components/list.vue
View File

@ -79,7 +79,7 @@
align="center"/> align="center"/>
<el-table-column type="index" label="序号" width="50" align="center" /> <el-table-column type="index" label="序号" width="50" align="center" />
<el-table-column prop="INSPECTED_DEPARTMENT_NAMES" label="被检查单位" align="center" /> <el-table-column prop="INSPECTED_DEPARTMENT_NAMES" label="被检查单位" align="center" />
<el-table-column prop="INSPECTION_DEPARTMENT_NAME" label="检查部门" align="center" /> <el-table-column prop="INSPECTION_LEADDEPARTMENT_NAME" label="检查部门" align="center" />
<el-table-column prop="INSPECTION_ORIGINATOR_NAME" label="检查发起人" align="center" /> <el-table-column prop="INSPECTION_ORIGINATOR_NAME" label="检查发起人" align="center" />
<el-table-column prop="INSPECTION_TYPE_NAME" label="检查类型" align="center" /> <el-table-column prop="INSPECTION_TYPE_NAME" label="检查类型" align="center" />
<el-table-column label="检查时间" width="260" align="center" > <el-table-column label="检查时间" width="260" align="center" >
@ -225,22 +225,22 @@ export default {
/** 获取列表 */ /** 获取列表 */
getList() { getList() {
this.listLoading = true this.listLoading = true
// requestFN( requestFN(
// '/safetyenvironmental/pleadList?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page, '/safetyenvironmental/pleadList?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
// { {
// ...this.search, ...this.search,
// INSPECTION_TIME_START: this.search.INSPECTION_TIME[0], INSPECTION_TIME_START: this.search.INSPECTION_TIME[0],
// INSPECTION_TIME_END: this.search.INSPECTION_TIME[1] INSPECTION_TIME_END: this.search.INSPECTION_TIME[1]
// } }
// ).then((data) => { ).then((data) => {
// this.listLoading = false this.listLoading = false
// this.varList = data.varList this.varList = data.varList
// this.total = data.page.totalResult this.total = data.page.totalResult
// this.hasButton() this.hasButton()
// this.pd = data.pd this.pd = data.pd
// }).catch((e) => { }).catch((e) => {
// this.listLoading = false this.listLoading = false
// }) })
setTimeout(() => { setTimeout(() => {
this.listLoading = false this.listLoading = false

4
src/views/train/synInfo/components/apply.vue
View File

@ -248,8 +248,8 @@ export default {
requestFN( requestFN(
'/regulatoryApi/user/listAll', '/regulatoryApi/user/listAll',
{ {
DEPARTMENT_ID: DEPARTMENT_ID, DEPARTMENT_ID: DEPARTMENT_ID
ISASSESS: '1' // ISASSESS: '1'
} }
).then((data) => { ).then((data) => {
this.userList = data.userList this.userList = data.userList