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:
wangzhijiang
2022-08-19 10:43:56 +08:00
parent 7dfcd4b740 d5399a9f5f
commit 59a6919085
5 changed files with 30 additions and 57 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
@@ -1122,7 +1122,7 @@ module.exports = {
RelevantMaterials: 'RelevantMaterials', RelevantMaterials: 'RelevantMaterials',
evaluatorFeedback: 'Evaluator Feedback', evaluatorFeedback: 'Evaluator Feedback',
nameTechnicalDocument: 'Name of technical document', nameTechnicalDocument: 'Name of technical document',
chapter: 'chapter', chapter: 'Chapter',
problemDescription: 'Problem Description', problemDescription: 'Problem Description',
filingExternalOpinions: 'Filing of external opinions', filingExternalOpinions: 'Filing of external opinions',
regulatoryTechnicalEvaluationResults: 'Regulatory technical evaluation results', regulatoryTechnicalEvaluationResults: 'Regulatory technical evaluation results',
jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardView.vue
+1
View File
@@ -116,6 +116,7 @@
} }
}, },
mounted() { mounted() {
document.title = 'Country Card'+ '-' + this.$t('details')
this.queryCountry(() => { this.queryCountry(() => {
this.replacePage() this.replacePage()
}) })
jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue
+3 -1
View File
@@ -278,10 +278,12 @@
} }
}, },
mounted() { mounted() {
document.title = this.$t('problemKnowledgeBase') + this.$t('newlyAdded')
this.getBase() this.getBase()
if (this.$route.query.id) { if (this.$route.query.id) {
this.queryById() this.queryById()
document.title = this.$t('problemKnowledgeBase') + this.$t('edit')
} else {
document.title = this.$t('problemKnowledgeBase') + this.$t('newlyAdded')
} }
}, },
methods: { methods: {
jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseRelease.vue
+1
View File
@@ -95,6 +95,7 @@
}, },
mounted() { mounted() {
this.getList() this.getList()
document.title = this.$t('managePublishing')
}, },
methods: { methods: {
...mapGetters(['userInfo']), ...mapGetters(['userInfo']),
jero-web/src/views/documentTools/searchCenter/components/problemKnowledgeBase.vue
+24 -55
View File
@@ -8,7 +8,7 @@
<a-select :placeholder="$t('PleaseSelect')+$t('problemClassification')" <a-select :placeholder="$t('PleaseSelect')+$t('problemClassification')"
class="text-select" class="text-select"
allowClear allowClear
v-model="queryParamOne.showPermissions"> v-model="queryParamOne.problem_type">
<a-select-option v-for="(item, key) in tagList" <a-select-option v-for="(item, key) in tagList"
:key="key" :key="key"
:value="item.id"> :value="item.id">
@@ -20,7 +20,7 @@
</div> </div>
<div class="text-left-select"> <div class="text-left-select">
<span class="text-sel" :title="$t('market')">{{$t('market')}}</span> <span class="text-sel" :title="$t('market')">{{$t('market')}}</span>
<j-dict-select-tag class="text-select" v-model="queryParamOne.applyMarket" <j-dict-select-tag class="text-select" v-model="queryParamOne.target_market"
:placeholder="$t('PleaseSelect')+$t('market')" :placeholder="$t('PleaseSelect')+$t('market')"
:type="'select'" :type="'select'"
:triggerChange="false" :dictCode="'region'"/> :triggerChange="false" :dictCode="'region'"/>
@@ -37,7 +37,7 @@
<div class="search-text-title"> <div class="search-text-title">
<div class="search-header-left"> <div class="search-header-left">
<span>{{$t('searchScope')}}：</span> <span>{{$t('searchScope')}}：</span>
<span>{{queryParamSeach}}</span> <span>{{queryParam.selectValue}}</span>
</div> </div>
</div> </div>
<div class="box-content"> <div class="box-content">
@@ -128,14 +128,14 @@
loading: false, loading: false,
fileList: [], fileList: [],
downLoadFileUrl: window._CONFIG['domianPreviewURL'] + '/sys/common/download', downLoadFileUrl: window._CONFIG['domianPreviewURL'] + '/sys/common/download',
queryParamSeach: '',
mapOne: {}, mapOne: {},
mapTwo: {}, mapTwo: {},
queryParamOne: {}, queryParamOne: {},
searchQueryOne: {},
orderBy: '1', orderBy: '1',
orderByField: '', orderByField: '',
tagList: [] tagList: [],
selectValue: '',
selectValueTwo: ''
} }
}, },
watch: { watch: {
@@ -180,86 +180,55 @@
} }
}, },
pageOnChange(page, pageSize) { pageOnChange(page, pageSize) {
this.queryParam = { ...this.queryParamOne, ...this.searchQueryOne }
this.pageNo = page this.pageNo = page
this.getParagraphInfoList(1) this.getParagraphInfoList()
}, },
SizeChange(page, pageSize) { SizeChange(page, pageSize) {
this.queryParam = { ...this.queryParamOne, ...this.searchQueryOne }
this.pageNo = 1 this.pageNo = 1
this.pageSize = pageSize this.pageSize = pageSize
this.getParagraphInfoList(1) this.getParagraphInfoList()
}, },
searchReset() { searchReset() {
this.pageNo = 1 this.pageNo = 1
this.queryParamOne = {} this.queryParamOne = {}
this.queryParam = { ...this.queryParamOne, ...this.searchQueryOne } this.getParagraphInfoList()
this.queryParamSeach = ''
this.getParagraphInfoList(1)
}, },
searchQuery() { searchQuery() {
this.ParamSeach()
this.queryParam = { ...this.queryParamOne, ...this.searchQueryOne }
this.pageNo = 1 this.pageNo = 1
this.getParagraphInfoList(1) this.getParagraphInfoList()
}, },
ParamSeach() { searchData(value) {
let queryParam = JSON.parse(JSON.stringify(this.searchQueryOne)) this.queryParam.selectValue = value || undefined
if (queryParam[this.selectModel]) { this.queryParam.selectValueTwo = undefined
this.queryParamSeach = this.selectModelName + '：' + queryParam[this.selectModel]
} else {
this.queryParamSeach = ''
}
},
searchData(data) {
this.queryParam = {}
this.searchQueryOne = data || {}
this.queryParam = { ...this.queryParamOne, ...data }
this.ParamSeach()
this.pageNo = 1 this.pageNo = 1
this.getParagraphInfoList(1) this.getParagraphInfoList()
}, },
searchDataTwo(data) { searchDataTwo(value) {
this.queryParam = {} this.queryParam.selectValueTwo = value
this.searchQueryOne = data || {}
this.queryParam = { ...this.queryParamOne, ...data }
this.ParamSeach()
this.pageNo = 1 this.pageNo = 1
this.getParagraphInfoList(2) this.getParagraphInfoList()
}, },
ResetSearch() { ResetSearch() {
this.queryParam = {} this.queryParam = {}
this.queryParamOne = {} this.queryParamOne = {}
this.searchQueryOne = {}
this.checkboxText = [] this.checkboxText = []
this.selectedRowKeys = []
this.ParamSeach()
this.pageNo = 1 this.pageNo = 1
this.getParagraphInfoList(1) this.getParagraphInfoList()
}, },
getParagraphInfoList(num) { getParagraphInfoList() {
let queryParam = JSON.parse(JSON.stringify(this.queryParam)) let queryParamOne = Object.assign(this.queryParam, this.queryParamOne)
let queryParam = JSON.parse(JSON.stringify(queryParamOne))
Object.keys(queryParam).forEach(val => { Object.keys(queryParam).forEach(val => {
if (queryParam[val] instanceof Array) { if (queryParam[val] instanceof Array) {
queryParam[val] = queryParam[val].join(',') queryParam[val] = queryParam[val].join(',')
} }
if (val.includes('_name')) {
delete queryParam[val]
}
}) })
this.mapTwo = {} let checkboxText = JSON.parse(JSON.stringify(this.checkboxText))
if (num == 1) {
this.mapOne = queryParam
} else if (num == 2) {
this.mapTwo = queryParam
let checkboxText = JSON.parse(JSON.stringify(this.checkboxText))
this.mapTwo.ids = checkboxText.join(',')
}
let query = { let query = {
pageNo: this.pageNo, pageNo: this.pageNo,
pageSize: this.pageSize, pageSize: this.pageSize,
mapOne: this.mapOne, ids: checkboxText.join(','),
mapTwo: this.mapTwo ...queryParam
} }
this.loading = true this.loading = true
postAction(this.url.getParagraphInfoList, query).then((res) => { postAction(this.url.getParagraphInfoList, query).then((res) => {