From 055097960d71180f238872fddaea2383b87359bd Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Thu, 17 Mar 2022 14:04:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E6=96=87=E5=85=B3=E6=80=80=E3=80=81?=
 =?UTF-8?q?=E9=9A=BE=E7=82=B9=E5=A0=B5=E7=82=B9=E8=AF=A6=E6=83=85=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/secretaryLog/difficulty/difficultyForm.vue      | 5 +++--
 .../modules/secretaryLog/difficulty/difficultyList.vue      | 6 ++++--
 src/views/modules/secretaryLog/humanisticCare/careForm.vue  | 5 +++--
 src/views/modules/secretaryLog/humanisticCare/careList.vue  | 6 ++++--
 4 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/views/modules/secretaryLog/difficulty/difficultyForm.vue b/src/views/modules/secretaryLog/difficulty/difficultyForm.vue
index e271db26..46bc5df7 100644
--- a/src/views/modules/secretaryLog/difficulty/difficultyForm.vue
+++ b/src/views/modules/secretaryLog/difficulty/difficultyForm.vue
@@ -6,6 +6,7 @@
                :inline="true"
                :model="formData"
                :rules="dataRule"
+               :disabled="formType==='detail'"
                class="form">
 
         <el-form-item label="内容"
@@ -295,9 +296,9 @@ export default {
 
       var a = document.createElement('a');
       var event = new MouseEvent('click');
-      a.download = file.name;
+      a.download = file.fileName;
       console.log(a)
-      a.href = file.url;
+      a.href = file.attachmentUrl;
       a.dispatchEvent(event);
 
 
diff --git a/src/views/modules/secretaryLog/difficulty/difficultyList.vue b/src/views/modules/secretaryLog/difficulty/difficultyList.vue
index 95d54527..90e9d8f1 100644
--- a/src/views/modules/secretaryLog/difficulty/difficultyList.vue
+++ b/src/views/modules/secretaryLog/difficulty/difficultyList.vue
@@ -282,10 +282,12 @@ export default {
 
 
     handleDetail (row) {
-      this.detailShow = true
+      // this.detailShow = true
+      this.formShow = true
       this.formTitle = '详情'
       this.$nextTick(() => {
-        this.$refs.ref_detail.initForm(row)
+        this.$refs.ref_form.initForm('detail', row.id)
+        // this.$refs.ref_detail.initForm(row)
 
       })
     },
diff --git a/src/views/modules/secretaryLog/humanisticCare/careForm.vue b/src/views/modules/secretaryLog/humanisticCare/careForm.vue
index 257acb56..086223d4 100644
--- a/src/views/modules/secretaryLog/humanisticCare/careForm.vue
+++ b/src/views/modules/secretaryLog/humanisticCare/careForm.vue
@@ -6,6 +6,7 @@
                :inline="true"
                :model="formData"
                :rules="dataRule"
+               :disabled="formType==='detail'"
                class="form">
 
         <el-form-item label="关怀类型"
@@ -348,9 +349,9 @@ export default {
 
       var a = document.createElement('a');
       var event = new MouseEvent('click');
-      a.download = file.name;
+      a.download = file.fileName;
       console.log(a)
-      a.href = file.url;
+      a.href = file.attachmentUrl;
       a.dispatchEvent(event);
 
 
diff --git a/src/views/modules/secretaryLog/humanisticCare/careList.vue b/src/views/modules/secretaryLog/humanisticCare/careList.vue
index d99b944a..afb7f687 100644
--- a/src/views/modules/secretaryLog/humanisticCare/careList.vue
+++ b/src/views/modules/secretaryLog/humanisticCare/careList.vue
@@ -352,10 +352,12 @@ export default {
 
 
     handleDetail (row) {
-      this.detailShow = true
+      // this.detailShow = true
+      this.formShow = true
       this.formTitle = '详情'
       this.$nextTick(() => {
-        this.$refs.ref_detail.initForm(row)
+        // this.$refs.ref_detail.initForm(row)
+        this.$refs.ref_form.initForm('detail', row.id)
 
       })
     },