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

This commit is contained in:
aixianling
2022-03-22 18:41:27 +08:00
18 changed files with 38 additions and 28 deletions

View File

@@ -13,7 +13,7 @@
</template>
<template #right>
<el-input size="small" placeholder="搜索姓名、手机号" v-model="search.name" clearable
@change="page.current=1,getTableData()"/>
v-throttle="() => {page.current = 1, getTableData()}"/>
</template>
</ai-search-bar>
<ai-table :tableData="tableData" :total="page.total" :current.sync="page.current" :size.sync="page.size"

View File

@@ -9,7 +9,8 @@
</template>
<template #right>
<el-input size="small" placeholder="搜索名称" v-model="search.name" clearable
@change="page.current=1,getTableData()"/>
@clear="page.current = 1,search.name = '', getTableData()"
v-throttle="() => {page.current = 1, getTableData()}"/>
</template>
</ai-search-bar>
<ai-table :tableData="tableData" :total="page.total" :current.sync="page.current" :size.sync="page.size"

View File

@@ -19,7 +19,7 @@
<ai-select v-model="status" placeholder="请选择" clearable :selectList="$dict.getDict('fpStatus')" @change="page.current=1,getTableData()"></ai-select>
</template>
<template #right>
<el-input placeholder="姓名/身份证/户主联系方式" v-model="search.name" size="small" clearable @change="page.current=1,getTableData()" suffix-icon="iconfont iconSearch"/>
<el-input placeholder="姓名/身份证/户主联系方式" v-model="search.name" size="small" @clear="page.current = 1,search.name = '', getTableData()" clearable v-throttle="() => {page.current = 1, getTableData()}" suffix-icon="iconfont iconSearch"/>
</template>
</ai-search-bar>
<ai-search-bar>

View File

@@ -20,7 +20,8 @@
v-model="search.name"
size="small"
clearable
@change="page.current=1,getTableData()"
@clear="page.current = 1,search.name = '', getTableData()"
v-throttle="() => {page.current = 1, getTableData()}"
suffix-icon="iconfont iconSearch"/>
</template>
</ai-search-bar>

View File

@@ -43,7 +43,7 @@
</template>
<template #right>
<el-input size="small" v-model="search.meetingAgenda" placeholder="会议标题/创建人"
suffix-icon="iconfont iconSearch" clearable @change="page.current=1,getAppThreeMeetingInfo()"/>
suffix-icon="iconfont iconSearch" v-throttle="() => {page.current = 1, getAppThreeMeetingInfo()}" clearable @clear="search.meetingAgenda = '', page.current=1,getAppThreeMeetingInfo()"/>
</template>
</ai-search-bar>
<ai-search-bar>

View File

@@ -16,7 +16,8 @@
size="small"
placeholder="请输入课程主题"
clearable
@change="search.current=1, getList()"
v-throttle="() => {search.current = 1, getList()}"
@clear="search.current=1, search.title = '', getList()"
suffix-icon="iconfont iconSearch">
</el-input>
</template>

View File

@@ -87,7 +87,7 @@
size="small"
v-model="search.con"
placeholder="姓名/身份证/联系方式"
@keyup.enter.native="search.current = 1, refreshTable()"
v-throttle="() => {search.current = 1, refreshTable()}"
@clear="search.current = 1, refreshTable()"
clearable
suffix-icon="iconfont iconSearch"/>

View File

@@ -75,7 +75,8 @@
placeholder="姓名/身份证号/联系方式"
prefix-icon="iconfont iconSearch"
clearable
@change="page.current=1,getTableData()"
@clear="page.current = 1,search.param = '', getTableData()"
v-throttle="() => {page.current = 1, getTableData()}"
/>
<el-button
type="primary"

View File

@@ -6,9 +6,8 @@
<ai-search-bar>
<template #right>
<el-input prefix-icon="iconfont iconSearch" v-model="search.title" placeholder="设备名、MAC号" clearable
@change="page.current=1,getTableData()" size="small"/>
<el-button type="primary" icon="iconfont iconSearch" @click="page.current=1,getTableData()">查询</el-button>
<el-button icon="iconfont iconResetting" @click="search={},page.current=1,getTableData()">重置</el-button>
@clear="page.current = 1,search.title = '', getTableData()"
v-throttle="() => {page.current = 1, getTableData()}" size="small"/>
</template>
</ai-search-bar>
<ai-table :tableData="tableData" :colConfigs="colConfigs" :total="page.total" :current.sync="page.current"

View File

@@ -27,7 +27,7 @@
size="small"
placeholder="事项名称/创建人"
@clear="search={},page.current=1,getList()"
@keyup.enter.native="page.current=1,getList()"
v-throttle="() => {page.current = 1, getList()}"
clearable
suffix-icon="iconfont iconSearch"/>
</template>

View File

@@ -15,6 +15,7 @@
size="mini"
placeholder="请输入部门名称"
v-model="unitName"
clearable
suffix-icon="iconfont iconSearch">
</el-input>
</div>

View File

@@ -51,8 +51,8 @@
<ai-uploader v-model="dialogInfo.imgUrl" @change="change" :instance="instance" :limit="1"></ai-uploader>
</el-form-item>
<!-- 活动名称 -->
<el-form-item label="活动名称" prop="title">
<el-input placeholder="请输入活动名称" :maxlength="30" show-word-limit v-model="dialogInfo.title"></el-input>
<el-form-item label="标题" prop="title">
<el-input placeholder="请输入标题" :maxlength="30" show-word-limit v-model="dialogInfo.title"></el-input>
</el-form-item>
<!-- 连接类型 -->
<el-form-item label="链接类型" prop="type">
@@ -74,13 +74,13 @@
<ai-info-item label="首页封面">
<span><img :src="dialogInfo.imgUrl" alt="" style="width:100px;height:100px;"/></span>
</ai-info-item>
<ai-info-item label="活动名称:">
<ai-info-item label="标题">
<span>{{ dialogInfo.title }}</span>
</ai-info-item>
<ai-info-item label="链接类型">
<ai-info-item label="链接类型">
<span>{{ this.dict.getLabel('bannerType', dialogInfo.type) }}</span>
</ai-info-item>
<ai-info-item label="链接">
<ai-info-item label="链接">
<span>{{ dialogInfo.linkUrl }}</span>
</ai-info-item>
</ai-wrapper>
@@ -135,7 +135,7 @@ export default {
// fileList: '',
formRules: {
imgUrl: [{required: true, message: '请添加图片', trigger: 'blur'}],
title: [{required: true, message: '请输入活动名称', trigger: 'blur'}],
title: [{required: true, message: '请输入标题', trigger: 'blur'}],
type: [{required: true, trigger: 'blur'}],
// linkUrl: [{ required: true, message: '请输入链接', trigger: 'blur' }]
},
@@ -143,7 +143,7 @@ export default {
{prop: 'imgUrl', label: '首页封面', slot: 'imgUrl'},
{
prop: 'title',
label: '活动名称',
label: '标题',
'show-overflow-tooltip': true,
},

View File

@@ -55,8 +55,9 @@
<el-input placeholder="输入公文名称/编号"
v-model="searchObj.name"
size="small"
@change="(page.current = 1), getList()"
v-throttle="() => {page.current = 1, getList()}"
clearable
@clear="page.current = 1, searchObj.name = '', getList()"
prefix-icon="iconfont iconSearch"/>
</template>
</ai-search-bar>
@@ -192,7 +193,7 @@ export default {
];
},
},
mounted() {
created() {
this.dict.load('officialDocumentName', 'officialDocumentConfidentialityLevel', 'officialDocumentReadType', 'documentStatus').then(() => {
this.$nextTick(() => this.getList())
})

View File

@@ -25,7 +25,8 @@
</template>
<template #right>
<el-input suffix-icon="iconfont iconSearch" v-model="search.name" placeholder="姓名/手机号码" clearable
@change="page.current=1,getTableData()" size="small"/>
@clear="page.current = 1,search.name = '', getTableData()"
v-throttle="() => {page.current = 1, getTableData()}" size="small"/>
</template>
</ai-search-bar>

View File

@@ -9,7 +9,8 @@
</template>
<template #right>
<el-input size="small" placeholder="搜索证书名称" v-model="search.condition" clearable
@change="page.current=1,getTableData()"/>
@clear="page.current = 1,search.condition = '', getTableData()"
v-throttle="() => {page.current = 1, getTableData()}"/>
</template>
</ai-search-bar>
<ai-table :tableData="tableData" :total="page.total" :current.sync="page.current" :size.sync="page.size"

View File

@@ -9,7 +9,8 @@
</template>
<template #right>
<el-input size="small" placeholder="搜索名称" v-model="search.condition" clearable
@change="page.current=1,getTableData()"/>
@clear="page.current = 1,search.condition = '', getTableData()"
v-throttle="() => {page.current = 1, getTableData()}"/>
</template>
</ai-search-bar>
<ai-table :tableData="tableData" :total="page.total" :current.sync="page.current" :size.sync="page.size"

View File

@@ -15,6 +15,7 @@
size="mini"
placeholder="请输入地区名称"
v-model="unitName"
clearable
suffix-icon="iconfont iconSearch">
</el-input>
</div>

View File

@@ -5,10 +5,11 @@
<template #content>
<ai-search-bar>
<template #right>
<el-input prefix-icon="iconfont iconSearch" v-model="search.title" placeholder="设备名、MAC号" clearable
@change="page.current=1,getTableData()" size="small"/>
<el-button type="primary" icon="iconfont iconSearch" @click="page.current=1,getTableData()">查询</el-button>
<el-button icon="iconfont iconResetting" @click="search={},page.current=1,getTableData()">重置</el-button>
<el-input
prefix-icon="iconfont iconSearch"
v-model="search.title" placeholder="设备名、MAC号" clearable
@clear="page.current = 1,search.title = '', getTableData()"
v-throttle="() => {page.current = 1, getTableData()}" size="small"/>
</template>
</ai-search-bar>
<ai-table :tableData="tableData" :colConfigs="colConfigs" :total="page.total" :current.sync="page.current"