From 9d1c4b312bc4e8ed95dfe0acaa599e141560cb45 Mon Sep 17 00:00:00 2001
From: xielue <gd_star@163.com>
Date: Wed, 11 Oct 2023 09:48:02 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A8=A1=E5=85=B7=20#146?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mk/components/editors/MkFormInputShow.vue    | 16 +++++++++++++---
 .../Middle/Mold/MoldProductionOrder/Edit.vue     |  2 +-
 src/pages/Middle/Mold/Touch/Reporting.vue        |  2 +-
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/application/mk/components/editors/MkFormInputShow.vue b/src/application/mk/components/editors/MkFormInputShow.vue
index b275c32..d05c8b4 100644
--- a/src/application/mk/components/editors/MkFormInputShow.vue
+++ b/src/application/mk/components/editors/MkFormInputShow.vue
@@ -1,6 +1,7 @@
 <template>
-   <div>
-       <input autocomplete="off" class="readonlytext" type="text" :value="valueShow" /> 
+   <div> 
+       <textarea v-if="isTextarea" readonly class="readonlytext readonlytext-textarea" :value="valueShow" style="height: 60px;"></textarea>
+       <input v-else readonly autocomplete="off" class="readonlytext" type="text" :value="valueShow" /> 
    </div>
 </template>
 
@@ -22,7 +23,8 @@ export default {
   },
   data () {
     return {
-      valueShow:''
+      valueShow:'',
+      isTextarea:false
     }
   },
   methods: {
@@ -34,6 +36,10 @@ export default {
       const { params } = this
 
       console.log(params)
+      if(params && params.isTextarea){
+        this.isTextarea = params.isTextarea;
+      }
+
       if(params && params.dataType == "number"){
         this.valueShow = parseFloat(this.value || 0).toFixed(2);
       }
@@ -101,6 +107,10 @@ export default {
   border:none;
   border-bottom: 1px solid #d3d3d3; 
 }
+.readonlytext-textarea{
+
+  border: 1px solid #d3d3d3; 
+}
 </style>
 
 
diff --git a/src/pages/Middle/Mold/MoldProductionOrder/Edit.vue b/src/pages/Middle/Mold/MoldProductionOrder/Edit.vue
index 68ff789..333467d 100644
--- a/src/pages/Middle/Mold/MoldProductionOrder/Edit.vue
+++ b/src/pages/Middle/Mold/MoldProductionOrder/Edit.vue
@@ -280,7 +280,7 @@ export default {
 
 
           {   field: 'problem', title: '出现问题及建议反馈', span: 24, itemRender: { name: '$input', props: {} } },
-          {  field: 'remark', title: '备注', span: 24, itemRender: { name: '$input', props: {} } },
+          {  field: 'remark', title: '备注', span: 24, itemRender: { name: '$textarea', props: {} } },
 
 
         ]
diff --git a/src/pages/Middle/Mold/Touch/Reporting.vue b/src/pages/Middle/Mold/Touch/Reporting.vue
index 95f6a6e..831bd3f 100644
--- a/src/pages/Middle/Mold/Touch/Reporting.vue
+++ b/src/pages/Middle/Mold/Touch/Reporting.vue
@@ -179,7 +179,7 @@ export default {
           },
 
           { field: 'manufacture_cycle', dataRule: { type: 'timestamp' }, title: '制作周期', span: 24, itemRender: { name: 'MkFormInputShow', props: { params: { dataType: 'date' } } } },
-          { field: 'remark', title: '备注', span: 24, itemRender: { name: 'MkFormInputShow' } },
+          { field: 'remark', title: '备注', span: 24, itemRender: { name: 'MkFormInputShow', props: { params: { isTextarea:true } } } },
           {
             field: 'progress', title: '进度', span: 24, itemRender: {
               name: 'MkFormProgress', props: {