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

Merge remote-tracking branch 'origin/feature_dev_20230109_BTTZ' into dev_2nd_20230213

Browse Source 
# Conflicts:
#	jero-web/src/mixins/header.js
#	jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/evaluationResultsList.vue
#	jero-web/src/views/documentManage/collection/index.vue
#	jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue
#	jero-web/src/views/projectManagement/components/customizeList.vue
This commit is contained in:
高嵩
2023-02-13 09:51:53 +08:00
parent 72fe8d8ca3 a8357dbd48
commit 8c3f610b04
120 changed files with 1852 additions and 950 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-web/src/views/projectManagement/components/TaskList.vue
+8 -2
View File
@@ -112,12 +112,12 @@
class="taskTable"
:loading="loading"
:pagination="false"
:scroll="{x: true,y:'calc(100vh - 335px)'}"
:scroll="{x: '100%',y:'calc(100vh - 300px)'}"
:data-source="dataSource"
rowKey="id"
@change="tableOnChange"
:row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
:columns="columns"
:columns="columns" :components="drag(columns,'columns',JSON.parse(JSON.stringify([[columns[3],200],[columns[4],200],[columns[5],200]])))"
>
<div slot="standardInformation" slot-scope="text,result" class="box-left">
<div class="content">
@@ -234,6 +234,7 @@
import { getAction, postAction, deleteAction, downloadFile } from '@/api/manage'
import { mapGetters } from 'vuex'
import store from '@/store/'
import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
export default {
name: 'TaskList',
@@ -246,6 +247,7 @@
taskBatSetting
},
props: ['isDisplayNum', 'areaOfResponsibility'],
mixins:[ResizeHeader, ResizeColumnProvide],
data() {
return {
toggleSearchStatus: false,
@@ -936,6 +938,10 @@
/deep/ .ant-table-tbody > tr > td {
padding: 16px 16px!important;
}
::v-deep .ant-table-placeholder {
margin-top: 8px !important;
}
</style>
<style>
.box-input .ant-select-selection {
jero-web/src/views/projectManagement/components/TaskParameterCollection.vue
+3
View File
@@ -45,6 +45,7 @@
ref='table'
size='middle'
rowKey='id'
:components="drag(columns,'columns')"
:columns='columns'
:dataSource='dataSource'
:pagination='false'
@@ -138,6 +139,7 @@
import { ACCESS_TOKEN } from '@/store/mutation-types'
import eventBUs from '@/common/event'
import store from '@/store/'
import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
export default {
name: 'TaskParameterCollection',
@@ -148,6 +150,7 @@
HistoricalVersion,
ProjectCollectionParameters
},
mixins:[ResizeHeader, ResizeColumnProvide],
data() {
return {
columns: [
jero-web/src/views/projectManagement/components/certificationDirectory.vue
+17 -7
View File
@@ -17,6 +17,7 @@
</div>
</div>
<a-table
:components="drag(columns,'columnsAll')"
:columns="columns"
:scroll="{x: 900}"
:data-source="dataList"
@@ -67,6 +68,7 @@
import { getAction, postAction, deleteAction } from '@/api/manage'
import certificationDirectoryAdd from './certificationDirectoryAdd'
import viewFileModel from '@/components/viewFileModel/index'
import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
export default {
name: 'certificationDirectory',
@@ -75,6 +77,7 @@
viewFileModel
},
props: ['isDisplayNum'],
mixins:[ResizeHeader, ResizeColumnProvide],
data() {
return {
visible: false,
@@ -86,45 +89,52 @@
title: this.$t('directoryName'),
dataIndex: 'directoryName',
align: 'left',
ellipsis: true
ellipsis: true,
width: 132
},
{
title: this.$t('batch'),
dataIndex: 'lot',
align: 'left',
ellipsis: true
ellipsis: true,
width: 132
},
{
title: this.$t('catalogFile'),
dataIndex: 'directoryFile',
align: 'left',
ellipsis: true,
scopedSlots: { customRender: 'operationFile' }
scopedSlots: { customRender: 'operationFile' },
width: 132
},
{
title: this.$t('testScheme'),
dataIndex: 'experimentFile',
align: 'left',
ellipsis: true,
scopedSlots: { customRender: 'operationFile' }
scopedSlots: { customRender: 'operationFile' },
width: 132
},
{
title: this.$t('testReportLocation'),
dataIndex: 'detectionReportLocation',
align: 'left',
ellipsis: true
ellipsis: true,
width: 132
},
{
title: this.$t('explain'),
dataIndex: 'explainInfo',
align: 'left',
ellipsis: true
ellipsis: true,
width: 132
},
{
title: this.$t('uploadTime'),
dataIndex: 'uploadTime',
align: 'left',
ellipsis: true
ellipsis: true,
width: 130
},
{
title: this.$t('operation'),
jero-web/src/views/projectManagement/components/certificationProgressEchart.vue
+18 -10
View File
@@ -7,6 +7,7 @@
<div id="main-right">
<a-table
ref="table"
:components="drag(columns,'columns')"
:loading="loading"
:pagination="false"
:scroll="{x: true}"
@@ -27,6 +28,7 @@
import * as echarts from 'echarts'
import { getAction, postAction, deleteAction, downloadFile } from '@/api/manage'
import responsibilityList from './responsibilityList'
import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
export default {
name: 'certificationProgress',
@@ -39,6 +41,7 @@
default: []
}
},
mixins:[ResizeHeader, ResizeColumnProvide],
data() {
return {
loading: false,
@@ -50,28 +53,33 @@
columns: [
{
title: this.$t('notInvolved'),
align: 'center',
dataIndex: 'notInvolved'
align: 'left',
dataIndex: 'notInvolved',
width: 102
},
{
title: this.$t('toBeStarted'),
align: 'center',
dataIndex: 'toBeStarted'
align: 'left',
dataIndex: 'toBeStarted',
width: 102
},
{
title: this.$t('inProgress'),
align: 'center',
dataIndex: 'inProgress'
align: 'left',
dataIndex: 'inProgress',
width: 102
},
{
title: this.$t('experimentFailed'),
align: 'center',
dataIndex: 'experimentFailed'
align: 'left',
dataIndex: 'experimentFailed',
width: 122
},
{
title: this.$t('experimentPassed'),
align: 'center',
dataIndex: 'experimentPassed'
align: 'left',
dataIndex: 'experimentPassed',
width: 122
}
]
}
jero-web/src/views/projectManagement/components/currentStatusOfTheProjectEcharts.vue
+15 -8
View File
@@ -14,6 +14,7 @@
<div id="main-right">
<a-table
ref="table"
:components="drag(columns,'columns')"
:loading="loading"
:pagination="false"
:scroll="{x: true}"
@@ -34,6 +35,7 @@
import * as echarts from 'echarts'
import { getAction, postAction, deleteAction, downloadFile } from '@/api/manage'
import responsibilityList from './responsibilityList'
import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
export default {
name: 'CurrentStatusOfTheProjectEcharts',
@@ -46,6 +48,7 @@
default: []
}
},
mixins:[ResizeHeader, ResizeColumnProvide],
data() {
return {
loading: false,
@@ -57,23 +60,27 @@
columns: [
{
title: this.$t('red'),
align: 'center',
dataIndex: 'redCount'
align: 'left',
dataIndex: 'redCount',
width: 139
},
{
title: this.$t('yellow'),
align: 'center',
dataIndex: 'yellowCount'
align: 'left',
dataIndex: 'yellowCount',
width: 139
},
{
title: this.$t('green'),
align: 'center',
dataIndex: 'greenCount'
align: 'left',
dataIndex: 'greenCount',
width: 139
},
{
title: this.$t('blue'),
align: 'center',
dataIndex: 'blueCount'
align: 'left',
dataIndex: 'blueCount',
width: 139
}
]
}
jero-web/src/views/projectManagement/components/customizeList.vue
+172 -470
View File
@@ -10,6 +10,7 @@
style="height: 100%;overflow: auto;padding-bottom: 53px;">
<div style="margin-bottom: 60px">
<a-table
:components="drag(columns,'columns')"
:columns="columns"
:rowKey="record=> record.key"
:scroll="{x: 800}"
@@ -41,486 +42,187 @@
</template>
<script>
import { getAction, postAction } from '@/api/manage'
import { getAction, postAction } from '@/api/manage'
import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
export default {
name: 'transferList',
components: {},
props: ['url'],
data() {
return {
visible: false,
queryParam: {},
confirmLoading: false,
selectedRowKeys: [],
selectedRows: [],
columns: [
{
title: this.$t('customColumn'),
dataIndex: 'name',
align: 'left',
ellipsis: true
},
],
dataList: [
{
sort: '1',
name: this.$t('standard'),
headFieldCn:'编号',
headFieldEn:'Number',
field: 'serialNumber',
key: 1,
moduleFlag:'法规清单',
status:1,
},
{
sort: '2',
name: this.$t('title'),
headFieldCn:'标题',
headFieldEn:'title',
field: 'title',
key: 2,
moduleFlag:'法规清单',
status:2,
},
{
sort: '',
name: this.$t('subtitle'),
headFieldCn:'子标题',
headFieldEn:'Sub-title',
field: 'subtitle',
key: 3,
moduleFlag:'法规清单',
},
{
sort: '',
name: this.$t('listConfirmationStatus'),
headFieldCn:'清单确认状态',
headFieldEn:'List Confirmation Status',
field: 'inventoryAffirmStatusName',
key: 4,
moduleFlag:'法规清单',
},
{
sort: '',
name: this.$t('taskAffirmStatus'),
headFieldCn:'任务确认状态',
headFieldEn:'Task Confirmation Status',
field: 'taskAffirmStatusName',
key: 5,
moduleFlag:'法规清单',
},
{
sort: '',
name: this.$t('zoneOfApplication'),
headFieldCn:'适用地区',
headFieldEn:'Area',
field: 'region_dictText',
key: 6,
moduleFlag:'法规清单',
},
{
sort: '',
name: this.$t('correspondingStandard'),
headFieldCn:'对应标准',
headFieldEn:'Compare EU/CN',
field: 'correspondingStandard',
key: 7,
moduleFlag:'法规清单',
},
{
sort: '',
name: this.$t('implementationCategory'),
headFieldCn:'实施类别',
headFieldEn:'Usage',
field: 'implementType_dictText',
key: 8,
moduleFlag:'法规清单',
},
{
sort: '',
name: this.$t('ImplementationDate'),
headFieldCn:'标准实施日期',
headFieldEn:'New Type Execution Date',
field: 'xin1Che1Xing2Shi2Shi1Ri4Qi1',
key: 9,
moduleFlag:'法规清单',
},
{
sort: '',
name: this.$t('vehicleInProductionDate'),
headFieldCn:'在产车实施日期',
headFieldEn:'New Vehicle Execution Date',
field: 'implementTime',
key: 10,
moduleFlag:'法规清单',
},
{
sort: '',
name: this.$t('certificationType'),
headFieldCn:'认证类型',
headFieldEn:'Certification Type',
field: 'attestationType_dictText',
key: 11,
moduleFlag:'法规清单',
},
{
sort: '',
name: this.$t('certificationLevel'),
headFieldCn:'认证级别',
headFieldEn:'Certification Level',
field: 'attestationRank_dictText',
key: 12,
moduleFlag:'法规清单',
},
{
sort: '',
name: this.$t('applicableSupplement'),
headFieldCn:'适用增补件',
headFieldEn:'Applicable Supplement',
field: 'applicableSupplement',
key: 13,
moduleFlag:'法规清单',
},
{
sort: '',
name: 'WVTA ID',
headFieldCn:'WVTA ID',
headFieldEn:'WVTA ID',
field: 'wvtaId',
key: 14,
moduleFlag:'法规清单',
},
{
sort: '',
name: this.$t('areaOfResponsibility'),
headFieldCn:'责任领域',
headFieldEn:'Responsible Field',
field: 'dutyTerritory_dictText',
key: 15,
moduleFlag:'法规清单',
},
{
sort: '',
name: this.$t('regulatoryEngineer'),
headFieldCn:'法规工程师',
headFieldEn:'Regulation Engineer',
field: 'regulationOwnerName',
key: 16,
moduleFlag:'法规清单',
},
{
sort: '',
name: this.$t('certifiedEngineer'),
headFieldCn:'认证工程师',
headFieldEn:'Homo Engineer',
field: 'homologationEngineerName',
key: 17,
moduleFlag:'法规清单',
},
{
sort: '',
name: this.$t('engineeringInterfacePerson'),
headFieldCn:'工程接口人',
headFieldEn:'Eng. Interface',
field: 'engineeringInterfacePersonName',
key: 18,
moduleFlag:'法规清单',
},
{
sort: '',
name: this.$t('remarks'),
headFieldCn:'备注',
headFieldEn:'Comments',
field: 'remark',
key: 19,
moduleFlag:'法规清单',
},
{
sort: '',
name: this.$t('confirmationOfDesignConformity') + '/' + this.$t('Deliverables'),
headFieldCn:'交付物',
headFieldEn:'Deliverables',
field: 'designDeliverableTemplateName',
affirmFlag:'1',
key: 20,
moduleFlag:'法规清单',
},
{
sort: '',
name: this.$t('confirmationOfDesignConformity') + '/' + this.$t('Sponsor'),
headFieldCn:'发起人',
headFieldEn:'Creator',
field: 'designInitiatorName',
affirmFlag:'1',
key: 21,
moduleFlag:'法规清单',
},
{
sort: '',
name: this.$t('confirmationOfDesignConformity') + '/' + this.$t('personLiable'),
headFieldCn:'责任人',
headFieldEn:'Assignee',
field: 'designDutyName',
affirmFlag:'1',
key: 22,
moduleFlag:'法规清单',
},
{
sort: '',
name: this.$t('confirmationOfDesignConformity') + '/' + this.$t('TaskCutOffTime'),
headFieldCn:'截止时间',
headFieldEn:'Due Date',
field: 'designDueDate',
affirmFlag:'1',
key: 23,
moduleFlag:'法规清单',
},
{
sort: '',
name: this.$t('confirmationOfDesignConformity') + '/' + this.$t('descriptionDeliverables'),
headFieldCn:'交付物说明',
headFieldEn:'Instruction',
field: 'designRemark',
affirmFlag:'1',
key: 24,
moduleFlag:'法规清单',
},
{
sort: '',
name: this.$t('PrehomoConfirmation') + '/' + this.$t('Deliverables'),
headFieldCn:'交付物',
headFieldEn:'Deliverables',
field: 'prehomoDeliverableTemplateName',
affirmFlag:'2',
key: 25,
moduleFlag:'法规清单',
},
{
sort: '',
name: this.$t('PrehomoConfirmation') + '/' + this.$t('Sponsor'),
headFieldCn:'发起人',
headFieldEn:'Creator',
field: 'prehomoInitiatorName',
affirmFlag:'2',
key:26,
moduleFlag:'法规清单',
},
{
sort: '',
name: this.$t('PrehomoConfirmation') + '/' + this.$t('personLiable'),
headFieldCn:'责任人',
headFieldEn:'Assignee',
field: 'prehomoDutyName',
affirmFlag:'2',
key: 27,
moduleFlag:'法规清单',
},
{
sort: '',
name: this.$t('PrehomoConfirmation') + '/' + this.$t('TaskCutOffTime'),
headFieldCn:'截止时间',
headFieldEn:'Due Date',
field: 'prehomoDueDate',
affirmFlag:'2',
key: 28,
moduleFlag:'法规清单',
},
{
sort: '',
name: this.$t('PrehomoConfirmation') + '/' + this.$t('descriptionDeliverables'),
headFieldCn:'交付物说明',
headFieldEn:'Instruction',
field: 'prehomoRemark',
affirmFlag:'2',
key: 29,
moduleFlag:'法规清单',
},
{
sort: '',
name: this.$t('verificationAndConformityconfirmation') + '/' + this.$t('Deliverables'),
headFieldCn:'交付物',
headFieldEn:'Deliverables',
field: 'verifyDeliverableTemplateName',
affirmFlag:'3',
key: 30,
moduleFlag:'法规清单',
},
{
sort: '',
name: this.$t('verificationAndConformityconfirmation') + '/' + this.$t('Sponsor'),
headFieldCn:'发起人',
headFieldEn:'Creator',
field: 'verifyInitiatorName',
affirmFlag:'3',
key: 31,
moduleFlag:'法规清单',
},
{
sort: '',
name: this.$t('verificationAndConformityconfirmation') + '/' + this.$t('personLiable'),
headFieldCn:'责任人',
headFieldEn:'Assignee',
field: 'verifyDutyName',
affirmFlag:'3',
key: 32,
moduleFlag:'法规清单',
},
{
sort: '',
name: this.$t('verificationAndConformityconfirmation') + '/' + this.$t('TaskCutOffTime'),
headFieldCn:'截止时间',
headFieldEn:'Due Date',
field: 'verifyDueDate',
affirmFlag:'3',
key: 33,
moduleFlag:'法规清单',
},
{
sort: '',
name: this.$t('verificationAndConformityconfirmation') + '/' + this.$t('descriptionDeliverables'),
headFieldCn:'交付物说明',
headFieldEn:'Instruction',
field: 'verifyRemark',
affirmFlag:'3',
key: 34,
moduleFlag:'法规清单',
},
{
sort: '',
name: this.$t('operation'),
headFieldCn:'操作',
headFieldEn:'Operation',
key: 35,
moduleFlag:'法规清单',
status:2,
},
],
content: [],
columnsAll:[],
loading: false,
pageNo: 1,
pageSize: 10,
total: 0
}
},
mounted() {
},
methods: {
transferModel(val) {
this.visible = true
this.queryParam = {}
this.columnsAll = val
// this.$nextTick(() => {
// this.selectedRowKeys = []
// this.selectedRows = []
// })
//
// this.getCheckboxProps()
},
searchQuery() {
this.pageNo = 1
this.replacePage()
},
searchReset() {
this.pageNo = 1
this.queryParam = {}
this.replacePage()
},
onChange(page, pageSize) {
this.pageNo = page
this.replacePage()
},
SizeChange(page, pageSize) {
this.pageNo = 1
this.pageSize = pageSize
this.replacePage()
},
replacePage() {
let query = {
pageNo: this.pageNo,
pageSize: this.pageSize,
...this.queryParam
export default {
name: 'transferList',
components: {},
props: ['url'],
mixins:[ResizeHeader, ResizeColumnProvide],
data() {
return {
visible: false,
queryParam: {},
confirmLoading: false,
selectedRowKeys: [],
columns: [
{
title: this.$t('customColumn'),
dataIndex: 'name',
align: 'left',
ellipsis: true,
width: 884
},
],
dataList: [
{
orderBy: '1',
name: '1',
id: '1',
status:1,
},
{
orderBy: '2',
name: '2',
id: '12',
status:2,
},
{
orderBy: '3',
name: '3',
id: '13',
},
{
orderBy: '4',
name: '4',
id: '15',
},
{
orderBy: '5',
name: '4',
id: '16',
},
{
orderBy: '6',
name: '4',
id: '17',
},
{
orderBy: '7',
name: '4',
id: '18',
},
{
orderBy: '8',
name: '4',
id: '19',
status:2,
},
],
content: [],
loading: false,
pageNo: 1,
pageSize: 10,
total: 0
}
this.loading = true
postAction(this.url.transferUrl, query).then((res) => {
if (res.success) {
this.dataList = res.result.records || []
this.total = res.result.total
this.loading = false
} else {
this.loading = false
},
mounted() {
},
methods: {
transferModel() {
this.visible = true
this.queryParam = {}
this.selectedRowKeys = []
// this.replacePage()
},
searchQuery() {
this.pageNo = 1
this.replacePage()
},
searchReset() {
this.pageNo = 1
this.queryParam = {}
this.replacePage()
},
onChange(page, pageSize) {
this.pageNo = page
this.replacePage()
},
SizeChange(page, pageSize) {
this.pageNo = 1
this.pageSize = pageSize
this.replacePage()
},
replacePage() {
let query = {
pageNo: this.pageNo,
pageSize: this.pageSize,
...this.queryParam
}
})
},
onSelectChange(value, rows) {
this.selectedRowKeys = value
this.selectedRows = rows
// if (this.selectedRowKeys.length > 1) {
// this.selectedRowKeys.shift()
// }
},
getCheckboxProps(record) {
let titleList = []
this.columnsAll.forEach((item) => {
if(item.children){
item.children.forEach((val) => {
titleList.push(item.dataIndex,val.dataIndex)
})
}else {
titleList.push(item.dataIndex)
}
})
console.log(titleList)
return ({
props: {
//当状态是1或者2的时候执行disable
disabled: record.status === 1 || record.status === 2,
defaultChecked: titleList.includes(record.field)
}
})
},
handleCancel() {
this.visible = false
},
handleSubmit(flag) {
// if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
this.confirmLoading = true
// let selectedRows = JSON.parse(JSON.stringify(this.selectedRows))
// this.confirmLoading = false
// this.$emit('transferListForm',selectedRowKeys.join(','))
// this.selectedRowKeys = []
this.selectedRows.forEach((item,index) => {
item.sort = index + 1
})
let headCustomEOList = JSON.parse(JSON.stringify(this.selectedRows))
let query ={
headCustomEOList :headCustomEOList
}
postAction('head/headCustomEO/add', query).then((res) => {
this.loading = true
postAction(this.url.transferUrl, query).then((res) => {
if (res.success) {
this.confirmLoading = false
this.visible = false
this.$message.success(this.$t('OperationSuccessful'))
this.$emit('customizeListForm')
this.dataList = res.result.records || []
this.total = res.result.total
this.loading = false
} else {
this.$message.warning(this.$t('operationFailed'))
this.confirmLoading = false
this.visible = false
this.loading = false
}
})
},
getAdd() {
let _this = this
this.$confirm({
content: _this.$t('TheDoesNotContainData'),
onOk() {
_this.handleSubmit('1')
},
onSelectChange(value) {
this.selectedRowKeys = value
// if (this.selectedRowKeys.length > 1) {
// this.selectedRowKeys.shift()
// }
},
getCheckboxProps(record) {
console.log(record.status, 'status');
return ({
props: {
//当状态是1或者2的时候执行disable
disabled: record.status === 1 || record.status === 2
}
})
},
handleCancel() {
this.visible = false
},
handleSubmit(flag) {
if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
this.confirmLoading = true
let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys))
this.confirmLoading = false
this.$emit('transferListForm',selectedRowKeys.join(','))
this.selectedRowKeys = []
// postAction(this.url.addModel, {
// dummyInventoryBaseId: selectedRowKeys.join(','),
// projectLibraryId: this.$route.query.id,
// flag: flag
// }).then((res) => {
// if (res.success) {
// this.confirmLoading = false
// this.$message.success(this.$t('OperationSuccessful'))
// this.visible = false
// this.selectedRowKeys = []
// this.$emit('transferListForm')
// } else {
// if (res.message == '该虚拟清单的维护清单中没有数据,是否需要添加') {
// this.confirmLoading = false
// this.getAdd()
// return
// }
// this.$message.warning(this.$t('operationFailed'))
// this.confirmLoading = false
// }
// })
} else {
this.$message.warning(this.$t('selectLeastOne'))
}
})
},
getAdd() {
let _this = this
this.$confirm({
content: _this.$t('TheDoesNotContainData'),
onOk() {
_this.handleSubmit('1')
}
})
}
}
}
}
</script>
<style scoped>
jero-web/src/views/projectManagement/components/historicalVersionList.vue
+8 -3
View File
@@ -14,9 +14,10 @@
</template>
<a-table
class="table"
:components="drag(columns,'columns')"
:columns="columns"
:pagination="false"
:scroll="{y: 400}"
:scroll="{x:'100%',y: 400}"
:data-source="dataSource"
:loading="loading"
>
@@ -29,9 +30,11 @@
<script>
import { getAction, postAction } from '@/api/manage'
import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
export default {
name: 'historicalVersionList',
mixins: [ResizeColumnProvide, ResizeHeader, ResizeColumnProvide],
data() {
return {
visible: false,
@@ -46,13 +49,15 @@
title: this.$t('versionName'),
dataIndex: 'versionsName',
align: 'left',
ellipsis: true
ellipsis: true,
width: 362
},
{
title: this.$t('finalizationTime'),
dataIndex: 'createTime',
align: 'left',
ellipsis: true
ellipsis: true,
width: 362
},
{
title: this.$t('operation'),
jero-web/src/views/projectManagement/components/listAddModel.vue
+13 -5
View File
@@ -60,6 +60,7 @@
</a-form>
</div>
<a-table
:components="drag(columns,'columns')"
:columns="columns"
rowKey="id"
:scroll="{x: 1200}"
@@ -93,6 +94,7 @@
<script>
import { getAction, postAction } from '@/api/manage'
import globalAdvancedQuery from '@/components/globalAdvancedQuery/index'
import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
export default {
name: 'listAddModel',
@@ -100,6 +102,7 @@
globalAdvancedQuery
},
props: ['url'],
mixins:[ResizeHeader, ResizeColumnProvide],
data() {
return {
toggleSearchStatus: false,
@@ -112,19 +115,22 @@
title: this.$t('standard'),
dataIndex: 'serial_number',
align: 'left',
ellipsis: true
ellipsis: true,
width: 228
},
{
title: this.$t('title'),
dataIndex: 'title',
align: 'left',
ellipsis: true
ellipsis: true,
width: 228
},
{
title: this.$t('zoneOfApplication'),
dataIndex: 'region',
align: 'left',
ellipsis: true
ellipsis: true,
width: 228
},
// {
// title: this.$t('status'),
@@ -142,13 +148,15 @@
title: this.$t('ImplementationDate'),
dataIndex: 'xin1_che1_xing2_shi2_shi1_ri4_qi1',
align: 'left',
ellipsis: true
ellipsis: true,
width: 228
},
{
title: this.$t('vehicleInProductionDate'),
dataIndex: 'implement_time',
align: 'left',
ellipsis: true
ellipsis: true,
width: 228
},
// {
// title: this.$t('correspondingStandard'),
jero-web/src/views/projectManagement/components/listOfRegulations.vue
+2 -2
View File
@@ -244,7 +244,7 @@
class="customizetable"
:loading="loading"
:pagination="false"
:scroll="{x: '100%',y:'calc(100vh - 356px)'}"
:scroll="{x: '100%',y:'calc(100vh - 300px)'}"
rowKey="id"
:data-source="dataSource"
@change="tableOnChange"
@@ -813,7 +813,7 @@
title: this.$t('operation'),
align: 'left',
fixed: 'right',
width: 240,
width: 200,
scopedSlots: { customRender: 'operation' }
},
{
jero-web/src/views/projectManagement/components/listOfRelevantPersonnel.vue
+17 -5
View File
@@ -105,6 +105,7 @@
:row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"-->
<a-table
class="table"
:components="drag(columns,'columnsAll')"
:columns="columns"
rowKey="id"
:row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
@@ -270,6 +271,7 @@
import { getAction, postAction, downloadFile, putAction } from '@/api/manage'
import ImportFile from '@/components/ImportFile/index'
import { mapGetters } from 'vuex'
import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
export default {
name: 'listOfRelevantPersonnel',
@@ -278,6 +280,7 @@
ImportFile,
personBatting
},
mixins:[ResizeHeader, ResizeColumnProvide],
data() {
return {
toggleSearchStatus: false,
@@ -288,31 +291,36 @@
title: this.$t('areaOfResponsibility'),
align: 'left',
dataIndex: 'dutyTerritory_dictText',
ellipsis: true
ellipsis: true,
width: 153
},
{
align: 'left',
dataIndex: 'lawEngineerName',
slots: { title: 'regulatoryEngineer' },
ellipsis: true
ellipsis: true,
width: 153
},
{
align: 'left',
slots: { title: 'engineeringInterfacePerson' },
dataIndex: 'engineeringInterfacePersonName',
ellipsis: true
ellipsis: true,
width: 153
},
{
align: 'left',
slots: { title: 'certifiedEngineer' },
dataIndex: 'certificationEngineerName',
ellipsis: true
ellipsis: true,
width: 153
},
{
title: this.$t('remarks'),
align: 'left',
dataIndex: 'remark',
ellipsis: true
ellipsis: true,
width: 153
},
{
title: this.$t('operation'),
@@ -689,4 +697,8 @@
/*/deep/.table .ant-table-tbody > tr > td {*/
/* color: #040B29 ;*/
/*}*/
.table {
margin-bottom: 60px;
}
</style>
jero-web/src/views/projectManagement/components/nonConformance.vue
+5 -3
View File
@@ -51,6 +51,7 @@
<a-table
ref="table"
size="middle"
:components="drag(columns,'columns')"
:loading="loading"
rowKey="uuid"
:pagination="false"
@@ -85,9 +86,11 @@
<script>
import { getAction, postAction, downloadFile, deleteAction,downloadFilePost } from '@/api/manage'
import store from '@/store/'
import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
export default {
name: 'nonConformance',
mixins:[ResizeHeader, ResizeColumnProvide],
data() {
return {
queryParam: {},
@@ -101,7 +104,6 @@
title: this.$t('standard'),
align: 'left',
dataIndex: 'serialNumber',
scopedSlots: { customRender: 'standard' },
ellipsis: true,
sorter:true,
width: 180
@@ -111,13 +113,13 @@
align: 'left',
dataIndex: 'title',
ellipsis: true,
width: 180,
scopedSlots: { customRender: 'standard' }
width: 180
},
{
title: this.$t('ProcessType'),
align: 'left',
dataIndex: 'flowType',
scopedSlots: { customRender: 'standard' },
ellipsis: true,
sorter:true,
width: 180
jero-web/src/views/projectManagement/components/responsibilityList.vue
+5 -2
View File
@@ -20,6 +20,7 @@
</div>
<a-table
ref="table"
:components="drag(columns,'columns')"
:loading="loading"
:pagination="false"
:scroll="{x: true,y:400}"
@@ -36,9 +37,11 @@
<script>
import { getAction, postAction, downloadFile } from '@/api/manage'
import moment from 'moment'
import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
export default {
name: 'responsibilityList',
mixins:[ResizeHeader, ResizeColumnProvide],
data() {
return {
visible: false,
@@ -55,7 +58,7 @@
{
title: this.$t('areaOfResponsibility'),
dataIndex: 'dutyTerritoryName',
align: 'center',
align: 'left',
width: 400,
ellipsis: true,
scopedSlots: { customRender: 'areaOfResponsibility' }
@@ -63,7 +66,7 @@
{
title: this.$t('Quantity'),
dataIndex: 'amount',
align: 'center',
align: 'left',
ellipsis: true,
width: 300
}
jero-web/src/views/projectManagement/components/settingList.vue
+56 -56
View File
@@ -13,7 +13,7 @@
<a-col :span="12">
<div class="box-title-text">
<div class="title-text">
<span class="Required">*</span>
<!-- <span class="Required">*</span>-->
<span class="title-text-text" :title="$t('confirmationOfRegulationsList')">
{{$t('confirmationOfRegulationsList')}}</span>
</div>
@@ -32,7 +32,7 @@
<a-col :span="12">
<div class="box-title-text">
<div class="title-text">
<span class="Required">*</span>
<!-- <span class="Required">*</span>-->
<span class="title-text-text" :title="$t('regulatoryTaskConfirmation')">
{{$t('regulatoryTaskConfirmation')}}</span>
</div>
@@ -51,7 +51,7 @@
<a-col :span="12">
<div class="box-title-text">
<div class="title-text">
<span class="Required">*</span>
<!-- <span class="Required">*</span>-->
<span class="title-text-text" :title="$t('confirmationOfDesignConformity')">
{{$t('confirmationOfDesignConformity')}}</span>
</div>
@@ -70,7 +70,7 @@
<a-col :span="12">
<div class="box-title-text">
<div class="title-text">
<span class="Required">*</span>
<!-- <span class="Required">*</span>-->
<span class="title-text-text" :title="$t('preHomoCompletion')">
{{$t('preHomoCompletion')}}</span>
</div>
@@ -89,7 +89,7 @@
<a-col :span="12">
<div class="box-title-text">
<div class="title-text">
<span class="Required">*</span>
<!-- <span class="Required">*</span>-->
<span class="title-text-text" :title="$t('certificationStart')">
{{$t('certificationStart')}}</span>
</div>
@@ -109,7 +109,7 @@
<a-col :span="12">
<div class="box-title-text">
<div class="title-text">
<span class="Required">*</span>
<!-- <span class="Required">*</span>-->
<span class="title-text-text" :title="$t('certificationEnd')">
{{$t('certificationEnd')}}</span>
</div>
@@ -129,7 +129,7 @@
<a-col :span="12">
<div class="box-title-text">
<div class="title-text">
<span class="Required">*</span>
<!-- <span class="Required">*</span>-->
<span class="title-text-text" :title="$t('verificationAndConformityconfirmation')">
{{$t('verificationAndConformityconfirmation')}}</span>
</div>
@@ -163,55 +163,55 @@
confirmLoading: false,
formInline: {},
rules: {
listConfirmation: [
{
required: true,
message: this.$t('confirmationOfRegulationsList') + this.$t('cannotEmpty'),
trigger: 'change'
}
],
legalTaskConfirmation: [
{
required: true,
message: this.$t('regulatoryTaskConfirmation') + this.$t('cannotEmpty'),
trigger: 'change'
}
],
designDeadline: [
{
required: true,
message: this.$t('confirmationOfDesignConformity') + this.$t('cannotEmpty'),
trigger: 'change'
}
],
prehomoDeadline: [
{
required: true,
message: this.$t('preHomoCompletion') + this.$t('cannotEmpty'),
trigger: 'change'
}
],
attestationStartTime: [
{
required: true,
message: this.$t('certificationStart') + this.$t('cannotEmpty'),
trigger: 'change'
}
],
attestationEndTime: [
{
required: true,
message: this.$t('certificationEnd') + this.$t('cannotEmpty'),
trigger: 'change'
}
],
verifyDeadline: [
{
required: true,
message: this.$t('verificationConfirmationDeadline') + this.$t('cannotEmpty'),
trigger: 'change'
}
]
// listConfirmation: [
// {
// required: true,
// message: this.$t('confirmationOfRegulationsList') + this.$t('cannotEmpty'),
// trigger: 'change'
// }
// ],
// legalTaskConfirmation: [
// {
// required: true,
// message: this.$t('regulatoryTaskConfirmation') + this.$t('cannotEmpty'),
// trigger: 'change'
// }
// ],
// designDeadline: [
// {
// required: true,
// message: this.$t('confirmationOfDesignConformity') + this.$t('cannotEmpty'),
// trigger: 'change'
// }
// ],
// prehomoDeadline: [
// {
// required: true,
// message: this.$t('preHomoCompletion') + this.$t('cannotEmpty'),
// trigger: 'change'
// }
// ],
// attestationStartTime: [
// {
// required: true,
// message: this.$t('certificationStart') + this.$t('cannotEmpty'),
// trigger: 'change'
// }
// ],
// attestationEndTime: [
// {
// required: true,
// message: this.$t('certificationEnd') + this.$t('cannotEmpty'),
// trigger: 'change'
// }
// ],
// verifyDeadline: [
// {
// required: true,
// message: this.$t('verificationConfirmationDeadline') + this.$t('cannotEmpty'),
// trigger: 'change'
// }
// ]
},
ids: []
}
jero-web/src/views/projectManagement/components/transferList.vue
+11 -4
View File
@@ -31,6 +31,7 @@
</a-form>
</div>
<a-table
:components="drag(columns,'columns')"
:columns="columns"
rowKey="id"
:scroll="{x: 1000}"
@@ -63,11 +64,13 @@
<script>
import { getAction, postAction } from '@/api/manage'
import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
export default {
name: 'transferList',
components: {},
props: ['url'],
mixins: [ResizeHeader, ResizeColumnProvide],
data() {
return {
visible: false,
@@ -79,25 +82,29 @@
title: this.$t('VirtualListName'),
dataIndex: 'name',
align: 'left',
ellipsis: true
ellipsis: true,
width: 235
},
{
title: this.$t('instructionForUse'),
dataIndex: 'useExplain',
align: 'left',
ellipsis: true
ellipsis: true,
width: 235
},
{
title: this.$t('updateTime'),
dataIndex: 'updateTime',
align: 'left',
ellipsis: true
ellipsis: true,
width: 235
},
{
title: this.$t('creater'),
dataIndex: 'createBy',
align: 'left',
ellipsis: true
ellipsis: true,
width: 235
}
],
dataList: [],
jero-web/src/views/projectManagement/components/versionStatistics.vue
+3
View File
@@ -31,6 +31,7 @@
<!-- </a-form>-->
<!-- </div>-->
<a-table
:components="drag(columns,'columns')"
:columns="columns"
:rowKey="(record)=>JSON.stringify(record)"
:scroll="{x: '100%',y:500}"
@@ -63,9 +64,11 @@
<script>
import { getAction, postAction } from '@/api/manage'
import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
export default {
name: 'versionStatistics',
mixins:[ResizeHeader, ResizeColumnProvide],
data() {
return {
visible: false,