From d04a084e654367af65ddc5275701922461cebd7a Mon Sep 17 00:00:00 2001
From: zyn <nn_0223@163.com>
Date: Thu, 30 Nov 2023 16:05:20 +0800
Subject: [PATCH] =?UTF-8?q?style:=20=E4=BC=81=E6=A0=87=E5=BA=9F=E6=AD=A2?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B-=E5=AE=A1=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     | 40 ++++++++++++++++++-
 .../pages/creatProcess/qbfs/step5.vue         |  1 +
 .../pages/creatProcess/qbfz/step1-7.vue       | 38 ++++++++++--------
 .../pages/creatProcess/qbfz/step1.vue         | 37 ++++++++++-------
 .../pages/creatProcess/qbfz/step2.vue         | 36 ++++++++++-------
 .../pages/creatProcess/qbfz/step3.vue         | 36 ++++++++++-------
 .../pages/creatProcess/qbfz/step4-1.vue       | 39 ++++++++++--------
 .../pages/creatProcess/qbfz/step4.vue         | 36 ++++++++++-------
 .../pages/creatProcess/qbfz/step5.vue         | 36 ++++++++++-------
 .../pages/creatProcess/qbfz/step6.vue         | 36 ++++++++++-------
 .../pages/creatProcess/qbfz/step7.vue         | 36 ++++++++++-------
 11 files changed, 233 insertions(+), 138 deletions(-)

diff --git a/src/components/hzwlComponents/ReceiptDescription.vue b/src/components/hzwlComponents/ReceiptDescription.vue
index c76c862ad..9cd841712 100644
--- a/src/components/hzwlComponents/ReceiptDescription.vue
+++ b/src/components/hzwlComponents/ReceiptDescription.vue
@@ -1,7 +1,7 @@
 <template>
   <!--意见-->
   <div>
-    <el-form v-if="model" ref="form" :model="model" :rules="rules">
+    <el-form v-if="!isItem" ref="form" :model="model" :rules="rules">
       <div class="title">{{ title }}</div>
       <el-form-item :prop="prop" label-width="0">
         <el-input :disabled="disabled"
@@ -29,6 +29,39 @@
       </el-form-item>
     </template>
   </div>
+  <!--
+      使用案例：
+        1.外层无el-form
+          1.1
+            <el-form
+              ref="formTongGuo"
+              :model="formTongGuo"
+              :rules="rules">
+              <ReceiptDescription
+                  title="审批意见"
+                  isItem
+                  prop="commentText"
+                  v-model="formTongGuo.commentText"
+              ></ReceiptDescription>
+            </el-form>
+          1.2
+              <ReceiptDescription
+                    title="审批意见"
+                    ref="formTongGuo"
+                    :model="formTongGuo"
+                    :rules="rules"
+                    prop="commentText"
+                    v-model="formTongGuo.commentText"
+                ></ReceiptDescription>
+
+        2.外层有el-form
+            <ReceiptDescription
+                title="审批意见"
+                isItem
+                prop="commentText"
+                v-model="qbfsForm.commentText"
+            ></ReceiptDescription>
+   -->
 </template>
 
 <script>
@@ -56,6 +89,11 @@ export default {
     rules: {
       type: Object
     },
+    // 组件父元素是否是el-form
+    isItem: {
+      type: Boolean,
+      default: false
+    }
   },
   methods: {
     handleChange (event) {
diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/step5.vue b/src/pages/processCenter/pages/creatProcess/qbfs/step5.vue
index ef204fd6b..bac7d9cb9 100644
--- a/src/pages/processCenter/pages/creatProcess/qbfs/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbfs/step5.vue
@@ -37,6 +37,7 @@
       ></formList>
       <ReceiptDescription
           title="审批意见"
+          isItem
           prop="commentText"
           v-model="qbfsForm.commentText"
       ></ReceiptDescription>
diff --git a/src/pages/processCenter/pages/creatProcess/qbfz/step1-7.vue b/src/pages/processCenter/pages/creatProcess/qbfz/step1-7.vue
index 5ea507cab..e975a589c 100644
--- a/src/pages/processCenter/pages/creatProcess/qbfz/step1-7.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbfz/step1-7.vue
@@ -147,23 +147,27 @@
             label="审核人">
           </el-table-column>
         </el-table>
+        <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"
-                disabled
-                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"-->
+      <!--          disabled-->
+      <!--          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%">
@@ -247,10 +251,12 @@ import ProcessHeader from "../../components/ProcessHeader";
 import ProcessFooter from "../../components/ProcessFooter";
 import ProcessTitle from "../../components/ProcessTitle";
 import { changeAssigneeNew, inboundLiaisonDetail, saveTaskFirst } from "api/process";
+import ReceiptDescription from '@/components/hzwlComponents/ReceiptDescription'
 
 export default {
   name: "qbfzStep7",
   components: {
+    ReceiptDescription,
     ProcessHeader,
     ProcessFooter,
     ProcessTitle
diff --git a/src/pages/processCenter/pages/creatProcess/qbfz/step1.vue b/src/pages/processCenter/pages/creatProcess/qbfz/step1.vue
index 925a47caf..c00e0ada6 100644
--- a/src/pages/processCenter/pages/creatProcess/qbfz/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbfz/step1.vue
@@ -102,22 +102,27 @@
             </el-col>
           </el-row>
         </el-form>
+        <ReceiptDescription
+            title="回执说明"
+            v-model="commentText"
+            :disabled="disabledXX"
+        ></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>
     <div class="content" v-show="active === '2'">
       <div class="block" style="padding-top: 20px;">
@@ -392,10 +397,12 @@ import ProcessHeader from "../../components/ProcessHeader";
 import ProcessFooter from "../../components/ProcessFooter";
 import ProcessTitle from "../../components/ProcessTitle";
 import { saveTaskFirst, queryTaskFirst, inboundLiaisonDetail, taskDel } from "api/process";
+import ReceiptDescription from '@/components/hzwlComponents/ReceiptDescription'
 
 export default {
   name: "qbfzStep1",
   components:{
+    ReceiptDescription,
     ProcessHeader,
     ProcessFooter,
     ProcessTitle
diff --git a/src/pages/processCenter/pages/creatProcess/qbfz/step2.vue b/src/pages/processCenter/pages/creatProcess/qbfz/step2.vue
index ef9cd3352..bb75b10f5 100644
--- a/src/pages/processCenter/pages/creatProcess/qbfz/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbfz/step2.vue
@@ -97,22 +97,26 @@
             </el-col>
           </el-row>
         </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%">
@@ -222,10 +226,12 @@ import ProcessHeader from "../../components/ProcessHeader";
 import ProcessFooter from "../../components/ProcessFooter";
 import ProcessTitle from "../../components/ProcessTitle";
 import { changeAssigneeNew, inboundLiaisonDetail, saveTaskFirst } from "api/process";
+import ReceiptDescription from '@/components/hzwlComponents/ReceiptDescription'
 
 export default {
   name: "qbfzStep2",
   components:{
+    ReceiptDescription,
     ProcessHeader,
     ProcessFooter,
     ProcessTitle
diff --git a/src/pages/processCenter/pages/creatProcess/qbfz/step3.vue b/src/pages/processCenter/pages/creatProcess/qbfz/step3.vue
index 88b4a4af9..b1afa0369 100644
--- a/src/pages/processCenter/pages/creatProcess/qbfz/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbfz/step3.vue
@@ -106,22 +106,26 @@
             </el-col>
           </el-row>
         </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%">
@@ -228,10 +232,12 @@ import ProcessHeader from "../../components/ProcessHeader";
 import ProcessFooter from "../../components/ProcessFooter";
 import ProcessTitle from "../../components/ProcessTitle";
 import { changeAssigneeNew, inboundLiaisonDetail, saveTaskFirst } from "api/process";
+import ReceiptDescription from '@/components/hzwlComponents/ReceiptDescription'
 
 export default {
   name: "qbfzStep3",
   components:{
+    ReceiptDescription,
     ProcessHeader,
     ProcessFooter,
     ProcessTitle
diff --git a/src/pages/processCenter/pages/creatProcess/qbfz/step4-1.vue b/src/pages/processCenter/pages/creatProcess/qbfz/step4-1.vue
index 7c2bf2e40..f5ce9926f 100644
--- a/src/pages/processCenter/pages/creatProcess/qbfz/step4-1.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbfz/step4-1.vue
@@ -162,23 +162,28 @@
             label="会签人">
           </el-table-column>
         </el-table>
+        <ReceiptDescription
+            title="回执说明"
+            v-model="commentText"
+            :disabled="disabledXX"
+        ></ReceiptDescription>
       </div>
-      <div>
-        <el-collapse accordion v-model="activesNames">
-          <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="activesNames">-->
+      <!--    <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>
     <div class="content" v-show="active === '3'">
       <div class="flow-list" style="height: 100%">
@@ -279,10 +284,12 @@ import ProcessHeader from "../../components/ProcessHeader";
 import ProcessFooter from "../../components/ProcessFooter";
 import ProcessTitle from "../../components/ProcessTitle";
 import { changeAssigneeNew, inboundLiaisonDetail, saveTaskFirst } from "api/process";
+import ReceiptDescription from '@/components/hzwlComponents/ReceiptDescription'
 
 export default {
   name: "qbfzStep4-1",
   components: {
+    ReceiptDescription,
     ProcessHeader,
     ProcessFooter,
     ProcessTitle
diff --git a/src/pages/processCenter/pages/creatProcess/qbfz/step4.vue b/src/pages/processCenter/pages/creatProcess/qbfz/step4.vue
index fbc64acab..b8ce4fa13 100644
--- a/src/pages/processCenter/pages/creatProcess/qbfz/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbfz/step4.vue
@@ -152,22 +152,26 @@
             label="会签人">
           </el-table-column>
         </el-table>
+        <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%">
@@ -267,10 +271,12 @@ import ProcessHeader from "../../components/ProcessHeader";
 import ProcessFooter from "../../components/ProcessFooter";
 import ProcessTitle from "../../components/ProcessTitle";
 import { changeAssigneeNew, inboundLiaisonDetail, saveTaskFirst } from "api/process";
+import ReceiptDescription from '@/components/hzwlComponents/ReceiptDescription'
 
 export default {
   name: "qbfzStep4",
   components: {
+    ReceiptDescription,
     ProcessHeader,
     ProcessFooter,
     ProcessTitle
diff --git a/src/pages/processCenter/pages/creatProcess/qbfz/step5.vue b/src/pages/processCenter/pages/creatProcess/qbfz/step5.vue
index e647cd280..97ef9957c 100644
--- a/src/pages/processCenter/pages/creatProcess/qbfz/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbfz/step5.vue
@@ -153,22 +153,26 @@
             label="会签人">
           </el-table-column>
         </el-table>
+        <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%">
@@ -271,10 +275,12 @@ import ProcessHeader from "../../components/ProcessHeader";
 import ProcessFooter from "../../components/ProcessFooter";
 import ProcessTitle from "../../components/ProcessTitle";
 import { changeAssigneeNew, inboundLiaisonDetail, saveTaskFirst } from "api/process";
+import ReceiptDescription from '@/components/hzwlComponents/ReceiptDescription'
 
 export default {
   name: "qbfzStep5",
   components: {
+    ReceiptDescription,
     ProcessHeader,
     ProcessFooter,
     ProcessTitle
diff --git a/src/pages/processCenter/pages/creatProcess/qbfz/step6.vue b/src/pages/processCenter/pages/creatProcess/qbfz/step6.vue
index 527c3dbb9..fac68f9a0 100644
--- a/src/pages/processCenter/pages/creatProcess/qbfz/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbfz/step6.vue
@@ -153,22 +153,26 @@
             label="会签人">
           </el-table-column>
         </el-table>
+        <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%">
@@ -271,10 +275,12 @@ import ProcessHeader from "../../components/ProcessHeader";
 import ProcessFooter from "../../components/ProcessFooter";
 import ProcessTitle from "../../components/ProcessTitle";
 import { changeAssigneeNew, inboundLiaisonDetail, saveTaskFirst } from "api/process";
+import ReceiptDescription from '@/components/hzwlComponents/ReceiptDescription'
 
 export default {
   name: "qbfzStep6",
   components: {
+    ReceiptDescription,
     ProcessHeader,
     ProcessFooter,
     ProcessTitle
diff --git a/src/pages/processCenter/pages/creatProcess/qbfz/step7.vue b/src/pages/processCenter/pages/creatProcess/qbfz/step7.vue
index 7dd38534f..6f6a8de7d 100644
--- a/src/pages/processCenter/pages/creatProcess/qbfz/step7.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbfz/step7.vue
@@ -153,22 +153,26 @@
             label="会签人">
           </el-table-column>
         </el-table>
+        <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%">
@@ -271,10 +275,12 @@ import ProcessHeader from "../../components/ProcessHeader";
 import ProcessFooter from "../../components/ProcessFooter";
 import ProcessTitle from "../../components/ProcessTitle";
 import { changeAssigneeNew, inboundLiaisonDetail, saveTaskFirst } from "api/process";
+import ReceiptDescription from '@/components/hzwlComponents/ReceiptDescription'
 
 export default {
   name: "qbfzStep7",
   components: {
+    ReceiptDescription,
     ProcessHeader,
     ProcessFooter,
     ProcessTitle