合并分支 'feature_dev_20221129_UI' 到 'master'

Feature dev 20221129 ui

查看合并请求 laws-nio/laws-weilai!283
This commit is contained in:
高嵩
2023-02-11 21:51:40 +08:00
7 changed files with 34 additions and 13 deletions
@@ -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')}}
@@ -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>
@@ -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' }