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

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

Browse Source
This commit is contained in:
高嵩
2022-10-13 11:58:34 +08:00
parent 6147be50b5 00e513b32a
commit 7c724cc5e2
14 changed files with 260 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-web/src/common/lang/en-us.js
+1 -1
View File
@@ -198,7 +198,7 @@ module.exports = {
entertitle:'Please enter Title',
OperationType: 'Operation Type',
selectOperationType: 'Please select Operation type',
selectProblemClassification:'Please select Classification',
selectProblemClassification:'Please select Problem Classification',
selectMarket:'Please select Market',
RequestMethod: 'Request Method',
RequestParameters: 'Request Parameters',
jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue
+10 -2
View File
@@ -179,7 +179,10 @@
</a-row>
</a-form-model>
<div class="submit-button">
<a-button class="box-button" type="primary" @click="submit">{{$t('submit')}}</a-button>
<a-button class="box-button" type="primary" @click="submit('Draft')">
{{$t('tempSave')}}
</a-button>
<a-button class="box-button" type="primary" @click="submit('Have released')">{{$t('release')}}</a-button>
</div>
</div>
</div>
@@ -601,7 +604,10 @@
this.formInline[this.uploadName] = attIdList.join(',')
this.formInline = { ...this.formInline }
},
submit() {
tempSaveClick(){
},
submit(releaseStatus) {
this.$refs.ruleForm.validate(valid => {
if (valid) {
let formInline = JSON.parse(JSON.stringify(this.formInline))
@@ -633,6 +639,7 @@
})
})
}
formInline.releaseStatus = releaseStatus
Action(url, formInline).then((res) => {
if (res.success) {
this.$message.success(this.$t('OperationSuccessful'))
@@ -784,6 +791,7 @@
.box-button {
height: 38px;
margin-top: 4px;
margin-left: 10px;
}
.box-button-index {
jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue
+2 -1
View File
@@ -344,7 +344,8 @@
pageNo: this.pageNo,
pageSize: this.pageSize,
searchStr: this.searchStr,
problemTypes: selectedTags.join(',')
problemTypes: selectedTags.join(','),
releaseStatus:'Have released'
}
this.loading = true
getAction(this.url.getInfoList, query).then((res) => {
jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseRelease.vue
+62 -18
View File
@@ -12,16 +12,40 @@
<div style="padding-top: 68px;background: #fff">
<div class="detail-content" style="padding: 30px">
<div class="search-detail-wrap">
<a-form layout="inline" @keyup.enter.native="onSearch">
<div class="box-title-text">
<div class="title-text" :title="$t('searchContent')">
<span>{{$t('searchContent')}}</span>
<a-form layout="inline" style="width: 1200px;margin: 0 auto" @keyup.enter.native="onSearch">
<a-row :gutter="24">
<a-col :span="10">
<div class="box-title-text">
<div class="title-text" :title="$t('searchContent')">
<span>{{$t('searchContent')}}</span>
</div>
<a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('searchContent')"
v-model="queryParam.searchStr"></a-input>
</div>
</a-col>
<a-col :span="10">
<div class="box-title-text">
<div class="title-text" :title="$t('releaseStatus')">
<span>{{$t('releaseStatus')}}</span>
</div>
<a-select :placeholder="$t('PleaseSelect')+$t('releaseStatus')"
v-model="queryParam.releaseStatus">
<a-select-option v-for="(item, key) in releaseStatusList"
:key="key"
:value="item.value">
<span class="selectText" :title=" item.name ">
{{ item.name}}
</span>
</a-select-option>
</a-select>
</div>
</a-col>
<div style="text-align: right">
<a-button class="box-button" type="primary" @click="onSearch">{{$t('query')}}</a-button>
<a-button class="box-button" style="margin-left: 8px" @click="ResetSearch">{{$t('reset')}}
</a-button>
</div>
<a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('searchContent')"
v-model="searchStr"></a-input>
<a-button class="box-button" type="primary" @click="onSearch">{{$t('query')}}</a-button>
<a-button class="box-button" style="margin-left: 8px" @click="ResetSearch">{{$t('reset')}}</a-button>
</div>
</a-row>
</a-form>
</div>
<div v-if="conList.length > 0" style="height: calc(100vh - 240px);overflow:auto;">
@@ -41,6 +65,9 @@
<div class="text-content">
{{item.contentOne}}
</div>
<div class="text-text-right-text-One">
{{item.releaseStatus == 'Draft'?$t('draft'):$t('HaveReleased')}}
</div>
<div class="text-text-right-text">
<a style="margin-right: 10px" @click="edit(item)"
v-if="userInfoQuery.username == item.createBy || administrators">{{$t('edit')}}</a>
@@ -85,7 +112,17 @@
conList: [],
total: 0,
pageSize: 10,
searchStr: '',
queryParam: {},
releaseStatusList: [
{
name: this.$t('draft'),
value: 'Draft'
},
{
name: this.$t('HaveReleased'),
value: 'Have released'
}
],
loading: false,
administrators: false,
downLoadFileUrl: window._CONFIG['domianPreviewURL'] + '/sys/common/download',
@@ -126,7 +163,7 @@
this.getList()
},
ResetSearch() {
this.searchStr = ''
this.queryParam = {}
this.pageNo = 1
this.getList()
},
@@ -140,7 +177,7 @@
pageNo: this.pageNo,
pageSize: this.pageSize,
createBy: this.userInfo().username,
searchStr: this.searchStr
...this.queryParam
}
this.loading = true
getAction(this.url.getInfoList, query).then((res) => {
@@ -285,11 +322,21 @@
.text-text-right {
padding: 19px 19px;
width: calc(100% - 180px);
width: calc(100% - 300px);
box-sizing: border-box;
/*margin-left: 38px;*/
}
.text-text-right-text-One {
width: 120px;
height: 100%;
text-align: center;
position: absolute;
right: 180px;
top: 50%;
transform: translate-Y(-50%);
}
.text-text-right-text {
width: 180px;
height: 100%;
@@ -365,16 +412,13 @@
.search-detail-wrap {
width: 100%;
margin: 0 auto;
margin-bottom: 16px;
}
.box-title-text {
line-height: 1.4;
display: flex;
align-items: center;
margin-bottom: 10px;
text-align: center;
justify-content: center;
}
.title-text {
@@ -394,7 +438,7 @@
.box-input {
/*min-width: 200px;*/
display: inline-block;
width: 50%;
width: 100%;
height: 38px;
margin-top: 2px;
margin-right: 16px;
jero-web/src/views/documentTools/documentComparison/components/comparisonResults.vue
+2 -1
View File
@@ -60,7 +60,7 @@
<span style="cursor: pointer"
@click="fileClick(resultData.fileNameRight,resultData.fileIdRight)">{{resultData.fileNameRight}}</span>
</div>
<div class="detail-content-header-content-rightOne">
<div class="detail-content-header-content-rightOne" :title="$t('comparisonDifferenceComment')">
{{$t('comparisonDifferenceComment')}}
</div>
<div class="detail-content-header-content-right" v-if="!isDisplay">
@@ -494,6 +494,7 @@
.operator-text-text {
cursor: pointer;
margin-right: 53px;
max-width: 138px;
font-size: 14px;
font-weight: 400;
color: #040B29;
jero-web/src/views/documentTools/documentComparison/index.vue
+14 -5
View File
@@ -42,11 +42,11 @@
</a-form>
</div>
<div class="table-operator">
<div @click="initiatingProcessClick" class="operator-text">
<div @click="initiatingProcessClick" v-has="'documentComparison:Initiate'" class="operator-text">
<a-icon type="apartment"/>
{{$t('initiateComparison')}}
</div>
<div @click="BatchDelete" class="operator-text">
<div @click="BatchDelete" v-has="'documentComparison:batchDelete'" class="operator-text">
<a-icon type="delete"/>
{{$t('BatchDelete')}}
</div>
@@ -67,15 +67,15 @@
<span slot="operation" slot-scope="text,record">
<a class="text-operation" @click="comparisonResultsClick(record)">{{$t('comparisonResults')}}</a>
<a class="text-operation"
v-if="record.createBy == userInfoQuery.username"
v-if="record.createBy == userInfoQuery.username || administrators"
@click="subscribe(record)">
{{!record.releaseState || record.releaseState == 'draft' ? $t('release') :$t('withdraw')}}
</a>
<a class="text-operation"
v-if="record.createBy == userInfoQuery.username && record.releaseState == 'draft'"
v-if="(record.createBy == userInfoQuery.username || administrators) && record.releaseState == 'draft'"
@click="edit(record)">{{$t('edit')}}</a>
<a class="text-operation"
v-if="record.createBy == userInfoQuery.username && record.releaseState == 'draft'"
v-if="(record.createBy == userInfoQuery.username || administrators) && record.releaseState == 'draft'"
@click="deleteData(record)">{{$t('delete')}}</a>
</span>
<span slot="serialNumberRight" :title="text" slot-scope="text,record">
@@ -132,6 +132,7 @@
pageNo: 1,
queryParam: {},
userInfoQuery: {},
administrators:false,
selectedRowKeysRecord: [],
columns: [
{
@@ -233,6 +234,14 @@
this.queryParam = { ...this.queryParam }
}
this.userInfoQuery = 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
}
})
}
this.getList()
},
methods: {
jero-web/src/views/documentTools/documentTranslation/index.vue
+19 -6
View File
@@ -59,15 +59,15 @@
</a-form>
</div>
<div class="table-operator">
<div @click="uploadClick" class="operator-text">
<div @click="uploadClick" v-has="'documentTranslation:upload'" class="operator-text">
<a-icon type="cloud-upload"/>
{{$t('upload1')}}
</div>
<div @click="RetrieveFilesClick" class="operator-text">
<div @click="RetrieveFilesClick" v-has="'documentTranslation:retrieval'" class="operator-text">
<a-icon type="database"/>
{{$t('RetrieveFiles')}}
</div>
<div @click="BatchDelete" class="operator-text">
<div @click="BatchDelete" v-has="'documentTranslation:batchDeletion'" class="operator-text">
<a-icon type="delete"/>
{{$t('BatchDelete')}}
</div>
@@ -86,18 +86,22 @@
>
<!-- -->
<span slot="operation" slot-scope="text,record">
<a class="text-operation" @click="viewClick(record)">{{$t('view')}}</a>
<a class="text-operation"
v-has="'documentTranslation:view'"
@click="viewClick(record)">{{$t('view')}}</a>
<!-- <a class="text-operation" @click="checkClick(record)">{{$t('check')}}</a>-->
<a class="text-operation"
v-if="record.createBy == userInfoQuery.username"
v-if="record.createBy == userInfoQuery.username || administrators"
@click="subscribe(record)">
{{!record.releaseCondition || record.releaseCondition == 'draft' ? $t('release') :$t('withdraw')}}
</a>
<a class="text-operation"
v-has="'documentTranslation:download'"
v-if="record.translationResult == 'Translation done'"
@click="downloadData(record)">{{$t('download')}}</a>
<a class="text-operation"
v-if="record.createBy == userInfoQuery.username && record.releaseCondition == 'draft'"
v-has="'documentTranslation:delete'"
v-if="(record.createBy == userInfoQuery.username || administrators) && record.releaseCondition == 'draft'"
@click="deleteData(record)">{{$t('delete')}}</a>
</span>
<span slot="standardTitle" slot-scope="text,record" :title="text">
@@ -158,6 +162,7 @@
queryParam: {},
userInfoQuery: {},
selectedRowKeysRecord: [],
administrators:false,
columns: [
{
title: this.$t('standard'),
@@ -233,6 +238,14 @@
}
this.getList()
this.userInfoQuery = 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
}
})
}
},
methods: {
...mapGetters(['userInfo']),
jero-web/src/views/regulatoryEarlyWarning/index.vue
+5 -2
View File
@@ -8,11 +8,14 @@
:url="url"/>
</div>
<div class="table-operator">
<div @click="handleCompare" class="operator-text">
<div @click="handleCompare" v-has="'regulatoryEarlyWarning:push'"
class="operator-text">
<a-icon type="rocket" :rotate="45"/>
{{$t('Push')}}
</div>
<div @click="handleExport" class="operator-text">
<div @click="handleExport"
v-has="'regulatoryEarlyWarning:export'"
class="operator-text">
<a-icon type="export" :rotate="-90"/>
{{$t('export')}}
</div>