From 59c4b632f8118689b8fb2b985a27f0000fbe941f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167>
Date: Sun, 22 Oct 2023 12:15:06 +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?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../moudles/addModel.vue                      | 52 ++++++++++++++-----
 1 file changed, 40 insertions(+), 12 deletions(-)

diff --git a/jero-web/src/views/projectManagement/projectNonConformance/moudles/addModel.vue b/jero-web/src/views/projectManagement/projectNonConformance/moudles/addModel.vue
index 37be64368..3af6b2024 100644
--- a/jero-web/src/views/projectManagement/projectNonConformance/moudles/addModel.vue
+++ b/jero-web/src/views/projectManagement/projectNonConformance/moudles/addModel.vue
@@ -191,6 +191,10 @@
                       @blur="quilleditorBlur"
                       @change="onEditorChange($event)"
                     />
+                    <a-input class="box-input"
+                             v-if="isDescription"
+                             v-model='formInline.description'
+                             :disabled="true"/>
                   </div>
                   <span v-if="!isDescription" @click="putAwayClick" class="putAway">{{$t('putAway')}}</span>
                   <span v-if="isDescription" @click="putAwayClick" class="putAway">{{$t('open')}}</span>
@@ -249,16 +253,21 @@
                        v-for="(item,index) in formInline.progressTrackingList" :key="index">
                     <!--                    <span>{{item}}</span>-->
                     <div style="width: calc(100% - 116px);display: inline-block">
-                      <quill-editor
-                        class="text-editor trackingClass"
-                        ref="myQuillEditorRef"
-                        :disabled="true"
-                        v-if="!item.isDescription"
-                        v-model="item.progressTracking"
-                        :content="item.progressTracking"
-                        style="width: 100%;height: 200px;display: inline-block"
-                        :options="editorOption"
-                      />
+<!--                      <quill-editor-->
+<!--                        class="text-editor trackingClass"-->
+<!--                        ref="myQuillEditorRef"-->
+<!--                        :disabled="true"-->
+<!--                        v-if="!item.isDescription"-->
+<!--                        v-model="item.progressTracking"-->
+<!--                        :content="item.progressTracking"-->
+<!--                        style="width: 100%;height: 200px;display: inline-block"-->
+<!--                        :options="editorOption"-->
+<!--                      />-->
+                      <div class="text-box"  v-if="!item.isDescription" v-html="item.progressTracking"></div>
+                      <a-input class="box-input"
+                               v-if="item.isDescription"
+                               v-model='item.progressTracking'
+                               :disabled="true"/>
                     </div>
                     <!--                    <a-input class="box-input"-->
                     <!--                             style='width: 88%'-->
@@ -607,7 +616,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 = '<p class="text-class">'+this.userInfo().username + ' ' + time+'</p>' + ' ' + 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
@@ -718,13 +727,16 @@
       },
       TrackingModelForm(row) {
         let time = moment(new Date()).format('YYYY-MM-DD HH:mm:ss')
-        let text = this.userInfo().username + ' ' + time + ' ' + row
+        console.log(row)
+        let text = '<p class="text-class">'+this.userInfo().username + ' ' + time +'</p>' + row
+        console.log(text)
         this.formInline.progressTrackingList.forEach((item, index) => {
           if (!item.progressTracking) {
             this.formInline.progressTrackingList.splice(0, 1)
           }
         })
         this.formInline.progressTrackingList.splice(this.index + 1, 1, { progressTracking: text })
+        console.log(this.formInline.progressTrackingList)
       },
       addprogresstrackingClick(index) {
         this.index = index
@@ -948,6 +960,14 @@
   .ant-input-disabled {
     color: rgba(0, 0, 0, 0.65) !important;
   }
+  .text-class{
+    color: rgba(0, 0, 0, 0.65);
+    font-weight: bold;
+  }
+  p{
+    margin: 0;
+    padding: 0;
+  }
 </style>
 <style scoped>
 
@@ -1072,4 +1092,12 @@
   ::v-deep .itemModel-explain .ql-container {
     height: calc(100% - 100px);
   }
+  .text-box{
+    width: 100%;
+    height: 200px;
+    display: inline-block;
+    border: 1px solid #ccc;
+    padding: 0 15px;
+    box-sizing: border-box;
+  }
 </style>
\ No newline at end of file