From a68939b182bb5605cc0e35d87cb2fd66e61d4727 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=9F=B9=E5=8F=8B?= <17852335869@163.com>
Date: Tue, 14 Mar 2023 17:57:11 +0800
Subject: [PATCH] =?UTF-8?q?1.=20=E8=AF=A6=E6=83=85=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=EF=BC=8C=E6=92=A4=E5=9B=9E=E5=86=8D=E6=AC=A1?=
 =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/plugin/workflow/mixins/ex-form.js        |  2 +-
 .../plugin/workflow/process/components/detail.vue  | 14 ++++++++++++--
 src/views/plugin/workflow/process/workorder.vue    |  2 +-
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/views/plugin/workflow/mixins/ex-form.js b/src/views/plugin/workflow/mixins/ex-form.js
index 6374245..1623bc4 100644
--- a/src/views/plugin/workflow/mixins/ex-form.js
+++ b/src/views/plugin/workflow/mixins/ex-form.js
@@ -96,7 +96,7 @@ export default {
           });
         } else {
           this.$router.push(
-            `/workflow/process/${type}/${param}?parent=${parent}`
+            `/workflow/process/${type}/${param}?parent=${parent}?status=${row.status}`
           );
         }
       }
diff --git a/src/views/plugin/workflow/process/components/detail.vue b/src/views/plugin/workflow/process/components/detail.vue
index fe26b84..a9a60fd 100644
--- a/src/views/plugin/workflow/process/components/detail.vue
+++ b/src/views/plugin/workflow/process/components/detail.vue
@@ -31,6 +31,7 @@
                 :defaults.sync="defaults"
                 :option="option"
                 :upload-preview="handleUploadPreview"
+                :upload-after="uploadAfter"
               >
                 <template slot="uploadrecord">
                   <el-table
@@ -62,9 +63,9 @@
                     <el-table-column label="操作">
                       <template slot-scope="scope">
                         <i
-                          v-if="userInfo.real_name === scope.row.createUser"
+                          v-if="(userInfo.real_name === scope.row.createUser) && $route.query.status!=='作废'"
                           class="el-icon-delete"
-                          style="cursor: pointer"
+                          style="cursor: pointer;"
                           @click="deleteFile(scope.$index)"
                         ></i>
                       </template>
@@ -191,6 +192,15 @@ export default {
     },
   },
   methods: {
+        // 文件上传后
+    uploadAfter(res, done, loading, column) {
+      if (typeof this.form.uploadrecord == "string") {
+        this.form.uploadrecord = this.form.uploadrecord.split("");
+      }
+      this.form.uploadrecord.push(res);
+      done();
+      this.$message.success("上传成功！");
+    },
     //  下载
     async download(row) {
       let res = await downloadFile({
diff --git a/src/views/plugin/workflow/process/workorder.vue b/src/views/plugin/workflow/process/workorder.vue
index 47b959f..40f150c 100644
--- a/src/views/plugin/workflow/process/workorder.vue
+++ b/src/views/plugin/workflow/process/workorder.vue
@@ -142,7 +142,7 @@
         @size-change="sizeChange"
       >
         <template slot-scope="{ row }" slot="menu">
-          <el-button @click="dynamicRoute(row, 'detail')">详情 </el-button>
+          <el-button @click="dynamicRoute(row, 'detail')">详情</el-button>
         </template>
         <template slot-scope="scope" slot="status">
           <span