Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
zhutianqi
2021-06-01 17:02:25 +08:00
5 changed files with 476 additions and 274 deletions
@@ -1,5 +1,5 @@
<comment>
# 标准对比
# 标准征求意见
</comment>
<template>
<div class="standardForComments">
@@ -15,10 +15,12 @@
<el-input v-model="newNumOrName" class="s-c-input" placeholder="请输入关键字" clearable :maxlength="100" @keyup.enter.native="sarStandCompareHis()"></el-input>
</el-formItem>
<el-formItem label="开始日期" class="search-item">
<el-input v-model="newNumOrName" class="s-c-input" placeholder="" clearable :maxlength="100" @keyup.enter.native="sarStandCompareHis()"></el-input>
<el-datePicker v-model="newNumOrName1" :editable="false"
placeholder="请选择开始日期"></el-datePicker>
</el-formItem>
<el-formItem label="结束日期" class="search-item">
<el-input v-model="newNumOrName" class="s-c-input" placeholder="请输入关键字" clearable :maxlength="100" @keyup.enter.native="sarStandCompareHis()"></el-input>
<el-datePicker v-model="newNumOrName2" :editable="false"
placeholder="请选择结束日期"></el-datePicker>
</el-formItem>
<el-formItem class="search-item btn-box">
<el-button
@@ -64,6 +66,9 @@
prop="oldStandName"
label="标准名称/政策名称"
align="center">
<template slot-scope="scope">
<a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.oldStandName }}</a>
</template>
</el-table-column>
<el-table-column
prop="createTime"
@@ -119,6 +124,8 @@ export default {
standCommonlySearch: {},
oldNumOrName: '',
newNumOrName: '',
newNumOrName1: '',
newNumOrName2: '',
standInfoList: [],
tableHeight: null,
total: 0,
@@ -266,39 +273,49 @@ export default {
this.drawerModal = false
this.$refs.drawerModalTree.treeReload()
},
// 查看
handlePreview (params) {
if (params.compareType === '条款比对') {
this.$store.commit('setDetailMap', this.$route.path)
this.$router.push({
name: 'SeeDatalis',
query: {
row: JSON.stringify(params)
}
})
} else {
let rowDataLeft = {}
let rowDataRight = {}
rowDataLeft.showNumber = params.oldStandNum
rowDataLeft.standName = params.oldStandName
rowDataLeft.standNameSplit = null
rowDataLeft.standNumSplit = null
rowDataRight.showNumber = params.newStandNum
rowDataRight.standName = params.newStandName
rowDataRight.standNameSplit = null
rowDataRight.standNumSplit = null
this.$store.commit('setDetailMap', this.$route.path)
this.$router.push({
name: 'TextComparison',
query: {
id: params.id,
flag: '查看',
rowDataLeft: JSON.stringify(rowDataLeft),
rowDataRight: JSON.stringify(rowDataRight)
}
})
}
// 点击查看
handlePreview (item) {
let routeUrl = this.$router.resolve({
name: 'consultationDetails',
params: {
id: item.id,
pageType: 'INLAND_STAND'
}
})
window.open(routeUrl.href, '_blank')
},
// handlePreview (params) {
// if (params.compareType === '条款比对') {
// this.$store.commit('setDetailMap', this.$route.path)
// this.$router.push({
// name: 'SeeDatalis',
// query: {
// row: JSON.stringify(params)
// }
// })
// } else {
// let rowDataLeft = {}
// let rowDataRight = {}
// rowDataLeft.showNumber = params.oldStandNum
// rowDataLeft.standName = params.oldStandName
// rowDataLeft.standNameSplit = null
// rowDataLeft.standNumSplit = null
// rowDataRight.showNumber = params.newStandNum
// rowDataRight.standName = params.newStandName
// rowDataRight.standNameSplit = null
// rowDataRight.standNumSplit = null
// this.$store.commit('setDetailMap', this.$route.path)
// this.$router.push({
// name: 'TextComparison',
// query: {
// id: params.id,
// flag: '查看',
// rowDataLeft: JSON.stringify(rowDataLeft),
// rowDataRight: JSON.stringify(rowDataRight)
// }
// })
// }
// },
// 删除
delFileEditInfo (id) {
this.$confirm('是否删除?', '提示', {