From 974b25c47ec60f4d4246247a34307db8dd491538 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167>
Date: Tue, 24 Oct 2023 17:47:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9UAT=E6=8F=90=E5=87=BA?=
=?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../components/ProjectDetails.vue | 4 +
.../components/nonConformance.vue | 971 +++++++++---------
.../components/projectStatus.vue | 18 +-
.../moudles/addModel.vue | 140 ++-
.../moudles/detilModel.vue | 85 +-
5 files changed, 707 insertions(+), 511 deletions(-)
diff --git a/jero-web/src/views/projectManagement/components/ProjectDetails.vue b/jero-web/src/views/projectManagement/components/ProjectDetails.vue
index ea759280f..577cbc4b8 100644
--- a/jero-web/src/views/projectManagement/components/ProjectDetails.vue
+++ b/jero-web/src/views/projectManagement/components/ProjectDetails.vue
@@ -167,6 +167,7 @@
' + this.userInfo().username + ' ' + time + '
' + ' ' + this.$t('Problemstate') + this.$t('by') + '\'' + this.problemState + '\'' + this.$t('Changeto') + '\'' + value + '\'' if (JSON.stringify(this.formInline.progressTrackingList[0]) == '{}' || this.formInline.progressTrackingList[0].progressTracking == '') { this.formInline.progressTrackingList.forEach((item, index) => { item.progressTracking = text @@ -681,7 +740,7 @@ ...mapGetters(['userInfo']), add() { this.templateDisabled = false - this.getNameList() + // this.getNameList() this.getFirstLevelDutyTerritory() this.title = this.$t('newlyAdded') this.visible = true @@ -699,8 +758,17 @@ }) }, edit(row) { - console.log(row) - this.getNameList() + this.projectNameList = [] + if (row.projectType == 'model') { + this.getNameList() + if (this.formInline.projectId != null) { + this.formInline.projectId = this.formInline.projectId.split(',') + } else { + this.formInline.projectId = undefined + } + } else if (row.projectType == 'numberPlatform' || row.projectType == 'carPlatform') { + this.getPlatform(row.projectType) + } this.getFirstLevelDutyTerritory() this.title = this.$t('edit') this.problemState = row.problemState @@ -722,11 +790,6 @@ if (this.formInline.fileLinkList == null) { this.formInline.fileLinkList = [{}] } - if (this.formInline.projectId != null) { - this.formInline.projectId = this.formInline.projectId.split(',') - } else { - this.formInline.projectId = undefined - } this.visible = true this.disabled = false this.templateDisabled = true @@ -753,7 +816,7 @@ TrackingModelForm(row) { let time = moment(new Date()).format('YYYY-MM-DD HH:mm:ss') console.log(row) - let text = ''+this.userInfo().username + ' ' + time +'
' + row + let text = '' + this.userInfo().username + ' ' + time + '
' + row console.log(text) this.formInline.progressTrackingList.forEach((item, index) => { if (!item.progressTracking) { @@ -807,7 +870,6 @@ }) }, handleSubmit() { - console.log(this.formInline) this.$refs.ruleForm.validate(valid => { if (valid) { this.confirmLoading = true @@ -970,10 +1032,29 @@ putAwayClick() { this.isDescription = !this.isDescription }, - openClick(item){ + openClick(item) { item.isDescription = !item.isDescription - this.formInline = {...this.formInline} + this.formInline = { ...this.formInline } }, + platformChange(value) { + this.projectNameList = [] + this.relatedItemsList = [] + if (value == 'model') { + this.formInline.projectId = [] + this.getNameList() + } else if (value == 'numberPlatform' || value == 'carPlatform') { + this.formInline.projectId = undefined + this.getPlatform(value) + }else{ + this.formInline.projectId = undefined + } + this.formInline = { ...this.formInline } + }, + getPlatform(platform) { + getAction('/project/projectLibraryBase/getPlatform', { platform: platform }).then((res) => { + this.relatedItemsList = res || [] + }) + } } } @@ -985,11 +1066,13 @@ .ant-input-disabled { color: rgba(0, 0, 0, 0.65) !important; } - .text-class{ + + .text-class { color: rgba(0, 0, 0, 0.65); font-weight: bold; } - p{ + + p { margin: 0; padding: 0; } @@ -1117,7 +1200,8 @@ ::v-deep .itemModel-explain .ql-container { height: calc(100% - 100px); } - .text-box{ + + .text-box { width: 100%; height: 200px; display: inline-block; diff --git a/jero-web/src/views/projectManagement/projectNonConformance/moudles/detilModel.vue b/jero-web/src/views/projectManagement/projectNonConformance/moudles/detilModel.vue index 5631b0596..995ce517f 100644 --- a/jero-web/src/views/projectManagement/projectNonConformance/moudles/detilModel.vue +++ b/jero-web/src/views/projectManagement/projectNonConformance/moudles/detilModel.vue @@ -82,14 +82,56 @@