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/components/listOfRegulations.vue
+133 -80
View File
@@ -24,6 +24,7 @@
v-model="queryParam.title"></j-input>
</div>
</a-col>
<template v-if="toggleSearchStatus">
<a-col :md="6" :sm="8">
<div class="box-title-text">
<div class="title-text" :title="$t('areaOfResponsibility')">
@@ -75,7 +76,8 @@
</a-select>
</div>
</a-col>
<span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
</template>
<span style="float: right;overflow: hidden;margin-right: 11px; " class="table-page-search-submitButtons">
<a-col :md="6" :sm="24">
<globalAdvancedQuery ref="globalAdvancedQueryRef"
@handleSuperQuery="handleSuperQuery"
@@ -83,6 +85,10 @@
<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">
{{ !toggleSearchStatus ? $t('open') : $t('away') }}
<a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
</a>
</a-col>
</span>
</a-row>
@@ -100,18 +106,11 @@
<a-icon type="file-protect"/>
{{ $t('initiateTaskConfirmation') }}
</div>
<div class="operator-text" @click="alterationClick">
<a-icon type="file-search"/>
{{ $t('alteration') }}
</div>
<div class="operator-text" @click="fixedPlateClick">
<a-icon type="bulb"/>
{{ $t('fixedPlate') }}
</div>
</div>
<div style="float: right;margin-top: 1px;" v-if="isDisplay">
<a-popconfirm overlayClassName='popconfirm' placement="bottomRight">
<template slot="title" id="popconfirm">
<div style="height:320px;overflow:scroll;overflow-x: auto;">
<div class="operator-text-title">
<ImportFile :url="url" :projectLibraryId=$route.query.id :isTrue="true" :accept="'.zip'"
@getList="getPersonnelList"/>
@@ -128,8 +127,8 @@
<a-icon type="delete"/>
{{ $t('BatchDelete') }}
</div>
<div class="operator-text-title" @click="ExportReportClick">
<a-icon type="export"/>
<div class="operator-text-title" @click="ExportReportClick">
<a-icon type="export" :rotate="-90"/>
{{ $t('ExportReport') }}
</div>
<div class="operator-text-title" @click="batSettingClick">
@@ -141,9 +140,22 @@
{{ $t('batchSettingPersonnel') }}
</div>
<div class="operator-text-title" @click="questionClick">
<a-icon type="apartment"/>
<a-icon type="sound"/>
{{ $t('question') }}
</div>
<div class="operator-text-title" @click="alterationClick">
<a-icon type="file-search"/>
{{ $t('alteration') }}
</div>
<div class="operator-text-title" @click="fixedPlateClick">
<a-icon type="pushpin"/>
{{ $t('fixedPlate') }}
</div>
<div @click="copyClick" class="operator-text-title">
<a-icon type="copy"/>
{{ $t('copy') }}
</div>
</div>
</template>
<div class="operator-text" style="position: relative">
<span style="position: absolute;left: -13px;top: -4px">...</span>{{ $t('more') }}
@@ -157,10 +169,6 @@
<a-icon type="profile"/>
{{ $t('Transfer') }}
</div>
<div @click="copyClick" class="operator-text">
<a-icon type="copy"/>
{{ $t('copy') }}
</div>
<div @click="handleAdd" class="operator-text">
<a-icon type="plus"/>
{{ $t('add') }}
@@ -202,6 +210,7 @@
<div style="width: 100%">
<a-table
ref="table"
:components="drag(columns,'columnsAll')"
class="tableList"
:loading="loading"
:pagination="false"
@@ -258,39 +267,39 @@
<span slot="designDeliverableTemplateName" slot-scope="text,record">
<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)">
{{ record.designDeliverableTemplateName.length > 10 ? record.designDeliverableTemplateName.slice(0, 9) + '...' :record.designDeliverableTemplateName}}
</a>
<a v-else-if="record.designDeliverableTemplate && record.designDeliverableTemplate.split(',').length > 1"
@click="clickButtonToUpload(record.designDeliverableTemplate)">{{ $t('viewFile') }}</a>
<!-- <a v-if="record.designDeliverableTemplate && record.designDeliverableTemplate.split(',').length == 1"-->
<!-- :title="record.designDeliverableTemplateName"-->
<!-- @click="pdfPreviewClick(record.designDeliverableTemplateName,record.designDeliverableTemplate)">-->
<!-- {{ record.designDeliverableTemplateName.length > 10 ? record.designDeliverableTemplateName.slice(0, 9) + '...' :record.designDeliverableTemplateName}}-->
<!-- </a>-->
<!-- <a v-else-if="record.designDeliverableTemplate && record.designDeliverableTemplate.split(',').length > 1"-->
<!-- @click="clickButtonToUpload(record.designDeliverableTemplate)">{{ $t('viewFile') }}</a>-->
<span v-else>--</span>
</span>
<span slot="prehomoDeliverableTemplateName" slot-scope="text,record">
<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)">
{{ record.prehomoDeliverableTemplateName.length > 10 ? record.prehomoDeliverableTemplateName.slice(0, 9) + '...' :record.prehomoDeliverableTemplateName}}
</a>
<a v-else-if="record.prehomoDeliverableTemplate && record.prehomoDeliverableTemplate.split(',').length > 1"
@click="clickButtonToUpload(record.prehomoDeliverableTemplate)">{{ $t('viewFile') }}</a>
<!-- <a v-if="record.prehomoDeliverableTemplate && record.prehomoDeliverableTemplate.split(',').length == 1"-->
<!-- :title="record.prehomoDeliverableTemplateName"-->
<!-- @click="pdfPreviewClick(record.prehomoDeliverableTemplateName,record.prehomoDeliverableTemplate)">-->
<!-- {{ record.prehomoDeliverableTemplateName.length > 10 ? record.prehomoDeliverableTemplateName.slice(0, 9) + '...' :record.prehomoDeliverableTemplateName}}-->
<!-- </a>-->
<!-- <a v-else-if="record.prehomoDeliverableTemplate && record.prehomoDeliverableTemplate.split(',').length > 1"-->
<!-- @click="clickButtonToUpload(record.prehomoDeliverableTemplate)">{{ $t('viewFile') }}</a>-->
<span v-else>--</span>
</span>
<span slot="verifyDeliverableTemplateName" slot-scope="text,record">
<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)">
{{ record.verifyDeliverableTemplateName.length > 10 ? record.verifyDeliverableTemplateName.slice(0, 9) + '...' :record.verifyDeliverableTemplateName}}
</a>
<a v-else-if="record.verifyDeliverableTemplate && record.verifyDeliverableTemplate.split(',').length > 1"
@click="clickButtonToUpload(record.verifyDeliverableTemplate)">{{ $t('viewFile') }}</a>
<!-- <a v-if="record.verifyDeliverableTemplate && record.verifyDeliverableTemplate.split(',').length == 1"-->
<!-- :title="record.verifyDeliverableTemplateName"-->
<!-- @click="pdfPreviewClick(record.verifyDeliverableTemplateName,record.verifyDeliverableTemplate)">-->
<!-- {{ record.verifyDeliverableTemplateName.length > 10 ? record.verifyDeliverableTemplateName.slice(0, 9) + '...' :record.verifyDeliverableTemplateName}}-->
<!-- </a>-->
<!-- <a v-else-if="record.verifyDeliverableTemplate && record.verifyDeliverableTemplate.split(',').length > 1"-->
<!-- @click="clickButtonToUpload(record.verifyDeliverableTemplate)">{{ $t('viewFile') }}</a>-->
<span v-else>--</span>
</span>
</a-table>
@@ -465,6 +474,7 @@
import globalAdvancedQuery from '@/components/globalAdvancedQuery/index'
import batchSettingPersonnel from './batchSettingPersonnel'
import { getAction, postAction, downloadFile, deleteAction } from '@/api/manage'
import {ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
import moment from 'moment'
import { mapGetters } from 'vuex'
import { Base64 } from 'js-base64'
@@ -485,8 +495,10 @@
batchSettingPersonnel,
listOfRegulationsView
},
mixins: [ResizeColumnProvide,ResizeHeader],
data() {
return {
toggleSearchStatus: false,
roleSwitchingList: [],
listTitle: '',
orderBy: '1',
@@ -494,7 +506,7 @@
columnsAll: [
{
title: this.$t('standard'),
align: 'center',
align: 'left',
dataIndex: 'serialNumber',
width: 180,
fixed: 'left',
@@ -503,7 +515,7 @@
},
{
title: this.$t('title'),
align: 'center',
align: 'left',
dataIndex: 'title',
width: 180,
fixed: 'left',
@@ -511,14 +523,14 @@
},
{
title: this.$t('subtitle'),
align: 'center',
align: 'left',
dataIndex: 'subtitle',
ellipsis: true,
width: 180
},
{
title: this.$t('listConfirmationStatus'),
align: 'center',
align: 'left',
dataIndex: 'inventoryAffirmStatusName',
width: 240,
sorter:true,
@@ -526,7 +538,7 @@
},
{
title: this.$t('taskAffirmStatus'),
align: 'center',
align: 'left',
sorter:true,
dataIndex: 'taskAffirmStatusName',
width: 240,
@@ -539,49 +551,49 @@
// },
{
title: this.$t('zoneOfApplication'),
align: 'center',
align: 'left',
dataIndex: 'region_dictText',
width: 180,
ellipsis: true
},
{
title: this.$t('correspondingStandard'),
align: 'center',
align: 'left',
dataIndex: 'correspondingStandard',
width: 180,
ellipsis: true
},
{
title: this.$t('implementationCategory'),
align: 'center',
align: 'left',
dataIndex: 'implementType_dictText',
width: 180,
ellipsis: true
},
{
title: this.$t('ImplementationDate'),
align: 'center',
align: 'left',
width: 200,
dataIndex: 'xin1Che1Xing2Shi2Shi1Ri4Qi1',
ellipsis: true
},
{
title: this.$t('vehicleInProductionDate'),
align: 'center',
align: 'left',
width: 220,
dataIndex: 'implementTime',
ellipsis: true
},
{
title: this.$t('certificationType'),
align: 'center',
align: 'left',
dataIndex: 'attestationType_dictText',
width: 180,
ellipsis: true
},
{
title: this.$t('certificationLevel'),
align: 'center',
align: 'left',
dataIndex: 'attestationRank_dictText',
width: 180,
sorter:true,
@@ -589,14 +601,14 @@
},
{
title: this.$t('applicableSupplement'),
align: 'center',
align: 'left',
width: 220,
dataIndex: 'applicableSupplement',
ellipsis: true
},
{
title: 'WVTA ID',
align: 'center',
align: 'left',
dataIndex: 'wvtaId',
width: 180,
sorter:true,
@@ -604,7 +616,7 @@
},
{
title: this.$t('areaOfResponsibility'),
align: 'center',
align: 'left',
ellipsis: true,
sorter:true,
dataIndex: 'dutyTerritory_dictText',
@@ -612,7 +624,7 @@
},
{
title: this.$t('regulatoryEngineer'),
align: 'center',
align: 'left',
ellipsis: true,
sorter:true,
dataIndex: 'regulationOwnerName',
@@ -620,7 +632,7 @@
},
{
title: this.$t('certifiedEngineer'),
align: 'center',
align: 'left',
ellipsis: true,
sorter:true,
dataIndex: 'homologationEngineerName',
@@ -628,7 +640,7 @@
},
{
title: this.$t('engineeringInterfacePerson'),
align: 'center',
align: 'left',
ellipsis: true,
sorter:true,
dataIndex: 'engineeringInterfacePersonName',
@@ -636,7 +648,7 @@
},
{
title: this.$t('remarks'),
align: 'center',
align: 'left',
dataIndex: 'remark',
width: 180,
ellipsis: true
@@ -647,7 +659,7 @@
{
title: this.$t('Deliverables'),
dataIndex: 'designDeliverableTemplateName',
align: 'center',
align: 'left',
width: 180,
ellipsis: true,
scopedSlots: { customRender: 'designDeliverableTemplateName' }
@@ -655,28 +667,28 @@
{
title: this.$t('Sponsor'),
dataIndex: 'designInitiatorName',
align: 'center',
align: 'left',
width: 180,
ellipsis: true
},
{
title: this.$t('personLiable'),
dataIndex: 'designDutyName',
align: 'center',
align: 'left',
width: 180,
ellipsis: true
},
{
title: this.$t('TaskCutOffTime'),
dataIndex: 'designDueDate',
align: 'center',
align: 'left',
ellipsis: true,
width: 140
},
{
title: this.$t('descriptionDeliverables'),
dataIndex: 'designRemark',
align: 'center',
align: 'left',
width: 220,
ellipsis: true
}
@@ -688,7 +700,7 @@
{
title: this.$t('Deliverables'),
dataIndex: 'prehomoDeliverableTemplateName',
align: 'center',
align: 'left',
width: 180,
ellipsis: true,
scopedSlots: { customRender: 'prehomoDeliverableTemplateName' }
@@ -696,28 +708,28 @@
{
title: this.$t('Sponsor'),
dataIndex: 'prehomoInitiatorName',
align: 'center',
align: 'left',
width: 180,
ellipsis: true
},
{
title: this.$t('personLiable'),
dataIndex: 'prehomoDutyName',
align: 'center',
align: 'left',
width: 180,
ellipsis: true
},
{
title: this.$t('TaskCutOffTime'),
dataIndex: 'prehomoDueDate',
align: 'center',
align: 'left',
width: 140,
ellipsis: true
},
{
title: this.$t('descriptionDeliverables'),
dataIndex: 'prehomoRemark',
align: 'center',
align: 'left',
width: 220,
ellipsis: true
}
@@ -729,7 +741,7 @@
{
title: this.$t('Deliverables'),
dataIndex: 'verifyDeliverableTemplateName',
align: 'center',
align: 'left',
width: 180,
ellipsis: true,
scopedSlots: { customRender: 'verifyDeliverableTemplateName' }
@@ -737,28 +749,28 @@
{
title: this.$t('Sponsor'),
dataIndex: 'verifyInitiatorName',
align: 'center',
align: 'left',
width: 180,
ellipsis: true
},
{
title: this.$t('personLiable'),
dataIndex: 'verifyDutyName',
align: 'center',
align: 'left',
width: 180,
ellipsis: true
},
{
title: this.$t('TaskCutOffTime'),
dataIndex: 'verifyDueDate',
align: 'center',
align: 'left',
ellipsis: true,
width: 140
},
{
title: this.$t('descriptionDeliverables'),
dataIndex: 'verifyRemark',
align: 'center',
align: 'left',
width: 220,
ellipsis: true
}
@@ -766,14 +778,14 @@
},
{
title: this.$t('operation'),
align: 'center',
align: 'left',
fixed: 'right',
width: 240,
scopedSlots: { customRender: 'operation' }
},
{
title: this.$t('operation'),
align: 'center',
align: 'left',
fixed: 'right',
width: 140,
scopedSlots: { customRender: 'operationOne' }
@@ -783,20 +795,20 @@
{
title: this.$t('deliverableTemplate'),
dataIndex: 'fileName',
align: 'center',
align: 'left',
width: 260,
ellipsis: true
},
{
title: this.$t('resultReported'),
dataIndex: 'fileName',
align: 'center',
align: 'left',
width: 260,
ellipsis: true
},
{
title: this.$t('operation'),
align: 'center',
align: 'left',
width: 130,
scopedSlots: { customRender: 'fileOperation' }
}
@@ -1019,7 +1031,7 @@
})
if (this.areaOfResponsibilityList && this.areaOfResponsibilityList.dutyTerritory) {
this.queryParam.dutyTerritory = this.areaOfResponsibilityList.dutyTerritory
this.queryParam = {...this.queryParam}
this.queryParam = { ...this.queryParam }
}
// } else {
// this.isDisplay = false
@@ -1068,6 +1080,9 @@
},
methods: {
...mapGetters(['userInfo']),
handleToggleSearch() {
this.toggleSearchStatus = !this.toggleSearchStatus
},
viewClick(row) {
let roleCodeIndex
if (this.isDisplay) {
@@ -2372,7 +2387,7 @@
}
.title-text {
width: 92px;
width: 110px;
color: #000F16;
display: inline-block;
font-weight: 500;
@@ -2553,7 +2568,7 @@
overflow: scroll !important;
}
</style>
<style>
<style lang="less">
.box-input .ant-select-selection {
height: 38px !important;
}
@@ -2574,6 +2589,14 @@
display: none !important;
}
//.popconfirm .ant-popover-inner-content{
// padding: 0px 16px;
//}
//
//.popconfirm .ant-popover-message{
// padding: 23px 0 1px;
//}
.ant-table-placeholder {
padding: 0;
border-top: none;
@@ -2584,6 +2607,36 @@
}
.tableList .ant-table-thead > tr > th {
padding: 7px 16px !important;
padding: 0px 16px !important;
//font-weight: bold;
//background: #f3f6f6;
}
//.tableList .ant-table-tbody > tr > td{
// color: #040B29 ;
//}
//.tableList .ant-table-thead > tr{
// padding: 2px 16px !important;
//}
//.tableList .ant-table-thead >tr{
// height: 56px !important;
//}
</style>
<style lang="less">
/* vue-draggable-resizable@2.1.0 begin */
.resize-table-th {
position: relative;
overflow: hidden;
}
.resize-table-th .table-draggable-handle {
height: 100% !important;
bottom: 0;
left: auto !important;
right: -5px;
cursor: col-resize;
touch-action: none;
}
/* 插件 end */
</style>