From 900f7e83c148357b263065098d84cdae25106e6e Mon Sep 17 00:00:00 2001
From: zyn <nn_0223@163.com>
Date: Tue, 26 Sep 2023 17:03:47 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=85=AC=E5=85=B1=E8=A1=A8?=
 =?UTF-8?q?=E5=8D=95=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DataRangePickerFormItem.vue               |  1 +
 .../hzwlComponents/DepartmentFormItem.vue     |  1 +
 .../InputForStandardsForLaws.vue              |  7 +----
 .../hzwlComponents/InputFormItem.vue          |  1 +
 .../hzwlComponents/ReceiptDescription.vue     | 28 +++++++++++++------
 .../hzwlComponents/personFormItem.vue         |  1 +
 6 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/src/components/hzwlComponents/DataRangePickerFormItem.vue b/src/components/hzwlComponents/DataRangePickerFormItem.vue
index 4c01fbd8c..4ac8e172a 100644
--- a/src/components/hzwlComponents/DataRangePickerFormItem.vue
+++ b/src/components/hzwlComponents/DataRangePickerFormItem.vue
@@ -3,6 +3,7 @@
     <el-date-picker
         :value="currentTime"
         :picker-options="pickerOptions"
+        :disabled="disabled"
         type="daterange"
         range-separator="至"
         start-placeholder="起始时间"
diff --git a/src/components/hzwlComponents/DepartmentFormItem.vue b/src/components/hzwlComponents/DepartmentFormItem.vue
index 22a5238b8..1aea491b6 100644
--- a/src/components/hzwlComponents/DepartmentFormItem.vue
+++ b/src/components/hzwlComponents/DepartmentFormItem.vue
@@ -5,6 +5,7 @@
           :value="value"
           :placeholder="placeholder"
           :clearable="clearable"
+          :disabled="disabled"
           readonly
           @click.native="choice('dep', placeholder, ids)">
         ></el-input>
diff --git a/src/components/hzwlComponents/InputForStandardsForLaws.vue b/src/components/hzwlComponents/InputForStandardsForLaws.vue
index b13c08967..873812545 100644
--- a/src/components/hzwlComponents/InputForStandardsForLaws.vue
+++ b/src/components/hzwlComponents/InputForStandardsForLaws.vue
@@ -18,8 +18,8 @@
           class="common-button-primary"
           size="mini"
           style="position:absolute;top: 10px;right: 0;"
+          :disabled="disabled"
           @click="selectLaws"
-          v-if="(processModel && !disabled) || !processModel"
       >手动查找</el-button>
     </el-form-item>
     <el-dialog
@@ -168,11 +168,6 @@ export default {
       type: Number,
       default: 24
     },
-    // 是否为流程中使用
-    processModel: {
-      type: Boolean,
-      default: false
-    },
     // label宽度
     labelWidth: {
       type: String,
diff --git a/src/components/hzwlComponents/InputFormItem.vue b/src/components/hzwlComponents/InputFormItem.vue
index d61f6ac89..e8b3f0671 100644
--- a/src/components/hzwlComponents/InputFormItem.vue
+++ b/src/components/hzwlComponents/InputFormItem.vue
@@ -5,6 +5,7 @@
           :value="value"
           :placeholder="placeholder"
           :clearable="clearable"
+          :disabled="disabled"
           @input="handleChange"
       ></el-input>
     </el-form-item>
diff --git a/src/components/hzwlComponents/ReceiptDescription.vue b/src/components/hzwlComponents/ReceiptDescription.vue
index 643b31f14..e3ebdd552 100644
--- a/src/components/hzwlComponents/ReceiptDescription.vue
+++ b/src/components/hzwlComponents/ReceiptDescription.vue
@@ -1,15 +1,18 @@
 <template>
+  <!--意见-->
   <el-collapse v-model="activeName" accordion>
-    <el-collapse-item title="回执说明" name="1">
+    <el-collapse-item :title="title" name="1">
       <div style="margin: 10px 0;">
-        <el-input :disabled="disabled"
-                  type="textarea"
-                  :rows="3"
-                  resize="none"
-                  placeholder="请输入意见"
-                  :value="value"
-                  @input="handleChange">
-        </el-input>
+        <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>
       </div>
     </el-collapse-item>
   </el-collapse>
@@ -31,6 +34,13 @@ export default {
     disabled: {
       type: Boolean,
       default: false
+    },
+    title: {
+      type: String,
+      required: true
+    },
+    prop: {
+      type: String
     }
   },
   methods: {
diff --git a/src/components/hzwlComponents/personFormItem.vue b/src/components/hzwlComponents/personFormItem.vue
index 67c388836..df2cb6a4d 100644
--- a/src/components/hzwlComponents/personFormItem.vue
+++ b/src/components/hzwlComponents/personFormItem.vue
@@ -5,6 +5,7 @@
           :value="value"
           :placeholder="placeholder"
           :clearable="clearable"
+          :disabled="disabled"
           readonly
           @click.native="choice('role', placeholder, value)">
         ></el-input>