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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
wangzhijiang
2022-03-11 10:09:49 +08:00
parent f46ba6f34f 86e4f56f90
commit 36e444fce2
3 changed files with 46 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-web/src/components/currencySearch/index.vue
+21 -6
View File
@@ -3,7 +3,21 @@
<a-row :gutter="24"> <a-row :gutter="24">
<a-col :md="12" :sm="8" v-for="(item,index) in searchList" :key="index" style="line-height: 48px"> <a-col :md="12" :sm="8" v-for="(item,index) in searchList" :key="index" style="line-height: 48px">
<template> <template>
<div class="box-title-text" v-if="item.field_show_type == '1'"> <div class="box-title-text" v-if="item.field_show_type == '0'">
<div class="title-text" :title="item.db_field_txt">
<span>{{item.db_field_txt}}</span>
</div>
<a-tree-select
class="box-input"
v-model="queryParam[item.db_field_name]"
:maxTagCount="1"
:tree-data="item.tree"
tree-checkable
:placeholder="$t('PleaseSelect')+item.db_field_txt"
/>
</div>
<div class="box-title-text" v-else-if="item.field_show_type == '1' || item.field_show_type == '8' ||
item.field_show_type == '9' || item.field_show_type == '10' || item.field_show_type == '11'">
<div class="title-text" :title="item.db_field_txt"> <div class="title-text" :title="item.db_field_txt">
<span>{{item.db_field_txt}}</span> <span>{{item.db_field_txt}}</span>
</div> </div>
@@ -17,7 +31,7 @@
<a-input-number class="box-input" :placeholder="$t('PleaseEnter')+item.db_field_txt" <a-input-number class="box-input" :placeholder="$t('PleaseEnter')+item.db_field_txt"
v-model="queryParam[item.db_field_name]" :min="1" :max="99999999"/> v-model="queryParam[item.db_field_name]" :min="1" :max="99999999"/>
</div> </div>
<div class="box-title-text" v-else-if="item.field_show_type == '3'"> <div class="box-title-text" v-else-if="item.field_show_type == '4'">
<div class="title-text" :title="item.db_field_txt"> <div class="title-text" :title="item.db_field_txt">
<span>{{item.db_field_txt}}</span> <span>{{item.db_field_txt}}</span>
</div> </div>
@@ -42,7 +56,7 @@
@change="dateChange(item.db_field_name)" @change="dateChange(item.db_field_name)"
v-model="queryParam[item.db_field_name]"/> v-model="queryParam[item.db_field_name]"/>
</div> </div>
<div class="box-title-text" v-else-if="item.field_show_type == '4'"> <div class="box-title-text" v-else-if="item.field_show_type == '3'">
<div class="title-text" :title="item.db_field_txt"> <div class="title-text" :title="item.db_field_txt">
<span>{{item.db_field_txt}}</span> <span>{{item.db_field_txt}}</span>
</div> </div>
@@ -53,7 +67,8 @@
</div> </div>
</template> </template>
</a-col> </a-col>
<span style="float: right;overflow: hidden;margin-right: 41px;margin-bottom: 20px" class="table-page-search-submitButtons"> <span style="float: right;overflow: hidden;margin-right: 41px;margin-bottom: 20px"
class="table-page-search-submitButtons">
<a-button class="box-button" type="primary" @click="searchQuery">{{$t('query')}}</a-button> <a-button class="box-button" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
<a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button> <a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
</span> </span>
@@ -89,11 +104,11 @@
}, },
methods: { methods: {
searchQuery() { searchQuery() {
this.$emit('searchQuery', this.queryParam) this.$emit('searchQuery', JSON.parse(JSON.stringify(this.queryParam)))
}, },
searchReset() { searchReset() {
this.queryParam = {} this.queryParam = {}
this.$emit('searchReset', this.queryParam) this.$emit('searchReset', JSON.parse(JSON.stringify(this.queryParam)))
}, },
getSeach() { getSeach() {
let params = { let params = {
jero-web/src/components/search/index.vue
+5 -4
View File
@@ -16,7 +16,7 @@
:placeholder="$t('PleaseSelect')+item.db_field_txt" :placeholder="$t('PleaseSelect')+item.db_field_txt"
/> />
</div> </div>
<div class="box-title-text" v-if="item.field_show_type == '1' || item.field_show_type == '8' || <div class="box-title-text" v-else-if="item.field_show_type == '1' || item.field_show_type == '8' ||
item.field_show_type == '9' || item.field_show_type == '10' || item.field_show_type == '11'"> item.field_show_type == '9' || item.field_show_type == '10' || item.field_show_type == '11'">
<div class="title-text" :title="item.db_field_txt"> <div class="title-text" :title="item.db_field_txt">
<span>{{item.db_field_txt}}</span> <span>{{item.db_field_txt}}</span>
@@ -24,7 +24,7 @@
<a-input class="box-input" :placeholder="$t('PleaseEnter')+item.db_field_txt" <a-input class="box-input" :placeholder="$t('PleaseEnter')+item.db_field_txt"
v-model="queryParam[item.db_field_name]"></a-input> v-model="queryParam[item.db_field_name]"></a-input>
</div> </div>
<div class="box-title-text" v-if="item.field_show_type == '2'"> <div class="box-title-text" v-else-if="item.field_show_type == '2'">
<div class="title-text" :title="item.db_field_txt"> <div class="title-text" :title="item.db_field_txt">
<span>{{item.db_field_txt}}</span> <span>{{item.db_field_txt}}</span>
</div> </div>
@@ -81,14 +81,15 @@
:placeholder="$t('PleaseSelect')+item.db_field_txt" :placeholder="$t('PleaseSelect')+item.db_field_txt"
/> />
</div> </div>
<div class="box-title-text" v-if="item.field_show_type == '1'"> <div class="box-title-text" v-else-if="item.field_show_type == '1' || item.field_show_type == '8' ||
item.field_show_type == '9' || item.field_show_type == '10' || item.field_show_type == '11'">
<div class="title-text" :title="item.db_field_txt"> <div class="title-text" :title="item.db_field_txt">
<span>{{item.db_field_txt}}</span> <span>{{item.db_field_txt}}</span>
</div> </div>
<a-input class="box-input" :placeholder="$t('PleaseEnter')+item.db_field_txt" <a-input class="box-input" :placeholder="$t('PleaseEnter')+item.db_field_txt"
v-model="queryParam[item.db_field_name]"></a-input> v-model="queryParam[item.db_field_name]"></a-input>
</div> </div>
<div class="box-title-text" v-if="item.field_show_type == '2'"> <div class="box-title-text" v-else-if="item.field_show_type == '2'">
<div class="title-text" :title="item.db_field_txt"> <div class="title-text" :title="item.db_field_txt">
<span>{{item.db_field_txt}}</span> <span>{{item.db_field_txt}}</span>
</div> </div>
jero-web/src/views/documentTools/searchCenter/components/DocumentLibrary.vue
+20 -15
View File
@@ -3,15 +3,18 @@
<div class="search-text-wrap"> <div class="search-text-wrap">
<div class="text-left"> <div class="text-left">
<div class="text-left-wrap"> <div class="text-left-wrap">
<div class="text-left-select" v-for="item in searchOption" :key="item.id"> <div v-for="item in searchOption" :key="item.id">
<span class="text-sel">{{item.value}}</span> <div class="text-left-select">
<a-select class="text-select" :default-value="item.option[0].value" style="width: 120px" <span class="text-sel">{{item.value}}</span>
@change="handleChange"> <a-select class="text-select" :default-value="item.option[0].value" style="width: 120px"
<a-select-option v-for="opt in item.option" :value="opt.value"> @change="handleChange">
{{opt.value}} <a-select-option v-for="opt in item.option" :value="opt.value">
</a-select-option> {{opt.value}}
</a-select> </a-select-option>
</a-select>
</div>
</div> </div>
<div class="text-left-select"> <div class="text-left-select">
<span class="text-sel">发布日期</span> <span class="text-sel">发布日期</span>
<a-date-picker class="text-select" @change="onChange"/> <a-date-picker class="text-select" @change="onChange"/>
@@ -39,7 +42,6 @@
v-if="isTrue" v-if="isTrue"
ref="table" ref="table"
size="middle" size="middle"
bordered
:scroll="{x: true}" :scroll="{x: true}"
rowKey="id" rowKey="id"
:data-source="tableData" :data-source="tableData"
@@ -53,7 +55,7 @@
<a @click="subscribe(record)" class="text-operation"> <a @click="subscribe(record)" class="text-operation">
{{!record.subscribeFlag || record.subscribeFlag == 0 ? $t('subscribe') :$t('CancelSubscribe')}} {{!record.subscribeFlag || record.subscribeFlag == 0 ? $t('subscribe') :$t('CancelSubscribe')}}
</a> </a>
<a> {{$t('Push')}}</a> <a @click="handleCompare(record)" class="text-operation"> {{$t('Push')}}</a>
</span> </span>
<!-- 字符串超长截取省略号显示--> <!-- 字符串超长截取省略号显示-->
<!-- <span slot="templateContent" slot-scope="text">--> <!-- <span slot="templateContent" slot-scope="text">-->
@@ -106,9 +108,10 @@
import eventBUs from '../../../../common/event' import eventBUs from '../../../../common/event'
import { getAction, postAction } from '@/api/manage' import { getAction, postAction } from '@/api/manage'
import libraryPush from '@/components/libraryPush/index' import libraryPush from '@/components/libraryPush/index'
export default { export default {
name: 'DocumentLibrary', name: 'DocumentLibrary',
components:{ components: {
libraryPush libraryPush
}, },
data() { data() {
@@ -220,9 +223,11 @@
] ]
} }
], ],
tableData: [], tableData: [
url:{ {}
pullMessage: 'document/bussDocumentLibraryEO/pullMessage',//推送 ],
url: {
pullMessage: 'document/bussDocumentLibraryEO/pullMessage'//推送
}, },
columns: [ columns: [
{ {
@@ -415,7 +420,7 @@
}, },
//推送 //推送
handleCompare(val) { handleCompare(val) {
let item = JSON.parse(JSON.stringify(val)) let item = JSON.parse(JSON.stringify(val))
this.$nextTick(() => { this.$nextTick(() => {
this.$refs.libraryPushRef.visible = true this.$refs.libraryPushRef.visible = true
this.$refs.libraryPushRef.tableKey = item.id.split(',') this.$refs.libraryPushRef.tableKey = item.id.split(',')