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

Merge branch 'fix_bug_first_stage'

Browse Source 
# Conflicts:
#	jero-web/src/common/lang/en-us.js
#	jero-web/src/common/lang/zh-cn.js
#	jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue
#	jero-web/src/views/projectManagement/components/listOfRegulations.vue
This commit is contained in:
zer0Black
2022-08-19 20:30:44 +08:00
parent 85d5570322 4f9d4edf6f
commit c081d7dec1
10 changed files with 717 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue
+11 -8
View File
@@ -143,7 +143,7 @@
class="ant-table tableList"
:loading="loading"
:pagination="false"
:scroll="{x: '100%',y:'calc(100vh - 186px)'}"
:scroll="{x: '100%',y:'calc(100vh - 356px)'}"
rowKey="id"
:data-source="dataSource"
:row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
@@ -169,7 +169,8 @@
</a>
</span>
<span slot="designDeliverableTemplateName" slot-scope="text,record">
<span>{{record.designDeliverableTypeName}}</span><br v-if="record.designDeliverableTypeName">
<span :title="record.designDeliverableTypeName">{{record.designDeliverableTypeName}}</span><br
v-if="record.designDeliverableTypeName">
<a v-if="record.designDeliverableTemplate && record.designDeliverableTemplate.split(',').length == 1"
:title="record.designDeliverableTemplateName"
@click="pdfPreviewClick(record.designDeliverableTemplateName,record.designDeliverableTemplate)">
@@ -180,7 +181,8 @@
<span v-else>--</span>
</span>
<span slot="prehomoDeliverableTemplateName" slot-scope="text,record">
<span>{{record.prehomoDeliverableTypeName}}</span><br v-if="record.prehomoDeliverableTypeName">
<span :title="record.prehomoDeliverableTypeName">{{record.prehomoDeliverableTypeName}}</span><br
v-if="record.prehomoDeliverableTypeName">
<a v-if="record.prehomoDeliverableTemplate && record.prehomoDeliverableTemplate.split(',').length == 1"
:title="record.prehomoDeliverableTemplateName"
@click="pdfPreviewClick(record.prehomoDeliverableTemplateName,record.prehomoDeliverableTemplate)">
@@ -191,7 +193,8 @@
<span v-else>--</span>
</span>
<span slot="verifyDeliverableTemplateName" slot-scope="text,record">
<span>{{record.verifyDeliverableTypeName}}</span><br v-if="record.verifyDeliverableTypeName">
<span :title="record.verifyDeliverableTypeName">{{record.verifyDeliverableTypeName}}</span><br
v-if="record.verifyDeliverableTypeName">
<a v-if="record.verifyDeliverableTemplate && record.verifyDeliverableTemplate.split(',').length == 1"
:title="record.verifyDeliverableTemplateName"
@click="pdfPreviewClick(record.verifyDeliverableTemplateName,record.verifyDeliverableTemplate)">
@@ -1015,6 +1018,10 @@
font-weight: 500;
color: #000F16;
}
::v-deep .ant-card-body {
padding: 14px 32px 0 32px;
}
::v-deep .ant-table-row:first-child {
background: #fff!important;
}
@@ -1032,10 +1039,6 @@
line-height: 38px;
}
.card .ant-card-body {
padding: 14px 32px 32px 32px;
}
.ant-table-placeholder {
padding: 0;
border-top: none;