WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改已知问题

Browse Source
This commit is contained in:
qq787203167
2022-05-27 17:29:00 +08:00
parent c498a114bf
commit 9f835fa5ce
3 changed files with 70 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-web/src/assets/less/common.less
+5
View File
@@ -90,10 +90,15 @@
.jee-hidden {
display: none
}
.box-input .ant-select-selection {
height: 38px !important;
}
.box-input .ant-select-selection__rendered {
line-height: 38px;
}
.ant-table-fixed-left table, .ant-table-fixed-right table .ant-table-fixed{
width: min-content;
}
jero-web/src/views/projectManagement/components/nonConformance.vue
+51 -37
View File
@@ -2,43 +2,43 @@
<a-card :bordered="false">
<div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
<a-col :md="6" :sm="8">
<div class="box-title-text">
<div class="title-text" :title="$t('standard')">
<span>{{$t('standard')}}</span>
<a-row :gutter="24">
<a-col :md="6" :sm="8">
<div class="box-title-text">
<div class="title-text" :title="$t('standard')">
<span>{{$t('standard')}}</span>
</div>
<j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('standard')"
v-model="queryParam.serialNumber"></j-input>
</div>
<j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('standard')"
v-model="queryParam.serialNumber"></j-input>
</div>
</a-col>
<a-col :md="6" :sm="8">
<div class="box-title-text">
<div class="title-text" :title="$t('title')">
<span>{{$t('title')}}</span>
</a-col>
<a-col :md="6" :sm="8">
<div class="box-title-text">
<div class="title-text" :title="$t('title')">
<span>{{$t('title')}}</span>
</div>
<j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('title')"
v-model="queryParam.title"></j-input>
</div>
<j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('title')"
v-model="queryParam.title"></j-input>
</div>
</a-col>
<a-col :md="6" :sm="8">
<div class="box-title-text">
<div class="title-text" style="width: 64px" :title="$t('areaOfResponsibility')">
<span>{{$t('areaOfResponsibility')}}</span>
</a-col>
<a-col :md="6" :sm="8">
<div class="box-title-text">
<div class="title-text" style="width: 64px" :title="$t('areaOfResponsibility')">
<span>{{$t('areaOfResponsibility')}}</span>
</div>
<j-dict-select-tag class="box-input" v-model="queryParam.dutyTerritory"
:placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"
:type="'select'"
:triggerChange="false" :dictCode="'duty_territory'"/>
</div>
<j-dict-select-tag class="box-input" v-model="queryParam.dutyTerritory"
:placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"
:type="'select'"
:triggerChange="false" :dictCode="'duty_territory'"/>
</div>
</a-col>
<span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
</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>
</span>
</a-row>
</a-row>
</a-form>
</div>
<div class="table-operator">
@@ -54,7 +54,7 @@
:loading="loading"
rowKey="uuid"
:pagination="false"
:scroll="{x: true}"
:scroll="{x: '100%'}"
:row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
:data-source="dataSource"
:columns="columns"
@@ -94,38 +94,52 @@
title: this.$t('standard'),
align: 'center',
dataIndex: 'serialNumber',
scopedSlots: { customRender: 'standard' }
scopedSlots: { customRender: 'standard' },
ellipsis: true,
width: 180
},
{
title: this.$t('title'),
align: 'center',
dataIndex: 'title',
ellipsis: true,
width: 180,
scopedSlots: { customRender: 'standard' }
},
{
title: this.$t('ProcessType'),
align: 'center',
dataIndex: 'flowType'
dataIndex: 'flowType',
ellipsis: true,
width: 180
},
{
title: this.$t('areaOfResponsibility'),
align: 'center',
dataIndex: 'dutyTerritory_dictText'
dataIndex: 'dutyTerritory_dictText',
ellipsis: true,
width: 180
},
{
title: this.$t('problemType'),
align: 'center',
dataIndex: 'problemType'
dataIndex: 'problemType',
ellipsis: true,
width: 180
},
{
title: this.$t('Sponsor'),
align: 'center',
dataIndex: 'initiator'
dataIndex: 'initiator',
ellipsis: true,
width: 140
},
{
title: this.$t('personLiable'),
align: 'center',
dataIndex: 'duty'
dataIndex: 'duty',
ellipsis: true,
width: 140
}
],
total: 0,
@@ -213,7 +227,7 @@
serialNumber: val.serialNumber,
actiProcInstId: val.prcId,
primaryKeyId: val.projectTaskInventoryDetailId,
TaskKey: val.taskDefinitionKey,
TaskKey: val.taskDefinitionKey,
isDisplay: val.status == 'NotDone' ? true : false
}
switch (num) {
jero-web/src/views/projectManagement/projectNonConformance/index.vue
+14 -6
View File
@@ -154,13 +154,13 @@
rowKey="uuid"
:loading="loading"
:pagination="false"
:scroll="{x: true}"
:scroll="{x: '100%'}"
:row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
:data-source="dataSource"
:columns="columns"
>
<span slot="standard" slot-scope="text,result">
<a @click="standardClick(result)">{{text}}</a>
<a @click="standardClick(result)" :title="text">{{text}}</a>
</span>
</a-table>
</div>
@@ -201,48 +201,56 @@
align: 'center',
dataIndex: 'serialNumber',
ellipsis: true,
scopedSlots: { customRender: 'standard' }
width:180,
scopedSlots: { customRender: 'standard' },
},
{
title: this.$t('title'),
align: 'center',
dataIndex: 'title',
ellipsis: true,
width:180,
scopedSlots: { customRender: 'standard' }
},
{
title: this.$t('ProcessType'),
align: 'center',
dataIndex: 'flowType',
width:180,
ellipsis: true
},
{
title: this.$t('areaOfResponsibility'),
align: 'center',
dataIndex: 'dutyTerritory_dictText',
width:180,
ellipsis: true
},
{
title: this.$t('RelatedItems'),
align: 'center',
dataIndex: 'projectName',
width:180,
ellipsis: true
},
{
title: this.$t('problemType'),
align: 'center',
dataIndex: 'problemType',
ellipsis: true
width:140,
ellipsis: true,
},
{
title: this.$t('Sponsor'),
align: 'center',
dataIndex: 'initiator'
dataIndex: 'initiator',
width:140,
},
{
title: this.$t('personLiable'),
align: 'center',
dataIndex: 'duty'
dataIndex: 'duty',
width:140,
}
],
total: 0,