From f8206de114bcecd216be6beae864c850bc911087 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Fri, 15 Dec 2023 16:15:02 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E5=BA=93=E5=B9=B3=E5=8F=B0=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/designCompliance.vue | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/designCompliance.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/designCompliance.vue index fbc1e7a36..271c5c668 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/designCompliance.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/designCompliance.vue @@ -32,7 +32,8 @@ :standardContentQuery="queryProject" /> - +
{ - this.$refs.experienceReferenceListRef.getData(this.queryProject.serialNumber) - }) // if (this.queryData.TaskKey == 'zrrqr' || this.queryData.TaskKey == 'dezrrqr') { // this.queryProject.endTime = this.queryData.endTime // } this.loading = false this.isDisplay = true + this.$nextTick(() => { + this.$refs.experienceReferenceListRef.getData(this.queryProject.serialNumber) + }) } else { this.queryProject = {} this.loading = false From bb8e61067f7f3d8c08d223898d03240f7ae16e3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Fri, 15 Dec 2023 16:50:59 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=89=B9=E9=87=8F?= =?UTF-8?q?=E7=AC=A6=E5=90=88=E6=80=A7=E7=A1=AE=E8=AE=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/confirmationDrawer.vue | 50 ++++++++++++++++++- 1 file changed, 48 insertions(+), 2 deletions(-) diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/confirmationDrawer.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/confirmationDrawer.vue index e0bb51541..e968c17ff 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/confirmationDrawer.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/confirmationDrawer.vue @@ -58,6 +58,7 @@
{{$t('accept')}} @@ -81,6 +82,26 @@ + + +
+
+ * + {{$t('expectedDeliveryTime')}} +
+
+ + + + +
@@ -140,6 +161,7 @@ props: {}, data() { return { + isDeliveryTime: false, titleName: '', allTitle: '', visible: false, @@ -247,19 +269,40 @@ message: this.$t('feedbackMessage') + this.$t('cannotExceed') + 300 + this.$t('Characters'), trigger: 'blur' } - ] + ], + deliveryTime: [ + { + required: true, + message: this.$t('expectedDeliveryTime') + this.$t('cannotEmpty'), + trigger: 'change' + } + ], }, formInline: {}, uploadName: '' } }, methods: { + dateChange(item) { + this.formInline[item.db_field_name] = this.formInline[item.db_field_name] ? moment(this.formInline[item.db_field_name]).format('YYYY-MM-DD') : '' + this.formInline = { ...this.formInline } + }, + reviewResultChange(value) { + if (value.target.value == 'To be tracked') { + this.isDeliveryTime = true + } else { + this.isDeliveryTime = false + this.formInline.deliveryTime = '' + } + this.formInline = { ...this.formInline } + }, ...mapGetters(['userInfo']), confirmation(data, name) { this.visible = true this.processableList = [] this.noProcessableList = [] this.formInline = {} + this.isDeliveryTime = false data.forEach(res => { res = JSON.parse(res) if (name == this.$t('Taskresponsibilityrecognition')) { @@ -306,6 +349,9 @@ taskIds.push(res.taskId) }) let handlingTime = moment(new Date()).format('YYYY-MM-DD HH:mm:ss') + if (this.formInline.flag == 'To be tracked') { + this.formInline.approvalOpinion = this.formInline.approvalOpinion + ';' + this.$t('expectedDeliveryTime') + ':' + this.formInline.deliveryTime + } let query = { ...this.formInline, taskIds: taskIds.join(','), @@ -481,7 +527,7 @@ color: red; } - ::v-deep .ant-drawer-header .ant-drawer-title{ + ::v-deep .ant-drawer-header .ant-drawer-title { font-weight: bold; } \ No newline at end of file From d85fe2d4ac309a049c637780a7a2c467069e4dac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Fri, 15 Dec 2023 17:49:39 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../moudles/addModel.vue | 19 +++- .../moudles/detilModel.vue | 104 +++++++++++++++--- 2 files changed, 104 insertions(+), 19 deletions(-) diff --git a/jero-web/src/views/projectManagement/projectNonConformance/moudles/addModel.vue b/jero-web/src/views/projectManagement/projectNonConformance/moudles/addModel.vue index 8101f67a1..0a95a7847 100644 --- a/jero-web/src/views/projectManagement/projectNonConformance/moudles/addModel.vue +++ b/jero-web/src/views/projectManagement/projectNonConformance/moudles/addModel.vue @@ -501,6 +501,7 @@ import { mapGetters } from 'vuex' import axios from 'axios' import Vue from 'vue' + import { ImagePreview } from 'vant' const toolbarOptions = [ ['bold', 'italic', 'underline', 'strike'], // toggled buttons @@ -723,7 +724,7 @@ // return // } - this.formInline.progressTrackingList.push({ progressTracking: text, isDescription: false }) + this.formInline.progressTrackingList.push({ progressTracking: text, isDescription: true }) } }, Standardselectioninput(val) { @@ -799,6 +800,10 @@ } if (this.formInline.progressTrackingList == null) { this.formInline.progressTrackingList = [] + } else { + this.formInline.progressTrackingList.forEach(val => { + val.isDescription = true + }) } if (this.formInline.approvalEvidenceLinkList == null) { this.formInline.approvalEvidenceLinkList = [{}] @@ -837,7 +842,7 @@ // this.formInline.progressTrackingList.splice(0, 1) // } // }) - this.formInline.progressTrackingList.push({ progressTracking: text, isDescription: false }) + this.formInline.progressTrackingList.push({ progressTracking: text, isDescription: true }) // this.formInline.progressTrackingList.splice(this.index + 1, 1, { progressTracking: text }) console.log(this.formInline.progressTrackingList) @@ -1052,7 +1057,14 @@ }, progressTrackingOpenClick(e) { if (e.target.localName == 'img') { - this.$refs.viewImgRef.getData(e.target.currentSrc) + ImagePreview( + { + images: [ + e.target.currentSrc + ], + closeable: true + }) + // this.$refs.viewImgRef.getData(e.target.currentSrc) } } } @@ -1308,6 +1320,7 @@ .progressTrackingListClass:last-child { margin-bottom: 0; } + ::v-deep .text-box-index-text-top img { max-width: 100% !important; } diff --git a/jero-web/src/views/projectManagement/projectNonConformance/moudles/detilModel.vue b/jero-web/src/views/projectManagement/projectNonConformance/moudles/detilModel.vue index 82aef2931..1c86b30b9 100644 --- a/jero-web/src/views/projectManagement/projectNonConformance/moudles/detilModel.vue +++ b/jero-web/src/views/projectManagement/projectNonConformance/moudles/detilModel.vue @@ -167,9 +167,27 @@ :title="$t('progresstracking')">{{$t('progresstracking')}}
-
-
+
+
+
+
+
+ + {{$t('putAway')}} +
+
+
+
+
+
+
+ + {{$t('open')}} +
+
+
@@ -224,6 +242,7 @@ import moment from 'moment' import viewImg from './viewImg' import { mapGetters } from 'vuex' + import { ImagePreview } from 'vant' export default { name: 'fillAdd', @@ -280,7 +299,7 @@ }, formInline: { fileLinkList: [{}], - progressTrackingList: [{}], + progressTrackingList: [], approvalEvidenceLinkList: [{}], dutyTerritory: undefined, projectId: undefined, @@ -362,6 +381,14 @@ } else if (row.projectType == 'numberPlatform' || row.projectType == 'carPlatform') { this.getPlatform(row.projectType) } + if (this.formInline.progressTrackingList && this.formInline.progressTrackingList.length > 0) { + this.formInline.progressTrackingList.forEach(res => { + res.isDescription = true + }) + + } else { + this.formInline.progressTrackingList = [] + } // if (this.formInline.dutyTerritory != null) { // this.formInline.dutyTerritory = this.formInline.dutyTerritory.split(',') // } else { @@ -377,7 +404,6 @@ } }) this.formInline = { ...this.formInline } - console.log(this.formInline) this.visible = true this.disabled = true this.$nextTick(() => { @@ -401,8 +427,19 @@ }, progressTrackingOpenClick(e) { if (e.target.localName == 'img') { - this.$refs.viewImgRef.getData(e.target.currentSrc) + ImagePreview( + { + images: [ + e.target.currentSrc + ], + closeable: true + }) + // this.$refs.viewImgRef.getData(e.target.currentSrc) } + }, + openClick(item) { + item.isDescription = !item.isDescription + this.formInline = { ...this.formInline } } } } @@ -512,14 +549,6 @@ word-break: break-word; } - .text-box { - width: 100%; - height: 200px; - display: inline-block; - border: 1px solid #ccc; - padding: 0 15px; - margin-bottom: 10px; - } .itemModel-text { box-sizing: border-box; @@ -538,12 +567,13 @@ .text-box { width: 100%; - height: 200px; + height: auto; display: inline-block; border: 1px solid #ccc; padding: 0; border-radius: 4px; position: relative; + margin-bottom: 10px; } ::v-deep .text-box-index-text-top p { @@ -590,7 +620,7 @@ .itemModel-text-box { width: 100%; white-space: pre-wrap; - height: 200px; + height: auto; display: inline-block; border: 1px solid #ccc; border-radius: 4px; @@ -605,4 +635,46 @@ ::v-deep .text-box-index-text-top img { max-width: 100% !important; } + + .text-box-index-text-right { + position: absolute; + display: flex; + align-items: center; + top: 13px; + right: 2px; + } + + .text-box-index-text-right-text { + font-size: 14px; + font-family: PingFang SC, PingFang SC; + font-weight: 400; + color: #01A0AC; + display: flex; + align-items: center; + margin-right: 10px; + cursor: pointer; + } + + .text-box-index { + width: 100%; + height: 46px; + display: inline-block; + padding: 0 15px; + border: 1px solid #ccc; + border-radius: 4px 4px 0px 0px; + white-space: pre-wrap; + overflow: hidden; + position: relative; + margin-bottom: 6px; + } + + .text-box-index-text { + width: 100%; + overflow: hidden; + white-space: pre-wrap; + } + + ::v-deep .text-box-index-text .text-class { + background: #fff !important; + } \ No newline at end of file