From 866761beae1a458644962d6a6fda5dd94699ed59 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Tue, 5 Sep 2023 09:10:09 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=BA=93-=E6=9C=AA=E7=AC=A6?= =?UTF-8?q?=E5=90=88=E9=A1=B9=E4=BF=AE=E6=94=B9=E5=B8=83=E5=B1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/addModelconformance.vue | 757 ++++++++++++++++++ .../components/detilModel.vue | 751 +++++++++++++++++ .../components/nonConformance.vue | 331 ++++++-- 3 files changed, 1753 insertions(+), 86 deletions(-) create mode 100644 jero-web/src/views/projectManagement/components/addModelconformance.vue create mode 100644 jero-web/src/views/projectManagement/components/detilModel.vue diff --git a/jero-web/src/views/projectManagement/components/addModelconformance.vue b/jero-web/src/views/projectManagement/components/addModelconformance.vue new file mode 100644 index 000000000..de8ad4ea5 --- /dev/null +++ b/jero-web/src/views/projectManagement/components/addModelconformance.vue @@ -0,0 +1,757 @@ + + + + + \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/components/detilModel.vue b/jero-web/src/views/projectManagement/components/detilModel.vue new file mode 100644 index 000000000..7d06b0f9d --- /dev/null +++ b/jero-web/src/views/projectManagement/components/detilModel.vue @@ -0,0 +1,751 @@ + + + + + \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/components/nonConformance.vue b/jero-web/src/views/projectManagement/components/nonConformance.vue index 46b5b74a5..2124d0419 100644 --- a/jero-web/src/views/projectManagement/components/nonConformance.vue +++ b/jero-web/src/views/projectManagement/components/nonConformance.vue @@ -3,38 +3,103 @@
- -
-
- {{$t('standard')}} -
- -
-
{{$t('title')}}
- +
-
- {{$t('areaOfResponsibility')}} +
+ {{$t('Relevantlawsregulations')}}
- +
+ +
+
+ {{$t('RelatedItems')}} +
+ + + + {{ item.projectName}} + + + +
+ + - {{$t('reset')}} + + {{ !toggleSearchStatus ? $t('open') : $t('away') }} + + + {{$t('reset')}} {{$t('query')}} @@ -42,6 +107,10 @@
+
+ + {{$t('newlyAdded')}} +
{{ $t('export') }} @@ -61,31 +130,46 @@ :data-source="dataSource" :columns="columns" > - - - {{text}} - - - - - {{text}} - +
+ + {{result.certificationProgress_dictText ? result.certificationProgress_dictText : $t('toBeStarted')}} + +
+ + + {{ $t('See') }} + + + {{ $t('edit') }} + + + {{ $t('deleteLib') }} +
- - - - - - - - - - - - +
+ +
+ + @@ -93,13 +177,17 @@ import { getAction, postAction, downloadFile, deleteAction,downloadFilePost } from '@/api/manage' import designCompliance from '../../toDoCenter/projectRegulationTasks/components/designCompliance' import store from '@/store/' + import addModel from './addModelconformance' + import detilModel from './detilModel' import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header' export default { name: 'nonConformance', mixins:[ResizeHeader, ResizeColumnProvide], components:{ - designCompliance + designCompliance, + addModel, + detilModel, }, data() { return { @@ -109,76 +197,112 @@ orderByField: '', dataSource: [], selectedRowKeys: [], + projectNameList: [], + ProblemstateList:[this.$t('red'),this.$t('yellow'),this.$t('green'),], + CertificationColor: { + 'red': 'nonConformityColor', + 'green': 'accordColor', + 'yellow': 'TrackedColor', + }, + toggleSearchStatus: false, columns: [ - { - title: this.$t('standard'), - align: 'left', - dataIndex: 'serialNumber', - scopedSlots: { customRender: 'standard' }, - ellipsis: true, - sorter:true, - width: 180 - }, { title: this.$t('title'), align: 'left', + dataIndex: 'serialNumber', + width: 170, + sorter:true, + scopedSlots: { customRender: 'standard' } + }, + { + title: this.$t('Relevantlawsregulations'), + align: 'left', dataIndex: 'title', - ellipsis: true, - width: 180 + width: 170, + sorter:true, + ellipsis: true }, { - title: this.$t('ProcessType'), + title: this.$t('RelatedItems'), align: 'left', - dataIndex: 'flowTypeName', - ellipsis: true, + dataIndex: 'RelatedItems', + width: 170, sorter:true, - width: 150 - }, - { - title: this.$t('areaOfResponsibility'), - align: 'left', - dataIndex: 'dutyTerritory_dictText', - ellipsis: true, - sorter:true, - width: 100 + ellipsis: true }, { title: this.$t('problemType'), align: 'left', - dataIndex: 'flowStatusName', - ellipsis: true, + dataIndex: 'problemType', + width: 170, sorter:true, - width: 150, - scopedSlots: { customRender: 'problemType' }, + ellipsis: true, + scopedSlots: { customRender: 'CertificationProgress' } }, { - title: this.$t('Sponsor'), + title: this.$t('statisticalNodes'), align: 'left', - dataIndex: 'regulationOwnerIdName', - ellipsis: true, + dataIndex: 'dutyTerritory', + width: 100, sorter:true, - width: 100 + ellipsis: true }, { - title: this.$t('personLiable'), + title: this.$t('creator'), align: 'left', - dataIndex: 'dutyIdName', - ellipsis: true, + dataIndex: 'creator', + width: 100, sorter:true, - width: 100 + ellipsis: true + }, + { + title: this.$t('Problemstate'), + align: 'left', + dataIndex: 'Problemstate', + width: 120, + sorter:true, + ellipsis: true + }, + { + title: this.$t('createTime'), + align: 'left', + dataIndex: 'createTime', + sorter:true, + width: 180 + }, + { + title: this.$t('updateTime'), + align: 'left', + dataIndex: 'updateTime', + sorter:true, + width: 180 + }, + { + title: this.$t('operation'), + align: 'left', + fixed: 'right', + width: localStorage.getItem('language') == 'zh-cn' ? 160 : 180, + scopedSlots: { customRender: 'operation' } } ], total: 0, pageSize: 10, pageNo: 1, + orderBy: '1', + orderByField: '', + long: '', + isPersonnelSelection:true, url: { page: '/project/projectLawsInventoryEO/queryNotComplianList', exportData: '/project/projectLawsInventoryEO/exportNotComplianList' - } + }, + content: [] } }, mounted() { + this.long = localStorage.getItem('language') || 'zh-cn' this.getList() + this.getNameList() }, created() { if (store.getters.userInfo) { @@ -198,6 +322,18 @@ } }, methods: { + getNameList() { + getAction('project/projectNameInfoEO/list', {}).then((res) => { + if (res.success) { + this.projectNameList = res.result || [] + } else { + this.projectNameList = [] + } + }) + }, + handleToggleSearch() { + this.toggleSearchStatus = !this.toggleSearchStatus + }, searchQuery() { this.pageNo = 1 this.getList() @@ -232,6 +368,9 @@ }) } }, + addModelForm(){ + this.getList() + }, handleExport() { let query = { ...this.queryParam, @@ -262,8 +401,8 @@ }, getList() { let query = { - // pageNo: this.pageNo, - // pageSize: this.pageSize, + pageNo: this.pageNo, + pageSize: this.pageSize, projectLibraryId: this.$route.query.id, orderBy: this.orderBy, orderByField: this.orderByField, @@ -272,8 +411,12 @@ this.loading = true getAction(this.url.page, query).then((res) => { if (res.success) { - this.dataSource = res.result || [] - // this.total = res.result.total + if (res.result.current > 1 && res.result.length == 0) { + this.pageNo = 1 + this.getList() + return + } + this.total = res.result.total this.loading = false } else { this.dataSource = [] @@ -281,14 +424,30 @@ } }) }, - standardhdClick(row) { - let newUrl = this.$router.resolve({ - path: '/docManage/library/detail', - query: { - id: row.standId + handleAdd(){ + this.$refs.addModelRef.add() + }, + edit(record){ + this.$refs.addModelRef.edit(JSON.parse(JSON.stringify(record))) + }, + detil(record){ + this.problemTypeClick(record) + }, + deleteLib(record){ + let _this = this + this.$confirm({ + content: _this.$t('ConfirmDelete'), + onOk() { + deleteAction(_this.url.deleteBatch, { id: record.id }).then((res) => { + if (res.success) { + _this.$message.success(_this.$t('OperationSuccessful')) + _this.getList() + } else { + _this.$message.warning(res.message) + } + }) } }) - window.open(newUrl.href, '_blank') }, problemTypeClick(row, name){ let query = {}