From 19420218083a8a41d9d5af2263fc2e109208121e Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Tue, 5 Sep 2023 16:09:01 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=AA=E7=AC=A6=E5=90=88=E9=A1=B9=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E7=BC=96=E8=BE=91=E5=BC=B9=E6=A1=86=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../projectNonConformance/index.vue | 73 +++++++++++++---- .../moudles/addModel.vue | 80 +++++++++++-------- 2 files changed, 102 insertions(+), 51 deletions(-) diff --git a/jero-web/src/views/projectManagement/projectNonConformance/index.vue b/jero-web/src/views/projectManagement/projectNonConformance/index.vue index e8e4583b9..086c6f36d 100644 --- a/jero-web/src/views/projectManagement/projectNonConformance/index.vue +++ b/jero-web/src/views/projectManagement/projectNonConformance/index.vue @@ -136,12 +136,20 @@
- - {{result.certificationProgress_dictText ? result.certificationProgress_dictText : $t('toBeStarted')}} + {{result.problemState ? result.problemState : ''}} + + + {{result.problemState ? result.problemState : ''}} + + + {{result.problemState ? result.problemState : ''}}
@@ -149,11 +157,11 @@ @click="detil(record)"> {{ $t('See') }} - {{ $t('edit') }} - {{ $t('deleteLib') }} @@ -204,11 +212,11 @@ selectedRowKeys: [], projectNameList: [], ProblemstateList:[this.$t('red'),this.$t('yellow'),this.$t('green'),], - CertificationColor: { - 'red': 'nonConformityColor', - 'green': 'accordColor', - 'yellow': 'TrackedColor', - }, + // CertificationColor: { + // $t('red'): 'nonConformityColor', + // $t('green'): 'accordColor', + // $t('yellow'): 'TrackedColor', + // }, toggleSearchStatus: false, columns: [ { @@ -238,11 +246,10 @@ { title: this.$t('problemType'), align: 'left', - dataIndex: 'problemType', + dataIndex: 'problemType_dictText', width: 170, sorter:true, - ellipsis: true, - scopedSlots: { customRender: 'CertificationProgress' } + ellipsis: true }, { title: this.$t('statisticalNodes'), @@ -266,7 +273,8 @@ dataIndex: 'problemState', width: 120, sorter:true, - ellipsis: true + ellipsis: true, + scopedSlots: { customRender: 'CertificationProgress' } }, { title: this.$t('createTime'), @@ -424,7 +432,7 @@ this.$confirm({ content: _this.$t('ConfirmDelete'), onOk() { - deleteAction(_this.url.deleteBatch, { id: record.id }).then((res) => { + deleteAction('/project/problemManagementEO/deleteBatch', { ids: record.uuid }).then((res) => { if (res.success) { _this.$message.success(_this.$t('OperationSuccessful')) _this.getList() @@ -601,7 +609,40 @@ text-align: right; margin-top: 20px; } + .box-content-Progress { + width: 88px; + height: 32px; + display: inline-block; + text-align: center; + line-height: 32px; + border-radius: 4px; + background: #f1f3f5; + color: #919399; + } + .accordColor { + background: #dbf6e2; + color: #26BD4B; + } + .nonConformityColor { + background: #f3dddd; + color: #E83030; + } + + .TrackedColor { + background: #f6ebdb; + color: #FDA71C; + } + + .notInvolvedColor { + background: #eef1f4; + color: #707486; + } + + .submittedColor { + color: #00B3BE; + background: #ddf3f4; + } .textName { width: 100%; overflow: hidden; diff --git a/jero-web/src/views/projectManagement/projectNonConformance/moudles/addModel.vue b/jero-web/src/views/projectManagement/projectNonConformance/moudles/addModel.vue index d19ac4093..20c408f2f 100644 --- a/jero-web/src/views/projectManagement/projectNonConformance/moudles/addModel.vue +++ b/jero-web/src/views/projectManagement/projectNonConformance/moudles/addModel.vue @@ -386,7 +386,10 @@ export default { formInline: { fileLinkList:[{}], progressTrackingList:[{}], - approvalEvidenceLinkList:[{}] + approvalEvidenceLinkList:[{}], + dutyTerritory:undefined, + projectId:undefined, + problemState:undefined, }, formInlinetracking:{}, confirmLoading: false, @@ -502,20 +505,27 @@ export default { }) }, edit(row) { + console.log(row) this.getNameList() this.getFirstLevelDutyTerritory() this.title = this.$t('edit') + if(row.dutyTerritory != null){ + this.formInline.dutyTerritory = row.dutyTerritory.split(',') + }else{ + this.formInline.dutyTerritory = undefined + console.log(this.formInline.dutyTerritory) + } + if(row.projectId != null){ + this.formInline.projectId = row.projectId.split(',') + }else{ + this.formInline.dutyTerritory = undefined + } + this.formInline = row + console.log(this.formInline) this.visible = true this.disabled = false this.templateDisabled = true this.$nextTick(() => { - if(row.dutyTerritory){ - this.formInline.dutyTerritory = this.formInline.dutyTerritory.split(',') - } - if(row.projectId){ - this.formInline.projectId = this.formInline.projectId.split(',') - } - this.formInline = row this.$refs.ruleForm.clearValidate() }) }, @@ -606,33 +616,33 @@ export default { if(this.formInline.projectId && this.formInline.projectId instanceof Array){ this.formInline.projectId = this.formInline.projectId.join(',') } - let fileLinkList = [] - let approvalEvidenceLinkList = [] - let progressTrackingList = [] - if(this.formInline.fileLinkList){ - this.formInline.fileLinkList.forEach(item => { - if(item.fileLink){ - fileLinkList.push(item.fileLink) - } - }) - this.formInline.fileLinkList = fileLinkList - } - if(this.formInline.approvalEvidenceLinkList){ - this.formInline.approvalEvidenceLinkList.forEach(item => { - if(item.approvalEvidenceLink){ - approvalEvidenceLinkList.push(item.approvalEvidenceLink) - } - }) - this.formInline.approvalEvidenceLinkList = approvalEvidenceLinkList - } - if(this.formInline.progressTrackingList){ - this.formInline.progressTrackingList.forEach(item => { - if(item.progressTracking){ - progressTrackingList.push(item.progressTracking) - } - }) - this.formInline.progressTrackingList = progressTrackingList - } + // let fileLinkList = [] + // let approvalEvidenceLinkList = [] + // let progressTrackingList = [] + // if(this.formInline.fileLinkList){ + // this.formInline.fileLinkList.forEach(item => { + // if(item.fileLink){ + // fileLinkList.push(item.fileLink) + // } + // }) + // this.formInline.fileLinkList = fileLinkList + // } + // if(this.formInline.approvalEvidenceLinkList){ + // this.formInline.approvalEvidenceLinkList.forEach(item => { + // if(item.approvalEvidenceLink){ + // approvalEvidenceLinkList.push(item.approvalEvidenceLink) + // } + // }) + // this.formInline.approvalEvidenceLinkList = approvalEvidenceLinkList + // } + // if(this.formInline.progressTrackingList){ + // this.formInline.progressTrackingList.forEach(item => { + // if(item.progressTracking){ + // progressTrackingList.push(item.progressTracking) + // } + // }) + // this.formInline.progressTrackingList = progressTrackingList + // } delete this.formInline.lawsName let query = { // problemManagementEO:formInline