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

修改禅道已知bug

Browse Source
This commit is contained in:
qq787203167
2022-03-30 14:23:02 +08:00
parent 9692401b1e
commit 94a25c4b7a
4 changed files with 30 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-web/src/components/libraryAddForm/index.vue
+1 -2
View File
@@ -97,7 +97,6 @@
</div>
<a-form-model-item class="itemModel" :prop="item.db_field_name">
<a-range-picker class="box-input" v-model="formInline[item.db_field_name]"
:placeholder="$t('PleaseSelect')+item.db_field_txt"
:disabled="disabled"
@change="onChange(item.db_field_name)"></a-range-picker>
</a-form-model-item>
@@ -124,7 +123,7 @@
</div>
</a-col>
<a-col :span="24" v-else-if="item.field_show_type === '8'">
<a-col :span="24" v-else-if="item.field_show_type === '8' || item.field_show_type === 'text'">
<div class="box-title-text">
<div class="title-text">
<span class="Required" v-if="item.field_must_input == 1">*</span>
jero-web/src/views/documentManage/library/docDetail/index.vue
+1 -1
View File
@@ -136,7 +136,7 @@
:loading="loading"
>
<span slot="content" slot-scope="text,record">
<a-tooltip placement="top">
<a-tooltip placement="topLeft">
<template slot="title">
<span v-html="text"></span>
</template>
jero-web/src/views/documentTools/searchCenter/components/DocumentLibrary.vue
+16 -18
View File
@@ -318,6 +318,7 @@
queryParamSeach: '',
mapOne: {},
mapTwo: {},
selectModelName: '',
queryParamOne: {},
searchQueryOne: {}
}
@@ -443,14 +444,14 @@
})
},
dateChange(item) {
this.queryParamOne[item] = moment(this.queryParamOne[item]).format('YYYY-MM-DD')
this.queryParamOne[item + '_name'] = moment(this.queryParamOne[item]).format('YYYY-MM-DD')
this.queryParamOne[item] = this.queryParamOne[item] ? moment(this.queryParamOne[item]).format('YYYY-MM-DD') : ''
this.queryParamOne[item + '_name'] = this.queryParamOne[item + '_name'] ? moment(this.queryParamOne[item + '_name']).format('YYYY-MM-DD') : ''
},
onChange(item) {
let dateOne = moment(this.queryParamOne[item][0]).format('YYYY-MM-DD')
let dateTwo = moment(this.queryParamOne[item][1]).format('YYYY-MM-DD')
this.queryParamOne[item] = [dateOne, dateTwo]
this.queryParamOne[item + '_name'] = [dateOne, dateTwo]
this.queryParamOne[item] = dateOne ? [dateOne, dateTwo] : []
this.queryParamOne[item + '_name'] = dateOne ? [dateOne, dateTwo] : []
},
getCondition() {
let query = {
@@ -493,23 +494,19 @@
this.db_field_name = db_field_name
},
ParamSeach() {
let queryParam = JSON.parse(JSON.stringify(this.queryParamOne))
this.queryParamSeach = ''
Object.keys(queryParam).forEach(val => {
if (queryParam[val] instanceof Array) {
queryParam[val] = queryParam[val].join(',')
}
if (val.includes('_name')) {
this.queryParamSeach = this.queryParamSeach + queryParam[val] + ','
}
})
this.queryParamSeach = this.queryParamSeach.substr(0, this.queryParamSeach.length - 1)
let queryParam = JSON.parse(JSON.stringify(this.searchQueryOne))
if (queryParam[this.selectModel]) {
this.queryParamSeach = this.selectModelName + '：' + queryParam[this.selectModel]
} else {
this.queryParamSeach = ''
}
},
searchData(data, selectModel) {
searchData(data, selectModel, name) {
this.queryParam = {}
this.searchQueryOne = data || {}
this.queryParam = { ...this.queryParamOne, ...data }
this.selectModel = selectModel
this.selectModelName = name
this.ParamSeach()
this.pageNo = 1
if (this.isTrue) {
@@ -518,11 +515,12 @@
this.getParagraphInfoList(1)
}
},
searchDataTwo(data, selectModel) {
searchDataTwo(data, selectModel, name) {
this.queryParam = {}
this.searchQueryOne = data || {}
this.queryParam = { ...this.queryParamOne, ...data }
this.selectModel = selectModel
this.selectModelName = name
this.ParamSeach()
this.pageNo = 1
if (this.isTrue) {
@@ -636,7 +634,7 @@
let newUrl = this.$router.resolve({
path: '/docManage/library/detail',
query: {
id: item.id.slice(0,32),
id: item.id.slice(0, 32),
title: item.title,
serial_number: item.serial_number
}
jero-web/src/views/documentTools/searchCenter/index.vue
+12 -2
View File
@@ -71,6 +71,7 @@
queryCondition: 'search/document/queryCondition'
},
selectModel: '',
selectModelName: '',
queryParam: {},
selectValueTwo: ''
}
@@ -86,7 +87,7 @@
onSearch(event) {
this.queryParam[this.selectModel] = event
if (this.$refs.DocumentLibraryRef) {
this.$refs.DocumentLibraryRef.searchData(this.queryParam, this.selectModel)
this.$refs.DocumentLibraryRef.searchData(this.queryParam, this.selectModel, this.selectModelName)
}
},
wholeOnSearch(event) {
@@ -99,7 +100,7 @@
this.$refs.wholeRef.searchDataTwo(event)
} else if (this.$refs.DocumentLibraryRef) {
this.queryParam[this.selectModel] = event
this.$refs.DocumentLibraryRef.searchDataTwo(this.queryParam, this.selectModel)
this.$refs.DocumentLibraryRef.searchDataTwo(this.queryParam, this.selectModel, this.selectModelName)
}
},
getCondition() {
@@ -112,6 +113,7 @@
this.searchOption = res.result || []
if (this.searchOption.length > 0) {
this.selectModel = this.searchOption[0].db_field_name
this.selectModelName = this.searchOption[0].db_field_txt
}
} else {
this.searchOption = []
@@ -119,6 +121,14 @@
})
},
selectModelChange(event) {
let content = this.searchOption.filter((res) => {
return res.db_field_name === event
})
if (content && content.length > 0) {
this.selectModelName = content[0].db_field_txt
} else {
this.selectModelName = ''
}
this.queryParam = {}
}
}