WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

合并分支 'dev_third_stage' 到 'dev_2nd_period_test'

Browse Source 
Dev third stage

查看合并请求 laws-nio/laws-weilai!226
This commit is contained in:
高嵩
2022-11-02 09:07:54 +08:00
parent 9e0af6b144 d2c5811bed
commit cf6a9fa0cd
37 changed files with 664 additions and 242 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-web/src/components/OcrTable/index.vue
+12 -3
View File
@@ -21,11 +21,11 @@
<!-- <span v-if="ol.text==$t('check')">-->
<!-- {{record.resultContent=='转换成功'&&record.syncState=='未同步'?ol.text:''}}-->
<!-- </span>-->
<span v-if="ol.text==$t('download') && record.createBy == userData.username"
<span v-if="ol.text==$t('download') && (record.createBy == userData.username || administrators)"
v-has="'ocr:ocrRestful:downFile'">
{{record.resultContent=='转换成功'?ol.text:''}}
</span>
<span v-if="ol.text==$t('delete') && record.createBy == userData.username" v-has="'ocr:ocrRecord:delete'">
<span v-if="ol.text==$t('delete') && (record.createBy == userData.username || administrators)" v-has="'ocr:ocrRecord:delete'">
{{ol.text}}
</span>
</a>
@@ -105,7 +105,8 @@
searchParmes: {},
loading: false,
orderBy: '1',
orderByField: ''
orderByField: '',
administrators:false
}
},
mounted() {
@@ -131,6 +132,14 @@
this.getData()
this.getTableList()
this.userData = this.userInfo()
this.administrators = false
if (this.userInfo().userRoleList && this.userInfo().userRoleList.length > 0) {
this.userInfo().userRoleList.forEach(res => {
if (res.roleCode == 'admin') {
this.administrators = true
}
})
}
},
beforeDestroy(){
eventBUs.$off('searchQuery')
jero-web/src/components/SplitTable/index.vue
+12 -3
View File
@@ -18,7 +18,7 @@
<!-- <span class="text">-->
<!-- {{ol.text}}-->
<!-- </span>-->
<span v-if="ol.text==$t('backDocument')&&record.flag==0 && record.createBy == userData.username"
<span v-if="ol.text==$t('backDocument') && record.flag==0 && (record.createBy == userData.username || administrators)"
class="text"
v-has="'split:sarFileSplitInfo:bind'">
{{ol.text}}
@@ -27,7 +27,7 @@
v-has="'split:sarFileSplitItems:page'">
{{ol.text}}
</span>
<span v-if="ol.text==$t('delete') && record.createBy == userData.username"
<span v-if="ol.text==$t('delete') && (record.createBy == userData.username || administrators)"
v-has="'split:sarFileSplitInfo:delete'">
{{ol.text}}
</span>
@@ -109,7 +109,8 @@
loading: false,
orderBy: '1',
userData: {},
orderByField: ''
orderByField: '',
administrators:false,
}
},
mounted() {
@@ -141,6 +142,14 @@
this.getData()
this.getTableList()
this.userData = this.userInfo()
this.administrators = false
if (this.userInfo().userRoleList && this.userInfo().userRoleList.length > 0) {
this.userInfo().userRoleList.forEach(res => {
if (res.roleCode == 'admin') {
this.administrators = true
}
})
}
},
beforeDestroy() {
eventBUs.$off('searchQuery')