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

This commit is contained in:
zhaokaiyao@91isoft.com
2021-11-26 20:11:18 +08:00
7 changed files with 277 additions and 115 deletions
@@ -22,8 +22,8 @@
style="border-top:none;position: absolute;right: 36px;"> style="border-top:none;position: absolute;right: 36px;">
<div class="modular-header" style="height: 50px;"> <div class="modular-header" style="height: 50px;">
<div class="modular-header-btn"> <div class="modular-header-btn">
<el-button v-if="sarStandardsInfoEO.collectId" @click="collectClick(sarStandardsInfoEO.collectId)" title="取消收藏" class="collection-btn" icon="icon-collection" :loading="isSubmit"></el-button> <el-button v-if="sarStandardsInfoEO.collectId" @click="collectClick(sarStandardsInfoEO.collectId)" title="取消收藏" class="collection-btn" style="color: #f56c6c;" icon="el-icon-star-off" :loading="isSubmit"></el-button>
<el-button v-else @click="collectClick()" title="收藏" class="collection-btn" icon="el-icon-star-off" :loading="isSubmit"></el-button> <el-button v-else @click="collectClick()" title="收藏" class="collection-btn" style="color: #4788c0;" icon="el-icon-star-off" :loading="isSubmit"></el-button>
<el-button class="relation-btn" icon="icon-relation" @click="relateEvent()">更新记录</el-button> <el-button class="relation-btn" icon="icon-relation" @click="relateEvent()">更新记录</el-button>
</div> </div>
</div> </div>
@@ -2369,7 +2369,6 @@ export default {
padding: 0; padding: 0;
border: none; border: none;
i { i {
color: #F2CB51;
font-size: 18px; font-size: 18px;
width: 18px; width: 18px;
height: 18px; height: 18px;
@@ -20,8 +20,8 @@
style="border-top:none;position: absolute;right: 36px;border: none"> style="border-top:none;position: absolute;right: 36px;border: none">
<div class="modular-header" style="height: 50px;"> <div class="modular-header" style="height: 50px;">
<div class="modular-header-btn"> <div class="modular-header-btn">
<el-button v-if="sarStandardsInfoEO.collectId" @click="collectClick(sarStandardsInfoEO.collectId)" title="取消收藏" class="collection-btn" icon="icon-collection" :loading="isSubmit"></el-button> <el-button v-if="sarStandardsInfoEO.collectId" @click="collectClick(sarStandardsInfoEO.collectId)" title="取消收藏" class="collection-btn" style="color: #f56c6c;" icon="el-icon-star-off" :loading="isSubmit"></el-button>
<el-button v-else @click="collectClick()" title="收藏" class="collection-btn" icon="el-icon-star-off" :loading="isSubmit"></el-button> <el-button v-else @click="collectClick()" title="收藏" class="collection-btn" style="color: #4788c0;" icon="el-icon-star-off" :loading="isSubmit"></el-button>
<el-button class="relation-btn" icon="icon-relation" @click="relateEvent()">更新LOG</el-button> <el-button class="relation-btn" icon="icon-relation" @click="relateEvent()">更新LOG</el-button>
</div> </div>
</div> </div>
@@ -2279,7 +2279,6 @@ export default {
padding: 0; padding: 0;
border: none; border: none;
i { i {
color: #F2CB51;
font-size: 18px; font-size: 18px;
width: 18px; width: 18px;
height: 18px; height: 18px;
@@ -23,8 +23,8 @@
<div class="modular-header" style="height: 50px;"> <div class="modular-header" style="height: 50px;">
<div class="modular-header-btn"> <div class="modular-header-btn">
<el-button v-if="sarStandardsInfoEO.collectId" @click="collectClick(sarStandardsInfoEO.collectId)" <el-button v-if="sarStandardsInfoEO.collectId" @click="collectClick(sarStandardsInfoEO.collectId)"
title="取消收藏" class="collection-btn" icon="icon-collection" :loading="isSubmit"></el-button> title="取消收藏" class="collection-btn" icon="el-icon-star-off" style="color: #f56c6c;" :loading="isSubmit"></el-button>
<el-button v-else @click="collectClick()" title="收藏" class="collection-btn" icon="el-icon-star-off" <el-button v-else @click="collectClick()" title="收藏" class="collection-btn" icon="el-icon-star-off" style="color: #4788c0;"
:loading="isSubmit"></el-button> :loading="isSubmit"></el-button>
<el-button class="relation-btn" icon="icon-relation" @click="relateEvent()">更新记录</el-button> <el-button class="relation-btn" icon="icon-relation" @click="relateEvent()">更新记录</el-button>
<!-- <el-button class="relation-btn" @click="knowledgeSharing">标准问答</el-button>--> <!-- <el-button class="relation-btn" @click="knowledgeSharing">标准问答</el-button>-->
@@ -3465,7 +3465,6 @@
border: none; border: none;
i { i {
color: #F2CB51;
font-size: 18px; font-size: 18px;
width: 18px; width: 18px;
height: 18px; height: 18px;
@@ -147,12 +147,12 @@
v-btn-permission="'b17f1d035219c47344032e261342d87d'" v-btn-permission="'b17f1d035219c47344032e261342d87d'"
title="不勾选时默认导出所有筛选项;勾选时仅导出勾选项"><i class="iconfont">&#xe6e9;</i>导出 title="不勾选时默认导出所有筛选项;勾选时仅导出勾选项"><i class="iconfont">&#xe6e9;</i>导出
</el-button> </el-button>
<!-- <el-button class="common-button-default delete-button" <el-button class="common-button-default delete-button"
:loading="delLoading" :loading="delLoading"
size="mini" size="mini"
@click="deleteStand(2)" @click="deleteStand(2)"
v-btn-permission="'c09dc12531085e30e39bbdc6cb6116ba'"><i class="iconfont">&#xe61b;</i>批量删除 v-btn-permission="'c09dc12531085e30e39bbdc6cb6116ba'"><i class="iconfont">&#xe61b;</i>批量删除
</el-button>--> </el-button>
<el-button class="common-button-default" <el-button class="common-button-default"
size="mini" size="mini"
@click="configurationStandard" @click="configurationStandard"
@@ -171,6 +171,10 @@
size="mini" size="mini"
@click="OCRAdd('1')"><i class="iconfont">&#xe611;</i>拆分 @click="OCRAdd('1')"><i class="iconfont">&#xe611;</i>拆分
</el-button> </el-button>
<el-button class="common-button-default"
size="mini" @click="OCRAdd('2')"
v-btn-permission="'247cebaefa7cf1683092af160af11502'"><i class="iconfont">&#xe611;</i>编辑
</el-button>
<!-- <el-button class="common-button-default"--> <!-- <el-button class="common-button-default"-->
<!-- size="mini"--> <!-- size="mini"-->
<!-- :loading="searching"--> <!-- :loading="searching"-->
@@ -289,7 +293,7 @@
</el-table-column> </el-table-column>
<el-table-column fixed="right" <el-table-column fixed="right"
v-if="isPermission('cac1eb379eb8e3b987cbb2e4599adb50,247cebaefa7cf1683092af160af11502,dbaf9df2990a595c8abea28e68b1a681')>0" v-if="isPermission('cac1eb379eb8e3b987cbb2e4599adb50,247cebaefa7cf1683092af160af11502,dbaf9df2990a595c8abea28e68b1a681')>0"
label="操作" align="center" width="100" label="操作" align="center" width="50"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<div v-if="isPermission('cac1eb379eb8e3b987cbb2e4599adb50,247cebaefa7cf1683092af160af11502,dbaf9df2990a595c8abea28e68b1a681') == 1" <div v-if="isPermission('cac1eb379eb8e3b987cbb2e4599adb50,247cebaefa7cf1683092af160af11502,dbaf9df2990a595c8abea28e68b1a681') == 1"
@@ -316,28 +320,38 @@
<div v-else> <div v-else>
<div @click.stop style="display: inline-block"> <div @click.stop style="display: inline-block">
<el-dropdown trigger="click" @command="handleCommand"> <el-dropdown trigger="click" @command="handleCommand">
<i class="iconfont">&#xe61e;</i> <!-- <i class="iconfont">&#xe61e;</i>-->
<el-dropdown-menu slot="dropdown"> <el-button title="收藏" class="collection-btn" icon="el-icon-star-off" v-btn-permission="'cac1eb379eb8e3b987cbb2e4599adb50'"
<el-dropdown-item v-btn-permission="'cac1eb379eb8e3b987cbb2e4599adb50'" v-if="scope.row.collectBtn"
v-if="scope.row.collectBtn" @click="handleCommand([scope.row, '收藏'])"
:command="[scope.row, '收藏']" >
> </el-button>
收藏 <el-button title="取消收藏" class="collection-btn" icon="el-icon-star-off" style="color: #f56c6c;" v-btn-permission="'cac1eb379eb8e3b987cbb2e4599adb50'"
</el-dropdown-item> v-else
<el-dropdown-item v-btn-permission="'cac1eb379eb8e3b987cbb2e4599adb50'" @click="handleCommand([scope.row, '取消收藏'])"
v-else >
:command="[scope.row, '取消收藏']" </el-button>
> <!-- <el-dropdown-menu slot="dropdown">-->
取消收藏 <!-- <el-dropdown-item v-btn-permission="'cac1eb379eb8e3b987cbb2e4599adb50'"-->
</el-dropdown-item> <!-- v-if="scope.row.collectBtn"-->
<el-dropdown-item :command="[scope.row, '编辑']" <!-- :command="[scope.row, '收藏']"-->
v-btn-permission="'247cebaefa7cf1683092af160af11502'">编辑 <!-- >-->
</el-dropdown-item> <!-- 收藏-->
<!-- <el-dropdown-item :command="[scope.row, '分享']" v-btn-permission="'ce4ec1bb233314d2ad8740d0aa98aca1'">分享</el-dropdown-item>--> <!-- </el-dropdown-item>-->
<el-dropdown-item :command="[scope.row, '删除']" <!-- <el-dropdown-item v-btn-permission="'cac1eb379eb8e3b987cbb2e4599adb50'"-->
v-btn-permission="'dbaf9df2990a595c8abea28e68b1a681'">删除 <!-- v-else-->
</el-dropdown-item> <!-- :command="[scope.row, '取消收藏']"-->
</el-dropdown-menu> <!-- >-->
<!-- 取消收藏-->
<!-- </el-dropdown-item>-->
<!-- <el-dropdown-item :command="[scope.row, '编辑']"-->
<!-- v-btn-permission="'247cebaefa7cf1683092af160af11502'">编辑-->
<!-- </el-dropdown-item>-->
<!-- &lt;!&ndash; <el-dropdown-item :command="[scope.row, '分享']" v-btn-permission="'ce4ec1bb233314d2ad8740d0aa98aca1'">分享</el-dropdown-item>&ndash;&gt;-->
<!-- <el-dropdown-item :command="[scope.row, '删除']"-->
<!-- v-btn-permission="'dbaf9df2990a595c8abea28e68b1a681'">删除-->
<!-- </el-dropdown-item>-->
<!-- </el-dropdown-menu>-->
</el-dropdown> </el-dropdown>
</div> </div>
</div> </div>
@@ -2633,15 +2647,18 @@
if (type === '0') { if (type === '0') {
text = 'OCR识别' text = 'OCR识别'
this.OCRTitle = '选择OCR实别文件' this.OCRTitle = '选择OCR实别文件'
} else { } else if(type === '1') {
text = '拆分' text = '拆分'
this.OCRTitle = '选择拆分文件' this.OCRTitle = '选择拆分文件'
}else if(type === '2') {
text = '编辑'
this.OCRTitle = '选择编辑文件'
} }
if (this.ocrList.length > 1) { if (this.ocrList.length > 1 && (type === '0' || type === '1' || type === '2')) {
this.$message.warning('仅能选择一条数据进行' + text) this.$message.warning('仅能选择一条数据进行' + text)
} else if (this.ocrList.length === 0) { } else if (this.ocrList.length === 0 && (type === '0' || type === '1' || type === '2')) {
this.$message.warning('请选择一条数据进行' + text) this.$message.warning('请选择一条数据进行' + text)
} else { } else if (this.ocrList.length === 1 && (type === '0' || type === '1')) {
this.OCRModel = true this.OCRModel = true
this.OCRLoading = true this.OCRLoading = true
this.$http.get('lawss/sarStandFile/queryFileInfoNew', { this.$http.get('lawss/sarStandFile/queryFileInfoNew', {
@@ -2660,6 +2677,8 @@
} }
} }
}) })
} else if (this.ocrList.length === 1 && type === '2'){
this.selectStandardPro(this.ocrList[0], 'edit')
} }
}, },
// //
@@ -5574,6 +5593,21 @@
overflow: hidden; overflow: hidden;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
.collection-btn {
padding: 0;
border: none;
color: #4788c0;
font-size: 18px;
width: 18px;
height: 18px;
background-color: transparent;
/*background: rgba(244, 162, 39, 0.1);*/
//.icon-collection {
// background-image: url("~assets/images/shangqi/standardDetails/collection.png");
//}
}
} }
.pagination { .pagination {
@@ -248,12 +248,13 @@
<!-- @click="uploadImportModal(1)"--> <!-- @click="uploadImportModal(1)"-->
<!-- v-btn-permission="'afX1p2gh3c'"--> <!-- v-btn-permission="'afX1p2gh3c'"-->
<!-- ><i class="iconfont">&#xe825;</i>模板下载</el-button>--> <!-- ><i class="iconfont">&#xe825;</i>模板下载</el-button>-->
<!-- <el-button <el-button
class="common-button-default delete-button" class="common-button-default delete-button"
round round
@click="deleteStand(2)" @click="deleteStand(2)"
v-btn-permission="'374205ce36a859a158ca4db196d151b7'" v-btn-permission="'374205ce36a859a158ca4db196d151b7'"
><i class="iconfont">&#xe61b;</i>批量删除</el-button>--> ><i class="iconfont">&#xe61b;</i>批量删除
</el-button>
<el-button <el-button
class="common-button-default" class="common-button-default"
round round
@@ -266,6 +267,10 @@
@click="deleteEnterStandFromKind(2)" @click="deleteEnterStandFromKind(2)"
v-btn-permission="'2d41ebdb6150ba1af52fd753086d77dc'" v-btn-permission="'2d41ebdb6150ba1af52fd753086d77dc'"
><i class="iconfont">&#xe611;</i>移除标准</el-button> ><i class="iconfont">&#xe611;</i>移除标准</el-button>
<el-button class="common-button-default"
size="mini" @click="OCRAdd('2')"
v-btn-permission="'247cebaefa7cf1683092af160af11502'"><i class="iconfont">&#xe611;</i>编辑
</el-button>
</div> </div>
<!--表格--> <!--表格-->
<div class="content"> <div class="content">
@@ -380,7 +385,7 @@
</el-table-column> </el-table-column>
<el-table-column fixed="right" <el-table-column fixed="right"
v-if="isPermission('d9730d984627af948053df56a2db7997,dd4ea796dab7a01b105ba657b1968a84,a7a38a95ea374695fc3128037f6feccf')>0" label="操作" align="center" width="100"> v-if="isPermission('d9730d984627af948053df56a2db7997,dd4ea796dab7a01b105ba657b1968a84,a7a38a95ea374695fc3128037f6feccf')>0" label="操作" align="center" width="50">
<template slot-scope="scope"> <template slot-scope="scope">
<div v-if="isPermission('d9730d984627af948053df56a2db7997,dd4ea796dab7a01b105ba657b1968a84,a7a38a95ea374695fc3128037f6feccf') == 1" <div v-if="isPermission('d9730d984627af948053df56a2db7997,dd4ea796dab7a01b105ba657b1968a84,a7a38a95ea374695fc3128037f6feccf') == 1"
@command="handleCommand" @command="handleCommand"
@@ -407,28 +412,38 @@
<div @click.stop style="display: inline-block"> <div @click.stop style="display: inline-block">
<el-dropdown trigger="click" @command="handleCommand"> <el-dropdown trigger="click" @command="handleCommand">
<i class="iconfont">&#xe61e;</i> <el-button title="收藏" class="collection-btn" icon="el-icon-star-off" v-btn-permission="'d9730d984627af948053df56a2db7997'"
<el-dropdown-menu slot="dropdown"> v-if="scope.row.collectBtn"
<el-dropdown-item @click="handleCommand([scope.row, '收藏'])"
v-if="scope.row.collectBtn" >
:command="[scope.row, '收藏']" </el-button>
v-btn-permission="'d9730d984627af948053df56a2db7997'" <el-button title="取消收藏" class="collection-btn" icon="el-icon-star-off" style="color: #f56c6c;" v-btn-permission="'d9730d984627af948053df56a2db7997'"
> v-else
收藏 @click="handleCommand([scope.row, '取消收藏'])"
</el-dropdown-item> >
<el-dropdown-item </el-button>
v-else <!-- <i class="iconfont">&#xe61e;</i>-->
:command="[scope.row, '取消收藏']" <!-- <el-dropdown-menu slot="dropdown">-->
v-btn-permission="'d9730d984627af948053df56a2db7997'" <!-- <el-dropdown-item-->
> <!-- v-if="scope.row.collectBtn"-->
取消收藏 <!-- :command="[scope.row, '收藏']"-->
</el-dropdown-item> <!-- v-btn-permission="'d9730d984627af948053df56a2db7997'"-->
<el-dropdown-item :command="[scope.row, '编辑']" v-btn-permission="'dd4ea796dab7a01b105ba657b1968a84'">编辑</el-dropdown-item> <!-- >-->
<!-- <el-dropdown-item :command="[scope.row, '分享']" v-btn-permission="'ESPMBSD4ZP'">分享</el-dropdown-item>--> <!-- 收藏-->
<!-- <el-dropdown-item :command="[scope.row, '授权']" v-btn-permission="'CWBPST294ZH7HSKD4452'" v-if="scope.row.attrInfoMap && scope.row.attrInfoMap.QBMJ === 'ACF675Z88W'">授权</el-dropdown-item>--> <!-- </el-dropdown-item>-->
<el-dropdown-item :command="[scope.row, '删除']" v-btn-permission="'a7a38a95ea374695fc3128037f6feccf'">删除</el-dropdown-item> <!-- <el-dropdown-item-->
<!-- <el-dropdown-item :command="[scope.row, '流程']">流程</el-dropdown-item>--> <!-- v-else-->
</el-dropdown-menu> <!-- :command="[scope.row, '取消收藏']"-->
<!-- v-btn-permission="'d9730d984627af948053df56a2db7997'"-->
<!-- >-->
<!-- 取消收藏-->
<!-- </el-dropdown-item>-->
<!-- <el-dropdown-item :command="[scope.row, '编辑']" v-btn-permission="'dd4ea796dab7a01b105ba657b1968a84'">编辑</el-dropdown-item>-->
<!-- &lt;!&ndash; <el-dropdown-item :command="[scope.row, '分享']" v-btn-permission="'ESPMBSD4ZP'">分享</el-dropdown-item>&ndash;&gt;-->
<!-- &lt;!&ndash; <el-dropdown-item :command="[scope.row, '授权']" v-btn-permission="'CWBPST294ZH7HSKD4452'" v-if="scope.row.attrInfoMap && scope.row.attrInfoMap.QBMJ === 'ACF675Z88W'">授权</el-dropdown-item>&ndash;&gt;-->
<!-- <el-dropdown-item :command="[scope.row, '删除']" v-btn-permission="'a7a38a95ea374695fc3128037f6feccf'">删除</el-dropdown-item>-->
<!-- &lt;!&ndash; <el-dropdown-item :command="[scope.row, '流程']">流程</el-dropdown-item>&ndash;&gt;-->
<!-- </el-dropdown-menu>-->
</el-dropdown> </el-dropdown>
</div> </div>
@@ -1306,6 +1321,9 @@ export default {
}, },
data () { data () {
return { return {
OCRType: '',
OCRTitle: '',
ocrList: [],
orderBy: '', orderBy: '',
nowOrder: '', nowOrder: '',
nowOrderBy: '', nowOrderBy: '',
@@ -3674,6 +3692,7 @@ export default {
}, },
// 修改成表格样式后,选择项勾选改变 // 修改成表格样式后,选择项勾选改变
standSelectChange (data) { standSelectChange (data) {
this.ocrList = data
this.selectedList = [] this.selectedList = []
for (let i = 0; i < data.length; i++) { for (let i = 0; i < data.length; i++) {
this.selectedList.push(data[i].id) this.selectedList.push(data[i].id)
@@ -3690,6 +3709,47 @@ export default {
}) })
window.open(routeUrl.href, '_blank') window.open(routeUrl.href, '_blank')
}, },
OCRAdd (type) {
let text = ''
this.OCRType = type
if (type === '0') {
text = 'OCR识别'
this.OCRTitle = '选择OCR实别文件'
} else if(type === '1') {
text = '拆分'
this.OCRTitle = '选择拆分文件'
}else if(type === '2') {
text = '编辑'
this.OCRTitle = '选择编辑文件'
}
if (this.ocrList.length > 1 && (type === '0' || type === '1' || type === '2')) {
this.$message.warning('仅能选择一条数据进行' + text)
} else if (this.ocrList.length === 0 && (type === '0' || type === '1' || type === '2')) {
this.$message.warning('请选择一条数据进行' + text)
} else if (this.ocrList.length === 1 && (type === '0' || type === '1')) {
this.OCRModel = true
this.OCRLoading = true
this.$http.get('lawss/sarStandFile/queryFileInfoNew', {
type: type,
standId: this.selectedList[0]
},{
_this: this
}, res => {
this.OCRLoading = false
if (res.ok) {
if (res.data.length > 0) {
this.OCRData = res.data
} else {
this.$message.warning('当前标准没有' + text + '文件')
this.this.OCRData = []
}
}
})
} else if (this.ocrList.length === 1 && type === '2'){
console.log('4228',this.ocrList)
this.selectStandardPro(this.ocrList[0], 'edit')
}
},
// 查询二级菜单 // 查询二级菜单
selectMenu () { selectMenu () {
this.countRootId = 0 this.countRootId = 0
@@ -4397,6 +4457,21 @@ export default {
flex-direction: column; flex-direction: column;
position: relative; position: relative;
flex: auto; flex: auto;
.collection-btn {
padding: 0;
border: none;
color: #4788c0;
font-size: 18px;
width: 18px;
height: 18px;
background-color: transparent;
/*background: rgba(244, 162, 39, 0.1);*/
//.icon-collection {
// background-image: url("~assets/images/shangqi/standardDetails/collection.png");
//}
}
.pagination { .pagination {
position: static; position: static;
/deep/ .pagination-slot { /deep/ .pagination-slot {
@@ -145,12 +145,12 @@
title="不勾选时默认导出所有筛选项;勾选时仅导出勾选项" title="不勾选时默认导出所有筛选项;勾选时仅导出勾选项"
v-btn-permission="'8871ed1be74cf65851659514880bb50a'"><i class="iconfont">&#xe6e9;</i>导出 v-btn-permission="'8871ed1be74cf65851659514880bb50a'"><i class="iconfont">&#xe6e9;</i>导出
</el-button> </el-button>
<!-- <el-button class="common-button-default delete-button" <el-button class="common-button-default delete-button"
:loading="delLoading" :loading="delLoading"
size="mini" size="mini"
@click="deleteStand(2)" @click="deleteStand(2)"
v-btn-permission="'4d01342db0f56f01bfceaee7b46904f4'"><i class="iconfont">&#xe61b;</i>批量删除 v-btn-permission="'4d01342db0f56f01bfceaee7b46904f4'"><i class="iconfont">&#xe61b;</i>批量删除
</el-button>--> </el-button>
<el-button class="common-button-default" <el-button class="common-button-default"
size="mini" @click="configurationStandard" size="mini" @click="configurationStandard"
v-btn-permission="'590049684c0af005c6b3d1f0ebcf897e'"><i class="iconfont">&#xe669;</i>配置标准 v-btn-permission="'590049684c0af005c6b3d1f0ebcf897e'"><i class="iconfont">&#xe669;</i>配置标准
@@ -160,6 +160,10 @@
@click="deleteStandFromKind(2)" @click="deleteStandFromKind(2)"
v-btn-permission="'29bf24bbd156c06f136cc89b1c7b2bb0'"><i class="iconfont">&#xe611;</i>移除标准 v-btn-permission="'29bf24bbd156c06f136cc89b1c7b2bb0'"><i class="iconfont">&#xe611;</i>移除标准
</el-button> </el-button>
<el-button class="common-button-default"
size="mini" @click="OCRAdd('2')"
v-btn-permission="'247cebaefa7cf1683092af160af11502'"><i class="iconfont">&#xe611;</i>编辑
</el-button>
<!--&lt;!&ndash; <el-button class="common-button-default" <!--&lt;!&ndash; <el-button class="common-button-default"
size="mini" :loading="searching" size="mini" :loading="searching"
@click="uploadImportModal(1)" @click="uploadImportModal(1)"
@@ -313,7 +317,7 @@
<span v-else style="color: #333333">{{ textStatusMap[scope.row.textStatus] }}</span> <span v-else style="color: #333333">{{ textStatusMap[scope.row.textStatus] }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column fixed="right" v-if="isPermission('f9745194958bc9ed3ee5127459795dbc,e8d690904ee1895dd0d17d9c794fbcd7,b299fa5edb3f3f35badb2adb6bda9f2e')>0" label="操作" align="center" width="100"> <el-table-column fixed="right" v-if="isPermission('f9745194958bc9ed3ee5127459795dbc,e8d690904ee1895dd0d17d9c794fbcd7,b299fa5edb3f3f35badb2adb6bda9f2e')>0" label="操作" align="center" width="50">
<template slot-scope="scope"> <template slot-scope="scope">
<div v-if="isPermission('f9745194958bc9ed3ee5127459795dbc,e8d690904ee1895dd0d17d9c794fbcd7,b299fa5edb3f3f35badb2adb6bda9f2e') == 1" <div v-if="isPermission('f9745194958bc9ed3ee5127459795dbc,e8d690904ee1895dd0d17d9c794fbcd7,b299fa5edb3f3f35badb2adb6bda9f2e') == 1"
@@ -341,30 +345,40 @@
<div @click.stop style="display: inline-block"> <div @click.stop style="display: inline-block">
<el-dropdown trigger="click" @command="handleCommand"> <el-dropdown trigger="click" @command="handleCommand">
<i class="iconfont">&#xe61e;</i> <el-button title="收藏" class="collection-btn" icon="el-icon-star-off" v-btn-permission="'f9745194958bc9ed3ee5127459795dbc'"
<el-dropdown-menu slot="dropdown"> v-if="scope.row.collectBtn"
<el-dropdown-item @click="handleCommand([scope.row, '收藏'])"
v-if="scope.row.collectBtn" >
:command="[scope.row, '收藏']" </el-button>
v-btn-permission="'f9745194958bc9ed3ee5127459795dbc'" <el-button title="取消收藏" class="collection-btn" icon="el-icon-star-off" style="color: #f56c6c;" v-btn-permission="'f9745194958bc9ed3ee5127459795dbc'"
> v-else
收藏 @click="handleCommand([scope.row, '取消收藏'])"
</el-dropdown-item> >
<el-dropdown-item </el-button>
v-else <!-- <i class="iconfont">&#xe61e;</i>-->
:command="[scope.row, '取消收藏']" <!-- <el-dropdown-menu slot="dropdown">-->
v-btn-permission="'47e155667f521467ed941c89d118e770'" <!-- <el-dropdown-item-->
> <!-- v-if="scope.row.collectBtn"-->
取消收藏 <!-- :command="[scope.row, '收藏']"-->
</el-dropdown-item> <!-- v-btn-permission="'f9745194958bc9ed3ee5127459795dbc'"-->
<el-dropdown-item :command="[scope.row, '编辑']" v-btn-permission="'e8d690904ee1895dd0d17d9c794fbcd7'"> <!-- >-->
编辑 <!-- 收藏-->
</el-dropdown-item> <!-- </el-dropdown-item>-->
<!-- <el-dropdown-item :command="[scope.row, '分享']" v-btn-permission="'413e676a155d6eb2dfbe08df8cbcf682'">分享</el-dropdown-item>--> <!-- <el-dropdown-item-->
<el-dropdown-item :command="[scope.row, '删除']" v-btn-permission="'b299fa5edb3f3f35badb2adb6bda9f2e'"> <!-- v-else-->
删除 <!-- :command="[scope.row, '取消收藏']"-->
</el-dropdown-item> <!-- v-btn-permission="'47e155667f521467ed941c89d118e770'"-->
</el-dropdown-menu> <!-- >-->
<!-- 取消收藏-->
<!-- </el-dropdown-item>-->
<!-- <el-dropdown-item :command="[scope.row, '编辑']" v-btn-permission="'e8d690904ee1895dd0d17d9c794fbcd7'">-->
<!-- 编辑-->
<!-- </el-dropdown-item>-->
<!-- &lt;!&ndash; <el-dropdown-item :command="[scope.row, '分享']" v-btn-permission="'413e676a155d6eb2dfbe08df8cbcf682'">分享</el-dropdown-item>&ndash;&gt;-->
<!-- <el-dropdown-item :command="[scope.row, '删除']" v-btn-permission="'b299fa5edb3f3f35badb2adb6bda9f2e'">-->
<!-- 删除-->
<!-- </el-dropdown-item>-->
<!-- </el-dropdown-menu>-->
</el-dropdown> </el-dropdown>
</div> </div>
@@ -2242,6 +2256,9 @@ export default {
orgName: '', orgName: '',
validFlag: '0' validFlag: '0'
}, },
OCRType: '',
OCRTitle: '',
ocrList: [],
standItemList: [], standItemList: [],
drawerWidth: 1400, drawerWidth: 1400,
// 配置标准相关 开始 // 配置标准相关 开始
@@ -3126,6 +3143,7 @@ export default {
}, },
// 修改成表格样式后,选择项勾选改变 // 修改成表格样式后,选择项勾选改变
standSelectChange(data) { standSelectChange(data) {
this.ocrList = data
this.selectedList = [] this.selectedList = []
for (let i = 0; i < data.length; i++) { for (let i = 0; i < data.length; i++) {
this.selectedList.push(data[i].id) this.selectedList.push(data[i].id)
@@ -4180,6 +4198,47 @@ export default {
this.configStandFlag = false this.configStandFlag = false
this.selectConfigStand = [] this.selectConfigStand = []
}, },
OCRAdd (type) {
let text = ''
this.OCRType = type
if (type === '0') {
text = 'OCR识别'
this.OCRTitle = '选择OCR实别文件'
} else if(type === '1') {
text = '拆分'
this.OCRTitle = '选择拆分文件'
}else if(type === '2') {
text = '编辑'
this.OCRTitle = '选择编辑文件'
}
if (this.ocrList.length > 1 && (type === '0' || type === '1' || type === '2')) {
this.$message.warning('仅能选择一条数据进行' + text)
} else if (this.ocrList.length === 0 && (type === '0' || type === '1' || type === '2')) {
this.$message.warning('请选择一条数据进行' + text)
} else if (this.ocrList.length === 1 && (type === '0' || type === '1')) {
this.OCRModel = true
this.OCRLoading = true
this.$http.get('lawss/sarStandFile/queryFileInfoNew', {
type: type,
standId: this.selectedList[0]
},{
_this: this
}, res => {
this.OCRLoading = false
if (res.ok) {
if (res.data.length > 0) {
this.OCRData = res.data
} else {
this.$message.warning('当前标准没有' + text + '文件')
this.this.OCRData = []
}
}
})
} else if (this.ocrList.length === 1 && type === '2'){
console.log('4228',this.ocrList)
this.selectStandardPro(this.ocrList[0], 'edit')
}
},
// 表对应标准移除分类到 // 表对应标准移除分类到
deleteStandFromKind(flag, item) { deleteStandFromKind(flag, item) {
// this.getMenu().then(boolean => { // this.getMenu().then(boolean => {
@@ -5092,6 +5151,21 @@ export default {
overflow: hidden; overflow: hidden;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
.collection-btn {
padding: 0;
border: none;
color: #4788c0;
font-size: 18px;
width: 18px;
height: 18px;
background-color: transparent;
/*background: rgba(244, 162, 39, 0.1);*/
//.icon-collection {
// background-image: url("~assets/images/shangqi/standardDetails/collection.png");
//}
}
} }
.pagination { .pagination {
@@ -84,7 +84,7 @@
label="标准号" label="标准号"
fixed="left" fixed="left"
show-overflow-tooltip show-overflow-tooltip
width="120px" width="190px"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.standSortShow === undefined" <span v-if="scope.row.standSortShow === undefined"
@@ -101,14 +101,12 @@
prop="standName" prop="standName"
label="中文名称" label="中文名称"
show-overflow-tooltip show-overflow-tooltip
width="120px"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="standEnName" prop="standEnName"
label="英文名称" label="英文名称"
show-overflow-tooltip show-overflow-tooltip
width="120px"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -157,25 +155,9 @@
</el-table-column> </el-table-column>
<el-table-column <el-table-column
show-overflow-tooltip show-overflow-tooltip
prop="kccvppsbm" prop=""
width="180px" width="180px"
label="卡车VPPS编码"> label="合规评估结果">
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="cycvppscn"
width="180px"
label="卡车vpps中文名称">
</el-table-column>
<el-table-column
prop="cycvppsbm"
width="180px"
label="乘车VPPS编码">
</el-table-column>
<el-table-column
prop="cycvppscn"
width="180px"
label="乘车vpps中文名称">
</el-table-column> </el-table-column>
</el-table> </el-table>
<pagination <pagination