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:
高嵩
2023-02-11 22:11:49 +08:00
parent b43cc4a60f 5d5034491e
commit 78332f7c90
19 changed files with 195 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-web/src/App.vue
+6 -1
View File
@@ -179,11 +179,16 @@
height: 38px !important;
}
.ant-table-column-title{
.ant-table-column-title {
font-weight: bold!important;
}
.ant-table-thead > tr > th {
background: #f3f6f6!important;
padding: 12px 8px!important;
}
.ant-table-tbody > tr > td {
padding: 12px 8px!important;
}
</style>
jero-web/src/assets/less/common.less
+7 -1
View File
@@ -123,13 +123,19 @@
border: 1px solid #0bd9d9!important;
}
.ant-table-column-title{
.ant-table-column-title {
font-weight: bold!important;
}
.ant-table-thead > tr > th {
background: #f3f6f6!important;
padding: 12px 8px!important;
}
.ant-table-tbody > tr > td {
padding: 12px 8px!important;
}
.ant-tooltip-inner {
color: #333;
background-color: #fff!important;
jero-web/src/components/SplitBatForm/index.vue
+1 -1
View File
@@ -549,7 +549,7 @@
width: 90px;
text-align: right;
display: inline-block;
font-weight: bold;
/*font-weight: bold;*/
font-size: 14px;
margin-right: 16px;
overflow: hidden;
jero-web/src/components/searchalonetext/index.vue
+2 -2
View File
@@ -1,7 +1,7 @@
<template>
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
<a-col :md="10" :sm="8" v-for="(item,index) in searchList" :key="index" style="line-height: 48px">
<a-col :md="9" :sm="8" v-for="(item,index) in searchList" :key="index" style="line-height: 48px">
<template v-if="index < 3">
<div class="box-title-text" v-if="item.field_show_type == '0'">
<div class="title-text" :title="item.db_field_txt">
@@ -137,7 +137,7 @@
</a-col>
<span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
<a-col :md="6" :sm="24">
<a-col :md="9" :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 @click="handleToggleSearch" style="margin-left: 8px" v-if="searchList.length > 3">
jero-web/src/components/tableCollection/index.vue
+15 -4
View File
@@ -10,10 +10,10 @@
:scroll="{x: '100%',y:'calc(100vh - 330px)'}"
:data-source="dataSource"
:loading="loading"
@change="tableOnChange"
sticky
:columns="columns"
:rowClassName="rowClassName"
@change="tableOnChange"
@onHeaderRow='onHeaderRow'
>
<span slot="titleName" slot-scope="text,record" :title="text">
@@ -840,9 +840,6 @@
}
})
},
tableOnChange(pagination, filters, sorter) {
console.log(pagination, filters, sorter, 'iiiiiiiiiiiiiiiii')
},
getTableListReset() {
this.formInline = {}
this.queryParamQuery = {}
@@ -915,6 +912,18 @@
cancleoperationFailed() {
this.selectedRowKeys = []
},
tableOnChange(pagination, filters, sorter) {
this.orderBy = sorter.order == 'ascend' ? '1' : '2'
if(sorter.columnKey == 'nioNumber'){
sorter.columnKey = 'nio_number'
}else if (sorter.columnKey == 'dutyTerritory'){
sorter.columnKey = 'duty_territory'
}else if (sorter.columnKey == 'reportTime'){
sorter.columnKey = 'report_time'
}
this.orderByField = sorter.columnKey
this.getTableList()
},
getTableList(currentPersonRole) {
let paramsManifestid
let url
@@ -935,6 +944,8 @@
pageSize: this.pageSize,
userTypes: this.currentPersonRole || currentPersonRole,
paramsManifestId: paramsManifestid,
orderBy: this.orderBy,
orderByField: this.orderByField,
...this.formInline,
...currentPersonRole,
...this.queryParamQuery
jero-web/src/components/tableCollection/index1.vue
+10 -1
View File
@@ -636,7 +636,14 @@
})
},
tableOnChange(pagination, filters, sorter) {
console.log(pagination, filters, sorter, 'iiiiiiiiiiiiiiiii')
this.orderBy = sorter.order == 'ascend' ? '1' : '2'
if(sorter.columnKey == 'nioNumber'){
sorter.columnKey = 'nio_number'
}else if (sorter.columnKey == 'syncTime'){
sorter.columnKey = 'sync_time'
}
this.orderByField = sorter.columnKey
this.getTableList()
},
getTableListReset() {
let params = {
@@ -709,6 +716,8 @@
let params = {
pageNo: this.pageNo,
pageSize: this.pageSize,
orderBy: this.orderBy,
orderByField: this.orderByField,
userTypes: this.currentPersonRole || currentPersonRole,
paramsManifestId: paramsManifestid,
...this.formInline
jero-web/src/views/documentManage/splitting/modules/SplitText.vue
+1 -1
View File
@@ -20,7 +20,7 @@
<div class="operator-select-type">
<span class="operator-file-type"><i class="operator-i">*</i>{{$t('fileType')}}</span>
<a-select v-model="fileGroup" style='min-width: 295px' :placeholder="$t('selectFileType')"
<a-select v-model="fileGroup" style='min-width: 250.5px' :placeholder="$t('selectFileType')"
class="file-type-select">
<a-select-option value="GSO" key="GSO" :title="$t('GSO')">
{{$t('GSO')}}
jero-web/src/views/parameter/parameterlist/index.vue
+10 -1
View File
@@ -181,12 +181,14 @@ export default {
align: 'left',
dataIndex: 'dutyTerritory_dictText',
width: 150,
sorter: true,
ellipsis: true,
},
{
title: this.$t('created'),
align: 'left',
dataIndex: 'createTime',
sorter: true,
width: 180,
ellipsis: true,
},
@@ -210,8 +212,15 @@ export default {
},
handleTableChange(pagination, filters, sorter) {
let _i = sorter.order === 'descend' ? 'asc': 'desc'
if(sorter.columnKey == 'dutyTerritory_dictText'){
sorter.columnKey = 'duty_territory'
} else if(sorter.columnKey == 'createTime'){
sorter.columnKey = 'create_time'
} else if(sorter.columnKey == 'nioNumber'){
sorter.columnKey = 'nio_number'
}
let _tt = {
orderByField: 'nioNumber',
orderByField: sorter.columnKey,
orderBy: _i
}
this.queryParam = {
jero-web/src/views/projectManagement/components/TaskList.vue
+10
View File
@@ -927,6 +927,15 @@
///deep/.taskTable .ant-table-thead > tr > th {
// font-weight: bolder;
//}
/deep/ .ant-table-thead > tr > th {
background: #f3f6f6!important;
padding: 12px 16px!important;
}
/deep/ .ant-table-tbody > tr > td {
padding: 16px 16px!important;
}
</style>
<style>
.box-input .ant-select-selection {
@@ -941,4 +950,5 @@
padding: 32px 0 !important;
margin: 0 !important;
}
</style>
jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/SentList.vue
+7 -7
View File
@@ -53,7 +53,7 @@
columns: [
{
title: this.$t('standardInformation'),
align: 'center',
align: 'left',
dataIndex: 'standardInfo',
scopedSlots: { customRender: 'standardInformation' },
ellipsis: true,
@@ -61,42 +61,42 @@
},
{
title: this.$t('taskType'),
align: 'center',
align: 'left',
dataIndex: 'flowTypeShow',
ellipsis: true,
width: 170
},
{
title: this.$t('LastProcessor'),
align: 'center',
align: 'left',
dataIndex: 'lastAssigneeName',
ellipsis: true,
width: 170
},
{
title: this.$t('CurrentProcessor'),
align: 'center',
align: 'left',
dataIndex: 'assigneeName',
ellipsis: true,
width: 170
},
{
title: this.$t('TaskCutOffTime'),
align: 'center',
align: 'left',
dataIndex: 'endTime',
ellipsis: true,
width: 170
},
{
title: this.$t('taskStatus'),
align: 'center',
align: 'left',
dataIndex: 'statusShow',
ellipsis: true,
width: 170
},
{
title: this.$t('operation'),
align: 'center',
align: 'left',
fixed: 'right',
width: 120,
scopedSlots: { customRender: 'operation' }