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

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

Browse Source
This commit is contained in:
zyn
2023-11-24 15:15:28 +08:00
parent b0a53b6d1c 92f5515620
commit 5299f3647b
3 changed files with 47 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/config/pages/mechanismManage/pages/mechanism.vue
+26 -12
View File
@@ -148,20 +148,28 @@
</template>
</el-table-column>
<el-table-column
prop="NameList"
label="所属岗位">
<template slot-scope="scope">
<el-popover trigger="hover" placement="top">
{{ scope.row.NameList }}
<div slot="reference" class="name-wrapper">
<p v-if="!scope.row.institutionName ||scope.row.NameList.length<15">
{{ scope.row.NameList }}
</p>
<p v-else> {{ scope.row.NameList.substring(0, 15) }}...</p>
</div>
</el-popover>
prop="roles"
label="角色"
>
<template slot-scope="scope">
{{getRoleName(scope.row.roles)}}
</template>
</el-table-column>
<!-- <el-table-column-->
<!-- prop="NameList"-->
<!-- label="所属岗位">-->
<!-- <template slot-scope="scope">-->
<!-- <el-popover trigger="hover" placement="top">-->
<!-- {{ scope.row.NameList }}-->
<!-- <div slot="reference" class="name-wrapper">-->
<!-- <p v-if="!scope.row.institutionName ||scope.row.NameList.length<15">-->
<!-- {{ scope.row.NameList }}-->
<!-- </p>-->
<!-- <p v-else> {{ scope.row.NameList.substring(0, 15) }}...</p>-->
<!-- </div>-->
<!-- </el-popover>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column
label="状态"
width="100px">
@@ -306,6 +314,12 @@ export default {
}
},
methods: {
getRoleName(roles){
let names=roles.map(item=>{
return item.name
})
return names.join(',')
},
clearAllSearch() {
this.searchForm = {
uname: "",
src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue
+19 -4
View File
@@ -101,6 +101,12 @@
@selection-change="handleSelectionChange"
row-key="id">
<el-table-column type="selection" width="55" align="center"/>
<el-table-column
type="index"
width="55"
label="序号"
align="center">
</el-table-column>
<el-table-column
prop="itemsNum"
label="条款号"
@@ -294,8 +300,17 @@
border
@selection-change="handleSelection"
:header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
<el-table-column type="selection" width="55" align="center"/>
<el-table-column
<el-table-column type="selection" width="55" align="center"/>
<el-table-column
type="index"
width="55"
label="序号"
align="center">
<template slot-scope="{scope, column, $index}">
{{ ($index + 1) + (standCommonlySearch.page - 1) * standCommonlySearch.pageSize }}
</template>
</el-table-column>
<el-table-column
prop="showNumber"
label="标准号/政策号"
width="170"
@@ -495,8 +510,8 @@
<div>比对条款: {{ itemsNum }}</div>
<div>相似度: {{ similarityDegree }}</div>
<div style="height: 40px;overflow: auto;display: flex;">
<div style="line-height: 20px; margin: 5px; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"><span>旧标准-{{form.itemsNum}}</span></div>
<div style="line-height: 20px; margin: 5px; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"><span>新标准-{{form.itemsNum1}}</span></div>
<div style="line-height: 20px; margin: 5px; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"><span>新标准-{{form.itemsNum}}</span></div>
<div style="line-height: 20px; margin: 5px; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"><span>旧标准-{{form.itemsNum1}}</span></div>
</div>
<div style="height: 600px;overflow: auto;display: flex;">
<div v-html="leftData" style="line-height: 20px; margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div>
src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
+2 -2
View File
@@ -525,8 +525,8 @@
<div>比对条款: {{ itemsNum }}</div>
<div>相似度: {{ similarityDegree }}</div>
<div style="height: 40px;overflow: auto;display: flex;">
<div style="line-height: 20px; margin: 5px; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"><span>旧标准-{{form.itemsNum}}</span></div>
<div style="line-height: 20px; margin: 5px; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"><span>新标准-{{form.itemsNum1}}</span></div>
<div style="line-height: 20px; margin: 5px; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"><span>新标准-{{form.itemsNum}}</span></div>
<div style="line-height: 20px; margin: 5px; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"><span>旧标准-{{form.itemsNum1}}</span></div>
</div>
<div style="height: 600px;overflow: auto;display: flex;">
<div v-html="leftData" style="line-height: 20px; margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div>