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

Merge branch 'pet' of http://47.92.113.182:3000/guoyuepeng/qa-regulatory-gwj-vue into pet

pet-人员中台对接-xuyifeng-7.24
water_xu 2024-06-28 08:40:43 +08:00
parent 3f39ad2548 7bbb361e1b
commit 825cd9bffd
9 changed files with 52 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/dangerousWork/electricity/components/detail.vue
View File

@ -246,7 +246,7 @@ export default {
})
},
goBack() {
this.$parent.activeName = 'List'
this.$parent.activeName = 'electricity_list'
}
}

12
src/views/dangerousWork/electricity/components/list.vue
View File

@ -109,6 +109,10 @@
<el-button type="primary" @click="dialogFormShow = false">确 定</el-button>
</div>
</el-dialog>
<div style="height: 60px;"></div>
<div class="ui-foot">
<el-button type="primary" @click="goBack">返 回</el-button>
</div>
</div>
</template>
<script>
@ -186,7 +190,9 @@ export default {
'/dangerousWork/gfElectricity/list?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
{
KEYWORDS: this.KEYWORDS, APPLY_STATUS: this.STATUS,
DEPTIDS: this.DEPTIDS, tm: new Date().getTime()
DEPTIDS: this.DEPTIDS, tm: new Date().getTime(),
CORPINFO_ID: this.$parent.CORPINFO_ID,
ticketType: this.$parent.ticketType
}
).then((data) => {
this.listLoading = false
@ -291,6 +297,10 @@ export default {
goDetail(id) {
this.$parent.activeName = 'Detail'
this.$parent.ELECTRICITY_ID = id
},
goBack(){
this.$parent.activeName = 'CorpInfo'
this.$parent.BREAKGROUND_ID = ''
}
}
}

2
src/views/dangerousWork/electricity/index.vue
View File

@ -1,7 +1,7 @@
<template>
<div>
<CorpInfo v-show="activeName=='CorpInfo'" ref="list" />
<List v-show="activeName=='electricity_list'" />
<List v-if="activeName=='electricity_list'" />
<Detail v-if="activeName=='Detail'"/>
</div>
</template>

2
src/views/dangerousWork/highwork/components/detail.vue
View File

@ -248,7 +248,7 @@ export default {
})
},
goBack() {
this.$parent.activeName = 'List'
this.$parent.activeName = 'highwork_list'
}
}

15
src/views/dangerousWork/highwork/components/list.vue
View File

@ -132,7 +132,14 @@
<el-button type="primary" @click="dialogFormShow = false">确 定</el-button>
</div>
</el-dialog>
<div style="height: 60px;"></div>
<div class="ui-foot">
<el-button type="primary" @click="goBack">返 回</el-button>
</div>
</div>
</template>
<script>
import Pagination from '@/components/Pagination' // 通过 el-pagination二次打包
@ -211,7 +218,9 @@ export default {
'/dangerousWork/gfHighWork/list?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
{
KEYWORDS: this.KEYWORDS, APPLY_STATUS: this.STATUS,
DEPTIDS: this.DEPTIDS, tm: new Date().getTime()
DEPTIDS: this.DEPTIDS, tm: new Date().getTime(),
CORPINFO_ID: this.$parent.CORPINFO_ID,
ticketType: this.$parent.ticketType
}
).then((data) => {
this.listLoading = false
@ -326,6 +335,10 @@ export default {
goDetail(id) {
this.$parent.activeName = 'Detail'
this.$parent.HIGHWORK_ID = id
},
goBack(){
this.$parent.activeName = 'CorpInfo'
this.$parent.HIGHWORK_ID = ''
}
}
}

15
src/views/dangerousWork/highwork/index.vue
View File

@ -1,28 +1,23 @@
<template>
<div>
<CorpInfo v-show="activeName=='CorpInfo'" />
<CorpInfo v-show="activeName=='CorpInfo'" ref="list"/>
<List v-if="activeName=='highwork_list'" />
<Detail v-if="activeName=='Detail'"/>
</div>
</template>
<script>
import CorpInfo from "./components/corpInfo";
import List from './components/list'
import Detail from './components/detail'
import CorpInfo from "./components/corpInfo";
export default {
components: {CorpInfo,List,Detail},
data() {
return {
activeName: 'CorpInfo',
HIGHWORK_ID: ''
}
},
watch: {
activeName(val) {
if (val == 'highwork_list') {
this.$refs.list.getQuery()
}
HIGHWORK_ID: '',
ticketType : '',
CUTROAD_ID:''
}
}
}

2
src/views/dangerousWork/hoisting/components/corpInfo.vue
View File

@ -102,7 +102,7 @@ export default {
this.$parent.activeName = tableName
this.$parent.CORPINFO_ID = CORPINFO_ID
this.$parent.ticketType = ticketType
this.$parent.CUTROAD_ID =''
this.$parent.HOISTING_ID =''
},
getList() {
return new Promise((resolve) => {

16
src/views/dangerousWork/hoisting/components/list.vue
View File

@ -132,7 +132,13 @@
<el-button type="primary" @click="dialogFormShow = false">确 定</el-button>
</div>
</el-dialog>
<div style="height: 60px;"></div>
<div class="ui-foot">
<el-button type="primary" @click="goBack">返 回</el-button>
</div>
</div>
</template>
<script>
import Pagination from '@/components/Pagination' // 通过 el-pagination二次打包
@ -211,7 +217,9 @@ export default {
'/dangerousWork/gfHoisting/list?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
{
KEYWORDS: this.KEYWORDS, APPLY_STATUS: this.STATUS,
DEPTIDS: this.DEPTIDS, tm: new Date().getTime()
DEPTIDS: this.DEPTIDS, tm: new Date().getTime(),
CORPINFO_ID: this.$parent.CORPINFO_ID,
ticketType: this.$parent.ticketType
}
).then((data) => {
this.listLoading = false
@ -324,8 +332,12 @@ export default {
}
},
goDetail(id) {
this.$parent.activeName = 'Hoisting'
this.$parent.activeName = 'Detail'
this.$parent.HOISTING_ID = id
},
goBack(){
this.$parent.activeName = 'CorpInfo'
this.$parent.HOISTING_ID = ''
}
}
}

6
src/views/dangerousWork/hoisting/index.vue
View File

@ -1,7 +1,7 @@
<template>
<div>
<CorpInfo v-show="activeName=='CorpInfo'" ref="list" />
<List v-show="activeName=='hoisting_list'" />
<List v-if="activeName=='hoisting_list'" />
<Detail v-if="activeName=='Detail'"/>
</div>
</template>
@ -15,7 +15,9 @@ export default {
data() {
return {
activeName: 'CorpInfo',
HOISTING_ID: ''
HOISTING_ID: '',
ticketType : '',
CORPINFO_ID : ''
}
},
watch: {