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 feature_dev_20230109_BTTZ

Browse Source
This commit is contained in:
zyx.net
2023-01-13 10:47:47 +08:00
parent 5d7ff5d238 7c47ab70d8
commit 9b1dbfa6ac
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-web/src/views/projectManagement/projectLibrary/index.vue
+6 -3
View File
@@ -127,6 +127,7 @@
<a-table <a-table
ref="table" ref="table"
size="middle" size="middle"
:components="drag(columns,'columns')"
:loading="loading" :loading="loading"
:pagination="false" :pagination="false"
:scroll="{x: '100%'}" :scroll="{x: '100%'}"
@@ -180,6 +181,7 @@
import changeExtensionModel from './components/changeExtensionModel' import changeExtensionModel from './components/changeExtensionModel'
import PersonnelSelection from '@/components/PersonnelSelection/index' import PersonnelSelection from '@/components/PersonnelSelection/index'
import { mapGetters } from 'vuex' import { mapGetters } from 'vuex'
import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
export default { export default {
name: 'index', name: 'index',
@@ -188,6 +190,7 @@
PersonnelSelection, PersonnelSelection,
changeExtensionModel changeExtensionModel
}, },
mixins:[ResizeHeader, ResizeColumnProvide],
data() { data() {
return { return {
loading: false, loading: false,
@@ -214,7 +217,7 @@
title: this.$t('entryName'), title: this.$t('entryName'),
align: 'left', align: 'left',
dataIndex: 'projectName', dataIndex: 'projectName',
width: 180, width: 260,
sorter:true, sorter:true,
ellipsis: true, ellipsis: true,
scopedSlots: { customRender: 'projectName' } scopedSlots: { customRender: 'projectName' }
@@ -244,7 +247,7 @@
{ {
title: this.$t('brand'), title: this.$t('brand'),
align: 'left', align: 'left',
width: 180, width: 140,
ellipsis: true, ellipsis: true,
dataIndex: 'brandText' dataIndex: 'brandText'
}, },
@@ -282,7 +285,7 @@
title: this.$t('operation'), title: this.$t('operation'),
align: 'left', align: 'left',
fixed: 'right', fixed: 'right',
width: 302, width: 260,
scopedSlots: { customRender: 'operation' } scopedSlots: { customRender: 'operation' }
} }
], ],
jero-web/src/views/projectManagement/projectNonConformance/index.vue
+4 -1
View File
@@ -152,6 +152,7 @@
ref="table" ref="table"
size="middle" size="middle"
rowKey="uuid" rowKey="uuid"
:components="drag(columns,'columns')"
:loading="loading" :loading="loading"
:pagination="false" :pagination="false"
:scroll="{x: '100%'}" :scroll="{x: '100%'}"
@@ -186,12 +187,14 @@
import { getAction, postAction, downloadFile, deleteAction ,downloadFilePost} from '@/api/manage' import { getAction, postAction, downloadFile, deleteAction ,downloadFilePost} from '@/api/manage'
import PersonnelSelection from '@/components/PersonnelSelection/index' import PersonnelSelection from '@/components/PersonnelSelection/index'
import store from '@/store/' import store from '@/store/'
import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
export default { export default {
name: 'projectNonConformance', name: 'projectNonConformance',
components: { components: {
PersonnelSelection PersonnelSelection
}, },
mixins:[ResizeHeader, ResizeColumnProvide],
data() { data() {
return { return {
queryParam: {}, queryParam: {},
@@ -228,7 +231,7 @@
title: this.$t('areaOfResponsibility'), title: this.$t('areaOfResponsibility'),
align: 'left', align: 'left',
dataIndex: 'dutyTerritory', dataIndex: 'dutyTerritory',
width: 180, width: 120,
sorter:true, sorter:true,
ellipsis: true ellipsis: true
}, },