Merge branch 'develop' into developer/yanjiaxu

src/views/task/new/index.vue

@@ -1074,6 +1074,13 @@ export default {
             closeOnClickModal: false,
             confirmButtonClass: 'queryBtn'
           }).then(() => {
+            // loading
+            const loading = this.$loading({
+              lock: true,
+              text: 'Loading',
+              spinner: 'el-icon-loading',
+              background: 'rgba(255, 255, 255, 0.8)'
+            })
             // 开始窜数据
             for (const key in this.model) {
               // eslint-disable-next-line no-prototype-builtins
@@ -1104,6 +1111,7 @@ export default {
             if (this.taskId === undefined) {
               createTask(this.taskCreateRequest).then(response => {
                 if (response.code === 200) {
+                  loading.close()
                   this.$modal.msgSuccess('发布成功')
                   this.$router.push({
                     path: '/task/on'
@@ -1121,6 +1129,7 @@ export default {
               })
               updateTask(this.taskCreateRequest).then(response => {
                 if (response.code === 200) {
+                  loading.close()
                   this.$modal.msgSuccess('修改成功')
                   this.$router.push({
                     path: '/task/on'