消息通知修改

src/api/userApi.js

@@ -57,7 +57,7 @@ axios.interceptors.response.use(
             .post(url,params)
             .then(
                 (res)=>{
-                    resolve(res.data)
+                    resolve(res)
                 },
                 (err)=>{
                     reject(err)
@@ -74,7 +74,7 @@ axios.interceptors.response.use(
         axios
             .get(url,{params:param})
             .then((res)=>{
-                resolve(res.data);
+                resolve(res);
                 },
                 (err)=>{
                     reject(err)

src/views/messageNotification.vue

@@ -184,10 +184,9 @@
       methods:{
         del(val){
           this.infromId=val
-          console.log(val);
           this.dialogVisible1=true;
         },
-        confirmDel(){
+        confirmDel(){     //删除内容
           let param={
             uid:this.$store.state.userInfo.userid,
             nid:this.infromId
@@ -198,7 +197,11 @@
                   // console.log(res);
                   this.getCourseManagement()
                   this.dialogVisible1=false;
-                  
+                  if (res.data) {
+                      this.$message.success('删除成功')
+                    }else{
+                      this.$message.error('删除失败')
+                    }
               },err=>{
                 console.log(err);
               })
@@ -241,12 +244,17 @@
                     this.addMess.tit='';
                     this.addMess.con='';
                     this.getCourseManagement();
+                    if (res.data) {
+                      this.$message.success('创建成功')
+                    }else{
+                      this.$message.error('创建失败')
+                    }
                 },err=>{
                   console.log(err);
                 })
 
         },
-        lookIntro(val){
+        lookIntro(val){    //查看信息通知
           console.log(val);
           let param={
             uid:this.$store.state.userInfo.userid,
@@ -255,7 +263,8 @@
           this.ajax
           .get(this.$store.state.api+'/SelectNotificationDetail',param)
           .then(res=>{
-              this.messageCon=res.data
+            console.log(res)
+              this.messageCon=res.data[0][0]
               // console.log(res);
           },err=>{
             console.log(err);

src/views/projectApply/projectApplicationApply.vue

@@ -176,7 +176,7 @@
 
       <!--添加成员dialog对话框开始 -->
       <el-dialog
-          title="添加成员"
+          :title="data.DialogStatus?'添加成员':'修改成员'"
           :visible.sync="addMemberDialog"
           :modal="true"
           :close-on-click-modal="true"
@@ -231,10 +231,12 @@
         },
         addMember(){   //添加项目成员
           this.addMemberDialog=true
+          this.data.DialogStatus=1;
         },
         amendDialogData(val){   //修改项目成员信息
             this.addMemberDialog=true
-            this.amend(val)
+            this.data.DialogStatus=0;
+            
         },
         
         backBtn1(){  // 上一步
@@ -245,8 +247,14 @@
             this.next();
         },
         commit(){   //确定添加成员
-            this.addPerson();
-            this.addMemberDialog=false
+            if (this.data.DialogStatus) {
+              this.addPerson();
+              this.addMemberDialog=false
+              return
+            }else{
+              this.amend()
+              this.addMemberDialog=false
+            }
         },
         Del(){
           

src/views/projectApply/projectApplicationApply3.vue

@@ -245,10 +245,6 @@ import { VueEditor } from "vue2-editor";
         return {
           addFundDialog:false,
           // 经费明细添加按钮对话框下拉框
-          
-          
-         
-          
         }
       },
       methods:{
@@ -257,25 +253,17 @@ import { VueEditor } from "vue2-editor";
           //重置
           this.addFundDialog=false;
         },
-        finish(){
+        finish(){    //添加经费明细对话框完成按钮
             this.addFundDetail()
             this.init()
         },
-        backBtn(){
-          // alert('333')
-          this.next();
-        },
-        backBtn1(){
+        backBtn1(){    //上一步
           this.back();
         },
-        submit(){
+        submit(){    //提交按钮
           this.submitBtn();
-          // this.dialogVisible1=true;
-        },
-        homeExit(){
-          this.$router.push('/login')
         },
-        addBtn(){
+        addBtn(){    //经费明细添加按钮
           this.addFundDialog=true;
         }
       }

src/views/projectApply/projectApplicationApplyMain.vue

@@ -27,13 +27,6 @@
       </div>
       <!--下方内容区结束-->
 
-
-      
-
-
-
-
-
       <!-- 提交对话框开始 -->
         <el-dialog
           title="提示"
@@ -66,6 +59,7 @@
             status:0,
             submitHint:false,
             projectApplicationApply1:{   //立项基础信息页面
+                DialogStatus:1,
                 select:{    //基本信息数据框
                   projectName:'人工智能分链机器',
                   person:'红发',
@@ -74,7 +68,7 @@
                   fund:'300000',
                   tel:'13128926474',
                   value1:"2023-11-12",
-                  sort:'dididi'
+                  sort:'第一产业'
                 },
                 options: [{   //学院下拉框
                     value: '选项1',
@@ -85,7 +79,7 @@
                     label: '中德学院'
                   },
                 ],
-                sortOptions: [{   //学院下拉框
+                sortOptions: [{   //分类下拉框
                     value: '选项1',
                     label: '第一产业'
                   },
@@ -133,40 +127,10 @@
                 ],
                 
                 dialog:{     //经费明细添加对话框
-                  textarea:'小同志不利于团结的话可不兴说呀',  //备注
-                  projectName:'',   //项目名称
-                  projectType:'',   //项目类别
-                  disburseProject:'Al智能生活',  //支出项目
-                  type:'智能家居',  //支出类别
                   fund:'300000',  //金额
-                  nameOptions: [   //项目名称下拉框
-                  {
-                    value: '1',
-                    label: '疯狂星期四'
-                  },
-                  {
-                    value: '2',
-                    label: '鱼稻共生'
-                  },
-                  {
-                    value: '3',
-                    label: '锻造钢铁'
-                  },
-                  ],
-                  typeOptions: [   //项目类型下拉框
-                  {
-                    value: '1',
-                    label: '第一产业'
-                  },
-                  {
-                    value: '2',
-                    label: '第二产业'
-                  },
-                  {
-                    value: '3',
-                    label: '第三产业'
-                  },
-                  ],
+                  type:'填海',  //支出类别
+                  disburseProject:'改造世界',  //支出项目
+                  textarea:'小同志不利于团结的话可不兴说呀',  //备注
                 },
             }
           }
@@ -179,10 +143,18 @@
               this.projectApplicationApply1.tableData.push(data);
             },
             amend(val){      //立项基础信息页面修改人员信息
+              console.log('111'); 
+              let p=this.projectApplicationApply1;
+
                 let param={
                   uid:this.$store.state.userInfo.userid,
-                  nid:val
+                  nid:val,
+                  personName:p.Member.name,
+                  class:p.Member.Class,
+                  phone:p.Member.phone
                 }
+                console.log(param);
+                return
                 this.ajax
                       .get(this.$store.state.api+'',param)
                       .then(res=>{
@@ -190,13 +162,12 @@
                       },err=>{
                         console.log(err);
                       })
-                console.log('111');
             },
             addFundDetail(){    //预算经费页面经费添加按钮
               let p=this.projectApplicationApply3;
                 let data={
                   Fund:p.dialog.fund,
-                  projectName:p.dialog.projectName,
+                  projectName:p.dialog.disburseProject,
                   sort:p.dialog.type,
                   remark:p.dialog.textarea
                 }