From 96393629cca556458479ef280700898eab9981b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Fri, 8 Dec 2023 18:35:18 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=AE=E9=A2=98=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E6=96=B0=E5=A2=9E=E6=9F=A5=E7=9C=8B=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/Standardselection/index.vue | 7 +- .../moudles/addModel.vue | 278 ++++++++++---- .../moudles/detilModel.vue | 361 ++++++++---------- 3 files changed, 371 insertions(+), 275 deletions(-) diff --git a/jero-web/src/components/Standardselection/index.vue b/jero-web/src/components/Standardselection/index.vue index 41854300a..79797040e 100644 --- a/jero-web/src/components/Standardselection/index.vue +++ b/jero-web/src/components/Standardselection/index.vue @@ -303,6 +303,11 @@ width: 80px; overflow: hidden; padding: 0; + background: #FFFFFF; + border-radius: 4px 4px 4px 4px; + opacity: 1; + border: 1px solid #00BEBE; + color: #01A0AC; } .drawer-bootom-button { @@ -359,7 +364,7 @@ ::v-deep .box-input-select .ant-select-selection--multiple::-webkit-scrollbar { /*height: 52px!important;*/ - display: block; + display: none; } .itemOption { diff --git a/jero-web/src/views/projectManagement/projectNonConformance/moudles/addModel.vue b/jero-web/src/views/projectManagement/projectNonConformance/moudles/addModel.vue index 4bdffcda9..9971a73f8 100644 --- a/jero-web/src/views/projectManagement/projectNonConformance/moudles/addModel.vue +++ b/jero-web/src/views/projectManagement/projectNonConformance/moudles/addModel.vue @@ -3,7 +3,7 @@ - +
* @@ -27,8 +27,6 @@
- -
@@ -44,6 +42,9 @@
+ + +
@@ -59,8 +60,6 @@
- -
@@ -80,6 +79,9 @@
+ + +
@@ -94,7 +96,7 @@ :getPopupContainer="triggerNode=> triggerNode.parentNode" showSearch @change="platformChange" - :style="formInline.projectType == 'none' ? 'width:100%' : 'width:50%'" + :style="!formInline.projectType ? 'width:100%' : 'width:calc(50% - 6px);'" optionFilterProp="label" :autoClearSearchValue="false" :placeholder="$t('PleaseSelect')+$t('type')"> @@ -113,7 +115,7 @@ v-model="formInline.projectId" :getPopupContainer="triggerNode=> triggerNode.parentNode" showSearch - style="width: 50%;float: right" + style="width: calc(50% - 6px);float: right;margin-left: 12px" optionFilterProp="label" :autoClearSearchValue="false" :placeholder="$t('PleaseSelect')+$t('RelatedItems')"> @@ -132,7 +134,7 @@ v-model="formInline.projectId" :getPopupContainer="triggerNode=> triggerNode.parentNode" showSearch - style="width: 50%;float: right" + style="width: calc(50% - 6px);float: right;margin-left: 10px" mode="multiple" optionFilterProp="label" :autoClearSearchValue="false" @@ -149,8 +151,7 @@
- - +
@@ -179,6 +180,8 @@
+ +
@@ -208,8 +211,6 @@
- -
@@ -236,9 +237,9 @@
-
+ +
- + + + +
- {{$t('putAway')}} - {{$t('open')}} + + @@ -273,22 +274,31 @@ :title="$t('documents')">{{$t('documents')}}
-
+
- - + + + + + + + + + +
{{ (formInline.file === 'null' || formInline.file === '' || formInline.file == null) ? $t('Fileupload') : $t('viewUploadedFiles') @@ -307,10 +317,16 @@ :title="$t('progresstracking')">{{$t('progresstracking')}}
-
+ {{ $t('newlyAdded') }} + +
-
+
@@ -321,11 +337,40 @@ -
- +
+
+
+
+ + {{$t('putAway')}} +
+
+ + {{$t('delete')}} +
+
+
+
+
+
+
+ + {{$t('open')}} +
+
+ + {{$t('delete')}} +
+
+
+ + + +
@@ -333,13 +378,13 @@ - {{$t('newlyAdded')}} - {{$t('delete')}} + + + + - {{$t('putAway')}} - {{$t('open')}} + +
@@ -375,21 +420,31 @@ :title="$t('examineapproveevidence')">{{$t('examineapproveevidence')}}
-
+
- - + + + + + + + + +
{{ (formInline.approvalEvidence === 'null' || formInline.approvalEvidence === '' || formInline.approvalEvidence == null) ? $t('Fileupload') : $t('viewUploadedFiles') @@ -700,7 +755,7 @@ this.problemState = this.$t('emptyc') } let time = moment(new Date()).format('YYYY-MM-DD HH:mm:ss') - let text = '

' + this.userInfo().username + ' ' + time + '

' + ' ' + this.$t('Problemstate') + this.$t('by') + '\'' + this.problemState + '\'' + this.$t('Changeto') + '\'' + value + '\'' + let text = '

' + ''+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 @@ -815,9 +870,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 - console.log(text) + let text = '

' + '' + this.userInfo().username + '' + '' + time + '' + '

' + row this.formInline.progressTrackingList.forEach((item, index) => { if (!item.progressTracking) { this.formInline.progressTrackingList.splice(0, 1) @@ -827,7 +880,7 @@ console.log(this.formInline.progressTrackingList) }, addprogresstrackingClick(index) { - this.index = index + this.index = this.formInline.progressTrackingList.length - 1 this.formInlinetracking = {} this.$refs.TrackingModelRef.add() this.$nextTick(() => { @@ -837,12 +890,10 @@ }) }, deleteprogresstrackingClick(index, item) { - if (item.progressTracking && item.progressTracking != '') { - if (index == 0) { - item.progressTracking = '' - } else { - this.formInline.progressTrackingList.splice(index, 1) - } + if (this.formInline.progressTrackingList.length > 1) { + this.formInline.progressTrackingList.splice(index, 1) + } else { + item.progressTracking = '' } this.formInline = { ...this.formInline } }, @@ -1045,7 +1096,7 @@ } else if (value == 'numberPlatform' || value == 'carPlatform') { this.formInline.projectId = undefined this.getPlatform(value) - }else{ + } else { this.formInline.projectId = undefined } this.formInline = { ...this.formInline } @@ -1070,14 +1121,41 @@ .text-class { color: rgba(0, 0, 0, 0.65); font-weight: bold; + background: #F5F6F7; + width: 100%; + border-radius: 4px 4px 0px 0px; + position: absolute; + top: 0; + height: 46px; + line-height: 46px; + } + + .usernameClass { + font-size: 14px; + font-family: PingFang SC, PingFang SC; + font-weight: 400; + color: #040B29; + margin-right: 6px; + } + + .timeClass { + font-size: 14px; + font-family: PingFang SC, PingFang SC; + font-weight: 400; + color: #9598A4; } p { margin: 0; padding: 0; } + \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/projectNonConformance/moudles/detilModel.vue b/jero-web/src/views/projectManagement/projectNonConformance/moudles/detilModel.vue index 24e1f5cfb..00aac233c 100644 --- a/jero-web/src/views/projectManagement/projectNonConformance/moudles/detilModel.vue +++ b/jero-web/src/views/projectManagement/projectNonConformance/moudles/detilModel.vue @@ -12,52 +12,43 @@ - +
{{$t('title')}}
- - - +
+ {{formInline.title}} +
- -
{{$t('problemType')}}
- - - -
- - -
-
- - {{'PS-issue'}} -
-
- {{formInline.psIssue}} +
+ {{formInline.problemType_dictText}}
+ + +
+
+ {{'PS-issue'}} +
+
+ {{formInline.psIssue}} +
+
+
@@ -65,14 +56,14 @@ {{$t('Relevantlawsregulations')}}
- - - +
+ {{formInline.lawsName || '--'}} +
+ + +
@@ -80,72 +71,21 @@ {{$t('RelatedItems')}}
- - - - - {{ item.name}} - - - - - - - {{item}} - - - - - - - {{ item.projectName}} - - - - +
+ + {{formInline.projectType ? formInline.projectType == 'numberPlatform' || + formInline.projectType == 'carPlatform' ? formInline.problemType_dictText+' '+formInline.projectId : + formInline.projectType == 'model' ? formInline.problemType_dictText+' '+formInline.projectName : + formInline.problemType_dictText : '--'}} + +
- - +
@@ -153,71 +93,34 @@ {{$t('statisticalNodes')}}
- - - - - {{ item.key }} - - - - -
- - -
-
- - {{$t('Problemstate')}} +
+ {{formInline.dutyTerritory}}
- - - - - {{ item }} - - - -
+ +
+
+ + {{$t('Problemstate')}} +
+
+ {{formInline.problemState}} +
+
+
{{$t('problemPriority')}}
- - - +
+ {{formInline.problemPriority_dictText}} +
@@ -228,12 +131,9 @@ {{$t('descriptions')}}
- -
- - - - +
+
@@ -244,14 +144,14 @@ {{$t('documents')}}
- -
+
+
{{item.fileLink}}
-
@@ -262,16 +162,11 @@ {{$t('progresstracking')}}
- -
-
- - - - - +
+
+
- +
@@ -282,11 +177,9 @@ {{$t('conculsion')}}
- - - +
+ {{formInline.conclusion}} +
@@ -298,14 +191,16 @@ {{$t('examineapproveevidence')}}
- -
+
+
{{item.approvalEvidenceLink}}
-
@@ -344,7 +239,7 @@ } ] }, - relatedItemsList:[], + relatedItemsList: [], platformList: [ { name: this.$t('DigitalPlatform'), @@ -458,11 +353,11 @@ } else if (row.projectType == 'numberPlatform' || row.projectType == 'carPlatform') { this.getPlatform(row.projectType) } - if (this.formInline.dutyTerritory != null) { - this.formInline.dutyTerritory = this.formInline.dutyTerritory.split(',') - } else { - this.formInline.dutyTerritory = undefined - } + // if (this.formInline.dutyTerritory != null) { + // this.formInline.dutyTerritory = this.formInline.dutyTerritory.split(',') + // } else { + // this.formInline.dutyTerritory = undefined + // } if (this.formInline.problemState == null) { this.formInline.problemState = undefined } @@ -472,7 +367,7 @@ this.formInline.approvalEvidenceFileList = res.result.approvalEvidenceFileList } }) - this.formInline = {...this.formInline} + this.formInline = { ...this.formInline } console.log(this.formInline) this.visible = true this.disabled = true @@ -506,11 +401,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; } @@ -520,20 +417,18 @@ .box-title-text { line-height: 1.4; display: flex; + justify-content: space-between; + margin-bottom: 20px; } .title-text { width: 114px; - text-align: right; + text-align: left; display: inline-block; - font-weight: 500; - font-size: 14px; margin-right: 16px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; - height: 42px; - line-height: 42px; } .box-input { @@ -545,25 +440,23 @@ .itemModel { width: calc(100% - 130px); display: inline-block; - margin-top: 2px; + font-size: 14px; + font-family: PingFang SC, PingFang SC; + font-weight: 400; + color: #040B29; } .title-text-text { - margin-top: 9px; + font-size: 14px; + font-family: PingFang SC, PingFang SC; + font-weight: 400; + color: #6F7385; } .formAdd { margin-bottom: 40px; } - .Required { - color: red; - margin-right: 4px; - } - - .title-text-text { - margin-top: 9px; - } .formAdd { margin-bottom: 40px; @@ -611,19 +504,71 @@ display: inline-block; border: 1px solid #ccc; padding: 0 15px; + margin-bottom: 10px; + } + + .itemModel-text { box-sizing: border-box; white-space: pre-wrap; - overflow: auto; + width: calc(100% - 130px); + margin-top: 1px; } - .text-box-one { + + .itemModel-text-text { + font-size: 14px; + font-family: PingFang SC, PingFang SC; + font-weight: 400; + color: #040B29; + margin-bottom: 10px; + } + + .text-box { width: 100%; height: 200px; display: inline-block; border: 1px solid #ccc; - padding: 0 15px; + padding: 0; + border-radius: 4px; + position: relative; + } + + ::v-deep .text-box-index-text-top p { + margin: 0 !important; + padding: 0 15px !important; + } + + .text-box-index-text-top { + width: 100%; + height: 100%; box-sizing: border-box; - margin-bottom: 20px; white-space: pre-wrap; overflow: auto; + padding: 56px 0 10px 0; + } + ::v-deep .text-class { + color: rgba(0, 0, 0, 0.65); + font-weight: bold; + background: #F5F6F7; + width: 100%; + height: 46px; + line-height: 46px; + border-radius: 4px 4px 0px 0px; + position: absolute; + top: 0; + } + + ::v-deep .usernameClass { + font-size: 14px; + font-family: PingFang SC, PingFang SC; + font-weight: 400; + color: #040B29; + margin-right: 6px; + } + + ::v-deep .timeClass { + font-size: 14px; + font-family: PingFang SC, PingFang SC; + font-weight: 400; + color: #9598A4; } \ No newline at end of file