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-05-23 17:20:08 +08:00
parent 0e212adbae
commit a1e0d47009
3 changed files with 273 additions and 168 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-web/src/views/documentManage/collection/index.vue
+89 -44
View File
@@ -3,37 +3,46 @@
<a-card :bordered="false"> <a-card :bordered="false">
<div class="collection-search-wrapper"> <div class="collection-search-wrapper">
<div class="collection-search-header"> <div class="collection-search-header">
<a-form layout="inline" @keyup.enter.native="searchQuery(queryParams)"> <div class="table-page-search-wrapper">
<a-form-model <a-row :gutter="24">
class="collection-content"
:model="queryParams"
ref="tagEditForm"
>
<a-row :gutter="24" type="flex" justify="start">
<a-col :md="6" :sm="8"> <a-col :md="6" :sm="8">
<a-form-model-item :label="$t('standard')"> <div class="box-title-text">
<a-input :placeholder="$t('enterNumber')" v-model="queryParams.serialNumber"></a-input> <div class="title-text" :title="$t('standard')">
</a-form-model-item> <span>{{$t('standard')}}</span>
</div>
<a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('standard')"
v-model="queryParams.serialNumber"></a-input>
</div>
</a-col> </a-col>
<a-col :md="6" :sm="8"> <a-col :md="6" :sm="8">
<a-form-model-item :label="$t('title')"> <div class="box-title-text">
<a-input :placeholder="$t('enterTitle')" v-model="queryParams.title"></a-input> <div class="title-text" :title="$t('title')">
</a-form-model-item> <span>{{$t('title')}}</span>
</div>
<a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('title')"
v-model="queryParams.title"></a-input>
</div>
</a-col> </a-col>
<a-col :md="6" :sm="8"> <a-col :md="6" :sm="8">
<a-form-model-item :label="$t('status')"> <div class="box-title-text">
<j-dict-select-tag type="list" v-model="queryParams.state" dictCode="file_type" :placeholder="$t('selectStatus')" /> <div class="title-text" :title="$t('status')">
</a-form-model-item> <span>{{$t('status')}}</span>
</div>
<j-dict-select-tag class="box-input" v-model="queryParams.state"
:placeholder="$t('PleaseSelect')+$t('status')"
:type="'select'"
:triggerChange="false" :dictCode="'state'"/>
</div>
</a-col>
<span style="float: right;overflow: hidden;margin-right: 11px"
class="table-page-search-submitButtons">
<a-col :md="6" :sm="24">
<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-col> </a-col>
<a-col :md="6" :sm="8">
<span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
<a-button type="primary" @click="searchQuery" icon="search">{{$t('query')}}</a-button>
<a-button @click="searchReset" icon="reload" style="margin-left: 8px">{{ $t('reset') }}</a-button>
</span> </span>
</a-col>
</a-row> </a-row>
</a-form-model> </div>
</a-form>
</div> </div>
</div> </div>
<div class="table-operator"> <div class="table-operator">
@@ -272,28 +281,64 @@
} }
} }
} }
</style> .box-title-text {
<style lang="less"> line-height: 1.4;
.collection{
.collection-content{
.ant-form-item-control-wrapper{
min-width: 180px;
}
}
}
.collection-search-header{
.ant-form-item-control-wrapper{
min-width: 200px;
.ant-form-item{
display: flex; display: flex;
} align-items: center;
} margin-bottom: 10px;
.ant-col-md-6{
display: flex;
}
.table-page-search-submitButtons{
float: none!important;
}
} }
.title-text {
width: 33px;
color: #000F16;
display: inline-block;
font-weight: 500;
font-size: 14px;
margin-right: 16px;
margin-top: 3px;
text-align: right;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
.box-input {
display: inline-block;
width: 100%;
height: 38px;
}
.box-button {
height: 38px;
}
</style>
<style lang="less">
/*.collection{*/
/* .collection-content{*/
/* .ant-form-item-control-wrapper{*/
/* min-width: 180px;*/
/* }*/
/* }*/
/*}*/
/*.collection-search-header{*/
/* .ant-form-item-control-wrapper{*/
/* min-width: 200px;*/
/* .ant-form-item{*/
/* display: flex;*/
/* }*/
/* }*/
/*.ant-col-md-6{*/
/* display: flex;*/
/*}*/
/*.table-page-search-submitButtons{*/
/* float: none!important;*/
/*}*/
/*}*/
.box-input .ant-select-selection__rendered {
line-height: 38px;
height: 38px;
}
.box-input .ant-select-selection--single {
height: 38px;
}
</style> </style>
jero-web/src/views/documentManage/splitting/modules/SplitAddForm.vue
+1 -1
View File
@@ -1398,6 +1398,6 @@
.box-input .ant-select-selection__rendered { .box-input .ant-select-selection__rendered {
line-height: 32px; line-height: 32px;
height: 32px; height: 32px;
overflow-y: auto; /*overflow-y: auto;*/
} }
</style> </style>
jero-web/src/views/documentManage/subscribtion/index.vue
+98 -38
View File
@@ -4,31 +4,46 @@
<div class="subscribtion-search-wrapper"> <div class="subscribtion-search-wrapper">
<div class="subscribtion-search-header"> <div class="subscribtion-search-header">
<!-- <search :url="url" :flag="'1'"></search>--> <!-- <search :url="url" :flag="'1'"></search>-->
<a-form layout="inline" @keyup.enter.native="searchQuery"> <div class="table-page-search-wrapper">
<a-row :gutter="24"> <a-row :gutter="24">
<a-col :md="6" :sm="6"> <a-col :md="6" :sm="8">
<a-form-item :label="$t('standard')"> <div class="box-title-text">
<a-input :placeholder="$t('enterNumber')" v-model="queryParams.serialNumber"></a-input> <div class="title-text" :title="$t('standard')">
</a-form-item> <span>{{$t('standard')}}</span>
</div>
<a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('standard')"
v-model="queryParams.serialNumber"></a-input>
</div>
</a-col> </a-col>
<a-col :md="6" :sm="6"> <a-col :md="6" :sm="8">
<a-form-item :label="$t('title')"> <div class="box-title-text">
<a-input :placeholder="$t('enterTitle')" v-model="queryParams.title"></a-input> <div class="title-text" :title="$t('title')">
</a-form-item> <span>{{$t('title')}}</span>
</div>
<a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('title')"
v-model="queryParams.title"></a-input>
</div>
</a-col> </a-col>
<a-col :md="6" :sm="6"> <a-col :md="6" :sm="8">
<a-form-item :label="$t('status')"> <div class="box-title-text">
<j-dict-select-tag type="list" v-model="queryParams.state" dictCode="file_type" :placeholder="$t('selectStatus')" /> <div class="title-text" :title="$t('status')">
</a-form-item> <span>{{$t('status')}}</span>
</div>
<j-dict-select-tag class="box-input" v-model="queryParams.state"
:placeholder="$t('PleaseSelect')+$t('status')"
:type="'select'"
:triggerChange="false" :dictCode="'state'"/>
</div>
</a-col>
<span style="float: right;overflow: hidden;margin-right: 11px"
class="table-page-search-submitButtons">
<a-col :md="6" :sm="24">
<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-col> </a-col>
<a-col :md="6" :sm="4">
<span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
<a-button type="primary" @click="searchQuery" icon="search">{{$t('query')}}</a-button>
<a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">{{$t('reset')}}</a-button>
</span> </span>
</a-col>
</a-row> </a-row>
</a-form> </div>
</div> </div>
</div> </div>
<div class="table-operator"> <div class="table-operator">
@@ -82,10 +97,11 @@
<script> <script>
import { getAction, postAction, deleteAction, putAction } from '@/api/manage' import { getAction, postAction, deleteAction, putAction } from '@/api/manage'
import SubArea from './module/SubArea' import SubArea from './module/SubArea'
export default { export default {
name: 'subscribtion', name: 'subscribtion',
components: { components: {
SubArea, SubArea
}, },
data() { data() {
return { return {
@@ -101,38 +117,38 @@
title: this.$t('standard'), title: this.$t('standard'),
dataIndex: 'serialNumber', dataIndex: 'serialNumber',
key: 'serialNumber', key: 'serialNumber',
align: "center", align: 'center',
width: 100, width: 100,
scopedSlots: { customRender: 'serialNumber' }, scopedSlots: { customRender: 'serialNumber' },
ellipsis: true, ellipsis: true
}, },
{ {
title: this.$t('title'), title: this.$t('title'),
align: "center", align: 'center',
width: 100, width: 100,
dataIndex: 'title', dataIndex: 'title',
scopedSlots: { customRender: 'serialtitle' }, scopedSlots: { customRender: 'serialtitle' },
ellipsis: true, ellipsis: true
}, },
{ {
title: this.$t('status'), title: this.$t('status'),
align: "center", align: 'center',
width: 100, width: 100,
dataIndex: 'state', dataIndex: 'state',
ellipsis: true, ellipsis: true
}, },
{ {
title: this.$t('subscriptionTime'), title: this.$t('subscriptionTime'),
align: "center", align: 'center',
width: 100, width: 100,
dataIndex: 'createTime', dataIndex: 'createTime',
ellipsis: true, ellipsis: true
}, },
{ {
title: this.$t('operation'), title: this.$t('operation'),
dataIndex: 'action', dataIndex: 'action',
scopedSlots: { customRender: 'action' }, scopedSlots: { customRender: 'action' },
align: "center", align: 'center',
width: 170 width: 170
} }
], ],
@@ -143,14 +159,14 @@
url: { url: {
tableHeader: 'subscribe/onlCgformSubscribe/getHeader', //表格头部字段 tableHeader: 'subscribe/onlCgformSubscribe/getHeader', //表格头部字段
seachList: 'subscribe/onlCgformSubscribe/queryCondition', //搜索字段 seachList: 'subscribe/onlCgformSubscribe/queryCondition', //搜索字段
tableList: 'subscribe/onlCgformSubscribe/page', //表格数据 tableList: 'subscribe/onlCgformSubscribe/page' //表格数据
}, },
OperationList: [ OperationList: [
{ {
text: this.$t('CancelSubscribe'), text: this.$t('CancelSubscribe'),
ClickEvent: 'onCancel' ClickEvent: 'onCancel'
} }
], ]
} }
}, },
mounted() { mounted() {
@@ -201,8 +217,9 @@
} }
}) })
}, },
onCancel() {}, onCancel() {
}); }
})
} else { } else {
this.$message.warning(this.$t('selectLeastOne')) this.$message.warning(this.$t('selectLeastOne'))
} }
@@ -229,8 +246,9 @@
} }
}) })
}, },
onCancel() {}, onCancel() {
}); }
})
}, },
//清空 //清空
searchReset() { searchReset() {
@@ -253,7 +271,7 @@
}, },
//选择框 //选择框
onSelectChange(rows) { onSelectChange(rows) {
this.selectedRowKeys = rows; this.selectedRowKeys = rows
// let ids=[] // let ids=[]
// if(rows && rows.length>0){ // if(rows && rows.length>0){
// rows.forEach(item=>{ // rows.forEach(item=>{
@@ -291,34 +309,76 @@
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
@import '~@assets/less/common.less'; @import '~@assets/less/common.less';
.subscribtion { .subscribtion {
.subscribtion-search-wrapper { .subscribtion-search-wrapper {
margin-bottom: 20px; margin-bottom: 20px;
} }
.page { .page {
margin-top: 20px; margin-top: 20px;
text-align: right; text-align: right;
} }
} }
.box-title-text {
line-height: 1.4;
display: flex;
align-items: center;
margin-bottom: 10px;
}
.title-text {
width: 33px;
color: #000F16;
display: inline-block;
font-weight: 500;
font-size: 14px;
margin-right: 16px;
margin-top: 3px;
text-align: right;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
.box-input {
display: inline-block;
width: 100%;
height: 38px;
}
.box-button {
height: 38px;
}
</style> </style>
<style lang="less"> <style lang="less">
.subscribtion { .subscribtion {
.subscribtion-content { .subscribtion-content {
.ant-form-item-control-wrapper { .ant-form-item-control-wrapper {
min-width: 180px; min-width: 180px;
.ant-form-item { .ant-form-item {
display: flex; display: flex;
} }
} }
} }
} }
.subscribtion-search-header { .subscribtion-search-header {
.ant-form-item-control-wrapper { .ant-form-item-control-wrapper {
min-width: 200px; min-width: 200px;
} }
.table-page-search-submitButtons{
float: none!important; /*.table-page-search-submitButtons {*/
/* float: none !important;*/
/*}*/
} }
.box-input .ant-select-selection__rendered {
line-height: 38px;
height: 38px;
}
.box-input .ant-select-selection--single {
height: 38px;
} }
</style> </style>