高级检索&样式修改

This commit is contained in:
宋伟佳
2021-05-26 19:35:21 +08:00
parent 433d101700
commit cf3f4fe7ae
7 changed files with 80 additions and 74 deletions
+4
View File
@@ -99,6 +99,10 @@ export const m = {
country: '国家', country: '国家',
tableName: '表格名称', tableName: '表格名称',
applicableModels: '适用车型', applicableModels: '适用车型',
applicableProductLine: '适用产品线',
associatedModule: '关联模块',
searchByApplicableProductLine: '根据适用产品线查找',
SearchByAssociatedModule: '根据关联模块查找',
typesOfEnergy: '能源种类', typesOfEnergy: '能源种类',
pleaseSelectRegion: '请选择区域', pleaseSelectRegion: '请选择区域',
lookUpByTableName: '根据表格名称查找', lookUpByTableName: '根据表格名称查找',
+7 -4
View File
@@ -8,14 +8,16 @@
<slot name="content"></slot> <slot name="content"></slot>
</div> </div>
<div class="advanced-search-footer"> <div class="advanced-search-footer">
<el-button icon="el-icon-search" <el-button size="small"
type="primary" type="primary"
class="common-button-primary" class="common-button-primary"
round @click="advancedSearch" style="margin-right: 5px" >{{$t('m.advancedSearch')}}</el-button> @click="advancedSearch" style="margin-right: 5px" >{{$t('m.search')}}</el-button>
<el-button @click="reset" <el-button @click="reset"
class="common-button-default" class="common-button-default"
icon="el-icon-refresh-left" size="small"
round></el-button> >
清空
</el-button>
</div> </div>
</div> </div>
</transition> </transition>
@@ -114,6 +116,7 @@ export default {
padding: 8px 20px; padding: 8px 20px;
.flex(); .flex();
justify-content: flex-end; justify-content: flex-end;
margin-top: -20px;
} }
} }
.tools-bar-wrapper{ .tools-bar-wrapper{
+16 -24
View File
@@ -11,16 +11,14 @@
</el-form-item> </el-form-item>
<el-form-item class="search-item btn-box"> <el-form-item class="search-item btn-box">
<el-button <el-button
icon="el-icon-search" size="mini"
type="primary" type="primary"
round
class="common-button-primary" class="common-button-primary"
@click="searchStandList"></el-button> @click="searchStandList">搜索</el-button>
<el-button <el-button
size="mini"
class="common-button-default" class="common-button-default"
icon="el-icon-refresh-left" @click="clearSearchStand">清空</el-button>
round
@click="clearSearchStand"></el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>
@@ -28,10 +26,10 @@
</table-tools-bar> </table-tools-bar>
<div class="content"> <div class="content">
<div class="action-bar"> <div class="action-bar">
<el-button size="mini" round @click="spiltStandFile" v-btn-permission="'6ZQ7ZZH4PTUYTUE5YQG4'"><i class="iconfont"></i>拆分</el-button> <el-button size="mini" @click="spiltStandFile" v-btn-permission="'6ZQ7ZZH4PTUYTUE5YQG4'"><i class="iconfont"></i>拆分</el-button>
<el-button size="mini" round @click="clickButtonToUpload" v-btn-permission="'NDQVR2GRE97JRF5A2VJ2'"><i class="iconfont">&#xe65d;</i>上传</el-button> <el-button size="mini" @click="clickButtonToUpload" v-btn-permission="'NDQVR2GRE97JRF5A2VJ2'"><i class="iconfont">&#xe65d;</i>上传</el-button>
<el-button size="mini" round @click="clickButtonToImport" v-btn-permission="'EH3ADP8PE9C3SGTS7S7T'"><i class="iconfont">&#xe6de;</i>导入拆分结果</el-button> <el-button size="mini" @click="clickButtonToImport" v-btn-permission="'EH3ADP8PE9C3SGTS7S7T'"><i class="iconfont">&#xe6de;</i>导入拆分结果</el-button>
<el-button size="mini" round @click="batchDelete" v-btn-permission="'9AC5CEZETGQTY4L9YRBP'"><i class="iconfont">&#xe61b;</i>删除</el-button> <el-button size="mini" @click="batchDelete" v-btn-permission="'9AC5CEZETGQTY4L9YRBP'"><i class="iconfont">&#xe61b;</i>删除</el-button>
</div> </div>
<div class="table-wrap"> <div class="table-wrap">
<div style="position: absolute;height: 100%;width: 100%;"> <div style="position: absolute;height: 100%;width: 100%;">
@@ -168,7 +166,6 @@
</el-form-item> </el-form-item>
<el-form-item class="search-item btn-box"> <el-form-item class="search-item btn-box">
<el-button <el-button
round
icon="el-icon-search" icon="el-icon-search"
type="primary" type="primary"
class="common-button-primary" class="common-button-primary"
@@ -178,7 +175,6 @@
<el-form-item class="serch-form-item btn-box"> <el-form-item class="serch-form-item btn-box">
<el-button <el-button
icon="el-icon-refresh-left" icon="el-icon-refresh-left"
round
class="common-button-default" class="common-button-default"
@click="clearGetStandFileListByPage" @click="clearGetStandFileListByPage"
></el-button> ></el-button>
@@ -239,8 +235,8 @@
@pageSizeChange="addFileStandPageSizeChange"></pagination> @pageSizeChange="addFileStandPageSizeChange"></pagination>
</div> </div>
<div class="demo-drawer-footer"> <div class="demo-drawer-footer">
<el-button size="mini" round style="margin-right: 8px" @click="addFileConvertShowflag = false" icon="el-icon-close" >取消</el-button> <el-button size="mini" style="margin-right: 8px" @click="addFileConvertShowflag = false" icon="el-icon-close" >取消</el-button>
<el-button size="mini" round type="primary" @click="saveSplitInfo" icon="el-icon-check" >拆分</el-button> <el-button size="mini" type="primary" @click="saveSplitInfo" icon="el-icon-check" >拆分</el-button>
</div> </div>
<loading :loading="loadData">正在获取数据</loading> <loading :loading="loadData">正在获取数据</loading>
</el-drawer> </el-drawer>
@@ -377,7 +373,7 @@
name="file" name="file"
:on-change="handleUploadChange2" :on-change="handleUploadChange2"
ref="importFileAboutStand"> ref="importFileAboutStand">
<el-button size="mini" round icon="el-icon-upload">{{$t('m.upload')}}</el-button> <el-button size="mini" icon="el-icon-upload">{{$t('m.upload')}}</el-button>
</el-upload> </el-upload>
</el-form-item> </el-form-item>
<div style="text-align: center"> <div style="text-align: center">
@@ -489,8 +485,8 @@
ref="importFileAboutStand" ref="importFileAboutStand"
:disabled="importSplitResultLoading" :disabled="importSplitResultLoading"
> >
<el-button size="mini" round icon="el-icon-upload">{{$t('m.upload')}}</el-button> <el-button size="mini" icon="el-icon-upload">{{$t('m.upload')}}</el-button>
<el-button size="mini" round @click="uploadImportModal" icon="el-icon-download">模板下载</el-button> <el-button size="mini" @click="uploadImportModal" icon="el-icon-download">模板下载</el-button>
</el-upload> </el-upload>
</el-form-item> </el-form-item>
<div style="text-align: center"> <div style="text-align: center">
@@ -550,13 +546,11 @@
icon="el-icon-search" icon="el-icon-search"
type="primary" type="primary"
class="common-button-primary" class="common-button-primary"
round
@click="getSearchSarBussStandPage"> @click="getSearchSarBussStandPage">
</el-button> </el-button>
<el-button <el-button
class="common-button-default" class="common-button-default"
icon="el-icon-refresh-left" icon="el-icon-refresh-left"
round
@click="handleResetCondition()" @click="handleResetCondition()"
></el-button> ></el-button>
</el-form-item> </el-form-item>
@@ -633,14 +627,12 @@
</div> </div>
<div class="demo-drawer-footer"> <div class="demo-drawer-footer">
<el-button <el-button
round
class="common-button-primary" class="common-button-primary"
icon="el-icon-check" icon="el-icon-check"
type="primary" type="primary"
@click="handleConfirm" @click="handleConfirm"
>确定</el-button> >确定</el-button>
<el-button <el-button
round
class="common-button-default" class="common-button-default"
icon="el-icon-close" icon="el-icon-close"
@click="handleCancel" @click="handleCancel"
@@ -1020,7 +1012,7 @@ export default {
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning', type: 'warning',
confirmButtonClass: 'common-button-primary', confirmButtonClass: 'common-button-primary',
roundButton: true roundButton: false
}).then(() => { }).then(() => {
this.$http.post('lawss/sarFileSplitInfo/batchDelete', { this.$http.post('lawss/sarFileSplitInfo/batchDelete', {
ids: this.selectedList.join(',') ids: this.selectedList.join(',')
@@ -1347,7 +1339,7 @@ export default {
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning', type: 'warning',
confirmButtonClass: 'common-button-primary', confirmButtonClass: 'common-button-primary',
roundButton: true roundButton: false
}).then(() => { }).then(() => {
this.spinShow = true this.spinShow = true
let nowstandItem = JSON.parse(JSON.stringify(data)) let nowstandItem = JSON.parse(JSON.stringify(data))
@@ -1454,7 +1446,7 @@ export default {
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning', type: 'warning',
confirmButtonClass: 'common-button-primary', confirmButtonClass: 'common-button-primary',
roundButton: true roundButton: false
}).then(() => { }).then(() => {
this.$http.post('lawss/sarFileSplitInfo/batchDelete', { this.$http.post('lawss/sarFileSplitInfo/batchDelete', {
ids: id ids: id
+4 -6
View File
@@ -16,16 +16,14 @@
</el-formItem> </el-formItem>
<el-formItem class="search-item btn-box"> <el-formItem class="search-item btn-box">
<el-button <el-button
icon="el-icon-search"
type="primary" type="primary"
round size="mini"
class="common-button-primary" class="common-button-primary"
@click="sarStandCompareHisInfo"></el-button> @click="sarStandCompareHisInfo">搜索</el-button>
<el-button <el-button
class="common-button-default" class="common-button-default"
icon="el-icon-refresh-left" size="mini"
round @click="clearSearchStand">清空</el-button>
@click="clearSearchStand"></el-button>
</el-formItem> </el-formItem>
</el-form> </el-form>
</div> </div>
@@ -4,10 +4,10 @@
<div class="action-bar"> <div class="action-bar">
<div slot="left"> <div slot="left">
<!-- <el-button type="primary" @click="changeData">转化</Button>--> <!-- <el-button type="primary" @click="changeData">转化</Button>-->
<el-button size="mini" round @click="uploadPdf" v-btn-permission="'MFQVKD5T76BL5VVZC3U2'" <el-button size="mini" @click="uploadPdf" v-btn-permission="'MFQVKD5T76BL5VVZC3U2'"
><i class="iconfont">&#xe65d;</i>上传</el-button ><i class="iconfont">&#xe65d;</i>上传</el-button
> >
<el-button size="mini" round @click="delData" v-btn-permission="'QJ2GMGUUE5ZZ9PL37BHM'" <el-button size="mini" @click="delData" v-btn-permission="'QJ2GMGUUE5ZZ9PL37BHM'"
><i class="iconfont">&#xe61b;</i>删除</el-button ><i class="iconfont">&#xe61b;</i>删除</el-button
> >
</div> </div>
@@ -165,7 +165,6 @@
<el-button <el-button
type="primary" type="primary"
class="common-button-primary" class="common-button-primary"
round
>{{ $t("m.upload")+' PDF'}}</el-button >{{ $t("m.upload")+' PDF'}}</el-button
> >
</el-upload> </el-upload>
@@ -205,13 +204,12 @@
</el-form-item> </el-form-item>
</el-form> </el-form>
<div slot="footer"> <div slot="footer">
<el-button size="mini" round @click="cancel" icon="el-icon-close" <el-button size="mini" @click="cancel" icon="el-icon-close"
>取消</el-button >取消</el-button
> >
<el-button <el-button
size="mini" size="mini"
icon="el-icon-check" icon="el-icon-check"
round
class="common-button-primary add-button" class="common-button-primary add-button"
@click="uploadSave" @click="uploadSave"
type="primary" type="primary"
@@ -667,7 +665,7 @@ export default {
confirmButtonText: "确定", confirmButtonText: "确定",
cancelButtonText: "取消", cancelButtonText: "取消",
confirmButtonClass: "common-button-primary", confirmButtonClass: "common-button-primary",
roundButton: true, roundButton: false,
type: "warning", type: "warning",
}).then(() => { }).then(() => {
this.$http.delete( this.$http.delete(
@@ -699,7 +697,7 @@ export default {
cancelButtonText: "取消", cancelButtonText: "取消",
confirmButtonClass: "common-button-primary", confirmButtonClass: "common-button-primary",
type: "warning", type: "warning",
roundButton: true, roundButton: false,
}); });
} else { } else {
this.$confirm("确认删除这些数据?", "提示", { this.$confirm("确认删除这些数据?", "提示", {
@@ -707,7 +705,7 @@ export default {
cancelButtonText: "取消", cancelButtonText: "取消",
type: "warning", type: "warning",
confirmButtonClass: "common-button-primary", confirmButtonClass: "common-button-primary",
roundButton: true, roundButton: false,
}).then(() => { }).then(() => {
let idsList = []; let idsList = [];
this.selectTableData.map((item) => { this.selectTableData.map((item) => {
@@ -868,14 +868,17 @@
<table-tools-bar v-model="isAdvancedSearch"> <table-tools-bar v-model="isAdvancedSearch">
<div slot="content"> <div slot="content">
<el-form :model="sarStandardsSearch" :inline="true" class="label-input-form" style="display: flex;flex-wrap: wrap"> <el-form :model="sarStandardsSearch" :inline="true" class="label-input-form" style="display: flex;flex-wrap: wrap">
<el-form-item :label="$t('m.standardNameOrFileName')" class="serch-form-item"> <!-- 标准号-->
<el-input v-model="sarStandardsSearch.standName" :placeholder="$t('m.searchByStandardName')" clearable :maxlength="500"
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
</el-form-item>
<el-form-item :label="$t('m.standardNo')" class="serch-form-item"> <el-form-item :label="$t('m.standardNo')" class="serch-form-item">
<el-input v-model="sarStandardsSearch.standNumber" :placeholder="$t('m.lookUpByStandardNumber')" clearable :maxlength="100" <el-input v-model="sarStandardsSearch.standNumber" :placeholder="$t('m.lookUpByStandardNumber')" clearable :maxlength="100"
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input> @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
</el-form-item> </el-form-item>
<!-- 标准名称-->
<el-form-item :label="$t('m.standName')" class="serch-form-item">
<el-input v-model="sarStandardsSearch.standName" :placeholder="$t('m.searchByStandardName')" clearable :maxlength="500"
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
</el-form-item>
<!-- 标准类别-->
<el-form-item :label="$t('m.standardCategory')" class="serch-form-item"> <el-form-item :label="$t('m.standardCategory')" class="serch-form-item">
<search-select <search-select
v-model="sarStandardsSearch.standSort" v-model="sarStandardsSearch.standSort"
@@ -884,35 +887,19 @@
:options="standSortOptions" :options="standSortOptions"
clearable/> clearable/>
</el-form-item> </el-form-item>
<el-form-item :label="$t('m.professionalField')" class="serch-form-item"> <!-- 标准状态-->
<search-select
v-model="sarStandardsSearch.category"
:placeholder="$t('m.searchByAreaOfExpertise')"
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"
:options="categoryOptions"
clearable/>
</el-form-item>
<el-form-item :label="$t('m.standNatureShow')" class="serch-form-item">
<el-select v-model="sarStandardsSearch.standNature" :placeholder="$t('m.findByStandardNature')" clearable
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
<el-option v-for="opt in standNatureOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}
</el-option>
</el-select>
</el-form-item>
<el-form-item :label="$t('m.standStateShow')" class="serch-form-item"> <el-form-item :label="$t('m.standStateShow')" class="serch-form-item">
<el-select v-model="sarStandardsSearch.standState" :placeholder="$t('m.lookupByStandardStatus')" clearable <el-select v-model="sarStandardsSearch.standState" :placeholder="$t('m.lookupByStandardStatus')" clearable
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"> @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
<el-option v-for="opt in standStateOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option> <el-option v-for="opt in standStateOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item :label="$t('m.abstract')" class="serch-form-item"> <!-- 代替标准号-->
<el-input v-model="sarStandardsSearch.synopsis" :placeholder="$t('m.findByContentSummary')" clearable :maxlength="100"
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
</el-form-item>
<el-form-item :label="$t('m.substituteStandardNumber')" class="serch-form-item"> <el-form-item :label="$t('m.substituteStandardNumber')" class="serch-form-item">
<el-input v-model="sarStandardsSearch.replaceStandNum" :placeholder="$t('m.lookUpByAlternativeCriteria')" clearable :maxlength="100" <el-input v-model="sarStandardsSearch.replaceStandNum" :placeholder="$t('m.lookUpByAlternativeCriteria')" clearable :maxlength="100"
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input> @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
</el-form-item> </el-form-item>
<!-- 适用车型-->
<el-form-item :label="$t('m.applicableModels')" class="serch-form-item"> <el-form-item :label="$t('m.applicableModels')" class="serch-form-item">
<search-select <search-select
v-model="sarStandardsSearch.applyArctic" v-model="sarStandardsSearch.applyArctic"
@@ -921,6 +908,23 @@
:options="applyArcticOptions" :options="applyArcticOptions"
clearable/> clearable/>
</el-form-item> </el-form-item>
<!-- 适用产品线(新增字段)-->
<el-form-item :label="$t('m.applicableProductLine')" class="serch-form-item">
<search-select
v-model="sarStandardsSearch.category"
:placeholder="$t('m.searchByApplicableProductLine')"
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"
:options="categoryOptions"
clearable/>
</el-form-item>
<!-- 关联模块(新增字段)-->
<el-form-item :label="$t('m.associatedModule')" class="serch-form-item">
<el-select v-model="sarStandardsSearch.standNature" :placeholder="$t('m.SearchByAssociatedModule')" clearable
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
<el-option v-for="opt in standNatureOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}
</el-option>
</el-select>
</el-form-item>
</el-form> </el-form>
</div> </div>
</table-tools-bar> </table-tools-bar>
@@ -1671,7 +1675,6 @@ export default {
}) })
const dynamicFormField = this.sarStandardsInfoEO const dynamicFormField = this.sarStandardsInfoEO
this.sarStandardsInfoEO.EOPSSRQ = this.$moment(this.sarStandardsInfoEO.EOPSSRQ).isValid() ? this.$moment(this.sarStandardsInfoEO.EOPSSRQ) : this.sarStandardsInfoEO.EOPSSRQ this.sarStandardsInfoEO.EOPSSRQ = this.$moment(this.sarStandardsInfoEO.EOPSSRQ).isValid() ? this.$moment(this.sarStandardsInfoEO.EOPSSRQ) : this.sarStandardsInfoEO.EOPSSRQ
this.sarStandardsInfoEO['id'] = item.id this.sarStandardsInfoEO['id'] = item.id
this.standState = JSON.parse(JSON.stringify(this.sarStandardsInfoEO.standState)) this.standState = JSON.parse(JSON.stringify(this.sarStandardsInfoEO.standState))
@@ -3755,12 +3758,23 @@ export default {
padding-top: 11px; padding-top: 11px;
} }
::v-deep .el-drawer__header{ ::v-deep .el-drawer__header {
&>span:first-child{ &>span:first-child{
outline: none!important; outline: none!important;
} }
} }
::v-deep .el-drawer{ ::v-deep .el-drawer {
outline: none!important; outline: none!important;
} }
.label-input-form {
/deep/.el-form-item__label {
width:100px;
}
/deep/.el-input__inner {
height: 35px;
line-height: 35px;
border-radius: 0 !important;
}
}
</style> </style>
@@ -18,7 +18,6 @@
icon="el-icon-search" icon="el-icon-search"
type="primary" type="primary"
class="common-button-primary" class="common-button-primary"
round
@click="searchBtn" @click="searchBtn"
></el-button> ></el-button>
</el-form-item> </el-form-item>
@@ -26,7 +25,6 @@
<el-button <el-button
class="common-button-default" class="common-button-default"
icon="el-icon-refresh-left" icon="el-icon-refresh-left"
round
@click="resetSearchForm">{{$t('m.clearQuery')}}</el-button> @click="resetSearchForm">{{$t('m.clearQuery')}}</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
@@ -38,7 +36,6 @@
<el-button <el-button
type="primary" type="primary"
class="common-button-primary add-button" class="common-button-primary add-button"
round
@click="openAddModel" @click="openAddModel"
v-btn-permission="'L8CEXYGB4TFUUWY8P89V'" v-btn-permission="'L8CEXYGB4TFUUWY8P89V'"
><i class="iconfont">&#xe84e;</i>新增</el-button> ><i class="iconfont">&#xe84e;</i>新增</el-button>
@@ -215,7 +212,7 @@
</el-form> </el-form>
</div> </div>
<div id="listFormButton" class="demo-drawer-footer"> <div id="listFormButton" class="demo-drawer-footer">
<el-button :loading="isSubmiting" round class="common-button-primary" icon="el-icon-check" type="primary" @click="submitDrawerForm('listVO')">{{$t('m.submit')}}</el-button> <el-button :loading="isSubmiting" class="common-button-primary" icon="el-icon-check" type="primary" @click="submitDrawerForm('listVO')">{{$t('m.submit')}}</el-button>
<el-button class="common-button-default" icon="el-icon-close" @click="drawerFormDrawerVisible = false">{{$t('m.cancel')}}</el-button> <el-button class="common-button-default" icon="el-icon-close" @click="drawerFormDrawerVisible = false">{{$t('m.cancel')}}</el-button>
</div> </div>
</el-drawer> </el-drawer>
@@ -615,7 +612,7 @@ export default {
confirmButtonText: '确定', confirmButtonText: '确定',
confirmButtonClass: 'common-button-primary', confirmButtonClass: 'common-button-primary',
cancelButtonText: '取消', cancelButtonText: '取消',
roundButton: true, roundButton: false,
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
this.$http.delete('sys/role/deleteList', { this.$http.delete('sys/role/deleteList', {
@@ -640,7 +637,7 @@ export default {
confirmButtonText: '确定', confirmButtonText: '确定',
confirmButtonClass: 'common-button-primary', confirmButtonClass: 'common-button-primary',
cancelButtonText: '取消', cancelButtonText: '取消',
roundButton: true, roundButton: false,
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
this.$http.post('lawss/sarStandCompareBase/deletesSarStandCompareBase', { this.$http.post('lawss/sarStandCompareBase/deletesSarStandCompareBase', {