From 00104e3ecef0dabcc23229c3e034de69f7aed528 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=9F=B9=E5=8F=8B?= <17852335869@163.com>
Date: Thu, 16 Mar 2023 09:25:07 +0800
Subject: [PATCH] =?UTF-8?q?1.=20=E6=96=B0=E5=BB=BA=E5=B7=A5=E5=8D=95?=
 =?UTF-8?q?=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/option/user/info.js                                 | 5 ++---
 src/views/plugin/workflow/mixins/ex-form.js             | 2 +-
 src/views/plugin/workflow/process/components/detail.vue | 2 +-
 src/views/plugin/workflow/process/components/form.vue   | 3 +++
 src/views/system/userinfo.vue                           | 2 ++
 5 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/option/user/info.js b/src/option/user/info.js
index a7500e5..713f3c6 100644
--- a/src/option/user/info.js
+++ b/src/option/user/info.js
@@ -7,12 +7,11 @@ export const userInfoOption = {
     type: 'upload',
     listType: 'picture-img',
     propsHttp: {
-      res: 'data',
-      url: 'link',
+      url: 'data',
     },
     fileType: 'img',//img/video/audio,
     accept: 'image/png, image/jpeg',
-    action: '/api/blade-resource/oss/endpoint/put-file',
+    action: '/api/blade-user/resultPicture',
     tip: '只能上传jpg/png用户头像，且不超过500kb',
     span: 12,
     row: true,
diff --git a/src/views/plugin/workflow/mixins/ex-form.js b/src/views/plugin/workflow/mixins/ex-form.js
index 1623bc4..6374245 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}?status=${row.status}`
+            `/workflow/process/${type}/${param}?parent=${parent}`
           );
         }
       }
diff --git a/src/views/plugin/workflow/process/components/detail.vue b/src/views/plugin/workflow/process/components/detail.vue
index a9a60fd..057ace6 100644
--- a/src/views/plugin/workflow/process/components/detail.vue
+++ b/src/views/plugin/workflow/process/components/detail.vue
@@ -63,7 +63,7 @@
                     <el-table-column label="操作">
                       <template slot-scope="scope">
                         <i
-                          v-if="(userInfo.real_name === scope.row.createUser) && $route.query.status!=='作废'"
+                          v-if="userInfo.real_name === scope.row.createUser"
                           class="el-icon-delete"
                           style="cursor: pointer;"
                           @click="deleteFile(scope.$index)"
diff --git a/src/views/plugin/workflow/process/components/form.vue b/src/views/plugin/workflow/process/components/form.vue
index eab8c0a..189ae86 100644
--- a/src/views/plugin/workflow/process/components/form.vue
+++ b/src/views/plugin/workflow/process/components/form.vue
@@ -254,6 +254,9 @@ export default {
         // const guanlibumen = this.findObject(this.option.column, "guanlibumen");
         const guanlibumen = this.option.column[1];
         guanlibumen.dicData = res.data.data;
+        if(res.data.data.length === 1) {
+          this.form.guanlibumen = guanlibumen.dicData[0].id
+        }
       });
       getTaskAndDataBase({ id }).then((res) => {
         this.taskAndDataBaseList = res.data.data;
diff --git a/src/views/system/userinfo.vue b/src/views/system/userinfo.vue
index 52c58a7..44337e8 100644
--- a/src/views/system/userinfo.vue
+++ b/src/views/system/userinfo.vue
@@ -188,8 +188,10 @@ export default {
             email: user.email,
           };
           this.$store.commit("SET_USER_INFO", {
+           ...user,
            avatar: user.avatar,
            real_name: user.realName,
+           role_name:user.roleName
           });
         });
       }