From d48cc283bad290e7ed5ea35a2ef213d2f70afe1c Mon Sep 17 00:00:00 2001
From: TiaStars <L18864257234@163.com>
Date: Thu, 14 Sep 2023 15:05:46 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=97=B6=E3=80=81=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E6=97=B6=E3=80=81=E4=BF=AE=E6=94=B9=E6=97=B6=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E8=92=99=E5=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/components/dialog/index.vue    |  8 ++++++++
 src/views/components/dialogTwo/index.vue |  6 +++++-
 src/views/yingji/planManage.vue          | 12 ++++++++++--
 3 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/src/views/components/dialog/index.vue b/src/views/components/dialog/index.vue
index c792519..68c3041 100644
--- a/src/views/components/dialog/index.vue
+++ b/src/views/components/dialog/index.vue
@@ -277,6 +277,7 @@
 </template>
 <script>
 import myPagination from "@/views/components/myPagination/index.vue";
+import { Loading } from "element-ui";
 export default {
   components: { myPagination },
   data() {
@@ -416,6 +417,11 @@ export default {
         this.nextStep = true;
         this.nextText = "发布计划";
       } else {
+        let downloadLoadingInstance = Loading.service({
+          text: this.isamend ? "正在修改计划，请稍后" : "正在发布计划，请稍后",
+          spinner: "el-icon-loading",
+          background: "rgba(0, 0, 0, 0.7)",
+        });
         // console.log(this.form2);
         console.log(this.multipleSelection);
         let arr = [];
@@ -438,6 +444,7 @@ export default {
           obj = {...obj,id:this.amendId}
           data = await this.$api.yingji.bPlanManage('put',obj)
           if(data.code == 200){
+            downloadLoadingInstance.close();
             this.$message({
               message: '修改成功',
               type: 'success'
@@ -447,6 +454,7 @@ export default {
         } else {
           data = await this.$api.yingji.bPlanManage('post',obj)
           if(data.code == 200){
+            downloadLoadingInstance.close();
             this.$message({
               message: '新增成功',
               type: 'success'
diff --git a/src/views/components/dialogTwo/index.vue b/src/views/components/dialogTwo/index.vue
index 5297d80..2b8c5d8 100644
--- a/src/views/components/dialogTwo/index.vue
+++ b/src/views/components/dialogTwo/index.vue
@@ -129,7 +129,11 @@ export default {
       this.pages.pageSize = 10;
     },
     async getList(item){
+      this.loading = true
       let data = await this.$api.yingji.bPlanManageTwo(item.id);
+      if(data.code == 200) {
+        this.loading = false
+      }
       this.year = data.data.plannedYear;
       this.title = data.data.planName;
       this.content = data.data.planContent;
@@ -138,7 +142,7 @@ export default {
     },
     // 页码，当前页切换事件
     pagesChange(pages) {
-      this.getTable(pages);
+      this.getList(pages);
       this.pages = pages;
     },
     tableRowClassName({ row, rowIndex }) {
diff --git a/src/views/yingji/planManage.vue b/src/views/yingji/planManage.vue
index 850b0e4..ea71dd0 100644
--- a/src/views/yingji/planManage.vue
+++ b/src/views/yingji/planManage.vue
@@ -4,7 +4,7 @@
  * @Author: JC9527
  * @Date: 2023-09-04 10:20:06
  * @LastEditors: JC9527
- * @LastEditTime: 2023-09-14 14:17:04
+ * @LastEditTime: 2023-09-14 15:00:34
 -->
 <template>
     <div class="plan-management">
@@ -111,7 +111,7 @@
               header-align="center"
             >
             <template slot-scope="scope">
-              <span>{{ scope.row.createTime.split(' ')[0] }}</span>
+              <span>{{ scope.row.createTime ? scope.row.createTime.split(' ')[0] : scope.row.createTime }}</span>
             </template>
             </el-table-column>
             <el-table-column
@@ -150,6 +150,7 @@
   import myPagination from "@/views/components/myPagination/index.vue"
   import myDialog from "@/views/components/dialog/index.vue"
   import myDialogtwo from "@/views/components/dialogTwo/index.vue"
+  import { Loading } from "element-ui";
   export default {
     components:{myPagination,myDialog,myDialogtwo},
     data() {
@@ -234,9 +235,15 @@
         .then(async() => {
           this.loading = true;
           try {
+            let downloadLoadingInstance = Loading.service({
+              text: "正在删除计划，请稍候",
+              spinner: "el-icon-loading",
+              background: "rgba(0, 0, 0, 0.7)",
+            });
             let data = await this.$api.yingji.bPlanManage('delete',_,{idList:idList.join(',')})
             if(data.code == 200) {
               this.loading = false;
+              downloadLoadingInstance.close();
               this.$message({
                 message: '删除成功',
                 type: 'success'
@@ -244,6 +251,7 @@
               this.getList();
             }
           } catch (error) {
+            downloadLoadingInstance.close();
             console.log(error)
           }
         })