From f70ebc62b81c86bd7799fd63dccc3461a89695fb Mon Sep 17 00:00:00 2001
From: lSun <15893999301@qq.com>
Date: Thu, 26 Dec 2024 17:24:36 +0800
Subject: [PATCH] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E6=95=B0=E6=8D=AE=E9=9A=94?=
 =?UTF-8?q?=E7=A6=BB=EF=BC=8Cbug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/process/orgApply.js          | 10 ++++++++++
 src/utils/request.js                 |  2 +-
 src/views/process/orgApply/index.vue |  8 ++++----
 src/views/system/userInfo/index.vue  |  2 ++
 4 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/src/api/process/orgApply.js b/src/api/process/orgApply.js
index 3501dbf..d54706d 100644
--- a/src/api/process/orgApply.js
+++ b/src/api/process/orgApply.js
@@ -95,3 +95,13 @@ export function listDept(query) {
     params: query
   })
 }
+
+
+// 查询部门列表全部
+export function listDeptAll(query) {
+  return request({
+    url: '/system/attDetails/orgListAll',
+    method: 'get',
+    params: query
+  })
+}
diff --git a/src/utils/request.js b/src/utils/request.js
index 1049c2f..1b0e4ac 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -17,7 +17,7 @@ const service = axios.create({
   // axios中请求配置有baseURL选项，表示请求URL公共部分
   baseURL: process.env.VUE_APP_BASE_API,
   // 超时
-  timeout: 10000
+  timeout: 60000
 })
 
 // request拦截器
diff --git a/src/views/process/orgApply/index.vue b/src/views/process/orgApply/index.vue
index 6dd303c..9226b52 100644
--- a/src/views/process/orgApply/index.vue
+++ b/src/views/process/orgApply/index.vue
@@ -229,7 +229,7 @@
   <script>
   import {
     listOrg, getOrg, delOrg, addOrg, updateOrg, changeOrgStatus, exportOrg, getPostName,
-    getAttGroupList,listDept
+    getAttGroupList, listDept, listDeptAll
   } from "@/api/process/orgApply";
   import Treeselect from "@riophae/vue-treeselect";
   import "@riophae/vue-treeselect/dist/vue-treeselect.css";
@@ -405,7 +405,7 @@
           this.form.attGroupId = this.$store.state.user.attGroupId;
           this.form.attGroupName = this.$store.state.user.attGroupName;
           console.log(this.form.attGroupName)
-          listDept().then(response => {
+          listDeptAll().then(response => {
             this.deptOptions = this.handleTree(response.data, "id");
             this.open = true;
             this.isView = false;
@@ -417,7 +417,7 @@
       handleUpdate(row) {
         this.reset();
         const Id = row.id
-        listDept().then(response => {
+        listDeptAll().then(response => {
           this.deptOptions = this.handleTree(response.data, "id");
         });
         getOrg(Id).then(orgResponse => {
@@ -436,7 +436,7 @@
       handleView(row) {
         this.reset();
         const Id = row.id
-        listDept().then(response => {
+        listDeptAll().then(response => {
           this.deptOptions = this.handleTree(response.data, "id");
         });
         getOrg(Id).then(orgResponse => {
diff --git a/src/views/system/userInfo/index.vue b/src/views/system/userInfo/index.vue
index a20c452..14c586d 100644
--- a/src/views/system/userInfo/index.vue
+++ b/src/views/system/userInfo/index.vue
@@ -500,6 +500,7 @@
         this.$refs["form"].validate(valid => {
           if (valid) {
             if (this.form.userId != undefined) {
+              this.form.newFace = "";
               console.log("人员修改",this.form);
               updateUser(this.form).then(response => {
                 this.$modal.msgSuccess("修改成功");
@@ -625,6 +626,7 @@
         this.$refs["forms"].validate(valid => {
           if (valid) {
             checkPersonAssignment(this.form).then(response => {
+              this.form.newFace = "";
               if(this.form.reviewerStatus=="1"){
                 this.$modal.msgSuccess("审核成功");
               }else if(this.form.reviewerStatus=="2"){