FT/foton-laws-system-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of http://gitlab.91isoft.com:90/LAWS/laws-system-front-FOTON into develop

Browse Source
This commit is contained in:
宋伟佳
2021-08-06 14:27:07 +08:00
parent 2df6b33b42 930759eaa5
commit 614f35ea24
17 changed files with 3295 additions and 1332 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
+20 -4
View File
@@ -235,8 +235,7 @@
width="170"
align="center">
<!-- <template slot-scope="scope">-->
<!-- <div v-if=" scope.row.splitStatus === '0'">{{ scope.row.standNumSplit }}</div>-->
<!-- <div v-else>{{ scope.row.showNumber }}</div>-->
<!-- <div @click="showUser(scope.row)" class="table-jump">{{ scope.row.showNumber }}</div>-->
<!-- </template>-->
</el-table-column>
<el-table-column
@@ -245,8 +244,7 @@
show-overflow-tooltip
align="center">
<!-- <template slot-scope="scope">-->
<!-- <span v-if=" scope.row.splitStatus === '0'">{{ scope.row.standNameSplit }}</span>-->
<!-- <span v-else>{{ scope.row.standName }}</span>-->
<!-- <span @click="showUser(scope.row)" class="table-jump">{{ scope.row.standName }}</span>-->
<!-- </template>-->
</el-table-column>
<el-table-column
@@ -459,6 +457,24 @@
ProcessTitle
},
methods: {
showUser (row) {
let routeUrl = this.$router.resolve({
name: 'ItemSplitInfo',
query: {
infoId: row.id,
result: row.result,
}
})
window.open(routeUrl.href, '_blank')
// this.$store.commit('setDetailMap', this.$route.path)
// this.$router.push({
// name: 'ItemSplitInfo',
// query: {
// infoId: row.id,
// result: row.result,
// }
// })
},
setMap(data){
data.forEach(item => {
this.$set(this.textStatusMap, item.value, item.label)
src/pages/processCenter/pages/creatProcess/bzjd/step2.vue
+2 -2
View File
@@ -272,14 +272,14 @@
choiceZRRS (row, type, index) {
this.type = type
if (type === 1) {
this.drawerTitle = '选择责任部门对接人'
this.drawerTitle = '选择执行人'
this.nodeList2 = []
this.zxIndex= index
this.nodeList2.push(row)
this.modalshowflag2 = true
} else {
// 批量
this.drawerTitle = '批量选择责任部门对接人'
this.drawerTitle = '批量选择执行人'
if (this.zxIdList.length > 0) {
this.nodeList2 = []
this.modalshowflag2 = true
src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+1 -1
View File
@@ -810,7 +810,7 @@
</el-form-item>
</el-card>
</el-timeline-item>
<el-timeline-item timestamp="修订申请人" placement="top" :color="roleForm.applyUpdUserName ? '#66b1ff' : ''">
<el-timeline-item timestamp="修订申请人" v-if="form.signFlag === '1'" placement="top" :color="roleForm.applyUpdUserName ? '#66b1ff' : ''">
<el-card>
<el-form-item prop="applyUpdUserName" style="margin-bottom: 0">
<h4>修订申请人</h4>
src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue
+20 -3
View File
@@ -220,13 +220,13 @@
<el-table-column type="selection" width="55" align="center"/>
<el-table-column label="标准号" align="center">
<template slot-scope="scope">
<div v-if="scope.row.standYear">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</div>
<div v-else>{{ scope.row.standSortShow }} {{ scope.row.standNumber }}</div>
<div v-if="scope.row.standYear" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</div>
<div v-else @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}</div>
</template>
</el-table-column>
<el-table-column prop="cname" label="标准名称" align="center">
<template slot-scope="scope">
<div>{{ scope.row.standName }}</div>
<div @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</div>
</template>
</el-table-column>
</el-table>
@@ -361,6 +361,23 @@
}
},
methods: {
// 点击查看
handlePreview (item) {
let pageType
if (item.standType === 'FOREIGN') {
pageType = 'FOREIGN_STAND'
} else {
pageType = 'INLAND_STAND'
}
let routeUrl = this.$router.resolve({
name: 'OtherStandardDetails',
params: {
id: item.id,
pageType: pageType
}
})
window.open(routeUrl.href, '_blank')
},
getData () {
queryTaskFirst({
bpnId: this.$route.query.bpnId
src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue
+20 -3
View File
@@ -221,13 +221,13 @@
<el-table-column type="selection" width="55" align="center"/>
<el-table-column label="标准号" align="center">
<template slot-scope="scope">
<div v-if="scope.row.standYear">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</div>
<div v-else>{{ scope.row.standSortShow }} {{ scope.row.standNumber }}</div>
<div v-if="scope.row.standYear" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</div>
<div v-else @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}</div>
</template>
</el-table-column>
<el-table-column prop="cname" label="标准名称" align="center">
<template slot-scope="scope">
<div>{{ scope.row.standName }}</div>
<div @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</div>
</template>
</el-table-column>
</el-table>
@@ -361,6 +361,23 @@ export default {
}
},
methods: {
// 点击查看
handlePreview (item) {
let pageType
if (item.standType === 'FOREIGN') {
pageType = 'FOREIGN_STAND'
} else {
pageType = 'INLAND_STAND'
}
let routeUrl = this.$router.resolve({
name: 'OtherStandardDetails',
params: {
id: item.id,
pageType: pageType
}
})
window.open(routeUrl.href, '_blank')
},
addZqyjList() {
this.title = '国内外标准库'
this.listModel = true