From b0a53b6d1c06dc17fb12a6e3068b634a558c5123 Mon Sep 17 00:00:00 2001
From: zyn <nn_0223@163.com>
Date: Fri, 24 Nov 2023 15:13:46 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=81=E6=A0=87=E5=88=B6=E4=BF=AE?=
 =?UTF-8?q?=E8=AE=A2=E8=AE=A1=E5=88=92=E7=AE=A1=E6=8E=A7-=E5=AE=A1?=
 =?UTF-8?q?=E6=89=B9=E6=84=8F=E8=A7=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hzwlComponents/ReceiptDescription.vue     | 51 +++++++++++++++++++
 .../pages/creatProcess/qbrk/step1-2.vue       | 31 ++++++-----
 .../pages/creatProcess/qbzxdjhgk/step1-1.vue  | 33 ++++++------
 .../pages/creatProcess/qbzxdjhgk/step1.vue    | 33 ++++++------
 .../pages/creatProcess/qbzxdjhgk/step2.vue    | 33 ++++++------
 .../pages/creatProcess/qbzxdjhgk/step3.vue    | 33 ++++++------
 .../pages/creatProcess/qbzxdjhgk/step4.vue    | 33 ++++++------
 .../pages/creatProcess/qbzxdjhgk/step5.vue    | 33 ++++++------
 8 files changed, 177 insertions(+), 103 deletions(-)
 create mode 100644 src/components/hzwlComponents/ReceiptDescription.vue

diff --git a/src/components/hzwlComponents/ReceiptDescription.vue b/src/components/hzwlComponents/ReceiptDescription.vue
new file mode 100644
index 000000000..8ea2b69b7
--- /dev/null
+++ b/src/components/hzwlComponents/ReceiptDescription.vue
@@ -0,0 +1,51 @@
+<template>
+  <!--意见-->
+  <el-form>
+    <div class="title">{{ title }}</div>
+    <el-form-item :prop="prop" label-width="0">
+      <el-input :disabled="disabled"
+                type="textarea"
+                :rows="3"
+                resize="none"
+                placeholder="请输入意见"
+                :value="value"
+                @input="handleChange">
+      </el-input>
+    </el-form-item>
+  </el-form>
+</template>
+
+<script>
+export default {
+  name: "ReceiptDescription",
+  props: {
+    value: {
+      type: String,
+      default: true
+    },
+    disabled: {
+      type: Boolean,
+      default: false
+    },
+    title: {
+      type: String,
+      default: '回执说明'
+    },
+    prop: {
+      type: String
+    }
+  },
+  methods: {
+    handleChange (event) {
+      this.$emit('input', event)
+    }
+  }
+}
+</script>
+
+<style scoped>
+.title {
+  height: 48px;
+  line-height: 48px;
+}
+</style>
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue
index 985ad67fc..8f8d0cc98 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue
@@ -517,19 +517,22 @@
                             </el-col>
                         </el-row>
                     </div>
-                    <el-collapse v-show="verifySarStandard && active !== '2'" v-model="activeName" accordion>
-                        <el-collapse-item title="回执说明" name="1">
-                            <div style="margin: 10px 0;">
-                                <el-input :disabled="disabledXX"
-                                          type="textarea"
-                                          :rows="3"
-                                          resize="none"
-                                          placeholder="请输入意见"
-                                          v-model="commentText">
-                                </el-input>
-                            </div>
-                        </el-collapse-item>
-                    </el-collapse>
+                  <ReceiptDescription
+                      v-show="verifySarStandard && active !== '2'"
+                      v-model="commentText"></ReceiptDescription>
+                    <!--<el-collapse v-show="verifySarStandard && active !== '2'" v-model="activeName" accordion>-->
+                    <!--    <el-collapse-item title="回执说明" name="1">-->
+                    <!--        <div style="margin: 10px 0;">-->
+                    <!--            <el-input :disabled="disabledXX"-->
+                    <!--                      type="textarea"-->
+                    <!--                      :rows="3"-->
+                    <!--                      resize="none"-->
+                    <!--                      placeholder="请输入意见"-->
+                    <!--                      v-model="commentText">-->
+                    <!--            </el-input>-->
+                    <!--        </div>-->
+                    <!--    </el-collapse-item>-->
+                    <!--</el-collapse>-->
                 </div>
                 <!--                <div class="block" id="active2" v-show="active === '2'">-->
                 <!--                    <ProcessTitle>-->
@@ -1338,6 +1341,7 @@
     import ProcessHeader from '../../components/ProcessHeader'
     import ProcessFooter from '../../components/ProcessFooter'
     import ProcessTitle from '../../components/ProcessTitle'
+    import ReceiptDescription from '@/components/hzwlComponents/ReceiptDescription'
     import {
         saveTaskFirst,
         updateBusProcessNew,
@@ -1357,6 +1361,7 @@
     export default {
         name: "bussLibrary1",
         components: {
+            ReceiptDescription,
             ProcessHeader,
             ProcessFooter,
             ProcessTitle,
diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1-1.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1-1.vue
index 588ea8bd6..1130df6d0 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1-1.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1-1.vue
@@ -40,22 +40,23 @@
           </el-row>
         </el-form>
         <component ref="childForm" :message="qbfsForm" :is="comName"></component>
+        <ReceiptDescription v-model="commentText"></ReceiptDescription>
       </div>
-      <div>
-        <el-collapse accordion v-model="activeNames">
-          <el-collapse-item title="回执说明" name="1">
-            <div style="margin: 10px 0;">
-              <el-input :disabled="disabledXX"
-                type="textarea"
-                :rows="3"
-                resize="none"
-                placeholder="请输入意见"
-                v-model="commentText">
-              </el-input>
-            </div>
-          </el-collapse-item>
-        </el-collapse>
-      </div>
+      <!--<div>-->
+      <!--  <el-collapse accordion v-model="activeNames">-->
+      <!--    <el-collapse-item title="回执说明" name="1">-->
+      <!--      <div style="margin: 10px 0;">-->
+      <!--        <el-input :disabled="disabledXX"-->
+      <!--          type="textarea"-->
+      <!--          :rows="3"-->
+      <!--          resize="none"-->
+      <!--          placeholder="请输入意见"-->
+      <!--          v-model="commentText">-->
+      <!--        </el-input>-->
+      <!--      </div>-->
+      <!--    </el-collapse-item>-->
+      <!--  </el-collapse>-->
+      <!--</div>-->
     </div>
     <loading :loading="formLoading">数据加载中...</loading>
     <div class="content" v-show="active === '2'">
@@ -266,12 +267,14 @@ import rename from "process/creatProcess/qbzxdjhgk/component/rename";
 import establish from "process/creatProcess/qbzxdjhgk/component/establish";
 import delay from "process/creatProcess/qbzxdjhgk/component/delay";
 import cancel from "process/creatProcess/qbzxdjhgk/component/cancel";
+import ReceiptDescription from '@/components/hzwlComponents/ReceiptDescription'
 import axios from "axios";
 import { saveTaskFirst, queryTaskFirst, inboundLiaisonDetail, taskDel, saveTaskForPub } from "api/process";
 
 export default {
   name: "qbzxdjhgkStep1",
   components: {
+    ReceiptDescription,
     ProcessHeader,
     ProcessFooter,
     ProcessTitle,
diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue
index 07e40b3ee..823bc9af5 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue
@@ -38,22 +38,23 @@
         </el-form>
         <component ref="childForm" v-if="isWrite" :message="qbfsForm" :is="comName"></component>
         <component ref="childForm" v-else :message="JSON.parse(JSON.stringify(qbfsForm))" :is="comName"></component>
+        <ReceiptDescription v-model="commentText"></ReceiptDescription>
       </div>
-      <div>
-        <el-collapse accordion>
-          <el-collapse-item title="回执说明">
-            <div style="margin: 10px 0;">
-              <el-input :disabled="disabledXX"
-                type="textarea"
-                :rows="3"
-                resize="none"
-                placeholder="请输入意见"
-                v-model="commentText">
-              </el-input>
-            </div>
-          </el-collapse-item>
-        </el-collapse>
-      </div>
+      <!--<div>-->
+      <!--  <el-collapse accordion>-->
+      <!--    <el-collapse-item title="回执说明">-->
+      <!--      <div style="margin: 10px 0;">-->
+      <!--        <el-input :disabled="disabledXX"-->
+      <!--          type="textarea"-->
+      <!--          :rows="3"-->
+      <!--          resize="none"-->
+      <!--          placeholder="请输入意见"-->
+      <!--          v-model="commentText">-->
+      <!--        </el-input>-->
+      <!--      </div>-->
+      <!--    </el-collapse-item>-->
+      <!--  </el-collapse>-->
+      <!--</div>-->
     </div>
     <loading :loading="formLoading">数据加载中...</loading>
     <div class="content" v-show="active === '2'">
@@ -264,6 +265,7 @@ import rename from "process/creatProcess/qbzxdjhgk/component/rename";
 import establish from "process/creatProcess/qbzxdjhgk/component/establish";
 import delay from "process/creatProcess/qbzxdjhgk/component/delay";
 import cancel from "process/creatProcess/qbzxdjhgk/component/cancel";
+import ReceiptDescription from '@/components/hzwlComponents/ReceiptDescription'
 import axios from "axios";
 import { saveTaskFirst, queryTaskFirst, inboundLiaisonDetail, taskDel, saveTaskForPub } from "api/process";
 
@@ -273,6 +275,7 @@ export default {
     ProcessHeader,
     ProcessFooter,
     ProcessTitle,
+    ReceiptDescription,
     merge,
     rename,
     establish,
diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step2.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step2.vue
index fde5e8f22..8b4c84e73 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step2.vue
@@ -243,22 +243,23 @@
           <!--                                                    :maxlength="500"/>-->
           <!--                                        </el-form-item>-->
         </el-form>
+        <ReceiptDescription title="审批意见" v-model="commentText"></ReceiptDescription>
       </div>
-      <div>
-        <el-collapse accordion>
-          <el-collapse-item title="审批意见">
-            <div style="margin: 10px 0;">
-              <el-input
-                type="textarea"
-                :rows="3"
-                resize="none"
-                placeholder="请输入意见"
-                v-model="commentText">
-              </el-input>
-            </div>
-          </el-collapse-item>
-        </el-collapse>
-      </div>
+      <!--<div>-->
+      <!--  <el-collapse accordion>-->
+      <!--    <el-collapse-item title="审批意见">-->
+      <!--      <div style="margin: 10px 0;">-->
+      <!--        <el-input-->
+      <!--          type="textarea"-->
+      <!--          :rows="3"-->
+      <!--          resize="none"-->
+      <!--          placeholder="请输入意见"-->
+      <!--          v-model="commentText">-->
+      <!--        </el-input>-->
+      <!--      </div>-->
+      <!--    </el-collapse-item>-->
+      <!--  </el-collapse>-->
+      <!--</div>-->
     </div>
     <div class="content" v-show="active === '3'">
       <div class="flow-list" style="height: 100%">
@@ -360,12 +361,14 @@
 import ProcessHeader from "../../components/ProcessHeader";
 import ProcessFooter from "../../components/ProcessFooter";
 import ProcessTitle from "../../components/ProcessTitle";
+import ReceiptDescription from '@/components/hzwlComponents/ReceiptDescription'
 import { changeAssigneeNew, inboundLiaisonDetail, saveTaskFirst } from "api/process";
 
 
 export default {
   name: "qbzxdjhgkStep2",
   components:{
+    ReceiptDescription,
     ProcessHeader,
     ProcessFooter,
     ProcessTitle
diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step3.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step3.vue
index e0a7c687f..c76ccf129 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step3.vue
@@ -241,22 +241,23 @@
           <!--                                                    :maxlength="500"/>-->
           <!--                                        </el-form-item>-->
         </el-form>
+        <ReceiptDescription title="审批意见" v-model="commentText"></ReceiptDescription>
       </div>
-      <div>
-        <el-collapse accordion>
-          <el-collapse-item title="审批意见">
-            <div style="margin: 10px 0;">
-              <el-input
-                type="textarea"
-                :rows="3"
-                resize="none"
-                placeholder="请输入意见"
-                v-model="commentText">
-              </el-input>
-            </div>
-          </el-collapse-item>
-        </el-collapse>
-      </div>
+      <!--<div>-->
+      <!--  <el-collapse accordion>-->
+      <!--    <el-collapse-item title="审批意见">-->
+      <!--      <div style="margin: 10px 0;">-->
+      <!--        <el-input-->
+      <!--          type="textarea"-->
+      <!--          :rows="3"-->
+      <!--          resize="none"-->
+      <!--          placeholder="请输入意见"-->
+      <!--          v-model="commentText">-->
+      <!--        </el-input>-->
+      <!--      </div>-->
+      <!--    </el-collapse-item>-->
+      <!--  </el-collapse>-->
+      <!--</div>-->
     </div>
     <div class="content" v-show="active === '3'">
        <el-table
@@ -356,12 +357,14 @@
 import ProcessHeader from "../../components/ProcessHeader";
 import ProcessFooter from "../../components/ProcessFooter";
 import ProcessTitle from "../../components/ProcessTitle";
+import ReceiptDescription from '@/components/hzwlComponents/ReceiptDescription'
 import { changeAssigneeNew, inboundLiaisonDetail, saveTaskFirst } from "api/process";
 
 
 export default {
   name: "qbzxdjhgkStep3",
   components:{
+    ReceiptDescription,
     ProcessHeader,
     ProcessFooter,
     ProcessTitle
diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step4.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step4.vue
index 6a610ede6..b8c2037cd 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step4.vue
@@ -241,22 +241,23 @@
           <!--                                                    :maxlength="500"/>-->
           <!--                                        </el-form-item>-->
         </el-form>
+        <ReceiptDescription title="审批意见" v-model="commentText"></ReceiptDescription>
       </div>
-      <div>
-        <el-collapse accordion>
-          <el-collapse-item title="审批意见">
-            <div style="margin: 10px 0;">
-              <el-input
-                type="textarea"
-                :rows="3"
-                resize="none"
-                placeholder="请输入意见"
-                v-model="commentText">
-              </el-input>
-            </div>
-          </el-collapse-item>
-        </el-collapse>
-      </div>
+    <!--  <div>-->
+    <!--    <el-collapse accordion>-->
+    <!--      <el-collapse-item title="审批意见">-->
+    <!--        <div style="margin: 10px 0;">-->
+    <!--          <el-input-->
+    <!--            type="textarea"-->
+    <!--            :rows="3"-->
+    <!--            resize="none"-->
+    <!--            placeholder="请输入意见"-->
+    <!--            v-model="commentText">-->
+    <!--          </el-input>-->
+    <!--        </div>-->
+    <!--      </el-collapse-item>-->
+    <!--    </el-collapse>-->
+    <!--  </div>-->
     </div>
     <div class="content" v-show="active === '3'">
       <div class="flow-list" style="height: 100%">
@@ -358,12 +359,14 @@
 import ProcessHeader from "../../components/ProcessHeader";
 import ProcessFooter from "../../components/ProcessFooter";
 import ProcessTitle from "../../components/ProcessTitle";
+import ReceiptDescription from '@/components/hzwlComponents/ReceiptDescription'
 import { changeAssigneeNew, inboundLiaisonDetail, saveTaskFirst } from "api/process";
 
 
 export default {
   name: "qbzxdjhgkStep4",
   components:{
+    ReceiptDescription,
     ProcessHeader,
     ProcessFooter,
     ProcessTitle
diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step5.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step5.vue
index b71b8743d..6a5024bc7 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step5.vue
@@ -241,22 +241,23 @@
           <!--                                                    :maxlength="500"/>-->
           <!--                                        </el-form-item>-->
         </el-form>
+        <ReceiptDescription title="审批意见" v-model="commentText"></ReceiptDescription>
       </div>
-      <div>
-        <el-collapse accordion>
-          <el-collapse-item title="审批意见">
-            <div style="margin: 10px 0;">
-              <el-input
-                type="textarea"
-                :rows="3"
-                resize="none"
-                placeholder="请输入意见"
-                v-model="commentText">
-              </el-input>
-            </div>
-          </el-collapse-item>
-        </el-collapse>
-      </div>
+      <!--<div>-->
+      <!--  <el-collapse accordion>-->
+      <!--    <el-collapse-item title="审批意见">-->
+      <!--      <div style="margin: 10px 0;">-->
+      <!--        <el-input-->
+      <!--          type="textarea"-->
+      <!--          :rows="3"-->
+      <!--          resize="none"-->
+      <!--          placeholder="请输入意见"-->
+      <!--          v-model="commentText">-->
+      <!--        </el-input>-->
+      <!--      </div>-->
+      <!--    </el-collapse-item>-->
+      <!--  </el-collapse>-->
+      <!--</div>-->
     </div>
     <div class="content" v-show="active === '3'">
       <div class="flow-list" style="height: 100%">
@@ -358,12 +359,14 @@
 import ProcessHeader from "../../components/ProcessHeader";
 import ProcessFooter from "../../components/ProcessFooter";
 import ProcessTitle from "../../components/ProcessTitle";
+import ReceiptDescription from '@/components/hzwlComponents/ReceiptDescription'
 import { changeAssigneeNew, inboundLiaisonDetail, saveTaskFirst } from "api/process";
 
 
 export default {
   name: "qbzxdjhgkStep5",
   components:{
+    ReceiptDescription,
     ProcessHeader,
     ProcessFooter,
     ProcessTitle