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

Merge remote-tracking branch 'origin/feature_dev_20221129_UI' into fix_2nd_period

Browse Source 
# Conflicts:
#	jero-web/src/components/tableCollection/index1.vue
#	jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue
#	jero-web/src/views/documentManage/collection/index.vue
#	jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
#	jero-web/src/views/projectManagement/components/listOfRegulations.vue
#	jero-web/src/views/projectManagement/projectStatusBoard/components/projectStatusAndProgress.vue
#	jero-web/src/views/projectManagement/projectStatusBoard/index.vue
This commit is contained in:
高嵩
2022-12-30 15:53:39 +08:00
parent 07c02abef6 2154e4edfe
commit b0b8f36e92
129 changed files with 1418 additions and 765 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-web/src/views/projectManagement/projectStatusBoard/components/TaskPlanList.vue
+7 -2
View File
@@ -22,7 +22,7 @@
>
<div slot="renderExtraFooter" style="width: 100%;display: block">
<div style="text-align: right;width: 100%">
<a @click="okChange">{{$t('determine')}}</a>
<a-button type="primary" @click="okChange">{{$t('determine')}}</a-button>
</div>
</div>
</a-range-picker>
@@ -317,9 +317,14 @@
}
</script>
<style>
.ant-calendar-footer-btn .ant-calendar-footer-extra{
float: right;
}
</style>
<style lang="less" scoped>
@import '~@assets/less/common.less';
.doc-detail {
background: #fff;
height: 100%;
jero-web/src/views/projectManagement/projectStatusBoard/components/projectStatusAndProgress.vue
+13 -9
View File
@@ -67,61 +67,61 @@
columns: [
{
title: this.$t('entryName'),
align: 'center',
align: 'left',
dataIndex: 'projectName',
width: 240,
ellipsis: true
},
// {
// title: this.$t('targetMarket'),
// align: 'center',
// align: 'left',
// dataIndex: 'targetMarket',
// width: 180,
// ellipsis: true
// },
{
align: 'center',
align: 'left',
dataIndex: 'projectStatus',
scopedSlots: { title: 'projectStatusTitle' },
width: 240,
ellipsis: true
},
{
align: 'center',
align: 'left',
dataIndex: 'certificationProgress',
width: 380,
ellipsis: true,
scopedSlots: { title: 'CertificationProgressTitle' }
},
{
align: 'center',
align: 'left',
dataIndex: 'inventory',
width: 340,
ellipsis: true,
scopedSlots: { title: 'listConfirmationStatusTitle' }
},
{
align: 'center',
align: 'left',
dataIndex: 'task',
width: 340,
ellipsis: true,
scopedSlots: { title: 'taskAffirmStatusTitle' }
},
{
align: 'center',
align: 'left',
dataIndex: 'design',
width: 440,
scopedSlots: { title: 'designComplianceReviewTitle' }
},
{
dataIndex: 'pre',
align: 'center',
align: 'left',
width: 440,
scopedSlots: { title: 'preHomeConfirmationTitle' }
},
{
dataIndex: 'verify',
align: 'center',
align: 'left',
width: 440,
scopedSlots: { title: 'verificationComplianceReviewTitle' }
}
@@ -229,4 +229,8 @@
::v-deep .ant-table-body {
background: transparent!important;
}
/deep/.ant-table-column-title{
font-weight: bold!important;
}
</style>
jero-web/src/views/projectManagement/projectStatusBoard/index.vue
+19 -12
View File
@@ -34,7 +34,7 @@
:triggerChange="false" :dictCode="'brand'"/>
</div>
</a-col>
<span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
<span style="float: right;overflow: hidden;" 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>
@@ -58,8 +58,8 @@
@change="hodeChange"
>
<div slot="renderExtraFooter" style="width: 100%;display: block">
<div style="text-align: right;width: 100%">
<a @click="okChange">{{$t('determine')}}</a>
<div style="text-align: right;width: 100%;">
<a-button type="primary" @click="okChange">{{$t('determine')}}</a-button>
</div>
</div>
</a-range-picker>
@@ -185,7 +185,7 @@
columns: [
{
title: this.$t('entryName'),
align: 'center',
align: 'left',
dataIndex: 'projectName',
scopedSlots: { customRender: 'projectName' },
width: 240,
@@ -193,54 +193,54 @@
},
// {
// title: this.$t('targetMarket'),
// align: 'center',
// align: 'left',
// dataIndex: 'targetMarket',
// width: 180,
// ellipsis: true
// },
{
align: 'center',
align: 'left',
dataIndex: 'projectStatus',
scopedSlots: { title: 'projectStatusTitle' },
width: 240,
ellipsis: true
},
{
align: 'center',
align: 'left',
dataIndex: 'certificationProgress',
width: 380,
ellipsis: true,
scopedSlots: { title: 'CertificationProgressTitle' }
},
{
align: 'center',
align: 'left',
dataIndex: 'inventory',
width: 340,
ellipsis: true,
scopedSlots: { title: 'listConfirmationStatusTitle' }
},
{
align: 'center',
align: 'left',
dataIndex: 'task',
width: 340,
ellipsis: true,
scopedSlots: { title: 'taskAffirmStatusTitle' }
},
{
align: 'center',
align: 'left',
dataIndex: 'design',
width: 440,
scopedSlots: { title: 'designComplianceReviewTitle' }
},
{
dataIndex: 'pre',
align: 'center',
align: 'left',
width: 440,
scopedSlots: { title: 'preHomeConfirmationTitle' }
},
{
dataIndex: 'verify',
align: 'center',
align: 'left',
width: 440,
scopedSlots: { title: 'verificationComplianceReviewTitle' }
}
@@ -498,6 +498,9 @@
height: 38px;
width: 300px;
}
.ant-calendar-footer-btn .ant-calendar-footer-extra{
float: right;
}
</style>
<style scoped lang="less">
@import '~@assets/less/common.less';
@@ -729,4 +732,8 @@
width: 100px;
z-index: 101;
}
/deep/.ant-table-column-title{
font-weight: bold!important;
}
</style>