From 2faa1a474cfe6ae1d818289f3fec955ffe922d4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=86=8A=E6=88=90=E5=BC=BA?= <xiongchengqiang@linzikg.com>
Date: Tue, 27 Oct 2020 14:38:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/elementConfig.js                    |  4 ++-
 src/utils/request.js                          | 26 ++++++++++++++++++-
 .../workbench/assessmentGroup/edit/index.vue  | 12 ++++++++-
 3 files changed, 39 insertions(+), 3 deletions(-)

diff --git a/src/utils/elementConfig.js b/src/utils/elementConfig.js
index f4dce2a..1b55bb4 100644
--- a/src/utils/elementConfig.js
+++ b/src/utils/elementConfig.js
@@ -31,9 +31,11 @@ import {
   Tabs,
   TabPane,
   Menu,
-  MenuItem
+  MenuItem,
+  Loading
 } from 'element-ui'
 
+Vue.prototype.$loading = Loading
 Vue.prototype.$message = Message
 Vue.prototype.$confirm = MessageBox.confirm
 Vue.prototype.$alert = MessageBox.alert
diff --git a/src/utils/request.js b/src/utils/request.js
index bf8a0c2..33d8672 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -1,5 +1,12 @@
 import axios from 'axios'
-import { Message } from 'element-ui'
+import { Message, Loading } from 'element-ui'
+// const id = Loading.service({
+//   target: document.querySelector('.appamin'),
+//   background: 'rgba(255, 255, 255, 0.1)',
+//   spinner: 'el-icon-loading',
+//   text: '请求加载中。。。'
+// })
+// id.close()
 // import store from '@/store'
 // import { getToken } from '@/utils/auth'
 // import errorCode from '@/utils/errorCode'
@@ -14,8 +21,17 @@ const service = axios.create({
   // 超时
   timeout: 1500000
 })
+
+const options = {
+  fullscreen: true,
+  target: document.querySelector('.appamin'),
+  background: 'rgba(255, 255, 255, 0.1)',
+  spinner: 'el-icon-loading',
+  text: '请求加载中。。。'}
+
 // request拦截器
 service.interceptors.request.use(config => {
+  Loading.service(options)
   // 是否需要设置 token
   // const isToken = (config.headers || {}).isToken === false
   // if (getToken() && !isToken) {
@@ -29,6 +45,10 @@ service.interceptors.request.use(config => {
 
 // 响应拦截器
 service.interceptors.response.use(res => {
+  const id = setTimeout(() => {
+    Loading.service(options).close()
+    clearTimeout(id)
+  }, 300)
   // 未设置状态码则默认成功状态
   const code = res.data.code || 200
   if (code !== 200) {
@@ -41,6 +61,10 @@ service.interceptors.response.use(res => {
   }
 },
 error => {
+  const id = setTimeout(() => {
+    Loading.service(options).close()
+    clearTimeout(id)
+  }, 300)
   console.log('err' + error)
   let { message } = error
   if (message === 'Network Error') {
diff --git a/src/views/kpi/workbench/assessmentGroup/edit/index.vue b/src/views/kpi/workbench/assessmentGroup/edit/index.vue
index 41affd4..135d8ee 100644
--- a/src/views/kpi/workbench/assessmentGroup/edit/index.vue
+++ b/src/views/kpi/workbench/assessmentGroup/edit/index.vue
@@ -7,7 +7,7 @@
             <div @click="handleChangle(3)" :class="{active:active===3}" class="a commonFont"><span class="eidt-header-circle">3</span>流程设计</div>
         </div>
         <div class="eidt-right">
-           <el-button type="primary" @click="handSaveBasisc">保 存</el-button>
+           <el-button :loading='loadings' type="primary" @click="handSaveBasisc">保 存</el-button>
         </div>
         <div class="eidt-content boderAndRadius">
           <basis :basisForm.sync='basisForm'  v-show="active===1"/>
@@ -27,6 +27,7 @@ console.log('saveDetailProcs: ', saveDetailProcs)
 export default {
   data () {
     return {
+      loadings: false,
       active: 1,
       // 基础
       basisForm: {
@@ -64,6 +65,14 @@ export default {
     async handSaveBasisc () {
       console.log('this.processInfo: ', this.processInfo)
       console.log('this.basisForm: ', this.basisForm)
+      if (!this.basisForm.name) {
+        return this.$message.error('请输入考评组名称')
+      }
+      if (!this.basisForm.depIds && !this.basisForm.staffIds) {
+        return this.$message.error('请选择被考核人员')
+      }
+
+      this.loadings = true
       try {
         let res = await saveBaseSet(this.basisForm)
         this.basisForm = res
@@ -89,6 +98,7 @@ export default {
       } catch (error) {
         this.$message.error(error.msg)
       }
+      this.loadings = false
       this.$message({
         message: '保存成功',
         type: 'success',