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

# 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
120 changed files with 1852 additions and 950 deletions
@@ -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